Merge branch 'master' into av/node-addon

.github/actions/prepare-build/action.yml

@@ -0,0 +1,47 @@
+name: "Prebuilt steps for build"
+description: "Reusable steps for multiple jobs"
+inputs:
+   java_ver:
+     required: true
+     description: "Java version to install"
+   ghc_ver:
+     required: true
+     description: "GHC version to install"
+   github_ref:
+     required: true
+     description: "Git reference"
+   os:
+     required: true
+     description: "Target OS"
+   cache_path:
+     required: false
+     default: "~/.cabal/store"
+     description: "Cache path"
+   cabal_ver:
+     required: false
+     default: 3.10.1.0
+     description: "GHC version to install"
+runs:
+  using: "composite"
+  steps:
+    - name: Setup Haskell
+      uses: simplex-chat/setup-haskell-action@v2
+      with:
+        ghc-version: ${{ inputs.ghc_ver }}
+        cabal-version: ${{ inputs.cabal_ver }}
+
+    - name: Setup Java
+      if: startsWith(inputs.github_ref, 'refs/tags/v')
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'corretto'
+        java-version: ${{ inputs.java_ver }}
+        cache: 'gradle'
+
+    - name: Restore cached build
+      uses: actions/cache@v4
+      with:
+        path: |
+          ${{ inputs.cache_path }}
+          dist-newstyle
+        key: ${{ inputs.os }}-ghc${{ inputs.ghc_ver }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}

.github/actions/prepare-release/action.yml

@@ -0,0 +1,39 @@
+name: "Upload binary and update hash"
+description: "Reusable steps for multiple jobs"
+inputs:
+   bin_path:
+     required: true
+     description: "Path to binary to upload"
+   bin_name:
+     required: true
+     description: "Name of uploaded binary"
+   bin_hash:
+     required: true
+     description: "Message with SHA to include in release"
+   github_ref:
+     required: true
+     description: "Github reference"
+   github_token:
+     required: true
+     description: "Github token"
+runs:
+  using: "composite"
+  steps:
+    - name: Upload file with specific name
+      if: startsWith(inputs.github_ref, 'refs/tags/v')
+      uses: simplex-chat/upload-release-action@v2
+      with:
+        repo_token: ${{ inputs.github_token }}
+        file: ${{ inputs.bin_path }}
+        asset_name: ${{ inputs.bin_name }}
+        tag: ${{ inputs.github_ref }}
+
+    - name: Add hash to release notes
+      if: startsWith(inputs.github_ref, 'refs/tags/v')
+      uses: simplex-chat/action-gh-release@v2
+      env:
+        GITHUB_TOKEN: ${{ inputs.github_token }}
+      with:
+        append_body: true
+        body: |
+          ${{ inputs.bin_hash }}

.github/actions/swap/action.yml

@@ -0,0 +1,44 @@
+name: 'Set Swap Space'
+description: 'Add moar swap'
+branding:
+  icon: 'crop'
+  color: 'orange'
+inputs:
+  swap-size-gb:
+    description: 'Swap space to create, in Gigabytes.'
+    required: false
+    default: '10'
+runs:
+  using: "composite"
+  steps:
+    - name: Swap space report before modification
+      shell: bash
+      run: |
+        echo "Memory and swap:"
+        free -h
+        echo
+        swapon --show
+        echo
+    - name: Set Swap
+      shell: bash
+      run: |
+          export SWAP_FILE=$(swapon --show=NAME | tail -n 1)
+          echo "Swap file: $SWAP_FILE"
+          if [ -z "$SWAP_FILE" ]; then
+            SWAP_FILE=/opt/swapfile
+          else
+            sudo swapoff $SWAP_FILE
+            sudo rm $SWAP_FILE
+          fi
+          sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
+          sudo chmod 600 $SWAP_FILE
+          sudo mkswap $SWAP_FILE
+          sudo swapon $SWAP_FILE
+    - name: Swap space report after modification
+      shell: bash
+      run: |
+        echo "Memory and swap:"
+        free -h
+        echo
+        swapon --show
+        echo

.github/workflows/build.yml

@@ -22,17 +22,58 @@ on:
       - "README.md"
       - "PRIVACY.md"
 
+# This workflow uses custom actions (prepare-build and prepare-release) defined in:
+# 
+# .github/actions/
+# ├── prepare-build
+# │   └── action.yml
+# └── prepare-release
+#     └── action.yml
+
+# Important!
+# Do not use always(), it makes build unskippable.
+# See: https://github.com/actions/runner/issues/1846#issuecomment-1246102753
+
 jobs:
-  prepare-release:
-    if: startsWith(github.ref, 'refs/tags/v')
+
+# =============================
+#       Global variables
+# =============================
+
+# That is the only and less hacky way to setup global variables
+# to use in strategy matrix (env:/YAML anchors doesn't work).
+# See: https://github.com/orgs/community/discussions/56787#discussioncomment-6041789
+#      https://github.com/actions/runner/issues/1182
+#      https://stackoverflow.com/a/77549656
+
+  variables:
+    runs-on: ubuntu-latest
+    outputs:
+      GHC_VER: 9.6.3
+      JAVA_VER: 17
+    steps:
+      - name: Dummy job when we have just simple variables
+        if: false
+        run: echo
+
+# =============================
+#       Create release
+# =============================
+
+# Create release, but only if it's triggered by tag push.
+# On pull requests/commits push, this job will always complete.
+
+  maybe-release:
     runs-on: ubuntu-latest
     steps:
       - name: Clone project
+        if: startsWith(github.ref, 'refs/tags/v')
         uses: actions/checkout@v3
 
       - name: Build changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v4
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: simplex-chat/release-changelog-builder-action@v5
         with:
           configuration: .github/changelog_conf.json
           failOnError: true
@@ -42,7 +83,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: simplex-chat/action-gh-release@v2
         with:
           body: ${{ steps.build_changelog.outputs.changelog }}
           prerelease: true
@@ -52,183 +94,295 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  build:
-    name: build-${{ matrix.os }}-${{ matrix.ghc }}
-    if: always()
-    needs: prepare-release
+# =========================
+#        Linux Build
+# =========================
+
+  build-linux:
+    name: "ubuntu-${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
+    needs: [maybe-release, variables]
+    runs-on: ubuntu-${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: 22.04
+            ghc: "8.10.7"
+            should_run: ${{ !(github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }}
+          - os: 22.04
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-ubuntu-22_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-22_04-x86_64.deb
+            should_run: true
+          - os: 24.04
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-ubuntu-24_04-x86-64
+            desktop_asset_name: simplex-desktop-ubuntu-24_04-x86_64.deb
+            should_run: true
+    steps:
+      - name: Checkout Code
+        if: matrix.should_run == true
+        uses: actions/checkout@v3
+
+      - name: Setup swap
+        if: matrix.ghc == '8.10.7' && matrix.should_run == true
+        uses: ./.github/actions/swap
+        with:
+          swap-size-gb: 30
+
+      # Otherwise we run out of disk space with Docker build
+      - name: Free disk space
+        if: matrix.should_run == true
+        shell: bash
+        run: ./scripts/ci/linux_util_free_space.sh
+
+      - name: Restore cached build
+        if: matrix.should_run == true
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cabal/store
+            dist-newstyle
+          key: ubuntu-${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
+
+      - name: Set up Docker Buildx
+        if: matrix.should_run == true
+        uses: simplex-chat/docker-setup-buildx-action@v3
+
+      - name: Build and cache Docker image
+        if: matrix.should_run == true
+        uses: simplex-chat/docker-build-push-action@v6
+        with:
+          context: .
+          load: true
+          file: Dockerfile.build
+          tags: build/${{ matrix.os }}:latest
+          build-args: |
+            TAG=${{ matrix.os }}
+            GHC=${{ matrix.ghc }}
+
+      # Docker needs these flags for AppImage build:
+      # --device /dev/fuse
+      # --cap-add SYS_ADMIN
+      # --security-opt apparmor:unconfined
+      - name: Start container
+        if: matrix.should_run == true
+        shell: bash
+        run: |
+          docker run -t -d \
+            --device /dev/fuse \
+            --cap-add SYS_ADMIN \
+            --security-opt apparmor:unconfined \
+            --name builder \
+            -v ~/.cabal:/root/.cabal \
+            -v /home/runner/work/_temp:/home/runner/work/_temp \
+            -v ${{ github.workspace }}:/project \
+            build/${{ matrix.os }}:latest
+
+      - name: Prepare cabal.project.local
+        if: matrix.should_run == true
+        shell: bash
+        run: |
+          echo "ignore-project: False"    >> cabal.project.local
+          echo "package direct-sqlcipher" >> cabal.project.local
+          echo "    flags: +openssl"      >> cabal.project.local
+
+      # chmod/git commands are used to workaround permission issues when cache is restored
+      - name: Build CLI
+        if: matrix.should_run == true
+        shell: docker exec -t builder sh -eu {0}
+        run: |
+          chmod -R 777 dist-newstyle ~/.cabal && git config --global --add safe.directory '*'
+          cabal clean
+          cabal update
+          cabal build -j --enable-tests
+          mkdir -p /out
+          for i in simplex-chat simplex-chat-test; do
+            bin=$(find /project/dist-newstyle -name "$i" -type f -executable)
+            chmod +x "$bin"
+            mv "$bin" /out/
+          done
+          strip /out/simplex-chat
+
+      - name: Copy tests from container
+        if: matrix.should_run == true
+        shell: bash
+        run: |
+          docker cp builder:/out/simplex-chat-test .
+
+      - name: Copy CLI from container and prepare it
+        id: linux_cli_prepare
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        shell: bash
+        run: |
+          docker cp builder:/out/simplex-chat ./${{ matrix.cli_asset_name }}
+          path="${{ github.workspace }}/${{ matrix.cli_asset_name }}"
+          echo "bin_path=$path" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-256\(${{ matrix.cli_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Upload CLI
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        uses: ./.github/actions/prepare-release
+        with:
+          bin_path: ${{ steps.linux_cli_prepare.outputs.bin_path }}
+          bin_name: ${{ matrix.cli_asset_name }}
+          bin_hash: ${{ steps.linux_cli_prepare.outputs.bin_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Desktop
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        shell: docker exec -t builder sh -eu {0}
+        run: |
+          scripts/desktop/build-lib-linux.sh
+          cd apps/multiplatform
+          ./gradlew packageDeb
+
+      - name: Prepare Desktop
+        id: linux_desktop_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        shell: bash
+        run: |
+          path=$(echo ${{ github.workspace }}/apps/multiplatform/release/main/deb/simplex_*_amd64.deb )
+          echo "package_path=$path" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Upload Desktop
+        uses: ./.github/actions/prepare-release
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.should_run == true
+        with:
+          bin_path: ${{ steps.linux_desktop_build.outputs.package_path }}
+          bin_name: ${{ matrix.desktop_asset_name }}
+          bin_hash: ${{ steps.linux_desktop_build.outputs.package_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build AppImage
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == '22.04' && matrix.should_run == true
+        shell: docker exec -t builder sh -eu {0}
+        run: |
+          scripts/desktop/make-appimage-linux.sh
+
+      - name: Prepare AppImage
+        id: linux_appimage_build
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == '22.04' && matrix.should_run == true
+        shell: bash
+        run: |
+          path=$(echo ${{ github.workspace }}/apps/multiplatform/release/main/*imple*.AppImage)
+          echo "appimage_path=$path" >> $GITHUB_OUTPUT
+          echo "appimage_hash=$(echo SHA2-256\(simplex-desktop-x86_64.AppImage\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+
+      - name: Upload AppImage
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == '22.04' && matrix.should_run == true
+        uses: ./.github/actions/prepare-release
+        with:
+          bin_path: ${{ steps.linux_appimage_build.outputs.appimage_path }}
+          bin_name: "simplex-desktop-x86_64.AppImage"
+          bin_hash: ${{ steps.linux_appimage_build.outputs.appimage_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fix permissions for cache
+        if: matrix.should_run == true
+        shell: bash
+        run: |
+          sudo chmod -R 777 dist-newstyle ~/.cabal
+          sudo chown -R $(id -u):$(id -g) dist-newstyle ~/.cabal
+
+      - name: Run tests
+        if: matrix.should_run == true
+        timeout-minutes: 120
+        shell: bash
+        run: |
+          i=1
+          attempts=1
+          ${{ (github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }} && attempts=3
+          while [ "$i" -le "$attempts" ]; do
+            if ./simplex-chat-test; then
+              break
+            else
+              echo "Attempt $i failed, retrying..."
+              i=$((i + 1))
+              sleep 1
+            fi
+          done
+          if [ "$i" -gt "$attempts" ]; then
+            echo "All "$attempts" attempts failed."
+            exit 1
+          fi
+
+# =========================
+#        MacOS Build
+# =========================
+
+  build-macos:
+    name: "${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
+    needs: [maybe-release, variables]
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       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-aarch64
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-macos-aarch64
             desktop_asset_name: simplex-desktop-macos-aarch64.dmg
+            openssl_dir: "/opt/homebrew/opt"
           - os: macos-13
-            ghc: "9.6.3"
-            cache_path: ~/.cabal/store
-            asset_name: simplex-chat-macos-x86-64
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_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
-
+            openssl_dir: "/usr/local/opt"
     steps:
-      - name: Skip unreliable ghc 8.10.7 build on stable branch
-        if: matrix.ghc == '8.10.7' && github.ref == 'refs/heads/stable'
-        run: exit 0
-
-      - name: Configure pagefile (Windows)
-        if: matrix.os == 'windows-latest'
-        uses: al-cheb/configure-pagefile-action@v1.3
-        with:
-          minimum-size: 16GB
-          maximum-size: 16GB
-          disk-root: "C:"
-
-      - name: Clone project
+      - name: Checkout Code
         uses: actions/checkout@v3
 
-      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+      - name: Prepare build
+        uses: ./.github/actions/prepare-build
         with:
-          ghc-version: ${{ matrix.ghc }}
-          cabal-version: "3.10.1.0"
+          java_ver: ${{ needs.variables.outputs.JAVA_VER }}
+          ghc_ver: ${{ matrix.ghc }}
+          os: ${{ matrix.os }}
+          github_ref: ${{ github.ref }}
 
-      - name: Restore cached build
-        id: restore_cache
-        uses: actions/cache/restore@v3
-        with:
-          path: |
-            ${{ matrix.cache_path }}
-            dist-newstyle
-          key: ${{ matrix.os }}-ghc${{ matrix.ghc }}-${{ hashFiles('cabal.project', 'simplex-chat.cabal') }}
-
-      # / Unix
-
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-latest'
-        shell: bash
-        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib"         >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib"         >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
-
-      - name: Unix prepare cabal.project.local for Mac
-        if: matrix.os == 'macos-13'
-        shell: bash
-        run: |
-          echo "ignore-project: False"                                         >> cabal.project.local
-          echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@3.0/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@3.0/lib"            >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@3.0/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@3.0/lib"            >> cabal.project.local
-          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'
-        run: sudo apt install -y desktop-file-utils
-
-      - name: Install openssl for Mac
-        if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
+      - name: Install OpenSSL
         run: brew install openssl@3.0
 
-      - name: Unix prepare cabal.project.local for Ubuntu
-        if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
+      - name: Prepare cabal.project.local
         shell: bash
         run: |
           echo "ignore-project: False"                                                    >> cabal.project.local
+          echo "package simplexmq"                                                        >> cabal.project.local
+          echo "    extra-include-dirs: ${{ matrix.opnessl_dir }}/openssl@3.0/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: ${{ matrix.openssl_dir}}/openssl@3.0/lib"             >> cabal.project.local
+          echo ""                                                                         >> cabal.project.local
           echo "package direct-sqlcipher"                                                 >> cabal.project.local
+          echo "    extra-include-dirs: ${{ matrix.openssl_dir }}/openssl@3.0/include"    >> cabal.project.local
+          echo "    extra-lib-dirs: ${{ matrix.openssl_dir }}/openssl@3.0/lib"            >> cabal.project.local
           echo "    flags: +openssl"                                                      >> cabal.project.local
 
-      - name: Unix build CLI
-        id: unix_cli_build
-        if: matrix.os != 'windows-latest'
+      - name: Build CLI
+        id: mac_cli_build
         shell: bash
         run: |
-          cabal build --enable-tests
+          cabal build -j --enable-tests
           path=$(cabal list-bin simplex-chat)
           echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-256\(${{ matrix.cli_asset_name }}\)= $(openssl sha256 $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'
-        uses: svenstaro/upload-release-action@v2
+      - name: Upload CLI
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.unix_cli_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
+          bin_path: ${{ steps.mac_cli_build.outputs.bin_path }}
+          bin_name: ${{ matrix.cli_asset_name }}
+          bin_hash: ${{ steps.mac_cli_build.outputs.bin_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Unix update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.unix_cli_build.outputs.bin_hash }}
-
-      - name: Setup Java
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '17'
-          cache: 'gradle'
-
-      - name: Linux build desktop
-        id: linux_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        shell: bash
-        run: |
-          scripts/desktop/build-lib-linux.sh
-          cd apps/multiplatform
-          ./gradlew packageDeb
-          path=$(echo $PWD/release/main/deb/simplex_*_amd64.deb)
-          echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Linux make AppImage
-        id: linux_appimage_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        shell: bash
-        run: |
-          scripts/desktop/make-appimage-linux.sh
-          path=$(echo $PWD/apps/multiplatform/release/main/*imple*.AppImage)
-          echo "appimage_path=$path" >> $GITHUB_OUTPUT
-          echo "appimage_hash=$(echo SHA2-512\(simplex-desktop-x86_64.AppImage\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
-
-      - name: Mac build desktop
+      - name: Build Desktop
         id: mac_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
+        if: startsWith(github.ref, 'refs/tags/v')
         shell: bash
         env:
           APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
@@ -238,88 +392,77 @@ jobs:
           scripts/ci/build-desktop-mac.sh
           path=$(echo $PWD/apps/multiplatform/release/main/dmg/SimpleX-*.dmg)
           echo "package_path=$path" >> $GITHUB_OUTPUT
-          echo "package_hash=$(echo SHA2-512\(${{ matrix.desktop_asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $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')
-        uses: svenstaro/upload-release-action@v2
+      - name: Upload Desktop
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
+          bin_path: ${{ steps.mac_desktop_build.outputs.package_path }}
+          bin_name: ${{ matrix.desktop_asset_name }}
+          bin_hash: ${{ steps.mac_desktop_build.outputs.package_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - 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')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.linux_desktop_build.outputs.package_hash }}
-
-      - name: Linux upload AppImage to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
-          asset_name: simplex-desktop-x86_64.AppImage
-          tag: ${{ github.ref }}
-
-      - name: Linux update AppImage hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.linux_appimage_build.outputs.appimage_hash }}
-
-      - name: Mac upload desktop package to release
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.mac_desktop_build.outputs.package_path }}
-          asset_name: ${{ matrix.desktop_asset_name }}
-          tag: ${{ github.ref }}
-
-      - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.mac_desktop_build.outputs.package_hash }}
-
-      - name: 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: 40
+      - name: Run tests
+        timeout-minutes: 120
         shell: bash
-        run: cabal test --test-show-details=direct
+        run: |
+          i=1
+          attempts=1
+          ${{ (github.ref == 'refs/heads/stable' || startsWith(github.ref, 'refs/tags/v')) }} && attempts=3
+          while [ "$i" -le "$attempts" ]; do
+            if cabal test --test-show-details=direct; then
+              break
+            else
+              echo "Attempt $i failed, retrying..."
+              i=$((i + 1))
+              sleep 1
+            fi
+          done
+          if [ "$i" -gt "$attempts" ]; then
+            echo "All "$attempts" attempts failed."
+            exit 1
+          fi
 
-      # Unix /
+# =========================
+#      Windows Build
+# =========================
 
-      # / Windows
-      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+  build-windows:
+    name: "${{ matrix.os }} (CLI,Desktop), GHC: ${{ matrix.ghc }}"
+    needs: [maybe-release, variables]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: windows-latest
+            ghc: ${{ needs.variables.outputs.GHC_VER }}
+            cli_asset_name: simplex-chat-windows-x86-64
+            desktop_asset_name: simplex-desktop-windows-x86_64.msi
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Prepare build
+        uses: ./.github/actions/prepare-build
+        with:
+          java_ver: ${{ needs.variables.outputs.JAVA_VER }}
+          ghc_ver: ${{ matrix.ghc }}
+          os: ${{ matrix.os }}
+          cache_path: "C:/cabal"
+          github_ref: ${{ github.ref }}
+
+      - name: Configure pagefile (Windows)
+        uses: simplex-chat/configure-pagefile-action@v1.4
+        with:
+          minimum-size: 16GB
+          maximum-size: 16GB
+          disk-root: "C:"
   
       - name: 'Setup MSYS2'
-        if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
+        uses: simplex-chat/setup-msys2@v2
         with:
           msystem: ucrt64
           update: true
@@ -331,10 +474,9 @@ jobs:
             toolchain:p
             cmake:p
 
-
-      - name: Windows build
-        id: windows_build
-        if: matrix.os == 'windows-latest'
+      # rm -rf dist-newstyle/src/direct-sq* is here because of the bug in cabal's dependency which prevents second build from finishing
+      - name: Build CLI
+        id: windows_cli_build
         shell: msys2 {0}
         run: |
           export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
@@ -349,70 +491,42 @@ jobs:
 
           rm -rf dist-newstyle/src/direct-sq*
           sed -i "s/, unix /--, unix /" simplex-chat.cabal
-          cabal build --enable-tests
+          cabal build -j --enable-tests
           rm -rf dist-newstyle/src/direct-sq*
           path=$(cabal list-bin simplex-chat | tail -n 1)
           echo "bin_path=$path" >> $GITHUB_OUTPUT
-          echo "bin_hash=$(echo SHA2-512\(${{ matrix.asset_name }}\)= $(openssl sha512 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
+          echo "bin_hash=$(echo SHA2-256\(${{ matrix.cli_asset_name }}\)= $(openssl sha256 $path | cut -d' ' -f 2))" >> $GITHUB_OUTPUT
 
-      - name: Windows upload CLI binary to release
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
+      - name: Upload CLI
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.windows_build.outputs.bin_path }}
-          asset_name: ${{ matrix.asset_name }}
-          tag: ${{ github.ref }}
+          bin_path: ${{ steps.windows_cli_build.outputs.bin_path }}
+          bin_name: ${{ matrix.cli_asset_name }}
+          bin_hash: ${{ steps.windows_cli_build.outputs.bin_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Windows update CLI binary hash
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          append_body: true
-          body: |
-            ${{ steps.windows_build.outputs.bin_hash }}
-
-      - name: Windows build desktop
+      - name: Build Desktop
         id: windows_desktop_build
-        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
+        if: startsWith(github.ref, 'refs/tags/v')
         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
+          rm -rf dist-newstyle/src/direct-sq*
           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
+          echo "package_hash=$(echo SHA2-256\(${{ matrix.desktop_asset_name }}\)= $(openssl sha256 $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
+      - name: Upload Desktop
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: ./.github/actions/prepare-release
         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 /
+          bin_path: ${{ steps.windows_desktop_build.outputs.package_path }}
+          bin_name: ${{ matrix.desktop_asset_name }}
+          bin_hash: ${{ steps.windows_desktop_build.outputs.package_hash }}
+          github_ref: ${{ github.ref }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/reproduce-schedule.yml

@@ -0,0 +1,45 @@
+name: Reproduce latest release
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 2 * * *' # every day at 02:00 night
+
+jobs:
+  reproduce:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Get latest release
+        shell: bash
+        run: |
+          curl --proto '=https' \
+               --tlsv1.2 \
+               -sSf -L \
+               'https://api.github.com/repos/simplex-chat/simplex-chat/releases/latest' \
+               2>/dev/null | \
+          grep -i "tag_name" | \
+          awk -F \" '{print "TAG="$4}' >> $GITHUB_ENV
+
+      - name: Execute reproduce script
+        run: |
+          ${GITHUB_WORKSPACE}/scripts/reproduce-builds.sh "$TAG"
+
+      - name: Check if build has been reproduced
+        env:
+          url: ${{ secrets.STATUS_SIMPLEX_WEBHOOK_URL }}
+          user: ${{ secrets.STATUS_SIMPLEX_WEBHOOK_USER }}
+          pass: ${{ secrets.STATUS_SIMPLEX_WEBHOOK_PASS }}
+        run: |
+          if [ -f "${GITHUB_WORKSPACE}/$TAG/_sha256sums" ]; then
+            exit 0
+          else
+            curl --proto '=https' --tlsv1.2 -sSf \
+              -u "${user}:${pass}" \
+              -H 'Content-Type: application/json' \
+              -d '{"title": "👾 GitHub: Runner", "description": "⛔️ '"$TAG"' did not reproduce."}' \
+              "$url"
+            exit 1
+          fi

.github/workflows/web.yml

@@ -33,7 +33,7 @@ jobs:
           ./website/web.sh
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: simplex-chat/actions-gh-pages@v3
         with:
           publish_dir: ./website/_site
           github_token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -29,7 +29,7 @@ RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
 
 # Compile simplex-chat
 RUN cabal update
-RUN cabal build exe:simplex-chat --constraint 'simplexmq +client_library'
+RUN cabal build exe:simplex-chat --constraint 'simplexmq +client_library' --constraint 'simplex-chat +client_library'
 
 # Strip the binary from debug symbols to reduce size
 RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \

Dockerfile.build

@@ -0,0 +1,92 @@
+# syntax=docker/dockerfile:1.7.0-labs
+ARG TAG=24.04
+FROM ubuntu:${TAG} AS build
+
+### Build stage
+
+ARG GHC=9.6.3
+ARG CABAL=3.10.1.0
+ARG JAVA=17
+
+ENV TZ=Etc/UTC \
+    DEBIAN_FRONTEND=noninteractive
+
+# Install curl, git and and simplex-chat dependencies
+RUN apt-get update && \
+    apt-get install -y curl \
+                       libpq-dev \
+                       git \
+                       sqlite3 \
+                       libsqlite3-dev \
+                       build-essential \
+                       libgmp3-dev \
+                       zlib1g-dev \
+                       llvm \
+                       cmake \
+                       llvm-dev \
+                       libnuma-dev \
+                       libssl-dev \
+                       desktop-file-utils \
+                       patchelf \
+                       ca-certificates \
+                       zip \
+                       wget \
+                       fuse3 \
+                       file \
+                       appstream \
+                       gpg \
+                       unzip &&\
+    ln -s /bin/fusermount /bin/fusermount3 || :
+
+# Install Java Coretto
+# Required, because official Java in Ubuntu
+# depends on libjpeg.so.8 and liblcms2.so.2 which are NOT copied into final
+# /usr/lib/runtime/lib directory and I do not have time to figure out gradle.kotlin
+# to fix this :(
+RUN curl --proto '=https' --tlsv1.2 -sSf 'https://apt.corretto.aws/corretto.key' | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg &&\
+    echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" > /etc/apt/sources.list.d/corretto.list &&\
+    apt update &&\
+    apt install -y java-${JAVA}-amazon-corretto-jdk
+
+# Specify bootstrap Haskell versions
+ENV BOOTSTRAP_HASKELL_GHC_VERSION=${GHC}
+ENV BOOTSTRAP_HASKELL_CABAL_VERSION=${CABAL}
+
+# Do not install Stack
+ENV BOOTSTRAP_HASKELL_INSTALL_NO_STACK=true
+ENV BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=true
+
+# Install ghcup
+RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
+
+# Adjust PATH
+ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+
+# Set both as default
+RUN ghcup set ghc "${GHC}" && \
+    ghcup set cabal "${CABAL}"
+
+#=====================
+# Install Android SDK
+#=====================
+ARG SDK_VERSION=13114758
+
+ENV SDK_VERSION=$SDK_VERSION \
+    ANDROID_HOME=/root
+
+RUN curl -L -o tools.zip "https://dl.google.com/android/repository/commandlinetools-linux-${SDK_VERSION}_latest.zip" && \
+    unzip tools.zip && rm tools.zip && \
+    mv cmdline-tools tools && mkdir "$ANDROID_HOME/cmdline-tools" && mv tools "$ANDROID_HOME/cmdline-tools/" && \
+    ln -s "$ANDROID_HOME/cmdline-tools/tools" "$ANDROID_HOME/cmdline-tools/latest"
+
+ENV PATH="$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/cmdline-tools/tools/bin"
+
+# https://askubuntu.com/questions/885658/android-sdk-repositories-cfg-could-not-be-loaded
+RUN mkdir -p ~/.android ~/.gradle && \
+    touch ~/.android/repositories.cfg && \
+    echo 'org.gradle.console=plain' > ~/.gradle/gradle.properties &&\
+    yes | sdkmanager --licenses >/dev/null
+
+ENV PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools
+
+WORKDIR /project

PRIVACY.md

@@ -123,6 +123,16 @@ This section applies only to the experimental group directory operated by Simple
 
 [SimpleX Directory](/docs/DIRECTORY.md) stores: your search requests, the messages and the members profiles in the registered groups. You can connect to SimpleX Directory via [this address](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion).
 
+#### Public groups and content channels
+
+You may participate in a public group and receive content from a public channel (Group). In case you send messages or comments to the Group, you grant a license:
+- to all recipients:
+  - to share your messages with the new Group members and outside of the group, e.g. via quoting (replying), forwarding and copy-pasting your message. When your message is deleted or marked as deleted, the copies of your message will not be deleted.
+  - to retain a copy of your messages according to the Group settings (e.g., the Group may allow irreversible message deletion from the recipient devices for a limited period of time, or it may only allow to edit and mark messages as deleted on recipient devices). Deleting message from the recipient devices or marking message as deleted revokes the license to share the message.
+- to Group owners: to share your messages with the new Group members as history of the Group. Currently, the Group history shared with the new members is limited to 100 messages.
+
+Group owners may use chat relays or automated bots (Chat Relays) to re-broadcast member messages to all members, for efficiency. The Chat Relays may be operated by the group owners, by preset operators or by 3rd parties. The Chat Relays have access to and will retain messages in line with Group settings, for technical functioning of the Group. Neither you nor group owners grant any content license to Chat Relay operators.
+
 #### User Support
 
 The app includes support contact operated by SimpleX Chat Ltd. If you contact support, any personal data you share is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion) when it is possible, and avoid sharing any personal information.
@@ -131,9 +141,9 @@ The app includes support contact operated by SimpleX Chat Ltd. If you contact su
 
 Preset server operators will not share the information on their servers with each other, other than aggregate usage statistics. 
 
-Preset server operators will not provide general access to their servers or the data on their servers to each other.
+Preset server operators must not provide general access to their servers or the data on their servers to each other.
 
-Preset server operators will provide non-administrative access to control port of preset servers to SimpleX Chat Ltd, for the purposes of removing identified illegal content. This control port access only allows deleting known links and files, and access to aggregate statistics, but does NOT allow enumerating any information on the servers.
+Preset server operators will provide non-administrative access to control port of preset servers to SimpleX Chat Ltd, for the purposes of removing illegal content identified in publicly accessible resources (contact and group addresses, and downloadable files). This control port access only allows deleting known links and files, and accessing aggregate server-wide statistics, but does NOT allow enumerating any information on the servers or accessing statistics related to specific users.
 
 ### Information Preset Server Operators May Share
 
@@ -148,7 +158,7 @@ The cases when the preset server operators may share the data temporarily stored
 - To detect, prevent, or otherwise address fraud, security, or technical issues.
 - To protect against harm to the rights, property, or safety of software users, operators of preset servers, or the public as required or permitted by law.
 
-At the time of updating this document, the preset server operators have never provided or have been requested the access to the preset relay servers or any information from the servers by any third parties. If the preset server operators are ever requested to provide such access or information, they will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
+By the time of updating this document, the preset server operators were not served with any enforceable requests and did not provide any information from the servers to any third parties. If the preset server operators are ever requested to provide such access or information, they will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
 
 Preset server operators will publish information they are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
 
@@ -190,7 +200,18 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b
 
 **Legal usage**. You agree to use SimpleX Chat Applications only for legal purposes. You will not use (or assist others in using) the Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, other preset server operators, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While server operators cannot access content or identify messages or groups, in some cases the links to the illegal communications can be shared publicly on social media or websites. Preset server operators reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via their servers, whether they were reported by the users or discovered by the operators themselves.
 
-**Damage to SimpleX Chat Ltd and Preset Server Operators**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit SimpleX Chat Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, other preset server operators, their Infrastructure, or any other systems. For example, you must not 1) access preset operators' Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of preset operators' Infrastructure; 3) collect information about the users in any manner; or 4) sell, rent, or charge for preset operators' Infrastructure. This does not prohibit you from providing your own Infrastructure to others, whether free or for a fee, as long as you do not violate these Conditions and AGPLv3 license, including the requirement to publish any modifications of the relay server software.
+**Damage to SimpleX Chat Ltd and Preset Server Operators**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit SimpleX Chat Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, other preset server operators, their Infrastructure, or any other systems. For example, you must not 1) access preset operators' Infrastructure or systems without authorization, in any way other than by using the Software or by using a 3rd party client applications that satisfies the requirements of the Conditions of use (see the next section); 2) disrupt the integrity or performance of preset operators' Infrastructure; 3) collect information about the users in any manner; or 4) sell, rent, or charge for preset operators' Infrastructure. This does not prohibit you from providing your own Infrastructure to others, whether free or for a fee, as long as you do not violate these Conditions and AGPLv3 license, including the requirement to publish any modifications of the relay server software.
+
+**3rd party client applications**. You may use a 3rd party application (App) to access preset operators' Infrastructure or systems, provided that this App:
+- is compatible with the protocol specifications not older than 1 year,
+- provides user-to-user messaging only or enables automated chat bots sending messages requested by users (in case of bots, it must be made clear to the users that these are automated bots),
+- implements the same limits, rules and restrictions as Software,
+- requires that the users accept the same Conditions of use of preset operators' Infrastructure as in Software prior to providing access to this Infrastructure,
+- displays the notice that it is the App for using SimpleX network,
+- provides its source code under open-source license accessible to the users via the App interface. In case the App uses the source code of Software, the App's source code must be provided under AGPLv3 license, and in case it is developed without using Software code its source code must be provided under any widely recognized free open-source license,
+- does NOT use the branding of SimpleX Chat Ltd without the permission,
+- does NOT pretend to be Software,
+- complies with these Conditions of use.
 
 **Keeping your data secure**. SimpleX Chat is the first communication software that aims to be 100% private by design - server software neither has the ability to access your messages, nor it has information about who you communicate with. That means that you are solely responsible for keeping your device, your user profile and any data safe and secure. If you lose your phone or remove the Software from the device, you will not be able to recover the lost data, unless you made a back up. To protect the data you need to make regular backups, as using old backups may disrupt your communication with some of the contacts. SimpleX Chat Ltd and other preset server operators are not responsible for any data loss.
 
@@ -222,4 +243,4 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b
 
 **Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd and preset server operators at any time by deleting the Applications from your devices and discontinuing use of the Infrastructure of SimpleX Chat Ltd and preset server operators. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the conditions, Enforcing the conditions, and Ending these conditions will survive termination of your relationship with SimpleX Chat Ltd and/or preset server operators.
 
-Updated November 14, 2024
+Updated March 3, 2025

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=2-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 users group](https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FiBkJE72asZX1NUZaYFIeKRVk6oVjb-iv%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAinqu3j74AMjODLoIRR487ZW6ysip_dlpD6Zxk18SPFY%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22groupLinkId%22%3A%223wAFGCLygQHR5AwynZOHlQ%3D%3D%22%7D)
 
 There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FvYCRjIflKNMGYlfTkuHe4B40qSlQ0439%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAHNdcqNbzXZhyMoSBjT2R0-Eb1EPaLyUg3KZjn-kmM1w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22PD20tcXjw7IpkkMCfR6HLA%3D%3D%22%7D) for developers who build on SimpleX platform:
 
@@ -169,6 +169,7 @@ It is possible to donate via:
 - ETH: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
 - USDT (Ethereum): 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
 - ZEC: t1fwjQW5gpFhDqXNhxqDWyF9j9WeKvVS5Jg
+- ZEC shielded: u16rnvkflumf5uw9frngc2lymvmzgdr2mmc9unyu0l44unwfmdcpfm0axujd2w34ct3ye709azxsqge45705lpvvqu264ltzvfay55ygyq
 - DOGE: D99pV4n9TrPxBPCkQGx4w4SMSa6QjRBxPf
 - SOL: 7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu
 - please ask if you want to donate any other coins.
@@ -234,6 +235,10 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
+[Mar 8, 2025. SimpleX Chat v6.3: new user experience and safety in public groups](./blog/20250308-simplex-chat-v6-3-new-user-experience-safety-in-public-groups.md)
+
+[Jan 14, 2025. SimpleX network: large groups and privacy-preserving content moderation](./blog/20250114-simplex-network-large-groups-privacy-preserving-content-moderation.md)
+
 [Dec 10, 2024. SimpleX network: preset servers operated by Flux, business chats and more with v6.2 of the apps](./20241210-simplex-network-v6-2-servers-by-flux-business-chats.md)
 
 [Oct 14, 2024. SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience.](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
@@ -305,12 +310,13 @@ What is already implemented:
 15. Manual messaging queue rotations to move conversation to another SMP relay.
 16. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
 17. Local files encryption.
+18. [Reproducible server builds](./docs/SERVER.md#reproduce-builds).
 
 We plan to add:
 
 1. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
 2. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-3. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+3. Reproducible clients builds – this is a complex problem, but we are aiming to have it in 2025 at least partially.
 4. Recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
 
 ## For developers

apps/ios/Shared/AppDelegate.swift

@@ -54,7 +54,7 @@ class AppDelegate: NSObject, UIApplicationDelegate {
                             try await apiVerifyToken(token: token, nonce: nonce, code: verification)
                             m.tokenStatus = .active
                         } catch {
-                            if let cr = error as? ChatResponse, case .chatCmdError(_, .errorAgent(.NTF(.AUTH))) = cr {
+                            if let cr = error as? ChatError, case .errorAgent(.NTF(.AUTH)) = cr {
                                 m.tokenStatus = .expired
                             }
                             logger.error("AppDelegate: didReceiveRemoteNotification: apiVerifyToken or apiIntervalNofication error: \(responseError(error))")

apps/ios/Shared/Assets.xcassets/vertical_logo.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "vertical_logo_x1.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "vertical_logo_x2.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "vertical_logo_x3.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

apps/ios/Shared/ContentView.swift

@@ -11,12 +11,10 @@ import SimpleXChat
 
 private enum NoticesSheet: Identifiable {
     case whatsNew(updatedConditions: Bool)
-    case updatedConditions
 
     var id: String {
         switch self {
         case .whatsNew: return "whatsNew"
-        case .updatedConditions: return "updatedConditions"
         }
     }
 }
@@ -76,7 +74,7 @@ struct ContentView: View {
         }
     }
 
-    @ViewBuilder func allViews() -> some View {
+    func allViews() -> some View {
         ZStack {
             let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
             // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
@@ -211,7 +209,7 @@ struct ContentView: View {
         }
     }
 
-    @ViewBuilder private func activeCallInteractiveArea(_ call: Call) -> some View {
+    private func activeCallInteractiveArea(_ call: Call) -> some View {
         HStack {
             Text(call.contact.displayName).font(.body).foregroundColor(.white)
             Spacer()
@@ -278,18 +276,18 @@ struct ContentView: View {
                             let showWhatsNew = shouldShowWhatsNew()
                             let showUpdatedConditions = chatModel.conditions.conditionsAction?.showNotice ?? false
                             noticesShown = showWhatsNew || showUpdatedConditions
-                            if showWhatsNew {
+                            if showWhatsNew || showUpdatedConditions {
                                 noticesSheetItem = .whatsNew(updatedConditions: showUpdatedConditions)
-                            } else if showUpdatedConditions {
-                                noticesSheetItem = .updatedConditions
                             }
                         }
                     }
                 }
                 prefShowLANotice = true
                 connectViaUrl()
+                showReRegisterTokenAlert()
             }
             .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
+            .onChange(of: chatModel.reRegisterTknStatus) { _ in showReRegisterTokenAlert() }
             .sheet(item: $noticesSheetItem) { item in
                 switch item {
                 case let .whatsNew(updatedConditions):
@@ -298,13 +296,6 @@ struct ContentView: View {
                         .if(updatedConditions) { v in
                             v.task { await setConditionsNotified_() }
                         }
-                case .updatedConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
-                    .modifier(ThemedBackground(grouped: true))
-                    .task { await setConditionsNotified_() }
                 }
             }
             if chatModel.setDeliveryReceipts {
@@ -315,6 +306,12 @@ struct ContentView: View {
         .onContinueUserActivity("INStartCallIntent", perform: processUserActivity)
         .onContinueUserActivity("INStartAudioCallIntent", perform: processUserActivity)
         .onContinueUserActivity("INStartVideoCallIntent", perform: processUserActivity)
+        .onContinueUserActivity(NSUserActivityTypeBrowsingWeb) { userActivity in
+            if let url = userActivity.webpageURL {
+                logger.debug("onContinueUserActivity.NSUserActivityTypeBrowsingWeb: \(url)")
+                chatModel.appOpenUrl = url
+            }
+        }
     }
 
     private func setConditionsNotified_() async {
@@ -446,12 +443,12 @@ struct ContentView: View {
     }
 
     func connectViaUrl() {
-        dismissAllSheets() {
         let m = ChatModel.shared
         if let url = m.appOpenUrl {
             m.appOpenUrl = nil
+            dismissAllSheets() {
                 var path = url.path
-                if (path == "/contact" || path == "/invitation") {
+                if (path == "/contact" || path == "/invitation" || path == "/a" || path == "/c" || path == "/g" || path == "/i") {
                     path.removeFirst()
                     let link = url.absoluteString.replacingOccurrences(of: "///\(path)", with: "/\(path)")
                     planAndConnect(
@@ -468,6 +465,21 @@ struct ContentView: View {
         }
     }
 
+    func showReRegisterTokenAlert() {
+        dismissAllSheets() {
+            let m = ChatModel.shared
+            if let errorTknStatus = m.reRegisterTknStatus, let token = chatModel.deviceToken {
+                chatModel.reRegisterTknStatus = nil
+                AlertManager.shared.showAlert(Alert(
+                    title: Text("Notifications error"),
+                    message: Text(tokenStatusInfo(errorTknStatus, register: true)),
+                    primaryButton: .default(Text("Register")) { reRegisterToken(token: token) },
+                    secondaryButton: .cancel()
+                ))
+            }
+        }
+    }
+
     private func showPlanAndConnectAlert(_ alert: PlanAndConnectAlert) {
         AlertManager.shared.showAlert(planAndConnectAlert(alert, dismiss: false))
     }

apps/ios/Shared/Model/ChatModel.swift

@@ -30,9 +30,18 @@ actor TerminalItems {
         }
     }
 
-    func addCommand(_ start: Date, _ cmd: ChatCommand, _ resp: ChatResponse) async {
+    func addCommand<R: ChatAPIResult>(_ start: Date, _ cmd: ChatCommand, _ res: APIResult<R>) async {
         await add(.cmd(start, cmd))
-        await add(.resp(.now, resp))
+        await addResult(res)
+    }
+    
+    func addResult<R: ChatAPIResult>(_ res: APIResult<R>) async {
+        let item: TerminalItem = switch res {
+        case let .result(r): .res(.now, r)
+        case let .error(e): .err(.now, e)
+        case let .invalid(type, json): .bad(.now, type, json)
+        }
+        await add(item)
     }
 }
 
@@ -43,8 +52,26 @@ private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
     items.append(item)
 }
 
+// analogue for SecondaryContextFilter in Kotlin
+enum SecondaryItemsModelFilter {
+    case groupChatScopeContext(groupScopeInfo: GroupChatScopeInfo)
+    case msgContentTagContext(contentTag: MsgContentTag)
+
+    func descr() -> String {
+        switch self {
+        case let .groupChatScopeContext(groupScopeInfo):
+            return "groupChatScopeContext \(groupScopeInfo.toChatScope())"
+        case let .msgContentTagContext(contentTag):
+            return "msgContentTagContext \(contentTag.rawValue)"
+        }
+    }
+}
+
+// analogue for ChatsContext in Kotlin
 class ItemsModel: ObservableObject {
-    static let shared = ItemsModel()
+    static let shared = ItemsModel(secondaryIMFilter: nil)
+    public var secondaryIMFilter: SecondaryItemsModelFilter?
+    public var preloadState = PreloadState()
     private let publisher = ObservableObjectPublisher()
     private var bag = Set<AnyCancellable>()
     var reversedChatItems: [ChatItem] = [] {
@@ -54,45 +81,68 @@ class ItemsModel: ObservableObject {
         willSet { publisher.send() }
     }
 
+    let chatState = ActiveChatState()
+
     // Publishes directly to `objectWillChange` publisher,
     // this will cause reversedChatItems to be rendered without throttling
     @Published var isLoading = false
-    @Published var showLoadingProgress = false
+    @Published var showLoadingProgress: ChatId? = nil
 
-    init() {
+    private var navigationTimeoutTask: Task<Void, Never>? = nil
+    private var loadChatTask: Task<Void, Never>? = nil
+
+    var lastItemsLoaded: Bool {
+        chatState.splits.isEmpty || chatState.splits.first != reversedChatItems.first?.id
+    }
+
+    init(secondaryIMFilter: SecondaryItemsModelFilter? = nil) {
+        self.secondaryIMFilter = secondaryIMFilter
         publisher
             .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
             .sink { self.objectWillChange.send() }
             .store(in: &bag)
     }
 
+    static func loadSecondaryChat(_ chatId: ChatId, chatFilter: SecondaryItemsModelFilter, willNavigate: @escaping () -> Void = {}) {
+        let im = ItemsModel(secondaryIMFilter: chatFilter)
+        ChatModel.shared.secondaryIM = im
+        im.loadOpenChat(chatId, willNavigate: willNavigate)
+    }
+
     func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
-        let navigationTimeout = Task {
+        navigationTimeoutTask?.cancel()
+        loadChatTask?.cancel()
+        navigationTimeoutTask = Task {
             do {
                 try await Task.sleep(nanoseconds: 250_000000)
                 await MainActor.run {
-                    willNavigate()
                     ChatModel.shared.chatId = chatId
+                    willNavigate()
                 }
             } catch {}
         }
-        let progressTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 1500_000000)
-                await MainActor.run { showLoadingProgress = true }
-            } catch {}
-        }
-        Task {
-            if let chat = ChatModel.shared.getChat(chatId) {
+        loadChatTask = Task {
             await MainActor.run { self.isLoading = true }
-//                try? await Task.sleep(nanoseconds: 5000_000000)
-                await loadChat(chat: chat)
-                navigationTimeout.cancel()
-                progressTimeout.cancel()
+//            try? await Task.sleep(nanoseconds: 1000_000000)
+            await loadChat(chatId: chatId, im: self)
+            if !Task.isCancelled {
                 await MainActor.run {
                     self.isLoading = false
-                    self.showLoadingProgress = false
-                    willNavigate()
+                    self.showLoadingProgress = nil
+                }
+            }
+        }
+    }
+
+    func loadOpenChatNoWait(_ chatId: ChatId, _ openAroundItemId: ChatItem.ID? = nil) {
+        navigationTimeoutTask?.cancel()
+        loadChatTask?.cancel()
+        loadChatTask = Task {
+            //            try? await Task.sleep(nanoseconds: 1000_000000)
+            await loadChat(chatId: chatId, im: self, openAroundItemId: openAroundItemId, clearItems: openAroundItemId == nil)
+            if !Task.isCancelled {
+                await MainActor.run {
+                    if openAroundItemId == nil {
                         ChatModel.shared.chatId = chatId
                     }
                 }
@@ -100,6 +150,35 @@ class ItemsModel: ObservableObject {
         }
     }
 
+    public var contentTag: MsgContentTag? {
+        switch secondaryIMFilter {
+        case nil: nil
+        case .groupChatScopeContext: nil
+        case let .msgContentTagContext(contentTag): contentTag
+        }
+    }
+
+    public var groupScopeInfo: GroupChatScopeInfo? {
+        switch secondaryIMFilter {
+        case nil: nil
+        case let .groupChatScopeContext(scopeInfo): scopeInfo
+        case .msgContentTagContext: nil
+        }
+    }
+}
+
+class PreloadState {
+    var prevFirstVisible: Int64 = Int64.min
+    var prevItemsCount: Int = 0
+    var preloading: Bool = false
+
+    func clear() {
+        prevFirstVisible = Int64.min
+        prevItemsCount = 0
+        preloading = false
+    }
+}
+
 class ChatTagsModel: ObservableObject {
     static let shared = ChatTagsModel()
     
@@ -124,11 +203,9 @@ class ChatTagsModel: ObservableObject {
                 }
             }
         }
-        if case let .presetTag(tag) = tm.activeFilter, (newPresetTags[tag] ?? 0) == 0 {
-            activeFilter = nil
-        }
         presetTags = newPresetTags
         unreadTags = newUnreadTags
+        clearActiveChatFilterIfNeeded()
     }
 
     func updateChatFavorite(favorite: Bool, wasFavorite: Bool) {
@@ -137,9 +214,7 @@ class ChatTagsModel: ObservableObject {
             presetTags[.favorites] = (count ?? 0) + 1
         } else if !favorite && wasFavorite, let count {
             presetTags[.favorites] = max(0, count - 1)
-            if case .presetTag(.favorites) = activeFilter, (presetTags[.favorites] ?? 0) == 0 {
-                activeFilter = nil
-            }
+            clearActiveChatFilterIfNeeded()
         }
     }
 
@@ -163,6 +238,7 @@ class ChatTagsModel: ObservableObject {
                 }
             }
         }
+        clearActiveChatFilterIfNeeded()
     }
     
     func markChatTagRead(_ chat: Chat) -> Void {
@@ -193,7 +269,17 @@ class ChatTagsModel: ObservableObject {
 
     func changeGroupReportsTag(_ by: Int = 0) {
         if by == 0 { return }
-        presetTags[.groupReports] = (presetTags[.groupReports] ?? 0) + by
+        presetTags[.groupReports] = max(0, (presetTags[.groupReports] ?? 0) + by)
+        clearActiveChatFilterIfNeeded()
+    }
+
+    func clearActiveChatFilterIfNeeded() {
+        let clear = switch activeFilter {
+        case let .presetTag(tag): (presetTags[tag] ?? 0) == 0
+        case let .userTag(tag): !userTags.contains(tag)
+        case .unread, nil: false
+        }
+        if clear { activeFilter = nil }
     }
 }
 
@@ -253,7 +339,7 @@ final class ChatModel: ObservableObject {
     @Published var deletedChats: Set<String> = []
     // current chat
     @Published var chatId: String?
-    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
+    @Published var openAroundItemId: ChatItem.ID? = nil
     @Published var chatToTop: String?
     @Published var groupMembers: [GMember] = []
     @Published var groupMembersIndexes: Dictionary<Int64, Int> = [:] // groupMemberId to index in groupMembers list
@@ -267,6 +353,7 @@ final class ChatModel: ObservableObject {
     @Published var deviceToken: DeviceToken?
     @Published var savedToken: DeviceToken?
     @Published var tokenRegistered = false
+    @Published var reRegisterTknStatus: NtfTknStatus? = nil
     @Published var tokenStatus: NtfTknStatus?
     @Published var notificationMode = NotificationsMode.off
     @Published var notificationServer: String?
@@ -301,6 +388,10 @@ final class ChatModel: ObservableObject {
 
     let im = ItemsModel.shared
 
+    // ItemsModel for secondary chat view (such as support scope chat), as opposed to ItemsModel.shared used for primary chat
+    @Published var secondaryIM: ItemsModel? = nil
+    @Published var secondaryPendingInviteeChatOpened = false
+
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
     let ntfEnableLocal = true
@@ -358,7 +449,7 @@ final class ChatModel: ObservableObject {
 
     func getGroupChat(_ groupId: Int64) -> Chat? {
         chats.first { chat in
-            if case let .group(groupInfo) = chat.chatInfo {
+            if case let .group(groupInfo, _) = chat.chatInfo {
                 return groupInfo.groupId == groupId
             } else {
                 return false
@@ -411,7 +502,11 @@ final class ChatModel: ObservableObject {
 
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
+            if case let .group(groupInfo, groupChatScope) = cInfo, groupChatScope != nil {
+                chats[i].chatInfo = .group(groupInfo: groupInfo, groupChatScope: nil)
+            } else {
                 chats[i].chatInfo = cInfo
+            }
             chats[i].created = Date.now
         }
     }
@@ -433,7 +528,7 @@ final class ChatModel: ObservableObject {
     }
 
     func updateGroup(_ groupInfo: GroupInfo) {
-        updateChat(.group(groupInfo: groupInfo))
+        updateChat(.group(groupInfo: groupInfo, groupChatScope: nil))
     }
 
     private func updateChat(_ cInfo: ChatInfo, addMissing: Bool = true) {
@@ -476,14 +571,18 @@ final class ChatModel: ObservableObject {
 //    }
 
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // updates membersRequireAttention
+        updateChatInfo(cInfo)
         // mark chat non deleted
         if case let .direct(contact) = cInfo, contact.chatDeleted {
             var updatedContact = contact
             updatedContact.chatDeleted = false
             updateContact(updatedContact)
         }
-        // update previews
+        // update chat list
         if let i = getChatIndex(cInfo.id) {
+            // update preview
+            if cInfo.groupChatScope() == nil || cInfo.groupInfo?.membership.memberPending ?? false {
                 chats[i].chatItems = switch cInfo {
                 case .group:
                     if let currentPreviewItem = chats[i].chatItems.first {
@@ -499,21 +598,47 @@ final class ChatModel: ObservableObject {
                     [cItem]
                 }
                 if case .rcvNew = cItem.meta.itemStatus {
-                unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
+                    unreadCollector.changeUnreadCounter(cInfo.id, by: 1, unreadMentions: cItem.meta.userMention ? 1 : 0)
                 }
+            }
+            // pop chat
             popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
         } else {
+            if cInfo.groupChatScope() == nil {
                 addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
+            } else {
+                addChat(Chat(chatInfo: cInfo, chatItems: []))
             }
-        // add to current chat
-        if chatId == cInfo.id {
-            _ = _upsertChatItem(cInfo, cItem)
+        }
+        // add to current scope
+        if let ciIM = getCIItemsModel(cInfo, cItem) {
+            _ = _upsertChatItem(ciIM, cInfo, cItem)
+        }
+    }
+
+    func getCIItemsModel(_ cInfo: ChatInfo, _ ci: ChatItem) -> ItemsModel? {
+        let cInfoScope = cInfo.groupChatScope()
+        if let cInfoScope = cInfoScope {
+            switch cInfoScope {
+            case .memberSupport:
+                switch secondaryIM?.secondaryIMFilter {
+                case .none:
+                    return nil
+                case let .groupChatScopeContext(groupScopeInfo):
+                    return (cInfo.id == chatId && sameChatScope(cInfoScope, groupScopeInfo.toChatScope())) ? secondaryIM : nil
+                case let .msgContentTagContext(contentTag):
+                    return (cInfo.id == chatId && ci.isReport && contentTag == .report) ? secondaryIM : nil
+                }
+            }
+        } else {
+            return cInfo.id == chatId ? im : nil
         }
     }
 
     func upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
-        // update previews
-        var res: Bool
+        // update chat list
+        var itemAdded: Bool = false
+        if cInfo.groupChatScope() == nil {
             if let chat = getChat(cInfo.id) {
                 if let pItem = chat.chatItems.last {
                     if pItem.id == cItem.id || (chatId == cInfo.id && im.reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
@@ -522,30 +647,36 @@ final class ChatModel: ObservableObject {
                 } else {
                     chat.chatItems = [cItem]
                 }
-            res = false
             } else {
                 addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
-            res = true
+                itemAdded = true
             }
             if cItem.isDeletedContent || cItem.meta.itemDeleted != nil {
                 VoiceItemState.stopVoiceInChatView(cInfo, cItem)
             }
-        // update current chat
-        return chatId == cInfo.id ? _upsertChatItem(cInfo, cItem) : res
+        }
+        // update current scope
+        if let ciIM = getCIItemsModel(cInfo, cItem) {
+            itemAdded = _upsertChatItem(ciIM, cInfo, cItem)
+        }
+        return itemAdded
     }
 
-    private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
-        if let i = getChatItemIndex(cItem) {
-            _updateChatItem(at: i, with: cItem)
-            ChatItemDummyModel.shared.sendUpdate()
+    private func _upsertChatItem(_ ciIM: ItemsModel, _ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
+        if let i = getChatItemIndex(ciIM, cItem) {
+            let oldStatus = ciIM.reversedChatItems[i].meta.itemStatus
+            let newStatus = cItem.meta.itemStatus
+            var ci = cItem
+            if shouldKeepOldSndCIStatus(oldStatus: oldStatus, newStatus: newStatus) {
+                ci.meta.itemStatus = oldStatus
+            }
+            _updateChatItem(ciIM: ciIM, at: i, with: ci)
+            ChatItemDummyModel.shared.sendUpdate() // TODO [knocking] review what's this
             return false
         } else {
-            var ci = cItem
-            if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                ci.meta.itemStatus = status
-            }
-            im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-            im.itemAdded = true
+            ciIM.reversedChatItems.insert(cItem, at: hasLiveDummy ? 1 : 0)
+            ciIM.chatState.itemAdded((cItem.id, cItem.isRcvNew), hasLiveDummy ? 1 : 0)
+            ciIM.itemAdded = true
             ChatItemDummyModel.shared.sendUpdate()
             return true
         }
@@ -559,27 +690,28 @@ final class ChatModel: ObservableObject {
     }
 
     func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
-        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
+        if let ciIM = getCIItemsModel(cInfo, cItem),
+           let i = getChatItemIndex(ciIM, cItem) {
             withConditionalAnimation {
-                _updateChatItem(at: i, with: cItem)
+                _updateChatItem(ciIM: ciIM, at: i, with: cItem)
             }
-        } else if let status = status {
-            chatItemStatuses.updateValue(status, forKey: cItem.id)
         }
     }
 
-    private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        im.reversedChatItems[i] = cItem
-        im.reversedChatItems[i].viewTimestamp = .now
+    private func _updateChatItem(ciIM: ItemsModel, at i: Int, with cItem: ChatItem) {
+        ciIM.reversedChatItems[i] = cItem
+        ciIM.reversedChatItems[i].viewTimestamp = .now
     }
 
-    func getChatItemIndex(_ cItem: ChatItem) -> Int? {
-        im.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
+    func getChatItemIndex(_ ciIM: ItemsModel, _ cItem: ChatItem) -> Int? {
+        ciIM.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
     func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // update chat list
+        if cInfo.groupChatScope() == nil {
             if cItem.isRcvNew {
-            unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+                unreadCollector.changeUnreadCounter(cInfo.id, by: -1, unreadMentions: cItem.meta.userMention ? -1 : 0)
             }
             // update previews
             if let chat = getChat(cInfo.id) {
@@ -587,17 +719,58 @@ final class ChatModel: ObservableObject {
                     chat.chatItems = [ChatItem.deletedItemDummy()]
                 }
             }
-        // remove from current chat
-        if chatId == cInfo.id {
-            if let i = getChatItemIndex(cItem) {
-                _ = withAnimation {
-                    im.reversedChatItems.remove(at: i)
+        }
+        // remove from current scope
+        if let ciIM = getCIItemsModel(cInfo, cItem) {
+            if let i = getChatItemIndex(ciIM, cItem) {
+                withAnimation {
+                    let item = ciIM.reversedChatItems.remove(at: i)
+                    ciIM.chatState.itemsRemoved([(item.id, i, item.isRcvNew)], im.reversedChatItems.reversed())
                 }
             }
         }
         VoiceItemState.stopVoiceInChatView(cInfo, cItem)
     }
 
+    func removeMemberItems(_ removedMember: GroupMember, byMember: GroupMember, _ groupInfo: GroupInfo) {
+        // this should not happen, only another member can "remove" user, user can only "leave" (another event).
+        if byMember.groupMemberId == groupInfo.membership.groupMemberId {
+            logger.debug("exiting removeMemberItems")
+            return
+        }
+        if chatId == groupInfo.id {
+            for i in 0..<im.reversedChatItems.count {
+                if let updatedItem = removedUpdatedItem(im.reversedChatItems[i]) {
+                    _updateChatItem(ciIM: im, at: i, with: updatedItem) // TODO [knocking] review: use getCIItemsModel?
+                }
+            }
+        } else if let chat = getChat(groupInfo.id),
+                  chat.chatItems.count > 0,
+                  let updatedItem = removedUpdatedItem(chat.chatItems[0]) {
+                chat.chatItems = [updatedItem]
+        }
+        
+        func removedUpdatedItem(_ item: ChatItem) -> ChatItem? {
+            let newContent: CIContent
+            if case .groupSnd = item.chatDir, removedMember.groupMemberId == groupInfo.membership.groupMemberId {
+                newContent = .sndModerated
+            } else if case let .groupRcv(groupMember) = item.chatDir, groupMember.groupMemberId == removedMember.groupMemberId {
+                newContent = .rcvModerated
+            } else {
+                return nil
+            }
+            var updatedItem = item
+            updatedItem.meta.itemDeleted = .moderated(deletedTs: Date.now, byGroupMember: byMember)
+            if groupInfo.fullGroupPreferences.fullDelete.on {
+                updatedItem.content = newContent
+            }
+            if item.isActiveReport {
+                decreaseGroupReportsCounter(groupInfo.id)
+            }
+            return updatedItem
+        }
+    }
+
     func nextChatItemData<T>(_ chatItemId: Int64, previous: Bool, map: @escaping (ChatItem) -> T?) -> T? {
         guard var i = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
         if previous {
@@ -640,6 +813,7 @@ final class ChatModel: ObservableObject {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
             im.reversedChatItems.insert(cItem, at: 0)
+            im.chatState.itemAdded((cItem.id, cItem.isRcvNew), 0)
             im.itemAdded = true
         }
         return cItem
@@ -659,63 +833,23 @@ final class ChatModel: ObservableObject {
         im.reversedChatItems.first?.isLiveDummy == true
     }
 
-    func markChatItemsRead(_ cInfo: ChatInfo) {
+    func markAllChatItemsRead(_ chatIM: ItemsModel, _ cInfo: ChatInfo) {
         // update preview
         _updateChat(cInfo.id) { chat in
-            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
-            self.updateFloatingButtons(unreadCount: 0)
+            self.decreaseUnreadCounter(user: self.currentUser!, chat: chat)
             ChatTagsModel.shared.markChatTagRead(chat)
             chat.chatStats = ChatStats()
         }
         // update current chat
         if chatId == cInfo.id {
-            markCurrentChatRead()
+            var i = 0
+            while i < im.reversedChatItems.count {
+                markChatItemRead_(chatIM, i)
+                i += 1
+            }
+            im.chatState.itemsRead(nil, im.reversedChatItems.reversed())
         }
     }
-
-    private func markCurrentChatRead(fromIndex i: Int = 0) {
-        var j = i
-        while j < im.reversedChatItems.count {
-            markChatItemRead_(j)
-            j += 1
-        }
-    }
-
-    private func updateFloatingButtons(unreadCount: Int) {
-        let fbm = ChatView.FloatingButtonModel.shared
-        fbm.totalUnread = unreadCount
-        fbm.objectWillChange.send()
-    }
-
-    func markChatItemsRead(_ cInfo: ChatInfo, aboveItem: ChatItem? = nil) {
-        if let cItem = aboveItem {
-            if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
-                markCurrentChatRead(fromIndex: i)
-                _updateChat(cInfo.id) { chat in
-                    var unreadBelow = 0
-                    var j = i - 1
-                    while j >= 0 {
-                        if case .rcvNew = self.im.reversedChatItems[j].meta.itemStatus {
-                            unreadBelow += 1
-                        }
-                        j -= 1
-                    }
-                    // update preview
-                    let markedCount = chat.chatStats.unreadCount - unreadBelow
-                    if markedCount > 0 {
-                        let wasUnread = chat.unreadTag
-                        chat.chatStats.unreadCount -= markedCount
-                        ChatTagsModel.shared.updateChatTagRead(chat, wasUnread: wasUnread)
-                        self.decreaseUnreadCounter(user: self.currentUser!, by: markedCount)
-                        self.updateFloatingButtons(unreadCount: chat.chatStats.unreadCount)
-                    }
-                }
-            }
-        } else {
-            markChatItemsRead(cInfo)
-        }
-    }
-
     func markChatUnread(_ cInfo: ChatInfo, unreadChat: Bool = true) {
         _updateChat(cInfo.id) { chat in
             let wasUnread = chat.unreadTag
@@ -727,7 +861,7 @@ final class ChatModel: ObservableObject {
     func clearChat(_ cInfo: ChatInfo) {
         // clear preview
         if let chat = getChat(cInfo.id) {
-            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
+            self.decreaseUnreadCounter(user: self.currentUser!, chat: chat)
             chat.chatItems = []
             ChatTagsModel.shared.markChatTagRead(chat)
             chat.chatStats = ChatStats()
@@ -735,20 +869,28 @@ final class ChatModel: ObservableObject {
         }
         // clear current chat
         if chatId == cInfo.id {
-            chatItemStatuses = [:]
             im.reversedChatItems = []
+            im.chatState.clear()
         }
     }
 
-    func markChatItemsRead(_ cInfo: ChatInfo, _ itemIds: [ChatItem.ID]) {
+    func markChatItemsRead(_ chatIM: ItemsModel, _ cInfo: ChatInfo, _ itemIds: [ChatItem.ID], _ mentionsRead: Int) {
         if self.chatId == cInfo.id {
-            for itemId in itemIds {
-                if let i = im.reversedChatItems.firstIndex(where: { $0.id == itemId }) {
-                    markChatItemRead_(i)
+            var unreadItemIds: Set<ChatItem.ID> = []
+            var i = 0
+            var ids = Set(itemIds)
+            while i < chatIM.reversedChatItems.count && !ids.isEmpty {
+                let item = chatIM.reversedChatItems[i]
+                if ids.contains(item.id) && item.isRcvNew {
+                    markChatItemRead_(chatIM, i)
+                    unreadItemIds.insert(item.id)
+                    ids.remove(item.id)
                 }
+                i += 1
             }
+            chatIM.chatState.itemsRead(unreadItemIds, chatIM.reversedChatItems.reversed())
         }
-        self.unreadCollector.changeUnreadCounter(cInfo.id, by: -itemIds.count)
+        self.unreadCollector.changeUnreadCounter(cInfo.id, by: -itemIds.count, unreadMentions: -mentionsRead)
     }
 
     private let unreadCollector = UnreadCollector()
@@ -756,16 +898,16 @@ final class ChatModel: ObservableObject {
     class UnreadCollector {
         private let subject = PassthroughSubject<Void, Never>()
         private var bag = Set<AnyCancellable>()
-        private var unreadCounts: [ChatId: Int] = [:]
+        private var unreadCounts: [ChatId: (unread: Int, mentions: Int)] = [:]
 
         init() {
             subject
                 .debounce(for: 1, scheduler: DispatchQueue.main)
                 .sink {
                     let m = ChatModel.shared
-                    for (chatId, count) in self.unreadCounts {
-                        if let i = m.getChatIndex(chatId) {
-                            m.changeUnreadCounter(i, by: count)
+                    for (chatId, (unread, mentions)) in self.unreadCounts {
+                        if unread != 0 || mentions != 0, let i = m.getChatIndex(chatId) {
+                            m.changeUnreadCounter(i, by: unread, unreadMentions: mentions)
                         }
                     }
                     self.unreadCounts = [:]
@@ -773,11 +915,9 @@ final class ChatModel: ObservableObject {
                 .store(in: &bag)
         }
 
-        func changeUnreadCounter(_ chatId: ChatId, by count: Int) {
-            if chatId == ChatModel.shared.chatId {
-                ChatView.FloatingButtonModel.shared.totalUnread += count
-            }
-            self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
+        func changeUnreadCounter(_ chatId: ChatId, by count: Int, unreadMentions: Int) {
+            let (unread, mentions) = self.unreadCounts[chatId] ?? (0, 0)
+            self.unreadCounts[chatId] = (unread + count, mentions + unreadMentions)
             subject.send()
         }
     }
@@ -844,20 +984,22 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    private func markChatItemRead_(_ i: Int) {
-        let meta = im.reversedChatItems[i].meta
+    private func markChatItemRead_(_ chatIM: ItemsModel, _ i: Int) {
+        let meta = chatIM.reversedChatItems[i].meta
         if case .rcvNew = meta.itemStatus {
-            im.reversedChatItems[i].meta.itemStatus = .rcvRead
-            im.reversedChatItems[i].viewTimestamp = .now
+            chatIM.reversedChatItems[i].meta.itemStatus = .rcvRead
+            chatIM.reversedChatItems[i].viewTimestamp = .now
             if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
-                im.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+                chatIM.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
             }
         }
     }
 
-    func changeUnreadCounter(_ chatIndex: Int, by count: Int) {
+    func changeUnreadCounter(_ chatIndex: Int, by count: Int, unreadMentions: Int) {
         let wasUnread = chats[chatIndex].unreadTag
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount + count
+        let stats = chats[chatIndex].chatStats
+        chats[chatIndex].chatStats.unreadCount = stats.unreadCount + count
+        chats[chatIndex].chatStats.unreadMentions = stats.unreadMentions + unreadMentions
         ChatTagsModel.shared.updateChatTagRead(chats[chatIndex], wasUnread: wasUnread)
         changeUnreadCounter(user: currentUser!, by: count)
     }
@@ -866,6 +1008,13 @@ final class ChatModel: ObservableObject {
         changeUnreadCounter(user: user, by: 1)
     }
 
+    func decreaseUnreadCounter(user: any UserLike, chat: Chat) {
+        let by = chat.chatInfo.chatSettings?.enableNtfs == .mentions
+                ? chat.chatStats.unreadMentions
+                : chat.chatStats.unreadCount
+        decreaseUnreadCounter(user: user, by: by)
+    }
+
     func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
         changeUnreadCounter(user: user, by: -by)
     }
@@ -878,8 +1027,20 @@ final class ChatModel: ObservableObject {
     }
 
     func totalUnreadCountForAllUsers() -> Int {
-        chats.filter { $0.chatInfo.ntfsEnabled }.reduce(0, { count, chat in count + chat.chatStats.unreadCount }) +
-            users.filter { !$0.user.activeUser }.reduce(0, { unread, next -> Int in unread + next.unreadCount })
+        var unread: Int = 0
+        for chat in chats {
+            switch chat.chatInfo.chatSettings?.enableNtfs {
+            case .all: unread += chat.chatStats.unreadCount
+            case .mentions: unread += chat.chatStats.unreadMentions
+            default: ()
+            }
+        }
+        for u in users {
+            if !u.user.activeUser {
+                unread += u.unreadCount
+            }
+        }
+        return unread
     }
 
     func increaseGroupReportsCounter(_ chatId: ChatId) {
@@ -887,7 +1048,7 @@ final class ChatModel: ObservableObject {
     }
 
     func decreaseGroupReportsCounter(_ chatId: ChatId, by: Int = 1) {
-        changeGroupReportsCounter(chatId, -1)
+        changeGroupReportsCounter(chatId, -by)
     }
 
     private func changeGroupReportsCounter(_ chatId: ChatId, _ by: Int = 0) {
@@ -908,7 +1069,7 @@ final class ChatModel: ObservableObject {
         var count = 0
         var ns: [String] = []
         if let ciCategory = chatItem.mergeCategory,
-           var i = getChatItemIndex(chatItem) {
+           var i = getChatItemIndex(im, chatItem) { // TODO [knocking] review: use getCIItemsModel?
             while i < im.reversedChatItems.count {
                 let ci = im.reversedChatItems[i]
                 if ci.mergeCategory != ciCategory { break }
@@ -924,7 +1085,7 @@ final class ChatModel: ObservableObject {
 
     // returns the index of the passed item and the next item (it has smaller index)
     func getNextChatItem(_ ci: ChatItem) -> (Int?, ChatItem?) {
-        if let i = getChatItemIndex(ci) {
+        if let i = getChatItemIndex(im, ci) { // TODO [knocking] review: use getCIItemsModel?
             (i, i > 0 ? im.reversedChatItems[i - 1] : nil)
         } else {
             (nil, nil)
@@ -948,13 +1109,18 @@ final class ChatModel: ObservableObject {
 
     // 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) {
+        let items = im.reversedChatItems
         var prevMember: GroupMember? = nil
         var memberIds: Set<Int64> = []
         for i in range {
-            if case let .groupRcv(m) = im.reversedChatItems[i].chatDir {
+            if i < items.count {
+                if case let .groupRcv(m) = items[i].chatDir {
                     if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
                     memberIds.insert(m.groupMemberId)
                 }
+            } else {
+                logger.error("getPrevHiddenMember: index >= count of reversed items: \(i) vs \(items.count), range: \(String(describing: range))")
+            }
         }
         return (prevMember, memberIds.count)
     }
@@ -1030,7 +1196,7 @@ final class ChatModel: ObservableObject {
     func removeWallpaperFilesFromChat(_ chat: Chat) {
         if case let .direct(contact) = chat.chatInfo {
             removeWallpaperFilesFromTheme(contact.uiThemes)
-        } else if case let .group(groupInfo) = chat.chatInfo {
+        } else if case let .group(groupInfo, _) = chat.chatInfo {
             removeWallpaperFilesFromTheme(groupInfo.uiThemes)
         }
     }
@@ -1082,35 +1248,30 @@ final class Chat: ObservableObject, Identifiable, ChatLike {
         )
     }
 
-    var userCanSend: Bool {
-        switch chatInfo {
-        case .direct: return true
-        case let .group(groupInfo):
-            let m = groupInfo.membership
-            return m.memberActive && m.memberRole >= .member
-        case .local:
-            return true
-        default: return false
-        }
-    }
-
-    var userIsObserver: Bool {
-        switch chatInfo {
-        case let .group(groupInfo):
-            let m = groupInfo.membership
-            return m.memberActive && m.memberRole == .observer
-        default: return false
-        }
-    }
-
     var unreadTag: Bool {
-        chatInfo.ntfsEnabled && (chatStats.unreadCount > 0 || chatStats.unreadChat)
+        switch chatInfo.chatSettings?.enableNtfs {
+        case .all: chatStats.unreadChat || chatStats.unreadCount > 0
+        case .mentions: chatStats.unreadChat || chatStats.unreadMentions > 0
+        default: chatStats.unreadChat
+        }
     }
     
     var id: ChatId { get { chatInfo.id } }
 
     var viewId: String { get { "\(chatInfo.id) \(created.timeIntervalSince1970)" } }
 
+    var supportUnreadCount: Int {
+        switch chatInfo {
+        case let .group(groupInfo, _):
+            if groupInfo.canModerate {
+                return groupInfo.membersRequireAttention
+            } else {
+                return groupInfo.membership.supportChat?.unread ?? 0
+            }
+        default: return 0
+        }
+    }
+
     public static var sampleData: Chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
 }
 

apps/ios/Shared/Model/NtfManager.swift

@@ -248,7 +248,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
 
     func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
-        if cInfo.ntfsEnabled {
+        if cInfo.ntfsEnabled(chatItem: cItem) {
             addNotification(createMessageReceivedNtf(user, cInfo, cItem, 0))
         }
     }

apps/ios/Shared/SimpleXApp.swift

@@ -19,6 +19,7 @@ struct SimpleXApp: App {
 
     @Environment(\.scenePhase) var scenePhase
     @State private var enteredBackgroundAuthenticated: TimeInterval? = nil
+    @State private var appOpenUrlLater: URL?
 
     init() {
         DispatchQueue.global(qos: .background).sync {
@@ -42,7 +43,11 @@ struct SimpleXApp: App {
                 .environmentObject(AppTheme.shared)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
+                    if AppChatState.shared.value == .active {
                         chatModel.appOpenUrl = url
+                    } else {
+                        appOpenUrlLater = url
+                    }
                 }
                 .onAppear() {
                     // Present screen for continue migration if it wasn't finished yet
@@ -93,9 +98,18 @@ struct SimpleXApp: App {
                                             if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
                                                 await updateCallInvitations()
                                             }
+                                            if let url = appOpenUrlLater {
+                                                await MainActor.run {
+                                                    appOpenUrlLater = nil
+                                                    chatModel.appOpenUrl = url
                                                 }
                                             }
                                         }
+                                    } else if let url = appOpenUrlLater {
+                                        appOpenUrlLater = nil
+                                        chatModel.appOpenUrl = url
+                                    }
+                                }
                             }
                         }
                     default:
@@ -145,7 +159,7 @@ struct SimpleXApp: App {
             if let id = chatModel.chatId,
                let chat = chatModel.getChat(id),
                !NtfManager.shared.navigatingToChat {
-                Task { await loadChat(chat: chat, clearItems: false) }
+                Task { await loadChat(chat: chat, im: ItemsModel.shared, clearItems: false) }
             }
             if let ncr = chatModel.ntfContactRequest {
                 await MainActor.run { chatModel.ntfContactRequest = nil }

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

@@ -243,7 +243,7 @@ struct ActiveCallView: View {
                 ChatReceiver.shared.messagesChannel = nil
                 return
             }
-            if case let .chatItemsStatusesUpdated(_, chatItems) = msg,
+            if case let .result(.chatItemsStatusesUpdated(_, chatItems)) = msg,
                chatItems.contains(where: { ci in
                    ci.chatInfo.id == call.contact.id &&
                    ci.chatItem.content.isSndCall &&
@@ -361,7 +361,7 @@ struct ActiveCallOverlay: View {
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
+                        Text(verbatim: "(") + Text(connInfo.text) + Text(verbatim: ")")
                     }
                 }
             }
@@ -390,7 +390,7 @@ struct ActiveCallOverlay: View {
                 HStack {
                     Text(call.encryptionStatus)
                     if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
+                        Text(verbatim: "(") + Text(connInfo.text) + Text(verbatim: ")")
                     }
                 }
             }
@@ -467,7 +467,7 @@ struct ActiveCallOverlay: View {
         .disabled(call.initialCallType == .audio && client.activeCall?.peerHasOldVersion == true)
     }
 
-    @ViewBuilder private func flipCameraButton() -> some View {
+    private func flipCameraButton() -> some View {
         controlButton(call, "arrow.triangle.2.circlepath", padding: 12) {
                 Task {
                     if await WebRTCClient.isAuthorized(for: .video) {
@@ -477,11 +477,11 @@ struct ActiveCallOverlay: View {
         }
     }
 
-    @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
+    private func controlButton(_ call: Call, _ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
         callButton(imageName, call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2), padding: padding, perform)
     }
 
-    @ViewBuilder private func audioDevicePickerButton() -> some View {
+    private func audioDevicePickerButton() -> some View {
         AudioDevicePicker()
             .opacity(0.8)
             .scaleEffect(2)

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

@@ -22,11 +22,28 @@ struct ChatInfoToolbar: View {
                 Image(systemName: "theatermasks").frame(maxWidth: 24, maxHeight: 24, alignment: .center).foregroundColor(.indigo)
                 Spacer().frame(width: 16)
             }
+            ZStack(alignment: .bottomTrailing) {
                 ChatInfoImage(
                     chat: chat,
                     size: imageSize,
                     color: Color(uiColor: .tertiaryLabel)
                 )
+                if chat.chatStats.reportsCount > 0 {
+                    Image(systemName: "flag.circle.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 14, height: 14)
+                        .symbolRenderingMode(.palette)
+                        .foregroundStyle(.white, .red)
+                } else if chat.supportUnreadCount > 0 {
+                    Image(systemName: "flag.circle.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 14, height: 14)
+                        .symbolRenderingMode(.palette)
+                        .foregroundStyle(.white, theme.colors.primary)
+                }
+            }
             .padding(.trailing, 4)
             let t = Text(cInfo.displayName).font(.headline)
             (cInfo.contact?.verified == true ? contactVerifiedShield + t : t)

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

@@ -7,7 +7,7 @@
 //
 
 import SwiftUI
-import SimpleXChat
+@preconcurrency import SimpleXChat
 
 func infoRow(_ title: LocalizedStringKey, _ value: String) -> some View {
     HStack {
@@ -158,7 +158,9 @@ struct ChatInfoView: View {
                             searchButton(width: buttonWidth)
                             AudioCallButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
                             VideoButton(chat: chat, contact: contact, connectionStats: $connectionStats, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                            muteButton(width: buttonWidth)
+                            if let nextNtfMode = chat.chatInfo.nextNtfMode {
+                                muteButton(width: buttonWidth, nextNtfMode: nextNtfMode)
+                            }
                         }
                     }
                     .padding(.trailing)
@@ -432,13 +434,13 @@ struct ChatInfoView: View {
         .disabled(!contact.ready || chat.chatItems.isEmpty)
     }
 
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
+    private func muteButton(width: CGFloat, nextNtfMode: MsgFilter) -> some View {
+        return InfoViewButton(
+            image: nextNtfMode.iconFilled,
+            title: "\(nextNtfMode.text(mentions: false))",
             width: width
         ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+            toggleNotifications(chat, enableNtfs: nextNtfMode)
         }
         .disabled(!contact.ready || !contact.active)
     }
@@ -682,17 +684,23 @@ struct ChatTTLOption: View {
             ) {
                 progressIndicator = true
                 Task {
+                    let m = ChatModel.shared
                     do {
                         try await setChatTTL(chatType: chat.chatInfo.chatType, id: chat.chatInfo.apiId, ttl)
-                        await loadChat(chat: chat, clearItems: true, replaceChat: true)
+                        await loadChat(chat: chat, im: ItemsModel.shared, clearItems: true)
                         await MainActor.run {
                             progressIndicator = false
                             currentChatItemTTL = chatItemTTL
+                            if ItemsModel.shared.reversedChatItems.isEmpty && m.chatId == chat.id,
+                               let chat = m.getChat(chat.id) {
+                                chat.chatItems = []
+                                m.replaceChat(chat.id, chat)
+                            }
                         }
                     }
                     catch let error {
                         logger.error("setChatTTL error \(responseError(error))")
-                        await loadChat(chat: chat, clearItems: true, replaceChat: true)
+                        await loadChat(chat: chat, im: ItemsModel.shared, clearItems: true)
                         await MainActor.run {
                             chatItemTTL = currentChatItemTTL
                             progressIndicator = false
@@ -930,7 +938,7 @@ struct ChatWallpaperEditorSheet: View {
         self.chat = chat
         self.themes = if case let ChatInfo.direct(contact) = chat.chatInfo, let uiThemes = contact.uiThemes {
             uiThemes
-        } else if case let ChatInfo.group(groupInfo) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
+        } else if case let ChatInfo.group(groupInfo, _) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
             uiThemes
         } else {
             ThemeModeOverrides()
@@ -966,7 +974,7 @@ struct ChatWallpaperEditorSheet: View {
     private func themesFromChat(_ chat: Chat) -> ThemeModeOverrides {
         if case let ChatInfo.direct(contact) = chat.chatInfo, let uiThemes = contact.uiThemes {
             uiThemes
-        } else if case let ChatInfo.group(groupInfo) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
+        } else if case let ChatInfo.group(groupInfo, _) = chat.chatInfo, let uiThemes = groupInfo.uiThemes {
             uiThemes
         } else {
             ThemeModeOverrides()
@@ -1044,12 +1052,12 @@ struct ChatWallpaperEditorSheet: View {
                             chat.wrappedValue = Chat.init(chatInfo: ChatInfo.direct(contact: contact))
                             themes = themesFromChat(chat.wrappedValue)
                         }
-                    } else if case var ChatInfo.group(groupInfo) = chat.wrappedValue.chatInfo {
+                    } else if case var ChatInfo.group(groupInfo, _) = chat.wrappedValue.chatInfo {
                         groupInfo.uiThemes = changedThemesConstant
 
                         await MainActor.run {
-                            ChatModel.shared.updateChatInfo(ChatInfo.group(groupInfo: groupInfo))
-                            chat.wrappedValue = Chat.init(chatInfo: ChatInfo.group(groupInfo: groupInfo))
+                            ChatModel.shared.updateChatInfo(ChatInfo.group(groupInfo: groupInfo, groupChatScope: nil))
+                            chat.wrappedValue = Chat.init(chatInfo: ChatInfo.group(groupInfo: groupInfo, groupChatScope: nil))
                             themes = themesFromChat(chat.wrappedValue)
                         }
                     }

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

@@ -50,7 +50,7 @@ struct CICallItemView: View {
         Image(systemName: "phone.connection").foregroundColor(.green)
     }
 
-    @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
+    private func endedCallIcon(_ sent: Bool) -> some View {
         HStack {
             Image(systemName: "phone.down")
             Text(durationText(duration)).foregroundColor(theme.colors.secondary)
@@ -60,16 +60,16 @@ struct CICallItemView: View {
 
     @ViewBuilder private func acceptCallButton() -> some View {
         if case let .direct(contact) = chat.chatInfo {
-            Button {
+            Label("Answer call", systemImage: "phone.arrow.down.left")
+                .foregroundColor(theme.colors.primary)
+                .simultaneousGesture(TapGesture().onEnded {
                     if let invitation = m.callInvitations[contact.id] {
                         CallController.shared.answerCall(invitation: invitation)
                         logger.debug("acceptCallButton call answered")
                     } else {
                         AlertManager.shared.showAlertMsg(title: "Call already ended!")
                     }
-            } label: {
-                Label("Answer call", systemImage: "phone.arrow.down.left")
-            }
+                })
         } else {
             Image(systemName: "phone.arrow.down.left").foregroundColor(theme.colors.secondary)
         }

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

@@ -12,8 +12,8 @@ import SimpleXChat
 struct CIChatFeatureView: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.revealed) var revealed: Bool
-    @ObservedObject var im = ItemsModel.shared
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var feature: Feature
@@ -53,7 +53,7 @@ struct CIChatFeatureView: View {
     private func mergedFeatures() -> [FeatureInfo]? {
         var fs: [FeatureInfo] = []
         var icons: Set<String> = []
-        if var i = m.getChatItemIndex(chatItem) {
+        if var i = m.getChatItemIndex(im, chatItem) {
             while i < im.reversedChatItems.count,
                   let f = featureInfo(im.reversedChatItems[i]) {
                 if !icons.contains(f.icon) {
@@ -108,6 +108,7 @@ struct CIChatFeatureView_Previews: PreviewProvider {
         let enabled = FeatureEnabled(forUser: false, forContact: false)
         CIChatFeatureView(
             chat: Chat.sampleData,
+            im: ItemsModel.shared,
             chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary)
         ).environment(\.revealed, true)
     }

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

@@ -26,9 +26,9 @@ struct CIFeaturePreferenceView: View {
                allowed != .no && ct.allowsFeature(feature) && !ct.userAllowsFeature(feature) {
                 let setParam = feature == .timedMessages && ct.mergedPreferences.timedMessages.userPreference.preference.ttl == nil
                 featurePreferenceView(acceptText: setParam ? "Set 1 day" : "Accept")
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         allowFeatureToContact(ct, feature, param: setParam ? 86400 : nil)
-                    }
+                    })
             } else {
                 featurePreferenceView()
             }

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

@@ -19,12 +19,11 @@ struct CIFileView: View {
     var body: some View {
         if smallViewSize != nil {
             fileIndicator()
-            .onTapGesture(perform: fileAction)
+            .simultaneousGesture(TapGesture().onEnded(fileAction))
         } else {
             let metaReserve = edited
             ? "                           "
             : "                       "
-            Button(action: fileAction) {
             HStack(alignment: .bottom, spacing: 6) {
                 fileIndicator()
                     .padding(.top, 5)
@@ -50,11 +49,12 @@ struct CIFileView: View {
             .padding(.bottom, 6)
             .padding(.leading, 10)
             .padding(.trailing, 12)
-            }
+            .simultaneousGesture(TapGesture().onEnded(fileAction))
             .disabled(!itemInteractive)
         }
     }
 
+    @inline(__always)
     private var itemInteractive: Bool {
         if let file = file {
             switch (file.fileStatus) {
@@ -278,6 +278,7 @@ func showFileErrorAlert(_ err: FileError, temporary: Bool = false) {
 
 struct CIFileView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let sentFile: ChatItem = ChatItem(
             chatDir: .directSnd,
             meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
@@ -293,16 +294,16 @@ struct CIFileView_Previews: PreviewProvider {
             file: nil
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentFile)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample())
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation))
-            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))
-            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: sentFile, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, 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), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: fileChatItemWtFile, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 360))

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

@@ -84,12 +84,12 @@ struct CIGroupInvitationView: View {
         }
 
         if action {
-            v.onTapGesture {
+            v.simultaneousGesture(TapGesture().onEnded {
                 inProgress = true
                 joinGroup(groupInvitation.groupId) {
                     await MainActor.run { inProgress = false }
                 }
-            }
+            })
             .disabled(inProgress)
         } else {
             v

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

@@ -12,6 +12,7 @@ import SimpleXChat
 struct CIImageView: View {
     @EnvironmentObject var m: ChatModel
     let chatItem: ChatItem
+    var scrollToItem: ((ChatItem.ID) -> Void)? = nil
     var preview: UIImage?
     let maxWidth: CGFloat
     var imgWidth: CGFloat?
@@ -25,12 +26,14 @@ struct CIImageView: View {
             if let uiImage = getLoadedImage(file) {
                 Group { if smallView { smallViewImageView(uiImage) } else { imageView(uiImage) } }
                 .fullScreenCover(isPresented: $showFullScreenImage) {
-                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage)
+                    FullScreenMediaView(chatItem: chatItem, scrollToItem: scrollToItem, image: uiImage, showView: $showFullScreenImage)
                 }
                 .if(!smallView) { view in
                     view.modifier(PrivacyBlur(blurred: $blurred))
                 }
-                .onTapGesture { showFullScreenImage = true }
+                .if(!blurred) { v in
+                    v.simultaneousGesture(TapGesture().onEnded { showFullScreenImage = true })
+                }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenImage = false
                 }
@@ -42,7 +45,7 @@ struct CIImageView: View {
                         imageView(preview).modifier(PrivacyBlur(blurred: $blurred))
                     }
                 }
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         if let file = file {
                             switch file.fileStatus {
                             case .rcvInvitation, .rcvAborted:
@@ -79,7 +82,7 @@ struct CIImageView: View {
                             default: ()
                             }
                         }
-                    }
+                    })
             }
         }
         .onDisappear {

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

@@ -7,10 +7,11 @@
 //
 
 import SwiftUI
+import SimpleXChat
 
 struct CIInvalidJSONView: View {
     @EnvironmentObject var theme: AppTheme
-    var json: String
+    var json: Data?
     @State private var showJSON = false
     
     var body: some View {
@@ -23,16 +24,16 @@ struct CIInvalidJSONView: View {
         .padding(.vertical, 6)
         .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .textSelection(.disabled)
-        .onTapGesture { showJSON = true }
+        .simultaneousGesture(TapGesture().onEnded { showJSON = true })
         .appSheet(isPresented: $showJSON) {
-            invalidJSONView(json)
+            invalidJSONView(dataToString(json))
         }
     }
 }
 
 func invalidJSONView(_ json: String) -> some View {
     VStack(alignment: .leading, spacing: 16) {
-        Button {
+        Button { // this is used in the sheet, Button works here
             showShareSheet(items: [json])
         } label: {
             Image(systemName: "square.and.arrow.up")
@@ -49,6 +50,6 @@ func invalidJSONView(_ json: String) -> some View {
 
 struct CIInvalidJSONView_Previews: PreviewProvider {
     static var previews: some View {
-        CIInvalidJSONView(json: "{}")
+        CIInvalidJSONView(json: "{}".data(using: .utf8)!)
     }
 }

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

@@ -21,15 +21,15 @@ struct CILinkView: View {
                     .resizable()
                     .scaledToFit()
                     .modifier(PrivacyBlur(blurred: $blurred))
+                    .if(!blurred) { v in
+                        v.simultaneousGesture(TapGesture().onEnded {
+                            openBrowserAlert(uri: linkPreview.uri)
+                        })
+                    }
             }
             VStack(alignment: .leading, spacing: 6) {
                 Text(linkPreview.title)
                     .lineLimit(3)
-//                if linkPreview.description != "" {
-//                    Text(linkPreview.description)
-//                        .font(.subheadline)
-//                        .lineLimit(12)
-//                }
                 Text(linkPreview.uri.absoluteString)
                     .font(.caption)
                     .lineLimit(1)
@@ -37,10 +37,32 @@ struct CILinkView: View {
             }
             .padding(.horizontal, 12)
             .frame(maxWidth: .infinity, alignment: .leading)
+            .simultaneousGesture(TapGesture().onEnded {
+                openBrowserAlert(uri: linkPreview.uri)
+            })
         }
     }
 }
 
+func openBrowserAlert(uri: URL) {
+    showAlert(
+        NSLocalizedString("Open link?", comment: "alert title"),
+        message: uri.absoluteString,
+        actions: {[
+            UIAlertAction(
+                title: NSLocalizedString("Cancel", comment: "alert action"),
+                style: .default,
+                handler: { _ in }
+            ),
+            UIAlertAction(
+                title: NSLocalizedString("Open", comment: "alert action"),
+                style: .default,
+                handler: { _ in UIApplication.shared.open(uri) }
+            )
+        ]}
+    )
+}
+
 struct LargeLinkPreview_Previews: PreviewProvider {
     static var previews: some View {
         let preview = LinkPreview(

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

@@ -20,12 +20,11 @@ struct CIMemberCreatedContactView: View {
             case let .groupRcv(groupMember):
                 if let contactId = groupMember.memberContactId {
                     memberCreatedContactView(openText: "Open")
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
+                            ItemsModel.shared.loadOpenChat("@\(contactId)") {
                                 dismissAllSheets(animated: true)
-                            DispatchQueue.main.async {
-                                ItemsModel.shared.loadOpenChat("@\(contactId)")
-                            }
                             }
+                        })
                 } else {
                     memberCreatedContactView()
                 }

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

@@ -15,7 +15,7 @@ struct CIMetaView: View {
     @Environment(\.showTimestamp) var showTimestamp: Bool
     var chatItem: ChatItem
     var metaColor: Color
-    var paleMetaColor = Color(UIColor.tertiaryLabel)
+    var paleMetaColor = Color(uiColor: .tertiaryLabel)
     var showStatus = true
     var showEdited = true
     var invertedMaterial = false
@@ -152,11 +152,13 @@ func ciMetaText(
     return r.font(.caption)
 }
 
+@inline(__always)
 private func statusIconText(_ icon: String, _ color: Color?) -> Text {
     colored(Text(Image(systemName: icon)), color)
 }
 
 // Applying `foregroundColor(nil)` breaks `.invertedForegroundStyle` modifier
+@inline(__always)
 private func colored(_ t: Text, _ color: Color?) -> Text {
     if let color {
         t.foregroundColor(color)

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

@@ -45,7 +45,7 @@ struct CIRcvDecryptionError: View {
         viewBody()
             .onAppear {
                 // for direct chat ConnectionStats are populated on opening chat, see ChatView onAppear
-                if case let .group(groupInfo) = chat.chatInfo,
+                if case let .group(groupInfo, _) = chat.chatInfo,
                    case let .groupRcv(groupMember) = chatItem.chatDir {
                     do {
                         let (member, stats) = try apiGroupMemberInfoSync(groupInfo.apiId, groupMember.groupMemberId)
@@ -68,7 +68,7 @@ struct CIRcvDecryptionError: View {
             }
     }
 
-    @ViewBuilder private func viewBody() -> some View {
+    private func viewBody() -> some View {
         Group {
             if case let .direct(contact) = chat.chatInfo,
                let contactStats = contact.activeConn?.connectionStats {
@@ -83,7 +83,7 @@ struct CIRcvDecryptionError: View {
                 } else {
                     basicDecryptionErrorItem()
                 }
-            } else if case let .group(groupInfo) = chat.chatInfo,
+            } else if case let .group(groupInfo, _) = chat.chatInfo,
                       case let .groupRcv(groupMember) = chatItem.chatDir,
                       let mem = m.getGroupMember(groupMember.groupMemberId),
                       let memberStats = mem.wrapped.activeConn?.connectionStats {
@@ -133,7 +133,7 @@ struct CIRcvDecryptionError: View {
             CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
-        .onTapGesture(perform: { onClick() })
+        .simultaneousGesture(TapGesture().onEnded(onClick))
         .padding(.vertical, 6)
         .textSelection(.disabled)
     }
@@ -151,7 +151,7 @@ struct CIRcvDecryptionError: View {
             CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
                 .padding(.horizontal, 12)
         }
-        .onTapGesture(perform: { onClick() })
+        .simultaneousGesture(TapGesture().onEnded(onClick))
         .padding(.vertical, 6)
         .textSelection(.disabled)
     }
@@ -161,13 +161,13 @@ struct CIRcvDecryptionError: View {
         let why = Text(decryptErrorReason)
         switch msgDecryptError {
         case .ratchetHeader:
-            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+            message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
         case .tooManySkipped:
-            message = Text("\(msgCount) messages skipped.") + Text("\n") + why
+            message = Text("\(msgCount) messages skipped.") + textNewLine + why
         case .ratchetEarlier:
-            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+            message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
         case .other:
-            message = Text("\(msgCount) messages failed to decrypt.") + Text("\n") + why
+            message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
         case .ratchetSync:
             message = Text("Encryption re-negotiation failed.")
         }

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

@@ -47,17 +47,22 @@ struct CIVideoView: View {
         let file = chatItem.file
         ZStack(alignment: smallView ? .topLeading : .center) {
             ZStack(alignment: .topLeading) {
-                if let file = file, let preview = preview, let decrypted = urlDecrypted, smallView {
-                    smallVideoView(decrypted, file, preview)
-                } else if let file = file, let preview = preview, let player = player, let decrypted = urlDecrypted {
-                    videoView(player, decrypted, file, preview, duration)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil, smallView {
-                    smallVideoViewEncrypted(file, defaultPreview)
-                } else if let file = file, let defaultPreview = preview, file.loaded && urlDecrypted == nil {
-                    videoViewEncrypted(file, defaultPreview, duration)
-                } else if let preview, let file {
+                if let file, let preview {
+                    if let urlDecrypted {
+                        if smallView {
+                            smallVideoView(urlDecrypted, file, preview)
+                        } else if let player {
+                            videoView(player, urlDecrypted, file, preview, duration)
+                        }
+                    } else if file.loaded {
+                        if smallView {
+                            smallVideoViewEncrypted(file, preview)
+                        } else {
+                            videoViewEncrypted(file, preview, duration)
+                        }
+                    } else {
                         Group { if smallView { smallViewImageView(preview, file) } else { imageView(preview) } }
-                        .onTapGesture {
+                            .simultaneousGesture(TapGesture().onEnded {
                                 switch file.fileStatus {
                                 case .rcvInvitation, .rcvAborted:
                                     receiveFileIfValidSize(file: file, receiveFile: receiveFile)
@@ -80,6 +85,7 @@ struct CIVideoView: View {
                                 case .rcvCancelled: () // TODO
                                 default: ()
                                 }
+                            })
                     }
                 }
                 if !smallView {
@@ -87,17 +93,11 @@ struct CIVideoView: View {
                 }
             }
             if !blurred, let file, showDownloadButton(file.fileStatus) {
-                if !smallView {
-                    Button {
-                        receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                    } label: {
+                if !smallView || !file.showStatusIconInSmallView {
                     playPauseIcon("play.fill")
-                    }
-                } else if !file.showStatusIconInSmallView {
-                    playPauseIcon("play.fill")
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                        }
+                        })
                 }
             }
         }
@@ -151,26 +151,25 @@ struct CIVideoView: View {
             ZStack(alignment: .center) {
                 let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
                 imageView(defaultPreview)
-                .onTapGesture {
+                .simultaneousGesture(TapGesture().onEnded {
                     decrypt(file: file) {
                         showFullScreenPlayer = urlDecrypted != nil
                     }
-                }
+                })
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenPlayer = false
                 }
                 if !blurred {
                     if !decryptionInProgress {
-                        Button {
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
+                            .simultaneousGesture(TapGesture().onEnded {
                                 decrypt(file: file) {
                                     if urlDecrypted != nil {
                                         videoPlaying = true
                                         player?.play()
                                     }
                                 }
-                        } label: {
-                            playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-                        }
+                            })
                             .disabled(!canBePlayed)
                     } else {
                         videoDecryptionProgress()
@@ -194,7 +193,8 @@ struct CIVideoView: View {
                     }
                 }
                 .modifier(PrivacyBlur(enabled: !videoPlaying, blurred: $blurred))
-                .onTapGesture {
+                .if(!blurred) { v in
+                    v.simultaneousGesture(TapGesture().onEnded {
                         switch player.timeControlStatus {
                         case .playing:
                             player.pause()
@@ -205,17 +205,17 @@ struct CIVideoView: View {
                             }
                         default: ()
                         }
+                    })
                 }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenPlayer = false
                 }
                 if !videoPlaying && !blurred {
-                    Button {
+                    playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
+                        .simultaneousGesture(TapGesture().onEnded {
                             m.stopPreviousRecPlay = url
                             player.play()
-                    } label: {
-                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-                    }
+                        })
                         .disabled(!canBePlayed)
                 }
             }
@@ -235,7 +235,7 @@ struct CIVideoView: View {
         return ZStack(alignment: .topLeading) {
             let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
             smallViewImageView(preview, file)
-                .onTapGesture {
+                .onTapGesture { // this is shown in chat list, where onTapGesture works
                     decrypt(file: file) {
                         showFullScreenPlayer = urlDecrypted != nil
                     }
@@ -256,7 +256,7 @@ struct CIVideoView: View {
     private func smallVideoView(_ url: URL, _ file: CIFile, _ preview: UIImage) -> some View {
         return ZStack(alignment: .topLeading) {
             smallViewImageView(preview, file)
-                .onTapGesture {
+                .onTapGesture { // this is shown in chat list, where onTapGesture works
                     showFullScreenPlayer = true
                 }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
@@ -354,14 +354,14 @@ struct CIVideoView: View {
             case .sndCancelled: fileIcon("xmark", 10, 13)
             case let .sndError(sndFileError):
                 fileIcon("xmark", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(sndFileError)
-                    }
+                    })
             case let .sndWarning(sndFileError):
                 fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(sndFileError, temporary: true)
-                    }
+                    })
             case .rcvInvitation: fileIcon("arrow.down", 10, 13)
             case .rcvAccepted: fileIcon("ellipsis", 14, 11)
             case let .rcvTransfer(rcvProgress, rcvTotal):
@@ -375,14 +375,14 @@ struct CIVideoView: View {
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case let .rcvError(rcvFileError):
                 fileIcon("xmark", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(rcvFileError)
-                    }
+                    })
             case let .rcvWarning(rcvFileError):
                 fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
+                    .simultaneousGesture(TapGesture().onEnded {
                         showFileErrorAlert(rcvFileError, temporary: true)
-                    }
+                    })
             case .invalid: fileIcon("questionmark", 10, 13)
             }
         }
@@ -429,7 +429,7 @@ struct CIVideoView: View {
             Color.black.edgesIgnoringSafeArea(.all)
             VideoPlayer(player: fullPlayer)
             .overlay(alignment: .topLeading, content: {
-                Button(action: { showFullScreenPlayer = false },
+                Button(action: { showFullScreenPlayer = false }, // this is used in full screen player, Button works here
                     label: {
                         Image(systemName: "multiply")
                         .resizable()

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

@@ -168,14 +168,14 @@ struct VoiceMessagePlayer: View {
                 case .sndCancelled: playbackButton()
                 case let .sndError(sndFileError):
                     fileStatusIcon("multiply", 14)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(sndFileError)
-                        }
+                        })
                 case let .sndWarning(sndFileError):
                     fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(sndFileError, temporary: true)
-                        }
+                        })
                 case .rcvInvitation: downloadButton(recordingFile, "play.fill")
                 case .rcvAccepted: loadingIcon()
                 case .rcvTransfer: loadingIcon()
@@ -184,14 +184,14 @@ struct VoiceMessagePlayer: View {
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case let .rcvError(rcvFileError):
                     fileStatusIcon("multiply", 14)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(rcvFileError)
-                        }
+                        })
                 case let .rcvWarning(rcvFileError):
                     fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
+                        .simultaneousGesture(TapGesture().onEnded {
                             showFileErrorAlert(rcvFileError, temporary: true)
-                        }
+                        })
                 case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 }
             } else {
@@ -255,59 +255,29 @@ struct VoiceMessagePlayer: View {
         }
     }
 
-    @ViewBuilder private func playbackButton() -> some View {
-        if sizeMultiplier != 1 {
+    private func playbackButton() -> some View {
+        let icon = switch playbackState {
+        case .noPlayback: "play.fill"
+        case .playing: "pause.fill"
+        case .paused: "play.fill"
+        }
+        return playPauseIcon(icon, theme.colors.primary)
+            .simultaneousGesture(TapGesture().onEnded { _ in
                 switch playbackState {
                 case .noPlayback:
-                playPauseIcon("play.fill", theme.colors.primary)
-                    .onTapGesture {
                     if let recordingSource = getLoadedFileSource(recordingFile) {
                         startPlayback(recordingSource)
                     }
-                    }
                 case .playing:
-                playPauseIcon("pause.fill", theme.colors.primary)
-                    .onTapGesture {
                     audioPlayer?.pause()
                     playbackState = .paused
                     notifyStateChange()
-                    }
                 case .paused:
-                playPauseIcon("play.fill", theme.colors.primary)
-                    .onTapGesture {
                     audioPlayer?.play()
                     playbackState = .playing
                     notifyStateChange()
                 }
-            }
-        } else {
-            switch playbackState {
-            case .noPlayback:
-                Button {
-                    if let recordingSource = getLoadedFileSource(recordingFile) {
-                        startPlayback(recordingSource)
-                    }
-                } label: {
-                    playPauseIcon("play.fill", theme.colors.primary)
-                }
-            case .playing:
-                Button {
-                    audioPlayer?.pause()
-                    playbackState = .paused
-                    notifyStateChange()
-                } label: {
-                    playPauseIcon("pause.fill", theme.colors.primary)
-                }
-            case .paused:
-                Button {
-                    audioPlayer?.play()
-                    playbackState = .playing
-                    notifyStateChange()
-                } label: {
-                    playPauseIcon("play.fill", theme.colors.primary)
-                }
-            }
-        }
+            })
     }
 
     private func playPauseIcon(_ image: String, _ color: Color/* = .accentColor*/) -> some View {
@@ -329,28 +299,14 @@ struct VoiceMessagePlayer: View {
     }
 
     private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
-        Group {
-            if sizeMultiplier != 1 {
         playPauseIcon(icon, theme.colors.primary)
-                    .onTapGesture {
+            .simultaneousGesture(TapGesture().onEnded {
                 Task {
                     if let user = chatModel.currentUser {
                         await receiveFile(user: user, fileId: recordingFile.fileId)
                     }
                 }
-                    }
-            } else {
-                Button {
-                    Task {
-                        if let user = chatModel.currentUser {
-                            await receiveFile(user: user, fileId: recordingFile.fileId)
-                        }
-                    }
-                } label: {
-                    playPauseIcon(icon, theme.colors.primary)
-                }
-            }
-        }
+            })
     }
 
     func notifyStateChange() {
@@ -430,6 +386,7 @@ struct VoiceMessagePlayer: View {
     }
 }
 
+@inline(__always)
 func voiceMessageSizeBasedOnSquareSize(_ squareSize: CGFloat) -> CGFloat {
     let squareToCircleRatio = 0.935
     return squareSize + squareSize * (1 - squareToCircleRatio)
@@ -446,10 +403,12 @@ class VoiceItemState {
         self.playbackTime = playbackTime
     }
 
+    @inline(__always)
     static func id(_ chat: Chat, _ chatItem: ChatItem) -> String {
         "\(chat.id) \(chatItem.id)"
     }
 
+    @inline(__always)
     static func id(_ chatInfo: ChatInfo, _ chatItem: ChatItem) -> String {
         "\(chatInfo.id) \(chatItem.id)"
     }
@@ -476,6 +435,7 @@ class VoiceItemState {
 
 struct CIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
             meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
@@ -498,10 +458,10 @@ struct CIVoiceView_Previews: PreviewProvider {
                 duration: 30,
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: sentVoiceMessage, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: voiceMessageWtFile, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil), allowMenu: .constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 360))
     }

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

@@ -77,6 +77,7 @@ struct FramedCIVoiceView: View {
 
 struct FramedCIVoiceView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let sentVoiceMessage: ChatItem = ChatItem(
             chatDir: .directSnd,
             meta: CIMeta.getSample(1, .now, "", .sndSent(sndProgress: .complete), itemEdited: true),
@@ -92,11 +93,11 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
             file: CIFile.getSample(fileStatus: .sndComplete)
         )
         Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)))
-            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."))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: sentVoiceMessage, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, 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."), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: voiceMessageWithQuote, scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 360))

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

@@ -13,8 +13,8 @@ import AVKit
 
 struct FullScreenMediaView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var scrollModel: ReverseListScrollModel
     @State var chatItem: ChatItem
+    var scrollToItem: ((ChatItem.ID) -> Void)?
     @State var image: UIImage?
     @State var player: AVPlayer? = nil
     @State var url: URL? = nil
@@ -71,7 +71,7 @@ struct FullScreenMediaView: View {
                 let w = abs(t.width)
                 if t.height > 60 && t.height > w * 2  {
                     showView = false
-                    scrollModel.scrollToItem(id: chatItem.id)
+                    scrollToItem?(chatItem.id)
                 } else if w > 60 && w > abs(t.height) * 2 && !scrolling {
                     let previous = t.width > 0
                     scrolling = true
@@ -126,7 +126,7 @@ struct FullScreenMediaView: View {
                         .scaledToFit()
             }
         }
-        .onTapGesture { showView = false }
+        .onTapGesture { showView = false } // this is used in full screen view, onTapGesture works
     }
 
     private func videoView( _ player: AVPlayer, _ url: URL) -> some View {

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

@@ -31,8 +31,8 @@ struct IntegrityErrorItemView: View {
             case .msgBadHash:
                 AlertManager.shared.showAlert(Alert(
                     title: Text("Bad message hash"),
-                    message: Text("The hash of the previous message is different.") + Text("\n") +
-                        Text(decryptErrorReason) + Text("\n") +
+                    message: Text("The hash of the previous message is different.") + textNewLine +
+                        Text(decryptErrorReason) + textNewLine +
                         Text("Please report it to the developers.")
                 ))
             case .msgBadId: msgBadIdAlert()
@@ -47,7 +47,7 @@ struct IntegrityErrorItemView: View {
             message: Text("""
                 The ID of the next message is incorrect (less or equal to the previous).
                 It can happen because of some bug or when the connection is compromised.
-                """) + Text("\n") +
+                """) + textNewLine +
                 Text("Please report it to the developers.")
         ))
     }
@@ -71,7 +71,7 @@ struct CIMsgError: View {
         .padding(.vertical, 6)
         .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
         .textSelection(.disabled)
-        .onTapGesture(perform: onTap)
+        .simultaneousGesture(TapGesture().onEnded(onTap))
     }
 }
 

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

@@ -14,6 +14,7 @@ struct MarkedDeletedItemView: View {
     @EnvironmentObject var theme: AppTheme
     @Environment(\.revealed) var revealed: Bool
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     var chatItem: ChatItem
 
     var body: some View {
@@ -29,14 +30,14 @@ struct MarkedDeletedItemView: View {
     var mergedMarkedDeletedText: LocalizedStringKey {
         if !revealed,
            let ciCategory = chatItem.mergeCategory,
-           var i = m.getChatItemIndex(chatItem) {
+           var i = m.getChatItemIndex(im, chatItem) {
             var moderated = 0
             var blocked = 0
             var blockedByAdmin = 0
             var deleted = 0
             var moderatedBy: Set<String> = []
-            while i < ItemsModel.shared.reversedChatItems.count,
-                  let ci = .some(ItemsModel.shared.reversedChatItems[i]),
+            while i < im.reversedChatItems.count,
+                  let ci = .some(im.reversedChatItems[i]),
                   ci.mergeCategory == ciCategory,
                   let itemDeleted = ci.meta.itemDeleted {
                 switch itemDeleted {
@@ -85,6 +86,7 @@ struct MarkedDeletedItemView_Previews: PreviewProvider {
         Group {
             MarkedDeletedItemView(
                 chat: Chat.sampleData,
+                im: ItemsModel.shared,
                 chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))
             ).environment(\.revealed, true)
         }

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

@@ -11,51 +11,74 @@ import SimpleXChat
 
 let uiLinkColor = UIColor(red: 0, green: 0.533, blue: 1, alpha: 1)
 
-private let noTyping = Text(verbatim: "   ")
-
-private let typingIndicators: [Text] = [
-    (typing(.black) + typing() + typing()),
-    (typing(.bold) + typing(.black) + typing()),
-    (typing() + typing(.bold) + typing(.black)),
-    (typing() + typing() + typing(.bold))
-]
-
-private func typing(_ w: Font.Weight = .light) -> Text {
-    Text(".").fontWeight(w)
+private func typing(_ theme: AppTheme, _ descr: UIFontDescriptor, _ ws: [UIFont.Weight]) -> NSMutableAttributedString {
+    let res = NSMutableAttributedString()
+    for w in ws {
+        res.append(NSAttributedString(string: ".", attributes: [
+            .font: UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: w),
+            .kern: -2 as NSNumber,
+            .foregroundColor: UIColor(theme.colors.secondary)
+        ]))
+    }
+    return res
 }
 
 struct MsgContentView: View {
     @ObservedObject var chat: Chat
     @Environment(\.showTimestamp) var showTimestamp: Bool
+    @Environment(\.containerBackground) var containerBackground: UIColor
     @EnvironmentObject var theme: AppTheme
     var text: String
     var formattedText: [FormattedText]? = nil
+    var textStyle: UIFont.TextStyle
     var sender: String? = nil
     var meta: CIMeta? = nil
+    var mentions: [String: CIMention]? = nil
+    var userMemberId: String? = nil
     var rightToLeft = false
-    var showSecrets: Bool
-    var prefix: Text? = nil
+    var prefix: NSAttributedString? = nil
+    @State private var showSecrets: Set<Int> = []
     @State private var typingIdx = 0
     @State private var timer: Timer?
+    @State private var typingIndicators: [NSAttributedString] = []
+    @State private var noTyping = NSAttributedString(string: "   ")
+    @State private var phase: CGFloat = 0
 
     @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
 
     var body: some View {
+        let v = msgContentView()
         if meta?.isLive == true {
-            msgContentView()
-            .onAppear { switchTyping() }
+            v.onAppear {
+                let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .body)
+                noTyping = NSAttributedString(string: "   ", attributes: [
+                    .font: UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: .regular),
+                    .kern: -2 as NSNumber,
+                    .foregroundColor: UIColor(theme.colors.secondary)
+                ])
+                switchTyping()
+            }
             .onDisappear(perform: stopTyping)
             .onChange(of: meta?.isLive, perform: switchTyping)
             .onChange(of: meta?.recent, perform: switchTyping)
         } else {
-            msgContentView()
+            v
         }
     }
 
     private func switchTyping(_: Bool? = nil) {
         if let meta = meta, meta.isLive && meta.recent {
+            if typingIndicators.isEmpty {
+                let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .body)
+                typingIndicators = [
+                    typing(theme, descr, [.black, .light, .light]),
+                    typing(theme, descr, [.bold, .black, .light]),
+                    typing(theme, descr, [.light, .bold, .black]),
+                    typing(theme, descr, [.light, .light, .bold])
+                ]
+            }
             timer = timer ?? Timer.scheduledTimer(withTimeInterval: 0.25, repeats: true) { _ in
-                typingIdx = (typingIdx + 1) % typingIndicators.count
+                typingIdx = typingIdx + 1
             }
         } else {
             stopTyping()
@@ -65,100 +88,276 @@ struct MsgContentView: View {
     private func stopTyping() {
         timer?.invalidate()
         timer = nil
+        typingIdx = 0
     }
 
-    private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary, prefix: prefix)
+    @inline(__always)
+    private func msgContentView() -> some View {
+        let r = messageText(text, formattedText, textStyle: textStyle, sender: sender, mentions: mentions, userMemberId: userMemberId, showSecrets: showSecrets, backgroundColor: containerBackground, prefix: prefix)
+        let s = r.string
+        let t: Text
         if let mt = meta {
             if mt.isLive {
-                v = v + typingIndicator(mt.recent)
+                s.append(typingIndicator(mt.recent))
             }
-            v = v + reserveSpaceForMeta(mt)
+            t = Text(AttributedString(s)) + reserveSpaceForMeta(mt)
+        } else {
+            t = Text(AttributedString(s))
         }
-        return v
+        return msgTextResultView(r, t, showSecrets: $showSecrets)
     }
 
-    private func typingIndicator(_ recent: Bool) -> Text {
-        return (recent ? typingIndicators[typingIdx] : noTyping)
-            .font(.body.monospaced())
-            .kerning(-2)
-            .foregroundColor(theme.colors.secondary)
+    @inline(__always)
+    private func typingIndicator(_ recent: Bool) -> NSAttributedString {
+        recent && !typingIndicators.isEmpty
+        ? typingIndicators[typingIdx % 4]
+        : noTyping
     }
 
+    @inline(__always)
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text(verbatim: "   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+        (rightToLeft ? textNewLine : Text(verbatim: "   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
     }
 }
 
-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool, secondaryColor: Color, prefix: Text? = nil) -> Text {
-    let s = text
-    var res: Text
-    
-    if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
-        res = formatText(ft[0], preview, showSecret: showSecrets)
-        var i = 1
-        while i < ft.count {
-            res = res + formatText(ft[i], preview, showSecret: showSecrets)
-            i = i + 1
+func msgTextResultView(_ r: MsgTextResult, _ t: Text, showSecrets: Binding<Set<Int>>? = nil) -> some View {
+    t.if(r.hasSecrets, transform: hiddenSecretsView)
+        .if(r.handleTaps) { $0.overlay(handleTextTaps(r.string, showSecrets: showSecrets)) }
 }
+
+@inline(__always)
+private func handleTextTaps(_ s: NSAttributedString, showSecrets: Binding<Set<Int>>? = nil) -> some View {
+    return GeometryReader { g in
+        Rectangle()
+            .fill(Color.clear)
+            .contentShape(Rectangle())
+            .simultaneousGesture(DragGesture(minimumDistance: 0).onEnded { event in
+                let t = event.translation
+                if t.width * t.width + t.height * t.height > 100 { return }
+                let framesetter = CTFramesetterCreateWithAttributedString(s as CFAttributedString)
+                let path = CGPath(rect: CGRect(origin: .zero, size: g.size), transform: nil)
+                let frame = CTFramesetterCreateFrame(framesetter, CFRangeMake(0, s.length), path, nil)
+                let point = CGPoint(x: event.location.x, y: g.size.height - event.location.y) // Flip y for UIKit
+                var index: CFIndex?
+                if let lines = CTFrameGetLines(frame) as? [CTLine] {
+                    var origins = [CGPoint](repeating: .zero, count: lines.count)
+                    CTFrameGetLineOrigins(frame, CFRangeMake(0, 0), &origins)
+                    for i in 0 ..< lines.count {
+                        let bounds = CTLineGetBoundsWithOptions(lines[i], .useOpticalBounds)
+                        if bounds.offsetBy(dx: origins[i].x, dy: origins[i].y).contains(point) {
+                            index = CTLineGetStringIndexForPosition(lines[i], point)
+                            break
+                        }
+                    }
+                }
+                if let index, let (url, browser) = attributedStringLink(s, for: index) {
+                    if browser {
+                        openBrowserAlert(uri: url)
                     } else {
-        res = Text(s)
+                        UIApplication.shared.open(url)
+                    }
+                }
+            })
     }
 
-    if let i = icon {
-        res = Text(Image(systemName: i)).foregroundColor(secondaryColor) + textSpace + res
-    }
-    
-    if let p = prefix {
-        res = p + res
-    }
-
-    if let s = sender {
-        let t = Text(s)
-        return (preview ? t : t.fontWeight(.medium)) + Text(": ") + res
+    func attributedStringLink(_ s: NSAttributedString, for index: CFIndex) -> (URL, Bool)? {
+        var linkURL: URL?
+        var browser: Bool = false
+        s.enumerateAttributes(in: NSRange(location: 0, length: s.length)) { attrs, range, stop in
+            if index >= range.location && index < range.location + range.length {
+                if let url = attrs[linkAttrKey] as? NSURL {
+                    linkURL = url.absoluteURL
+                    browser = attrs[webLinkAttrKey] != nil
+                } else if let showSecrets, let i = attrs[secretAttrKey] as? Int {
+                    if showSecrets.wrappedValue.contains(i) {
+                        showSecrets.wrappedValue.remove(i)
                     } else {
-        return res
+                        showSecrets.wrappedValue.insert(i)
+                    }
+                }
+                stop.pointee = true
+            }
+        }
+        return if let linkURL { (linkURL, browser) } else { nil }
     }
 }
 
-private func formatText(_ ft: FormattedText, _ preview: Bool, showSecret: Bool) -> Text {
-    let t = ft.text
-    if let f = ft.format {
-        switch (f) {
-        case .bold: return Text(t).bold()
-        case .italic: return Text(t).italic()
-        case .strikeThrough: return Text(t).strikethrough()
-        case .snippet: return Text(t).font(.body.monospaced())
-        case .secret: return
-            showSecret
-            ? Text(t)
-            : Text(AttributedString(t, attributes: AttributeContainer([
-                .foregroundColor: UIColor.clear as Any,
-                .backgroundColor: UIColor.secondarySystemFill as Any
-            ])))
-        case let .colored(color): return Text(t).foregroundColor(color.uiColor)
-        case .uri: return linkText(t, t, preview, prefix: "")
+func hiddenSecretsView<V: View>(_ v: V) -> some View {
+    v.overlay(
+        GeometryReader { g in
+            let size = (g.size.width + g.size.height) / 1.4142
+            Image("vertical_logo")
+                .resizable(resizingMode: .tile)
+                .frame(width: size, height: size)
+                .rotationEffect(.degrees(45), anchor: .center)
+                .position(x: g.size.width / 2, y: g.size.height / 2)
+                .clipped()
+                .saturation(0.65)
+                .opacity(0.35)
+        }
+        .mask(v)
+    )
+}
+
+private let linkAttrKey = NSAttributedString.Key("chat.simplex.app.link")
+
+private let webLinkAttrKey = NSAttributedString.Key("chat.simplex.app.webLink")
+
+private let secretAttrKey = NSAttributedString.Key("chat.simplex.app.secret")
+
+typealias MsgTextResult = (string: NSMutableAttributedString, hasSecrets: Bool, handleTaps: Bool)
+
+func messageText(
+    _ text: String,
+    _ formattedText: [FormattedText]?,
+    textStyle: UIFont.TextStyle = .body,
+    sender: String?,
+    preview: Bool = false,
+    mentions: [String: CIMention]?,
+    userMemberId: String?,
+    showSecrets: Set<Int>?,
+    backgroundColor: UIColor,
+    prefix: NSAttributedString? = nil
+) -> MsgTextResult {
+    let res = NSMutableAttributedString()
+    let descr = UIFontDescriptor.preferredFontDescriptor(withTextStyle: textStyle)
+    let font = UIFont.preferredFont(forTextStyle: textStyle)
+    let plain: [NSAttributedString.Key: Any] = [
+        .font: font,
+        .foregroundColor: UIColor.label
+    ]
+    let secretColor = backgroundColor.withAlphaComponent(1)
+    var link: [NSAttributedString.Key: Any]?
+    var hasSecrets = false
+    var handleTaps = false
+
+    if let sender {
+        if preview {
+            res.append(NSAttributedString(string: sender + ": ", attributes: plain))
+        } else {
+            var attrs = plain
+            attrs[.font] = UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.medium]]), size: descr.pointSize)
+            res.append(NSAttributedString(string: sender, attributes: attrs))
+            res.append(NSAttributedString(string: ": ", attributes: plain))
+        }
+    }
+
+    if let prefix {
+        res.append(prefix)
+    }
+
+    if let fts = formattedText, fts.count > 0 {
+        var bold: UIFont?
+        var italic: UIFont?
+        var snippet: UIFont?
+        var mention: UIFont?
+        var secretIdx: Int = 0
+        for ft in fts {
+            var t = ft.text
+            var attrs = plain
+            switch (ft.format) {
+            case .bold:
+                bold = bold ?? UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.bold]]), size: descr.pointSize)
+                attrs[.font] = bold
+            case .italic:
+                italic = italic ?? UIFont(descriptor: descr.withSymbolicTraits(.traitItalic) ?? descr, size: descr.pointSize)
+                attrs[.font] = italic
+            case .strikeThrough:
+                attrs[.strikethroughStyle] = NSUnderlineStyle.single.rawValue
+            case .snippet:
+                snippet = snippet ?? UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: .regular)
+                attrs[.font] = snippet
+            case .secret:
+                if let showSecrets {
+                    if !showSecrets.contains(secretIdx) {
+                        attrs[.foregroundColor] = UIColor.clear
+                        attrs[.backgroundColor] = secretColor
+                    }
+                    attrs[secretAttrKey] = secretIdx
+                    secretIdx += 1
+                    handleTaps = true
+                } else {
+                    attrs[.foregroundColor] = UIColor.clear
+                    attrs[.backgroundColor] = secretColor
+                }
+                hasSecrets = true
+            case let .colored(color):
+                if let c = color.uiColor {
+                    attrs[.foregroundColor] = UIColor(c)
+                }
+            case .uri:
+                attrs = linkAttrs()
+                if !preview {
+                    let s = t.lowercased()
+                    let link = s.hasPrefix("http://") || s.hasPrefix("https://")
+                                ? t
+                                : "https://" + t
+                    attrs[linkAttrKey] = NSURL(string: link)
+                    attrs[webLinkAttrKey] = true
+                    handleTaps = true
+                }
             case let .simplexLink(linkType, simplexUri, smpHosts):
-            switch privacySimplexLinkModeDefault.get() {
-            case .description: return linkText(simplexLinkText(linkType, smpHosts), simplexUri, preview, prefix: "")
-            case .full: return linkText(t, simplexUri, preview, prefix: "")
-            case .browser: return linkText(t, simplexUri, preview, prefix: "")
+                attrs = linkAttrs()
+                if !preview {
+                    attrs[linkAttrKey] = NSURL(string: simplexUri)
+                    handleTaps = true
                 }
-        case .email: return linkText(t, t, preview, prefix: "mailto:")
-        case .phone: return linkText(t, t.replacingOccurrences(of: " ", with: ""), preview, prefix: "tel:")
+                if case .description = privacySimplexLinkModeDefault.get() {
+                    t = simplexLinkText(linkType, smpHosts)
+                }
+            case let .mention(memberName):
+                if let m = mentions?[memberName] {
+                    mention = mention ?? UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.semibold]]), size: descr.pointSize)
+                    attrs[.font] = mention
+                    if let ref = m.memberRef {
+                        let name: String = if let alias = ref.localAlias, alias != "" {
+                            "\(alias) (\(ref.displayName))"
+                        } else {
+                            ref.displayName
+                        }
+                        if m.memberId == userMemberId {
+                            attrs[.foregroundColor] = UIColor.tintColor
+                        }
+                        t = mentionText(name)
+                    } else {
+                        t = mentionText(memberName)
+                    }
+                }
+            case .email:
+                attrs = linkAttrs()
+                if !preview {
+                    attrs[linkAttrKey] = NSURL(string: "mailto:" + ft.text)
+                    handleTaps = true
+                }
+            case .phone:
+                attrs = linkAttrs()
+                if !preview {
+                    attrs[linkAttrKey] = NSURL(string: "tel:" + t.replacingOccurrences(of: " ", with: ""))
+                    handleTaps = true
+                }
+            case .none: ()
+            }
+            res.append(NSAttributedString(string: t, attributes: attrs))
         }
     } else {
-        return Text(t)
+        res.append(NSMutableAttributedString(string: text, attributes: plain))
+    }
+    
+    return (string: res, hasSecrets: hasSecrets, handleTaps: handleTaps)
+
+    func linkAttrs() -> [NSAttributedString.Key: Any] {
+        link = link ?? [
+            .font: font,
+            .foregroundColor: uiLinkColor,
+            .underlineStyle: NSUnderlineStyle.single.rawValue
+        ]
+        return link!
     }
 }
 
-private func linkText(_ s: String, _ link: String, _ preview: Bool, prefix: String, color: Color = Color(uiColor: uiLinkColor), uiColor: UIColor = uiLinkColor) -> Text {
-    preview
-    ? Text(s).foregroundColor(color).underline(color: color)
-    : Text(AttributedString(s, attributes: AttributeContainer([
-        .link: NSURL(string: prefix + link) as Any,
-        .foregroundColor: uiColor as Any
-    ]))).underline()
+@inline(__always)
+private func mentionText(_ name: String) -> String {
+    name.contains(" @") ? "@'\(name)'" : "@\(name)"
 }
 
 func simplexLinkText(_ linkType: SimplexLinkType, _ smpHosts: [String]) -> String {
@@ -172,9 +371,9 @@ struct MsgContentView_Previews: PreviewProvider {
             chat: Chat.sampleData,
             text: chatItem.text,
             formattedText: chatItem.formattedText,
+            textStyle: .body,
             sender: chatItem.memberDisplayName,
-            meta: chatItem.meta,
-            showSecrets: false
+            meta: chatItem.meta
         )
         .environmentObject(Chat.sampleData)
     }

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

@@ -41,7 +41,7 @@ struct ChatItemForwardingView: View {
         .alert(item: $alert) { $0.alert }
     }
 
-    @ViewBuilder private func forwardListView() -> some View {
+    private func forwardListView() -> some View {
         VStack(alignment: .leading) {
             if !chatsToForwardTo.isEmpty {
                 List {

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

@@ -14,6 +14,7 @@ struct ChatItemInfoView: View {
     @Environment(\.dismiss) var dismiss
     @EnvironmentObject var theme: AppTheme
     var ci: ChatItem
+    var userMemberId: String?
     @Binding var chatItemInfo: ChatItemInfo?
     @State private var selection: CIInfoTab = .history
     @State private var alert: CIInfoViewAlert? = nil
@@ -130,9 +131,9 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func details() -> some View {
+    private func details() -> some View {
         let meta = ci.meta
-        VStack(alignment: .leading, spacing: 16) {
+        return VStack(alignment: .leading, spacing: 16) {
             Text(title)
                 .font(.largeTitle)
                 .bold()
@@ -196,7 +197,7 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func historyTab() -> some View {
+    private func historyTab() -> some View {
         GeometryReader { g in
             let maxWidth = (g.size.width - 32) * 0.84
             ScrollView {
@@ -226,12 +227,13 @@ 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)
+    private func itemVersionView(_ itemVersion: ChatItemVersion, _ maxWidth: CGFloat, current: Bool) -> some View {
+        let backgroundColor = chatItemFrameColor(ci, theme)
+        return VStack(alignment: .leading, spacing: 4) {
+            textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil, backgroundColor: UIColor(backgroundColor))
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
-                .background(chatItemFrameColor(ci, theme))
+                .background(backgroundColor)
                 .modifier(ChatItemClipped())
                 .contextMenu {
                     if itemVersion.msgContent.text != "" {
@@ -256,9 +258,9 @@ struct ChatItemInfoView: View {
         .frame(maxWidth: maxWidth, alignment: .leading)
     }
 
-    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil) -> some View {
+    @ViewBuilder private func textBubble(_ text: String, _ formattedText: [FormattedText]?, _ sender: String? = nil, backgroundColor: UIColor) -> some View {
         if text != "" {
-            TextBubble(text: text, formattedText: formattedText, sender: sender)
+            TextBubble(text: text, formattedText: formattedText, sender: sender, mentions: ci.mentions, userMemberId: userMemberId, backgroundColor: backgroundColor)
         } else {
             Text("no text")
                 .italic()
@@ -271,14 +273,18 @@ struct ChatItemInfoView: View {
         var text: String
         var formattedText: [FormattedText]?
         var sender: String? = nil
-        @State private var showSecrets = false
+        var mentions: [String: CIMention]?
+        var userMemberId: String?
+        var backgroundColor: UIColor
+        @State private var showSecrets: Set<Int> = []
 
         var body: some View {
-            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary))
+            let r = messageText(text, formattedText, sender: sender, mentions: mentions, userMemberId: userMemberId, showSecrets: showSecrets, backgroundColor: backgroundColor)
+            return msgTextResultView(r, Text(AttributedString(r.string)), showSecrets: $showSecrets)
         }
     }
 
-    @ViewBuilder private func quoteTab(_ qi: CIQuote) -> some View {
+    private func quoteTab(_ qi: CIQuote) -> some View {
         GeometryReader { g in
             let maxWidth = (g.size.width - 32) * 0.84
             ScrollView {
@@ -296,9 +302,10 @@ 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))
+    private func quotedMsgView(_ qi: CIQuote, _ maxWidth: CGFloat) -> some View {
+        let backgroundColor = quotedMsgFrameColor(qi, theme)
+        return VStack(alignment: .leading, spacing: 4) {
+            textBubble(qi.text, qi.formattedText, qi.getSender(nil), backgroundColor: UIColor(backgroundColor))
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
                 .background(quotedMsgFrameColor(qi, theme))
@@ -331,7 +338,7 @@ struct ChatItemInfoView: View {
         : theme.appColors.receivedMessage
     }
 
-    @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
+    private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 16) {
                 details()
@@ -351,10 +358,11 @@ struct ChatItemInfoView: View {
             Button {
                 Task {
                     await MainActor.run {
-                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
+                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id) {
                             dismiss()
                         }
                     }
+                }
             } label: {
                 forwardedFromSender(forwardedFromItem)
             }
@@ -368,7 +376,7 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
+    private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
         HStack {
             ChatInfoImage(chat: Chat(chatInfo: forwardedFromItem.chatInfo), size: 48)
                 .padding(.trailing, 6)
@@ -399,7 +407,7 @@ struct ChatItemInfoView: View {
         }
     }
 
-    @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+    private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
         ScrollView {
             VStack(alignment: .leading, spacing: 16) {
                 details()
@@ -414,7 +422,7 @@ struct ChatItemInfoView: View {
         .frame(maxHeight: .infinity, alignment: .top)
     }
 
-    @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
+    private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
         LazyVStack(alignment: .leading, spacing: 12) {
             let mss = membersStatuses(memberDeliveryStatuses)
             if !mss.isEmpty {
@@ -548,6 +556,6 @@ func localTimestamp(_ date: Date) -> String {
 
 struct ChatItemInfoView_Previews: PreviewProvider {
     static var previews: some View {
-        ChatItemInfoView(ci: ChatItem.getSample(1, .directSnd, .now, "hello"), chatItemInfo: Binding.constant(nil))
+        ChatItemInfoView(ci: ChatItem.getSample(1, .directSnd, .now, "hello"), userMemberId: Chat.sampleData.chatInfo.groupInfo?.membership.memberId, chatItemInfo: Binding.constant(nil))
     }
 }

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

@@ -18,6 +18,10 @@ extension EnvironmentValues {
         static let defaultValue: Bool = true
     }
 
+    struct ContainerBackground: EnvironmentKey {
+        static let defaultValue: UIColor = .clear
+    }
+
     var showTimestamp: Bool {
         get { self[ShowTimestamp.self] }
         set { self[ShowTimestamp.self] = newValue }
@@ -27,26 +31,40 @@ extension EnvironmentValues {
         get { self[Revealed.self] }
         set { self[Revealed.self] = newValue }
     }
+
+    var containerBackground: UIColor {
+        get { self[ContainerBackground.self] }
+        set { self[ContainerBackground.self] = newValue }
+    }
 }
 
 struct ChatItemView: View {
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.showTimestamp) var showTimestamp: Bool
     @Environment(\.revealed) var revealed: Bool
     var chatItem: ChatItem
+    var scrollToItem: (ChatItem.ID) -> Void
+    @Binding var scrollToItemId: ChatItem.ID?
     var maxWidth: CGFloat = .infinity
     @Binding var allowMenu: Bool
 
     init(
         chat: Chat,
+        im: ItemsModel,
         chatItem: ChatItem,
+        scrollToItem: @escaping (ChatItem.ID) -> Void,
+        scrollToItemId: Binding<ChatItem.ID?> = .constant(nil),
         showMember: Bool = false,
         maxWidth: CGFloat = .infinity,
         allowMenu: Binding<Bool> = .constant(false)
     ) {
         self.chat = chat
+        self.im = im
         self.chatItem = chatItem
+        self.scrollToItem = scrollToItem
+        _scrollToItemId = scrollToItemId
         self.maxWidth = maxWidth
         _allowMenu = allowMenu
     }
@@ -54,14 +72,14 @@ struct ChatItemView: View {
     var body: some View {
         let ci = chatItem
         if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem)
+            MarkedDeletedItemView(chat: chat, im: im, chatItem: chatItem)
         } else if ci.quotedItem == nil && ci.meta.itemForwarded == 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)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
                 CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, im: im, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -89,7 +107,10 @@ struct ChatItemView: View {
         }()
         return FramedItemView(
             chat: chat,
+            im: im,
             chatItem: chatItem,
+            scrollToItem: scrollToItem,
+            scrollToItemId: $scrollToItemId,
             preview: preview,
             maxWidth: maxWidth,
             imgWidth: adjustedMaxWidth,
@@ -104,6 +125,7 @@ struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var theme: AppTheme
     @Environment(\.revealed) var revealed: Bool
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     var chatItem: ChatItem
     var msgContentView: () -> Content
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
@@ -127,7 +149,9 @@ struct ChatItemContentView<Content: View>: View {
         case let .sndGroupInvitation(groupInvitation, memberRole): groupInvitationItemView(groupInvitation, memberRole)
         case .rcvDirectEvent: eventItemView()
         case .rcvGroupEvent(.memberCreatedContact): CIMemberCreatedContactView(chatItem: chatItem)
+        case .rcvGroupEvent(.newMemberPendingReview): CIEventView(eventText: pendingReviewEventItemText())
         case .rcvGroupEvent: eventItemView()
+        case .sndGroupEvent(.userPendingReview): CIEventView(eventText: pendingReviewEventItemText())
         case .sndGroupEvent: eventItemView()
         case .rcvConnEvent: eventItemView()
         case .sndConnEvent: eventItemView()
@@ -136,7 +160,7 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvChatPreference(feature, allowed, param):
             CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
+            CIChatFeatureView(chat: chat, im: im, chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
         case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
         case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -168,6 +192,13 @@ struct ChatItemContentView<Content: View>: View {
         CIEventView(eventText: eventItemViewText(theme.colors.secondary))
     }
 
+    private func pendingReviewEventItemText() -> Text {
+        Text(chatItem.content.text)
+            .font(.caption)
+            .foregroundColor(theme.colors.secondary)
+            .fontWeight(.bold)
+    }
+
     private func eventItemViewText(_ secondaryColor: Color) -> Text {
         if !revealed, let t = mergedGroupEventText {
             return chatEventText(t + textSpace + chatItem.timestampText, secondaryColor)
@@ -183,7 +214,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chat: chat, im: im, chatItem: chatItem, feature: feature, iconColor: iconColor)
     }
 
     private var mergedGroupEventText: Text? {
@@ -243,16 +274,17 @@ func chatEventText(_ ci: ChatItem, _ secondaryColor: Color) -> Text {
 
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         Group{
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true)).environment(\.revealed, true)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true)).environment(\.revealed, true)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getDeletedContentSample(), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil))
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil)).environment(\.revealed, true)
+            ChatItemView(chat: Chat.sampleData, im: im, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil)).environment(\.revealed, true)
         }
         .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 70))
@@ -262,57 +294,72 @@ struct ChatItemView_Previews: PreviewProvider {
 
 struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
     static var previews: some View {
+        let im = ItemsModel.shared
         let ciFeatureContent = CIContent.rcvChatFeature(feature: .fullDelete, enabled: FeatureEnabled(forUser: false, forContact: false), param: nil)
         Group{
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: 1, toMsgId: 2)),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "1 skipped message", .rcvRead),
                     content: .rcvDecryptionError(msgDecryptError: .ratchetHeader, msgCount: 2),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in }, scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "received invitation to join group team as admin", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvGroupInvitation(groupInvitation: CIGroupInvitation.getSample(status: .pending), memberRole: .admin),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, "group event text", .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: .rcvGroupEvent(rcvGroupEvent: .memberAdded(groupMemberId: 1, profile: Profile.sampleData)),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
             ChatItemView(
                 chat: Chat.sampleData,
+                im: im,
                 chatItem: ChatItem(
                     chatDir: .directRcv,
                     meta: CIMeta.getSample(1, .now, ciFeatureContent.text, .rcvRead, itemDeleted: .deleted(deletedTs: .now)),
                     content: ciFeatureContent,
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                scrollToItem: { _ in },
+                scrollToItemId: Binding.constant(nil)
             )
         }
         .environment(\.revealed, true)

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

@@ -0,0 +1,516 @@
+//
+//  ChatItemsLoader.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 17.12.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SimpleXChat
+import SwiftUI
+
+let TRIM_KEEP_COUNT = 200
+
+func apiLoadMessages(
+    _ chatId: ChatId,
+    _ im: ItemsModel,
+    _ pagination: ChatPagination,
+    _ search: String = "",
+    _ openAroundItemId: ChatItem.ID? = nil,
+    _ visibleItemIndexesNonReversed: @MainActor () -> ClosedRange<Int> = { 0 ... 0 }
+) async {
+    let chat: Chat
+    let navInfo: NavigationInfo
+    do {
+        (chat, navInfo) = try await apiGetChat(chatId: chatId, scope: im.groupScopeInfo?.toChatScope(), contentTag: im.contentTag, pagination: pagination, search: search)
+    } catch let error {
+        logger.error("apiLoadMessages error: \(responseError(error))")
+        return
+    }
+
+    let chatModel = ChatModel.shared
+
+    // For .initial allow the chatItems to be empty as well as chatModel.chatId to not match this chat because these values become set after .initial finishes
+    let paginationIsInitial = switch pagination { case .initial: true; default: false }
+    let paginationIsLast = switch pagination { case .last: true; default: false }
+    // When openAroundItemId is provided, chatId can be different too
+    if ((chatModel.chatId != chat.id || chat.chatItems.isEmpty) && !paginationIsInitial && !paginationIsLast && openAroundItemId == nil) || Task.isCancelled {
+        return
+    }
+
+    let unreadAfterItemId = im.chatState.unreadAfterItemId
+
+    let oldItems = Array(im.reversedChatItems.reversed())
+    var newItems: [ChatItem] = []
+    switch pagination {
+    case .initial:
+        let newSplits: [Int64] = if !chat.chatItems.isEmpty && navInfo.afterTotal > 0 { [chat.chatItems.last!.id] } else { [] }
+        if im.secondaryIMFilter == nil && chatModel.getChat(chat.id) == nil {
+            chatModel.addChat(chat)
+        }
+        await MainActor.run {
+            im.reversedChatItems = chat.chatItems.reversed()
+            if im.secondaryIMFilter == nil {
+                chatModel.updateChatInfo(chat.chatInfo)
+            }
+            im.chatState.splits = newSplits
+            if !chat.chatItems.isEmpty {
+                im.chatState.unreadAfterItemId = chat.chatItems.last!.id
+            }
+            im.chatState.totalAfter = navInfo.afterTotal
+            im.chatState.unreadTotal = chat.chatStats.unreadCount
+            im.chatState.unreadAfter = navInfo.afterUnread
+            im.chatState.unreadAfterNewestLoaded = navInfo.afterUnread
+
+            im.preloadState.clear()
+        }
+    case let .before(paginationChatItemId, _):
+        newItems.append(contentsOf: oldItems)
+        let indexInCurrentItems = oldItems.firstIndex(where: { $0.id == paginationChatItemId })
+        guard let indexInCurrentItems else { return }
+        let (newIds, _) = mapItemsToIds(chat.chatItems)
+        let wasSize = newItems.count
+        let visibleItemIndexes = await MainActor.run { visibleItemIndexesNonReversed() }
+        let modifiedSplits = removeDuplicatesAndModifySplitsOnBeforePagination(
+            unreadAfterItemId, &newItems, newIds, im.chatState.splits, visibleItemIndexes
+        )
+        let insertAt = max((indexInCurrentItems - (wasSize - newItems.count) + modifiedSplits.trimmedIds.count), 0)
+        newItems.insert(contentsOf: chat.chatItems, at: insertAt)
+        let newReversed: [ChatItem] = newItems.reversed()
+        await MainActor.run {
+            im.reversedChatItems = newReversed
+            im.chatState.splits = modifiedSplits.newSplits
+            im.chatState.moveUnreadAfterItem(modifiedSplits.oldUnreadSplitIndex, modifiedSplits.newUnreadSplitIndex, oldItems)
+        }
+    case let .after(paginationChatItemId, _):
+        newItems.append(contentsOf: oldItems)
+        let indexInCurrentItems = oldItems.firstIndex(where: { $0.id == paginationChatItemId })
+        guard let indexInCurrentItems else { return }
+
+        let mappedItems = mapItemsToIds(chat.chatItems)
+        let newIds = mappedItems.0
+        let (newSplits, unreadInLoaded) = removeDuplicatesAndModifySplitsOnAfterPagination(
+            mappedItems.1, paginationChatItemId, &newItems, newIds, chat, im.chatState.splits
+        )
+        let indexToAdd = min(indexInCurrentItems + 1, newItems.count)
+        let indexToAddIsLast = indexToAdd == newItems.count
+        newItems.insert(contentsOf: chat.chatItems, at: indexToAdd)
+        let new: [ChatItem] = newItems
+        let newReversed: [ChatItem] = newItems.reversed()
+        await MainActor.run {
+            im.reversedChatItems = newReversed
+            im.chatState.splits = newSplits
+            im.chatState.moveUnreadAfterItem(im.chatState.splits.first ?? new.last!.id, new)
+            // loading clear bottom area, updating number of unread items after the newest loaded item
+            if indexToAddIsLast {
+                im.chatState.unreadAfterNewestLoaded -= unreadInLoaded
+            }
+        }
+    case .around:
+        var newSplits: [Int64]
+        if openAroundItemId == nil {
+            newItems.append(contentsOf: oldItems)
+            newSplits = await removeDuplicatesAndUpperSplits(&newItems, chat, im.chatState.splits, visibleItemIndexesNonReversed)
+        } else {
+            newSplits = []
+        }
+        let (itemIndex, splitIndex) = indexToInsertAround(chat.chatInfo.chatType, chat.chatItems.last, to: newItems, Set(newSplits))
+        //indexToInsertAroundTest()
+        newItems.insert(contentsOf: chat.chatItems, at: itemIndex)
+        newSplits.insert(chat.chatItems.last!.id, at: splitIndex)
+        let newReversed: [ChatItem] = newItems.reversed()
+        let orderedSplits = newSplits
+        await MainActor.run {
+            im.reversedChatItems = newReversed
+            im.chatState.splits = orderedSplits
+            im.chatState.unreadAfterItemId = chat.chatItems.last!.id
+            im.chatState.totalAfter = navInfo.afterTotal
+            im.chatState.unreadTotal = chat.chatStats.unreadCount
+            im.chatState.unreadAfter = navInfo.afterUnread
+
+            if let openAroundItemId {
+                im.chatState.unreadAfterNewestLoaded = navInfo.afterUnread
+                if im.secondaryIMFilter == nil {
+                    ChatModel.shared.openAroundItemId = openAroundItemId // TODO [knocking] move openAroundItemId from ChatModel to ItemsModel?
+                    ChatModel.shared.chatId = chat.id
+                }
+            } else {
+                // no need to set it, count will be wrong
+                // chatState.unreadAfterNewestLoaded = navInfo.afterUnread
+            }
+            im.preloadState.clear()
+        }
+    case .last:
+        newItems.append(contentsOf: oldItems)
+        let newSplits = await removeDuplicatesAndUnusedSplits(&newItems, chat, im.chatState.splits)
+        newItems.append(contentsOf: chat.chatItems)
+        let items = newItems
+        await MainActor.run {
+            im.reversedChatItems = items.reversed()
+            im.chatState.splits = newSplits
+            if im.secondaryIMFilter == nil {
+                chatModel.updateChatInfo(chat.chatInfo)
+            }
+            im.chatState.unreadAfterNewestLoaded = 0
+        }
+    }
+}
+
+
+private class ModifiedSplits {
+    let oldUnreadSplitIndex: Int
+    let newUnreadSplitIndex: Int
+    let trimmedIds: Set<Int64>
+    let newSplits: [Int64]
+
+    init(oldUnreadSplitIndex: Int, newUnreadSplitIndex: Int, trimmedIds: Set<Int64>, newSplits: [Int64]) {
+        self.oldUnreadSplitIndex = oldUnreadSplitIndex
+        self.newUnreadSplitIndex = newUnreadSplitIndex
+        self.trimmedIds = trimmedIds
+        self.newSplits = newSplits
+    }
+}
+
+private func removeDuplicatesAndModifySplitsOnBeforePagination(
+    _ unreadAfterItemId: Int64,
+    _ newItems: inout [ChatItem],
+    _ newIds: Set<Int64>,
+    _ splits: [Int64],
+    _ visibleItemIndexes: ClosedRange<Int>
+) -> ModifiedSplits {
+    var oldUnreadSplitIndex: Int = -1
+    var newUnreadSplitIndex: Int = -1
+    var lastSplitIndexTrimmed: Int? = nil
+    var allowedTrimming = true
+    var index = 0
+    /** keep the newest [TRIM_KEEP_COUNT] items (bottom area) and oldest [TRIM_KEEP_COUNT] items, trim others */
+    let trimLowerBound = visibleItemIndexes.upperBound + TRIM_KEEP_COUNT
+    let trimUpperBound = newItems.count - TRIM_KEEP_COUNT
+    let trimRange = trimUpperBound >= trimLowerBound ? trimLowerBound ... trimUpperBound : -1 ... -1
+    var trimmedIds = Set<Int64>()
+    let prevTrimLowerBound = visibleItemIndexes.upperBound + TRIM_KEEP_COUNT + 1
+    let prevTrimUpperBound = newItems.count - TRIM_KEEP_COUNT
+    let prevItemTrimRange = prevTrimUpperBound >= prevTrimLowerBound ? prevTrimLowerBound ... prevTrimUpperBound : -1 ... -1
+    var newSplits = splits
+
+    newItems.removeAll(where: {
+        let invisibleItemToTrim = trimRange.contains(index) && allowedTrimming
+        let prevItemWasTrimmed = prevItemTrimRange.contains(index) && allowedTrimming
+        // may disable it after clearing the whole split range
+        if !splits.isEmpty && $0.id == splits.first {
+            // trim only in one split range
+            allowedTrimming = false
+        }
+        let indexInSplits = splits.firstIndex(of: $0.id)
+        if let indexInSplits {
+            lastSplitIndexTrimmed = indexInSplits
+        }
+        if invisibleItemToTrim {
+            if prevItemWasTrimmed {
+                trimmedIds.insert($0.id)
+            } else {
+                newUnreadSplitIndex = index
+                // prev item is not supposed to be trimmed, so exclude current one from trimming and set a split here instead.
+                // this allows to define splitRange of the oldest items and to start loading trimmed items when user scrolls in the opposite direction
+                if let lastSplitIndexTrimmed {
+                    var new = newSplits
+                    new[lastSplitIndexTrimmed] = $0.id
+                    newSplits = new
+                } else {
+                    newSplits = [$0.id] + newSplits
+                }
+            }
+        }
+        if unreadAfterItemId == $0.id {
+            oldUnreadSplitIndex = index
+        }
+        index += 1
+        return (invisibleItemToTrim && prevItemWasTrimmed) || newIds.contains($0.id)
+    })
+    // will remove any splits that now becomes obsolete because items were merged
+    newSplits = newSplits.filter { split in !newIds.contains(split) && !trimmedIds.contains(split) }
+    return ModifiedSplits(oldUnreadSplitIndex: oldUnreadSplitIndex, newUnreadSplitIndex:  newUnreadSplitIndex, trimmedIds: trimmedIds, newSplits: newSplits)
+}
+
+private func removeDuplicatesAndModifySplitsOnAfterPagination(
+    _ unreadInLoaded: Int,
+    _ paginationChatItemId: Int64,
+    _ newItems: inout [ChatItem],
+    _ newIds: Set<Int64>,
+    _ chat: Chat,
+    _ splits: [Int64]
+) -> ([Int64], Int) {
+    var unreadInLoaded = unreadInLoaded
+    var firstItemIdBelowAllSplits: Int64? = nil
+    var splitsToRemove: Set<Int64> = []
+    let indexInSplitRanges = splits.firstIndex(of: paginationChatItemId)
+    // Currently, it should always load from split range
+    let loadingFromSplitRange = indexInSplitRanges != nil
+    let topSplits: [Int64]
+    var splitsToMerge: [Int64]
+    if let indexInSplitRanges, loadingFromSplitRange && indexInSplitRanges + 1 <= splits.count {
+        splitsToMerge = Array(splits[indexInSplitRanges + 1 ..< splits.count])
+        topSplits = Array(splits[0 ..< indexInSplitRanges + 1])
+    } else {
+        splitsToMerge = []
+        topSplits = []
+    }
+    newItems.removeAll(where: { new in
+        let duplicate = newIds.contains(new.id)
+        if loadingFromSplitRange && duplicate {
+            if splitsToMerge.contains(new.id) {
+                splitsToMerge.removeAll(where: { $0 == new.id })
+                splitsToRemove.insert(new.id)
+            } else if firstItemIdBelowAllSplits == nil && splitsToMerge.isEmpty {
+                // we passed all splits and found duplicated item below all of them, which means no splits anymore below the loaded items
+                firstItemIdBelowAllSplits = new.id
+            }
+        }
+        if duplicate && new.isRcvNew {
+            unreadInLoaded -= 1
+        }
+        return duplicate
+    })
+    var newSplits: [Int64] = []
+    if firstItemIdBelowAllSplits != nil {
+        // no splits below anymore, all were merged with bottom items
+        newSplits = topSplits
+    } else {
+        if !splitsToRemove.isEmpty {
+            var new = splits
+            new.removeAll(where: { splitsToRemove.contains($0) })
+            newSplits = new
+        }
+        let enlargedSplit = splits.firstIndex(of: paginationChatItemId)
+        if let enlargedSplit {
+            // move the split to the end of loaded items
+            var new = splits
+            new[enlargedSplit] = chat.chatItems.last!.id
+            newSplits = new
+        }
+    }
+    return (newSplits, unreadInLoaded)
+}
+
+private func removeDuplicatesAndUpperSplits(
+    _ newItems: inout [ChatItem],
+    _ chat: Chat,
+    _ splits: [Int64],
+    _ visibleItemIndexesNonReversed: @MainActor () -> ClosedRange<Int>
+) async -> [Int64] {
+    if splits.isEmpty {
+        removeDuplicates(&newItems, chat)
+        return splits
+    }
+
+    var newSplits = splits
+    let visibleItemIndexes = await MainActor.run { visibleItemIndexesNonReversed() }
+    let (newIds, _) = mapItemsToIds(chat.chatItems)
+    var idsToTrim: [BoxedValue<Set<Int64>>] = []
+    idsToTrim.append(BoxedValue(Set()))
+    var index = 0
+    newItems.removeAll(where: {
+        let duplicate = newIds.contains($0.id)
+        if (!duplicate && visibleItemIndexes.lowerBound > index) {
+            idsToTrim.last?.boxedValue.insert($0.id)
+        }
+        if visibleItemIndexes.lowerBound > index, let firstIndex = newSplits.firstIndex(of: $0.id) {
+            newSplits.remove(at: firstIndex)
+            // closing previous range. All items in idsToTrim that ends with empty set should be deleted.
+            // Otherwise, the last set should be excluded from trimming because it is in currently visible split range
+            idsToTrim.append(BoxedValue(Set()))
+        }
+
+        index += 1
+        return duplicate
+    })
+    if !idsToTrim.last!.boxedValue.isEmpty {
+        // it has some elements to trim from currently visible range which means the items shouldn't be trimmed
+        // Otherwise, the last set would be empty
+        idsToTrim.removeLast()
+    }
+    let allItemsToDelete = idsToTrim.compactMap { set in set.boxedValue }.joined()
+    if !allItemsToDelete.isEmpty {
+        newItems.removeAll(where: { allItemsToDelete.contains($0.id) })
+    }
+    return newSplits
+}
+
+private func removeDuplicatesAndUnusedSplits(
+    _ newItems: inout [ChatItem],
+    _ chat: Chat,
+    _ splits: [Int64]
+) async -> [Int64] {
+    if splits.isEmpty {
+        removeDuplicates(&newItems, chat)
+        return splits
+    }
+
+    var newSplits = splits
+    let (newIds, _) = mapItemsToIds(chat.chatItems)
+    newItems.removeAll(where: {
+        let duplicate = newIds.contains($0.id)
+        if duplicate, let firstIndex = newSplits.firstIndex(of: $0.id) {
+            newSplits.remove(at: firstIndex)
+        }
+        return duplicate
+    })
+    return newSplits
+}
+
+// ids, number of unread items
+private func mapItemsToIds(_ items: [ChatItem]) -> (Set<Int64>, Int) {
+    var unreadInLoaded = 0
+    var ids: Set<Int64> = Set()
+    var i = 0
+    while i < items.count {
+        let item = items[i]
+        ids.insert(item.id)
+        if item.isRcvNew {
+            unreadInLoaded += 1
+        }
+        i += 1
+    }
+    return (ids, unreadInLoaded)
+}
+
+private func removeDuplicates(_ newItems: inout [ChatItem], _ chat: Chat) {
+    let (newIds, _) = mapItemsToIds(chat.chatItems)
+    newItems.removeAll { newIds.contains($0.id) }
+}
+
+private typealias SameTimeItem = (index: Int, item: ChatItem)
+
+// return (item index, split index)
+private func indexToInsertAround(_ chatType: ChatType, _ lastNew: ChatItem?, to: [ChatItem], _ splits: Set<Int64>) -> (Int, Int) {
+    guard to.count > 0, let lastNew = lastNew else { return (0, 0) }
+    // group sorting: item_ts, item_id
+    // everything else: created_at, item_id
+    let compareByTimeTs = chatType == .group
+    // in case several items have the same time as another item in the `to` array
+    var sameTime: [SameTimeItem] = []
+
+    // trying to find new split index for item looks difficult but allows to not use one more loop.
+    // The idea is to memorize how many splits were till any index (map number of splits until index)
+    // and use resulting itemIndex to decide new split index position.
+    // Because of the possibility to have many items with the same timestamp, it's possible to see `itemIndex < || == || > i`.
+    var splitsTillIndex: [Int] = []
+    var splitsPerPrevIndex = 0
+
+    for i in 0 ..< to.count {
+        let item = to[i]
+
+        splitsPerPrevIndex = splits.contains(item.id) ? splitsPerPrevIndex + 1 : splitsPerPrevIndex
+        splitsTillIndex.append(splitsPerPrevIndex)
+
+        let itemIsNewer = (compareByTimeTs ? item.meta.itemTs > lastNew.meta.itemTs : item.meta.createdAt > lastNew.meta.createdAt)
+        if itemIsNewer || i + 1 == to.count {
+            if (compareByTimeTs ? lastNew.meta.itemTs == item.meta.itemTs : lastNew.meta.createdAt == item.meta.createdAt) {
+                sameTime.append((i, item))
+            }
+            // time to stop the loop. Item is newer or it's the last item in `to` array, taking previous items and checking position inside them
+            let itemIndex: Int
+            if sameTime.count > 1, let first = sameTime.sorted(by: { prev, next in prev.item.meta.itemId < next.item.id }).first(where: { same in same.item.id > lastNew.id }) {
+                itemIndex = first.index
+            } else if sameTime.count == 1 {
+                itemIndex = sameTime[0].item.id > lastNew.id ? sameTime[0].index : sameTime[0].index + 1
+            } else {
+                itemIndex = itemIsNewer ? i : i + 1
+            }
+            let splitIndex = splitsTillIndex[min(itemIndex, splitsTillIndex.count - 1)]
+            let prevItemSplitIndex = itemIndex == 0 ? 0 : splitsTillIndex[min(itemIndex - 1, splitsTillIndex.count - 1)]
+            return (itemIndex, splitIndex == prevItemSplitIndex ? splitIndex : prevItemSplitIndex)
+        }
+
+        if (compareByTimeTs ? lastNew.meta.itemTs == item.meta.itemTs : lastNew.meta.createdAt == item.meta.createdAt) {
+            sameTime.append(SameTimeItem(index: i, item: item))
+        } else {
+            sameTime = []
+        }
+    }
+    // shouldn't be here
+    return (to.count, splits.count)
+}
+
+private func indexToInsertAroundTest() {
+    func assert(_ one: (Int, Int), _ two: (Int, Int)) {
+        if one != two {
+            logger.debug("\(String(describing: one)) != \(String(describing: two))")
+            fatalError()
+        }
+    }
+
+    let itemsToInsert = [ChatItem.getSample(3, .groupSnd, Date.init(timeIntervalSince1970: 3), "")]
+    let items1 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(1, .groupSnd, Date.init(timeIntervalSince1970: 1), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 2), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items1, Set([1])), (3, 1))
+
+    let items2 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(1, .groupSnd, Date.init(timeIntervalSince1970: 1), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items2, Set([2])), (3, 1))
+
+    let items3 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(1, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items3, Set([1])), (3, 1))
+
+    let items4 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items4, Set([4])), (1, 0))
+
+    let items5 = [
+        ChatItem.getSample(0, .groupSnd, Date.init(timeIntervalSince1970: 0), ""),
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items5, Set([2])), (2, 1))
+
+    let items6 = [
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(6, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items6, Set([5])), (0, 0))
+
+    let items7 = [
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(6, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, nil, to: items7, Set([6])), (0, 0))
+
+    let items8 = [
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 4), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items8, Set([2])), (0, 0))
+
+    let items9 = [
+        ChatItem.getSample(2, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items9, Set([5])), (1, 0))
+
+    let items10 = [
+        ChatItem.getSample(4, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(5, .groupSnd, Date.init(timeIntervalSince1970: 3), ""),
+        ChatItem.getSample(6, .groupSnd, Date.init(timeIntervalSince1970: 4), "")
+    ]
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items10, Set([4])), (0, 0))
+
+    let items11: [ChatItem] = []
+    assert(indexToInsertAround(.group, itemsToInsert.last, to: items11, Set([])), (0, 0))
+}

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

@@ -0,0 +1,457 @@
+//
+//  ChatItemsMerger.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 02.12.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct MergedItems: Hashable, Equatable {
+    let im: ItemsModel
+    let items: [MergedItem]
+    let splits: [SplitRange]
+    // chat item id, index in list
+    let indexInParentItems: Dictionary<Int64, Int>
+
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.hashValue == rhs.hashValue
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine("\(items.hashValue)")
+    }
+
+    static func create(_ im: ItemsModel, _ revealedItems: Set<Int64>) -> MergedItems {
+        if im.reversedChatItems.isEmpty {
+            return MergedItems(im: im, items: [], splits: [], indexInParentItems: [:])
+        }
+
+        let unreadCount = im.chatState.unreadTotal
+
+        let unreadAfterItemId = im.chatState.unreadAfterItemId
+        let itemSplits = im.chatState.splits
+        var mergedItems: [MergedItem] = []
+        // Indexes of splits here will be related to reversedChatItems, not chatModel.chatItems
+        var splitRanges: [SplitRange] = []
+        var indexInParentItems = Dictionary<Int64, Int>()
+        var index = 0
+        var unclosedSplitIndex: Int? = nil
+        var unclosedSplitIndexInParent: Int? = nil
+        var visibleItemIndexInParent = -1
+        var unreadBefore = unreadCount - im.chatState.unreadAfterNewestLoaded
+        var lastRevealedIdsInMergedItems: BoxedValue<[Int64]>? = nil
+        var lastRangeInReversedForMergedItems: BoxedValue<ClosedRange<Int>>? = nil
+        var recent: MergedItem? = nil
+        while index < im.reversedChatItems.count {
+            let item = im.reversedChatItems[index]
+            let prev = index >= 1 ? im.reversedChatItems[index - 1] : nil
+            let next = index + 1 < im.reversedChatItems.count ? im.reversedChatItems[index + 1] : nil
+            let category = item.mergeCategory
+            let itemIsSplit = itemSplits.contains(item.id)
+
+            if item.id == unreadAfterItemId {
+                unreadBefore = unreadCount - im.chatState.unreadAfter
+            }
+            if item.isRcvNew {
+                unreadBefore -= 1
+            }
+
+            let revealed = item.mergeCategory == nil || revealedItems.contains(item.id)
+            if recent != nil, case let .grouped(items, _, _, _, mergeCategory, unreadIds, _, _) = recent, mergeCategory == category, let first = items.boxedValue.first, !revealedItems.contains(first.item.id) && !itemIsSplit {
+                let listItem = ListItem(item: item, prevItem: prev, nextItem: next, unreadBefore: unreadBefore)
+                items.boxedValue.append(listItem)
+
+                if item.isRcvNew {
+                    unreadIds.boxedValue.insert(item.id)
+                }
+                if let lastRevealedIdsInMergedItems, let lastRangeInReversedForMergedItems {
+                    if revealed {
+                        lastRevealedIdsInMergedItems.boxedValue.append(item.id)
+                    }
+                    lastRangeInReversedForMergedItems.boxedValue = lastRangeInReversedForMergedItems.boxedValue.lowerBound ... index
+                }
+            } else {
+                visibleItemIndexInParent += 1
+                let listItem = ListItem(item: item, prevItem: prev, nextItem: next, unreadBefore: unreadBefore)
+                if item.mergeCategory != nil {
+                    if item.mergeCategory != prev?.mergeCategory || lastRevealedIdsInMergedItems == nil {
+                        lastRevealedIdsInMergedItems = BoxedValue(revealedItems.contains(item.id) ? [item.id] : [])
+                    } else if revealed, let lastRevealedIdsInMergedItems {
+                        lastRevealedIdsInMergedItems.boxedValue.append(item.id)
+                    }
+                    lastRangeInReversedForMergedItems = BoxedValue(index ... index)
+                    recent = MergedItem.grouped(
+                        items: BoxedValue([listItem]),
+                        revealed: revealed,
+                        revealedIdsWithinGroup: lastRevealedIdsInMergedItems!,
+                        rangeInReversed: lastRangeInReversedForMergedItems!,
+                        mergeCategory: item.mergeCategory,
+                        unreadIds: BoxedValue(item.isRcvNew ? Set(arrayLiteral: item.id) : Set()),
+                        startIndexInReversedItems: index,
+                        hash: listItem.genHash(revealedItems.contains(prev?.id ?? -1), revealedItems.contains(next?.id ?? -1))
+                    )
+                } else {
+                    lastRangeInReversedForMergedItems = nil
+                    recent = MergedItem.single(
+                        item: listItem,
+                        startIndexInReversedItems: index,
+                        hash: listItem.genHash(revealedItems.contains(prev?.id ?? -1), revealedItems.contains(next?.id ?? -1))
+                    )
+                }
+                mergedItems.append(recent!)
+            }
+            if itemIsSplit {
+                // found item that is considered as a split
+                if let unclosedSplitIndex, let unclosedSplitIndexInParent {
+                    // it was at least second split in the list
+                    splitRanges.append(SplitRange(itemId: im.reversedChatItems[unclosedSplitIndex].id, indexRangeInReversed: unclosedSplitIndex ... index - 1, indexRangeInParentItems: unclosedSplitIndexInParent ... visibleItemIndexInParent - 1))
+                }
+                unclosedSplitIndex = index
+                unclosedSplitIndexInParent = visibleItemIndexInParent
+            } else if index + 1 == im.reversedChatItems.count, let unclosedSplitIndex, let unclosedSplitIndexInParent {
+                // just one split for the whole list, there will be no more, it's the end
+                splitRanges.append(SplitRange(itemId: im.reversedChatItems[unclosedSplitIndex].id, indexRangeInReversed: unclosedSplitIndex ... index, indexRangeInParentItems: unclosedSplitIndexInParent ... visibleItemIndexInParent))
+            }
+            indexInParentItems[item.id] = visibleItemIndexInParent
+            index += 1
+        }
+        return MergedItems(
+            im: im,
+            items: mergedItems,
+            splits: splitRanges,
+            indexInParentItems: indexInParentItems
+        )
+    }
+
+    // Use this check to ensure that mergedItems state based on currently actual state of global
+    // splits and reversedChatItems
+    func isActualState() -> Bool {
+        // do not load anything if global splits state is different than in merged items because it
+        // will produce undefined results in terms of loading and placement of items. 
+        // Same applies to reversedChatItems
+        return indexInParentItems.count == im.reversedChatItems.count &&
+        splits.count == im.chatState.splits.count &&
+        // that's just an optimization because most of the time only 1 split exists
+        ((splits.count == 1 && splits[0].itemId == im.chatState.splits[0]) || splits.map({ split in split.itemId }).sorted() == im.chatState.splits.sorted())
+    }
+}
+
+
+enum MergedItem: Identifiable, Hashable, Equatable {
+    // equatable and hashable implementations allows to see the difference and correctly scroll to items we want
+    static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.hash == rhs.hash
+    }
+
+    var id: Int64 { newest().item.id }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(hash)
+    }
+
+    var hash: String {
+        switch self {
+        case .single(_, _, let hash): hash + " 1"
+        case .grouped(let items, _, _, _, _, _, _, let hash): hash + " \(items.boxedValue.count)"
+        }
+    }
+
+    // the item that is always single, cannot be grouped and always revealed
+    case single(
+        item: ListItem,
+        startIndexInReversedItems: Int,
+        hash: String
+    )
+
+    /** The item that can contain multiple items or just one depending on revealed state. When the whole group of merged items is revealed,
+     * there will be multiple [Grouped] items with revealed flag set to true. When the whole group is collapsed, it will be just one instance
+     *  of [Grouped] item with all grouped items inside [items]. In other words, number of [MergedItem] will always be equal to number of
+     *  visible items in ChatView's EndlessScrollView  */
+    case grouped (
+        items: BoxedValue<[ListItem]>,
+        revealed: Bool,
+        // it stores ids for all consecutive revealed items from the same group in order to hide them all on user's action
+        // it's the same list instance for all Grouped items within revealed group
+        /** @see reveal */
+        revealedIdsWithinGroup: BoxedValue<[Int64]>,
+        rangeInReversed: BoxedValue<ClosedRange<Int>>,
+        mergeCategory: CIMergeCategory?,
+        unreadIds: BoxedValue<Set<Int64>>,
+        startIndexInReversedItems: Int,
+        hash: String
+    )
+
+    func revealItems(_ reveal: Bool, _ revealedItems: Binding<Set<Int64>>) {
+        if case .grouped(let items, _, let revealedIdsWithinGroup, _, _, _, _, _) = self {
+            var newRevealed = revealedItems.wrappedValue
+            var i = 0
+            if reveal {
+                while i < items.boxedValue.count {
+                    newRevealed.insert(items.boxedValue[i].item.id)
+                    i += 1
+                }
+            } else {
+                while i < revealedIdsWithinGroup.boxedValue.count {
+                    newRevealed.remove(revealedIdsWithinGroup.boxedValue[i])
+                    i += 1
+                }
+                revealedIdsWithinGroup.boxedValue.removeAll()
+            }
+            revealedItems.wrappedValue = newRevealed
+        }
+    }
+
+    var startIndexInReversedItems: Int {
+        get {
+            switch self {
+            case let .single(_, startIndexInReversedItems, _): startIndexInReversedItems
+            case let .grouped(_, _, _, _, _, _, startIndexInReversedItems, _): startIndexInReversedItems
+            }
+        }
+    }
+
+    func hasUnread() -> Bool {
+        switch self {
+        case let .single(item, _, _): item.item.isRcvNew
+        case let .grouped(_, _, _, _, _, unreadIds, _, _): !unreadIds.boxedValue.isEmpty
+        }
+    }
+
+    func newest() -> ListItem {
+        switch self {
+        case let .single(item, _, _): item
+        case let .grouped(items, _, _, _, _, _, _, _): items.boxedValue[0]
+        }
+    }
+
+    func oldest() -> ListItem {
+        switch self {
+        case let .single(item, _, _): item
+        case let .grouped(items, _, _, _, _, _, _, _): items.boxedValue[items.boxedValue.count - 1]
+        }
+    }
+
+    func lastIndexInReversed() -> Int {
+        switch self {
+        case .single: startIndexInReversedItems
+        case let .grouped(items, _, _, _, _, _, _, _): startIndexInReversedItems + items.boxedValue.count - 1
+        }
+    }
+}
+
+struct SplitRange {
+    let itemId: Int64
+    /** range of indexes inside reversedChatItems where the first element is the split (it's index is [indexRangeInReversed.first])
+     * so [0, 1, 2, -100-, 101] if the 3 is a split, SplitRange(indexRange = 3 .. 4) will be this SplitRange instance
+     * (3, 4 indexes of the splitRange with the split itself at index 3)
+     * */
+    let indexRangeInReversed: ClosedRange<Int>
+    /** range of indexes inside LazyColumn where the first element is the split (it's index is [indexRangeInParentItems.first]) */
+    let indexRangeInParentItems: ClosedRange<Int>
+}
+
+struct ListItem: Hashable {
+    let item: ChatItem
+    let prevItem: ChatItem?
+    let nextItem: ChatItem?
+    // how many unread items before (older than) this one (excluding this one)
+    let unreadBefore: Int
+
+    private func chatDirHash(_ chatDir: CIDirection?) -> Int {
+        guard let chatDir else { return 0 }
+        return switch chatDir {
+        case .directSnd: 0
+        case .directRcv: 1
+        case .groupSnd: 2
+        case let .groupRcv(mem): "\(mem.groupMemberId) \(mem.displayName) \(mem.memberStatus.rawValue) \(mem.memberRole.rawValue) \(mem.image?.hash ?? 0)".hash
+        case .localSnd: 4
+        case .localRcv: 5
+        }
+    }
+
+    // using meta.hashValue instead of parts takes much more time so better to use partial meta here
+    func genHash(_ prevRevealed: Bool, _ nextRevealed: Bool) -> String {
+        "\(item.meta.itemId) \(item.meta.updatedAt.hashValue) \(item.meta.itemEdited) \(item.meta.itemDeleted?.hashValue ?? 0) \(item.meta.itemTimed?.hashValue ?? 0) \(item.meta.itemStatus.hashValue) \(item.meta.sentViaProxy ?? false) \(item.mergeCategory?.hashValue ?? 0) \(chatDirHash(item.chatDir)) \(item.reactions.hashValue) \(item.meta.isRcvNew) \(item.text.hash) \(item.file?.hashValue ?? 0) \(item.quotedItem?.itemId ?? 0) \(unreadBefore) \(prevItem?.id ?? 0) \(chatDirHash(prevItem?.chatDir)) \(prevItem?.mergeCategory?.hashValue ?? 0) \(prevRevealed) \(nextItem?.id ?? 0) \(chatDirHash(nextItem?.chatDir)) \(nextItem?.mergeCategory?.hashValue ?? 0) \(nextRevealed)"
+    }
+}
+
+class ActiveChatState {
+    var splits: [Int64] = []
+    var unreadAfterItemId: Int64 = -1
+    // total items after unread after item (exclusive)
+    var totalAfter: Int = 0
+    var unreadTotal: Int = 0
+    // exclusive
+    var unreadAfter: Int = 0
+    // exclusive
+    var unreadAfterNewestLoaded: Int = 0
+
+    func moveUnreadAfterItem(_ toItemId: Int64?, _ nonReversedItems: [ChatItem]) {
+        guard let toItemId else { return }
+        let currentIndex = nonReversedItems.firstIndex(where: { $0.id == unreadAfterItemId })
+        let newIndex = nonReversedItems.firstIndex(where: { $0.id == toItemId })
+        guard let currentIndex, let newIndex else {
+            return
+        }
+        unreadAfterItemId = toItemId
+        let unreadDiff = newIndex > currentIndex
+        ? -nonReversedItems[currentIndex + 1..<newIndex + 1].filter { $0.isRcvNew }.count
+        : nonReversedItems[newIndex + 1..<currentIndex + 1].filter { $0.isRcvNew }.count
+        unreadAfter += unreadDiff
+    }
+
+    func moveUnreadAfterItem(_ fromIndex: Int, _ toIndex: Int, _ nonReversedItems: [ChatItem]) {
+        if fromIndex == -1 || toIndex == -1 {
+            return
+        }
+        unreadAfterItemId = nonReversedItems[toIndex].id
+        let unreadDiff = toIndex > fromIndex
+        ? -nonReversedItems[fromIndex + 1..<toIndex + 1].filter { $0.isRcvNew }.count
+        : nonReversedItems[toIndex + 1..<fromIndex + 1].filter { $0.isRcvNew }.count
+        unreadAfter += unreadDiff
+    }
+
+    func clear() {
+        splits = []
+        unreadAfterItemId = -1
+        totalAfter = 0
+        unreadTotal = 0
+        unreadAfter = 0
+        unreadAfterNewestLoaded = 0
+    }
+
+    func itemsRead(_ itemIds: Set<Int64>?, _ newItems: [ChatItem]) {
+        guard let itemIds else {
+            // special case when the whole chat became read
+            unreadTotal = 0
+            unreadAfter = 0
+            return
+        }
+        var unreadAfterItemIndex: Int = -1
+        // since it's more often that the newest items become read, it's logical to loop from the end of the list to finish it faster
+        var i = newItems.count - 1
+        var ids = itemIds
+        // intermediate variables to prevent re-setting state value a lot of times without reason
+        var newUnreadTotal = unreadTotal
+        var newUnreadAfter = unreadAfter
+        while i >= 0 {
+            let item = newItems[i]
+            if item.id == unreadAfterItemId {
+                unreadAfterItemIndex = i
+            }
+            if ids.contains(item.id) {
+                // was unread, now this item is read
+                if (unreadAfterItemIndex == -1) {
+                    newUnreadAfter -= 1
+                }
+                newUnreadTotal -= 1
+                ids.remove(item.id)
+                if ids.isEmpty {
+                    break
+                }
+            }
+            i -= 1
+        }
+        unreadTotal = newUnreadTotal
+        unreadAfter = newUnreadAfter
+    }
+
+    func itemAdded(_ item: (Int64, Bool), _ index: Int) {
+        if item.1 {
+            unreadAfter += 1
+            unreadTotal += 1
+        }
+    }
+
+    func itemsRemoved(_ itemIds: [(Int64, Int, Bool)], _ newItems: [ChatItem]) {
+        var newSplits: [Int64] = []
+        for split in splits {
+            let index = itemIds.firstIndex(where: { (delId, _, _) in delId == split })
+            // deleted the item that was right before the split between items, find newer item so it will act like the split
+            if let index {
+                let idx = itemIds[index].1 - itemIds.filter { (_, delIndex, _) in delIndex <= index }.count
+                let newSplit = newItems.count > idx && idx >= 0 ? newItems[idx].id : nil
+                // it the  whole section is gone and splits overlap, don't add it at all
+                if let newSplit, !newSplits.contains(newSplit) {
+                    newSplits.append(newSplit)
+                }
+            } else {
+                newSplits.append(split)
+            }
+        }
+        splits = newSplits
+
+        let index = itemIds.firstIndex(where: { (delId, _, _) in delId == unreadAfterItemId })
+        // unread after item was removed
+        if let index {
+            let idx = itemIds[index].1 - itemIds.filter { (_, delIndex, _) in delIndex <= index }.count
+            var newUnreadAfterItemId = newItems.count > idx && idx >= 0 ? newItems[idx].id : nil
+            let newUnreadAfterItemWasNull = newUnreadAfterItemId == nil
+            if newUnreadAfterItemId == nil {
+                // everything on top (including unread after item) were deleted, take top item as unread after id
+                newUnreadAfterItemId = newItems.first?.id
+            }
+            if let newUnreadAfterItemId {
+                unreadAfterItemId = newUnreadAfterItemId
+                totalAfter -= itemIds.filter { (_, delIndex, _) in delIndex > index }.count
+                unreadTotal -= itemIds.filter { (_, delIndex, isRcvNew) in delIndex <= index && isRcvNew }.count
+                unreadAfter -= itemIds.filter { (_, delIndex, isRcvNew) in delIndex > index && isRcvNew }.count
+                if newUnreadAfterItemWasNull {
+                    // since the unread after item was moved one item after initial position, adjust counters accordingly
+                    if newItems.first?.isRcvNew == true {
+                        unreadTotal += 1
+                        unreadAfter -= 1
+                    }
+                }
+            } else {
+                // all items were deleted, 0 items in chatItems
+                unreadAfterItemId = -1
+                totalAfter = 0
+                unreadTotal = 0
+                unreadAfter = 0
+            }
+        } else {
+            totalAfter -= itemIds.count
+        }
+    }
+}
+
+class BoxedValue<T: Hashable>: Equatable, Hashable {
+    static func == (lhs: BoxedValue<T>, rhs: BoxedValue<T>) -> Bool {
+        lhs.boxedValue == rhs.boxedValue
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine("\(self)")
+    }
+
+    var boxedValue : T
+    init(_ value: T) {
+        self.boxedValue = value
+    }
+}
+
+@MainActor
+func visibleItemIndexesNonReversed(_ im: ItemsModel, _ listState: EndlessScrollView<MergedItem>.ListState, _ mergedItems: MergedItems) -> ClosedRange<Int> {
+    let zero = 0 ... 0
+    let items = mergedItems.items
+    if items.isEmpty {
+        return zero
+    }
+    let newest = items.count > listState.firstVisibleItemIndex ? items[listState.firstVisibleItemIndex].startIndexInReversedItems : nil
+    let oldest = items.count > listState.lastVisibleItemIndex ? items[listState.lastVisibleItemIndex].lastIndexInReversed() : nil
+    guard let newest, let oldest else {
+        return zero
+    }
+    let size = im.reversedChatItems.count
+    let range = size - oldest ... size - newest
+    if range.lowerBound < 0 || range.upperBound < 0 {
+        return zero
+    }
+
+    // visible items mapped to their underlying data structure which is im.reversedChatItems.reversed()
+    return range
+}

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

@@ -0,0 +1,174 @@
+//
+//  ChatScrollHelpers.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 20.12.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+func loadLastItems(_ loadingMoreItems: Binding<Bool>, loadingBottomItems: Binding<Bool>, _ chat: Chat, _ im: ItemsModel) async {
+    await MainActor.run {
+        loadingMoreItems.wrappedValue = true
+        loadingBottomItems.wrappedValue = true
+    }
+    try? await Task.sleep(nanoseconds: 500_000000)
+    if ChatModel.shared.chatId != chat.chatInfo.id {
+        await MainActor.run {
+            loadingMoreItems.wrappedValue = false
+            loadingBottomItems.wrappedValue = false
+        }
+        return
+    }
+    await apiLoadMessages(chat.chatInfo.id, im, ChatPagination.last(count: 50))
+    await MainActor.run {
+        loadingMoreItems.wrappedValue = false
+        loadingBottomItems.wrappedValue = false
+    }
+}
+
+func preloadIfNeeded(
+    _ im: ItemsModel,
+    _ allowLoadMoreItems: Binding<Bool>,
+    _ ignoreLoadingRequests: Binding<Int64?>,
+    _ listState: EndlessScrollView<MergedItem>.ListState,
+    _ mergedItems: BoxedValue<MergedItems>,
+    loadItems: @escaping (Bool, ChatPagination) async -> Bool,
+    loadLastItems: @escaping () async -> Void
+) {
+    let state = im.preloadState
+    guard !listState.isScrolling && !listState.isAnimatedScrolling,
+          !state.preloading,
+          listState.totalItemsCount > 0
+    else {
+        return
+    }
+    if state.prevFirstVisible != listState.firstVisibleItemId as! Int64 || state.prevItemsCount != mergedItems.boxedValue.indexInParentItems.count {
+        state.preloading = true
+        let allowLoadMore = allowLoadMoreItems.wrappedValue
+        Task {
+            defer { state.preloading = false }
+            var triedToLoad = true
+            await preloadItems(im, mergedItems.boxedValue, allowLoadMore, listState, ignoreLoadingRequests) { pagination in
+                triedToLoad = await loadItems(false, pagination)
+                return triedToLoad
+            }
+            if triedToLoad {
+                state.prevFirstVisible = listState.firstVisibleItemId as! Int64
+                state.prevItemsCount = mergedItems.boxedValue.indexInParentItems.count
+            }
+            // it's important to ask last items when the view is fully covered with items. Otherwise, visible items from one
+            // split will be merged with last items and position of scroll will change unexpectedly.
+            if listState.itemsCanCoverScreen && !im.lastItemsLoaded {
+                await loadLastItems()
+            }
+        }
+    } else if listState.itemsCanCoverScreen && !im.lastItemsLoaded {
+        state.preloading = true
+        Task {
+            defer { state.preloading = false }
+            await loadLastItems()
+        }
+    }
+}
+
+func preloadItems(
+    _ im: ItemsModel,
+    _ mergedItems: MergedItems,
+    _ allowLoadMoreItems: Bool,
+    _ listState: EndlessScrollView<MergedItem>.ListState,
+    _ ignoreLoadingRequests: Binding<Int64?>,
+    _ loadItems: @escaping (ChatPagination) async -> Bool) 
+async {
+    let allowLoad = allowLoadMoreItems || mergedItems.items.count == listState.lastVisibleItemIndex + 1
+    let remaining = ChatPagination.UNTIL_PRELOAD_COUNT
+    let firstVisibleIndex = listState.firstVisibleItemIndex
+
+    if !(await preloadItemsBefore()) {
+        await preloadItemsAfter()
+    }
+
+    func preloadItemsBefore() async -> Bool {
+        let splits = mergedItems.splits
+        let lastVisibleIndex = listState.lastVisibleItemIndex
+        var lastIndexToLoadFrom: Int? = findLastIndexToLoadFromInSplits(firstVisibleIndex, lastVisibleIndex, remaining, splits)
+        let items: [ChatItem] = im.reversedChatItems.reversed()
+        if splits.isEmpty && !items.isEmpty && lastVisibleIndex > mergedItems.items.count - remaining {
+            lastIndexToLoadFrom = items.count - 1
+        }
+        let loadFromItemId: Int64?
+        if allowLoad, let lastIndexToLoadFrom {
+            let index = items.count - 1 - lastIndexToLoadFrom
+            loadFromItemId = index >= 0 ? items[index].id : nil
+        } else {
+            loadFromItemId = nil
+        }
+        guard let loadFromItemId, ignoreLoadingRequests.wrappedValue != loadFromItemId else {
+            return false
+        }
+        let sizeWas = items.count
+        let firstItemIdWas = items.first?.id
+        let triedToLoad = await loadItems(ChatPagination.before(chatItemId: loadFromItemId, count: ChatPagination.PRELOAD_COUNT))
+        if triedToLoad && sizeWas == im.reversedChatItems.count && firstItemIdWas == im.reversedChatItems.last?.id {
+            ignoreLoadingRequests.wrappedValue = loadFromItemId
+            return false
+        }
+        return triedToLoad
+    }
+
+    func preloadItemsAfter() async {
+        let splits = mergedItems.splits
+        let split = splits.last(where: { $0.indexRangeInParentItems.contains(firstVisibleIndex) })
+        // we're inside a splitRange (top --- [end of the splitRange --- we're here --- start of the splitRange] --- bottom)
+        let reversedItems: [ChatItem] = im.reversedChatItems
+        if let split, split.indexRangeInParentItems.lowerBound + remaining > firstVisibleIndex {
+            let index = split.indexRangeInReversed.lowerBound
+            if index >= 0 {
+                let loadFromItemId = reversedItems[index].id
+                _ = await loadItems(ChatPagination.after(chatItemId: loadFromItemId, count: ChatPagination.PRELOAD_COUNT))
+            }
+        }
+    }
+}
+
+func oldestPartiallyVisibleListItemInListStateOrNull(_ listState: EndlessScrollView<MergedItem>.ListState) -> ListItem? {
+    if listState.lastVisibleItemIndex < listState.items.count {
+        return listState.items[listState.lastVisibleItemIndex].oldest()
+    } else {
+        return listState.items.last?.oldest()
+    }
+}
+
+private func findLastIndexToLoadFromInSplits(_ firstVisibleIndex: Int, _ lastVisibleIndex: Int, _ remaining: Int, _ splits: [SplitRange]) -> Int? {
+    for split in splits {
+        // before any split
+        if split.indexRangeInParentItems.lowerBound > firstVisibleIndex {
+            if lastVisibleIndex > (split.indexRangeInParentItems.lowerBound - remaining) {
+                return split.indexRangeInReversed.lowerBound - 1
+            }
+            break
+        }
+        let containsInRange = split.indexRangeInParentItems.contains(firstVisibleIndex)
+        if containsInRange {
+            if lastVisibleIndex > (split.indexRangeInParentItems.upperBound - remaining) {
+                return split.indexRangeInReversed.upperBound
+            }
+            break
+        }
+    }
+    return nil
+}
+
+/// Disable animation on iOS 15
+func withConditionalAnimation<Result>(
+    _ animation: Animation? = .default,
+    _ body: () throws -> Result
+) rethrows -> Result {
+    if #available(iOS 16.0, *) {
+        try withAnimation(animation, body)
+    } else {
+        try body()
+    }
+}

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

@@ -18,7 +18,7 @@ struct ComposeLinkView: View {
 
     var body: some View {
         HStack(alignment: .center, spacing: 8) {
-            if let linkPreview = linkPreview {
+            if let linkPreview {
                 linkPreviewView(linkPreview)
             } else {
                 ProgressView()

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

@@ -11,6 +11,8 @@ import SimpleXChat
 import SwiftyGif
 import PhotosUI
 
+let MAX_NUMBER_OF_MENTIONS = 3
+
 enum ComposePreview {
     case noPreview
     case linkPreview(linkPreview: LinkPreview?)
@@ -19,7 +21,7 @@ enum ComposePreview {
     case filePreview(fileName: String, file: URL)
 }
 
-enum ComposeContextItem {
+enum ComposeContextItem: Equatable {
     case noContextItem
     case quotedItem(chatItem: ChatItem)
     case editingItem(chatItem: ChatItem)
@@ -39,31 +41,41 @@ struct LiveMessage {
     var sentMsg: String?
 }
 
+typealias MentionedMembers = [String: CIMention]
+
 struct ComposeState {
     var message: String
+    var parsedMessage: [FormattedText]
     var liveMessage: LiveMessage? = nil
     var preview: ComposePreview
     var contextItem: ComposeContextItem
     var voiceMessageRecordingState: VoiceMessageRecordingState
     var inProgress = false
     var useLinkPreviews: Bool = UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
+    var mentions: MentionedMembers = [:]
 
     init(
         message: String = "",
+        parsedMessage: [FormattedText] = [],
         liveMessage: LiveMessage? = nil,
         preview: ComposePreview = .noPreview,
         contextItem: ComposeContextItem = .noContextItem,
-        voiceMessageRecordingState: VoiceMessageRecordingState = .noRecording
+        voiceMessageRecordingState: VoiceMessageRecordingState = .noRecording,
+        mentions: MentionedMembers = [:]
     ) {
         self.message = message
+        self.parsedMessage = parsedMessage
         self.liveMessage = liveMessage
         self.preview = preview
         self.contextItem = contextItem
         self.voiceMessageRecordingState = voiceMessageRecordingState
+        self.mentions = mentions
     }
 
     init(editingItem: ChatItem) {
-        self.message = editingItem.content.text
+        let text = editingItem.content.text
+        self.message = text
+        self.parsedMessage = editingItem.formattedText ?? FormattedText.plain(text)
         self.preview = chatItemPreview(chatItem: editingItem)
         self.contextItem = .editingItem(chatItem: editingItem)
         if let emc = editingItem.content.msgContent,
@@ -72,10 +84,12 @@ struct ComposeState {
         } else {
             self.voiceMessageRecordingState = .noRecording
         }
+        self.mentions = editingItem.mentions ?? [:]
     }
 
     init(forwardingItems: [ChatItem], fromChatInfo: ChatInfo) {
         self.message = ""
+        self.parsedMessage = []
         self.preview = .noPreview
         self.contextItem = .forwardingItems(chatItems: forwardingItems, fromChatInfo: fromChatInfo)
         self.voiceMessageRecordingState = .noRecording
@@ -83,20 +97,38 @@ struct ComposeState {
 
     func copy(
         message: String? = nil,
+        parsedMessage: [FormattedText]? = nil,
         liveMessage: LiveMessage? = nil,
         preview: ComposePreview? = nil,
         contextItem: ComposeContextItem? = nil,
-        voiceMessageRecordingState: VoiceMessageRecordingState? = nil
+        voiceMessageRecordingState: VoiceMessageRecordingState? = nil,
+        mentions: MentionedMembers? = nil
     ) -> ComposeState {
         ComposeState(
             message: message ?? self.message,
+            parsedMessage: parsedMessage ?? self.parsedMessage,
             liveMessage: liveMessage ?? self.liveMessage,
             preview: preview ?? self.preview,
             contextItem: contextItem ?? self.contextItem,
-            voiceMessageRecordingState: voiceMessageRecordingState ?? self.voiceMessageRecordingState
+            voiceMessageRecordingState: voiceMessageRecordingState ?? self.voiceMessageRecordingState,
+            mentions: mentions ?? self.mentions
         )
     }
     
+    func mentionMemberName(_ name: String) -> String {
+        var n = 0
+        var tryName = name
+        while mentions[tryName] != nil {
+            n += 1
+            tryName = "\(name)_\(n)"
+        }
+        return tryName
+    }
+    
+    var memberMentions: [String: Int64] {
+        self.mentions.compactMapValues { $0.memberRef?.groupMemberId }
+    }
+    
     var editing: Bool {
         switch contextItem {
         case .editingItem: return true
@@ -291,8 +323,12 @@ struct ComposeView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
+    @ObservedObject var im: ItemsModel
     @Binding var composeState: ComposeState
     @Binding var keyboardVisible: Bool
+    @Binding var keyboardHiddenDate: Date
+    @Binding var selectedRange: NSRange
+    var disabledText: LocalizedStringKey? = nil
 
     @State var linkUrl: URL? = nil
     @State var hasSimplexLink: Bool = false
@@ -321,6 +357,20 @@ struct ComposeView: View {
     var body: some View {
         VStack(spacing: 0) {
             Divider()
+            if let groupInfo = chat.chatInfo.groupInfo,
+               case let .groupChatScopeContext(groupScopeInfo) = im.secondaryIMFilter,
+               case let .memberSupport(member) = groupScopeInfo,
+               let member = member,
+               member.memberPending,
+               composeState.contextItem == .noContextItem,
+               composeState.noPreview {
+                ContextPendingMemberActionsView(
+                    groupInfo: groupInfo,
+                    member: member
+                )
+                Divider()
+            }
+
             if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                 ContextInvitingContactMemberView()
                 Divider()
@@ -331,8 +381,8 @@ struct ComposeView: View {
                 Divider()
             }
             // preference checks should match checks in forwarding list
-            let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-            let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
+            let simplexLinkProhibited = im.secondaryIMFilter == nil && hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
+            let fileProhibited = im.secondaryIMFilter == nil && composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
             let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
             if simplexLinkProhibited {
                 msgNotAllowedView("SimpleX links not allowed", icon: "link")
@@ -357,12 +407,13 @@ struct ComposeView: View {
                     Image(systemName: "paperclip")
                         .resizable()
                 }
-                .disabled(composeState.attachmentDisabled || !chat.userCanSend || (chat.chatInfo.contact?.nextSendGrpInv ?? false))
+                .disabled(composeState.attachmentDisabled || !chat.chatInfo.sendMsgEnabled || (chat.chatInfo.contact?.nextSendGrpInv ?? false))
                 .frame(width: 25, height: 25)
-                .padding(.bottom, 12)
+                .padding(.bottom, 16)
                 .padding(.leading, 12)
                 .tint(theme.colors.primary)
-                if case let .group(g) = chat.chatInfo,
+                if im.secondaryIMFilter == nil,
+                   case let .group(g, _) = chat.chatInfo,
                    !g.fullGroupPreferences.files.on(for: g.membership) {
                     b.disabled(true).onTapGesture {
                         AlertManager.shared.showAlertMsg(
@@ -376,6 +427,7 @@ struct ComposeView: View {
                 ZStack(alignment: .leading) {
                     SendMessageView(
                         composeState: $composeState,
+                        selectedRange: $selectedRange,
                         sendMessage: { ttl in
                             sendMessage(ttl: ttl)
                             resetLinkPreview()
@@ -400,24 +452,19 @@ struct ComposeView: View {
                         timedMessageAllowed: chat.chatInfo.featureEnabled(.timedMessages),
                         onMediaAdded: { media in if !media.isEmpty { chosenMedia = media }},
                         keyboardVisible: $keyboardVisible,
+                        keyboardHiddenDate: $keyboardHiddenDate,
                         sendButtonColor: chat.chatInfo.incognito
                         ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
                         : theme.colors.primary
                     )
                     .padding(.trailing, 12)
-                    .disabled(!chat.userCanSend)
+                    .disabled(!chat.chatInfo.sendMsgEnabled)
 
-                    if chat.userIsObserver {
-                        Text("you are observer")
+                    if let disabledText {
+                        Text(disabledText)
                             .italic()
                             .foregroundColor(theme.colors.secondary)
                             .padding(.horizontal, 12)
-                            .onTapGesture {
-                                AlertManager.shared.showAlertMsg(
-                                    title: "You can't send messages!",
-                                    message: "Please contact group admin."
-                                )
-                            }
                     }
                 }
             }
@@ -428,21 +475,23 @@ struct ComposeView: View {
                 .ignoresSafeArea(.all, edges: .bottom)
         }
         .onChange(of: composeState.message) { msg in
+            let parsedMsg = parseSimpleXMarkdown(msg)
+            composeState = composeState.copy(parsedMessage: parsedMsg ?? FormattedText.plain(msg))
             if composeState.linkPreviewAllowed {
                 if msg.count > 0 {
-                    showLinkPreview(msg)
+                    showLinkPreview(parsedMsg)
                 } else {
                     resetLinkPreview()
                     hasSimplexLink = false
                 }
             } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
-                (_, hasSimplexLink) = parseMessage(msg)
+                (_, hasSimplexLink) = getSimplexLink(parsedMsg)
             } else {
                 hasSimplexLink = false
             }
         }
-        .onChange(of: chat.userCanSend) { canSend in
-            if !canSend {
+        .onChange(of: chat.chatInfo.sendMsgEnabled) { sendEnabled in
+            if !sendEnabled {
                 cancelCurrentVoiceRecording()
                 clearCurrentDraft()
                 clearState()
@@ -793,6 +842,7 @@ struct ComposeView: View {
         var sent: ChatItem?
         let msgText = text ?? composeState.message
         let liveMessage = composeState.liveMessage
+        let mentions = composeState.memberMentions
         if !live {
             if liveMessage != nil { composeState = composeState.copy(liveMessage: nil) }
             await sending()
@@ -803,7 +853,7 @@ struct ComposeView: View {
             // Composed text is send as a reply to the last forwarded item
             sent = await forwardItems(chatItems, fromChatInfo, ttl).last
             if !composeState.message.isEmpty {
-                _ = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
+                _ = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl, mentions: mentions)
             }
         } else if case let .editingItem(ci) = composeState.contextItem {
             sent = await updateMessage(ci, live: live)
@@ -819,10 +869,11 @@ struct ComposeView: View {
 
             switch (composeState.preview) {
             case .noPreview:
-                sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
+                sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl, mentions: mentions)
             case .linkPreview:
-                sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl)
+                sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl, mentions: mentions)
             case let .mediaPreviews(media):
+                // TODO: CHECK THIS
                 let last = media.count - 1
                 var msgs: [ComposedMessage] = []
                 if last >= 0 {
@@ -847,10 +898,10 @@ struct ComposeView: View {
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
                 let file = voiceCryptoFile(recordingFileName)
-                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl)
+                sent = await send(.voice(text: msgText, duration: duration), quoted: quoted, file: file, ttl: ttl, mentions: mentions)
             case let .filePreview(_, file):
                 if let savedFile = saveFileFromURL(file) {
-                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl)
+                    sent = await send(.file(msgText), quoted: quoted, file: savedFile, live: live, ttl: ttl, mentions: mentions)
                 }
             }
         }
@@ -904,8 +955,9 @@ struct ComposeView: View {
                         let chatItem = try await apiUpdateChatItem(
                             type: chat.chatInfo.chatType,
                             id: chat.chatInfo.apiId,
+                            scope: chat.chatInfo.groupChatScope(),
                             itemId: ei.id,
-                            msg: mc,
+                            updatedMessage: UpdatedMessage(msgContent: mc, mentions: composeState.memberMentions),
                             live: live
                         )
                         await MainActor.run {
@@ -966,9 +1018,9 @@ struct ComposeView: View {
                 reportReason: reportReason,
                 reportText: msgText
             ) {
+                if showReportsInSupportChatAlertDefault.get() {
                     await MainActor.run {
-                    for chatItem in chatItems {
-                        chatModel.addChatItem(chat.chatInfo, chatItem)
+                        showReportsInSupportChatAlert()
                     }
                 }
                 return chatItems.first
@@ -977,9 +1029,29 @@ struct ComposeView: View {
             return nil
         }
 
-        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+        func showReportsInSupportChatAlert() {
+            showAlert(
+                NSLocalizedString("Report sent to moderators", comment: "alert title"),
+                message: NSLocalizedString("You can view your reports in Chat with admins.", comment: "alert message"),
+                actions: {[
+                    UIAlertAction(
+                        title: NSLocalizedString("Don't show again", comment: "alert action"),
+                        style: .default,
+                        handler: { _ in
+                            showReportsInSupportChatAlertDefault.set(false)
+                        }
+                    ),
+                    UIAlertAction(
+                        title: NSLocalizedString("Ok", comment: "alert action"),
+                        style: .default
+                    )
+                ]}
+            )
+        }
+
+        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?, mentions: [String: Int64]) async -> ChatItem? {
             await send(
-                [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc)],
+                [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc, mentions: mentions)],
                 live: live,
                 ttl: ttl
             ).first
@@ -991,6 +1063,7 @@ struct ComposeView: View {
                 : await apiSendMessages(
                     type: chat.chatInfo.chatType,
                     id: chat.chatInfo.apiId,
+                    scope: chat.chatInfo.groupChatScope(),
                     live: live,
                     ttl: ttl,
                     composedMessages: msgs
@@ -1015,8 +1088,10 @@ struct ComposeView: View {
             if let chatItems = await apiForwardChatItems(
                 toChatType: chat.chatInfo.chatType,
                 toChatId: chat.chatInfo.apiId,
+                toScope: chat.chatInfo.groupChatScope(),
                 fromChatType: fromChatInfo.chatType,
                 fromChatId: fromChatInfo.apiId,
+                fromScope: fromChatInfo.groupChatScope(),
                 itemIds: forwardedItems.map { $0.id },
                 ttl: ttl
             ) {
@@ -1043,7 +1118,8 @@ struct ComposeView: View {
         func checkLinkPreview() -> MsgContent {
             switch (composeState.preview) {
             case let .linkPreview(linkPreview: linkPreview):
-                if let url = parseMessage(msgText).url,
+                if let parsedMsg = parseSimpleXMarkdown(msgText),
+                   let url = getSimplexLink(parsedMsg).url,
                    let linkPreview = linkPreview,
                    url == linkPreview.uri {
                     return .link(text: msgText, preview: linkPreview)
@@ -1162,9 +1238,9 @@ struct ComposeView: View {
         }
     }
 
-    private func showLinkPreview(_ s: String) {
+    private func showLinkPreview(_ parsedMsg: [FormattedText]?) {
         prevLinkUrl = linkUrl
-        (linkUrl, hasSimplexLink) = parseMessage(s)
+        (linkUrl, hasSimplexLink) = getSimplexLink(parsedMsg)
         if let url = linkUrl {
             if url != composeState.linkPreview?.uri && url != pendingLinkUrl {
                 pendingLinkUrl = url
@@ -1181,8 +1257,8 @@ struct ComposeView: View {
         }
     }
 
-    private func parseMessage(_ msg: String) -> (url: URL?, hasSimplexLink: Bool) {
-        guard let parsedMsg = parseSimpleXMarkdown(msg) else { return (nil, false) }
+    private func getSimplexLink(_ parsedMsg: [FormattedText]?) -> (url: URL?, hasSimplexLink: Bool) {
+        guard let parsedMsg else { return (nil, false) }
         let url: URL? = if let uri = parsedMsg.first(where: { ft in
             ft.format == .uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text)
         }) {
@@ -1213,12 +1289,15 @@ struct ComposeView: View {
         if pendingLinkUrl == url {
             composeState = composeState.copy(preview: .linkPreview(linkPreview: nil))
             getLinkPreview(url: url) { linkPreview in
-                if let linkPreview = linkPreview,
-                   pendingLinkUrl == url {
+                if let linkPreview, pendingLinkUrl == url {
                     composeState = composeState.copy(preview: .linkPreview(linkPreview: linkPreview))
-                    pendingLinkUrl = nil
+                } else {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        composeState = composeState.copy(preview: .noPreview)
                     }
                 }
+                pendingLinkUrl = nil
+            }
         }
     }
 
@@ -1233,19 +1312,27 @@ struct ComposeView: View {
 struct ComposeView_Previews: PreviewProvider {
     static var previews: some View {
         let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
+        let im = ItemsModel.shared
         @State var composeState = ComposeState(message: "hello")
+        @State var selectedRange = NSRange()
 
         return Group {
             ComposeView(
                 chat: chat,
+                im: im,
                 composeState: $composeState,
-                keyboardVisible: Binding.constant(true)
+                keyboardVisible: Binding.constant(true),
+                keyboardHiddenDate: Binding.constant(Date.now),
+                selectedRange: $selectedRange
             )
             .environmentObject(ChatModel())
             ComposeView(
                 chat: chat,
+                im: im,
                 composeState: $composeState,
-                keyboardVisible: Binding.constant(true)
+                keyboardVisible: Binding.constant(true),
+                keyboardHiddenDate: Binding.constant(Date.now),
+                selectedRange: $selectedRange
             )
             .environmentObject(ChatModel())
         }

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

@@ -70,8 +70,10 @@ struct ContextItemView: View {
             .lineLimit(lines)
     }
 
-    private func contextMsgPreview(_ contextItem: ChatItem) -> Text {
-        return attachment() + messageText(contextItem.text, contextItem.formattedText, nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)
+    private func contextMsgPreview(_ contextItem: ChatItem) -> some View {
+        let r = messageText(contextItem.text, contextItem.formattedText, sender: nil, preview: true, mentions: contextItem.mentions, userMemberId: nil, showSecrets: nil, backgroundColor: UIColor(background))
+        let t = attachment() + Text(AttributedString(r.string))
+        return t.if(r.hasSecrets, transform: hiddenSecretsView)
 
         func attachment() -> Text {
             let isFileLoaded = if let fileSource = getLoadedFileSource(contextItem.file) {

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

@@ -0,0 +1,108 @@
+//
+//  ContextPendingMemberActionsView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 02.05.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct ContextPendingMemberActionsView: View {
+    @EnvironmentObject var theme: AppTheme
+    @Environment(\.dismiss) var dismiss
+    var groupInfo: GroupInfo
+    var member: GroupMember
+
+    var body: some View {
+        HStack(spacing: 0) {
+            ZStack {
+                Text("Reject")
+                    .foregroundColor(.red)
+            }
+            .frame(maxWidth: .infinity)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                showRejectMemberAlert(groupInfo, member, dismiss: dismiss)
+            }
+
+            ZStack {
+                Text("Accept")
+                    .foregroundColor(theme.colors.primary)
+            }
+            .frame(maxWidth: .infinity)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                showAcceptMemberAlert(groupInfo, member, dismiss: dismiss)
+            }
+        }
+        .frame(minHeight: 54)
+        .frame(maxWidth: .infinity)
+        .background(.thinMaterial)
+    }
+}
+
+func showRejectMemberAlert(_ groupInfo: GroupInfo, _ member: GroupMember, dismiss: DismissAction? = nil) {
+    showAlert(
+        title: NSLocalizedString("Reject member?", comment: "alert title"),
+        buttonTitle: "Reject",
+        buttonAction: { removeMember(groupInfo, member, dismiss: dismiss) },
+        cancelButton: true
+    )
+}
+
+func showAcceptMemberAlert(_ groupInfo: GroupInfo, _ member: GroupMember, dismiss: DismissAction? = nil) {
+    showAlert(
+        NSLocalizedString("Accept member", comment: "alert title"),
+        message: NSLocalizedString("Member will join the group, accept member?", comment: "alert message"),
+        actions: {[
+            UIAlertAction(
+                title: NSLocalizedString("Accept as member", comment: "alert action"),
+                style: .default,
+                handler: { _ in
+                    acceptMember(groupInfo, member, .member, dismiss: dismiss)
+                }
+            ),
+            UIAlertAction(
+                title: NSLocalizedString("Accept as observer", comment: "alert action"),
+                style: .default,
+                handler: { _ in
+                    acceptMember(groupInfo, member, .observer, dismiss: dismiss)
+                }
+            ),
+            UIAlertAction(
+                title: NSLocalizedString("Cancel", comment: "alert action"),
+                style: .default
+            )
+        ]}
+    )
+}
+
+func acceptMember(_ groupInfo: GroupInfo, _ member: GroupMember, _ role: GroupMemberRole, dismiss: DismissAction? = nil) {
+    Task {
+        do {
+            let (gInfo, acceptedMember) = try await apiAcceptMember(groupInfo.groupId, member.groupMemberId, role)
+            await MainActor.run {
+                _ = ChatModel.shared.upsertGroupMember(gInfo, acceptedMember)
+                ChatModel.shared.updateGroup(gInfo)
+                dismiss?()
+            }
+        } catch let error {
+            logger.error("apiAcceptMember error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error accepting member", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
+#Preview {
+    ContextPendingMemberActionsView(
+        groupInfo: GroupInfo.sampleData,
+        member: GroupMember.sampleData
+    )
+}

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

@@ -16,19 +16,15 @@ struct NativeTextEditor: UIViewRepresentable {
     @Binding var disableEditing: Bool
     @Binding var height: CGFloat
     @Binding var focused: Bool
+    @Binding var lastUnfocusedDate: Date
     @Binding var placeholder: String?
+    @Binding var selectedRange: NSRange
     let onImagesAdded: ([UploadContent]) -> Void
     
-    private let minHeight: CGFloat = 37
+    static let minHeight: CGFloat = 39
 
-    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)
+    func makeUIView(context: Context) -> CustomUITextField {
+        let field = CustomUITextField(parent: self, height: _height)
         field.backgroundColor = .clear
         field.text = text
         field.textAlignment = alignment(text)
@@ -37,10 +33,9 @@ struct NativeTextEditor: UIViewRepresentable {
             if !disableEditing {
                 text = newText
                 field.textAlignment = alignment(text)
-                updateFont(field)
+                field.updateFont()
                 // Speed up the process of updating layout, reduce jumping content on screen
-                updateHeight(field)
-                self.height = field.frame.size.height
+                field.updateHeight()
             } else {
                 field.text = text
             }
@@ -48,48 +43,32 @@ struct NativeTextEditor: UIViewRepresentable {
                 onImagesAdded(images)
             }
         }
-        field.setOnFocusChangedListener { focused = $0 }
+        field.setOnFocusChangedListener {
+            focused = $0
+            if !focused {
+                lastUnfocusedDate = .now
+            }
+        }
         field.delegate = field
         field.textContainerInset = UIEdgeInsets(top: 8, left: 5, bottom: 6, right: 4)
         field.setPlaceholderView()
-        updateFont(field)
-        updateHeight(field)
+        field.updateFont()
+        field.updateHeight(updateBindingNow: false)
         return field
     }
     
-    func updateUIView(_ field: UITextView, context: Context) {
+    func updateUIView(_ field: CustomUITextField, context: Context) {
         if field.markedTextRange == nil && field.text != text {
             field.text = text
             field.textAlignment = alignment(text)
-            updateFont(field)
-            updateHeight(field)
+            field.updateFont()
+            field.updateHeight(updateBindingNow: false)
         }
-        
-        let castedField = field as! CustomUITextField
-        if castedField.placeholder != placeholder {
-            castedField.placeholder = placeholder
+        if field.placeholder != placeholder {
+            field.placeholder = placeholder
         }
-    }
-
-    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) {
-        let newFont = isShortEmoji(field.text)
-        ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
-        : UIFont.preferredFont(forTextStyle: .body)
-        if field.font != newFont {
-            field.font = newFont
+        if field.selectedRange != selectedRange {
+            field.selectedRange = selectedRange
         }
     }
 }
@@ -98,7 +77,8 @@ private func alignment(_ text: String) -> NSTextAlignment {
     isRightToLeft(text) ? .right : .left
 }
 
-private class CustomUITextField: UITextView, UITextViewDelegate {
+class CustomUITextField: UITextView, UITextViewDelegate {
+    var parent: NativeTextEditor?
     var height: Binding<CGFloat>
     var newHeight: CGFloat = 0
     var onTextChanged: (String, [UploadContent]) -> Void = { newText, image in }
@@ -106,7 +86,8 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
 
     private let placeholderLabel: UILabel = UILabel()
 
-    init(height: Binding<CGFloat>) {
+    init(parent: NativeTextEditor?, height: Binding<CGFloat>) {
+        self.parent = parent
         self.height = height
         super.init(frame: .zero, textContainer: nil)
     }
@@ -128,11 +109,44 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
         invalidateIntrinsicContentSize()
     }
 
-    override var intrinsicContentSize: CGSize {
-        if height.wrappedValue != newHeight {
-            DispatchQueue.main.asyncAfter(deadline: .now(), execute: { self.height.wrappedValue = self.newHeight })
+    func updateHeight(updateBindingNow: Bool = true) {
+        let maxHeight = min(360, font!.lineHeight * 12)
+        let newHeight = min(max(sizeThatFits(CGSizeMake(frame.size.width, CGFloat.greatestFiniteMagnitude)).height, NativeTextEditor.minHeight), maxHeight).rounded(.down)
+
+        if self.newHeight != newHeight {
+            frame.size = CGSizeMake(frame.size.width, newHeight)
+            invalidateIntrinsicContentHeight(newHeight)
+            if updateBindingNow {
+                self.height.wrappedValue = newHeight
+            } else {
+                DispatchQueue.main.async {
+                    self.height.wrappedValue = newHeight
                 }
-        return CGSizeMake(0, newHeight)
+            }
+        }
+    }
+
+    func updateFont() {
+        let newFont = isShortEmoji(text)
+        ? (text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
+        : UIFont.preferredFont(forTextStyle: .body)
+        if font != newFont {
+            font = newFont
+            // force apply new font because it has problem with doing it when the field had two emojis
+            if text.count == 0 {
+                text = " "
+                text = ""
+            }
+        }
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        updateHeight()
+    }
+
+    override var intrinsicContentSize: CGSize {
+        CGSizeMake(0, newHeight)
     }
 
     func setOnTextChangedListener(onTextChanged: @escaping (String, [UploadContent]) -> Void) {
@@ -232,10 +246,22 @@ private class CustomUITextField: UITextView, UITextViewDelegate {
     
     func textViewDidBeginEditing(_ textView: UITextView) {
         onFocusChanged(true)
+        updateSelectedRange(textView)
     }
     
     func textViewDidEndEditing(_ textView: UITextView) {
         onFocusChanged(false)
+        updateSelectedRange(textView)
+    }
+    
+    func textViewDidChangeSelection(_ textView: UITextView) {
+        updateSelectedRange(textView)
+    }
+    
+    private func updateSelectedRange(_ textView: UITextView) {
+        if parent?.selectedRange != textView.selectedRange {
+            parent?.selectedRange = textView.selectedRange
+        }
     }
 }
 
@@ -246,7 +272,9 @@ struct NativeTextEditor_Previews: PreviewProvider{
             disableEditing: Binding.constant(false),
             height: Binding.constant(100),
             focused: Binding.constant(false),
+            lastUnfocusedDate: Binding.constant(.now),
             placeholder: Binding.constant("Placeholder"),
+            selectedRange: Binding.constant(NSRange(location: 0, length: 0)),
             onImagesAdded: { _ in }
         )
         .fixedSize(horizontal: false, vertical: true)

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

@@ -13,7 +13,9 @@ private let liveMsgInterval: UInt64 = 3000_000000
 
 struct SendMessageView: View {
     @Binding var composeState: ComposeState
+    @Binding var selectedRange: NSRange
     @EnvironmentObject var theme: AppTheme
+    @Environment(\.isEnabled) var isEnabled
     var sendMessage: (Int?) -> Void
     var sendLiveMessage: (() async -> Void)? = nil
     var updateLiveMessage: (() async -> Void)? = nil
@@ -31,8 +33,9 @@ struct SendMessageView: View {
     @State private var holdingVMR = false
     @Namespace var namespace
     @Binding var keyboardVisible: Bool
+    @Binding var keyboardHiddenDate: Date
     var sendButtonColor = Color.accentColor
-    @State private var teHeight: CGFloat = 42
+    @State private var teHeight: CGFloat = NativeTextEditor.minHeight
     @State private var teFont: Font = .body
     @State private var sendButtonSize: CGFloat = 29
     @State private var sendButtonOpacity: CGFloat = 1
@@ -43,9 +46,7 @@ struct SendMessageView: View {
     @UserDefault(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
 
     var body: some View {
-        ZStack {
         let composeShape = RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
-            HStack(alignment: .bottom) {
         ZStack(alignment: .leading) {
             if case .voicePreview = composeState.preview {
                 Text("Voice message…")
@@ -54,6 +55,7 @@ struct SendMessageView: View {
                     .foregroundColor(theme.colors.secondary)
                     .padding(.horizontal, 10)
                     .padding(.vertical, 8)
+                    .padding(.trailing, 32)
                     .frame(maxWidth: .infinity)
             } else {
                 NativeTextEditor(
@@ -61,34 +63,37 @@ struct SendMessageView: View {
                     disableEditing: $composeState.inProgress,
                     height: $teHeight,
                     focused: $keyboardVisible,
+                    lastUnfocusedDate: $keyboardHiddenDate,
                     placeholder: Binding(get: { composeState.placeholder }, set: { _ in }),
+                    selectedRange: $selectedRange,
                     onImagesAdded: onMediaAdded
                 )
+                .padding(.trailing, 32)
                 .allowsTightening(false)
                 .fixedSize(horizontal: false, vertical: true)
             }
         }
+        .overlay(alignment: .topTrailing, content: {
+            if !progressByTimeout && teHeight > 100 && !composeState.inProgress {
+                deleteTextButton()
+            }
+        })
+        .overlay(alignment: .bottomTrailing, content: {
             if progressByTimeout {
                 ProgressView()
                     .scaleEffect(1.4)
                     .frame(width: 31, height: 31, alignment: .center)
-                        .padding([.bottom, .trailing], 3)
+                    .padding([.bottom, .trailing], 4)
             } else {
-                    VStack(alignment: .trailing) {
-                        if teHeight > 100 && !composeState.inProgress {
-                            deleteTextButton()
-                            Spacer()
-                        }
                 composeActionButtons()
+                // required for intercepting clicks
+                    .background(.white.opacity(0.000001))
             }
-                    .frame(height: teHeight, alignment: .bottom)
-                }
-            }
+        })
         .padding(.vertical, 1)
         .background(theme.colors.background)
         .clipShape(composeShape)
         .overlay(composeShape.strokeBorder(.secondary, lineWidth: 0.5).opacity(0.7))
-        }
         .onChange(of: composeState.message, perform: { text in updateFont(text) })
         .onChange(of: composeState.inProgress) { inProgress in
             if inProgress {
@@ -167,7 +172,7 @@ struct SendMessageView: View {
             !composeState.sendEnabled ||
             composeState.inProgress
         )
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .padding([.bottom, .trailing], 4)
     }
 
@@ -190,7 +195,7 @@ struct SendMessageView: View {
             composeState.endLiveDisabled ||
             disableSendButton
         )
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .contextMenu{
             sendButtonContextMenuItems()
         }
@@ -251,6 +256,7 @@ struct SendMessageView: View {
     }
 
     private struct RecordVoiceMessageButton: View {
+        @Environment(\.isEnabled) var isEnabled
         @EnvironmentObject var theme: AppTheme
         var startVoiceMessageRecording: (() -> Void)?
         var finishVoiceMessageRecording: (() -> Void)?
@@ -259,15 +265,14 @@ struct SendMessageView: View {
         @State private var pressed: TimeInterval? = nil
 
         var body: some View {
-            Button(action: {}) {
-                Image(systemName: "mic.fill")
+            Image(systemName: isEnabled ? "mic.fill" : "mic")
             .resizable()
             .scaledToFit()
             .frame(width: 20, height: 20)
-                    .foregroundColor(theme.colors.primary)
-            }
+            .foregroundColor(isEnabled ? theme.colors.primary : theme.colors.secondary)
+            .opacity(holdingVMR ? 0.7 : 1)
             .disabled(disabled)
-            .frame(width: 29, height: 29)
+            .frame(width: 31, height: 31)
             .padding([.bottom, .trailing], 4)
             ._onButtonGesture { down in
                 if down {
@@ -275,9 +280,7 @@ struct SendMessageView: View {
                     pressed = ProcessInfo.processInfo.systemUptime
                     startVoiceMessageRecording?()
                 } else {
-                    let now = ProcessInfo.processInfo.systemUptime
-                    if let pressed = pressed,
-                       now - pressed >= 1 {
+                    if let pressed, ProcessInfo.processInfo.systemUptime - pressed >= 1 {
                         finishVoiceMessageRecording?()
                     }
                     holdingVMR = false
@@ -323,7 +326,7 @@ struct SendMessageView: View {
                 .foregroundColor(theme.colors.secondary)
         }
         .disabled(composeState.inProgress)
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .padding([.bottom, .trailing], 4)
     }
 
@@ -351,7 +354,7 @@ struct SendMessageView: View {
             Image(systemName: "bolt.fill")
                 .resizable()
                 .scaledToFit()
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(isEnabled ? theme.colors.primary : theme.colors.secondary)
                 .frame(width: 20, height: 20)
         }
         .frame(width: 29, height: 29)
@@ -408,7 +411,7 @@ struct SendMessageView: View {
                 .foregroundColor(theme.colors.primary)
         }
         .disabled(composeState.inProgress)
-        .frame(width: 29, height: 29)
+        .frame(width: 31, height: 31)
         .padding([.bottom, .trailing], 4)
     }
 
@@ -424,8 +427,10 @@ struct SendMessageView: View {
 struct SendMessageView_Previews: PreviewProvider {
     static var previews: some View {
         @State var composeStateNew = ComposeState()
+        @State var selectedRange = NSRange()
         let ci = ChatItem.getSample(1, .directSnd, .now, "hello")
         @State var composeStateEditing = ComposeState(editingItem: ci)
+        @State var selectedRangeEditing = NSRange()
         @State var sendEnabled: Bool = true
 
         return Group {
@@ -434,9 +439,11 @@ struct SendMessageView_Previews: PreviewProvider {
                 Spacer(minLength: 0)
                 SendMessageView(
                     composeState: $composeStateNew,
+                    selectedRange: $selectedRange,
                     sendMessage: { _ in },
                     onMediaAdded: { _ in },
-                    keyboardVisible: Binding.constant(true)
+                    keyboardVisible: Binding.constant(true),
+                    keyboardHiddenDate: Binding.constant(Date.now)
                 )
             }
             VStack {
@@ -444,9 +451,11 @@ struct SendMessageView_Previews: PreviewProvider {
                 Spacer(minLength: 0)
                 SendMessageView(
                     composeState: $composeStateEditing,
+                    selectedRange: $selectedRangeEditing,
                     sendMessage: { _ in },
                     onMediaAdded: { _ in },
-                    keyboardVisible: Binding.constant(true)
+                    keyboardVisible: Binding.constant(true),
+                    keyboardHiddenDate: Binding.constant(Date.now)
                 )
             }
         }

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

@@ -0,0 +1,715 @@
+//
+//  EndlessScrollView.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 25.01.2025.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct ScrollRepresentable<Content: View, ScrollItem>: UIViewControllerRepresentable where ScrollItem : Identifiable, ScrollItem: Hashable {
+
+    let scrollView: EndlessScrollView<ScrollItem>
+    let content: (Int, ScrollItem) -> Content
+
+    func makeUIViewController(context: Context) -> ScrollController {
+        ScrollController.init(scrollView: scrollView, content: content)
+    }
+
+    func updateUIViewController(_ controller: ScrollController, context: Context) {}
+
+    class ScrollController: UIViewController {
+        let scrollView: EndlessScrollView<ScrollItem>
+        fileprivate var items: [ScrollItem] = []
+        fileprivate var content: ((Int, ScrollItem) -> Content)!
+
+        fileprivate init(scrollView: EndlessScrollView<ScrollItem>, content: @escaping (Int, ScrollItem) -> Content) {
+            self.scrollView = scrollView
+            self.content = content
+            super.init(nibName: nil, bundle: nil)
+            self.view = scrollView
+            scrollView.createCell = createCell
+            scrollView.updateCell = updateCell
+        }
+
+        required init?(coder: NSCoder) { fatalError() }
+
+        private func createCell(_ index: Int, _ items: [ScrollItem], _ cellsToReuse: inout [UIView]) -> UIView {
+            let item: ScrollItem? = index >= 0 && index < items.count ? items[index] : nil
+            let cell: UIView
+            if #available(iOS 16.0, *), false {
+                let c: UITableViewCell = cellsToReuse.isEmpty ? UITableViewCell() : cellsToReuse.removeLast() as! UITableViewCell
+                if let item {
+                    c.contentConfiguration = UIHostingConfiguration { self.content(index, item) }
+                        .margins(.all, 0)
+                        .minSize(height: 1) // Passing zero will result in system default of 44 points being used
+                }
+                cell = c
+            } else {
+                let c = cellsToReuse.isEmpty ? HostingCell<Content>() : cellsToReuse.removeLast() as! HostingCell<Content>
+                if let item {
+                    c.set(content: self.content(index, item), parent: self)
+                }
+                cell = c
+            }
+            cell.isHidden = false
+            cell.backgroundColor = .clear
+            let size = cell.systemLayoutSizeFitting(CGSizeMake(scrollView.bounds.width, CGFloat.greatestFiniteMagnitude))
+            cell.frame.size.width = scrollView.bounds.width
+            cell.frame.size.height = size.height
+            return cell
+        }
+
+        private func updateCell(cell: UIView, _ index: Int, _ items: [ScrollItem]) {
+            let item = items[index]
+            if #available(iOS 16.0, *), false {
+                (cell as! UITableViewCell).contentConfiguration = UIHostingConfiguration { self.content(index, item) }
+                    .margins(.all, 0)
+                    .minSize(height: 1) // Passing zero will result in system default of 44 points being used
+            } else {
+                if let cell = cell as? HostingCell<Content> {
+                    cell.set(content: self.content(index, item), parent: self)
+                } else {
+                    fatalError("Unexpected Cell Type for: \(item)")
+                }
+            }
+            let size = cell.systemLayoutSizeFitting(CGSizeMake(scrollView.bounds.width, CGFloat.greatestFiniteMagnitude))
+            cell.frame.size.width = scrollView.bounds.width
+            cell.frame.size.height = size.height
+            cell.setNeedsLayout()
+        }
+    }
+}
+
+class EndlessScrollView<ScrollItem>: UIScrollView, UIScrollViewDelegate, UIGestureRecognizerDelegate where ScrollItem : Identifiable, ScrollItem: Hashable {
+
+    /// Stores actual state of the scroll view and all elements drawn on the screen
+    let listState: ListState = ListState()
+
+    /// Just some random big number that will probably be enough to scrolling down and up without reaching the end
+    var initialOffset: CGFloat = 100000000
+
+    /// Default item id when no items in the visible items list. Something that will never be in real data
+    fileprivate static var DEFAULT_ITEM_ID: any Hashable { get { Int64.min } }
+
+    /// Storing an offset that was already used for laying down content to be able to see the difference
+    var prevProcessedOffset: CGFloat = 0
+
+    /// When screen is being rotated, it's important to track the view size and adjust scroll offset accordingly because the view doesn't know that the content
+    /// starts from bottom and ends at top, not vice versa as usual
+    var oldScreenHeight: CGFloat = 0
+
+    /// Not 100% correct height of the content since the items loaded lazily and their dimensions are unkown until they are on screen
+    var estimatedContentHeight: ContentHeight = ContentHeight()
+
+    /// Specify here the value that is small enough to NOT see any weird animation when you scroll to items. Minimum expected item size is ok. Scroll speed depends on it too
+    var averageItemHeight: CGFloat = 30
+
+    /// This is used as a multiplier for difference between current index and scrollTo index using [averageItemHeight] as well. Increase it to get faster speed
+    var scrollStepMultiplier: CGFloat = 0.37
+
+    /// Adds content padding to top
+    var insetTop: CGFloat = 100
+
+    /// Adds content padding to bottom
+    var insetBottom: CGFloat = 100
+
+    var scrollToItemIndexDelayed: Int? = nil
+
+    /// The second scroll view that is used only for purpose of displaying scroll bar with made-up content size and scroll offset that is gathered from main scroll view, see [estimatedContentHeight]
+    let scrollBarView: UIScrollView = UIScrollView(frame: .zero)
+
+    /// Stores views that can be used to hold new content so it will be faster to replace something than to create the whole view from scratch
+    var cellsToReuse: [UIView] = []
+
+    /// Enable debug to see hundreds of logs
+    var debug: Bool = false
+
+    var createCell: (Int, [ScrollItem], inout [UIView]) -> UIView? = { _, _, _ in nil }
+    var updateCell: (UIView, Int, [ScrollItem]) -> Void = { cell, _, _ in }
+
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.delegate = self
+    }
+
+    required init?(coder: NSCoder) { fatalError() }
+
+    class ListState: NSObject {
+
+        /// Will be called on every change of the items array, visible items, and scroll position
+        var onUpdateListener: () -> Void = {}
+
+        /// Items that were used to lay out the screen
+        var items: [ScrollItem] = [] {
+            didSet {
+                onUpdateListener()
+            }
+        }
+
+        /// It is equai to the number of [items]
+        var totalItemsCount: Int {
+            items.count
+        }
+
+        /// The items with their positions and other useful information. Only those that are visible on screen
+        var visibleItems: [EndlessScrollView<ScrollItem>.VisibleItem] = []
+
+        /// Index in [items] of the first item on screen. This is intentiallty not derived from visible items because it's is used as a starting point for laying out the screen
+        var firstVisibleItemIndex: Int = 0
+
+        /// Unique item id of the first visible item on screen
+        var firstVisibleItemId: any Hashable = EndlessScrollView<ScrollItem>.DEFAULT_ITEM_ID
+
+        /// Item offset of the first item on screen. Most of the time it's non-positive but it can be positive as well when a user produce overscroll effect on top/bottom of the scroll view
+        var firstVisibleItemOffset: CGFloat = -100
+
+        /// Index of the last visible item on screen
+        var lastVisibleItemIndex: Int {
+            visibleItems.last?.index ?? 0
+        }
+
+        /// Specifies if visible items cover the whole screen or can cover it (if overscrolled)
+        var itemsCanCoverScreen: Bool = false
+
+        /// Whether there is a non-animated scroll to item in progress or not
+        var isScrolling: Bool = false
+        /// Whether there is an animated scroll to item in progress or not
+        var isAnimatedScrolling: Bool = false
+
+        override init() {
+            super.init()
+        }
+    }
+
+    class VisibleItem {
+        let index: Int
+        let item: ScrollItem
+        let view: UIView
+        var offset: CGFloat
+
+        init(index: Int, item: ScrollItem, view: UIView, offset: CGFloat) {
+            self.index = index
+            self.item = item
+            self.view = view
+            self.offset = offset
+        }
+    }
+
+    class ContentHeight {
+        /// After that you should see overscroll effect. When scroll positon is far from
+        /// top/bottom items, these values are estimated based on items count multiplied by averageItemHeight or real item height (from visible items). Example:
+        /// [ 10, 9, 8, 7, (6, 5, 4, 3), 2, 1, 0] - 6, 5, 4, 3 are visible and have know heights but others have unknown height and for them averageItemHeight will be used to calculate the whole content height
+        var topOffsetY: CGFloat = 0
+        var bottomOffsetY: CGFloat = 0
+
+        var virtualScrollOffsetY: CGFloat = 0
+
+        /// How much distance were overscolled on top which often means to show sticky scrolling that should scroll back to real position after a users finishes dragging the scrollView
+        var overscrolledTop: CGFloat = 0
+
+        /// Adds content padding to bottom and top
+        var inset: CGFloat = 100
+
+        /// Estimated height of the contents of scroll view
+        var height: CGFloat {
+            get { bottomOffsetY - topOffsetY }
+        }
+
+        /// Estimated height of the contents of scroll view + distance of overscrolled effect. It's only updated when number of item changes to prevent jumping of scroll bar
+        var virtualOverscrolledHeight: CGFloat {
+            get {
+                bottomOffsetY - topOffsetY + overscrolledTop - inset * 2
+            }
+        }
+
+        func update(
+            _ contentOffset: CGPoint,
+            _ listState: ListState,
+            _ averageItemHeight: CGFloat,
+            _ updateStaleHeight: Bool
+        ) {
+            let lastVisible = listState.visibleItems.last
+            let firstVisible = listState.visibleItems.first
+            guard let last = lastVisible, let first = firstVisible else {
+                topOffsetY = contentOffset.y
+                bottomOffsetY = contentOffset.y
+                virtualScrollOffsetY = 0
+                overscrolledTop = 0
+                return
+            }
+            topOffsetY = last.view.frame.origin.y - CGFloat(listState.totalItemsCount - last.index - 1) * averageItemHeight - self.inset
+            bottomOffsetY = first.view.frame.origin.y + first.view.bounds.height + CGFloat(first.index) * averageItemHeight + self.inset
+            virtualScrollOffsetY = contentOffset.y - topOffsetY
+            overscrolledTop = max(0, last.index == listState.totalItemsCount - 1 ? last.view.frame.origin.y - contentOffset.y : 0)
+        }
+    }
+
+    var topY: CGFloat {
+        get { contentOffset.y }
+    }
+
+    var bottomY: CGFloat {
+        get { contentOffset.y + bounds.height }
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        if contentSize.height == 0 {
+            setup()
+        }
+        let newScreenHeight = bounds.height
+        if newScreenHeight != oldScreenHeight && oldScreenHeight != 0 {
+            contentOffset.y += oldScreenHeight - newScreenHeight
+            scrollBarView.frame = CGRectMake(frame.width - 10, self.insetTop, 10, frame.height - self.insetTop - self.insetBottom)
+        }
+        oldScreenHeight = newScreenHeight
+        adaptItems(listState.items, false)
+        if let index = scrollToItemIndexDelayed {
+            scrollToItem(index)
+            scrollToItemIndexDelayed = nil
+        }
+    }
+
+    private func setup() {
+        contentSize = CGSizeMake(frame.size.width, initialOffset * 2)
+        prevProcessedOffset = initialOffset
+        contentOffset = CGPointMake(0, initialOffset)
+        
+        showsVerticalScrollIndicator = false
+        scrollBarView.showsHorizontalScrollIndicator = false
+        panGestureRecognizer.delegate = self
+        addGestureRecognizer(scrollBarView.panGestureRecognizer)
+        superview!.addSubview(scrollBarView)
+    }
+
+    func updateItems(_ items: [ScrollItem], _ forceReloadVisible: Bool = false) {
+        if !Thread.isMainThread {
+            logger.error("Use main thread to update items")
+            return
+        }
+        if bounds.height == 0 {
+            self.listState.items = items
+            // this function requires to have valid bounds and it will be called again once it has them
+            return
+        }
+        adaptItems(items, forceReloadVisible)
+        snapToContent(animated: false)
+    }
+
+    /// [forceReloadVisible]: reloads every item that was visible regardless of hashValue changes
+    private func adaptItems(_ items: [ScrollItem], _ forceReloadVisible: Bool, overridenOffset: CGFloat? = nil) {
+        let start = Date.now
+        // special case when everything was removed
+        if items.isEmpty {
+            listState.visibleItems.forEach { item in item.view.removeFromSuperview() }
+            listState.visibleItems = []
+            listState.itemsCanCoverScreen = false
+            listState.firstVisibleItemId = EndlessScrollView<ScrollItem>.DEFAULT_ITEM_ID
+            listState.firstVisibleItemIndex = 0
+            listState.firstVisibleItemOffset = -insetTop
+
+            estimatedContentHeight.update(contentOffset, listState, averageItemHeight, true)
+            scrollBarView.contentSize = .zero
+            scrollBarView.contentOffset = .zero
+
+            prevProcessedOffset = contentOffset.y
+            // this check is just to prevent didSet listener from firing on the same empty array, no use for this
+            if !self.listState.items.isEmpty {
+                self.listState.items = items
+            }
+            return
+        }
+
+        let contentOffsetY = overridenOffset ?? contentOffset.y
+
+        var oldVisible = listState.visibleItems
+        var newVisible: [VisibleItem] = []
+        var visibleItemsHeight: CGFloat = 0
+        let offsetsDiff = contentOffsetY - prevProcessedOffset
+
+        var shouldBeFirstVisible = items.firstIndex(where: { item in item.id == listState.firstVisibleItemId as! ScrollItem.ID }) ?? 0
+
+        var wasFirstVisibleItemOffset = listState.firstVisibleItemOffset
+        var alreadyChangedIndexWhileScrolling = false
+        var allowOneMore = false
+        var nextOffsetY: CGFloat = 0
+        var i = shouldBeFirstVisible
+        // building list of visible items starting from the first one that should be visible
+        while i >= 0 && i < items.count {
+            let item = items[i]
+            let visibleIndex = oldVisible.firstIndex(where: { vis in vis.item.id == item.id })
+            let visible: VisibleItem?
+            if let visibleIndex {
+                let v = oldVisible.remove(at: visibleIndex)
+                if forceReloadVisible || v.view.bounds.width != bounds.width || v.item.hashValue != item.hashValue {
+                    let wasHeight = v.view.bounds.height
+                    updateCell(v.view, i, items)
+                    if wasHeight < v.view.bounds.height && i == 0 && shouldBeFirstVisible == i {
+                        v.view.frame.origin.y -= v.view.bounds.height - wasHeight
+                    }
+                }
+                visible = v
+            } else {
+                visible = nil
+            }
+            if shouldBeFirstVisible == i {
+                if let vis = visible {
+
+                    if // there is auto scroll in progress and the first item has a higher offset than bottom part
+                        // of the screen. In order to make scrolling down & up equal in time, we treat this as a sign to
+                        // re-make the first visible item
+                        (listState.isAnimatedScrolling && vis.view.frame.origin.y + vis.view.bounds.height < contentOffsetY + bounds.height) ||
+                        // the fist visible item previously is hidden now, remove it and move on
+                        !isVisible(vis.view) {
+                        let newIndex: Int
+                        if listState.isAnimatedScrolling {
+                            // skip many items to make the scrolling take less time
+                            var indexDiff = !alreadyChangedIndexWhileScrolling ? Int(ceil(abs(offsetsDiff / averageItemHeight))) : 0
+                            // if index was already changed, no need to change it again. Otherwise, the scroll will overscoll and return back animated. Because it means the whole screen was scrolled
+                            alreadyChangedIndexWhileScrolling = true
+
+                            indexDiff = offsetsDiff <= 0 ? indexDiff : -indexDiff
+                            newIndex = max(0, min(items.count - 1, i + indexDiff))
+                            // offset for the first visible item can now be 0 because the previous first visible item doesn't exist anymore
+                            wasFirstVisibleItemOffset = 0
+                        } else {
+                            // don't skip multiple items if it's manual scrolling gesture
+                            newIndex = i + (offsetsDiff <= 0 ? 1 : -1)
+                        }
+                        shouldBeFirstVisible = newIndex
+                        i = newIndex
+
+                        cellsToReuse.append(vis.view)
+                        hideAndRemoveFromSuperviewIfNeeded(vis.view)
+                        continue
+                    }
+                }
+                let vis: VisibleItem
+                if let visible {
+                    vis = VisibleItem(index: i, item: item, view: visible.view, offset: offsetToBottom(visible.view))
+                } else {
+                    let cell = createCell(i, items, &cellsToReuse)!
+                    cell.frame.origin.y = bottomY + wasFirstVisibleItemOffset - cell.frame.height
+                    vis = VisibleItem(index: i, item: item, view: cell, offset: offsetToBottom(cell))
+                }
+                if vis.view.superview == nil {
+                    addSubview(vis.view)
+                }
+                newVisible.append(vis)
+                visibleItemsHeight += vis.view.frame.height
+                nextOffsetY = vis.view.frame.origin.y
+            } else {
+                let vis: VisibleItem
+                if let visible {
+                    vis = VisibleItem(index: i, item: item, view: visible.view, offset: offsetToBottom(visible.view))
+                    nextOffsetY -= vis.view.frame.height
+                    vis.view.frame.origin.y = nextOffsetY
+                } else {
+                    let cell = createCell(i, items, &cellsToReuse)!
+                    nextOffsetY -= cell.frame.height
+                    cell.frame.origin.y = nextOffsetY
+                    vis = VisibleItem(index: i, item: item, view: cell, offset: offsetToBottom(cell))
+                }
+                if vis.view.superview == nil {
+                    addSubview(vis.view)
+                }
+                newVisible.append(vis)
+                visibleItemsHeight += vis.view.frame.height
+            }
+            if abs(nextOffsetY) < contentOffsetY && !allowOneMore {
+                break
+            } else if abs(nextOffsetY) < contentOffsetY {
+                allowOneMore = false
+            }
+            i += 1
+        }
+        if let firstVisible = newVisible.first, firstVisible.view.frame.origin.y + firstVisible.view.frame.height < contentOffsetY + bounds.height, firstVisible.index > 0 {
+            var offset: CGFloat = firstVisible.view.frame.origin.y + firstVisible.view.frame.height
+            let index = firstVisible.index
+            for i in stride(from: index - 1, through: 0, by: -1) {
+                let item = items[i]
+                let visibleIndex = oldVisible.firstIndex(where: { vis in vis.item.id == item.id })
+                let vis: VisibleItem
+                if let visibleIndex {
+                    let visible = oldVisible.remove(at: visibleIndex)
+                    visible.view.frame.origin.y = offset
+                    vis = VisibleItem(index: i, item: item, view: visible.view, offset: offsetToBottom(visible.view))
+                } else {
+                    let cell = createCell(i, items, &cellsToReuse)!
+                    cell.frame.origin.y = offset
+                    vis = VisibleItem(index: i, item: item, view: cell, offset: offsetToBottom(cell))
+                }
+                if vis.view.superview == nil {
+                    addSubview(vis.view)
+                }
+                offset += vis.view.frame.height
+                newVisible.insert(vis, at: 0)
+                visibleItemsHeight += vis.view.frame.height
+                if offset >= contentOffsetY + bounds.height {
+                    break
+                }
+            }
+        }
+
+        // removing already unneeded visible items
+        oldVisible.forEach { vis in
+            cellsToReuse.append(vis.view)
+            hideAndRemoveFromSuperviewIfNeeded(vis.view)
+        }
+        let itemsCountChanged = listState.items.count != items.count
+        prevProcessedOffset = contentOffsetY
+
+        listState.visibleItems = newVisible
+        // bottom drawing starts from 0 until top visible area at least (bound.height - insetTop) or above top bar (bounds.height).
+        // For visible items to preserve offset after adding more items having such height is enough
+        listState.itemsCanCoverScreen = visibleItemsHeight >= bounds.height - insetTop
+
+        listState.firstVisibleItemId = listState.visibleItems.first?.item.id ?? EndlessScrollView<ScrollItem>.DEFAULT_ITEM_ID
+        listState.firstVisibleItemIndex = listState.visibleItems.first?.index ?? 0
+        listState.firstVisibleItemOffset = listState.visibleItems.first?.offset ?? -insetTop
+        // updating the items with the last step in order to call listener with fully updated state
+        listState.items = items
+
+        estimatedContentHeight.update(contentOffset, listState, averageItemHeight, itemsCountChanged)
+        scrollBarView.contentSize = CGSizeMake(bounds.width, estimatedContentHeight.virtualOverscrolledHeight)
+        scrollBarView.contentOffset = CGPointMake(0, estimatedContentHeight.virtualScrollOffsetY)
+        scrollBarView.isHidden = listState.visibleItems.count == listState.items.count && (listState.visibleItems.isEmpty || -listState.firstVisibleItemOffset + (listState.visibleItems.last?.offset ?? 0) + insetTop < bounds.height)
+
+        if debug {
+            println("time spent \((-start.timeIntervalSinceNow).description.prefix(5).replacingOccurrences(of: "0.000", with: "<0").replacingOccurrences(of: "0.", with: ""))")
+        }
+    }
+
+    func setScrollPosition(_ index: Int, _ id: Int64, _ offset: CGFloat = 0) {
+        listState.firstVisibleItemIndex = index
+        listState.firstVisibleItemId = id
+        listState.firstVisibleItemOffset = offset == 0 ? -bounds.height + insetTop + insetBottom : offset
+    }
+
+    func scrollToItem(_ index: Int, top: Bool = true) {
+        if index >= listState.items.count || listState.isScrolling || listState.isAnimatedScrolling {
+            return
+        }
+        if bounds.height == 0 || contentSize.height == 0 {
+            scrollToItemIndexDelayed = index
+            return
+        }
+        listState.isScrolling = true
+        defer {
+            listState.isScrolling = false
+        }
+
+        // just a faster way to set top item as requested index
+        listState.firstVisibleItemIndex = index
+        listState.firstVisibleItemId = listState.items[index].id
+        listState.firstVisibleItemOffset = -bounds.height + insetTop + insetBottom
+        scrollBarView.flashScrollIndicators()
+        adaptItems(listState.items, false)
+
+        var adjustedOffset = self.contentOffset.y
+        var i = 0
+
+        var upPrev = index > listState.firstVisibleItemIndex
+        //let firstOrLastIndex = upPrev ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+        //let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier)
+
+        var stepSlowdownMultiplier: CGFloat = 1
+        while i < 200 {
+            let up = index > listState.firstVisibleItemIndex
+            if upPrev != up {
+                stepSlowdownMultiplier = stepSlowdownMultiplier * 0.5
+                upPrev = up
+            }
+
+            // these two lines makes scrolling's finish non-linear and NOT overscroll visually when reach target index
+            let firstOrLastIndex = up ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+            let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier) * stepSlowdownMultiplier
+
+            let offsetToScroll = (up ? -averageItemHeight : averageItemHeight) * step
+            adjustedOffset += offsetToScroll
+            if let item = listState.visibleItems.first(where: { $0.index == index }) {
+                let y = if top {
+                    min(estimatedContentHeight.bottomOffsetY - bounds.height, item.view.frame.origin.y - insetTop)
+                } else {
+                    max(estimatedContentHeight.topOffsetY - insetTop - insetBottom, item.view.frame.origin.y + item.view.bounds.height - bounds.height + insetBottom)
+                }
+                setContentOffset(CGPointMake(contentOffset.x, y), animated: false)
+                scrollBarView.flashScrollIndicators()
+                break
+            }
+            contentOffset = CGPointMake(contentOffset.x, adjustedOffset)
+            adaptItems(listState.items, false)
+            snapToContent(animated: false)
+            i += 1
+        }
+        adaptItems(listState.items, false)
+        snapToContent(animated: false)
+        estimatedContentHeight.update(contentOffset, listState, averageItemHeight, true)
+    }
+
+    func scrollToItemAnimated(_ index: Int, top: Bool = true) async {
+        if index >= listState.items.count || listState.isScrolling || listState.isAnimatedScrolling {
+            return
+        }
+        listState.isAnimatedScrolling = true
+        defer {
+            listState.isAnimatedScrolling = false
+        }
+        var adjustedOffset = self.contentOffset.y
+        var i = 0
+
+        var upPrev = index > listState.firstVisibleItemIndex
+        //let firstOrLastIndex = upPrev ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+        //let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier)
+
+        var stepSlowdownMultiplier: CGFloat = 1
+        while i < 200 {
+            let up = index > listState.firstVisibleItemIndex
+            if upPrev != up {
+                stepSlowdownMultiplier = stepSlowdownMultiplier * 0.5
+                upPrev = up
+            }
+
+            // these two lines makes scrolling's finish non-linear and NOT overscroll visually when reach target index
+            let firstOrLastIndex = up ? listState.visibleItems.last?.index ?? 0 : listState.firstVisibleItemIndex
+            let step: CGFloat = max(0.1, CGFloat(abs(index - firstOrLastIndex)) * scrollStepMultiplier) * stepSlowdownMultiplier
+
+            //println("Scrolling step \(step) \(stepSlowdownMultiplier)  index \(index) \(firstOrLastIndex)  \(index - firstOrLastIndex)  \(adjustedOffset), up \(up), i \(i)")
+
+            let offsetToScroll = (up ? -averageItemHeight : averageItemHeight) * step
+            adjustedOffset += offsetToScroll
+            if let item = listState.visibleItems.first(where: { $0.index == index }) {
+                let y = if top {
+                    min(estimatedContentHeight.bottomOffsetY - bounds.height, item.view.frame.origin.y - insetTop)
+                } else {
+                    max(estimatedContentHeight.topOffsetY - insetTop - insetBottom, item.view.frame.origin.y + item.view.bounds.height - bounds.height + insetBottom)
+                }
+                setContentOffset(CGPointMake(contentOffset.x, y), animated: true)
+                scrollBarView.flashScrollIndicators()
+                break
+            }
+            contentOffset = CGPointMake(contentOffset.x, adjustedOffset)
+
+            // skipping unneded relayout if this offset is already processed
+            if prevProcessedOffset - contentOffset.y != 0 {
+                adaptItems(listState.items, false)
+                snapToContent(animated: false)
+            }
+            // let UI time to update to see the animated position change
+            await MainActor.run {}
+
+            i += 1
+        }
+        estimatedContentHeight.update(contentOffset, listState, averageItemHeight, true)
+    }
+
+    func scrollToBottom() {
+        scrollToItem(0, top: false)
+    }
+
+    func scrollToBottomAnimated() {
+        Task {
+            await scrollToItemAnimated(0, top: false)
+        }
+    }
+
+    func scroll(by: CGFloat, animated: Bool = true) {
+        setContentOffset(CGPointMake(contentOffset.x, contentOffset.y + by), animated: animated)
+    }
+
+    func scrollViewShouldScrollToTop(_ scrollView: UIScrollView) -> Bool {
+        if !listState.items.isEmpty {
+            scrollToBottomAnimated()
+        }
+        return false
+    }
+
+    private func snapToContent(animated: Bool) {
+        let topBlankSpace = estimatedContentHeight.height < bounds.height ? bounds.height - estimatedContentHeight.height : 0
+        if topY < estimatedContentHeight.topOffsetY - topBlankSpace {
+            setContentOffset(CGPointMake(0, estimatedContentHeight.topOffsetY - topBlankSpace), animated: animated)
+        } else if bottomY > estimatedContentHeight.bottomOffsetY {
+            setContentOffset(CGPointMake(0, estimatedContentHeight.bottomOffsetY - bounds.height), animated: animated)
+        }
+    }
+
+    func offsetToBottom(_ view: UIView) -> CGFloat {
+        bottomY - (view.frame.origin.y + view.frame.height)
+    }
+
+    /// If I try to .removeFromSuperview() right when I need to remove the view, it is possible to crash the app when the view was hidden in result of
+    /// pressing Hide in menu on top of the revealed item within the group. So at that point the item should still be attached to the view
+    func hideAndRemoveFromSuperviewIfNeeded(_ view: UIView) {
+        if view.isHidden {
+            // already passed this function
+            return
+        }
+        (view as? ReusableView)?.prepareForReuse()
+        view.isHidden = true
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
+            if view.isHidden { view.removeFromSuperview() }
+        }
+    }
+
+    /// Synchronizing both scrollViews
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        true
+    }
+
+    func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+        if !decelerate {
+            snapToContent(animated: true)
+        }
+    }
+
+    override var contentOffset: CGPoint {
+        get { super.contentOffset }
+        set {
+            var newOffset = newValue
+            let topBlankSpace = estimatedContentHeight.height < bounds.height ? bounds.height - estimatedContentHeight.height : 0
+            if contentOffset.y > 0 && newOffset.y < estimatedContentHeight.topOffsetY - topBlankSpace && contentOffset.y > newOffset.y {
+                if !isDecelerating {
+                    newOffset.y = min(contentOffset.y, newOffset.y + abs(newOffset.y - estimatedContentHeight.topOffsetY + topBlankSpace) / 1.8)
+                } else {
+                    DispatchQueue.main.async {
+                        self.setContentOffset(newValue, animated: false)
+                        self.snapToContent(animated: true)
+                    }
+                }
+            } else if contentOffset.y > 0 && newOffset.y + bounds.height > estimatedContentHeight.bottomOffsetY && contentOffset.y < newOffset.y {
+                if !isDecelerating {
+                    newOffset.y = max(contentOffset.y, newOffset.y - abs(newOffset.y + bounds.height - estimatedContentHeight.bottomOffsetY) / 1.8)
+                } else {
+                    DispatchQueue.main.async {
+                        self.setContentOffset(newValue, animated: false)
+                        self.snapToContent(animated: true)
+                    }
+                }
+            }
+            super.contentOffset = newOffset
+        }
+    }
+
+    private func stopScrolling() {
+        let offsetYToStopAt = if abs(contentOffset.y - estimatedContentHeight.topOffsetY) < abs(bottomY - estimatedContentHeight.bottomOffsetY) {
+            estimatedContentHeight.topOffsetY
+        } else {
+            estimatedContentHeight.bottomOffsetY - bounds.height
+        }
+        setContentOffset(CGPointMake(contentOffset.x, offsetYToStopAt), animated: false)
+    }
+
+    func isVisible(_ view: UIView) -> Bool {
+        if view.superview == nil {
+             return false
+        }
+        return view.frame.intersects(CGRectMake(0, contentOffset.y, bounds.width, bounds.height))
+    }
+}
+
+private func println(_ text: String) {
+    print("\(Date.now.timeIntervalSince1970): \(text)")
+}

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

@@ -78,6 +78,12 @@ struct AddGroupMembersViewCommon: View {
                     let count = selectedContacts.count
                     Section {
                         if creatingGroup {
+                            MemberAdmissionButton(
+                                groupInfo: $groupInfo,
+                                admission: groupInfo.groupProfile.memberAdmission_,
+                                currentAdmission: groupInfo.groupProfile.memberAdmission_,
+                                creatingGroup: true
+                            )
                             GroupPreferencesButton(
                                 groupInfo: $groupInfo,
                                 preferences: groupInfo.fullGroupPreferences,
@@ -145,9 +151,9 @@ struct AddGroupMembersViewCommon: View {
         return dummy
     }()
 
-    @ViewBuilder private func inviteMembersButton() -> some View {
+    private func inviteMembersButton() -> some View {
         let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Invite to group" : "Invite to chat"
-        Button {
+        return Button {
             inviteMembers()
         } label: {
             HStack {

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

@@ -17,11 +17,12 @@ struct GroupChatInfoView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
     @Binding var groupInfo: GroupInfo
+    @Binding var scrollToItemId: ChatItem.ID?
     var onSearch: () -> Void
     @State var localAlias: String
     @FocusState private var aliasTextFieldFocused: Bool
     @State private var alert: GroupChatInfoViewAlert? = nil
-    @State private var groupLink: String?
+    @State private var groupLink: CreatedConnLink?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
     @State private var groupLinkNavLinkActive: Bool = false
     @State private var addMembersNavLinkActive: Bool = false
@@ -88,6 +89,24 @@ struct GroupChatInfoView: View {
                         .listRowSeparator(.hidden)
                         .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
+                    Section {
+                        if groupInfo.canAddMembers && groupInfo.businessChat == nil {
+                            groupLinkButton()
+                        }
+                        if groupInfo.businessChat == nil && groupInfo.membership.memberRole >= .moderator {
+                            memberSupportButton()
+                        }
+                        if groupInfo.canModerate {
+                            GroupReportsChatNavLink(chat: chat, scrollToItemId: $scrollToItemId)
+                        }
+                        if groupInfo.membership.memberActive
+                            && (groupInfo.membership.memberRole < .moderator || groupInfo.membership.supportChat != nil) {
+                            UserSupportChatNavLink(chat: chat, groupInfo: groupInfo, scrollToItemId: $scrollToItemId)
+                        }
+                    } header: {
+                        Text("")
+                    }
+
                     Section {
                         if groupInfo.isOwner && groupInfo.businessChat == nil {
                             editGroupButton()
@@ -96,19 +115,6 @@ struct GroupChatInfoView: View {
                             addOrEditWelcomeMessage()
                         }
                         GroupPreferencesButton(groupInfo: $groupInfo, preferences: groupInfo.fullGroupPreferences, currentPreferences: groupInfo.fullGroupPreferences)
-                        if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
-                            sendReceiptsOption()
-                        } else {
-                            sendReceiptsOptionDisabled()
-                        }
-                                                
-                        NavigationLink {
-                            ChatWallpaperEditorSheet(chat: chat)
-                        } label: {
-                            Label("Chat theme", systemImage: "photo")
-                        }
-                    } header: {
-                        Text("")
                     } footer: {
                         let label: LocalizedStringKey = (
                             groupInfo.businessChat == nil
@@ -120,6 +126,16 @@ struct GroupChatInfoView: View {
                     }
                     
                     Section {
+                        if members.filter({ $0.wrapped.memberCurrent }).count <= SMALL_GROUPS_RCPS_MEM_LIMIT {
+                            sendReceiptsOption()
+                        } else {
+                            sendReceiptsOptionDisabled()
+                        }
+                        NavigationLink {
+                            ChatWallpaperEditorSheet(chat: chat)
+                        } label: {
+                            Label("Chat theme", systemImage: "photo")
+                        }
                         ChatTTLOption(chat: chat, progressIndicator: $progressIndicator)
                     } footer: {
                         Text("Delete chat messages from your device.")
@@ -127,9 +143,6 @@ struct GroupChatInfoView: View {
                     
                     Section(header: Text("\(members.count + 1) members").foregroundColor(theme.colors.secondary)) {
                         if groupInfo.canAddMembers {
-                            if groupInfo.businessChat == nil {
-                                groupLinkButton()
-                            }
                             if (chat.chatInfo.incognito) {
                                 Label("Invite members", systemImage: "plus")
                                     .foregroundColor(Color(uiColor: .tertiaryLabel))
@@ -138,23 +151,22 @@ struct GroupChatInfoView: View {
                                 addMembersButton()
                             }
                         }
-                        if members.count > 8 {
                         searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
                             .padding(.leading, 8)
-                        }
                         let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                        let filteredMembers = s == "" ? members : members.filter { $0.wrapped.chatViewName.localizedLowercase.contains(s) }
-                        MemberRowView(groupInfo: groupInfo, groupMember: GMember(groupInfo.membership), user: true, alert: $alert)
+                        let filteredMembers = s == ""
+                            ? members
+                            : members.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) }
+                        MemberRowView(
+                            chat: chat,
+                            groupInfo: groupInfo,
+                            groupMember: GMember(groupInfo.membership),
+                            scrollToItemId: $scrollToItemId,
+                            user: true,
+                            alert: $alert
+                        )
                         ForEach(filteredMembers) { member in
-                            ZStack {
-                                NavigationLink {
-                                    memberInfoView(member)
-                                } label: {
-                                    EmptyView()
-                                }
-                                .opacity(0)
-                                MemberRowView(groupInfo: groupInfo, groupMember: member, alert: $alert)
-                            }
+                            MemberRowView(chat: chat, groupInfo: groupInfo, groupMember: member, scrollToItemId: $scrollToItemId, alert: $alert)
                         }
                     }
                     
@@ -163,7 +175,7 @@ struct GroupChatInfoView: View {
                         if groupInfo.canDelete {
                             deleteGroupButton()
                         }
-                        if groupInfo.membership.memberCurrent {
+                        if groupInfo.membership.memberCurrentOrPending {
                             leaveGroupButton()
                         }
                     }
@@ -276,7 +288,9 @@ struct GroupChatInfoView: View {
                 if groupInfo.canAddMembers {
                     addMembersActionButton(width: buttonWidth)
                 }
-                muteButton(width: buttonWidth)
+                if let nextNtfMode = chat.chatInfo.nextNtfMode {
+                    muteButton(width: buttonWidth, nextNtfMode: nextNtfMode)
+                }
             }
             .frame(maxWidth: .infinity, alignment: .center)
         }
@@ -290,9 +304,9 @@ struct GroupChatInfoView: View {
         .disabled(!groupInfo.ready || chat.chatItems.isEmpty)
     }
 
-    @ViewBuilder private func addMembersActionButton(width: CGFloat) -> some View {
-        if chat.chatInfo.incognito {
+    private func addMembersActionButton(width: CGFloat) -> some View {
         ZStack {
+            if chat.chatInfo.incognito {
                 InfoViewButton(image: "link.badge.plus", title: "invite", width: width) {
                     groupLinkNavLinkActive = true
                 }
@@ -304,10 +318,7 @@ struct GroupChatInfoView: View {
                 }
                 .frame(width: 1, height: 1)
                 .hidden()
-            }
-            .disabled(!groupInfo.ready)
             } else {
-            ZStack {
                 InfoViewButton(image: "person.fill.badge.plus", title: "invite", width: width) {
                     addMembersNavLinkActive = true
                 }
@@ -320,17 +331,17 @@ struct GroupChatInfoView: View {
                 .frame(width: 1, height: 1)
                 .hidden()
             }
+        }
         .disabled(!groupInfo.ready)
     }
-    }
 
-    private func muteButton(width: CGFloat) -> some View {
-        InfoViewButton(
-            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
-            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
+    private func muteButton(width: CGFloat, nextNtfMode: MsgFilter) -> some View {
+        return InfoViewButton(
+            image: nextNtfMode.iconFilled,
+            title: "\(nextNtfMode.text(mentions: true))",
             width: width
         ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+            toggleNotifications(chat, enableNtfs: nextNtfMode)
         }
         .disabled(!groupInfo.ready)
     }
@@ -353,25 +364,23 @@ struct GroupChatInfoView: View {
             .onAppear {
                 searchFocussed = false
                 Task {
-                    let groupMembers = await apiListMembers(groupInfo.groupId)
-                    await MainActor.run {
-                        chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                        chatModel.populateGroupMembersIndexes()
-                    }
+                    await chatModel.loadGroupMembers(groupInfo)
                 }
             }
     }
 
     private struct MemberRowView: View {
+        var chat: Chat
         var groupInfo: GroupInfo
         @ObservedObject var groupMember: GMember
+        @Binding var scrollToItemId: ChatItem.ID?
         @EnvironmentObject var theme: AppTheme
         var user: Bool = false
         @Binding var alert: GroupChatInfoViewAlert?
 
         var body: some View {
             let member = groupMember.wrapped
-            let v = HStack{
+            let v1 = HStack{
                 MemberProfileImage(member, size: 38)
                     .padding(.trailing, 2)
                 // TODO server connection status
@@ -388,6 +397,20 @@ struct GroupChatInfoView: View {
                 memberInfo(member)
             }
 
+            let v = ZStack {
+                if user {
+                    v1
+                } else {
+                    NavigationLink {
+                        memberInfoView()
+                    } label: {
+                        EmptyView()
+                    }
+                    .opacity(0)
+                    v1
+                }
+            }
+
             if user {
                 v
             } else if groupInfo.membership.memberRole >= .admin {
@@ -412,6 +435,11 @@ struct GroupChatInfoView: View {
             }
         }
 
+        private func memberInfoView() -> some View {
+            GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember, scrollToItemId: $scrollToItemId)
+                .navigationBarHidden(false)
+        }
+
         private func memberConnStatus(_ member: GroupMember) -> LocalizedStringKey {
             if member.activeConn?.connDisabled ?? false {
                 return "disabled"
@@ -491,11 +519,6 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private func memberInfoView(_ groupMember: GMember) -> some View {
-        GroupMemberInfoView(groupInfo: groupInfo, chat: chat, groupMember: groupMember)
-            .navigationBarHidden(false)
-    }
-
     private func groupLinkButton() -> some View {
         NavigationLink {
             groupLinkDestinationView()
@@ -521,15 +544,95 @@ struct GroupChatInfoView: View {
         .navigationBarTitleDisplayMode(.large)
     }
 
+    struct UserSupportChatNavLink: View {
+        @ObservedObject var chat: Chat
+        @EnvironmentObject var theme: AppTheme
+        var groupInfo: GroupInfo
+        @EnvironmentObject var chatModel: ChatModel
+        @Binding var scrollToItemId: ChatItem.ID?
+        @State private var navLinkActive = false
+
+        var body: some View {
+            let scopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: nil)
+            NavigationLink(isActive: $navLinkActive) {
+                SecondaryChatView(
+                    chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: scopeInfo), chatItems: [], chatStats: ChatStats()),
+                    scrollToItemId: $scrollToItemId
+                )
+            } label: {
+                HStack {
+                    Label("Chat with admins", systemImage: chat.supportUnreadCount > 0 ? "flag.fill" : "flag")
+                    Spacer()
+                    if chat.supportUnreadCount > 0 {
+                        UnreadBadge(count: chat.supportUnreadCount, color: theme.colors.primary)
+                    }
+                }
+            }
+            .onChange(of: navLinkActive) { active in
+                if active {
+                    ItemsModel.loadSecondaryChat(groupInfo.id, chatFilter: .groupChatScopeContext(groupScopeInfo: scopeInfo))
+                }
+            }
+        }
+    }
+
+    private func memberSupportButton() -> some View {
+        NavigationLink {
+            MemberSupportView(groupInfo: groupInfo, scrollToItemId: $scrollToItemId)
+                .navigationBarTitle("Chats with members")
+                .modifier(ThemedBackground())
+                .navigationBarTitleDisplayMode(.large)
+        } label: {
+            HStack {
+                Label(
+                    "Chats with members",
+                    systemImage: chat.supportUnreadCount > 0 ? "flag.fill" : "flag"
+                )
+                Spacer()
+                if chat.supportUnreadCount > 0 {
+                    UnreadBadge(count: chat.supportUnreadCount, color: theme.colors.primary)
+                }
+            }
+        }
+    }
+
+    struct GroupReportsChatNavLink: View {
+        @EnvironmentObject var chatModel: ChatModel
+        @EnvironmentObject var theme: AppTheme
+        @State private var navLinkActive = false
+        @ObservedObject var chat: Chat
+        @Binding var scrollToItemId: ChatItem.ID?
+
+        var body: some View {
+            NavigationLink(isActive: $navLinkActive) {
+                SecondaryChatView(chat: chat, scrollToItemId: $scrollToItemId)
+            } label: {
+                HStack {
+                    Label {
+                        Text("Member reports")
+                    } icon: {
+                        Image(systemName: chat.chatStats.reportsCount > 0 ? "flag.fill" : "flag").foregroundColor(.red)
+                    }
+                    Spacer()
+                    if chat.chatStats.reportsCount > 0 {
+                        UnreadBadge(count: chat.chatStats.reportsCount, color: .red)
+                    }
+                }
+            }
+            .onChange(of: navLinkActive) { active in
+                if active {
+                    ItemsModel.loadSecondaryChat(chat.id, chatFilter: .msgContentTagContext(contentTag: .report))
+                }
+            }
+        }
+    }
+
     private func editGroupButton() -> some View {
         NavigationLink {
             GroupProfileView(
                 groupInfo: $groupInfo,
                 groupProfile: groupInfo.groupProfile
             )
-            .navigationBarTitle("Group profile")
-            .modifier(ThemedBackground())
-            .navigationBarTitleDisplayMode(.large)
         } label: {
             Label("Edit group profile", systemImage: "pencil")
         }
@@ -571,9 +674,9 @@ struct GroupChatInfoView: View {
         }
     }
 
-    @ViewBuilder private func leaveGroupButton() -> some View {
+    private func leaveGroupButton() -> some View {
         let label: LocalizedStringKey = groupInfo.businessChat == nil ? "Leave group" : "Leave chat"
-        Button(role: .destructive) {
+        return Button(role: .destructive) {
             alert = .leaveGroupAlert
         } label: {
             Label(label, systemImage: "rectangle.portrait.and.arrow.right")
@@ -681,24 +784,36 @@ struct GroupChatInfoView: View {
             title: Text("Remove member?"),
             message: Text(messageLabel),
             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)
-                    }
-                }
+                removeMember(groupInfo, mem)
             },
             secondaryButton: .cancel()
         )
     }
 }
 
+func removeMember(_ groupInfo: GroupInfo, _ mem: GroupMember, dismiss: DismissAction? = nil) {
+    Task {
+        do {
+            let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId])
+            await MainActor.run {
+                ChatModel.shared.updateGroup(updatedGroupInfo)
+                updatedMembers.forEach { updatedMember in
+                    _ = ChatModel.shared.upsertGroupMember(updatedGroupInfo, updatedMember)
+                }
+                dismiss?()
+            }
+        } catch let error {
+            logger.error("apiRemoveMembers error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error removing member", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
 func deleteGroupAlertMessage(_ groupInfo: GroupInfo) -> Text {
     groupInfo.businessChat == nil ? (
         groupInfo.membership.memberCurrent ? Text("Group will be deleted for all members - this cannot be undone!") : Text("Group will be deleted for you - this cannot be undone!")
@@ -792,6 +907,7 @@ struct GroupChatInfoView_Previews: PreviewProvider {
         GroupChatInfoView(
             chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
             groupInfo: Binding.constant(GroupInfo.sampleData),
+            scrollToItemId: Binding.constant(nil),
             onSearch: {},
             localAlias: ""
         )

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

@@ -10,12 +10,14 @@ import SwiftUI
 import SimpleXChat
 
 struct GroupLinkView: View {
+    @EnvironmentObject var theme: AppTheme
     var groupId: Int64
-    @Binding var groupLink: String?
+    @Binding var groupLink: CreatedConnLink?
     @Binding var groupLinkMemberRole: GroupMemberRole
     var showTitle: Bool = false
     var creatingGroup: Bool = false
     var linkCreatedCb: (() -> Void)? = nil
+    @State private var showShortLink = true
     @State private var creatingLink = false
     @State private var alert: GroupLinkAlert?
     @State private var shouldCreate = true
@@ -33,6 +35,7 @@ struct GroupLinkView: View {
     }
 
     var body: some View {
+        ZStack {
             if creatingGroup {
                 groupLinkView()
                     .navigationBarBackButtonHidden()
@@ -44,6 +47,12 @@ struct GroupLinkView: View {
             } else {
                 groupLinkView()
             }
+            if creatingLink {
+                ProgressView()
+                    .scaleEffect(2)
+                    .frame(maxWidth: .infinity)
+            }
+        }
     }
 
     private func groupLinkView() -> some View {
@@ -69,14 +78,22 @@ struct GroupLinkView: View {
                         }
                     }
                     .frame(height: 36)
-                    SimpleXLinkQRCode(uri: groupLink)
-                        .id("simplex-qrcode-view-for-\(groupLink)")
+                    SimpleXCreatedLinkQRCode(link: groupLink, short: $showShortLink)
+                        .id("simplex-qrcode-view-for-\(groupLink.simplexChatUri(short: showShortLink))")
                     Button {
-                        showShareSheet(items: [simplexChatLink(groupLink)])
+                        showShareSheet(items: [groupLink.simplexChatUri(short: showShortLink)])
                     } label: {
                         Label("Share link", systemImage: "square.and.arrow.up")
                     }
 
+                    if (groupLink.connShortLink == nil && UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_SHORT_LINKS)) {
+                        Button {
+                            addShortLink()
+                        } label: {
+                            Label("Add short link", systemImage: "plus")
+                        }
+                    }
+
                     if !creatingGroup {
                         Button(role: .destructive) { alert = .deleteLink } label: {
                             Label("Delete link", systemImage: "trash")
@@ -87,11 +104,10 @@ struct GroupLinkView: View {
                         Label("Create link", systemImage: "link.badge.plus")
                     }
                     .disabled(creatingLink)
-                    if creatingLink {
-                        ProgressView()
-                            .scaleEffect(2)
-                            .frame(maxWidth: .infinity)
                 }
+            } header: {
+                if let groupLink, groupLink.connShortLink != nil {
+                    ToggleShortLinkHeader(text: Text(""), link: groupLink, short: $showShortLink)
                 }
             }
             .alert(item: $alert) { alert in
@@ -154,12 +170,32 @@ struct GroupLinkView: View {
             }
         }
     }
+
+    private func addShortLink() {
+        Task {
+            do {
+                creatingLink = true
+                let link = try await apiAddGroupShortLink(groupId)
+                await MainActor.run {
+                    creatingLink = false
+                    (groupLink, groupLinkMemberRole) = link
+                }
+            } catch let error {
+                logger.error("apiAddGroupShortLink: \(responseError(error))")
+                await MainActor.run {
+                    creatingLink = false
+                    let a = getErrorAlert(error, "Error adding short link")
+                    alert = .error(title: a.title, error: a.message)
+                }
+            }
+        }
+    }
 }
 
 struct GroupLinkView_Previews: PreviewProvider {
     static var previews: some View {
-        @State var groupLink: String? = "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"
-        @State var noGroupLink: String? = nil
+        @State var groupLink: CreatedConnLink? = CreatedConnLink(connFullLink: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D", connShortLink: nil)
+        @State var noGroupLink: CreatedConnLink? = nil
 
         return Group {
             GroupLinkView(groupId: 1, groupLink: $groupLink, groupLinkMemberRole: Binding.constant(.member))

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

@@ -16,6 +16,7 @@ struct GroupMemberInfoView: View {
     @State var groupInfo: GroupInfo
     @ObservedObject var chat: Chat
     @ObservedObject var groupMember: GMember
+    @Binding var scrollToItemId: ChatItem.ID?
     var navigation: Bool = false
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
@@ -103,6 +104,10 @@ struct GroupMemberInfoView: View {
 
                     if member.memberActive {
                         Section {
+                            if groupInfo.membership.memberRole >= .moderator
+                                && (member.memberRole < .moderator || member.supportChat != nil) {
+                                MemberInfoSupportChatNavLink(groupInfo: groupInfo, member: groupMember, scrollToItemId: $scrollToItemId)
+                            }
                             if let code = connectionCode { verifyCodeButton(code) }
                             if let connStats = connectionStats,
                                connStats.ratchetSyncAllowed {
@@ -278,7 +283,7 @@ struct GroupMemberInfoView: View {
             }
         }
         .onChange(of: chat.chatInfo) { c in
-            if case let .group(gI) = chat.chatInfo {
+            if case let .group(gI, _) = chat.chatInfo {
                 groupInfo = gI
             }
         }
@@ -366,15 +371,9 @@ struct GroupMemberInfoView: View {
     func newDirectChatButton(_ contactId: Int64, width: CGFloat) -> some View {
         InfoViewButton(image: "message.fill", title: "message", width: width) {
             Task {
-                do {
-                    let chat = try await apiGetChat(type: .direct, id: contactId)
-                    chatModel.addChat(chat)
-                    ItemsModel.shared.loadOpenChat(chat.id) {
+                ItemsModel.shared.loadOpenChat("@\(contactId)") {
                     dismissAllSheets(animated: true)
                 }
-                } catch let error {
-                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
-                }
             }
         }
     }
@@ -480,6 +479,31 @@ struct GroupMemberInfoView: View {
         .frame(maxWidth: .infinity, alignment: .center)
     }
 
+    struct MemberInfoSupportChatNavLink: View {
+        @EnvironmentObject var theme: AppTheme
+        var groupInfo: GroupInfo
+        var member: GMember
+        @Binding var scrollToItemId: ChatItem.ID?
+        @State private var navLinkActive = false
+
+        var body: some View {
+            let scopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: member.wrapped)
+            NavigationLink(isActive: $navLinkActive) {
+                SecondaryChatView(
+                    chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: scopeInfo), chatItems: [], chatStats: ChatStats()),
+                    scrollToItemId: $scrollToItemId
+                )
+            } label: {
+                Label("Chat with member", systemImage: "flag")
+            }
+            .onChange(of: navLinkActive) { active in
+                if active {
+                    ItemsModel.loadSecondaryChat(groupInfo.id, chatFilter: .groupChatScopeContext(groupScopeInfo: scopeInfo))
+                }
+            }
+        }
+    }
+
     private func verifyCodeButton(_ code: String) -> some View {
         let member = groupMember.wrapped
         return NavigationLink {
@@ -616,13 +640,16 @@ struct GroupMemberInfoView: View {
             primaryButton: .destructive(Text("Remove")) {
                 Task {
                     do {
-                        let updatedMember = try await apiRemoveMember(groupInfo.groupId, mem.groupMemberId)
+                        let (updatedGroupInfo, updatedMembers) = try await apiRemoveMembers(groupInfo.groupId, [mem.groupMemberId])
                         await MainActor.run {
-                            _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
+                            chatModel.updateGroup(updatedGroupInfo)
+                            updatedMembers.forEach { updatedMember in
+                                _ = chatModel.upsertGroupMember(updatedGroupInfo, updatedMember)
+                            }
                             dismiss()
                         }
                     } catch let error {
-                        logger.error("apiRemoveMember error: \(responseError(error))")
+                        logger.error("apiRemoveMembers error: \(responseError(error))")
                         let a = getErrorAlert(error, "Error removing member")
                         alert = .error(title: a.title, error: a.message)
                     }
@@ -647,14 +674,16 @@ struct GroupMemberInfoView: View {
             primaryButton: .default(Text("Change")) {
                 Task {
                     do {
-                        let updatedMember = try await apiMemberRole(groupInfo.groupId, mem.groupMemberId, newRole)
+                        let updatedMembers = try await apiMembersRole(groupInfo.groupId, [mem.groupMemberId], newRole)
                         await MainActor.run {
+                            updatedMembers.forEach { updatedMember in
                                 _ = chatModel.upsertGroupMember(groupInfo, updatedMember)
                             }
+                        }
 
                     } catch let error {
                         newRole = mem.memberRole
-                        logger.error("apiMemberRole error: \(responseError(error))")
+                        logger.error("apiMembersRole error: \(responseError(error))")
                         let a = getErrorAlert(error, "Error changing role")
                         alert = .error(title: a.title, error: a.message)
                     }
@@ -806,12 +835,14 @@ func unblockForAllAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
 func blockMemberForAll(_ gInfo: GroupInfo, _ member: GroupMember, _ blocked: Bool) {
     Task {
         do {
-            let updatedMember = try await apiBlockMemberForAll(gInfo.groupId, member.groupMemberId, blocked)
+            let updatedMembers = try await apiBlockMembersForAll(gInfo.groupId, [member.groupMemberId], blocked)
             await MainActor.run {
+                updatedMembers.forEach { updatedMember in
                     _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
                 }
+            }
         } catch let error {
-            logger.error("apiBlockMemberForAll error: \(responseError(error))")
+            logger.error("apiBlockMembersForAll error: \(responseError(error))")
         }
     }
 }
@@ -821,7 +852,8 @@ struct GroupMemberInfoView_Previews: PreviewProvider {
         GroupMemberInfoView(
             groupInfo: GroupInfo.sampleData,
             chat: Chat.sampleData,
-            groupMember: GMember.sampleData
+            groupMember: GMember.sampleData,
+            scrollToItemId: Binding.constant(nil)
         )
     }
 }

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

@@ -0,0 +1,269 @@
+//
+//  GroupMentions.swift
+//  SimpleX (iOS)
+//
+//  Created by Diogo Cunha on 30/01/2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+let MENTION_START: Character = "@"
+let QUOTE: Character = "'"
+let MEMBER_ROW_SIZE: CGFloat = 60
+let MAX_VISIBLE_MEMBER_ROWS: CGFloat = 4.8
+
+struct GroupMentionsView: View {
+    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    var im: ItemsModel
+    var groupInfo: GroupInfo
+    @Binding var composeState: ComposeState
+    @Binding var selectedRange: NSRange
+    @Binding var keyboardVisible: Bool
+
+    @State private var isVisible = false
+    @State private var currentMessage: String = ""
+    @State private var mentionName: String = ""
+    @State private var mentionRange: NSRange?
+    @State private var mentionMemberId: String?
+    @State private var sortedMembers: [GMember] = []
+
+    var body: some View {
+        ZStack(alignment: .bottom) {
+            if isVisible {
+                let filtered = filteredMembers()
+                if filtered.count > 0 {
+                    Color.white.opacity(0.01)
+                        .edgesIgnoringSafeArea(.all)
+                        .onTapGesture {
+                            isVisible = false
+                        }
+                    VStack(spacing: 0) {
+                        Spacer()
+                        Divider()
+                        let scroll = ScrollView {
+                            LazyVStack(spacing: 0) {
+                                ForEach(Array(filtered.enumerated()), id: \.element.wrapped.groupMemberId) { index, member in
+                                    let mentioned = mentionMemberId == member.wrapped.memberId
+                                    let disabled = composeState.mentions.count >= MAX_NUMBER_OF_MENTIONS && !mentioned
+                                    ZStack(alignment: .bottom) {
+                                        memberRowView(member.wrapped, mentioned)
+                                            .contentShape(Rectangle())
+                                            .disabled(disabled)
+                                            .opacity(disabled ? 0.6 : 1)
+                                            .onTapGesture {
+                                                memberSelected(member)
+                                            }
+                                            .padding(.horizontal)
+                                            .frame(height: MEMBER_ROW_SIZE)
+
+                                        Divider()
+                                            .padding(.leading)
+                                            .padding(.leading, 48)
+                                    }
+                                }
+                            }
+                        }
+                            .frame(maxHeight: MEMBER_ROW_SIZE * min(MAX_VISIBLE_MEMBER_ROWS, CGFloat(filtered.count)))
+                            .background(Color(UIColor.systemBackground))
+
+                        if #available(iOS 16.0, *) {
+                            scroll.scrollDismissesKeyboard(.never)
+                        } else {
+                            scroll
+                        }
+                    }
+                }
+            }
+        }
+        .onChange(of: composeState.parsedMessage) { parsedMsg in
+            currentMessage = composeState.message
+            messageChanged(currentMessage, parsedMsg, selectedRange)
+        }
+        .onChange(of: selectedRange) { r in
+            // This condition is needed to prevent messageChanged called twice,
+            // because composeState.formattedText triggers later when message changes.
+            // The condition is only true if position changed without text change
+            if currentMessage == composeState.message {
+                messageChanged(currentMessage, composeState.parsedMessage, r)
+            }
+        }
+        .onAppear {
+            currentMessage = composeState.message
+        }
+    }
+
+    func contextMemberFilter(_ member: GroupMember) -> Bool {
+        switch im.secondaryIMFilter {
+        case nil:
+            return true
+        case let .groupChatScopeContext(groupScopeInfo):
+            switch (groupScopeInfo) {
+            case let .memberSupport(groupMember_):
+                if let scopeMember = groupMember_ {
+                    return member.memberRole >= .moderator || member.groupMemberId == scopeMember.groupMemberId
+                } else {
+                    return member.memberRole >= .moderator
+                }
+            }
+        case .msgContentTagContext:
+            return false
+        }
+    }
+
+    private func filteredMembers() -> [GMember] {
+        let s = mentionName.lowercased()
+        return sortedMembers.filter {
+            contextMemberFilter($0.wrapped)
+            && (s.isEmpty || $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s))
+        }
+    }
+
+    private func messageChanged(_ msg: String, _ parsedMsg: [FormattedText], _ range: NSRange) {
+        removeUnusedMentions(parsedMsg)
+        if let (ft, r) = selectedMarkdown(parsedMsg, range) {
+            switch ft.format {
+            case let .mention(name):
+                isVisible = true
+                mentionName = name
+                mentionRange = r
+                mentionMemberId = composeState.mentions[name]?.memberId
+                if !m.membersLoaded {
+                    Task {
+                        await m.loadGroupMembers(groupInfo)
+                        sortMembers()
+                    }
+                }
+                return
+            case .none: () //
+                let pos = range.location
+                if range.length == 0, let (at, atRange) = getCharacter(msg, pos - 1), at == "@" {
+                    let prevChar = getCharacter(msg, pos - 2)?.char
+                    if prevChar == nil || prevChar == " " || prevChar == "\n" {
+                        isVisible = true
+                        mentionName = ""
+                        mentionRange = atRange
+                        mentionMemberId = nil
+                        Task {
+                            await m.loadGroupMembers(groupInfo)
+                            sortMembers()
+                        }
+                        return
+                    }
+                }
+            default: ()
+            }
+        }
+        closeMemberList()
+    }
+
+    private func sortMembers() {
+        sortedMembers = m.groupMembers.filter({ m in
+            let status = m.wrapped.memberStatus
+            return status != .memLeft && status != .memRemoved && status != .memInvited
+        })
+        .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }
+    }
+
+    private func removeUnusedMentions(_ parsedMsg: [FormattedText]) {
+        let usedMentions: Set<String> = Set(parsedMsg.compactMap { ft in
+            if case let .mention(name) = ft.format { name } else { nil }
+        })
+        if usedMentions.count < composeState.mentions.count  {
+            composeState = composeState.copy(mentions: composeState.mentions.filter({ usedMentions.contains($0.key) }))
+        }
+    }
+
+    private func getCharacter(_ s: String, _ pos: Int) -> (char: String.SubSequence, range: NSRange)? {
+        if pos < 0 || pos >= s.count { return nil }
+        let r = NSRange(location: pos, length: 1)
+        return if let range = Range(r, in: s) {
+            (s[range], r)
+        } else {
+            nil
+        }
+    }
+    
+    private func selectedMarkdown(_ parsedMsg: [FormattedText], _ range: NSRange) -> (FormattedText, NSRange)? {
+        if parsedMsg.isEmpty { return nil }
+        var i = 0
+        var pos: Int = 0
+        while i < parsedMsg.count && pos + parsedMsg[i].text.count < range.location {
+            pos += parsedMsg[i].text.count
+            i += 1
+        }
+        // the second condition will be true when two markdowns are selected
+        return i >= parsedMsg.count || range.location + range.length > pos + parsedMsg[i].text.count
+            ? nil
+            : (parsedMsg[i], NSRange(location: pos, length: parsedMsg[i].text.count))
+    }
+    
+    private func memberSelected(_ member: GMember) {
+        if let range = mentionRange, mentionMemberId == nil || mentionMemberId != member.wrapped.memberId {
+            addMemberMention(member, range)
+        }
+    }
+    
+    private func addMemberMention(_ member: GMember, _ r: NSRange) {
+        guard let range = Range(r, in: composeState.message) else { return }
+        var mentions = composeState.mentions
+        var newName: String
+        if let mm = mentions.first(where: { $0.value.memberId == member.wrapped.memberId }) {
+            newName = mm.key
+        } else {
+            newName = composeState.mentionMemberName(member.wrapped.memberProfile.displayName)
+        }
+        mentions[newName] = CIMention(groupMember: member.wrapped)
+        var msgMention = newName.contains(" ") || newName.last?.isPunctuation == true
+                        ? "@'\(newName)'"
+                        : "@\(newName)"
+        var newPos = r.location + msgMention.count
+        let newMsgLength = composeState.message.count + msgMention.count - r.length
+        print(newPos)
+        print(newMsgLength)
+        if newPos == newMsgLength {
+            msgMention += " "
+            newPos += 1
+        }
+        composeState = composeState.copy(
+            message: composeState.message.replacingCharacters(in: range, with: msgMention),
+            mentions: mentions
+        )
+        selectedRange = NSRange(location: newPos, length: 0)
+        closeMemberList()
+        keyboardVisible = true
+    }
+    
+    private func closeMemberList() {
+        isVisible = false
+        mentionName = ""
+        mentionRange = nil
+        mentionMemberId = nil
+    }
+    
+    private func memberRowView(_ member: GroupMember, _ mentioned: Bool) -> some View {
+        return HStack{
+            MemberProfileImage(member, size: 38)
+                .padding(.trailing, 2)
+            VStack(alignment: .leading) {
+                let t = Text(member.localAliasAndFullName).foregroundColor(member.memberIncognito ? .indigo : theme.colors.onBackground)
+                (member.verified ? memberVerifiedShield() + t : t)
+                    .lineLimit(1)
+            }
+            Spacer()
+            if mentioned {
+                Image(systemName: "checkmark")
+            }
+        }
+
+        func memberVerifiedShield() -> Text {
+            (Text(Image(systemName: "checkmark.shield")) + textSpace)
+                .font(.caption)
+                .baselineOffset(2)
+                .kerning(-2)
+                .foregroundColor(theme.colors.secondary)
+        }
+    }
+}

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

@@ -30,6 +30,14 @@ struct GroupPreferencesView: View {
         let saveText: LocalizedStringKey = creatingGroup ? "Save" : "Save and notify group members"
         VStack {
             List {
+                Section {
+                    MemberAdmissionButton(
+                        groupInfo: $groupInfo,
+                        admission: groupInfo.groupProfile.memberAdmission_,
+                        currentAdmission: groupInfo.groupProfile.memberAdmission_,
+                        creatingGroup: creatingGroup
+                    )
+                }
                 featureSection(.timedMessages, $preferences.timedMessages.enable)
                 featureSection(.fullDelete, $preferences.fullDelete.enable)
                 featureSection(.directMessages, $preferences.directMessages.enable, $preferences.directMessages.role)
@@ -37,6 +45,7 @@ struct GroupPreferencesView: View {
                 featureSection(.voice, $preferences.voice.enable, $preferences.voice.role)
                 featureSection(.files, $preferences.files.enable, $preferences.files.role)
                 featureSection(.simplexLinks, $preferences.simplexLinks.enable, $preferences.simplexLinks.role)
+                featureSection(.reports, $preferences.reports.enable)
                 featureSection(.history, $preferences.history.enable)
 
                 if groupInfo.isOwner {
@@ -89,6 +98,7 @@ struct GroupPreferencesView: View {
                 settingsRow(icon, color: color) {
                     Toggle(feature.text, isOn: enable)
                 }
+                .disabled(feature == .reports) // remove in 6.4
                 if timedOn {
                     DropdownCustomTimePicker(
                         selection: $preferences.timedMessages.ttl,
@@ -138,6 +148,66 @@ struct GroupPreferencesView: View {
     }
 }
 
+struct MemberAdmissionButton: View {
+    @Binding var groupInfo: GroupInfo
+    @State var admission: GroupMemberAdmission
+    @State var currentAdmission: GroupMemberAdmission
+    var creatingGroup: Bool = false
+
+    var body: some View {
+        NavigationLink {
+            MemberAdmissionView(
+                groupInfo: $groupInfo,
+                admission: $admission,
+                currentAdmission: currentAdmission,
+                creatingGroup: creatingGroup,
+                saveAdmission: saveAdmission
+            )
+            .navigationBarTitle("Member admission")
+            .modifier(ThemedBackground(grouped: true))
+            .navigationBarTitleDisplayMode(.large)
+            .onDisappear {
+                let saveText = NSLocalizedString(
+                    creatingGroup ? "Save" : "Save and notify group members",
+                    comment: "alert button"
+                )
+
+                if groupInfo.groupProfile.memberAdmission_ != admission {
+                    showAlert(
+                        title: NSLocalizedString("Save admission settings?", comment: "alert title"),
+                        buttonTitle: saveText,
+                        buttonAction: { saveAdmission() },
+                        cancelButton: true
+                    )
+                }
+            }
+        } label: {
+            if creatingGroup {
+                Text("Set member admission")
+            } else {
+                Label("Member admission", systemImage: "switch.2")
+            }
+        }
+    }
+
+    private func saveAdmission() {
+        Task {
+            do {
+                var gp = groupInfo.groupProfile
+                gp.memberAdmission = admission
+                let gInfo = try await apiUpdateGroup(groupInfo.groupId, gp)
+                await MainActor.run {
+                    groupInfo = gInfo
+                    ChatModel.shared.updateGroup(gInfo)
+                    currentAdmission = admission
+                }
+            } catch {
+                logger.error("MemberAdmissionView apiUpdateGroup error: \(responseError(error))")
+            }
+        }
+    }
+}
+
 struct GroupPreferencesView_Previews: PreviewProvider {
     static var previews: some View {
         GroupPreferencesView(

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

@@ -26,6 +26,7 @@ struct GroupProfileView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @Binding var groupInfo: GroupInfo
     @State var groupProfile: GroupProfile
+    @State private var currentProfileHash: Int?
     @State private var showChooseSource = false
     @State private var showImagePicker = false
     @State private var showTakePhoto = false
@@ -34,60 +35,40 @@ struct GroupProfileView: View {
     @FocusState private var focusDisplayName
 
     var body: some View {
-        return VStack(alignment: .leading) {
-            Text("Group profile is stored on members' devices, not on the servers.")
-                .padding(.vertical)
+        List {
+            EditProfileImage(profileImage: $groupProfile.image, showChooseSource: $showChooseSource)
+                .if(!focusDisplayName) { $0.padding(.top) }
 
-            ZStack(alignment: .center) {
-                ZStack(alignment: .topTrailing) {
-                    profileImageView(groupProfile.image)
-                    if groupProfile.image != nil {
-                        Button {
-                            groupProfile.image = nil
-                        } label: {
-                            Image(systemName: "multiply")
-                                .resizable()
-                                .aspectRatio(contentMode: .fit)
-                                .frame(width: 12)
-                        }
-                    }
-                }
-
-                editImageButton { showChooseSource = true }
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-
-            VStack(alignment: .leading) {
-                ZStack(alignment: .topLeading) {
-                    if !validNewProfileName() {
+            Section {
+                HStack {
+                    TextField("Group display name", text: $groupProfile.displayName)
+                        .focused($focusDisplayName)
+                    if !validNewProfileName {
                         Button {
                             alert = .invalidName(validName: mkValidName(groupProfile.displayName))
                         } label: {
                             Image(systemName: "exclamationmark.circle").foregroundColor(.red)
                         }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                     }
-                    profileNameTextEdit("Group display name", $groupProfile.displayName)
-                        .focused($focusDisplayName)
                 }
-                .padding(.bottom)
                 let fullName = groupInfo.groupProfile.fullName
                 if fullName != "" && fullName != groupProfile.displayName {
-                    profileNameTextEdit("Group full name (optional)", $groupProfile.fullName)
-                        .padding(.bottom)
+                    TextField("Group full name (optional)", text: $groupProfile.fullName)
                 }
-                HStack(spacing: 20) {
-                    Button("Cancel") { dismiss() }
-                    Button("Save group profile") { saveProfile() }
-                        .disabled(!canUpdateProfile())
+            } footer: {
+                Text("Group profile is stored on members' devices, not on the servers.")
             }
-            }
-            .frame(maxWidth: .infinity, minHeight: 120, alignment: .leading)
 
+            Section {
+                Button("Reset") {
+                    groupProfile = groupInfo.groupProfile
+                    currentProfileHash = groupProfile.hashValue
+                }
+                .disabled(currentProfileHash == groupProfile.hashValue)
+                Button("Save group profile", action: saveProfile)
+                .disabled(!canUpdateProfile)
+            }
         }
-        .padding()
-        .frame(maxHeight: .infinity, alignment: .top)
         .confirmationDialog("Group image", isPresented: $showChooseSource, titleVisibility: .visible) {
             Button("Take picture") {
                 showTakePhoto = true
@@ -95,6 +76,11 @@ struct GroupProfileView: View {
             Button("Choose from library") {
                 showImagePicker = true
             }
+            if UIPasteboard.general.hasImages {
+                Button("Paste image") {
+                    chosenImage = UIPasteboard.general.image
+                }
+            }
         }
         .fullScreenCover(isPresented: $showTakePhoto) {
             ZStack {
@@ -120,8 +106,20 @@ struct GroupProfileView: View {
             }
         }
         .onAppear {
+            currentProfileHash = groupProfile.hashValue
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                focusDisplayName = true
+                withAnimation { focusDisplayName = true }
+            }
+        }
+        .onDisappear {
+            if canUpdateProfile {
+                showAlert(
+                    title: NSLocalizedString("Save group profile?", comment: "alert title"),
+                    message: NSLocalizedString("Group profile was changed. If you save it, the updated profile will be sent to group members.", comment: "alert message"),
+                    buttonTitle: NSLocalizedString("Save (and notify members)", comment: "alert button"),
+                    buttonAction: saveProfile,
+                    cancelButton: true
+                )
             }
         }
         .alert(item: $alert) { a in
@@ -135,30 +133,30 @@ struct GroupProfileView: View {
                 return createInvalidNameAlert(name, $groupProfile.displayName)
             }
         }
-        .contentShape(Rectangle())
-        .onTapGesture { hideKeyboard() }
+        .navigationBarTitle("Group profile")
+        .modifier(ThemedBackground(grouped: true))
+        .navigationBarTitleDisplayMode(focusDisplayName ? .inline : .large)
     }
 
-    private func canUpdateProfile() -> Bool {
-        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" && validNewProfileName()
+    private var canUpdateProfile: Bool {
+        currentProfileHash != groupProfile.hashValue &&
+        groupProfile.displayName.trimmingCharacters(in: .whitespaces) != "" &&
+        validNewProfileName
     }
 
-    private func validNewProfileName() -> Bool {
+    private var 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)
-    }
-
     func saveProfile() {
         Task {
             do {
                 groupProfile.displayName = groupProfile.displayName.trimmingCharacters(in: .whitespaces)
+                groupProfile.fullName = groupProfile.fullName.trimmingCharacters(in: .whitespaces)
                 let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
                 await MainActor.run {
+                    currentProfileHash = groupProfile.hashValue
                     groupInfo = gInfo
                     chatModel.updateGroup(gInfo)
                     dismiss()

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

@@ -18,6 +18,7 @@ struct GroupWelcomeView: View {
     @State private var editMode = true
     @FocusState private var keyboardVisible: Bool
     @State private var showSaveDialog = false
+    @State private var showSecrets: Set<Int> = []
 
     let maxByteCount = 1200
 
@@ -58,7 +59,8 @@ struct GroupWelcomeView: View {
     }
 
     private func textPreview() -> some View {
-        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false, secondaryColor: theme.colors.secondary)
+        let r = messageText(welcomeText, parseSimpleXMarkdown(welcomeText), sender: nil, mentions: nil, userMemberId: nil, showSecrets: showSecrets, backgroundColor: UIColor(theme.colors.background))
+        return msgTextResultView(r, Text(AttributedString(r.string)), showSecrets: $showSecrets)
             .frame(minHeight: 130, alignment: .topLeading)
             .frame(maxWidth: .infinity, alignment: .leading)
     }

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

@@ -0,0 +1,93 @@
+//
+//  MemberAdmissionView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 28.04.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+private let memberCriterias: [(criteria: MemberCriteria?, text: LocalizedStringKey)] = [
+    (nil, "off"),
+    (.all, "all")
+]
+
+struct MemberAdmissionView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @Binding var groupInfo: GroupInfo
+    @Binding var admission: GroupMemberAdmission
+    var currentAdmission: GroupMemberAdmission
+    let creatingGroup: Bool
+    let saveAdmission: () -> Void
+    @State private var showSaveDialogue = false
+
+    var body: some View {
+        let saveText: LocalizedStringKey = creatingGroup ? "Save" : "Save and notify group members"
+        VStack {
+            List {
+                admissionSection(
+                    NSLocalizedString("Review members", comment: "admission stage"),
+                    NSLocalizedString("Review members before admitting (\"knocking\").", comment: "admission stage description"),
+                    $admission.review
+                )
+
+                if groupInfo.isOwner {
+                    Section {
+                        Button("Reset") { admission = currentAdmission }
+                        Button(saveText) { saveAdmission() }
+                    }
+                    .disabled(currentAdmission == admission)
+                }
+            }
+        }
+        .modifier(BackButton(disabled: Binding.constant(false)) {
+            if currentAdmission == admission {
+                dismiss()
+            } else {
+                showSaveDialogue = true
+            }
+        })
+        .confirmationDialog("Save admission settings?", isPresented: $showSaveDialogue) {
+            Button(saveText) {
+                saveAdmission()
+                dismiss()
+            }
+            Button("Exit without saving") {
+                admission = currentAdmission
+                dismiss()
+            }
+        }
+    }
+
+    private func admissionSection(_ admissionStageStr: String, _ admissionStageDescrStr: String, _ memberCriteria: Binding<MemberCriteria?>) -> some View {
+        Section {
+            if groupInfo.isOwner {
+                Picker(admissionStageStr, selection: memberCriteria) {
+                    ForEach(memberCriterias, id: \.criteria) { mc in
+                        Text(mc.text)
+                    }
+                }
+                .frame(height: 36)
+            } else {
+                infoRow(Text(admissionStageStr), memberCriteria.wrappedValue?.text ?? NSLocalizedString("off", comment: "member criteria value"))
+            }
+        } footer: {
+            Text(admissionStageDescrStr)
+                .foregroundColor(theme.colors.secondary)
+        }
+    }
+}
+
+#Preview {
+    MemberAdmissionView(
+        groupInfo: Binding.constant(GroupInfo.sampleData),
+        admission: Binding.constant(GroupMemberAdmission.sampleData),
+        currentAdmission: GroupMemberAdmission.sampleData,
+        creatingGroup: false,
+        saveAdmission: {}
+    )
+}

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

@@ -0,0 +1,44 @@
+//
+//  MemberSupportChatToolbar.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 01.05.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct MemberSupportChatToolbar: View {
+    @Environment(\.colorScheme) var colorScheme
+    @EnvironmentObject var theme: AppTheme
+    var groupMember: GroupMember
+    var imageSize: CGFloat = 32
+    
+    var body: some View {
+        return HStack {
+            MemberProfileImage(groupMember, size: imageSize)
+                .padding(.trailing, 4)
+            let t = Text(groupMember.chatViewName).font(.headline)
+            (groupMember.verified ? memberVerifiedShield + t : t)
+                .lineLimit(1)
+        }
+        .foregroundColor(theme.colors.onBackground)
+        .frame(width: 220)
+    }
+
+    private var memberVerifiedShield: Text {
+        (Text(Image(systemName: "checkmark.shield")) + textSpace)
+            .font(.caption)
+            .foregroundColor(theme.colors.secondary)
+            .baselineOffset(1)
+            .kerning(-2)
+    }
+}
+
+#Preview {
+    MemberSupportChatToolbar(
+        groupMember: GroupMember.sampleData
+    )
+    .environmentObject(CurrentColors.toAppTheme())
+}

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

@@ -0,0 +1,287 @@
+//
+//  MemberSupportView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 28.04.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct MemberSupportView: View {
+    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @State private var searchText: String = ""
+    @FocusState private var searchFocussed
+    var groupInfo: GroupInfo
+    @Binding var scrollToItemId: ChatItem.ID?
+
+    var body: some View {
+        viewBody()
+            .onAppear {
+                Task {
+                    await chatModel.loadGroupMembers(groupInfo)
+                }
+            }
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button {
+                        Task {
+                            await chatModel.loadGroupMembers(groupInfo)
+                        }
+                    } label: {
+                        Image(systemName: "arrow.clockwise")
+                    }
+                }
+            }
+    }
+
+    @ViewBuilder private func viewBody() -> some View {
+        let membersWithChats = sortedMembersWithChats()
+        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
+        let filteredMembersWithChats = s == ""
+        ? membersWithChats
+        : membersWithChats.filter { $0.wrapped.localAliasAndFullName.localizedLowercase.contains(s) }
+
+        if membersWithChats.isEmpty {
+            Text("No chats with members")
+                .foregroundColor(.secondary)
+        } else {
+            List {
+                searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
+                    .padding(.leading, 8)
+                ForEach(filteredMembersWithChats) { memberWithChat in
+                    MemberSupportChatNavLink(
+                        groupInfo: groupInfo,
+                        memberWithChat: memberWithChat,
+                        scrollToItemId: $scrollToItemId
+                    )
+                }
+            }
+        }
+    }
+
+    struct MemberSupportChatNavLink: View {
+        @EnvironmentObject var chatModel: ChatModel
+        @EnvironmentObject var theme: AppTheme
+        @State private var memberSupportChatNavLinkActive = false
+        var groupInfo: GroupInfo
+        var memberWithChat: GMember
+        @Binding var scrollToItemId: ChatItem.ID?
+
+        var body: some View {
+            ZStack {
+                let scopeInfo: GroupChatScopeInfo = .memberSupport(groupMember_: memberWithChat.wrapped)
+                Button {
+                    ItemsModel.loadSecondaryChat(groupInfo.id, chatFilter: .groupChatScopeContext(groupScopeInfo: scopeInfo)) {
+                        memberSupportChatNavLinkActive = true
+                    }
+                } label: {
+                    SupportChatRowView(groupMember: memberWithChat, groupInfo: groupInfo)
+                }
+
+                NavigationLink(isActive: $memberSupportChatNavLinkActive) {
+                    SecondaryChatView(
+                        chat: Chat(chatInfo: .group(groupInfo: groupInfo, groupChatScope: scopeInfo), chatItems: [], chatStats: ChatStats()),
+                        scrollToItemId: $scrollToItemId
+                    )
+                } label: {
+                    EmptyView()
+                }
+                .frame(width: 1, height: 1)
+                .hidden()
+            }
+            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+                if memberWithChat.wrapped.memberPending {
+                    Button {
+                        showAcceptMemberAlert(groupInfo, memberWithChat.wrapped)
+                    } label: {
+                        Label("Accept", systemImage: "checkmark")
+                    }
+                    .tint(theme.colors.primary)
+                } else {
+                    Button {
+                        showDeleteMemberSupportChatAlert(groupInfo, memberWithChat.wrapped)
+                    } label: {
+                        Label("Delete", systemImage: "trash")
+                    }
+                    .tint(.red)
+                }
+            }
+        }
+    }
+
+    func sortedMembersWithChats() -> [GMember] {
+        chatModel.groupMembers
+            .filter {
+                $0.wrapped.supportChat != nil &&
+                $0.wrapped.memberStatus != .memLeft &&
+                $0.wrapped.memberStatus != .memRemoved
+            }
+            .sorted { (m0: GMember, m1: GMember) -> Bool in
+                if m0.wrapped.memberPending != m1.wrapped.memberPending {
+                    return m0.wrapped.memberPending
+                }
+
+                let mentions0 = (m0.wrapped.supportChat?.mentions ?? 0) > 0
+                let mentions1 = (m1.wrapped.supportChat?.mentions ?? 0) > 0
+                if mentions0 != mentions1 {
+                    return mentions0
+                }
+
+                let attention0 = (m0.wrapped.supportChat?.memberAttention ?? 0) > 0
+                let attention1 = (m1.wrapped.supportChat?.memberAttention ?? 0) > 0
+                if attention0 != attention1 {
+                    return attention0
+                }
+
+                let unread0 = (m0.wrapped.supportChat?.unread ?? 0) > 0
+                let unread1 = (m1.wrapped.supportChat?.unread ?? 0) > 0
+                if unread0 != unread1 {
+                    return unread0
+                }
+
+                return (m0.wrapped.supportChat?.chatTs ?? .distantPast) > (m1.wrapped.supportChat?.chatTs ?? .distantPast)
+            }
+    }
+
+    private struct SupportChatRowView: View {
+        @EnvironmentObject var chatModel: ChatModel
+        @ObservedObject var groupMember: GMember
+        @EnvironmentObject var theme: AppTheme
+        @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+        var groupInfo: GroupInfo
+
+        var dynamicChatInfoSize: CGFloat { dynamicSize(userFont).chatInfoSize }
+
+        var body: some View {
+            let member = groupMember.wrapped
+            HStack{
+                MemberProfileImage(member, size: 38)
+                    .padding(.trailing, 2)
+                VStack(alignment: .leading) {
+                    let t = Text(member.chatViewName).foregroundColor(theme.colors.onBackground)
+                    (member.verified ? memberVerifiedShield + t : t)
+                        .lineLimit(1)
+                    Text(memberStatus(member))
+                        .lineLimit(1)
+                        .font(.caption)
+                        .foregroundColor(theme.colors.secondary)
+                }
+
+                Spacer()
+
+                if member.memberPending {
+                    Image(systemName: "flag.fill")
+                        .resizable()
+                        .scaledToFill()
+                        .frame(width: dynamicChatInfoSize * 0.8, height: dynamicChatInfoSize * 0.8)
+                        .foregroundColor(theme.colors.primary)
+                }
+                if let supportChat = member.supportChat {
+                    SupportChatUnreadIndicator(supportChat: supportChat)
+                }
+            }
+        }
+
+        private func memberStatus(_ member: GroupMember) -> LocalizedStringKey {
+            if member.activeConn?.connDisabled ?? false {
+                return "disabled"
+            } else if member.activeConn?.connInactive ?? false {
+                return "inactive"
+            } else if member.memberPending {
+                return member.memberStatus.text
+            } else {
+                return LocalizedStringKey(member.memberRole.text)
+            }
+        }
+
+        struct SupportChatUnreadIndicator: View {
+            @EnvironmentObject var theme: AppTheme
+            @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+            var supportChat: GroupSupportChat
+
+            var dynamicChatInfoSize: CGFloat { dynamicSize(userFont).chatInfoSize }
+
+            private var indicatorTint: Color {
+                if supportChat.mentions > 0 || supportChat.memberAttention > 0 {
+                    return theme.colors.primary
+                } else {
+                    return theme.colors.secondary
+                }
+            }
+
+            var body: some View {
+                HStack(alignment: .center, spacing: 2) {
+                    if supportChat.unread > 0 || supportChat.mentions > 0 || supportChat.memberAttention > 0 {
+                        if supportChat.mentions > 0 && supportChat.unread > 1 {
+                            Text("\(MENTION_START)")
+                                .font(userFont <= .xxxLarge ? .body : .callout)
+                                .foregroundColor(indicatorTint)
+                                .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                                .cornerRadius(dynamicSize(userFont).unreadCorner)
+                                .padding(.bottom, 1)
+                        }
+                        let singleUnreadIsMention = supportChat.mentions > 0 && supportChat.unread == 1
+                        (singleUnreadIsMention ? Text("\(MENTION_START)") : unreadCountText(supportChat.unread))
+                            .font(userFont <= .xxxLarge ? .caption : .caption2)
+                            .foregroundColor(.white)
+                            .padding(.horizontal, dynamicSize(userFont).unreadPadding)
+                            .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                            .background(indicatorTint)
+                            .cornerRadius(dynamicSize(userFont).unreadCorner)
+                    }
+                }
+                .frame(height: dynamicChatInfoSize)
+                .frame(minWidth: 22)
+            }
+        }
+
+        private var memberVerifiedShield: Text {
+            (Text(Image(systemName: "checkmark.shield")) + textSpace)
+                .font(.caption)
+                .baselineOffset(2)
+                .kerning(-2)
+                .foregroundColor(theme.colors.secondary)
+        }
+    }
+}
+
+func showDeleteMemberSupportChatAlert(_ groupInfo: GroupInfo, _ member: GroupMember) {
+    showAlert(
+        title: NSLocalizedString("Delete chat with member?", comment: "alert title"),
+        buttonTitle: "Delete",
+        buttonAction: { deleteMemberSupportChat(groupInfo, member) },
+        cancelButton: true
+    )
+}
+
+func deleteMemberSupportChat(_ groupInfo: GroupInfo, _ member: GroupMember) {
+    Task {
+        do {
+            let (gInfo, updatedMember) = try await apiDeleteMemberSupportChat(groupInfo.groupId, member.groupMemberId)
+            await MainActor.run {
+                _ = ChatModel.shared.upsertGroupMember(gInfo, updatedMember)
+                ChatModel.shared.updateGroup(gInfo)
+            }
+            // TODO member row doesn't get removed from list (upsertGroupMember correctly sets supportChat to nil) - this repopulates list to fix it
+            await ChatModel.shared.loadGroupMembers(gInfo)
+        } catch let error {
+            logger.error("apiDeleteMemberSupportChat error: \(responseError(error))")
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error deleting chat with member", comment: "alert title"),
+                    message: responseError(error)
+                )
+            }
+        }
+    }
+}
+
+#Preview {
+    MemberSupportView(
+        groupInfo: GroupInfo.sampleData,
+        scrollToItemId: Binding.constant(nil)
+    )
+}

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

@@ -0,0 +1,42 @@
+//
+//  SecondaryChatView.swift
+//  SimpleX (iOS)
+//
+//  Created by spaced4ndy on 29.04.2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct SecondaryChatView: View {
+    @EnvironmentObject var chatModel: ChatModel
+    @ObservedObject var chat: Chat
+    @Binding var scrollToItemId: ChatItem.ID?
+
+    var body: some View {
+        if let im = chatModel.secondaryIM {
+            ChatView(
+                chat: chat,
+                im: im,
+                mergedItems: BoxedValue(MergedItems.create(im, [])),
+                floatingButtonModel: FloatingButtonModel(im: im),
+                scrollToItemId: $scrollToItemId
+            )
+            .onDisappear {
+                chatModel.secondaryIM = nil
+            }
+        }
+    }
+}
+
+#Preview {
+    SecondaryChatView(
+        chat: Chat(
+            chatInfo: .group(groupInfo: GroupInfo.sampleData, groupChatScope: .memberSupport(groupMember_: GroupMember.sampleData)),
+            chatItems: [],
+            chatStats: ChatStats()
+        ),
+        scrollToItemId: Binding.constant(nil)
+    )
+}

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

@@ -1,371 +0,0 @@
-//
-//  ReverseList.swift
-//  SimpleX (iOS)
-//
-//  Created by Levitating Pineapple on 11/06/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import Combine
-import SimpleXChat
-
-/// A List, which displays it's items in reverse order - from bottom to top
-struct ReverseList<Content: View>: UIViewControllerRepresentable {
-    let items: Array<ChatItem>
-
-    @Binding var scrollState: ReverseListScrollModel.State
-
-    /// Closure, that returns user interface for a given item
-    let content: (ChatItem) -> Content
-
-    let loadPage: () -> Void
-
-    func makeUIViewController(context: Context) -> Controller {
-        Controller(representer: self)
-    }
-
-    func updateUIViewController(_ controller: Controller, context: Context) {
-        controller.representer = self
-        if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
-            controller.view.layer.removeAllAnimations()
-            switch destination {
-            case .nextPage:
-                controller.scrollToNextPage()
-            case let .item(id):
-                controller.scroll(to: items.firstIndex(where: { $0.id == id }), position: .bottom)
-            case .bottom:
-                controller.scroll(to: 0, position: .top)
-            }
-        } else {
-            controller.update(items: items)
-        }
-    }
-
-    /// Controller, which hosts SwiftUI cells
-    class Controller: UITableViewController {
-        private enum Section { case main }
-        var representer: ReverseList
-        private var dataSource: UITableViewDiffableDataSource<Section, ChatItem>!
-        private var itemCount: Int = 0
-        private let updateFloatingButtons = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-
-        init(representer: ReverseList) {
-            self.representer = representer
-            super.init(style: .plain)
-
-            // 1. Style
-            tableView = InvertedTableView()
-            tableView.separatorStyle = .none
-            tableView.transform = .verticalFlip
-            tableView.backgroundColor = .clear
-
-            // 2. Register cells
-            if #available(iOS 16.0, *) {
-                tableView.register(
-                    UITableViewCell.self,
-                    forCellReuseIdentifier: cellReuseId
-                )
-            } else {
-                tableView.register(
-                    HostingCell<Content>.self,
-                    forCellReuseIdentifier: cellReuseId
-                )
-            }
-
-            // 3. Configure data source
-            self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
-                tableView: tableView
-            ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8 {
-                    self.representer.loadPage()
-                }
-                let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
-                if #available(iOS 16.0, *) {
-                    cell.contentConfiguration = UIHostingConfiguration { self.representer.content(item) }
-                        .margins(.all, 0)
-                        .minSize(height: 1) // Passing zero will result in system default of 44 points being used
-                } else {
-                    if let cell = cell as? HostingCell<Content> {
-                        cell.set(content: self.representer.content(item), parent: self)
-                    } else {
-                        fatalError("Unexpected Cell Type for: \(item)")
-                    }
-                }
-                cell.transform = .verticalFlip
-                cell.selectionStyle = .none
-                cell.backgroundColor = .clear
-                return cell
-            }
-
-            // 4. External state changes will require manual layout updates
-            NotificationCenter.default
-                .addObserver(
-                    self,
-                    selector: #selector(updateLayout),
-                    name: notificationName,
-                    object: nil
-                )
-
-            updateFloatingButtons
-                .throttle(for: 0.2, scheduler: DispatchQueue.global(qos: .background), latest: true)
-                .sink {
-                    if let listState = DispatchQueue.main.sync(execute: { [weak self] in self?.getListState() }) {
-                        ChatView.FloatingButtonModel.shared.updateOnListChange(listState)
-                    }
-                }
-                .store(in: &bag)
-        }
-
-        @available(*, unavailable)
-        required init?(coder: NSCoder) { fatalError() }
-
-        deinit { NotificationCenter.default.removeObserver(self) }
-
-        @objc private func updateLayout() {
-            if #available(iOS 16.0, *) {
-                tableView.setNeedsLayout()
-                tableView.layoutIfNeeded()
-            } else {
-                tableView.reloadData()
-            }
-        }
-
-        /// Hides keyboard, when user begins to scroll.
-        /// Equivalent to `.scrollDismissesKeyboard(.immediately)`
-        override func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
-            UIApplication.shared
-                .sendAction(
-                    #selector(UIResponder.resignFirstResponder),
-                    to: nil,
-                    from: nil,
-                    for: nil
-                )
-            NotificationCenter.default.post(name: .chatViewWillBeginScrolling, object: nil)
-        }
-
-        override func viewDidAppear(_ animated: Bool) {
-            tableView.clipsToBounds = false
-            parent?.viewIfLoaded?.clipsToBounds = false
-        }
-
-        /// Scrolls up
-        func scrollToNextPage() {
-            tableView.setContentOffset(
-                CGPoint(
-                    x: tableView.contentOffset.x,
-                    y: tableView.contentOffset.y + tableView.bounds.height
-                ),
-                animated: true
-            )
-            Task { representer.scrollState = .atDestination }
-        }
-
-        /// Scrolls to Item at index path
-        /// - Parameter indexPath: Item to scroll to - will scroll to beginning of the list, if `nil`
-        func scroll(to index: Int?, position: UITableView.ScrollPosition) {
-            var animated = false
-            if #available(iOS 16.0, *) {
-                animated = true
-            }
-            if let index, tableView.numberOfRows(inSection: 0) != 0 {
-                tableView.scrollToRow(
-                    at: IndexPath(row: index, section: 0),
-                    at: position,
-                    animated: animated
-                )
-            } else {
-                tableView.setContentOffset(
-                    CGPoint(x: .zero, y: -InvertedTableView.inset),
-                    animated: animated
-                )
-            }
-            Task { representer.scrollState = .atDestination }
-        }
-
-        func update(items: [ChatItem]) {
-            var snapshot = NSDiffableDataSourceSnapshot<Section, ChatItem>()
-            snapshot.appendSections([.main])
-            snapshot.appendItems(items)
-            dataSource.defaultRowAnimation = .none
-            dataSource.apply(
-                snapshot,
-                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
-            )
-            // Sets content offset on initial load
-            if itemCount == 0 {
-                tableView.setContentOffset(
-                    CGPoint(x: 0, y: -InvertedTableView.inset),
-                    animated: false
-                )
-            }
-            itemCount = items.count
-            updateFloatingButtons.send()
-        }
-
-        override func scrollViewDidScroll(_ scrollView: UIScrollView) {
-            updateFloatingButtons.send()
-        }
-
-        func getListState() -> ListState? {
-            if let visibleRows = tableView.indexPathsForVisibleRows,
-                visibleRows.last?.item ?? 0 < representer.items.count {
-                let scrollOffset: Double = tableView.contentOffset.y + InvertedTableView.inset
-                let topItemDate: Date? =
-                    if let lastVisible = visibleRows.last(where: { isVisible(indexPath: $0) }) {
-                        representer.items[lastVisible.item].meta.itemTs
-                    } else {
-                        nil
-                    }
-                let bottomItemId: ChatItem.ID? =
-                    if let firstVisible = visibleRows.first(where: { isVisible(indexPath: $0) }) {
-                        representer.items[firstVisible.item].id
-                    } else {
-                        nil
-                    }
-                return (scrollOffset: scrollOffset, topItemDate: topItemDate, bottomItemId: bottomItemId)
-            }
-            return nil
-        }
-        
-        private func isVisible(indexPath: IndexPath) -> Bool {
-            if let relativeFrame = tableView.superview?.convert(
-                tableView.rectForRow(at: indexPath),
-                from: tableView
-            ) {
-                relativeFrame.maxY > InvertedTableView.inset &&
-                relativeFrame.minY < tableView.frame.height - InvertedTableView.inset
-            } else { false }
-        }
-    }
-
-    /// `UIHostingConfiguration` back-port for iOS14 and iOS15
-    /// Implemented as a `UITableViewCell` that wraps and manages a generic `UIHostingController`
-    private final class HostingCell<Hosted: View>: UITableViewCell {
-        private let hostingController = UIHostingController<Hosted?>(rootView: nil)
-
-        /// Updates content of the cell
-        /// For reference: https://noahgilmore.com/blog/swiftui-self-sizing-cells/
-        func set(content: Hosted, parent: UIViewController) {
-            hostingController.view.backgroundColor = .clear
-            hostingController.rootView = content
-            if let hostingView = hostingController.view {
-                hostingView.invalidateIntrinsicContentSize()
-                if hostingController.parent != parent { parent.addChild(hostingController) }
-                if !contentView.subviews.contains(hostingController.view) {
-                    contentView.addSubview(hostingController.view)
-                    hostingView.translatesAutoresizingMaskIntoConstraints = false
-                    NSLayoutConstraint.activate([
-                        hostingView.leadingAnchor
-                            .constraint(equalTo: contentView.leadingAnchor),
-                        hostingView.trailingAnchor
-                            .constraint(equalTo: contentView.trailingAnchor),
-                        hostingView.topAnchor
-                            .constraint(equalTo: contentView.topAnchor),
-                        hostingView.bottomAnchor
-                            .constraint(equalTo: contentView.bottomAnchor)
-                    ])
-                }
-                if hostingController.parent != parent { hostingController.didMove(toParent: parent) }
-            } else {
-                fatalError("Hosting View not loaded \(hostingController)")
-            }
-        }
-
-        override func prepareForReuse() {
-            super.prepareForReuse()
-            hostingController.rootView = nil
-        }
-    }
-}
-
-typealias ListState = (
-    scrollOffset: Double,
-    topItemDate: Date?,
-    bottomItemId: ChatItem.ID?
-)
-
-/// Manages ``ReverseList`` scrolling
-class ReverseListScrollModel: ObservableObject {
-    /// Represents Scroll State of ``ReverseList``
-    enum State: Equatable {
-        enum Destination: Equatable {
-            case nextPage
-            case item(ChatItem.ID)
-            case bottom
-        }
-
-        case scrollingTo(Destination)
-        case atDestination
-    }
-
-    @Published var state: State = .atDestination
-
-    func scrollToNextPage() {
-        state = .scrollingTo(.nextPage)
-    }
-
-    func scrollToBottom() {
-        state = .scrollingTo(.bottom)
-    }
-
-    func scrollToItem(id: ChatItem.ID) {
-        state = .scrollingTo(.item(id))
-    }
-}
-
-fileprivate let cellReuseId = "hostingCell"
-
-fileprivate let notificationName = NSNotification.Name(rawValue: "reverseListNeedsLayout")
-
-fileprivate extension CGAffineTransform {
-    /// Transform that vertically flips the view, preserving it's location
-    static let verticalFlip = CGAffineTransform(scaleX: 1, y: -1)
-}
-
-extension NotificationCenter {
-    static func postReverseListNeedsLayout() {
-        NotificationCenter.default.post(
-            name: notificationName,
-            object: nil
-        )
-    }
-}
-
-/// Disable animation on iOS 15
-func withConditionalAnimation<Result>(
-    _ animation: Animation? = .default,
-    _ body: () throws -> Result
-) rethrows -> Result {
-    if #available(iOS 16.0, *) {
-        try withAnimation(animation, body)
-    } else {
-        try body()
-    }
-}
-
-class InvertedTableView: UITableView {
-    static let inset = CGFloat(100)
-
-    static let insets = UIEdgeInsets(
-        top: inset,
-        left: .zero,
-        bottom: inset,
-        right: .zero
-    )
-
-    override var contentInsetAdjustmentBehavior: UIScrollView.ContentInsetAdjustmentBehavior {
-        get { .never }
-        set { }
-    }
-
-    override var contentInset: UIEdgeInsets {
-        get { Self.insets }
-        set { }
-    }
-
-    override var adjustedContentInset: UIEdgeInsets {
-        Self.insets
-    }
-}

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

@@ -0,0 +1,52 @@
+//
+//  ScrollViewCells.swift
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 27.01.2025.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+protocol ReusableView {
+    func prepareForReuse()
+}
+
+/// `UIHostingConfiguration` back-port for iOS14 and iOS15
+/// Implemented as a `UIView` that wraps and manages a generic `UIHostingController`
+final class HostingCell<Hosted: View>: UIView, ReusableView {
+    private let hostingController = UIHostingController<Hosted?>(rootView: nil)
+
+    /// Updates content of the cell
+    /// For reference: https://noahgilmore.com/blog/swiftui-self-sizing-cells/
+    func set(content: Hosted, parent: UIViewController) {
+        hostingController.view.backgroundColor = .clear
+        hostingController.rootView = content
+        if let hostingView = hostingController.view {
+            hostingView.invalidateIntrinsicContentSize()
+            if hostingController.parent != parent { parent.addChild(hostingController) }
+            if !subviews.contains(hostingController.view) {
+                addSubview(hostingController.view)
+                hostingView.translatesAutoresizingMaskIntoConstraints = false
+                NSLayoutConstraint.activate([
+                    hostingView.leadingAnchor
+                        .constraint(equalTo: leadingAnchor),
+                    hostingView.trailingAnchor
+                        .constraint(equalTo: trailingAnchor),
+                    hostingView.topAnchor
+                        .constraint(equalTo: topAnchor),
+                    hostingView.bottomAnchor
+                        .constraint(equalTo: bottomAnchor)
+                ])
+            }
+            if hostingController.parent != parent { hostingController.didMove(toParent: parent) }
+        } else {
+            fatalError("Hosting View not loaded \(hostingController)")
+        }
+    }
+
+    func prepareForReuse() {
+        //super.prepareForReuse()
+        hostingController.rootView = nil
+    }
+}

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

@@ -25,17 +25,20 @@ struct SelectedItemsTopToolbar: View {
 struct SelectedItemsBottomToolbar: View {
     @Environment(\.colorScheme) var colorScheme
     @EnvironmentObject var theme: AppTheme
-    let chatItems: [ChatItem]
+    let im: ItemsModel
     @Binding var selectedChatItems: Set<Int64>?
     var chatInfo: ChatInfo
     // Bool - delete for everyone is possible
     var deleteItems: (Bool) -> Void
+    var archiveItems: () -> Void
     var moderateItems: () -> Void
     //var shareItems: () -> Void
     var forwardItems: () -> Void
     @State var deleteEnabled: Bool = false
     @State var deleteForEveryoneEnabled: Bool = false
 
+    @State var canArchiveReports: Bool = false
+
     @State var canModerate: Bool = false
     @State var moderateEnabled: Bool = false
 
@@ -50,7 +53,11 @@ struct SelectedItemsBottomToolbar: View {
 
             HStack(alignment: .center) {
                 Button {
+                    if canArchiveReports {
+                        archiveItems()
+                    } else {
                         deleteItems(deleteForEveryoneEnabled)
+                    }
                 } label: {
                     Image(systemName: "trash")
                         .resizable()
@@ -68,9 +75,9 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || deleteCountProhibited ? theme.colors.secondary : .red)
+                        .foregroundColor(!moderateEnabled || deleteCountProhibited || im.secondaryIMFilter != nil ? theme.colors.secondary : .red)
                 }
-                .disabled(!moderateEnabled || deleteCountProhibited)
+                .disabled(!moderateEnabled || deleteCountProhibited || im.secondaryIMFilter != nil)
                 .opacity(canModerate ? 1 : 0)
 
                 Spacer()
@@ -81,24 +88,24 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!forwardEnabled || forwardCountProhibited ? theme.colors.secondary : theme.colors.primary)
+                        .foregroundColor(!forwardEnabled || forwardCountProhibited || im.secondaryIMFilter != nil ? theme.colors.secondary : theme.colors.primary)
                 }
-                .disabled(!forwardEnabled || forwardCountProhibited)
+                .disabled(!forwardEnabled || forwardCountProhibited || im.secondaryIMFilter != nil)
             }
             .frame(maxHeight: .infinity)
             .padding([.leading, .trailing], 12)
         }
         .onAppear {
-            recheckItems(chatInfo, chatItems, selectedChatItems)
+            recheckItems(chatInfo, im.reversedChatItems, selectedChatItems)
         }
         .onChange(of: chatInfo) { info in
-            recheckItems(info, chatItems, selectedChatItems)
+            recheckItems(info, im.reversedChatItems, selectedChatItems)
         }
-        .onChange(of: chatItems) { items in
+        .onChange(of: im.reversedChatItems) { items in
             recheckItems(chatInfo, items, selectedChatItems)
         }
         .onChange(of: selectedChatItems) { selected in
-            recheckItems(chatInfo, chatItems, selected)
+            recheckItems(chatInfo, im.reversedChatItems, selected)
         }
         .frame(height: 55.5)
         .background(.thinMaterial)
@@ -109,19 +116,25 @@ struct SelectedItemsBottomToolbar: View {
         deleteCountProhibited = count == 0 || count > 200
         forwardCountProhibited = count == 0 || count > 20
         canModerate = possibleToModerate(chatInfo)
+        let groupInfo: GroupInfo? = if case let ChatInfo.group(groupInfo: info, _) = chatInfo {
+            info
+        } else {
+             nil
+        }
         if let selected = selectedItems {
             let me: Bool
             let onlyOwnGroupItems: Bool
-            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, forwardEnabled, selectedChatItems) = chatItems.reduce((true, true, true, true, true, [])) { (r, ci) in
+            (deleteEnabled, deleteForEveryoneEnabled, canArchiveReports, me, onlyOwnGroupItems, forwardEnabled, selectedChatItems) = chatItems.reduce((true, true, true, true, true, true, [])) { (r, ci) in
                 if selected.contains(ci.id) {
-                    var (de, dee, me, onlyOwnGroupItems, fe, sel) = r
+                    var (de, dee, ar, me, onlyOwnGroupItems, fe, sel) = r
                     de = de && ci.canBeDeletedForSelf
                     dee = dee && ci.meta.deletable && !ci.localNote && !ci.isReport
+                    ar = ar && ci.isActiveReport && ci.chatDir != .groupSnd && groupInfo != nil && groupInfo!.membership.memberRole >= .moderator
                     onlyOwnGroupItems = onlyOwnGroupItems && ci.chatDir == .groupSnd && !ci.isReport
                     me = me && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil && !ci.isReport
                     fe = fe && ci.content.msgContent != nil && ci.meta.itemDeleted == nil && !ci.isLiveDummy && !ci.isReport
                     sel.insert(ci.id) // we are collecting new selected items here to account for any changes in chat items list
-                    return (de, dee, me, onlyOwnGroupItems, fe, sel)
+                    return (de, dee, ar, me, onlyOwnGroupItems, fe, sel)
                 } else {
                     return r
                 }
@@ -132,7 +145,7 @@ struct SelectedItemsBottomToolbar: View {
 
     private func possibleToModerate(_ chatInfo: ChatInfo) -> Bool {
         return switch chatInfo {
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             groupInfo.membership.memberRole >= .admin
         default: false
         }

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

@@ -24,45 +24,37 @@ struct VerifyCodeView: View {
     }
 
     private func verifyCodeView(_ code: String) -> some View {
-        ScrollView {
         let splitCode = splitToParts(code, length: 24)
-            VStack(alignment: .leading) {
-                Group {
-                    HStack {
-                        if connectionVerified {
-                            Image(systemName: "checkmark.shield")
-                                .foregroundColor(theme.colors.secondary)
-                            Text("\(displayName) is verified")
-                        } else {
-                            Text("\(displayName) is not verified")
-                        }
-                    }
-                    .frame(height: 24)
-
-                    QRCode(uri: code)
-                        .padding(.horizontal)
+        return List {
+            Section {
+                QRCode(uri: code, small: true)
 
                 Text(splitCode)
                     .multilineTextAlignment(.leading)
                     .font(.body.monospaced())
                     .lineLimit(20)
-                        .padding(.bottom, 8)
-                }
                     .frame(maxWidth: .infinity, alignment: .center)
-
+            } header: {
+                if connectionVerified {
+                    HStack {
+                        Image(systemName: "checkmark.shield").foregroundColor(theme.colors.secondary)
+                        Text("\(displayName) is verified").textCase(.none)
+                    }
+                } else {
+                    Text("\(displayName) is not verified").textCase(.none)
+                }
+            } footer: {
                 Text("To verify end-to-end encryption with your contact compare (or scan) the code on your devices.")
-                    .padding(.bottom)
+            }
 
-                Group {
+            Section {
                 if connectionVerified {
                     Button {
                         verifyCode(nil)
                     } label: {
                         Label("Clear verification", systemImage: "shield")
                     }
-                        .padding()
                 } else {
-                        HStack {
                     NavigationLink {
                         ScanCodeView(connectionVerified: $connectionVerified, verify: verify)
                             .navigationBarTitleDisplayMode(.large)
@@ -71,7 +63,6 @@ struct VerifyCodeView: View {
                     } label: {
                         Label("Scan code", systemImage: "qrcode")
                     }
-                            .padding()
                     Button {
                         verifyCode(code) { verified in
                             if !verified { showCodeError = true }
@@ -79,17 +70,12 @@ struct VerifyCodeView: View {
                     } label: {
                         Label("Mark verified", systemImage: "checkmark.shield")
                     }
-                            .padding()
                     .alert(isPresented: $showCodeError) {
                         Alert(title: Text("Incorrect security code!"))
                     }
                 }
             }
         }
-                .frame(maxWidth: .infinity, alignment: .center)
-            }
-            .padding()
-            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {
                 Button {
@@ -103,7 +89,6 @@ struct VerifyCodeView: View {
             if connectionVerified { dismiss() }
         }
     }
-    }
 
     private func verifyCode(_ code: String?, _ cb: ((Bool) -> Void)? = nil) {
         if let (verified, existingCode) = verify(code) {

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

@@ -66,7 +66,7 @@ struct ChatListNavLink: View {
             switch chat.chatInfo {
             case let .direct(contact):
                 contactNavLink(contact)
-            case let .group(groupInfo):
+            case let .group(groupInfo, _):
                 groupNavLink(groupInfo)
             case let .local(noteFolder):
                 noteFolderNavLink(noteFolder)
@@ -90,11 +90,11 @@ struct ChatListNavLink: View {
         .actionSheet(item: $actionSheet) { $0.actionSheet }
     }
     
-    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
+    private func contactNavLink(_ contact: Contact) -> some View {
         Group {
             if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
                 ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                    .frame(height: dynamicRowHeight)
+                    .frameCompat(height: dynamicRowHeight)
                     .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                         Button {
                             deleteContactDialog(
@@ -121,6 +121,7 @@ struct ChatListNavLink: View {
                     selection: $chatModel.chatId,
                     label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
                 )
+                .frameCompat(height: dynamicRowHeight)
                 .swipeActions(edge: .leading, allowsFullSwipe: true) {
                     markReadButton()
                     toggleFavoriteButton()
@@ -145,7 +146,6 @@ struct ChatListNavLink: View {
                     }
                     .tint(.red)
                 }
-                .frame(height: dynamicRowHeight)
             }
         }
         .alert(item: $alert) { $0.alert }
@@ -163,7 +163,7 @@ struct ChatListNavLink: View {
         switch (groupInfo.membership.memberStatus) {
         case .memInvited:
             ChatPreviewView(chat: chat, progressByTimeout: $progressByTimeout)
-                .frame(height: dynamicRowHeight)
+                .frameCompat(height: dynamicRowHeight)
                 .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                     joinGroupButton()
                     if groupInfo.canDelete {
@@ -183,13 +183,13 @@ struct ChatListNavLink: View {
                 .disabled(inProgress)
         case .memAccepted:
             ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
-                .frame(height: dynamicRowHeight)
+                .frameCompat(height: dynamicRowHeight)
                 .onTapGesture {
                     AlertManager.shared.showAlert(groupInvitationAcceptedAlert())
                 }
                 .swipeActions(edge: .trailing) {
                     tagChatButton(chat)
-                    if (groupInfo.membership.memberCurrent) {
+                    if (groupInfo.membership.memberCurrentOrPending) {
                         leaveGroupChatButton(groupInfo)
                     }
                     if groupInfo.canDelete {
@@ -203,7 +203,7 @@ struct ChatListNavLink: View {
                 label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                 disabled: !groupInfo.ready
             )
-            .frame(height: dynamicRowHeight)
+            .frameCompat(height: dynamicRowHeight)
             .swipeActions(edge: .leading, allowsFullSwipe: true) {
                 markReadButton()
                 toggleFavoriteButton()
@@ -211,37 +211,46 @@ struct ChatListNavLink: View {
             }
             .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                 tagChatButton(chat)
+                let showReportsButton = chat.chatStats.reportsCount > 0 && groupInfo.membership.memberRole >= .moderator
                 let showClearButton = !chat.chatItems.isEmpty
                 let showDeleteGroup = groupInfo.canDelete
-                let showLeaveGroup = groupInfo.membership.memberCurrent
-                let totalNumberOfButtons = 1 + (showClearButton ? 1 : 0) + (showDeleteGroup ? 1 : 0) + (showLeaveGroup ? 1 : 0)
+                let showLeaveGroup = groupInfo.membership.memberCurrentOrPending
+                let totalNumberOfButtons = 1 + (showReportsButton ? 1 : 0) + (showClearButton ? 1 : 0) + (showDeleteGroup ? 1 : 0) + (showLeaveGroup ? 1 : 0)
 
-                if showClearButton, totalNumberOfButtons <= 3 {
+                if showClearButton && totalNumberOfButtons <= 3 {
                     clearChatButton()
                 }
-                if (showLeaveGroup) {
+
+                if showReportsButton && totalNumberOfButtons <= 3 {
+                    archiveAllReportsButton()
+                }
+
+                if showLeaveGroup {
                     leaveGroupChatButton(groupInfo)
                 }
 
-                if showDeleteGroup {
-                    if totalNumberOfButtons <= 3 {
+                if showDeleteGroup && totalNumberOfButtons <= 3 {
                     deleteGroupChatButton(groupInfo)
+                } else if totalNumberOfButtons > 3 {
+                    if showDeleteGroup && !groupInfo.membership.memberActive {
+                        deleteGroupChatButton(groupInfo)
+                        moreOptionsButton(false, chat, groupInfo)
                     } else {
-                        moreOptionsButton(chat, groupInfo)
+                        moreOptionsButton(true, chat, groupInfo)
                     }
                 }
             }
         }
     }
 
-    @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
+    private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
         NavLinkPlain(
             chatId: chat.chatInfo.id,
             selection: $chatModel.chatId,
             label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
             disabled: !noteFolder.ready
         )
-        .frame(height: dynamicRowHeight)
+        .frameCompat(height: dynamicRowHeight)
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             markReadButton()
         }
@@ -267,7 +276,7 @@ struct ChatListNavLink: View {
     @ViewBuilder private func markReadButton() -> some View {
         if chat.chatStats.unreadCount > 0 || chat.chatStats.unreadChat {
             Button {
-                Task { await markChatRead(chat) }
+                Task { await markChatRead(ItemsModel.shared, chat) }
             } label: {
                 SwipeLabel(NSLocalizedString("Read", comment: "swipe action"), systemImage: "checkmark", inverted: oneHandUI)
             }
@@ -302,14 +311,22 @@ struct ChatListNavLink: View {
     }
 
     @ViewBuilder private func toggleNtfsButton(chat: Chat) -> some View {
+        if let nextMode = chat.chatInfo.nextNtfMode {
             Button {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+                toggleNotifications(chat, enableNtfs: nextMode)
             } label: {
-            if chat.chatInfo.ntfsEnabled {
-                SwipeLabel(NSLocalizedString("Mute", comment: "swipe action"), systemImage: "speaker.slash.fill", inverted: oneHandUI)
-            } else {
-                SwipeLabel(NSLocalizedString("Unmute", comment: "swipe action"), systemImage: "speaker.wave.2.fill", inverted: oneHandUI)
+                SwipeLabel(nextMode.text(mentions: chat.chatInfo.hasMentions), systemImage: nextMode.iconFilled, inverted: oneHandUI)
             }
+        } else {
+            EmptyView()
+        }
+    }
+
+    private func archiveAllReportsButton() -> some View {
+        Button {
+            AlertManager.shared.showAlert(archiveAllReportsAlert())
+        } label: {
+            SwipeLabel(NSLocalizedString("Archive reports", comment: "swipe action"), systemImage: "archivebox", inverted: oneHandUI)
         }
     }
 
@@ -354,15 +371,20 @@ struct ChatListNavLink: View {
         )
     }
     
-    private func moreOptionsButton(_ chat: Chat, _ groupInfo: GroupInfo?) -> some View {
+    private func moreOptionsButton(_ canShowGroupDelete: Bool, _ chat: Chat, _ groupInfo: GroupInfo?) -> some View {
         Button {
-            var buttons: [Alert.Button] = [
-                .default(Text("Clear")) {
+            var buttons: [Alert.Button] = []
+            buttons.append(.default(Text("Clear")) {
                 AlertManager.shared.showAlert(clearChatAlert())
-                }
-            ]
+            })
 
-            if let gi = groupInfo, gi.canDelete {
+            if let groupInfo, chat.chatStats.reportsCount > 0 && groupInfo.membership.memberRole >= .moderator && groupInfo.ready {
+                buttons.append(.default(Text("Archive reports")) {
+                    AlertManager.shared.showAlert(archiveAllReportsAlert())
+                })
+            }
+
+            if canShowGroupDelete, let gi = groupInfo, gi.canDelete {
                 buttons.append(.destructive(Text("Delete")) {
                     AlertManager.shared.showAlert(deleteGroupAlert(gi))
                 })
@@ -372,7 +394,7 @@ struct ChatListNavLink: View {
                                
             actionSheet = SomeActionSheet(
                 actionSheet: ActionSheet(
-                    title: Text("Clear or delete group?"),
+                    title: canShowGroupDelete ? Text("Clear or delete group?") : Text("Clear group?"),
                     buttons: buttons
                 ),
                 id: "other options"
@@ -411,6 +433,7 @@ struct ChatListNavLink: View {
 
     private func contactRequestNavLink(_ contactRequest: UserContactRequest) -> some View {
         ContactRequestView(contactRequest: contactRequest, chat: chat)
+        .frameCompat(height: dynamicRowHeight)
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
             Button {
                 Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
@@ -429,7 +452,6 @@ struct ChatListNavLink: View {
             }
             .tint(.red)
         }
-        .frame(height: dynamicRowHeight)
         .contentShape(Rectangle())
         .onTapGesture { showContactRequestDialog = true }
         .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
@@ -441,6 +463,7 @@ struct ChatListNavLink: View {
 
     private func contactConnectionNavLink(_ contactConnection: PendingContactConnection) -> some View {
         ContactConnectionView(chat: chat)
+        .frameCompat(height: dynamicRowHeight)
         .swipeActions(edge: .trailing, allowsFullSwipe: true) {
             Button {
                 AlertManager.shared.showAlert(deleteContactConnectionAlert(contactConnection) { a in
@@ -458,16 +481,13 @@ struct ChatListNavLink: View {
             }
             .tint(theme.colors.primary)
         }
-        .frame(height: dynamicRowHeight)
         .appSheet(isPresented: $showContactConnectionInfo) {
-            Group {
             if case let .contactConnection(contactConnection) = chat.chatInfo {
                 ContactConnectionInfo(contactConnection: contactConnection)
                     .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
                     .modifier(ThemedBackground(grouped: true))
             }
         }
-        }
         .contentShape(Rectangle())
         .onTapGesture {
             showContactConnectionInfo = true
@@ -490,6 +510,27 @@ struct ChatListNavLink: View {
         )
     }
 
+    private func archiveAllReportsAlert() -> Alert {
+        Alert(
+            title: Text("Archive all reports?"),
+            message: Text("All reports will be archived for you."),
+            primaryButton: .destructive(Text("Archive")) {
+                Task { await archiveAllReportsForMe(chat.chatInfo.apiId) }
+            },
+            secondaryButton: .cancel()
+        )
+    }
+
+    private func archiveAllReportsForMe(_ apiId: Int64) async {
+        do {
+            if case let .groupChatItemsDeleted(user, groupInfo, chatItemIDs, _, member) = try await apiArchiveReceivedReports(groupId: apiId) {
+                await groupChatItemsDeleted(user, groupInfo, chatItemIDs, member)
+            }
+        } catch {
+            logger.error("archiveAllReportsForMe error: \(responseError(error))")
+        }
+    }
+
     private func clearChatAlert() -> Alert {
         Alert(
             title: Text("Clear conversation?"),
@@ -536,14 +577,14 @@ struct ChatListNavLink: View {
         )
     }
 
-    private func invalidJSONPreview(_ json: String) -> some View {
+    private func invalidJSONPreview(_ json: Data?) -> some View {
         Text("invalid chat data")
             .foregroundColor(.red)
             .padding(4)
-            .frame(height: dynamicRowHeight)
+            .frameCompat(height: dynamicRowHeight)
             .onTapGesture { showInvalidJSON = true }
             .appSheet(isPresented: $showInvalidJSON) {
-                invalidJSONView(json)
+                invalidJSONView(dataToString(json))
                     .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
             }
     }
@@ -552,12 +593,31 @@ struct ChatListNavLink: View {
         Task {
             let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
+                ItemsModel.shared.loadOpenChat(contact.id) {
                     AlertManager.shared.showAlert(connReqSentAlert(.contact))
                 }
             }
         }
     }
+}
+
+extension View {
+    @inline(__always)
+    @ViewBuilder fileprivate func frameCompat(height: CGFloat) -> some View {
+        if #available(iOS 16, *) {
+            self.frame(height: height)
+        } else {
+            VStack(spacing: 0) {
+                Divider()
+                    .padding(.leading, 16)
+                self
+                    .frame(height: height)
+                    .padding(.horizontal, 8)
+                    .padding(.vertical, 8)
+            }
+        }
+    }
+}
 
 func rejectContactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
     Alert(
@@ -645,7 +705,7 @@ func joinGroup(_ groupId: Int64, _ onComplete: @escaping () async -> Void) {
 }
 
 func getErrorAlert(_ error: Error, _ title: LocalizedStringKey) -> ErrorAlert {
-    if let r = error as? ChatResponse,
+    if let r = error as? ChatError,
        let alert = getNetworkErrorAlert(r) {
         return alert
     } else {

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

@@ -148,6 +148,10 @@ struct ChatListView: View {
     @State private var userPickerShown: Bool = false
     @State private var sheet: SomeSheet<AnyView>? = nil
     @StateObject private var chatTagsModel = ChatTagsModel.shared
+    @State private var scrollToItemId: ChatItem.ID? = nil
+
+    // iOS 15 is required it to show/hide toolbar while chat is hidden/visible
+    @State private var viewOnScreen = true
 
     @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
     @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
@@ -203,7 +207,17 @@ struct ChatListView: View {
                 .navigationBarHidden(searchMode || oneHandUI)
         }
         .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-        .onDisappear() { activeUserPickerSheet = nil }
+        .onAppear {
+            if #unavailable(iOS 16.0), !viewOnScreen {
+                viewOnScreen = true
+            }
+        }
+        .onDisappear {
+            activeUserPickerSheet = nil
+            if #unavailable(iOS 16.0) {
+                viewOnScreen = false
+            }
+        }
         .refreshable {
             AlertManager.shared.showAlert(Alert(
                 title: Text("Reconnect servers?"),
@@ -258,7 +272,7 @@ struct ChatListView: View {
             }
         } else {
             if oneHandUI {
-                content().toolbar { bottomToolbarGroup }
+                content().toolbar { bottomToolbarGroup() }
             } else {
                 content().toolbar { topToolbar }
             }
@@ -286,9 +300,9 @@ struct ChatListView: View {
         }
     }
     
-    @ToolbarContentBuilder var bottomToolbarGroup: some ToolbarContent {
+    @ToolbarContentBuilder func bottomToolbarGroup() -> some ToolbarContent {
         let padding: Double = Self.hasHomeIndicator ? 0 : 14
-        ToolbarItemGroup(placement: .bottomBar) {
+        ToolbarItemGroup(placement: viewOnScreen ? .bottomBar : .principal) {
             leadingToolbarItem.padding(.bottom, padding)
             Spacer()
             SubsStatusIndicator().padding(.bottom, padding)
@@ -322,9 +336,9 @@ struct ChatListView: View {
         }
     }
     
-    @ViewBuilder private var chatList: some View {
+    private var chatList: some View {
         let cs = filteredChats()
-        ZStack {
+        return ZStack {
             ScrollViewReader { scrollProxy in
                 List {
                     if !chatModel.chats.isEmpty {
@@ -354,13 +368,7 @@ struct ChatListView: View {
                         .offset(x: -8)
                     } else {
                         ForEach(cs, id: \.viewId) { chat in
-                            VStack(spacing: .zero) {
-                                Divider()
-                                    .padding(.leading, 16)
                             ChatListNavLink(chat: chat,  parentSheet: $sheet)
-                                    .padding(.horizontal, 8)
-                                    .padding(.vertical, 6)
-                            }
                             .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                             .listRowSeparator(.hidden)
                             .listRowInsets(EdgeInsets())
@@ -439,7 +447,14 @@ struct ChatListView: View {
     
     @ViewBuilder private func chatView() -> some View {
         if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
-            ChatView(chat: chat)
+            let im = ItemsModel.shared
+            ChatView(
+                chat: chat,
+                im: im,
+                mergedItems: BoxedValue(MergedItems.create(im, [])),
+                floatingButtonModel: FloatingButtonModel(im: im),
+                scrollToItemId: $scrollToItemId
+            )
         }
     }
     
@@ -480,7 +495,7 @@ struct ChatListView: View {
             switch chatTagsModel.activeFilter {
             case let .presetTag(tag): presetTagMatchesChat(tag, chat.chatInfo, chat.chatStats)
             case let .userTag(tag): chat.chatInfo.chatTags?.contains(tag.chatTagId) == true
-            case .unread: chat.chatStats.unreadChat ||  chat.chatInfo.ntfsEnabled && chat.chatStats.unreadCount > 0
+            case .unread: chat.unreadTag
             case .none: true
             }
         }
@@ -791,7 +806,7 @@ struct TagsView: View {
         }
     }
 
-    @ViewBuilder private func expandedPresetTagsFiltersView() -> some View {
+    private func expandedPresetTagsFiltersView() -> some View {
         ForEach(PresetTag.allCases, id: \.id) { tag in
             if (chatTagsModel.presetTags[tag] ?? 0) > 0 {
                 expandedTagFilterView(tag)
@@ -885,12 +900,12 @@ func presetTagMatchesChat(_ tag: PresetTag, _ chatInfo: ChatInfo, _ chatStats: C
         case let .direct(contact): !(contact.activeConn == nil && contact.profile.contactLink != nil && contact.active) && !contact.chatDeleted
         case .contactRequest: true
         case .contactConnection: true
-        case let .group(groupInfo): groupInfo.businessChat?.chatType == .customer
+        case let .group(groupInfo, _): groupInfo.businessChat?.chatType == .customer
         default: false
         }
     case .groups:
         switch chatInfo {
-        case let .group(groupInfo): groupInfo.businessChat == nil
+        case let .group(groupInfo, _): groupInfo.businessChat == nil
         default: false
         }
     case .business:

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

@@ -27,7 +27,8 @@ struct ChatPreviewView: View {
     
     var body: some View {
         let cItem = chat.chatItems.last
-        return HStack(spacing: 8) {
+        return ZStack {
+            HStack(spacing: 8) {
                 ZStack(alignment: .bottomTrailing) {
                     ChatInfoImage(chat: chat, size: dynamicSize(userFont).profileImageSize)
                     chatPreviewImageOverlayIcon()
@@ -92,7 +93,14 @@ struct ChatPreviewView: View {
                 }
                 .frame(maxHeight: .infinity)
             }
+            .opacity(deleting ? 0.4 : 1)
             .padding(.bottom, -8)
+            
+            if deleting {
+                ProgressView()
+                    .scaleEffect(2)
+            }
+        }
         .onChange(of: chatModel.deletedChats.contains(chat.chatInfo.id)) { contains in
             deleting = contains
             // Stop voice when deleting the chat
@@ -133,8 +141,9 @@ struct ChatPreviewView: View {
             } else {
                 EmptyView()
             }
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             switch (groupInfo.membership.memberStatus) {
+            case .memRejected: inactiveIcon()
             case .memLeft: inactiveIcon()
             case .memRemoved: inactiveIcon()
             case .memGroupDeleted: inactiveIcon()
@@ -145,7 +154,7 @@ struct ChatPreviewView: View {
         }
     }
 
-    @ViewBuilder private func inactiveIcon() -> some View {
+    private func inactiveIcon() -> some View {
         Image(systemName: "multiply.circle.fill")
             .foregroundColor(.secondary.opacity(0.65))
             .background(Circle().foregroundColor(Color(uiColor: .systemBackground)))
@@ -156,11 +165,11 @@ struct ChatPreviewView: View {
         switch chat.chatInfo {
         case let .direct(contact):
             previewTitle(contact.verified == true ? verifiedIcon + t : t).foregroundColor(deleting ? Color.secondary : nil)
-        case let .group(groupInfo):
+        case let .group(groupInfo, _):
             let v = previewTitle(t)
             switch (groupInfo.membership.memberStatus) {
             case .memInvited: v.foregroundColor(deleting ? theme.colors.secondary : chat.chatInfo.incognito ? .indigo : theme.colors.primary)
-            case .memAccepted: v.foregroundColor(theme.colors.secondary)
+            case .memAccepted, .memRejected: v.foregroundColor(theme.colors.secondary)
             default: if deleting  { v.foregroundColor(theme.colors.secondary) } else { v }
             }
         default: previewTitle(t)
@@ -178,14 +187,17 @@ struct ChatPreviewView: View {
             .kerning(-2)
     }
 
-    private func chatPreviewLayout(_ text: Text?, draft: Bool = false, _ hasFilePreview: Bool = false) -> some View {
+    private func chatPreviewLayout(_ text: Text?, draft: Bool = false, hasFilePreview: Bool = false, hasSecrets: Bool) -> some View {
         ZStack(alignment: .topTrailing) {
+            let s = chat.chatStats
+            let mentionWidth: CGFloat = if s.unreadMentions > 0 && s.unreadCount > 1 { dynamicSize(userFont).unreadCorner } else { 0 }
             let t = text
                 .lineLimit(userFont <= .xxxLarge ? 2 : 1)
                 .multilineTextAlignment(.leading)
+                .if(hasSecrets, transform: hiddenSecretsView)
                 .frame(maxWidth: .infinity, alignment: .topLeading)
                 .padding(.leading, hasFilePreview ? 0 : 8)
-                .padding(.trailing, hasFilePreview ? 38 : 36)
+                .padding(.trailing, mentionWidth + (hasFilePreview ? 38 : 36))
                 .offset(x: hasFilePreview ? -2 : 0)
                 .fixedSize(horizontal: false, vertical: true)
             if !showChatPreviews && !draft {
@@ -200,19 +212,34 @@ struct ChatPreviewView: View {
     @ViewBuilder private func chatInfoIcon(_ chat: Chat) -> some View {
         let s = chat.chatStats
         if s.unreadCount > 0 || s.unreadChat {
-            unreadCountText(s.unreadCount)
+            let mentionColor = mentionColor(chat)
+            HStack(alignment: .center, spacing: 2) {
+                if s.unreadMentions > 0 && s.unreadCount > 1 {
+                    Text("\(MENTION_START)")
+                        .font(userFont <= .xxxLarge ? .body : .callout)
+                        .foregroundColor(mentionColor)
+                        .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
+                        .cornerRadius(dynamicSize(userFont).unreadCorner)
+                        .padding(.bottom, 1)
+                }
+                let singleUnreadIsMention = s.unreadMentions > 0 && s.unreadCount == 1
+                (singleUnreadIsMention ? Text("\(MENTION_START)") : unreadCountText(s.unreadCount))
                     .font(userFont <= .xxxLarge ? .caption : .caption2)
                     .foregroundColor(.white)
                     .padding(.horizontal, dynamicSize(userFont).unreadPadding)
                     .frame(minWidth: dynamicChatInfoSize, minHeight: dynamicChatInfoSize)
-                .background(chat.chatInfo.ntfsEnabled || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
+                    .background(singleUnreadIsMention ? mentionColor : chat.chatInfo.ntfsEnabled(false) || chat.chatInfo.chatType == .local ? theme.colors.primary : theme.colors.secondary)
                     .cornerRadius(dynamicSize(userFont).unreadCorner)
-        } else if !chat.chatInfo.ntfsEnabled && chat.chatInfo.chatType != .local {
-            Image(systemName: "speaker.slash.fill")
+            }
+            .frame(height: dynamicChatInfoSize)
+        } else if let ntfMode = chat.chatInfo.chatSettings?.enableNtfs, ntfMode != .all {
+            let iconSize = ntfMode == .mentions ? dynamicChatInfoSize * 0.8 : dynamicChatInfoSize
+            let iconColor = ntfMode == .mentions ? theme.colors.secondary.opacity(0.7) : theme.colors.secondary
+            Image(systemName: ntfMode.iconFilled)
                 .resizable()
                 .scaledToFill()
-                .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
-                .foregroundColor(theme.colors.secondary)
+                .frame(width: iconSize, height: iconSize)
+                .foregroundColor(iconColor)
         } else if chat.chatInfo.chatSettings?.favorite ?? false {
             Image(systemName: "star.fill")
                 .resizable()
@@ -225,11 +252,21 @@ struct ChatPreviewView: View {
         }
     }
     
-    private func messageDraft(_ draft: ComposeState) -> Text {
+    private func mentionColor(_ chat: Chat) -> Color {
+        switch chat.chatInfo.chatSettings?.enableNtfs {
+        case .all: theme.colors.primary
+        case .mentions: theme.colors.primary
+        default: theme.colors.secondary
+        }
+    }
+
+    private func messageDraft(_ draft: ComposeState) -> (Text, Bool) {
         let msg = draft.message
-        return image("rectangle.and.pencil.and.ellipsis", color: theme.colors.primary)
+        let r = messageText(msg, parseSimpleXMarkdown(msg), sender: nil, preview: true, mentions: draft.mentions, userMemberId: nil, showSecrets: nil, backgroundColor: UIColor(theme.colors.background))
+        return (image("rectangle.and.pencil.and.ellipsis", color: theme.colors.primary)
                     + attachment()
-                + messageText(msg, parseSimpleXMarkdown(msg), nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)
+                    + Text(AttributedString(r.string)),
+                r.hasSecrets)
 
         func image(_ s: String, color: Color = Color(uiColor: .tertiaryLabel)) -> Text {
             Text(Image(systemName: s)).foregroundColor(color) + textSpace
@@ -245,10 +282,11 @@ struct ChatPreviewView: View {
         }
     }
 
-    func chatItemPreview(_ cItem: ChatItem) -> Text {
+    func chatItemPreview(_ cItem: ChatItem) -> (Text, Bool) {
         let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
         let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
-        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary, prefix: prefix())
+        let r = messageText(itemText, itemFormattedText, sender: cItem.memberDisplayName, preview: true, mentions: cItem.mentions, userMemberId: chat.chatInfo.groupInfo?.membership.memberId, showSecrets: nil, backgroundColor: UIColor(theme.colors.background), prefix: prefix())
+        return (Text(AttributedString(r.string)), r.hasSecrets)
 
         // 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
@@ -275,19 +313,21 @@ struct ChatPreviewView: View {
             }
         }
         
-        func prefix() -> Text {
+        func prefix() -> NSAttributedString? {
             switch cItem.content.msgContent {
-            case let .report(_, reason): return Text(!itemText.isEmpty ? "\(reason.text): " : reason.text).italic().foregroundColor(Color.red)
-            default: return Text("")
+            case let .report(_, reason): reason.attrString
+            default: nil
             }
         }
     }
 
     @ViewBuilder private func chatMessagePreview(_ cItem: ChatItem?, _ hasFilePreview: Bool = false) -> some View {
         if chatModel.draftChatId == chat.id, let draft = chatModel.draft {
-            chatPreviewLayout(messageDraft(draft), draft: true, hasFilePreview)
+            let (t, hasSecrets) = messageDraft(draft)
+            chatPreviewLayout(t, draft: true, hasFilePreview: hasFilePreview, hasSecrets: hasSecrets)
         } else if let cItem = cItem {
-            chatPreviewLayout(itemStatusMark(cItem) + chatItemPreview(cItem), hasFilePreview)
+            let (t, hasSecrets) = chatItemPreview(cItem)
+            chatPreviewLayout(itemStatusMark(cItem) + t, hasFilePreview: hasFilePreview, hasSecrets: hasSecrets)
         } else {
             switch (chat.chatInfo) {
             case let .direct(contact):
@@ -301,10 +341,12 @@ struct ChatPreviewView: View {
                         chatPreviewInfoText("connecting…")
                     }
                 }
-            case let .group(groupInfo):
+            case let .group(groupInfo, _):
                 switch (groupInfo.membership.memberStatus) {
+                case .memRejected: chatPreviewInfoText("rejected")
                 case .memInvited: groupInvitationPreviewText(groupInfo)
                 case .memAccepted: chatPreviewInfoText("connecting…")
+                case .memPendingReview, .memPendingApproval: chatPreviewInfoText("reviewed by admins")
                 default: EmptyView()
                 }
             default: EmptyView()
@@ -313,7 +355,6 @@ struct ChatPreviewView: View {
     }
 
     @ViewBuilder func chatItemContentPreview(_ chat: Chat, _ ci: ChatItem) -> some View {
-        let linkClicksEnabled = privacyChatListOpenLinksDefault.get() != PrivacyChatListOpenLinksMode.no
         let mc = ci.content.msgContent
         switch mc {
         case let .link(_, preview):
@@ -335,28 +376,16 @@ struct ChatPreviewView: View {
                     .cornerRadius(8)
                 }
                 .onTapGesture {
-                    switch privacyChatListOpenLinksDefault.get() {
-                    case .yes:  UIApplication.shared.open(preview.uri)
-                    case .no: ItemsModel.shared.loadOpenChat(chat.id)
-                    case .ask: AlertManager.shared.showAlert(
-                        Alert(title: Text("Open web link?"),
-                              message: Text(preview.uri.absoluteString),
-                              primaryButton: .default(Text("Open chat"), action: { ItemsModel.shared.loadOpenChat(chat.id) }),
-                              secondaryButton: .default(Text("Open link"), action: { UIApplication.shared.open(preview.uri) })
-                             )
-                    )
-                    }
+                    openBrowserAlert(uri: preview.uri)
                 }
             }
         case let .image(_, image):
             smallContentPreview(size: dynamicMediaSize) {
                 CIImageView(chatItem: ci, preview: imageFromBase64(image), maxWidth: dynamicMediaSize, smallView: true, showFullScreenImage: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel())
             }
         case let .video(_,image, duration):
             smallContentPreview(size: dynamicMediaSize) {
                 CIVideoView(chatItem: ci, preview: imageFromBase64(image), duration: duration, maxWidth: dynamicMediaSize, videoWidth: nil, smallView: true, showFullscreenPlayer: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel())
             }
         case let .voice(_, duration):
             smallContentPreviewVoice(size: dynamicMediaSize) {
@@ -377,7 +406,7 @@ struct ChatPreviewView: View {
         : chatPreviewInfoText("you are invited to group")
     }
 
-    @ViewBuilder private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
+    private func chatPreviewInfoText(_ text: LocalizedStringKey) -> some View {
         Text(text)
             .frame(maxWidth: .infinity, minHeight: 44, maxHeight: 44, alignment: .topLeading)
             .padding([.leading, .trailing], 8)
@@ -411,7 +440,11 @@ struct ChatPreviewView: View {
             if progressByTimeout {
                 ProgressView()
             } else if chat.chatStats.reportsCount > 0 {
-                groupReportsIcon(size: size * 0.8)
+                flagIcon(size: size * 0.8, color: .red)
+            } else if chat.supportUnreadCount > 0 {
+                flagIcon(size: size * 0.8, color: theme.colors.primary)
+            } else if chat.chatInfo.groupInfo?.membership.memberPending ?? false {
+                flagIcon(size: size * 0.8, color: theme.colors.secondary)
             } else {
                 incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
             }
@@ -457,12 +490,12 @@ struct ChatPreviewView: View {
     }
 }
 
-@ViewBuilder func groupReportsIcon(size: CGFloat) -> some View {
+func flagIcon(size: CGFloat, color: Color) -> some View {
     Image(systemName: "flag")
         .resizable()
         .scaledToFit()
         .frame(width: size, height: size)
-        .foregroundColor(.red)
+        .foregroundColor(color)
 }
 
 func smallContentPreview(size: CGFloat, _ view: @escaping () -> some View) -> some View {

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

@@ -14,6 +14,7 @@ struct ContactConnectionInfo: View {
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @State var contactConnection: PendingContactConnection
+    @State private var showShortLink: Bool = true
     @State private var alert: CCInfoAlert?
     @State private var localAlias = ""
     @State private var showIncognitoSheet = false
@@ -61,14 +62,19 @@ struct ContactConnectionInfo: View {
                     }
 
                     if contactConnection.initiated,
-                       let connReqInv = contactConnection.connReqInv {
-                        SimpleXLinkQRCode(uri: simplexChatLink(connReqInv))
+                       let connLinkInv = contactConnection.connLinkInv {
+                        SimpleXCreatedLinkQRCode(link: connLinkInv, short: $showShortLink)
+                            .id("simplex-invitation-qrcode-\(connLinkInv.simplexChatUri(short: showShortLink))")
                         incognitoEnabled()
-                        shareLinkButton(connReqInv, theme.colors.secondary)
-                        oneTimeLinkLearnMoreButton(theme.colors.secondary)
+                        shareLinkButton(connLinkInv, short: showShortLink)
+                        oneTimeLinkLearnMoreButton()
                     } else {
                         incognitoEnabled()
-                        oneTimeLinkLearnMoreButton(theme.colors.secondary)
+                        oneTimeLinkLearnMoreButton()
+                    }
+                } header: {
+                    if let connLinkInv = contactConnection.connLinkInv, connLinkInv.connShortLink != nil {
+                        ToggleShortLinkHeader(text: Text(""), link: connLinkInv, short: $showShortLink)
                     }
                 } footer: {
                     sharedProfileInfo(contactConnection.incognito)
@@ -167,26 +173,22 @@ struct ContactConnectionInfo: View {
     }
 }
 
-private func shareLinkButton(_ connReqInvitation: String, _ secondaryColor: Color) -> some View {
+private func shareLinkButton(_ connLinkInvitation: CreatedConnLink, short: Bool) -> some View {
     Button {
-        showShareSheet(items: [simplexChatLink(connReqInvitation)])
+        showShareSheet(items: [connLinkInvitation.simplexChatUri(short: short)])
     } label: {
-        settingsRow("square.and.arrow.up", color: secondaryColor) {
-            Text("Share 1-time link")
-        }
+        Label("Share 1-time link", systemImage: "square.and.arrow.up")
     }
 }
 
-private func oneTimeLinkLearnMoreButton(_ secondaryColor: Color) -> some View {
+private func oneTimeLinkLearnMoreButton() -> some View {
     NavigationLink {
         AddContactLearnMore(showTitle: false)
             .navigationTitle("One-time invitation link")
             .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
     } label: {
-        settingsRow("info.circle", color: secondaryColor) {
-            Text("Learn more")
-        }
+        Label("Learn more", systemImage: "info.circle")
     }
 }
 

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

@@ -245,7 +245,7 @@ struct ServersSummaryView: View {
         }
     }
 
-    @ViewBuilder private func smpServersListView(
+    private func smpServersListView(
         _ servers: [SMPServerSummary],
         _ statsStartedAt: Date,
         _ header: LocalizedStringKey? = nil,
@@ -256,7 +256,7 @@ struct ServersSummaryView: View {
             ? serverAddress($0.smpServer) < serverAddress($1.smpServer)
             : $0.hasSubs && !$1.hasSubs
         }
-        Section {
+        return Section {
             ForEach(sortedServers) { server in
                 smpServerView(server, statsStartedAt)
             }
@@ -318,14 +318,14 @@ struct ServersSummaryView: View {
         return onionHosts == .require ? .indigo : .accentColor
     }
 
-    @ViewBuilder private func xftpServersListView(
+    private func xftpServersListView(
         _ servers: [XFTPServerSummary],
         _ statsStartedAt: Date,
         _ header: LocalizedStringKey? = nil,
         _ footer: LocalizedStringKey? = nil
     ) -> some View {
         let sortedServers = servers.sorted { serverAddress($0.xftpServer) < serverAddress($1.xftpServer) }
-        Section {
+        return Section {
             ForEach(sortedServers) { server in
                 xftpServerView(server, statsStartedAt)
             }
@@ -587,7 +587,7 @@ struct SMPStatsView: View {
         } header: {
             Text("Statistics")
         } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + textNewLine + Text("All data is kept private on your device.")
         }
     }
 }
@@ -703,7 +703,7 @@ struct XFTPStatsView: View {
         } header: {
             Text("Statistics")
         } footer: {
-            Text("Starting from \(localTimestamp(statsStartedAt)).") + Text("\n") + Text("All data is kept private on your device.")
+            Text("Starting from \(localTimestamp(statsStartedAt)).") + textNewLine + Text("All data is kept private on your device.")
         }
     }
 }

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

@@ -61,7 +61,7 @@ struct TagListView: View {
                         Button {
                             showAlert(
                                 NSLocalizedString("Delete list?", comment: "alert title"),
-                                message: NSLocalizedString("All chats will be removed from the list \(text), and the list deleted.", comment: "alert message"),
+                                message: String.localizedStringWithFormat(NSLocalizedString("All chats will be removed from the list %@, and the list deleted.", comment: "alert message"), text),
                                 actions: {[
                                     UIAlertAction(
                                         title: NSLocalizedString("Cancel", comment: "alert action"),
@@ -138,7 +138,7 @@ struct TagListView: View {
         }
     }
     
-    @ViewBuilder private func radioButton(selected: Bool) -> some View {
+    private func radioButton(selected: Bool) -> some View {
         Image(systemName: selected ? "checkmark.circle.fill" : "circle")
             .imageScale(.large)
             .foregroundStyle(selected ? Color.accentColor : Color(.tertiaryLabel))

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

@@ -124,7 +124,7 @@ struct UserPicker: View {
             ZStack(alignment: .topTrailing) {
                 ProfileImage(imageStr: u.user.image, size: size, color: Color(uiColor: .tertiarySystemGroupedBackground))
                 if (u.unreadCount > 0) {
-                    UnreadBadge(userInfo: u).offset(x: 4, y: -4)
+                    userUnreadBadge(u, theme: theme).offset(x: 4, y: -4)
                 }
             }
             .padding(.trailing, 6)
@@ -171,19 +171,27 @@ struct UserPicker: View {
     }
 }
 
+@inline(__always)
+func userUnreadBadge(_ userInfo: UserInfo, theme: AppTheme) -> some View {
+    UnreadBadge(
+        count: userInfo.unreadCount,
+        color: userInfo.user.showNtfs ? theme.colors.primary : theme.colors.secondary
+    )
+}
+
 struct UnreadBadge: View {
-    var userInfo: UserInfo
-    @EnvironmentObject var theme: AppTheme
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+    var count: Int
+    var color: Color
 
     var body: some View {
         let size = dynamicSize(userFont).chatInfoSize
-        unreadCountText(userInfo.unreadCount)
+        unreadCountText(count)
             .font(userFont <= .xxxLarge ? .caption : .caption2)
             .foregroundColor(.white)
             .padding(.horizontal, dynamicSize(userFont).unreadPadding)
             .frame(minWidth: size, minHeight: size)
-            .background(userInfo.user.showNtfs ? theme.colors.primary : theme.colors.secondary)
+            .background(color)
             .cornerRadius(dynamicSize(userFont).unreadCorner)
     }
 }

apps/ios/Shared/Views/Contacts/ContactListNavLink.swift

@@ -140,9 +140,9 @@ struct ContactListNavLink: View {
         }
     }
 
-    @ViewBuilder private func previewTitle(_ contact: Contact, titleColor: Color) -> some View {
+    private func previewTitle(_ contact: Contact, titleColor: Color) -> some View {
         let t = Text(chat.chatInfo.chatViewName).foregroundColor(titleColor)
-        (
+        return (
             contact.verified == true
             ? verifiedIcon + t
             : t
@@ -188,8 +188,7 @@ struct ContactListNavLink: View {
         Task {
             let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { alert = SomeAlert(alert: $0, id: "ContactListNavLink connectContactViaAddress") })
             if ok {
-                ItemsModel.shared.loadOpenChat(contact.id)
-                DispatchQueue.main.async {
+                ItemsModel.shared.loadOpenChat(contact.id) {
                     dismissAllSheets(animated: true) {
                         AlertManager.shared.showAlert(connReqSentAlert(.contact))
                     }

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

@@ -173,7 +173,7 @@ struct DatabaseEncryptionView: View {
             }
             return true
         } catch let error {
-            if case .chatCmdError(_, .errorDatabase(.errorExport(.errorNotADatabase))) = error as? ChatResponse {
+            if case .errorDatabase(.errorExport(.errorNotADatabase)) = error as? ChatError {
                 await operationEnded(.currentPassphraseError)
             } else {
                 await operationEnded(.error(title: "Error encrypting database", error: "\(responseError(error))"))

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

@@ -28,7 +28,7 @@ struct DatabaseErrorView: View {
         }
     }
 
-    @ViewBuilder private func databaseErrorView() -> some View {
+    private func databaseErrorView() -> some View {
         VStack(alignment: .center, spacing: 20) {
             switch status {
             case let .errorNotADatabase(dbFile):
@@ -141,7 +141,7 @@ struct DatabaseErrorView: View {
     }
 
     private func migrationsText(_ ms: [String]) -> some View {
-        (Text("Migrations:").font(.subheadline) + Text(verbatim: "\n") + Text(ms.joined(separator: "\n")).font(.caption))
+        (Text("Migrations:").font(.subheadline) + textNewLine + Text(ms.joined(separator: "\n")).font(.caption))
             .multilineTextAlignment(.center)
             .padding(.horizontal, 25)
     }

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

@@ -21,7 +21,7 @@ enum DatabaseAlert: Identifiable {
     case deleteLegacyDatabase
     case deleteFilesAndMedia
     case setChatItemTTL(ttl: ChatItemTTL)
-    case error(title: LocalizedStringKey, error: String = "")
+    case error(title: String, error: String = "")
 
     var id: String {
         switch self {
@@ -279,7 +279,7 @@ struct DatabaseView: View {
         case let .archiveExportedWithErrors(archivePath, errs):
             return Alert(
                 title: Text("Chat database exported"),
-                message: Text("You may save the exported archive.") + Text(verbatim: "\n") + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
+                message: Text("You may save the exported archive.") + textNewLine + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
                 dismissButton: .default(Text("Continue")) {
                     showShareSheet(items: [archivePath])
                 }
@@ -456,7 +456,7 @@ struct DatabaseView: View {
             }
         } catch let error {
             await MainActor.run {
-                alert = .error(title: "Error exporting chat database", error: responseError(error))
+                alert = .error(title: NSLocalizedString("Error exporting chat database", comment: "alert title"), error: responseError(error))
                 progressIndicator = false
             }
         }
@@ -492,10 +492,10 @@ struct DatabaseView: View {
                         return migration
                     }
                 } catch let error {
-                    await operationEnded(.error(title: "Error importing chat database", error: responseError(error)), progressIndicator, alert)
+                    await operationEnded(.error(title: NSLocalizedString("Error importing chat database", comment: "alert title"), error: responseError(error)), progressIndicator, alert)
                 }
             } catch let error {
-                await operationEnded(.error(title: "Error deleting chat database", error: responseError(error)), progressIndicator, alert)
+                await operationEnded(.error(title: NSLocalizedString("Error deleting chat database", comment: "alert title"), error: responseError(error)), progressIndicator, alert)
             }
         } else {
             showAlert("Error accessing database file")
@@ -513,7 +513,7 @@ struct DatabaseView: View {
             await DatabaseView.operationEnded(.chatDeleted, $progressIndicator, $alert)
             return true
         } catch let error {
-            await DatabaseView.operationEnded(.error(title: "Error deleting database", error: responseError(error)), $progressIndicator, $alert)
+            await DatabaseView.operationEnded(.error(title: NSLocalizedString("Error deleting database", comment: "alert title"), error: responseError(error)), $progressIndicator, $alert)
             return false
         }
     }
@@ -522,7 +522,7 @@ struct DatabaseView: View {
         if removeLegacyDatabaseAndFiles() {
             legacyDatabase = false
         } else {
-            alert = .error(title: "Error deleting old database")
+            alert = .error(title: NSLocalizedString("Error deleting old database", comment: "alert title"))
         }
     }
 
@@ -546,7 +546,7 @@ struct DatabaseView: View {
                 let (title, message) = chatDeletedAlertText()
                 showAlert(title, message: message, actions: { [okAlertActionWaiting] })
             } else if case let .error(title, error) = dbAlert {
-                showAlert("\(title)", message: error, actions: { [okAlertActionWaiting] })
+                showAlert(title, message: error, actions: { [okAlertActionWaiting] })
             } else {
                 alert.wrappedValue = dbAlert
                 cont.resume()
@@ -567,7 +567,7 @@ struct DatabaseView: View {
                 }
             } catch {
                 await MainActor.run {
-                    alert = .error(title: "Error changing setting", error: responseError(error))
+                    alert = .error(title: NSLocalizedString("Error changing setting", comment: "alert title"), error: responseError(error))
                     chatItemTTL = currentChatItemTTL
                     afterSetCiTTL()
                 }

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

@@ -33,7 +33,7 @@ extension View {
     func appSheet<Content>(
         isPresented: Binding<Bool>,
         onDismiss: (() -> Void)? = nil,
-        content: @escaping () -> Content
+        @ViewBuilder content: @escaping () -> Content
     ) -> some View where Content: View {
         sheet(isPresented: isPresented, onDismiss: onDismiss) {
             content().modifier(PrivacySensitive())
@@ -43,7 +43,7 @@ extension View {
     func appSheet<T, Content>(
         item: Binding<T?>,
         onDismiss: (() -> Void)? = nil,
-        content: @escaping (T) -> Content
+        @ViewBuilder content: @escaping (T) -> Content
     ) -> some View where T: Identifiable, Content: View {
         sheet(item: item, onDismiss: onDismiss) { it in
             content(it).modifier(PrivacySensitive())

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

@@ -9,6 +9,7 @@
 import SwiftUI
 
 extension View {
+    @inline(__always)
     @ViewBuilder func `if`<Content: View>(_ condition: Bool, transform: (Self) -> Content) -> some View {
         if condition {
             transform(self)
@@ -36,9 +37,9 @@ struct PrivacyBlur: ViewModifier {
                 .overlay {
                     if (blurred && enabled) {
                         Color.clear.contentShape(Rectangle())
-                            .onTapGesture {
+                            .simultaneousGesture(TapGesture().onEnded {
                                 blurred = false
-                            }
+                            })
                     }
                 }
                 .onReceive(NotificationCenter.default.publisher(for: .chatViewWillBeginScrolling)) { _ in

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

@@ -65,6 +65,9 @@ struct LocalAuthView: View {
                 // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                 m.chatId = nil
                 ItemsModel.shared.reversedChatItems = []
+                ItemsModel.shared.chatState.clear()
+                ChatModel.shared.secondaryIM?.reversedChatItems = []
+                ChatModel.shared.secondaryIM?.chatState.clear()
                 m.updateChats([])
                 m.users = []
                 _ = kcAppPassword.set(password)

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

@@ -28,7 +28,7 @@ struct PasscodeEntry: View {
         }
     }
 
-    @ViewBuilder private func passwordView() -> some View {
+    private func passwordView() -> some View {
         Text(
             password == ""
             ? " "

apps/ios/Shared/Views/Migration/MigrateFromDevice.swift

@@ -177,7 +177,7 @@ struct MigrateFromDevice: View {
             case let .archiveExportedWithErrors(archivePath, errs):
                 return Alert(
                     title: Text("Chat database exported"),
-                    message: Text("You may migrate the exported database.") + Text(verbatim: "\n") + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
+                    message: Text("You may migrate the exported database.") + textNewLine + Text("Some file(s) were not exported:") + Text(archiveErrorsText(errs)),
                     dismissButton: .default(Text("Continue")) {
                         Task { await uploadArchive(path: archivePath) }
                     }
@@ -520,15 +520,15 @@ struct MigrateFromDevice: View {
             chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
                 await MainActor.run {
                     switch msg {
-                    case let .sndFileProgressXFTP(_, _, fileTransferMeta, sentSize, totalSize):
+                    case let .result(.sndFileProgressXFTP(_, _, fileTransferMeta, sentSize, totalSize)):
                         if case let .uploadProgress(uploaded, total, _, _, _) = migrationState, uploaded != total {
                             migrationState = .uploadProgress(uploadedBytes: sentSize, totalBytes: totalSize, fileId: fileTransferMeta.fileId, archivePath: archivePath, ctrl: ctrl)
                         }
-                    case .sndFileRedirectStartXFTP:
+                    case .result(.sndFileRedirectStartXFTP):
                         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                             migrationState = .linkCreation
                         }
-                    case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
+                    case let .result(.sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs)):
                         let cfg = getNetCfg()
                         let proxy: NetworkProxy? = if cfg.socksProxy == nil {
                             nil
@@ -546,7 +546,7 @@ struct MigrateFromDevice: View {
                         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                             migrationState = .linkShown(fileId: fileTransferMeta.fileId, link: data.addToLink(link: rcvURIs[0]), archivePath: archivePath, ctrl: ctrl)
                         }
-                    case .sndFileError:
+                    case .result(.sndFileError):
                         alert = .error(title: "Upload failed", error: "Check your internet connection and try again")
                         migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
                     default:
@@ -691,7 +691,7 @@ private struct PassphraseConfirmationView: View {
                 migrationState = .uploadConfirmation
             }
         } catch let error {
-            if case .chatCmdError(_, .errorDatabase(.errorOpen(.errorNotADatabase))) = error as? ChatResponse {
+            if case .errorDatabase(.errorOpen(.errorNotADatabase)) = error as? ChatError {
                 showErrorOnMigrationIfNeeded(.errorNotADatabase(dbFile: ""), $alert)
             } else {
                 alert = .error(title: "Error", error: NSLocalizedString("Error verifying passphrase:", comment: "") + " " + String(responseError(error)))
@@ -733,11 +733,11 @@ func chatStoppedView() -> some View {
 private class MigrationChatReceiver {
     let ctrl: chat_ctrl
     let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
+    let processReceivedMsg: (APIResult<ChatEvent>) async -> Void
     private var receiveLoop: Task<Void, Never>?
     private var receiveMessages = true
 
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
+    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (APIResult<ChatEvent>) async -> Void) {
         self.ctrl = ctrl
         self.databaseUrl = databaseUrl
         self.processReceivedMsg = processReceivedMsg
@@ -752,9 +752,9 @@ private class MigrationChatReceiver {
 
     func receiveMsgLoop() async {
         // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
+        if let msg: APIResult<ChatEvent> = await chatRecvMsg(ctrl) {
             Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
+                await TerminalItems.shared.addResult(msg)
             }
             logger.debug("processReceivedMsg: \(msg.responseType)")
             await processReceivedMsg(msg)

apps/ios/Shared/Views/Migration/MigrateToDevice.swift

@@ -496,10 +496,10 @@ struct MigrateToDevice: View {
             chatReceiver = MigrationChatReceiver(ctrl: ctrl, databaseUrl: tempDatabaseUrl) { msg in
                 await MainActor.run {
                     switch msg {
-                    case let .rcvFileProgressXFTP(_, _, receivedSize, totalSize, rcvFileTransfer):
+                    case let .result(.rcvFileProgressXFTP(_, _, receivedSize, totalSize, rcvFileTransfer)):
                         migrationState = .downloadProgress(downloadedBytes: receivedSize, totalBytes: totalSize, fileId: rcvFileTransfer.fileId, link: link, archivePath: archivePath, ctrl: ctrl)
                         MigrationToDeviceState.save(.downloadProgress(link: link, archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
-                    case .rcvStandaloneFileComplete:
+                    case .result(.rcvStandaloneFileComplete):
                         DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                             // User closed the whole screen before new state was saved
                             if migrationState == nil {
@@ -509,10 +509,10 @@ struct MigrateToDevice: View {
                                 MigrationToDeviceState.save(.archiveImport(archiveName: URL(fileURLWithPath: archivePath).lastPathComponent))
                             }
                         }
-                    case .rcvFileError:
+                    case .result(.rcvFileError):
                         alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
                         migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                    case .chatError(_, .error(.noRcvFileUser)):
+                    case .error(.error(.noRcvFileUser)):
                         alert = .error(title: "Download failed", error: "File was deleted or link is invalid")
                         migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
                     default:
@@ -539,7 +539,7 @@ struct MigrateToDevice: View {
                     chatInitControllerRemovingDatabases()
                 } else if ChatModel.shared.chatRunning == true {
                     // cannot delete storage if chat is running
-                    try await apiStopChat()
+                    try await stopChatAsync()
                 }
                 try await apiDeleteStorage()
                 try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
@@ -623,7 +623,7 @@ struct MigrateToDevice: View {
             AlertManager.shared.showAlert(
                 Alert(
                     title: Text("Error migrating settings"),
-                    message: Text ("Some app settings were not migrated.") + Text("\n") + Text(responseError(error)))
+                    message: Text ("Some app settings were not migrated.") + textNewLine + Text(responseError(error)))
             )
         }
         hideView()
@@ -632,6 +632,8 @@ struct MigrateToDevice: View {
     private func hideView() {
         onboardingStageDefault.set(.onboardingComplete)
         m.onboardingStage = .onboardingComplete
+        m.migrationState = nil
+        MigrationToDeviceState.save(nil)
         dismiss()
     }
 
@@ -749,11 +751,11 @@ private func progressView() -> some View {
 private class MigrationChatReceiver {
     let ctrl: chat_ctrl
     let databaseUrl: URL
-    let processReceivedMsg: (ChatResponse) async -> Void
+    let processReceivedMsg: (APIResult<ChatEvent>) async -> Void
     private var receiveLoop: Task<Void, Never>?
     private var receiveMessages = true
 
-    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
+    init(ctrl: chat_ctrl, databaseUrl: URL, _ processReceivedMsg: @escaping (APIResult<ChatEvent>) async -> Void) {
         self.ctrl = ctrl
         self.databaseUrl = databaseUrl
         self.processReceivedMsg = processReceivedMsg
@@ -770,7 +772,7 @@ private class MigrationChatReceiver {
         // TODO use function that has timeout
         if let msg = await chatRecvMsg(ctrl) {
             Task {
-                await TerminalItems.shared.add(.resp(.now, msg))
+                await TerminalItems.shared.addResult(msg)
             }
             logger.debug("processReceivedMsg: \(msg.responseType)")
             await processReceivedMsg(msg)

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

@@ -23,7 +23,7 @@ struct AddGroupView: View {
     @State private var showTakePhoto = false
     @State private var chosenImage: UIImage? = nil
     @State private var showInvalidNameAlert = false
-    @State private var groupLink: String?
+    @State private var groupLink: CreatedConnLink?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
 
     var body: some View {
@@ -191,13 +191,9 @@ struct AddGroupView: View {
             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) }
-                    m.populateGroupMembersIndexes()
+                await m.loadGroupMembers(gInfo)
             }
-            }
-            let c = Chat(chatInfo: .group(groupInfo: gInfo), chatItems: [])
+            let c = Chat(chatInfo: .group(groupInfo: gInfo, groupChatScope: nil), chatItems: [])
             m.addChat(c)
             withAnimation {
                 groupInfo = gInfo

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

@@ -85,7 +85,7 @@ struct NewChatSheet: View {
         }
     }
 
-    @ViewBuilder private func viewBody(_ showArchive: Bool) -> some View {
+    private func viewBody(_ showArchive: Bool) -> some View {
         List {
             HStack {
                 ContactsListSearchBar(
@@ -125,7 +125,7 @@ struct NewChatSheet: View {
                     }
                     NavigationLink {
                         AddGroupView()
-                            .navigationTitle("Create secret group")
+                            .navigationTitle("Create group")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
                     } label: {
@@ -258,7 +258,7 @@ struct ContactsList: View {
         }
     }
     
-    @ViewBuilder private func noResultSection(text: String) -> some View {
+    private func noResultSection(text: String) -> some View {
         Section {
             Text(text)
                 .foregroundColor(theme.colors.secondary)

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

@@ -81,7 +81,8 @@ struct NewChatView: View {
     @State var selection: NewChatOption
     @State var showQRCodeScanner = false
     @State private var invitationUsed: Bool = false
-    @State private var connReqInvitation: String = ""
+    @State private var connLinkInvitation: CreatedConnLink = CreatedConnLink(connFullLink: "", connShortLink: nil)
+    @State private var showShortLink = true
     @State private var creatingConnReq = false
     @State var choosingProfile = false
     @State private var pastedLink: String = ""
@@ -174,11 +175,12 @@ struct NewChatView: View {
 
     private func prepareAndInviteView() -> some View {
         ZStack { // ZStack is needed for views to not make transitions between each other
-            if connReqInvitation != "" {
+            if connLinkInvitation.connFullLink != "" {
                 InviteView(
                     invitationUsed: $invitationUsed,
                     contactConnection: $contactConnection,
-                    connReqInvitation: $connReqInvitation,
+                    connLinkInvitation: $connLinkInvitation,
+                    showShortLink: $showShortLink,
                     choosingProfile: $choosingProfile
                 )
             } else if creatingConnReq {
@@ -190,16 +192,16 @@ struct NewChatView: View {
     }
 
     private func createInvitation() {
-        if connReqInvitation == "" && contactConnection == nil && !creatingConnReq {
+        if connLinkInvitation.connFullLink == "" && 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 {
+                if let (connLink, pcc) = r {
                     await MainActor.run {
                         m.updateContactConnection(pcc)
                         m.showingInvitation = ShowingInvitation(pcc: pcc, connChatUsed: false)
-                        connReqInvitation = connReq
+                        connLinkInvitation = connLink
                         contactConnection = pcc
                     }
                 } else {
@@ -243,7 +245,8 @@ private struct InviteView: View {
     @EnvironmentObject var theme: AppTheme
     @Binding var invitationUsed: Bool
     @Binding var contactConnection: PendingContactConnection?
-    @Binding var connReqInvitation: String
+    @Binding var connLinkInvitation: CreatedConnLink
+    @Binding var showShortLink: Bool
     @Binding var choosingProfile: Bool
 
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
@@ -261,7 +264,7 @@ private struct InviteView: View {
                     NavigationLink {
                         ActiveProfilePicker(
                             contactConnection: $contactConnection,
-                            connReqInvitation: $connReqInvitation,
+                            connLinkInvitation: $connLinkInvitation,
                             incognitoEnabled: $incognitoDefault,
                             choosingProfile: $choosingProfile,
                             selectedProfile: selectedProfile
@@ -296,7 +299,7 @@ private struct InviteView: View {
 
     private func shareLinkView() -> some View {
         HStack {
-            let link = simplexChatLink(connReqInvitation)
+            let link = connLinkInvitation.simplexChatUri(short: showShortLink)
             linkTextView(link)
             Button {
                 showShareSheet(items: [link])
@@ -310,9 +313,9 @@ private struct InviteView: View {
     }
 
     private func qrCodeView() -> some View {
-        Section(header: Text("Or show this code").foregroundColor(theme.colors.secondary)) {
-            SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
-                .id("simplex-qrcode-view-for-\(connReqInvitation)")
+        Section {
+            SimpleXCreatedLinkQRCode(link: connLinkInvitation, short: $showShortLink, onShare: setInvitationUsed)
+                .id("simplex-qrcode-view-for-\(connLinkInvitation.simplexChatUri(short: showShortLink))")
                 .padding()
                 .background(
                     RoundedRectangle(cornerRadius: 12, style: .continuous)
@@ -322,6 +325,8 @@ private struct InviteView: View {
                 .listRowBackground(Color.clear)
                 .listRowSeparator(.hidden)
                 .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+        } header: {
+            ToggleShortLinkHeader(text: Text("Or show this code"), link: connLinkInvitation, short: $showShortLink)
         }
     }
 
@@ -343,7 +348,7 @@ private struct ActiveProfilePicker: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Binding var contactConnection: PendingContactConnection?
-    @Binding var connReqInvitation: String
+    @Binding var connLinkInvitation: CreatedConnLink
     @Binding var incognitoEnabled: Bool
     @Binding var choosingProfile: Bool
     @State private var alert: SomeAlert?
@@ -415,12 +420,11 @@ private struct ActiveProfilePicker: View {
                 }
                 Task {
                     do {
-                        if let contactConn = contactConnection,
-                           let conn = try await apiChangeConnectionUser(connId: contactConn.pccConnId, userId: profile.userId) {
-                            
+                        if let contactConn = contactConnection {
+                            let conn = try await apiChangeConnectionUser(connId: contactConn.pccConnId, userId: profile.userId)
                             await MainActor.run {
                                 contactConnection = conn
-                                connReqInvitation = conn.connReqInv ?? ""
+                                connLinkInvitation = conn.connLinkInv ?? CreatedConnLink(connFullLink: "", connShortLink: nil)
                                 incognitoEnabled = false
                                 chatModel.updateContactConnection(conn)
                             }
@@ -502,7 +506,7 @@ private struct ActiveProfilePicker: View {
         }
     }
     
-    @ViewBuilder private func profilerPickerUserOption(_ user: User) -> some View {
+    private func profilerPickerUserOption(_ user: User) -> some View {
         Button {
             if selectedProfile == user && incognitoEnabled {
                 incognitoEnabled = false
@@ -836,23 +840,25 @@ func sharedProfileInfo(_ incognito: Bool) -> Text {
 }
 
 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?)
+    case ownInvitationLinkConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case invitationLinkConnecting(connectionLink: CreatedConnLink)
+    case ownContactAddressConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case contactAddressConnectingConfirmReconnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConfirmConnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnectingConfirmReconnect(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, incognito: Bool)
+    case groupLinkConnecting(connectionLink: CreatedConnLink, groupInfo: GroupInfo?)
+    case error(shortOrFullLink: String, alert: Alert)
 
     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)"
+        case let .ownInvitationLinkConfirmConnect(connectionLink, _, _): return "ownInvitationLinkConfirmConnect \(connectionLink.connFullLink)"
+        case let .invitationLinkConnecting(connectionLink): return "invitationLinkConnecting \(connectionLink.connFullLink)"
+        case let .ownContactAddressConfirmConnect(connectionLink, _, _): return "ownContactAddressConfirmConnect \(connectionLink.connFullLink)"
+        case let .contactAddressConnectingConfirmReconnect(connectionLink, _, _): return "contactAddressConnectingConfirmReconnect \(connectionLink.connFullLink)"
+        case let .groupLinkConfirmConnect(connectionLink, _, _): return "groupLinkConfirmConnect \(connectionLink.connFullLink)"
+        case let .groupLinkConnectingConfirmReconnect(connectionLink, _, _): return "groupLinkConnectingConfirmReconnect \(connectionLink.connFullLink)"
+        case let .groupLinkConnecting(connectionLink, _): return "groupLinkConnecting \(connectionLink.connFullLink)"
+        case let .error(shortOrFullLink, alert): return "error \(shortOrFullLink)"
         }
     }
 }
@@ -935,21 +941,22 @@ func planAndConnectAlert(_ alert: PlanAndConnectAlert, dismiss: Bool, cleanup: (
                 dismissButton: .default(Text("OK")) { cleanup?() }
             )
         }
+    case let .error(_, alert): return alert
     }
 }
 
 enum PlanAndConnectActionSheet: Identifiable {
-    case askCurrentOrIncognitoProfile(connectionLink: String, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
-    case askCurrentOrIncognitoProfileDestructive(connectionLink: String, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfile(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan?, title: LocalizedStringKey)
+    case askCurrentOrIncognitoProfileDestructive(connectionLink: CreatedConnLink, connectionPlan: ConnectionPlan, title: LocalizedStringKey)
     case askCurrentOrIncognitoProfileConnectContactViaAddress(contact: Contact)
-    case ownGroupLinkConfirmConnect(connectionLink: String, connectionPlan: ConnectionPlan, incognito: Bool?, groupInfo: GroupInfo)
+    case ownGroupLinkConfirmConnect(connectionLink: CreatedConnLink, 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 .askCurrentOrIncognitoProfile(connectionLink, _, _): return "askCurrentOrIncognitoProfile \(connectionLink.connFullLink)"
+        case let .askCurrentOrIncognitoProfileDestructive(connectionLink, _, _): return "askCurrentOrIncognitoProfileDestructive \(connectionLink.connFullLink)"
         case let .askCurrentOrIncognitoProfileConnectContactViaAddress(contact): return "askCurrentOrIncognitoProfileConnectContactViaAddress \(contact.contactId)"
-        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink)"
+        case let .ownGroupLinkConfirmConnect(connectionLink, _, _, _): return "ownGroupLinkConfirmConnect \(connectionLink.connFullLink)"
         }
     }
 }
@@ -1008,7 +1015,7 @@ func planAndConnectActionSheet(_ sheet: PlanAndConnectActionSheet, dismiss: Bool
 }
 
 func planAndConnect(
-    _ connectionLink: String,
+    _ shortOrFullLink: String,
     showAlert: @escaping (PlanAndConnectAlert) -> Void,
     showActionSheet: @escaping (PlanAndConnectActionSheet) -> Void,
     dismiss: Bool,
@@ -1018,8 +1025,8 @@ func planAndConnect(
     filterKnownGroup: ((GroupInfo) -> Void)? = nil
 ) {
     Task {
-        do {
-            let connectionPlan = try await apiConnectPlan(connReq: connectionLink)
+        let (result, alert) = await apiConnectPlan(connLink: shortOrFullLink)
+        if let (connectionLink, connectionPlan) = result {
             switch connectionPlan {
             case let .invitationLink(ilp):
                 switch ilp {
@@ -1028,17 +1035,22 @@ func planAndConnect(
                     if let incognito = incognito {
                         connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
                     } else {
+                        await MainActor.run {
                             showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via one-time link"))
                         }
+                    }
                 case .ownLink:
                     logger.debug("planAndConnect, .invitationLink, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         if let contact = contact_ {
                             if let f = filterKnownContact {
                                 f(contact)
@@ -1048,14 +1060,17 @@ func planAndConnect(
                         } else {
                             showAlert(.invitationLinkConnecting(connectionLink: connectionLink))
                         }
+                    }
                 case let .known(contact):
                     logger.debug("planAndConnect, .invitationLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    await MainActor.run {
                         if let f = filterKnownContact {
                             f(contact)
                         } else {
                             openKnownContact(contact, dismiss: dismiss) { AlertManager.shared.showAlert(contactAlreadyExistsAlert(contact)) }
                         }
                     }
+                }
             case let .contactAddress(cap):
                 switch cap {
                 case .ok:
@@ -1063,70 +1078,91 @@ func planAndConnect(
                     if let incognito = incognito {
                         connectViaLink(connectionLink, connectionPlan: connectionPlan, dismiss: dismiss, incognito: incognito, cleanup: cleanup)
                     } else {
+                        await MainActor.run {
                             showActionSheet(.askCurrentOrIncognitoProfile(connectionLink: connectionLink, connectionPlan: connectionPlan, title: "Connect via contact address"))
                         }
+                    }
                 case .ownLink:
                     logger.debug("planAndConnect, .contactAddress, .ownLink, incognito=\(incognito?.description ?? "nil")")
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         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 {
+                        await MainActor.run {
                             showActionSheet(.askCurrentOrIncognitoProfileConnectContactViaAddress(contact: contact))
                         }
                     }
+                }
             case let .groupLink(glp):
                 switch glp {
                 case .ok:
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         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")")
+                    await MainActor.run {
                         showAlert(.groupLinkConnecting(connectionLink: connectionLink, groupInfo: groupInfo_))
+                    }
                 case let .known(groupInfo):
                     logger.debug("planAndConnect, .groupLink, .known, incognito=\(incognito?.description ?? "nil")")
+                    await MainActor.run {
                         if let f = filterKnownGroup {
                             f(groupInfo)
                         } else {
@@ -1134,14 +1170,19 @@ func planAndConnect(
                         }
                     }
                 }
-        } catch {
-            logger.debug("planAndConnect, plan error")
+            case let .error(chatError):
+                logger.debug("planAndConnect, .error \(chatErrorString(chatError))")
                 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"))
                 }
             }
+        } else if let alert {
+            await MainActor.run {
+                showAlert(.error(shortOrFullLink: shortOrFullLink, alert: alert))
+            }
+        }
     }
 }
 
@@ -1161,22 +1202,22 @@ private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incogn
 }
 
 private func connectViaLink(
-    _ connectionLink: String,
+    _ connectionLink: CreatedConnLink,
     connectionPlan: ConnectionPlan?,
     dismiss: Bool,
     incognito: Bool,
     cleanup: (() -> Void)?
 ) {
     Task {
-        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connReq: connectionLink) {
+        if let (connReqType, pcc) = await apiConnect(incognito: incognito, connLink: connectionLink) {
             await MainActor.run {
                 ChatModel.shared.updateContactConnection(pcc)
             }
             let crt: ConnReqType
-            if let plan = connectionPlan {
-                crt = planToConnReqType(plan)
+            crt = if let plan = connectionPlan {
+                planToConnReqType(plan) ?? connReqType
             } else {
-                crt = connReqType
+                connReqType
             }
             DispatchQueue.main.async {
                 if dismiss {
@@ -1199,42 +1240,38 @@ private func connectViaLink(
 }
 
 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) {
-                        ItemsModel.shared.loadOpenChat(c.id)
+                ItemsModel.shared.loadOpenChat(c.id) {
                     showAlreadyExistsAlert?()
                 }
+            }
         } else {
-                    ItemsModel.shared.loadOpenChat(c.id)
+            ItemsModel.shared.loadOpenChat(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) {
-                        ItemsModel.shared.loadOpenChat(g.id)
+                ItemsModel.shared.loadOpenChat(g.id) {
                     showAlreadyExistsAlert?()
                 }
+            }
         } else {
-                    ItemsModel.shared.loadOpenChat(g.id)
+            ItemsModel.shared.loadOpenChat(g.id) {
                 showAlreadyExistsAlert?()
             }
         }
     }
 }
-}
 
 func contactAlreadyConnectingAlert(_ contact: Contact) -> Alert {
     mkAlert(
@@ -1269,11 +1306,12 @@ enum ConnReqType: Equatable {
     }
 }
 
-private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType {
+private func planToConnReqType(_ connectionPlan: ConnectionPlan) -> ConnReqType? {
     switch connectionPlan {
-    case .invitationLink: return .invitation
-    case .contactAddress: return .contact
-    case .groupLink: return .groupLink
+    case .invitationLink: .invitation
+    case .contactAddress: .contact
+    case .groupLink: .groupLink
+    case .error: nil
     }
 }
 

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

@@ -8,18 +8,30 @@
 
 import SwiftUI
 import CoreImage.CIFilterBuiltins
+import SimpleXChat
 
 struct MutableQRCode: View {
     @Binding var uri: String
+    var small: Bool = false
     var withLogo: Bool = true
     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)
+        QRCode(uri: uri, small: small, withLogo: withLogo, tintColor: tintColor)
             .id("simplex-qrcode-view-for-\(uri)")
     }
 }
 
+struct SimpleXCreatedLinkQRCode: View {
+    let link: CreatedConnLink
+    @Binding var short: Bool
+    var onShare: (() -> Void)? = nil
+
+    var body: some View {
+        QRCode(uri: link.simplexChatUri(short: short), small: short && link.connShortLink != nil, onShare: onShare)
+    }
+}
+
 struct SimpleXLinkQRCode: View {
     let uri: String
     var withLogo: Bool = true
@@ -27,56 +39,57 @@ struct SimpleXLinkQRCode: View {
     var onShare: (() -> Void)? = nil
 
     var body: some View {
-        QRCode(uri: simplexChatLink(uri), withLogo: withLogo, tintColor: tintColor, onShare: onShare)
+        QRCode(uri: simplexChatLink(uri), small: uri.count < 200, withLogo: withLogo, tintColor: tintColor, onShare: onShare)
     }
 }
 
-func simplexChatLink(_ uri: String) -> String {
-    uri.starts(with: "simplex:/")
-    ? uri.replacingOccurrences(of: "simplex:/", with: "https://simplex.chat/")
-    : uri
-}
+private let smallQRRatio: CGFloat = 0.63
 
 struct QRCode: View {
     let uri: String
+    var small: Bool = false
     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 width: CGFloat = .infinity
 
     var body: some View {
         ZStack {
             if let image = image {
-                qrCodeImage(image)
-                GeometryReader { geo in
+                qrCodeImage(image).frame(width: width, height: width)
+                GeometryReader { g in
+                    let w = g.size.width * (small ? smallQRRatio : 1)
+                    let l = w * (small ? 0.195 : 0.16)
+                    let m = w * 0.005
                     ZStack {
                         if withLogo {
-                            let w = geo.size.width
                             Image("icon-light")
                             .resizable()
                             .scaledToFit()
-                            .frame(width: w * 0.16, height: w * 0.16)
-                            .frame(width: w * 0.165, height: w * 0.165)
+                            .frame(width: l, height: l)
+                            .frame(width: l + m, height: l + m)
                             .background(.white)
                             .clipShape(Circle())
                         }
                     }
                     .onAppear {
+                        width = w
                         makeScreenshotFunc = {
                             let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                            showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                            showShareSheet(items: [makeScreenshot(g.frame(in: .local).origin, size)])
                             onShare?()
                         }
                     }
-                    .frame(width: geo.size.width, height: geo.size.height)
+                    .frame(width: g.size.width, height: g.size.height)
                 }
             } else {
-                Color.clear.aspectRatio(1, contentMode: .fit)
+                Color.clear.aspectRatio(small ? 1 / smallQRRatio : 1, contentMode: .fit)
             }
         }
         .onTapGesture(perform: makeScreenshotFunc)
-        .task { image = await generateImage(uri, tintColor: tintColor) }
+        .task { image = await generateImage(uri, tintColor: tintColor, errorLevel: small ? "M" : "L") }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
@@ -89,10 +102,11 @@ private func qrCodeImage(_ image: UIImage) -> some View {
         .textSelection(.enabled)
 }
 
-private func generateImage(_ uri: String, tintColor: UIColor) async -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor, errorLevel: String) async -> UIImage? {
     let context = CIContext()
     let filter = CIFilter.qrCodeGenerator()
     filter.message = Data(uri.utf8)
+    filter.correctionLevel = errorLevel
     if let outputImage = filter.outputImage,
        let cgImage = context.createCGImage(outputImage, from: outputImage.extent) {
         return UIImage(cgImage: cgImage).replaceColor(UIColor.black, tintColor)

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

@@ -43,26 +43,23 @@ struct OnboardingButtonStyle: ButtonStyle {
     }
 }
 
-private enum ChooseServerOperatorsSheet: Identifiable {
-    case showInfo
+private enum OnboardingConditionsViewSheet: Identifiable {
     case showConditions
+    case configureOperators
 
     var id: String {
         switch self {
-        case .showInfo: return "showInfo"
         case .showConditions: return "showConditions"
+        case .configureOperators: return "configureOperators"
         }
     }
 }
 
-struct ChooseServerOperators: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
+struct OnboardingConditionsView: View {
     @EnvironmentObject var theme: AppTheme
-    var onboarding: Bool
     @State private var serverOperators: [ServerOperator] = []
     @State private var selectedOperatorIds = Set<Int64>()
-    @State private var sheetItem: ChooseServerOperatorsSheet? = nil
+    @State private var sheetItem: OnboardingConditionsViewSheet? = nil
     @State private var notificationsModeNavLinkActive = false
     @State private var justOpened = true
 
@@ -70,83 +67,47 @@ struct ChooseServerOperators: View {
 
     var body: some View {
         GeometryReader { g in
-            ScrollView {
+            let v = ScrollView {
                 VStack(alignment: .leading, spacing: 20) {
-                    let title = Text("Server operators")
+                    Text("Conditions of use")
                         .font(.largeTitle)
                         .bold()
                         .frame(maxWidth: .infinity, alignment: .center)
-                    
-                    if onboarding {
-                        title.padding(.top, 25)
-                    } else {
-                        title
-                    }
-
-                    infoText()
-                        .frame(maxWidth: .infinity, alignment: .center)
+                        .padding(.top, 25)
 
                     Spacer()
 
-                    ForEach(serverOperators) { srvOperator in
-                        operatorCheckView(srvOperator)
-                    }
-                    VStack {
-                        Text("SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.").padding(.bottom, 8)
-                        Text("You can configure servers via settings.")
-                    }
-                    .font(.footnote)
-                    .multilineTextAlignment(.center)
-                    .frame(maxWidth: .infinity, alignment: .center)
-                    .padding(.horizontal, 16)
+                    VStack(alignment: .leading, spacing: 20) {
+                        Text("Private chats, groups and your contacts are not accessible to server operators.")
+                            .lineSpacing(2)
+                            .frame(maxWidth: .infinity, alignment: .leading)
+                        Text("""
+                        By using SimpleX Chat you agree to:
+                        - send only legal content in public groups.
+                        - respect other users – no spam.
+                        """)
+                        .lineSpacing(2)
+                        .frame(maxWidth: .infinity, alignment: .leading)
 
-                    Spacer()
-                    
-                    let reviewForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-                    let canReviewLater = reviewForOperators.allSatisfy { $0.conditionsAcceptance.usageAllowed }
-                    let currEnabledOperatorIds = Set(serverOperators.filter { $0.enabled }.map { $0.operatorId })
-                    
-                    VStack(spacing: 8) {
-                        if !reviewForOperators.isEmpty {
-                            reviewConditionsButton()
-                        } else if selectedOperatorIds != currEnabledOperatorIds && !selectedOperatorIds.isEmpty {
-                            setOperatorsButton()
-                        } else {
-                            continueButton()
-                        }
-                        if onboarding {
-                            Group {
-                                if reviewForOperators.isEmpty {
-                                    Button("Conditions of use") {
+                        Button("Privacy policy and conditions of use.") {
                             sheetItem = .showConditions
                         }
-                                } else {
-                                    Text("Conditions of use")
-                                        .foregroundColor(.clear)
+                        .frame(maxWidth: .infinity, alignment: .leading)
                     }
+                    .padding(.horizontal, 4)
+
+                    Spacer()
+
+                    VStack(spacing: 12) {
+                        acceptConditionsButton()
+
+                        Button("Configure server operators") {
+                            sheetItem = .configureOperators
                         }
-                            .font(.system(size: 17, weight: .semibold))
                         .frame(minHeight: 40)
                     }
                 }
-                    
-                    if !onboarding && !reviewForOperators.isEmpty {
-                        VStack(spacing: 8) {
-                            reviewLaterButton()
-                            (
-                                Text("Conditions will be accepted for enabled operators after 30 days.")
-                                + textSpace
-                                + Text("You can configure operators in Network & servers settings.")
-                            )
-                            .multilineTextAlignment(.center)
-                            .font(.footnote)
-                            .padding(.horizontal, 32)
-                        }
-                        .frame(maxWidth: .infinity)
-                        .disabled(!canReviewLater)
-                        .padding(.bottom)
-                    }
-                }
+                .padding(25)
                 .frame(minHeight: g.size.height)
             }
             .onAppear {
@@ -158,130 +119,28 @@ struct ChooseServerOperators: View {
             }
             .sheet(item: $sheetItem) { item in
                 switch item {
-                case .showInfo:
-                    ChooseServerOperatorsInfoView()
                 case .showConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
+                    SimpleConditionsView()
                         .modifier(ThemedBackground(grouped: true))
+                case .configureOperators:
+                    ChooseServerOperators(serverOperators: serverOperators, selectedOperatorIds: $selectedOperatorIds)
+                        .modifier(ThemedBackground())
                 }
             }
             .frame(maxHeight: .infinity, alignment: .top)
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
         }
         .frame(maxHeight: .infinity, alignment: .top)
-        .padding(onboarding ? 25 : 16)
-    }
-
-    private func infoText() -> some View {
-        Button {
-            sheetItem = .showInfo
-        } label: {
-            Label("How it helps privacy", systemImage: "info.circle")
-                .font(.headline)
-        }
-    }
-
-    @ViewBuilder private func operatorCheckView(_ serverOperator: ServerOperator) -> some View {
-        let checked = selectedOperatorIds.contains(serverOperator.operatorId)
-        let icon = checked ? "checkmark.circle.fill" : "circle"
-        let iconColor = checked ? theme.colors.primary : Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
-        HStack(spacing: 10) {
-            Image(serverOperator.largeLogo(colorScheme))
-                .resizable()
-                .scaledToFit()
-                .frame(height: 48)
-            Spacer()
-            Image(systemName: icon)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 26, height: 26)
-                .foregroundColor(iconColor)
-        }
-        .background(theme.colors.background)
-        .padding()
-        .clipShape(RoundedRectangle(cornerRadius: 18))
-        .overlay(
-            RoundedRectangle(cornerRadius: 18)
-                .stroke(Color(uiColor: .secondarySystemFill), lineWidth: 2)
-        )
-        .padding(.horizontal, 2)
-        .onTapGesture {
-            if checked {
-                selectedOperatorIds.remove(serverOperator.operatorId)
-            } else {
-                selectedOperatorIds.insert(serverOperator.operatorId)
-            }
-        }
-    }
-
-    private func reviewConditionsButton() -> some View {
-        NavigationLink("Review conditions") {
-            reviewConditionsView()
-                .navigationTitle("Conditions of use")
-                .navigationBarTitleDisplayMode(.large)
-                .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
-                .modifier(ThemedBackground(grouped: true))
-        }
-        .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-        .disabled(selectedOperatorIds.isEmpty)
-    }
-
-    private func setOperatorsButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                Task {
-                    if let enabledOperators = enabledOperators(serverOperators) {
-                        let r = try await setServerOperators(operators: enabledOperators)
-                        await MainActor.run {
-                            ChatModel.shared.conditions = r
-                            continueToNextStep()
-                        }
-                    } else {
-                        await MainActor.run {
-                            continueToNextStep()
-                        }
-                    }
-                }
-            } label: {
-                Text("Update")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-        }
-    }
-
-    private func continueButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                continueToNextStep()
-            } label: {
-                Text("Continue")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-        }
-    }
-
-    private func reviewLaterButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                continueToNextStep()
-            } label: {
-                Text("Review later")
-            }
-            .buttonStyle(.borderless)
-        }
+        .navigationBarHidden(true) // necessary on iOS 15
     }
 
     private func continueToNextStep() {
-        if onboarding {
         onboardingStageDefault.set(.step4_SetNotificationsMode)
         notificationsModeNavLinkActive = true
-        } else {
-            dismiss()
-        }
     }
 
     func notificationsModeNavLinkButton(_ button: @escaping (() -> some View)) -> some View {
@@ -304,25 +163,6 @@ struct ChooseServerOperators: View {
             .modifier(ThemedBackground())
     }
 
-    @ViewBuilder private func reviewConditionsView() -> some View {
-        let operatorsWithConditionsAccepted = ChatModel.shared.conditions.serverOperators.filter { $0.conditionsAcceptance.conditionsAccepted }
-        let acceptForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-        VStack(alignment: .leading, spacing: 20) {
-            if !operatorsWithConditionsAccepted.isEmpty {
-                Text("Conditions are already accepted for these operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
-                Text("The same conditions will apply to operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
-            } else {
-                Text("Conditions will be accepted for operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
-            }
-            ConditionsTextView()
-                .frame(maxHeight: .infinity)
-            acceptConditionsButton()
-                .padding(.bottom)
-                .padding(.bottom)
-        }
-        .padding(.horizontal, 25)
-    }
-
     private func acceptConditionsButton() -> some View {
         notificationsModeNavLinkButton {
             Button {
@@ -356,9 +196,10 @@ struct ChooseServerOperators: View {
                     }
                 }
             } label: {
-                Text("Accept conditions")
+                Text("Accept")
             }
-            .buttonStyle(OnboardingButtonStyle())
+            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
+            .disabled(selectedOperatorIds.isEmpty)
         }
     }
 
@@ -393,6 +234,126 @@ struct ChooseServerOperators: View {
     }
 }
 
+private enum ChooseServerOperatorsSheet: Identifiable {
+    case showInfo
+
+    var id: String {
+        switch self {
+        case .showInfo: return "showInfo"
+        }
+    }
+}
+
+struct ChooseServerOperators: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @Environment(\.colorScheme) var colorScheme: ColorScheme
+    @EnvironmentObject var theme: AppTheme
+    var serverOperators: [ServerOperator]
+    @Binding var selectedOperatorIds: Set<Int64>
+    @State private var sheetItem: ChooseServerOperatorsSheet? = nil
+
+    var body: some View {
+        GeometryReader { g in
+            ScrollView {
+                VStack(alignment: .leading, spacing: 20) {
+                    Text("Server operators")
+                        .font(.largeTitle)
+                        .bold()
+                        .frame(maxWidth: .infinity, alignment: .center)
+                        .padding(.top, 25)
+
+                    infoText()
+                        .frame(maxWidth: .infinity, alignment: .center)
+
+                    Spacer()
+                    
+                    ForEach(serverOperators) { srvOperator in
+                        operatorCheckView(srvOperator)
+                    }
+                    VStack {
+                        Text("SimpleX Chat and Flux made an agreement to include Flux-operated servers into the app.").padding(.bottom, 8)
+                        Text("You can configure servers via settings.")
+                    }
+                    .font(.footnote)
+                    .multilineTextAlignment(.center)
+                    .frame(maxWidth: .infinity, alignment: .center)
+                    .padding(.horizontal, 16)
+                    
+                    Spacer()
+
+                    VStack(spacing: 8) {
+                        setOperatorsButton()
+                        onboardingButtonPlaceholder()
+                    }
+                }
+                .frame(minHeight: g.size.height)
+            }
+            .sheet(item: $sheetItem) { item in
+                switch item {
+                case .showInfo:
+                    ChooseServerOperatorsInfoView()
+                }
+            }
+            .frame(maxHeight: .infinity, alignment: .top)
+        }
+        .frame(maxHeight: .infinity, alignment: .top)
+        .padding(25)
+        .interactiveDismissDisabled(selectedOperatorIds.isEmpty)
+    }
+
+    private func infoText() -> some View {
+        Button {
+            sheetItem = .showInfo
+        } label: {
+            Label("How it helps privacy", systemImage: "info.circle")
+                .font(.headline)
+        }
+    }
+
+    private func operatorCheckView(_ serverOperator: ServerOperator) -> some View {
+        let checked = selectedOperatorIds.contains(serverOperator.operatorId)
+        let icon = checked ? "checkmark.circle.fill" : "circle"
+        let iconColor = checked ? theme.colors.primary : Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
+        return HStack(spacing: 10) {
+            Image(serverOperator.largeLogo(colorScheme))
+                .resizable()
+                .scaledToFit()
+                .frame(height: 48)
+            Spacer()
+            Image(systemName: icon)
+                .resizable()
+                .scaledToFit()
+                .frame(width: 26, height: 26)
+                .foregroundColor(iconColor)
+        }
+        .background(theme.colors.background)
+        .padding()
+        .clipShape(RoundedRectangle(cornerRadius: 18))
+        .overlay(
+            RoundedRectangle(cornerRadius: 18)
+                .stroke(Color(uiColor: .secondarySystemFill), lineWidth: 2)
+        )
+        .padding(.horizontal, 2)
+        .onTapGesture {
+            if checked {
+                selectedOperatorIds.remove(serverOperator.operatorId)
+            } else {
+                selectedOperatorIds.insert(serverOperator.operatorId)
+            }
+        }
+    }
+
+    private func setOperatorsButton() -> some View {
+        Button {
+            dismiss()
+        } label: {
+            Text("OK")
+        }
+        .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
+        .disabled(selectedOperatorIds.isEmpty)
+    }
+}
+
 let operatorsPostLink = URL(string: "https://simplex.chat/blog/20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.html")!
 
 struct ChooseServerOperatorsInfoView: View {
@@ -447,5 +408,5 @@ struct ChooseServerOperatorsInfoView: View {
 }
 
 #Preview {
-    ChooseServerOperators(onboarding: true)
+    OnboardingConditionsView()
 }

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

@@ -62,8 +62,7 @@ struct CreateProfile: View {
                 .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.")
+                    Text("Your profile is stored on your device and only shared with your contacts.")
                 }
                 .foregroundColor(theme.colors.secondary)
                 .frame(maxWidth: .infinity, alignment: .leading)
@@ -118,25 +117,22 @@ struct CreateFirstProfile: View {
     @State private var nextStepNavLinkActive = false
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            VStack(alignment: .center, spacing: 20) {
-                Text("Create your profile")
+        let v = VStack(alignment: .leading, spacing: 16) {
+            VStack(alignment: .center, spacing: 16) {
+                Text("Create profile")
                     .font(.largeTitle)
                     .bold()
                     .multilineTextAlignment(.center)
 
-                Text("Your profile, contacts and delivered messages are stored on your device.")
-                    .font(.callout)
-                    .foregroundColor(theme.colors.secondary)
-                    .multilineTextAlignment(.center)
-                
-                Text("The profile is only shared with your contacts.")
+                Text("Your profile is stored on your device and only shared with your contacts.")
                     .font(.callout)
                     .foregroundColor(theme.colors.secondary)
                     .multilineTextAlignment(.center)
             }
+            .fixedSize(horizontal: false, vertical: true)
             .frame(maxWidth: .infinity) // Ensures it takes up the full width
             .padding(.horizontal, 10)
+            .onTapGesture { focusDisplayName = false }
 
             HStack {
                 let name = displayName.trimmingCharacters(in: .whitespaces)
@@ -145,6 +141,7 @@ struct CreateFirstProfile: View {
                     TextField("Enter your name…", text: $displayName)
                         .focused($focusDisplayName)
                         .padding(.horizontal)
+                        .padding(.trailing, 20)
                         .padding(.vertical, 10)
                         .background(
                             RoundedRectangle(cornerRadius: 10, style: .continuous)
@@ -173,12 +170,23 @@ struct CreateFirstProfile: View {
             }
         }
         .onAppear() {
+            if #available(iOS 16, *) {
+                focusDisplayName = true
+            } else {
+                // it does not work before animation completes on iOS 15
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
                     focusDisplayName = true
                 }
+            }
+        }
         .padding(.horizontal, 25)
-        .padding(.top, 10)
         .padding(.bottom, 25)
         .frame(maxWidth: .infinity, alignment: .leading)
+        if #available(iOS 16, *) {
+            return v.padding(.top, 10)
+        } else {
+            return v.padding(.top, 75).ignoresSafeArea(.all, edges: .top)
+        }
     }
 
     func createProfileButton() -> some View {
@@ -206,7 +214,7 @@ struct CreateFirstProfile: View {
     }
 
     private func nextStepDestinationView() -> some View {
-        ChooseServerOperators(onboarding: true)
+        OnboardingConditionsView()
             .navigationBarBackButtonHidden(true)
             .modifier(ThemedBackground())
     }
@@ -235,15 +243,15 @@ private func showCreateProfileAlert(
     _ error: Error
 ) {
     let m = ChatModel.shared
-    switch error as? ChatResponse {
-    case .chatCmdError(_, .errorStore(.duplicateName)),
-         .chatCmdError(_, .error(.userExists)):
+    switch error as? ChatError {
+    case .errorStore(.duplicateName),
+         .error(.userExists):
         if m.currentUser == nil {
             AlertManager.shared.showAlert(duplicateUserAlert)
         } else {
             showAlert(.duplicateUserError)
         }
-    case .chatCmdError(_, .error(.invalidDisplayName)):
+    case .error(.invalidDisplayName):
         if m.currentUser == nil {
             AlertManager.shared.showAlert(invalidDisplayNameAlert)
         } else {

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

@@ -31,7 +31,7 @@ struct CreateSimpleXAddress: View {
                         Spacer()
 
                         if let userAddress = m.userAddress {
-                            SimpleXLinkQRCode(uri: userAddress.connReqContact)
+                            SimpleXCreatedLinkQRCode(link: userAddress.connLinkContact, short: Binding.constant(false))
                                 .frame(maxHeight: g.size.width)
                             shareQRCodeButton(userAddress)
                                 .frame(maxWidth: .infinity)
@@ -77,9 +77,9 @@ struct CreateSimpleXAddress: View {
                 progressIndicator = true
                 Task {
                     do {
-                        let connReqContact = try await apiCreateUserAddress()
+                        let connLinkContact = try await apiCreateUserAddress(short: false)
                         DispatchQueue.main.async {
-                            m.userAddress = UserContactLink(connReqContact: connReqContact)
+                            m.userAddress = UserContactLink(connLinkContact: connLinkContact)
                         }
                         await MainActor.run { progressIndicator = false }
                     } catch let error {
@@ -121,7 +121,7 @@ struct CreateSimpleXAddress: View {
 
     private func shareQRCodeButton(_ userAddress: UserContactLink) -> some View {
         Button {
-            showShareSheet(items: [simplexChatLink(userAddress.connReqContact)])
+            showShareSheet(items: [simplexChatLink(userAddress.connLinkContact.simplexChatUri(short: false))])
         } label: {
             Label("Share", systemImage: "square.and.arrow.up")
         }
@@ -189,7 +189,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"), simplexChatLink(userAddress.connLinkContact.simplexChatUri(short: false)))
         MailView(
             isShowing: self.$showMailView,
             result: $mailViewResult,

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

@@ -23,7 +23,7 @@ struct OnboardingView: View {
             case .step3_CreateSimpleXAddress: // deprecated
                 CreateSimpleXAddress()
             case .step3_ChooseServerOperators:
-                ChooseServerOperators(onboarding: true)
+                OnboardingConditionsView()
                     .navigationBarBackButtonHidden(true)
                     .modifier(ThemedBackground())
             case .step4_SetNotificationsMode:
@@ -44,7 +44,7 @@ enum OnboardingStage: String, Identifiable {
     case step1_SimpleXInfo
     case step2_CreateProfile // deprecated
     case step3_CreateSimpleXAddress // deprecated
-    case step3_ChooseServerOperators
+    case step3_ChooseServerOperators // changed to simplified conditions
     case step4_SetNotificationsMode
     case onboardingComplete
 

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

@@ -17,7 +17,7 @@ struct SetNotificationsMode: View {
 
     var body: some View {
         GeometryReader { g in
-            ScrollView {
+            let v = ScrollView {
                 VStack(alignment: .center, spacing: 20) {
                     Text("Push notifications")
                         .font(.largeTitle)
@@ -57,11 +57,17 @@ struct SetNotificationsMode: View {
                 .padding(25)
                 .frame(minHeight: g.size.height)
             }
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
         }
         .frame(maxHeight: .infinity)
         .sheet(isPresented: $showInfo) {
             NotificationsInfoView()
         }
+        .navigationBarHidden(true) // necessary on iOS 15
     }
 
     private func setNotificationsMode(_ token: DeviceToken, _ mode: NotificationsMode) {

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

@@ -18,7 +18,7 @@ struct SimpleXInfo: View {
 
     var body: some View {
         GeometryReader { g in
-            ScrollView {
+            let v = ScrollView {
                 VStack(alignment: .leading) {
                     VStack(alignment: .center, spacing: 10) {
                         Image(colorScheme == .light ? "logo" : "logo-light")
@@ -66,6 +66,9 @@ struct SimpleXInfo: View {
                         }
                     }
                 }
+                .padding(.horizontal, 25)
+                .padding(.top, 75)
+                .padding(.bottom, 25)
                 .frame(minHeight: g.size.height)
             }
             .sheet(isPresented: Binding(
@@ -88,14 +91,17 @@ struct SimpleXInfo: View {
                     createProfileNavLinkActive: $createProfileNavLinkActive
                 )
             }
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
         }
         .onAppear() {
             setLastVersionDefault()
         }
         .frame(maxHeight: .infinity)
-        .padding(.horizontal, 25)
-        .padding(.top, 75)
-        .padding(.bottom, 25)
+        .navigationBarHidden(true) // necessary on iOS 15
     }
 
     private func onboardingInfoRow(_ image: String, _ title: LocalizedStringKey, _ text: LocalizedStringKey, width: CGFloat) -> some View {
@@ -129,6 +135,7 @@ struct SimpleXInfo: View {
 
             NavigationLink(isActive: $createProfileNavLinkActive) {
                 CreateFirstProfile()
+                    .modifier(ThemedBackground())
             } label: {
                 EmptyView()
             }
@@ -140,6 +147,8 @@ struct SimpleXInfo: View {
 
 let textSpace = Text(verbatim: " ")
 
+let textNewLine = Text(verbatim: "\n")
+
 struct SimpleXInfo_Previews: PreviewProvider {
     static var previews: some View {
         SimpleXInfo(onboarding: true)