Merge branch 'ep/revert-base64' into ep/revert-base64-android

This reverts commit d65137882b.

.github/workflows/build.yml

@@ -5,22 +5,12 @@ on:
     branches:
       - master
       - stable
+      - users
     tags:
       - "v*"
       - "!*-fdroid"
       - "!*-armv7a"
   pull_request:
-    paths-ignore:
-      - "apps/ios"
-      - "apps/multiplatform"
-      - "blog"
-      - "docs"
-      - "fastlane"
-      - "images"
-      - "packages"
-      - "website"
-      - "README.md"
-      - "PRIVACY.md"
 
 jobs:
   prepare-release:
@@ -75,11 +65,6 @@ jobs:
             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
-            desktop_asset_name: simplex-desktop-macos-aarch64.dmg
-          - os: macos-13
             ghc: "9.6.3"
             cache_path: ~/.cabal/store
             asset_name: simplex-chat-macos-x86-64
@@ -122,36 +107,18 @@ jobs:
         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@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/lib"         >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@1.1/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@1.1/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@1.1/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
-          echo ""                                                              >> cabal.project.local
-          echo "package direct-sqlcipher"                                      >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"            >> cabal.project.local
-          echo "    flags: +openssl"                                           >> cabal.project.local
+          echo "ignore-project: False"                                      >> cabal.project.local
+          echo "package direct-sqlcipher"                                   >> cabal.project.local
+          echo "    extra-include-dirs: /usr/local/opt/openssl@1.1/include" >> cabal.project.local
+          echo "    extra-lib-dirs: /usr/local/opt/openssl@1.1/lib"         >> cabal.project.local
+          echo "    flags: +openssl"                                        >> cabal.project.local
 
       - name: Install AppImage dependencies
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
         run: sudo apt install -y desktop-file-utils
 
       - name: Install pkg-config for Mac
-        if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
+        if: matrix.os == 'macos-latest'
         run: brew install pkg-config
 
       - name: Unix prepare cabal.project.local for Ubuntu
@@ -223,7 +190,7 @@ jobs:
 
       - name: Mac 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') && matrix.os == 'macos-latest'
         shell: bash
         env:
           APPLE_SIMPLEX_SIGNING_KEYCHAIN: ${{ secrets.APPLE_SIMPLEX_SIGNING_KEYCHAIN }}
@@ -274,7 +241,7 @@ jobs:
             ${{ 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')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -283,7 +250,7 @@ jobs:
           tag: ${{ github.ref }}
 
       - name: Mac update desktop package hash
-        if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
+        if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-latest'
         uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cla.yml

@@ -5,20 +5,14 @@ on:
   pull_request_target:
     types: [opened, closed, synchronize]
 
-permissions:
-  actions: write
-  contents: write
-  pull-requests: write
-  statuses: write
-
 jobs:
   CLAssistant:
     runs-on: ubuntu-latest
     steps:
       - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
+        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request'
         # Beta Release
-        uses: cla-assistant/github-action@v2.3.0
+        uses: cla-assistant/github-action@v2.1.3-beta
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           # the below token should have repo scope and must be manually added by you in the repository's secret
@@ -39,4 +33,4 @@ jobs:
           #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
           #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
           #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
-          #use-dco-flag: true - If you are using DCO instead of CLA
+          #use-dco-flag: true - If you are using DCO instead of CLA

.github/workflows/web.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - stable
     paths:
       - website/**
       - images/**

.gitignore

@@ -54,14 +54,12 @@ website/translations.json
 website/src/img/images/
 website/src/images/
 website/src/js/lottie.min.js
-website/src/privacy.md
 # Generated files
 website/package/generated*
 
 # Ignore build tool output, e.g. code coverage
 website/.nyc_output/
 website/coverage/
-result
 
 # Ignore API documentation
 website/api-docs/

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
 
 # Strip the binary from debug symbols to reduce size
 RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \

PRIVACY.md

@@ -1,21 +1,16 @@
----
-layout: layouts/privacy.html
-permalink: /privacy/index.html
----
-
 # SimpleX Chat Privacy Policy and Conditions of Use
 
 SimpleX Chat is the first communication network based on a new protocol stack that builds on the same ideas of complete openness and decentralization as email and web, with the focus on providing security and privacy of communications, and without compromising on usability.
 
 SimpleX Chat communication protocol is the first protocol that has no user profile IDs of any kind, not even random numbers, cryptographic keys or hashes that identify the users. SimpleX Chat apps allow their users to send messages and files via relay server infrastructure. Relay server owners and providers do not have any access to your messages, thanks to double-ratchet end-to-end encryption algorithm (also known as Signal algorithm - do not confuse with Signal protocols or platform) and additional encryption layers, and they also have no access to your profile and contacts - as they do not provide any user accounts.
 
-Double ratchet algorithm has such important properties as [forward secrecy](/docs/GLOSSARY.md#forward-secrecy), sender [repudiation](/docs/GLOSSARY.md#) and break-in recovery (also known as [post-compromise security](/docs/GLOSSARY.md#post-compromise-security)).
+Double ratchet algorithm has such important properties as [forward secrecy](./docs/GLOSSARY.md#forward-secrecy), sender [repudiation](./docs/GLOSSARY.md#) and break-in recovery (also known as [post-compromise security](./docs/GLOSSARY.md#post-compromise-security)).
 
-If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you believe that any part of this document is not aligned with our mission or values, please raise it with us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Privacy Policy
 
-SimpleX Chat Ltd uses the best industry practices for security and encryption to provide client and server software for secure [end-to-end encrypted](/docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the relays servers, even if they are modified or compromised, via [man-in-the-middle attack](/docs/GLOSSARY.md#man-in-the-middle-attack), unlike most other communication platforms, services and networks.
+SimpleX Chat Ltd uses the best industry practices for security and encryption to provide client and server software for secure [end-to-end encrypted](./docs/GLOSSARY.md#end-to-end-encryption) messaging via private connections. This encryption cannot be compromised by the relays servers, even if they are modified or compromised, via [man-in-the-middle attack](./docs/GLOSSARY.md#man-in-the-middle-attack), unlike most other communication platforms, services and networks.
 
 SimpleX Chat software is built on top of SimpleX messaging and application protocols, based on a new message routing protocol allowing to establish private connections without having any kind of addresses or other identifiers assigned to its users - it does not use emails, phone numbers, usernames, identity keys or any other user profile identifiers to pass messages between the user applications.
 
@@ -25,9 +20,7 @@ While SimpleX Chat Ltd is not a communication service provider, and provide publ
 
 We see users and data sovereignty, and device and provider portability as critically important properties for any communication system.
 
-The implementation security assessment of SimpleX cryptography and networking was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2 – see [the announcement](/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-The cryptographic review of SimpleX protocols design was done in July 2024 by Trail of Bits – see [the announcement](/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md).
+SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 ### Your information
 
@@ -41,7 +34,7 @@ You can transfer the profile to another device by creating a backup of the app d
 
 #### Messages and Files
 
-SimpleX relay servers cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 64kb, 256kb, 1mb or 8mb via all or some of the configured file relay servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](/docs/GLOSSARY.md#key-exchange) happens out-of-band.
+SimpleX relay servers cannot decrypt or otherwise access the content or even the size of your messages and files you send or receive. Each message is padded to a fixed size of 16kb. Each file is sent in chunks of 64kb, 256kb, 1mb or 8mb via all or some of the configured file relay servers. Both messages and files are sent end-to-end encrypted, and the servers do not have technical means to compromise this encryption, because part of the [key exchange](./docs/GLOSSARY.md#key-exchange) happens out-of-band.
 
 Your message history is stored only on your own device and the devices of your contacts. While the recipients' devices are offline, messaging relay servers temporarily store end-to-end encrypted messages – you can configure which relay servers are used to receive the messages from the new contacts, and you can manually change them for the existing contacts too.
 
@@ -81,7 +74,7 @@ When you choose to use instant push notifications in SimpleX iOS app, because th
 
 Preset notification server cannot observe the actual addresses of these queues, as a separate address is used to subscribe to the notifications. It also cannot observe who sends messages to you. Apple push notifications servers can only observe how many notifications are sent to you, but not from how many contacts, or from which messaging relays, as notifications are delivered to your device end-to-end encrypted by one of the preset notification servers - these notifications only contain end-to-end encrypted metadata, not even encrypted message content, and they look completely random to Apple push notification servers.
 
-You can read more about the design of iOS push notifications [here](./blog/20220404-simplex-chat-instant-notifications.md#our-ios-approach-has-one-trade-off).
+You can read more about the design of iOS push notifications [here](https://simplex.chat/blog/20220404-simplex-chat-instant-notifications.html#our-ios-approach-has-one-trade-off).
 
 #### Another information stored on the servers
 
@@ -89,7 +82,7 @@ Additional technical information can be stored on our servers, including randoml
 
 #### SimpleX Directory
 
-[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).
+[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).
 
 #### User Support
 
@@ -110,15 +103,13 @@ The cases when SimpleX Chat Ltd may share the data temporarily stored on the ser
 
 At the time of updating this document, we 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 we are ever requested to provide such access or information, we will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
 
-We will publish information we are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
-
 ### Updates
 
 We will update this Privacy Policy as needed so that it is current, accurate, and as clear as possible. Your continued use of our software applications and preset relays infrastructure confirms your acceptance of our updated Privacy Policy.
 
 Please also read our Conditions of Use of Software and Infrastructure below.
 
-If you have questions about our Privacy Policy please contact us via [email](mailto:chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
+If you have questions about our Privacy Policy please contact us via [email](chat@simplex.chat) or [chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion).
 
 ## Conditions of Use of Software and Infrastructure
 
@@ -140,7 +131,7 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b
 
 **Traffic and device costs**. You are solely responsible for the traffic and device costs that you incur while using our Applications, and any associated taxes.
 
-**Legal usage**. You agree to use our Applications only for legal purposes. You will not use (or assist others in using) our Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While we cannot access content or identify messages or groups, in some cases the links to the illegal communications available via our Applications can be shared publicly on social media or websites. We reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via our servers, whether they were reported by the users or discovered by our team.
+**Legal and acceptable usage**. You agree to use our Applications only for legal and acceptable purposes. You will not use (or assist others in using) our Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal or impermissible communications, e.g. spam. While we cannot access content or identify messages or groups, in some cases the links to the illegal or impermissible communications available via our Applications can be shared publicly on social media or websites. We reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via our servers, whether they were reported by the users or discovered by our team.
 
 **Damage to SimpleX Chat Ltd**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit our Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, our Infrastructure, or any other systems. For example, you must not 1) access our Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of our Infrastructure; 3) collect information about our users in any manner; or 4) sell, rent, or charge for our 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.
 
@@ -174,4 +165,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 at any time by deleting our Applications from your devices and discontinuing use of our Infrastructure. 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.
 
-Updated October 14, 2024
+Updated February 24, 2024

README.md

@@ -4,7 +4,7 @@
 [![Join on Reddit](https://img.shields.io/reddit/subreddit-subscribers/SimpleXChat?style=social)](https://www.reddit.com/r/SimpleXChat)
 <a rel="me" href="https://mastodon.social/@simplex">![Follow on Mastodon](https://img.shields.io/mastodon/follow/108619463746856738?domain=https%3A%2F%2Fmastodon.social&style=social)</a>
 
-| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md), [PL](/docs/lang/pl/README.md) |
+| 30/03/2023 | EN, [FR](/docs/lang/fr/README.md), [CZ](/docs/lang/cs/README.md) |
 
 <img src="images/simplex-chat-logo.svg" alt="SimpleX logo" width="100%">
 
@@ -18,7 +18,7 @@
 2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
-5. ⚡️ [Contribute](#contribute) and [support us with donations](#please-support-us-with-your-donations).
+5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
 
 [Learn more about SimpleX Chat](#contents).
 
@@ -72,9 +72,9 @@ 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=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)
 
-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:
+There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F6eHqy7uAbZPOcA6qBtrQgQquVlt4Ll91%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAqV_pg3FF00L98aCXp4D3bOs4Sxv_UmSd-gb0juVoQVs%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22XonlixcHBIb2ijCehbZoiw%3D%3D%22%7D) for developers who build on SimpleX platform:
 
 - chat bots and automations
 - integrations with other apps
@@ -83,7 +83,7 @@ There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=s
 
 There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:
 
-[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FmfiivxDKWFuowXrQOp11jsY8TuP__rBL%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAiz3pKNwvKudckFYMUfgoT0s96B0jfZ7ALHAu7rtE9HQ%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22jZeJpXGrRXQJU_-MSJ_v2A%3D%3D%22%7D) (German-speaking), [\#SimpleX-ES](https://simplex.chat/contact#/?v=2-4&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FJ5ES83pJimY2BRklS8fvy_iQwIU37xra%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA0F0STP6UqN_12_k2cjjTrIjFgBGeWhOAmbY1qlk3pnM%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22VmUU0fqmYdCRmVCyvStvHA%3D%3D%22%7D) (Spanish-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FxCHBE_6PBRMqNEpm4UQDHXb9cz-mN7dd%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAetqlcM7zTCRw-iatnwCrvpJSto7lq5Yv6AsBMWv7GSM%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22foO5Xw4hhjOa_x7zET7otw%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=2-4&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FVXQTB0J2lLjYkgjWByhl6-1qmb5fgZHh%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAI6JaEWezfSwvcoTEkk6au-gkjrXR2ew2OqZYMYBvayk%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22ORH9OEe8Duissh-hslfeVg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FqpHu0psOUdYfc11yQCzSyq5JhijrBzZT%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEACZ_7fbwlM45wl6cGif8cY47oPQ_AMdP0ATqOYLA6zHY%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%229uRQRTir3ealdcSfB0zsrw%3D%3D%22%7D) (Italian-speaking).
+[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking), [\#SimpleX-ES](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FaJ8O1O8A8GbeoaHTo_V8dcefaCl7ouPb%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA034qWTA3sWcTsi6aWhNf9BA34vKVCFaEBdP2R66z6Ao%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22wiZ1v_wNjLPlT-nCSB-bRA%3D%3D%22%7D) (Spanish-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
 
 You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.
 
@@ -150,7 +150,7 @@ We would love to have you join the development! You can help us with:
 - contributing to SimpleX Chat knowledge-base.
 - developing features - please connect to us via chat so we can help you get started.
 
-## Please support us with your donations
+## Help us with donations
 
 Huge thank you to everybody who donated to SimpleX Chat!
 
@@ -158,19 +158,20 @@ We are prioritizing users privacy and security - it would be impossible without
 
 Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
 
-Your donations help us raise more funds - any amount, even the price of the cup of coffee, would make a big difference for us.
+Your donations help us raise more funds – any amount, even the price of the cup of coffee, would make a big difference for us.
 
 It is possible to donate via:
 
-- [GitHub](https://github.com/sponsors/simplex-chat) (commission-free) or [OpenCollective](https://opencollective.com/simplex-chat) (~10% commission).
-- Bitcoin: bc1qd74rc032ek2knhhr3yjq2ajzc5enz3h4qwnxad
+- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
+- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
 - Monero: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
-- BCH: bitcoincash:qq6c8vfvxqrk6rhdysgvkhqc24sggkfsx5nqvdlqcg
-- Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
+- Bitcoin: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
+- BCH: 1bpefFkzuRoMY3ZuBbZNZxycbg7NYPYTG
 - USDT:
-  - Ethereum: 0xD9ee7Db0AD0dc1Dfa7eD53290199ED06beA04692
-- Solana: 7JCf5m3TiHmYKZVr6jCu1KeZVtb9Y1jRMQDU69p5ARnu
-- please ask if you want to donate any other coins.
+  - BNB Smart Chain: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+  - Tron: TNnTrKLBmdy2Wn3cAQR98dAVvWhLskQGfW
+- Ethereum: 0x83fd788f7241a2be61780ea9dc72d2151e6843e2
+- Solana: 43tWFWDczgAcn4Rzwkpqg2mqwnQETSiTwznmCgA2tf1L
 
 Thank you,
 
@@ -233,11 +234,7 @@ You can use SimpleX with your own servers and still communicate with people usin
 
 Recent and important updates:
 
-[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)
-
-[Aug 14, 2024. SimpleX network: the investment from Jack Dorsey and Asymmetric, v6.0 released with the new user experience and private message routing](./blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.md)
-
-[Jun 4, 2024. SimpleX network: private message routing, v5.8 released with IP address protection and chat themes](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md)
+[Mar 23, 2024. SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration.](./blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)
 
 [Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)
 
@@ -247,6 +244,10 @@ Recent and important updates:
 
 [Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).
 
+[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
+
+[May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).
+
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).
 
 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
@@ -294,27 +295,25 @@ What is already implemented:
 1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses [pairwise per-queue identifiers](./docs/GLOSSARY.md#pairwise-pseudonymous-identifier) (2 addresses for each unidirectional message queue, with an optional 3rd address for push notifications on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
 2. [End-to-end encryption](./docs/GLOSSARY.md#end-to-end-encryption) in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
-4. [Post-quantum resistant key exchange](./docs/GLOSSARY.md#post-quantum-cryptography) in double ratchet protocol *on every ratchet step*. Read more in [this post](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md) and also see this [publication by Apple]( https://security.apple.com/blog/imessage-pq3/) explaining the need for post-quantum key rotation.
-5. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
-6. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-7. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
-8. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
-9. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
-10. To protect your IP address from unknown messaging relays, and for per-message transport anonymity (compared with Tor/VPN per-connection anonymity), from v6.0 all SimpleX Chat clients use private message routing by default. Read more in [this post](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md#private-message-routing).
-11. To protect your IP address from unknown file relays, when SOCKS proxy is not enabled SimpleX Chat clients ask for a confirmation before downloading the files from unknown servers.
-12. To protect your IP address from known servers all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
-13. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
-14. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
-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.
+4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
+5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
+6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
+8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
+9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
+10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
+11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
+12. Manual messaging queue rotations to move conversation to another SMP relay.
+13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+14. Local files encryption.
 
 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.
-4. Recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
+2. Post-quantum resistant key exchange in double ratchet protocol.
+3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
 
 ## For developers
 
@@ -381,10 +380,10 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 - ✅ Private notes.
 - ✅ Improve sending videos (including encryption of locally stored videos).
 - ✅ Post-quantum resistant key exchange in double ratchet protocol.
-- ✅ Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - 🏗 Improve stability and reduce battery usage.
 - 🏗 Improve experience for the new users.
 - 🏗 Large groups, communities and public channels.
+- 🏗 Message delivery relay for senders (to conceal IP address from the recipients' servers and to reduce the traffic).
 - Privacy & security slider - a simple way to set all settings at once.
 - SMP queue redundancy and rotation (manual is supported).
 - Include optional message into connection request sent via contact address.
@@ -403,9 +402,7 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A
 
 [SimpleX protocols and security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) was reviewed, and had many breaking changes and improvements in v1.0.0.
 
-The implementation security assessment of SimpleX cryptography and networking was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about) – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-The cryptographic review of SimpleX protocols was done in July 2024 by Trail of Bits – see [the announcement](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md).
+The security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
 
 SimpleX Chat is still a relatively early stage platform (the mobile apps were released in March 2022), so you may discover some bugs and missing features. We would really appreciate if you let us know anything that needs to be fixed or improved.
 
@@ -415,13 +412,13 @@ We have never provided or have been requested access to our servers or any infor
 
 We do not log IP addresses of the users and we do not perform any traffic correlation on our servers. If transport level security is critical you must use Tor or some other similar network to access messaging servers. We will be improving the client applications to reduce the opportunities for traffic correlation.
 
-Please read more in [Privacy Policy](./PRIVACY.md).
+Please read more in [Terms & privacy policy](./PRIVACY.md).
 
 ## Security contact
 
-Please see our [Security Policy](./docs/SECURITY.md) on how to report security vulnerabilities to us. We will coordinate the fix and disclosure.
+To report a security vulnerability, please send us email to chat@simplex.chat. We will coordinate the fix and disclosure. Please do NOT report security vulnerabilities via GitHub issues.
 
-Please do NOT report security vulnerabilities via GitHub issues.
+Please treat any findings of possible traffic correlation attacks allowing to correlate two different conversations to the same user, other than covered in [the threat model](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md#threat-model), as security vulnerabilities, and follow this disclosure process.
 
 ## License
 

apps/ios/Shared/AppDelegate.swift

@@ -9,17 +9,39 @@
 import Foundation
 import UIKit
 import SimpleXChat
-import SwiftUI
 
 class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         logger.debug("AppDelegate: didFinishLaunchingWithOptions")
         application.registerForRemoteNotifications()
+        if #available(iOS 17.0, *) { trackKeyboard() }
+        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
         removePasscodesIfReinstalled()
-        prepareForLaunch()
         return true
     }
 
+    @available(iOS 17.0, *)
+    private func trackKeyboard() {
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillShow(_ notification: Notification) {
+        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
+            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
+        }
+    }
+
+    @available(iOS 17.0, *)
+    @objc func keyboardWillHide(_ notification: Notification) {
+        ChatModel.shared.keyboardHeight = 0
+    }
+
+    @objc func pasteboardChanged() {
+        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
+    }
+
     func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
         let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
         logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")
@@ -119,10 +141,6 @@ class AppDelegate: NSObject, UIApplicationDelegate {
         }
     }
 
-    private func prepareForLaunch() {
-        try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
-    }
-
     static func keepScreenOn(_ on: Bool) {
         UIApplication.shared.isIdleTimerDisabled = on
     }
@@ -130,79 +148,13 @@ class AppDelegate: NSObject, UIApplicationDelegate {
 
 class SceneDelegate: NSObject, ObservableObject, UIWindowSceneDelegate {
     var window: UIWindow?
-    static var windowStatic: UIWindow?
     var windowScene: UIWindowScene?
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        UITableView.appearance().backgroundColor = .clear
         guard let windowScene = scene as? UIWindowScene else { return }
         self.windowScene = windowScene
         window = windowScene.keyWindow
-        SceneDelegate.windowStatic = windowScene.keyWindow
-        migrateAccentColorAndTheme()
-        ThemeManager.applyTheme(currentThemeDefault.get())
-        ThemeManager.adjustWindowStyle()
-    }
-
-    private func migrateAccentColorAndTheme() {
-        let defs = UserDefaults.standard
-        /// For checking migration
-//        themeOverridesDefault.set([])
-//        currentThemeDefault.set(DefaultTheme.SYSTEM_THEME_NAME)
-//        defs.set(0.5, forKey: DEFAULT_ACCENT_COLOR_RED)
-//        defs.set(0.3, forKey: DEFAULT_ACCENT_COLOR_GREEN)
-//        defs.set(0.8, forKey: DEFAULT_ACCENT_COLOR_BLUE)
-
-        let userInterfaceStyle = getUserInterfaceStyleDefault()
-        if defs.double(forKey: DEFAULT_ACCENT_COLOR_GREEN) == 0 && userInterfaceStyle == .unspecified {
-            // No migration needed or already migrated
-            return
-        }
-
-        let defaultAccentColor = Color(cgColor: CGColor(red: 0.000, green: 0.533, blue: 1.000, alpha: 1))
-        let accentColor = Color(cgColor: getUIAccentColorDefault())
-        if accentColor != defaultAccentColor {
-            let colors = ThemeColors(primary: accentColor.toReadableHex())
-            var overrides = themeOverridesDefault.get()
-            var themeIds = currentThemeIdsDefault.get()
-            switch userInterfaceStyle {
-            case .light:
-                let light = ThemeOverrides(base: DefaultTheme.LIGHT, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                overrides.append(light)
-                themeOverridesDefault.set(overrides)
-                themeIds[DefaultTheme.LIGHT.themeName] = light.themeId
-                currentThemeIdsDefault.set(themeIds)
-                ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
-            case .dark:
-                let dark = ThemeOverrides(base: DefaultTheme.DARK, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                overrides.append(dark)
-                themeOverridesDefault.set(overrides)
-                themeIds[DefaultTheme.DARK.themeName] = dark.themeId
-                currentThemeIdsDefault.set(themeIds)
-                ThemeManager.applyTheme(DefaultTheme.DARK.themeName)
-            case .unspecified:
-                let light = ThemeOverrides(base: DefaultTheme.LIGHT, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                let dark = ThemeOverrides(base: DefaultTheme.DARK, colors: colors, wallpaper: ThemeWallpaper(preset: PresetWallpaper.school.filename))
-                overrides.append(light)
-                overrides.append(dark)
-                themeOverridesDefault.set(overrides)
-                themeIds[DefaultTheme.LIGHT.themeName] = light.themeId
-                themeIds[DefaultTheme.DARK.themeName] = dark.themeId
-                currentThemeIdsDefault.set(themeIds)
-                ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
-            @unknown default: ()
-            }
-        } else if userInterfaceStyle != .unspecified {
-            let themeName = switch userInterfaceStyle {
-            case .light: DefaultTheme.LIGHT.themeName
-            case .dark: DefaultTheme.DARK.themeName
-            default: DefaultTheme.SYSTEM_THEME_NAME
-            }
-            ThemeManager.applyTheme(themeName)
-        }
-        defs.removeObject(forKey: DEFAULT_ACCENT_COLOR_RED)
-        defs.removeObject(forKey: DEFAULT_ACCENT_COLOR_GREEN)
-        defs.removeObject(forKey: DEFAULT_ACCENT_COLOR_BLUE)
-        defs.removeObject(forKey: DEFAULT_USER_INTERFACE_STYLE)
+        window?.tintColor = UIColor(cgColor: getUIAccentColorDefault())
+        window?.overrideUserInterfaceStyle = getUserInterfaceStyleDefault()
     }
 }

apps/ios/Shared/Assets.xcassets/checkmark.2.symbolset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "info": {
-    "author": "xcode",
-    "version": 1
-  },
-  "symbols": [
-    {
-      "filename": "checkmark.2.svg",
-      "idiom": "universal"
-    }
-  ]
-}

apps/ios/Shared/Assets.xcassets/checkmark.2.symbolset/checkmark.2.svg

@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="3300px" height="2200px" viewBox="0 0 3300 2200" version="1.1" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>checkmark.2</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="double.checkmark">
-            <g id="Notes">
-                <rect id="artboard" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="3300" height="2200"></rect>
-                <line x1="263" y1="292" x2="3036" y2="292" id="Path" stroke="#000000" stroke-width="0.5"></line>
-                <text id="Weight/Scale-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="263" y="322">Weight/Scale Variations</tspan>
-                </text>
-                <text id="Ultralight" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="533.711" y="322">Ultralight</tspan>
-                </text>
-                <text id="Thin" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="843.422" y="322">Thin</tspan>
-                </text>
-                <text id="Light" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1138.63" y="322">Light</tspan>
-                </text>
-                <text id="Regular" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1426.84" y="322">Regular</tspan>
-                </text>
-                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1723.06" y="322">Medium</tspan>
-                </text>
-                <text id="Semibold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2015.77" y="322">Semibold</tspan>
-                </text>
-                <text id="Bold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2326.48" y="322">Bold</tspan>
-                </text>
-                <text id="Heavy" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2618.19" y="322">Heavy</tspan>
-                </text>
-                <text id="Black" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2917.4" y="322">Black</tspan>
-                </text>
-                <line x1="263" y1="1903" x2="3036" y2="1903" id="Path" stroke="#000000" stroke-width="0.5"></line>
-                <g id="Group" transform="translate(264.3672, 1918.0684)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M7.88088,15.76172 C12.18752,15.76172 15.7715,12.1875 15.7715,7.88086 C15.7715,3.57422 12.17774,0 7.8711,0 C3.57422,0 0,3.57422 0,7.88086 C0,12.1875 3.58398,15.76172 7.88086,15.76172 L7.88088,15.76172 Z M7.88088,14.277344 C4.33596,14.277344 1.50392,11.435544 1.50392,7.880864 C1.50392,4.326184 4.32618,1.484384 7.8711,1.484384 C11.42578,1.484384 14.27734,4.326184 14.27734,7.880864 C14.27734,11.435544 11.43554,14.277344 7.88086,14.277344 L7.88088,14.277344 Z M4.28712,7.880864 C4.28712,8.310552 4.589854,8.60352 5.039074,8.60352 L7.138674,8.60352 L7.138674,10.72266 C7.138674,11.162114 7.431642,11.464848 7.86133,11.464848 C8.310548,11.464848 8.603518,11.162114 8.603518,10.72266 L8.603518,8.60352 L10.722658,8.60352 C11.162112,8.60352 11.464846,8.310552 11.464846,7.880864 C11.464846,7.44141 11.162112,7.138676 10.722658,7.138676 L8.603518,7.138676 L8.603518,5.029296 C8.603518,4.580078 8.31055,4.277342 7.86133,4.277342 C7.431642,4.277342 7.138674,4.580076 7.138674,5.029296 L7.138674,7.138676 L5.039074,7.138676 C4.589856,7.138676 4.28712,7.44141 4.28712,7.880864 Z"
-                        id="Shape"></path>
-                </g>
-                <g id="Group" transform="translate(283.254, 1915.9883)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M9.96094,19.92188 C15.41016,19.92188 19.92188,15.4004 19.92188,9.96094 C19.92188,4.51172 15.4004,0 9.95118,0 C4.51172,0 0,4.51172 0,9.96094 C0,15.4004 4.52148,19.92188 9.96094,19.92188 Z M9.96094,18.261724 C5.35156,18.261724 1.66992,14.570324 1.66992,9.960944 C1.66992,5.351564 5.3418,1.660164 9.95116,1.660164 C14.56052,1.660164 18.2617,5.351564 18.2617,9.960944 C18.2617,14.570324 14.5703,18.261724 9.96092,18.261724 L9.96094,18.261724 Z M5.4297,9.960944 C5.4297,10.43946 5.761732,10.761726 6.259778,10.761726 L9.130878,10.761726 L9.130878,13.642586 C9.130878,14.130868 9.46291,14.472664 9.941424,14.472664 C10.4297,14.472664 10.771502,14.140632 10.771502,13.642586 L10.771502,10.761726 L13.652362,10.761726 C14.140644,10.761726 14.48244,10.43946 14.48244,9.960944 C14.48244,9.472662 14.140644,9.130866 13.652362,9.130866 L10.771502,9.130866 L10.771502,6.259766 C10.771502,5.76172 10.4297,5.419922 9.941424,5.419922 C9.462908,5.419922 9.130878,5.761718 9.130878,6.259766 L9.130878,9.130866 L6.259778,9.130866 C5.761732,9.130866 5.4297,9.472662 5.4297,9.960944 Z"
-                        id="Shape"></path>
-                </g>
-                <g id="Group" transform="translate(307.1798, 1913.2246)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M12.71486,25.43944 C19.67776,25.43944 25.43946,19.67772 25.43946,12.7246 C25.43946,5.7617 19.66798,0 12.70508,0 C5.75196,0 -1.42108547e-15,5.76172 -1.42108547e-15,12.7246 C-1.42108547e-15,19.67772 5.76172,25.43944 12.71484,25.43944 L12.71486,25.43944 Z M12.71486,23.623034 C6.6797,23.623034 1.82618,18.759754 1.82618,12.724594 C1.82618,6.679674 6.66994,1.826154 12.70508,1.826154 C18.75,1.826154 23.61328,6.679674 23.61328,12.724594 C23.61328,18.759754 18.75976,23.623034 12.71484,23.623034 L12.71486,23.623034 Z M6.94338,12.724594 C6.94338,13.242172 7.314474,13.6035 7.861348,13.6035 L11.806668,13.6035 L11.806668,17.55858 C11.806668,18.09569 12.177762,18.476548 12.69534,18.476548 C13.23245,18.476548 13.603544,18.105454 13.603544,17.55858 L13.603544,13.6035 L17.558624,13.6035 C18.095734,13.6035 18.476592,13.242172 18.476592,12.724594 C18.476592,12.177718 18.105498,11.806626 17.558624,11.806626 L13.603544,11.806626 L13.603544,7.861306 C13.603544,7.31443 13.23245,6.933572 12.69534,6.933572 C12.177762,6.933572 11.806668,7.314432 11.806668,7.861306 L11.806668,11.806626 L7.861348,11.806626 C7.314472,11.806626 6.94338,12.17772 6.94338,12.724594 Z"
-                        id="Shape"></path>
-                </g>
-                <text id="Design-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="1953">Design Variations</tspan>
-                </text>
-                <text id="Symbols-are-supported-in-up-to-nine-weights-and-three-scales." fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="263" y="1971">Symbols are supported in up to nine weights and three scales.</tspan>
-                </text>
-                <text id="For-optimal-layout-with-text-and-other-symbols,-vertically-align" fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="263" y="1989">For optimal layout with text and other symbols, vertically align</tspan>
-                </text>
-                <text id="symbols-with-the-adjacent-text." fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="263" y="2007">symbols with the adjacent text.</tspan>
-                </text>
-                <line x1="776" y1="1919" x2="776" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5"></line>
-                <g id="Group" transform="translate(778.4902, 1918.7324)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M0.8203116,14.423832 C1.3378896,14.423832 1.5917956,14.2285116 1.7773436,13.681636 L3.0371096,10.234376 L8.7988296,10.234376 L10.0585956,13.681636 C10.2441424,14.228512 10.4980496,14.423832 11.0058616,14.423832 C11.5234396,14.423832 11.8554716,14.111324 11.8554716,13.623042 C11.8554716,13.4570264 11.8261748,13.300776 11.7480498,13.095698 L7.1679698,0.898438 C6.9433598,0.302734 6.5429698,0 5.9179698,0 C5.3125018,0 4.9023458,0.292968 4.6875018,0.888672 L0.1074218,13.105472 C0.0292968,13.31055 -3.55271368e-16,13.4668 -3.55271368e-16,13.632816 C-3.55271368e-16,14.121098 0.3125,14.423832 0.820312,14.423832 L0.8203116,14.423832 Z M3.5156316,8.750004 L5.8886716,2.177744 L5.9374998,2.177744 L8.3105398,8.750004 L3.5156316,8.750004 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="792.836" y1="1919" x2="792.836" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5">
-                </line>
-                <text id="Margins" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="776" y="1953">Margins</tspan>
-                </text>
-                <text id="Leading-and-trailing-margins-on-the-left-and-right-side-of-each-symbol" fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="776" y="1971">Leading and trailing margins on the left and right side of each symbol
-                    </tspan>
-                </text>
-                <text id="can-be-adjusted-by-modifying-the-x-location-of-the-margin-guidelines." fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="776" y="1989">can be adjusted by modifying the x-location of the margin guidelines.
-                    </tspan>
-                </text>
-                <text id="Modifications-are-automatically-applied-proportionally-to-all" fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="776" y="2007">Modifications are automatically applied proportionally to all</tspan>
-                </text>
-                <text id="scales-and-weights." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="776" y="2025">scales and weights.</tspan>
-                </text>
-                <g id="Group" transform="translate(1291.2481, 1914.5174)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M0.593687825,20.3477978 L2.29290583,22.0567818 C3.15228183,22.9259218 4.13860983,22.8673278 5.06634583,21.8419378 L15.7597058,10.0548378 L14.7929098,9.07827578 L4.17766983,20.7579558 C3.82610783,21.1583458 3.49407583,21.2560018 3.02532583,20.7872526 L1.85344983,19.6251426 C1.38469983,19.1661586 1.49212183,18.8243606 1.89251223,18.4630326 L13.3671122,7.66225258 L12.3905502,6.69545658 L0.798750225,17.5841366 C-0.187577775,18.5021046 -0.265703775,19.4786686 0.593672225,20.3478166 L0.593687825,20.3477978 Z M7.00970783,2.15443778 C6.58978583,2.56459378 6.56048983,3.14076578 6.79486383,3.53139178 C7.02923983,3.89271978 7.48822383,4.12709578 8.13275383,3.96107978 C9.59759783,3.61928378 11.1210338,3.56068978 12.5468138,4.49818978 L11.9608758,5.95326778 C11.6190798,6.78334578 11.7948602,7.36928378 12.3319698,7.91615778 L14.6268898,10.2306178 C15.1151718,10.7188998 15.5253278,10.7384298 16.0917338,10.6407738 L17.1561878,10.4454614 L17.8202498,11.1192894 L17.7811874,11.6759294 C17.742125,12.1739754 17.869078,12.5548354 18.3573594,13.0333514 L19.1190774,13.7755394 C19.5975934,14.2540554 20.2128274,14.2833514 20.6815774,13.8146018 L23.5917374,10.8946818 C24.0604874,10.4259318 24.0409554,9.83022778 23.5624406,9.35171378 L22.7909566,8.58999578 C22.3124406,8.11147978 21.9413466,7.95522978 21.4628326,7.99429178 L20.8866606,8.04311998 L20.2421286,7.40835398 L20.4862686,6.28530798 C20.6132218,5.71890198 20.4569718,5.27944798 19.8710346,4.69351198 L17.6737746,2.50601198 C14.3339346,-0.814308021 9.90033463,-0.736168021 7.00971463,2.15444998 L7.00970783,2.15443778 Z M8.50384783,2.52553178 C10.9354878,0.748187779 14.2265078,1.05092178 16.4530678,3.27748578 L18.8847078,5.68958578 C19.1190838,5.92396178 19.1581458,6.10950778 19.0897858,6.45130378 L18.7675198,7.93567978 L20.2714258,9.42005578 L21.2577538,9.36146198 C21.5116598,9.35169636 21.5897858,9.3712276 21.7850978,9.56653998 L22.3612698,10.142712 L19.9198698,12.584112 L19.3436978,12.00794 C19.1483854,11.8126276 19.1190878,11.734502 19.1288538,11.47083 L19.1972132,10.494268 L17.7030732,9.00989198 L16.1796352,9.26379798 C15.8573692,9.33215738 15.7108852,9.30286038 15.4667452,9.06848558 L13.4647852,7.06652558 C13.2108792,6.83214958 13.1815812,6.66613558 13.337832,6.29504158 L14.216738,4.20520158 C12.654238,2.75012358 10.622978,2.12512158 8.59173803,2.72082558 C8.43548803,2.75988798 8.37689403,2.63293498 8.50384743,2.52551318 L8.50384783,2.52553178 Z"
-                        id="Shape"></path>
-                </g>
-                <text id="Exporting" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1289" y="1953">Exporting</tspan>
-                </text>
-                <text id="Symbols-should-be-outlined-when-exporting-to-ensure-the" fill="#000000" fill-rule="nonzero"
-                    font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="1289" y="1971">Symbols should be outlined when exporting to ensure the</tspan>
-                </text>
-                <text id="design-is-preserved-when-submitting-to-Xcode." fill="#000000" fill-rule="nonzero"
-                    font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="1289" y="1989">design is preserved when submitting to Xcode.</tspan>
-                </text>
-                <text id="template-version" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2952" y="1933">Template v.5.0</tspan>
-                </text>
-                <text id="Requires-Xcode-15-or-greater" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="2865" y="1951">Requires Xcode 15 or greater</tspan>
-                </text>
-                <text id="descriptive-name" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2835" y="1969">Generated from double.checkmark</tspan>
-                </text>
-                <text id="Typeset-at-100.0-points" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="2901" y="1987">Typeset at 100.0 points</tspan>
-                </text>
-                <text id="Small" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="726">Small</tspan>
-                </text>
-                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="1156">Medium</tspan>
-                </text>
-                <text id="Large" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="1586">Large</tspan>
-                </text>
-            </g>
-            <g id="Guides" transform="translate(263, 600.785)">
-                <g id="H-reference" transform="translate(76.9937, 24.756)" fill="#27AAE1" fill-rule="nonzero">
-                    <path
-                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="0" y1="95.215" x2="2773" y2="95.215" id="Baseline-S" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="0" y1="24.756" x2="2773" y2="24.756" id="Capline-S" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <g id="H-reference" transform="translate(76.9937, 454.756)" fill="#27AAE1" fill-rule="nonzero">
-                    <path
-                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="0" y1="525.215" x2="2773" y2="525.215" id="Baseline-M" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="0" y1="454.755" x2="2773" y2="454.755" id="Capline-M" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <g id="H-reference" transform="translate(76.9937, 884.756)" fill="#27AAE1" fill-rule="nonzero">
-                    <path
-                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="0" y1="955.215" x2="2773" y2="955.215" id="Baseline-L" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="0" y1="884.755" x2="2773" y2="884.755" id="Capline-L" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="256.625" y1="1.13686838e-13" x2="256.625" y2="119.336" id="left-margin-Ultralight-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="348.798" y1="1.13686838e-13" x2="348.798" y2="119.336" id="right-margin-Ultralight-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="1143.53" y1="1.13686838e-13" x2="1143.53" y2="119.336" id="left-margin-Regular-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="1257.15" y1="1.13686838e-13" x2="1257.15" y2="119.336" id="right-margin-Regular-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="2622.62" y1="1.13686838e-13" x2="2622.62" y2="119.336" id="left-margin-Black-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="2760.18" y1="1.13686838e-13" x2="2760.18" y2="119.336" id="right-margin-Black-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-            </g>
-            <g id="Symbols" transform="translate(529.3906, 625.2969)" stroke="#000000" stroke-width="0.5">
-                <g id="Black-S" transform="translate(2365.995, 0)">
-                    <path
-                        d="M67.46878,71.191381 C71.17968,71.191381 74.06058,69.873022 76.01368,66.99216 L111.07228,15.2343 C112.43948,13.2324 113.02538,11.1328 113.02538,9.2773 C113.02538,4.0039 108.82618,0 103.35738,0 C99.69528,0 97.30278,1.3183 95.05668,4.834 L67.32228,47.9492 L53.69918,32.6172 C51.79488,30.4687 49.54888,29.4433 46.52148,29.4433 C41.05278,29.4433 37,33.4472 37,38.7695 C37,41.2109 37.63478,43.1152 39.73438,45.459 L59.36328,67.67576 C61.51168,70.117162 64.14848,71.191381 67.46878,71.191381 Z"
-                        id="Path"></path>
-                    <path
-                        d="M9.52148,29.4433 C12.54888,29.4433 14.79488,30.4687 16.69918,32.6172 L30.32228,47.9492 L32.291,44.888 L44.484,58.915 L39.01368,66.99216 C37.1235832,69.780091 34.3645791,71.1046997 30.825305,71.1872572 L30.46878,71.191381 C27.14848,71.191381 24.51168,70.117162 22.36328,67.67576 L2.73438,45.459 C0.63478,43.1152 0,41.2109 0,38.7695 C0,33.4472 4.05278,29.4433 9.52148,29.4433 Z M66.35738,0 C71.82618,0 76.02538,4.0039 76.02538,9.2773 C76.02538,11.1328 75.43948,13.2324 74.07228,15.2343 L61.951,33.129 L49.252,18.52 L58.05668,4.834 C60.2386057,1.41874857 62.5586852,0.0771252245 66.0465687,0.00324899359 Z"
-                        id="Combined-Shape"></path>
-                </g>
-                <g id="Regular-S" transform="translate(886.905, 3.7109)">
-                    <path
-                        d="M55.87888,66.113294 C57.78318,66.113294 59.29688,65.28322 60.37108,63.62306 L95.96678,7.3242 C96.79688,6.0547 97.08988,5.0293 97.08988,4.0039 C97.08988,1.6113 95.52738,0 93.08598,0 C91.32818,0 90.35158,0.586 89.27738,2.2949 L55.68358,56.2012 L38.00778,32.3731 C36.88478,30.8594 35.81058,30.2246 34.19918,30.2246 C31.75778,30.2246 30,31.9336 30,34.375 C30,35.4004 30.43948,36.5234 31.26958,37.5977 L51.24028,63.5254 C52.60738,65.28322 53.97458,66.113294 55.87888,66.113294 Z"
-                        id="Path"></path>
-                    <path
-                        d="M4.19918,30.2246 C5.81058,30.2246 6.88478,30.8594 8.00778,32.3731 L25.68358,56.2012 L30.332,48.741 L35.554,55.426 L30.37108,63.62306 C29.3457073,65.2077582 27.919881,66.0361177 26.1361316,66.1081489 L25.87888,66.113294 C23.97458,66.113294 22.60738,65.28322 21.24028,63.5254 L1.26958,37.5977 C0.43948,36.5234 0,35.4004 0,34.375 C0,31.9336 1.75778,30.2246 4.19918,30.2246 Z M63.08598,0 C65.52738,0 67.08988,1.6113 67.08988,4.0039 C67.08988,5.0293 66.79688,6.0547 65.96678,7.3242 L48.893,34.328 L43.564,27.508 L59.27738,2.2949 C60.3068217,0.657204167 61.2466272,0.0507828125 62.8702602,0.00309092159 Z"
-                        id="Combined-Shape"></path>
-                </g>
-                <g id="Ultralight-S" transform="translate(0, 4.4375)">
-                    <path
-                        d="M36.79298,62.07178 C37.24418,62.07178 37.53178,61.87744 37.78868,61.53417 L76.33598,2.0112 C76.57578,1.6045 76.64168,1.3965 76.64168,1.1885 C76.64168,0.5215 76.12358,0 75.45318,0 C75.01228,0 74.71678,0.1772 74.50538,0.5693 L36.73398,58.97114 L18.24078,37.7768 C17.98048,37.3984 17.67828,37.2177 17.20218,37.2177 C16.48638,37.2177 16,37.7006 16,38.371 C16,38.6699 16.12159,38.9755 16.40678,39.2778 L35.65088,61.52733 C36.01908,61.96826 36.29638,62.07178 36.79298,62.07178 Z"
-                        id="Path"></path>
-                    <path
-                        d="M1.20218,37.2177 C1.67828,37.2177 1.98048,37.3984 2.24078,37.7768 L20.73398,58.97114 L23.078,55.345 L24.636,57.137 L21.78868,61.53417 C21.5603244,61.8392989 21.3077121,62.0267547 20.937503,62.0646445 L20.79298,62.07178 C20.29638,62.07178 20.01908,61.96826 19.65088,61.52733 L0.40678,39.2778 C0.12159,38.9755 0,38.6699 0,38.371 C0,37.7006 0.48638,37.2177 1.20218,37.2177 Z M59.45318,0 C60.12358,0 60.64168,0.5215 60.64168,1.1885 C60.64168,1.3965 60.57578,1.6045 60.33598,2.0112 L32.216,45.432 L30.652,43.634 L58.50538,0.5693 C58.6932911,0.220766667 58.9476516,0.0420308642 59.3115144,0.00661467764 Z"
-                        id="Combined-Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

apps/ios/Shared/Assets.xcassets/checkmark.wide.symbolset/Contents.json

@@ -1,12 +0,0 @@
-{
-  "info": {
-    "author": "xcode",
-    "version": 1
-  },
-  "symbols": [
-    {
-      "filename": "checkmark.wide.svg",
-      "idiom": "universal"
-    }
-  ]
-}

apps/ios/Shared/Assets.xcassets/checkmark.wide.symbolset/checkmark.wide.svg

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="3300px" height="2200px" viewBox="0 0 3300 2200" version="1.1" xmlns="http://www.w3.org/2000/svg"
-    xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>checkmark.wide</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="double.checkmark">
-            <g id="Notes">
-                <rect id="artboard" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="3300" height="2200"></rect>
-                <line x1="263" y1="292" x2="3036" y2="292" id="Path" stroke="#000000" stroke-width="0.5"></line>
-                <text id="Weight/Scale-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="263" y="322">Weight/Scale Variations</tspan>
-                </text>
-                <text id="Ultralight" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="533.711" y="322">Ultralight</tspan>
-                </text>
-                <text id="Thin" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="843.422" y="322">Thin</tspan>
-                </text>
-                <text id="Light" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1138.63" y="322">Light</tspan>
-                </text>
-                <text id="Regular" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1426.84" y="322">Regular</tspan>
-                </text>
-                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1723.06" y="322">Medium</tspan>
-                </text>
-                <text id="Semibold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2015.77" y="322">Semibold</tspan>
-                </text>
-                <text id="Bold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2326.48" y="322">Bold</tspan>
-                </text>
-                <text id="Heavy" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2618.19" y="322">Heavy</tspan>
-                </text>
-                <text id="Black" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2917.4" y="322">Black</tspan>
-                </text>
-                <line x1="263" y1="1903" x2="3036" y2="1903" id="Path" stroke="#000000" stroke-width="0.5"></line>
-                <g id="Group" transform="translate(264.3672, 1918.0684)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M7.88088,15.76172 C12.18752,15.76172 15.7715,12.1875 15.7715,7.88086 C15.7715,3.57422 12.17774,0 7.8711,0 C3.57422,0 0,3.57422 0,7.88086 C0,12.1875 3.58398,15.76172 7.88086,15.76172 L7.88088,15.76172 Z M7.88088,14.277344 C4.33596,14.277344 1.50392,11.435544 1.50392,7.880864 C1.50392,4.326184 4.32618,1.484384 7.8711,1.484384 C11.42578,1.484384 14.27734,4.326184 14.27734,7.880864 C14.27734,11.435544 11.43554,14.277344 7.88086,14.277344 L7.88088,14.277344 Z M4.28712,7.880864 C4.28712,8.310552 4.589854,8.60352 5.039074,8.60352 L7.138674,8.60352 L7.138674,10.72266 C7.138674,11.162114 7.431642,11.464848 7.86133,11.464848 C8.310548,11.464848 8.603518,11.162114 8.603518,10.72266 L8.603518,8.60352 L10.722658,8.60352 C11.162112,8.60352 11.464846,8.310552 11.464846,7.880864 C11.464846,7.44141 11.162112,7.138676 10.722658,7.138676 L8.603518,7.138676 L8.603518,5.029296 C8.603518,4.580078 8.31055,4.277342 7.86133,4.277342 C7.431642,4.277342 7.138674,4.580076 7.138674,5.029296 L7.138674,7.138676 L5.039074,7.138676 C4.589856,7.138676 4.28712,7.44141 4.28712,7.880864 Z"
-                        id="Shape"></path>
-                </g>
-                <g id="Group" transform="translate(283.254, 1915.9883)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M9.96094,19.92188 C15.41016,19.92188 19.92188,15.4004 19.92188,9.96094 C19.92188,4.51172 15.4004,0 9.95118,0 C4.51172,0 0,4.51172 0,9.96094 C0,15.4004 4.52148,19.92188 9.96094,19.92188 Z M9.96094,18.261724 C5.35156,18.261724 1.66992,14.570324 1.66992,9.960944 C1.66992,5.351564 5.3418,1.660164 9.95116,1.660164 C14.56052,1.660164 18.2617,5.351564 18.2617,9.960944 C18.2617,14.570324 14.5703,18.261724 9.96092,18.261724 L9.96094,18.261724 Z M5.4297,9.960944 C5.4297,10.43946 5.761732,10.761726 6.259778,10.761726 L9.130878,10.761726 L9.130878,13.642586 C9.130878,14.130868 9.46291,14.472664 9.941424,14.472664 C10.4297,14.472664 10.771502,14.140632 10.771502,13.642586 L10.771502,10.761726 L13.652362,10.761726 C14.140644,10.761726 14.48244,10.43946 14.48244,9.960944 C14.48244,9.472662 14.140644,9.130866 13.652362,9.130866 L10.771502,9.130866 L10.771502,6.259766 C10.771502,5.76172 10.4297,5.419922 9.941424,5.419922 C9.462908,5.419922 9.130878,5.761718 9.130878,6.259766 L9.130878,9.130866 L6.259778,9.130866 C5.761732,9.130866 5.4297,9.472662 5.4297,9.960944 Z"
-                        id="Shape"></path>
-                </g>
-                <g id="Group" transform="translate(307.1798, 1913.2246)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M12.71486,25.43944 C19.67776,25.43944 25.43946,19.67772 25.43946,12.7246 C25.43946,5.7617 19.66798,0 12.70508,0 C5.75196,0 -1.42108547e-15,5.76172 -1.42108547e-15,12.7246 C-1.42108547e-15,19.67772 5.76172,25.43944 12.71484,25.43944 L12.71486,25.43944 Z M12.71486,23.623034 C6.6797,23.623034 1.82618,18.759754 1.82618,12.724594 C1.82618,6.679674 6.66994,1.826154 12.70508,1.826154 C18.75,1.826154 23.61328,6.679674 23.61328,12.724594 C23.61328,18.759754 18.75976,23.623034 12.71484,23.623034 L12.71486,23.623034 Z M6.94338,12.724594 C6.94338,13.242172 7.314474,13.6035 7.861348,13.6035 L11.806668,13.6035 L11.806668,17.55858 C11.806668,18.09569 12.177762,18.476548 12.69534,18.476548 C13.23245,18.476548 13.603544,18.105454 13.603544,17.55858 L13.603544,13.6035 L17.558624,13.6035 C18.095734,13.6035 18.476592,13.242172 18.476592,12.724594 C18.476592,12.177718 18.105498,11.806626 17.558624,11.806626 L13.603544,11.806626 L13.603544,7.861306 C13.603544,7.31443 13.23245,6.933572 12.69534,6.933572 C12.177762,6.933572 11.806668,7.314432 11.806668,7.861306 L11.806668,11.806626 L7.861348,11.806626 C7.314472,11.806626 6.94338,12.17772 6.94338,12.724594 Z"
-                        id="Shape"></path>
-                </g>
-                <text id="Design-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="1953">Design Variations</tspan>
-                </text>
-                <text id="Symbols-are-supported-in-up-to-nine-weights-and-three-scales." fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="263" y="1971">Symbols are supported in up to nine weights and three scales.</tspan>
-                </text>
-                <text id="For-optimal-layout-with-text-and-other-symbols,-vertically-align" fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="263" y="1989">For optimal layout with text and other symbols, vertically align</tspan>
-                </text>
-                <text id="symbols-with-the-adjacent-text." fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="263" y="2007">symbols with the adjacent text.</tspan>
-                </text>
-                <line x1="776" y1="1919" x2="776" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5"></line>
-                <g id="Group" transform="translate(778.4902, 1918.7324)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M0.8203116,14.423832 C1.3378896,14.423832 1.5917956,14.2285116 1.7773436,13.681636 L3.0371096,10.234376 L8.7988296,10.234376 L10.0585956,13.681636 C10.2441424,14.228512 10.4980496,14.423832 11.0058616,14.423832 C11.5234396,14.423832 11.8554716,14.111324 11.8554716,13.623042 C11.8554716,13.4570264 11.8261748,13.300776 11.7480498,13.095698 L7.1679698,0.898438 C6.9433598,0.302734 6.5429698,0 5.9179698,0 C5.3125018,0 4.9023458,0.292968 4.6875018,0.888672 L0.1074218,13.105472 C0.0292968,13.31055 -3.55271368e-16,13.4668 -3.55271368e-16,13.632816 C-3.55271368e-16,14.121098 0.3125,14.423832 0.820312,14.423832 L0.8203116,14.423832 Z M3.5156316,8.750004 L5.8886716,2.177744 L5.9374998,2.177744 L8.3105398,8.750004 L3.5156316,8.750004 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="792.836" y1="1919" x2="792.836" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5">
-                </line>
-                <text id="Margins" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="776" y="1953">Margins</tspan>
-                </text>
-                <text id="Leading-and-trailing-margins-on-the-left-and-right-side-of-each-symbol" fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="776" y="1971">Leading and trailing margins on the left and right side of each symbol
-                    </tspan>
-                </text>
-                <text id="can-be-adjusted-by-modifying-the-x-location-of-the-margin-guidelines." fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="776" y="1989">can be adjusted by modifying the x-location of the margin guidelines.
-                    </tspan>
-                </text>
-                <text id="Modifications-are-automatically-applied-proportionally-to-all" fill="#000000"
-                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="776" y="2007">Modifications are automatically applied proportionally to all</tspan>
-                </text>
-                <text id="scales-and-weights." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="776" y="2025">scales and weights.</tspan>
-                </text>
-                <g id="Group" transform="translate(1291.2481, 1914.5174)" fill="#000000" fill-rule="nonzero">
-                    <path
-                        d="M0.593687825,20.3477978 L2.29290583,22.0567818 C3.15228183,22.9259218 4.13860983,22.8673278 5.06634583,21.8419378 L15.7597058,10.0548378 L14.7929098,9.07827578 L4.17766983,20.7579558 C3.82610783,21.1583458 3.49407583,21.2560018 3.02532583,20.7872526 L1.85344983,19.6251426 C1.38469983,19.1661586 1.49212183,18.8243606 1.89251223,18.4630326 L13.3671122,7.66225258 L12.3905502,6.69545658 L0.798750225,17.5841366 C-0.187577775,18.5021046 -0.265703775,19.4786686 0.593672225,20.3478166 L0.593687825,20.3477978 Z M7.00970783,2.15443778 C6.58978583,2.56459378 6.56048983,3.14076578 6.79486383,3.53139178 C7.02923983,3.89271978 7.48822383,4.12709578 8.13275383,3.96107978 C9.59759783,3.61928378 11.1210338,3.56068978 12.5468138,4.49818978 L11.9608758,5.95326778 C11.6190798,6.78334578 11.7948602,7.36928378 12.3319698,7.91615778 L14.6268898,10.2306178 C15.1151718,10.7188998 15.5253278,10.7384298 16.0917338,10.6407738 L17.1561878,10.4454614 L17.8202498,11.1192894 L17.7811874,11.6759294 C17.742125,12.1739754 17.869078,12.5548354 18.3573594,13.0333514 L19.1190774,13.7755394 C19.5975934,14.2540554 20.2128274,14.2833514 20.6815774,13.8146018 L23.5917374,10.8946818 C24.0604874,10.4259318 24.0409554,9.83022778 23.5624406,9.35171378 L22.7909566,8.58999578 C22.3124406,8.11147978 21.9413466,7.95522978 21.4628326,7.99429178 L20.8866606,8.04311998 L20.2421286,7.40835398 L20.4862686,6.28530798 C20.6132218,5.71890198 20.4569718,5.27944798 19.8710346,4.69351198 L17.6737746,2.50601198 C14.3339346,-0.814308021 9.90033463,-0.736168021 7.00971463,2.15444998 L7.00970783,2.15443778 Z M8.50384783,2.52553178 C10.9354878,0.748187779 14.2265078,1.05092178 16.4530678,3.27748578 L18.8847078,5.68958578 C19.1190838,5.92396178 19.1581458,6.10950778 19.0897858,6.45130378 L18.7675198,7.93567978 L20.2714258,9.42005578 L21.2577538,9.36146198 C21.5116598,9.35169636 21.5897858,9.3712276 21.7850978,9.56653998 L22.3612698,10.142712 L19.9198698,12.584112 L19.3436978,12.00794 C19.1483854,11.8126276 19.1190878,11.734502 19.1288538,11.47083 L19.1972132,10.494268 L17.7030732,9.00989198 L16.1796352,9.26379798 C15.8573692,9.33215738 15.7108852,9.30286038 15.4667452,9.06848558 L13.4647852,7.06652558 C13.2108792,6.83214958 13.1815812,6.66613558 13.337832,6.29504158 L14.216738,4.20520158 C12.654238,2.75012358 10.622978,2.12512158 8.59173803,2.72082558 C8.43548803,2.75988798 8.37689403,2.63293498 8.50384743,2.52551318 L8.50384783,2.52553178 Z"
-                        id="Shape"></path>
-                </g>
-                <text id="Exporting" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="1289" y="1953">Exporting</tspan>
-                </text>
-                <text id="Symbols-should-be-outlined-when-exporting-to-ensure-the" fill="#000000" fill-rule="nonzero"
-                    font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="1289" y="1971">Symbols should be outlined when exporting to ensure the</tspan>
-                </text>
-                <text id="design-is-preserved-when-submitting-to-Xcode." fill="#000000" fill-rule="nonzero"
-                    font-family="Helvetica" font-size="13" font-weight="normal">
-                    <tspan x="1289" y="1989">design is preserved when submitting to Xcode.</tspan>
-                </text>
-                <text id="template-version" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2952" y="1933">Template v.5.0</tspan>
-                </text>
-                <text id="Requires-Xcode-15-or-greater" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="2865" y="1951">Requires Xcode 15 or greater</tspan>
-                </text>
-                <text id="descriptive-name" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="2835" y="1969">Generated from double.checkmark</tspan>
-                </text>
-                <text id="Typeset-at-100.0-points" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
-                    font-size="13" font-weight="normal">
-                    <tspan x="2901" y="1987">Typeset at 100.0 points</tspan>
-                </text>
-                <text id="Small" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="726">Small</tspan>
-                </text>
-                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="1156">Medium</tspan>
-                </text>
-                <text id="Large" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
-                    font-weight="normal">
-                    <tspan x="263" y="1586">Large</tspan>
-                </text>
-            </g>
-            <g id="Guides" transform="translate(263, 600.785)">
-                <g id="H-reference" transform="translate(76.9937, 24.756)" fill="#27AAE1" fill-rule="nonzero">
-                    <path
-                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="0" y1="95.215" x2="2773" y2="95.215" id="Baseline-S" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="0" y1="24.756" x2="2773" y2="24.756" id="Capline-S" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <g id="H-reference" transform="translate(76.9937, 454.756)" fill="#27AAE1" fill-rule="nonzero">
-                    <path
-                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="0" y1="525.215" x2="2773" y2="525.215" id="Baseline-M" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="0" y1="454.755" x2="2773" y2="454.755" id="Capline-M" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <g id="H-reference" transform="translate(76.9937, 884.756)" fill="#27AAE1" fill-rule="nonzero">
-                    <path
-                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
-                        id="Shape"></path>
-                </g>
-                <line x1="0" y1="955.215" x2="2773" y2="955.215" id="Baseline-L" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="0" y1="884.755" x2="2773" y2="884.755" id="Capline-L" stroke="#27AAE1" stroke-width="0.5">
-                </line>
-                <line x1="256.625" y1="1.13686838e-13" x2="256.625" y2="119.336" id="left-margin-Ultralight-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="348.798" y1="1.13686838e-13" x2="348.798" y2="119.336" id="right-margin-Ultralight-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="1143.53" y1="1.13686838e-13" x2="1143.53" y2="119.336" id="left-margin-Regular-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="1257.15" y1="1.13686838e-13" x2="1257.15" y2="119.336" id="right-margin-Regular-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="2622.62" y1="1.13686838e-13" x2="2622.62" y2="119.336" id="left-margin-Black-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-                <line x1="2760.18" y1="1.13686838e-13" x2="2760.18" y2="119.336" id="right-margin-Black-S"
-                    stroke="#00AEEF" stroke-width="0.5"></line>
-            </g>
-            <g id="Symbols" transform="translate(529.3906, 625.2969)" stroke="#000000" stroke-width="0.5">
-                <g id="Black-S" transform="translate(2365.995, 0)">
-                    <path
-                        d="M30.46878,71.191381 C34.17968,71.191381 37.06058,69.873022 39.01368,66.99216 L74.07228,15.2343 C75.43948,13.2324 76.02538,11.1328 76.02538,9.2773 C76.02538,4.0039 71.82618,0 66.35738,0 C62.69528,0 60.30278,1.3183 58.05668,4.834 L30.32228,47.9492 L16.69918,32.6172 C14.79488,30.4687 12.54888,29.4433 9.52148,29.4433 C4.05278,29.4433 0,33.4472 0,38.7695 C0,41.2109 0.63478,43.1152 2.73438,45.459 L22.36328,67.67576 C24.51168,70.117162 27.14848,71.191381 30.46878,71.191381 Z"
-                        id="Path"></path>
-                </g>
-                <g id="Regular-S" transform="translate(886.905, 3.7109)">
-                    <path
-                        d="M25.87888,66.113294 C27.78318,66.113294 29.29688,65.28322 30.37108,63.62306 L65.96678,7.3242 C66.79688,6.0547 67.08988,5.0293 67.08988,4.0039 C67.08988,1.6113 65.52738,0 63.08598,0 C61.32818,0 60.35158,0.586 59.27738,2.2949 L25.68358,56.2012 L8.00778,32.3731 C6.88478,30.8594 5.81058,30.2246 4.19918,30.2246 C1.75778,30.2246 0,31.9336 0,34.375 C0,35.4004 0.43948,36.5234 1.26958,37.5977 L21.24028,63.5254 C22.60738,65.28322 23.97458,66.113294 25.87888,66.113294 Z"
-                        id="Path"></path>
-                </g>
-                <g id="Ultralight-S" transform="translate(0, 4.4375)">
-                    <path
-                        d="M20.79298,62.07178 C21.24418,62.07178 21.53178,61.87744 21.78868,61.53417 L60.33598,2.0112 C60.57578,1.6045 60.64168,1.3965 60.64168,1.1885 C60.64168,0.5215 60.12358,0 59.45318,0 C59.01228,0 58.71678,0.1772 58.50538,0.5693 L20.73398,58.97114 L2.24078,37.7768 C1.98048,37.3984 1.67828,37.2177 1.20218,37.2177 C0.48638,37.2177 0,37.7006 0,38.371 C0,38.6699 0.12159,38.9755 0.40678,39.2778 L19.65088,61.52733 C20.01908,61.96826 20.29638,62.07178 20.79298,62.07178 Z"
-                        id="Path"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

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

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

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

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

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

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

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

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

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

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

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

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

apps/ios/Shared/ContentView.swift

@@ -13,10 +13,7 @@ struct ContentView: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var alertManager = AlertManager.shared
     @ObservedObject var callController = CallController.shared
-    @ObservedObject var appSheetState = AppSheetState.shared
     @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var sceneDelegate: SceneDelegate
 
     var contentAccessAuthenticationExtended: Bool
 
@@ -30,14 +27,14 @@ struct ContentView: View {
     @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
     @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
     @AppStorage(DEFAULT_NOTIFICATION_ALERT_SHOWN) private var notificationAlertShown = false
+    @State private var showSettings = false
     @State private var showWhatsNew = false
     @State private var showChooseLAMode = false
     @State private var showSetPasscode = false
     @State private var waitingForOrPassedAuth = true
     @State private var chatListActionSheet: ChatListActionSheet? = nil
-    @State private var chatListUserPickerSheet: UserPickerSheet? = nil
 
-    private let callTopPadding: CGFloat = 40
+    private let callTopPadding: CGFloat = 50
 
     private enum ChatListActionSheet: Identifiable {
         case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
@@ -54,16 +51,6 @@ struct ContentView: View {
     }
 
     var body: some View {
-        if #available(iOS 16.0, *) {
-            allViews()
-                .scrollContentBackground(.hidden)
-        } else {
-            // on iOS 15 scroll view background disabled in SceneDelegate
-            allViews()
-        }
-    }
-
-    @ViewBuilder 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.
@@ -87,7 +74,7 @@ struct ContentView: View {
                 callView(call)
             }
 
-            if chatListUserPickerSheet == nil, let la = chatModel.laRequest {
+            if !showSettings, let la = chatModel.laRequest {
                 LocalAuthView(authRequest: la)
                     .onDisappear {
                         // this flag is separate from accessAuthenticated to show initializationView while we wait for authentication
@@ -110,6 +97,9 @@ struct ContentView: View {
             }
         }
         .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
+        .sheet(isPresented: $showSettings) {
+            SettingsView(showSettings: $showSettings)
+        }
         .confirmationDialog("SimpleX Lock mode", isPresented: $showChooseLAMode, titleVisibility: .visible) {
             Button("System authentication") { initialEnableLA() }
             Button("Passcode entry") { showSetPasscode = true }
@@ -148,17 +138,6 @@ struct ContentView: View {
                 break
             }
         }
-        .onAppear {
-            reactOnDarkThemeChanges(systemInDarkThemeCurrently)
-        }
-        .onChange(of: colorScheme) { scheme in
-            // It's needed to update UI colors when iOS wants to make screenshot after going to background,
-            // so when a user changes his global theme from dark to light or back, the app will adapt to it
-            reactOnDarkThemeChanges(scheme == .dark)
-        }
-        .onChange(of: theme.name) { _ in
-            ThemeManager.adjustWindowStyle()
-        }
     }
 
     @ViewBuilder private func contentView() -> some View {
@@ -205,7 +184,7 @@ struct ContentView: View {
             CallDuration(call: call)
         }
         .padding(.horizontal)
-        .frame(height: callTopPadding)
+        .frame(height: callTopPadding - 10)
         .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
         .onTapGesture {
             chatModel.activeCallViewIsCollapsed = false
@@ -245,14 +224,13 @@ struct ContentView: View {
         .frame(maxWidth: .infinity, maxHeight: .infinity )
         .background(
             Rectangle()
-                .fill(theme.colors.background)
-        )
+                .fill(.background)
+        ) 
     }
 
     private func mainView() -> some View {
         ZStack(alignment: .top) {
-            ChatListView(activeUserPickerSheet: $chatListUserPickerSheet)
-                .redacted(reason: appSheetState.redactionReasons(protectScreen))
+            ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
             .onAppear {
                 requestNtfAuthorization()
                 // Local Authentication notice is to be shown on next start after onboarding is complete
@@ -299,18 +277,9 @@ struct ContentView: View {
         if let contactId = contacts?.first?.personHandle?.value,
            let chat = chatModel.getChat(contactId),
            case let .direct(contact) = chat.chatInfo {
-            let activeCall = chatModel.activeCall
-            // This line works when a user clicks on a video button in CallKit UI while in call.
-            // The app tries to make another call to the same contact and overwite activeCall instance making its state broken
-            if let activeCall, contactId == activeCall.contact.id, mediaType == .video, !activeCall.hasVideo {
-                Task {
-                    await chatModel.callCommand.processCommand(.media(source: .camera, enable: true))
-                }
-            } else if activeCall == nil {
-                logger.debug("callToRecentContact: schedule call")
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    CallController.shared.startCall(contact, mediaType)
-                }
+            logger.debug("callToRecentContact: schedule call")
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                CallController.shared.startCall(contact, mediaType)
             }
         }
     }

apps/ios/Shared/Model/AudioRecPlay.swift

@@ -179,7 +179,7 @@ class AudioPlayer: NSObject, AVAudioPlayerDelegate {
         if playback {
             if AVAudioSession.sharedInstance().category != .playback {
                 logger.log("AudioSession: playback")
-                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: [.duckOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
+                try? AVAudioSession.sharedInstance().setCategory(AVAudioSession.Category.playback, options: .duckOthers)
             }
         } else {
             if AVAudioSession.sharedInstance().category != .soloAmbient {

apps/ios/Shared/Model/ChatModel.swift

@@ -43,103 +43,11 @@ private func addTermItem(_ items: inout [TerminalItem], _ item: TerminalItem) {
     items.append(item)
 }
 
-class ItemsModel: ObservableObject {
-    static let shared = ItemsModel()
-    private let publisher = ObservableObjectPublisher()
-    private var bag = Set<AnyCancellable>()
-    var reversedChatItems: [ChatItem] = [] {
-        willSet { publisher.send() }
-    }
-    var itemAdded = false {
-        willSet { publisher.send() }
-    }
-    
-    // Publishes directly to `objectWillChange` publisher,
-    // this will cause reversedChatItems to be rendered without throttling
-    @Published var isLoading = false
-    @Published var showLoadingProgress = false
-
-    init() {
-        publisher
-            .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
-            .sink { self.objectWillChange.send() }
-            .store(in: &bag)
-    }
-
-    func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
-        let navigationTimeout = Task {
-            do {
-                try await Task.sleep(nanoseconds: 250_000000)
-                await MainActor.run {
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            } 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) {
-                await MainActor.run { self.isLoading = true }
-//                try? await Task.sleep(nanoseconds: 5000_000000)
-                await loadChat(chat: chat)
-                navigationTimeout.cancel()
-                progressTimeout.cancel()
-                await MainActor.run {
-                    self.isLoading = false
-                    self.showLoadingProgress = false
-                    willNavigate()
-                    ChatModel.shared.chatId = chatId
-                }
-            }
-        }
-    }
-}
-
-class NetworkModel: ObservableObject {
-    // map of connections network statuses, key is agent connection id
-    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
-
-    static let shared = NetworkModel()
-
-    private init() { }
-
-    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
-    }
-
-    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
-    }
-}
-
-/// ChatItemWithMenu can depend on previous or next item for it's appearance
-/// This dummy model is used to force an update of all chat items,
-/// when they might have changed appearance.
-class ChatItemDummyModel: ObservableObject {
-    static let shared = ChatItemDummyModel()
-    func sendUpdate() { objectWillChange.send() }
-}
-
 final class ChatModel: ObservableObject {
     @Published var onboardingStage: OnboardingStage?
     @Published var setDeliveryReceipts = false
     @Published var v3DBMigration: V3DBMigrationState = v3DBMigrationDefault.get()
-    @Published var currentUser: User? {
-        didSet {
-            ThemeManager.applyTheme(currentThemeDefault.get())
-        }
-    }
+    @Published var currentUser: User?
     @Published var users: [UserInfo] = []
     @Published var chatInitialized = false
     @Published var chatRunning: Bool?
@@ -147,20 +55,20 @@ final class ChatModel: ObservableObject {
     @Published var chatDbEncrypted: Bool?
     @Published var chatDbStatus: DBMigrationResult?
     @Published var ctrlInitInProgress: Bool = false
-    @Published var notificationResponse: UNNotificationResponse?
     // local authentication
     @Published var contentViewAccessAuthenticated: Bool = false
     @Published var laRequest: LocalAuthRequest?
     // list of chat "previews"
-    @Published private(set) var chats: [Chat] = []
+    @Published var chats: [Chat] = []
     @Published var deletedChats: Set<String> = []
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
     // current chat
     @Published var chatId: String?
+    @Published var reversedChatItems: [ChatItem] = []
     var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
     @Published var chatToTop: String?
     @Published var groupMembers: [GMember] = []
-    @Published var groupMembersIndexes: Dictionary<Int64, Int> = [:] // groupMemberId to index in groupMembers list
-    @Published var membersLoaded = false
     // items in the terminal view
     @Published var showingTerminal = false
     @Published var terminalItems: [TerminalItem] = []
@@ -192,7 +100,9 @@ final class ChatModel: ObservableObject {
     @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
-    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)
+    // tracks keyboard height via subscription in AppDelegate
+    @Published var keyboardHeight: CGFloat = 0
+    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
@@ -200,8 +110,6 @@ final class ChatModel: ObservableObject {
 
     static let shared = ChatModel()
 
-    let im = ItemsModel.shared
-
     static var ok: Bool { ChatModel.shared.chatDbStatus == .ok }
 
     let ntfEnableLocal = true
@@ -267,47 +175,18 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func populateGroupMembersIndexes() {
-        groupMembersIndexes.removeAll()
-        for (i, member) in groupMembers.enumerated() {
-            groupMembersIndexes[member.groupMemberId] = i
-        }
-    }
-
     func getGroupMember(_ groupMemberId: Int64) -> GMember? {
-        if let i = groupMembersIndexes[groupMemberId] {
-            return groupMembers[i]
-        }
-        return nil
-    }
-
-    func loadGroupMembers(_ groupInfo: GroupInfo, updateView: @escaping () -> Void = {}) async {
-        let groupMembers = await apiListMembers(groupInfo.groupId)
-        await MainActor.run {
-            if chatId == groupInfo.id {
-                self.groupMembers = groupMembers.map { GMember.init($0) }
-                self.populateGroupMembersIndexes()
-                self.membersLoaded = true
-                updateView()
-            }
-        }
+        groupMembers.first { $0.groupMemberId == groupMemberId }
     }
 
     private func getChatIndex(_ id: String) -> Int? {
         chats.firstIndex(where: { $0.id == id })
     }
 
-    func addChat(_ chat: Chat) {
-        if chatId == nil {
-            withAnimation { addChat_(chat, at: 0) }
-        } else {
-            addChat_(chat, at: 0)
+    func addChat(_ chat: Chat, at position: Int = 0) {
+        withAnimation {
+            chats.insert(chat, at: position)
         }
-        popChatCollector.throttlePopChat(chat.chatInfo.id, currentPosition: 0)
-    }
-
-    func addChat_(_ chat: Chat, at position: Int = 0) {
-        chats.insert(chat, at: position)
     }
 
     func updateChatInfo(_ cInfo: ChatInfo) {
@@ -365,10 +244,26 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateChats(_ newChats: [ChatData]) {
-        chats = newChats.map { Chat($0) }
+    func updateChats(with newChats: [ChatData]) {
+        for i in 0..<newChats.count {
+            let c = newChats[i]
+            if let j = getChatIndex(c.id)   {
+                let chat = chats[j]
+                chat.chatInfo = c.chatInfo
+                chat.chatItems = c.chatItems
+                chat.chatStats = c.chatStats
+                if i != j {
+                    if chatId != c.chatInfo.id  {
+                        popChat_(j, to: i)
+                    }  else if i == 0 {
+                        chatToTop = c.chatInfo.id
+                    }
+                }
+            } else {
+                addChat(Chat(c), at: i)
+            }
+        }
         NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
-        popChatCollector.clear()
     }
 
 //    func addGroup(_ group: SimpleXChat.Group) {
@@ -376,12 +271,6 @@ final class ChatModel: ObservableObject {
 //    }
 
     func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        // mark chat non deleted
-        if case let .direct(contact) = cInfo, contact.chatDeleted {
-            var updatedContact = contact
-            updatedContact.chatDeleted = false
-            updateContact(updatedContact)
-        }
         // update previews
         if let i = getChatIndex(cInfo.id) {
             chats[i].chatItems = switch cInfo {
@@ -399,9 +288,18 @@ final class ChatModel: ObservableObject {
                 [cItem]
             }
             if case .rcvNew = cItem.meta.itemStatus {
-                unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
+                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
+                increaseUnreadCounter(user: currentUser!)
+            }
+            if i > 0 {
+                if chatId == nil {
+                    withAnimation { popChat_(i) }
+                } else if chatId == cInfo.id  {
+                    chatToTop = cInfo.id
+                } else {
+                    popChat_(i)
+                }
             }
-            popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
         } else {
             addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
         }
@@ -416,7 +314,7 @@ final class ChatModel: ObservableObject {
         var res: Bool
         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) {
+                if pItem.id == cItem.id || (chatId == cInfo.id && reversedChatItems.first(where: { $0.id == cItem.id }) == nil) {
                     chat.chatItems = [cItem]
                 }
             } else {
@@ -427,26 +325,24 @@ final class ChatModel: ObservableObject {
             addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
             res = true
         }
-        if cItem.isDeletedContent || cItem.meta.itemDeleted != nil {
-            VoiceItemState.stopVoiceInChatView(cInfo, cItem)
-        }
         // update current chat
         return chatId == cInfo.id ? _upsertChatItem(cInfo, cItem) : res
     }
 
     private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
         if let i = getChatItemIndex(cItem) {
-            _updateChatItem(at: i, with: cItem)
-            ChatItemDummyModel.shared.sendUpdate()
+            withAnimation {
+                _updateChatItem(at: i, with: cItem)
+            }
             return false
         } else {
-            var ci = cItem
-            if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                ci.meta.itemStatus = status
+            withAnimation(itemAnimation()) {
+                var ci = cItem
+                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
+                    ci.meta.itemStatus = status
+                }
+                reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
             }
-            im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-            im.itemAdded = true
-            ChatItemDummyModel.shared.sendUpdate()
             return true
         }
 
@@ -460,7 +356,7 @@ final class ChatModel: ObservableObject {
 
     func updateChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem, status: CIStatus? = nil) {
         if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
-            withConditionalAnimation {
+            withAnimation {
                 _updateChatItem(at: i, with: cItem)
             }
         } else if let status = status {
@@ -469,17 +365,17 @@ final class ChatModel: ObservableObject {
     }
 
     private func _updateChatItem(at i: Int, with cItem: ChatItem) {
-        im.reversedChatItems[i] = cItem
-        im.reversedChatItems[i].viewTimestamp = .now
+        reversedChatItems[i] = cItem
+        reversedChatItems[i].viewTimestamp = .now
     }
 
     func getChatItemIndex(_ cItem: ChatItem) -> Int? {
-        im.reversedChatItems.firstIndex(where: { $0.id == cItem.id })
+        reversedChatItems.firstIndex(where: { $0.id == cItem.id })
     }
 
     func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
         if cItem.isRcvNew {
-            unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+            decreaseUnreadCounter(cInfo)
         }
         // update previews
         if let chat = getChat(cInfo.id) {
@@ -491,24 +387,23 @@ final class ChatModel: ObservableObject {
         if chatId == cInfo.id {
             if let i = getChatItemIndex(cItem) {
                 _ = withAnimation {
-                    im.reversedChatItems.remove(at: i)
+                    self.reversedChatItems.remove(at: i)
                 }
             }
         }
-        VoiceItemState.stopVoiceInChatView(cInfo, cItem)
     }
 
     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 }
+        guard var i = reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else { return nil }
         if previous {
-            while i < im.reversedChatItems.count - 1 {
+            while i < reversedChatItems.count - 1 {
                 i += 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
             }
         } else {
             while i > 0 {
                 i -= 1
-                if let res = map(im.reversedChatItems[i]) { return res }
+                if let res = map(reversedChatItems[i]) { return res }
             }
         }
         return nil
@@ -526,21 +421,10 @@ final class ChatModel: ObservableObject {
         }
     }
 
-    func updateCurrentUserUiThemes(uiThemes: ThemeModeOverrides?) {
-        guard var current = currentUser, current.uiThemes != uiThemes else { return }
-        current.uiThemes = uiThemes
-        let i = users.firstIndex(where: { $0.user.userId == current.userId })
-        if let i {
-            users[i].user = current
-        }
-        currentUser = current
-    }
-
     func addLiveDummy(_ chatInfo: ChatInfo) -> ChatItem {
         let cItem = ChatItem.liveDummy(chatInfo.chatType)
         withAnimation {
-            im.reversedChatItems.insert(cItem, at: 0)
-            im.itemAdded = true
+            reversedChatItems.insert(cItem, at: 0)
         }
         return cItem
     }
@@ -548,22 +432,21 @@ final class ChatModel: ObservableObject {
     func removeLiveDummy(animated: Bool = true) {
         if hasLiveDummy {
             if animated {
-                withAnimation { _ = im.reversedChatItems.removeFirst() }
+                withAnimation { _ = reversedChatItems.removeFirst() }
             } else {
-                _ = im.reversedChatItems.removeFirst()
+                _ = reversedChatItems.removeFirst()
             }
         }
     }
 
     private var hasLiveDummy: Bool {
-        im.reversedChatItems.first?.isLiveDummy == true
+        reversedChatItems.first?.isLiveDummy == true
     }
 
     func markChatItemsRead(_ cInfo: ChatInfo) {
         // update preview
         _updateChat(cInfo.id) { chat in
             self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
-            self.updateFloatingButtons(unreadCount: 0)
             chat.chatStats = ChatStats()
         }
         // update current chat
@@ -574,18 +457,12 @@ final class ChatModel: ObservableObject {
 
     private func markCurrentChatRead(fromIndex i: Int = 0) {
         var j = i
-        while j < im.reversedChatItems.count {
+        while j < 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) {
@@ -594,7 +471,7 @@ final class ChatModel: ObservableObject {
                     var unreadBelow = 0
                     var j = i - 1
                     while j >= 0 {
-                        if case .rcvNew = self.im.reversedChatItems[j].meta.itemStatus {
+                        if case .rcvNew = self.reversedChatItems[j].meta.itemStatus {
                             unreadBelow += 1
                         }
                         j -= 1
@@ -604,7 +481,6 @@ final class ChatModel: ObservableObject {
                     if markedCount > 0 {
                         chat.chatStats.unreadCount -= markedCount
                         self.decreaseUnreadCounter(user: self.currentUser!, by: markedCount)
-                        self.updateFloatingButtons(unreadCount: chat.chatStats.unreadCount)
                     }
                 }
             }
@@ -630,143 +506,51 @@ final class ChatModel: ObservableObject {
         // clear current chat
         if chatId == cInfo.id {
             chatItemStatuses = [:]
-            im.reversedChatItems = []
+            reversedChatItems = []
         }
     }
 
-    func markChatItemsRead(_ cInfo: ChatInfo, _ itemIds: [ChatItem.ID]) {
-        if self.chatId == cInfo.id {
-            for itemId in itemIds {
-                if let i = im.reversedChatItems.firstIndex(where: { $0.id == itemId }) {
-                    markChatItemRead_(i)
-                }
-            }
-        }
-        self.unreadCollector.changeUnreadCounter(cInfo.id, by: -itemIds.count)
-    }
-
-    private let unreadCollector = UnreadCollector()
-
-    class UnreadCollector {
-        private let subject = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var unreadCounts: [ChatId: 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)
-                        }
-                    }
-                    self.unreadCounts = [:]
-                }
-                .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
-            subject.send()
-        }
-    }
-
-    let popChatCollector = PopChatCollector()
-    
-    class PopChatCollector {
-        private let subject = PassthroughSubject<Void, Never>()
-        private var bag = Set<AnyCancellable>()
-        private var chatsToPop: [ChatId: Date] = [:]
-        private let popTsComparator = KeyPathComparator<Chat>(\.popTs, order: .reverse)
-
-        init() {
-            subject
-                .throttle(for: 2, scheduler: DispatchQueue.main, latest: true)
-                .sink { self.popCollectedChats() }
-                .store(in: &bag)
-        }
-        
-        func throttlePopChat(_ chatId: ChatId, currentPosition: Int) {
-            let m = ChatModel.shared
-            if currentPosition > 0 && m.chatId == chatId {
-                m.chatToTop = chatId
-            }
-            if currentPosition > 0 || !chatsToPop.isEmpty {
-                chatsToPop[chatId] = Date.now
-                subject.send()
-            }
-        }
-        
-        func clear() {
-            chatsToPop = [:]
-        }
-
-        func popCollectedChats() {
-            let m = ChatModel.shared
-            var ixs: IndexSet = []
-            var chs: [Chat] = []
-            // collect chats that received updates
-            for (chatId, popTs) in self.chatsToPop {
-                // Currently opened chat is excluded, removing it from the list would navigate out of it
-                // It will be popped to top later when user exits from the list.
-                if m.chatId != chatId, let i = m.getChatIndex(chatId) {
-                    ixs.insert(i)
-                    let ch = m.chats[i]
-                    ch.popTs = popTs
-                    chs.append(ch)
-                }
-            }
-
-            let removeInsert = {
-                m.chats.remove(atOffsets: ixs)
-                // sort chats by pop timestamp in descending order
-                m.chats.insert(contentsOf: chs.sorted(using: self.popTsComparator), at: 0)
-            }
-
-            if m.chatId == nil {
-                withAnimation { removeInsert() }
-            } else {
-                removeInsert()
-            }
-
-            self.chatsToPop = [:]
+    func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // update preview
+        decreaseUnreadCounter(cInfo)
+        // update current chat
+        if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
+            markChatItemRead_(i)
         }
     }
 
     private func markChatItemRead_(_ i: Int) {
-        let meta = im.reversedChatItems[i].meta
+        let meta = reversedChatItems[i].meta
         if case .rcvNew = meta.itemStatus {
-            im.reversedChatItems[i].meta.itemStatus = .rcvRead
-            im.reversedChatItems[i].viewTimestamp = .now
+            reversedChatItems[i].meta.itemStatus = .rcvRead
+            reversedChatItems[i].viewTimestamp = .now
             if meta.itemLive != true, let ttl = meta.itemTimed?.ttl {
-                im.reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
+                reversedChatItems[i].meta.itemTimed?.deleteAt = .now + TimeInterval(ttl)
             }
         }
     }
 
-    func changeUnreadCounter(_ chatIndex: Int, by count: Int) {
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount + count
-        changeUnreadCounter(user: currentUser!, by: count)
+    func decreaseUnreadCounter(_ cInfo: ChatInfo) {
+        if let i = getChatIndex(cInfo.id) {
+            chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount - 1
+            decreaseUnreadCounter(user: currentUser!)
+        }
     }
 
     func increaseUnreadCounter(user: any UserLike) {
         changeUnreadCounter(user: user, by: 1)
+        NtfManager.shared.incNtfBadgeCount()
     }
 
     func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
         changeUnreadCounter(user: user, by: -by)
+        NtfManager.shared.decNtfBadgeCount(by: by)
     }
 
     private func changeUnreadCounter(user: any UserLike, by: Int) {
         if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
             users[i].unreadCount += by
         }
-        NtfManager.shared.changeNtfBadgeCount(by: by)
     }
 
     func totalUnreadCountForAllUsers() -> Int {
@@ -780,8 +564,8 @@ final class ChatModel: ObservableObject {
         var ns: [String] = []
         if let ciCategory = chatItem.mergeCategory,
            var i = getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count {
-                let ci = im.reversedChatItems[i]
+            while i < reversedChatItems.count {
+                let ci = reversedChatItems[i]
                 if ci.mergeCategory != ciCategory { break }
                 if let m = ci.memberConnected {
                     ns.append(m.displayName)
@@ -796,7 +580,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) {
-            (i, i > 0 ? im.reversedChatItems[i - 1] : nil)
+            (i, i > 0 ? reversedChatItems[i - 1] : nil)
         } else {
             (nil, nil)
         }
@@ -806,10 +590,10 @@ final class ChatModel: ObservableObject {
     // and the previous visible item with another merge category
     func getPrevShownChatItem(_ ciIndex: Int?, _ ciCategory: CIMergeCategory?) -> (Int?, ChatItem?) {
         guard var i = ciIndex else { return (nil, nil) }
-        let fst = im.reversedChatItems.count - 1
+        let fst = reversedChatItems.count - 1
         while i < fst {
             i = i + 1
-            let ci = im.reversedChatItems[i]
+            let ci = reversedChatItems[i]
             if ciCategory == nil || ciCategory != ci.mergeCategory {
                 return (i - 1, ci)
             }
@@ -822,7 +606,7 @@ final class ChatModel: ObservableObject {
         var prevMember: GroupMember? = nil
         var memberIds: Set<Int64> = []
         for i in range {
-            if case let .groupRcv(m) = im.reversedChatItems[i].chatDir {
+            if case let .groupRcv(m) = reversedChatItems[i].chatDir {
                 if prevMember == nil && m.groupMemberId != member.groupMemberId { prevMember = m }
                 memberIds.insert(m.groupMemberId)
             }
@@ -832,7 +616,6 @@ final class ChatModel: ObservableObject {
 
     func popChat(_ id: String) {
         if let i = getChatIndex(id) {
-            // no animation here, for it not to look like it just moved when leaving the chat
             popChat_(i)
         }
     }
@@ -867,17 +650,14 @@ final class ChatModel: ObservableObject {
         }
         // update current chat
         if chatId == groupInfo.id {
-            if let i = groupMembersIndexes[member.groupMemberId] {
+            if let i = groupMembers.firstIndex(where: { $0.groupMemberId == member.groupMemberId }) {
                 withAnimation(.default) {
                     self.groupMembers[i].wrapped = member
                     self.groupMembers[i].created = Date.now
                 }
                 return false
             } else {
-                withAnimation {
-                    groupMembers.append(GMember(member))
-                    groupMembersIndexes[member.groupMemberId] = groupMembers.count - 1
-                }
+                withAnimation { groupMembers.append(GMember(member)) }
                 return true
             }
         } else {
@@ -893,6 +673,43 @@ final class ChatModel: ObservableObject {
             _ = upsertGroupMember(groupInfo, updatedMember)
         }
     }
+
+    func unreadChatItemCounts(itemsInView: Set<String>) -> UnreadChatItemCounts {
+        var i = 0
+        var totalBelow = 0
+        var unreadBelow = 0
+        while i < reversedChatItems.count - 1 && !itemsInView.contains(reversedChatItems[i].viewId) {
+            totalBelow += 1
+            if reversedChatItems[i].isRcvNew {
+                unreadBelow += 1
+            }
+            i += 1
+        }
+        return UnreadChatItemCounts(totalBelow: totalBelow, unreadBelow: unreadBelow)
+    }
+
+    func topItemInView(itemsInView: Set<String>) -> ChatItem? {
+        let maxIx = reversedChatItems.count - 1
+        var i = 0
+        let inView = { itemsInView.contains(self.reversedChatItems[$0].viewId) }
+        while i < maxIx && !inView(i) { i += 1 }
+        while i < maxIx && inView(i) { i += 1 }
+        return reversedChatItems[min(i - 1, maxIx)]
+    }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
+    }
 }
 
 struct ShowingInvitation {
@@ -905,12 +722,16 @@ struct NTFContactRequest {
     var chatId: String
 }
 
-final class Chat: ObservableObject, Identifiable, ChatLike {
+struct UnreadChatItemCounts {
+    var totalBelow: Int
+    var unreadBelow: Int
+}
+
+final class Chat: ObservableObject, Identifiable {
     @Published var chatInfo: ChatInfo
     @Published var chatItems: [ChatItem]
     @Published var chatStats: ChatStats
     var created = Date.now
-    fileprivate var popTs: Date?
 
     init(_ cData: ChatData) {
         self.chatInfo = cData.chatInfo

apps/ios/Shared/Model/ImageUtils.swift

@@ -7,19 +7,18 @@
 //
 
 import Foundation
+import SimpleXChat
 import SwiftUI
 import AVKit
-import SwiftyGif
-import LinkPresentation
 
-public func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
+func getLoadedFileSource(_ file: CIFile?) -> CryptoFile? {
     if let file = file, file.loaded {
         return file.fileSource
     }
     return nil
 }
 
-public func getLoadedImage(_ file: CIFile?) -> UIImage? {
+func getLoadedImage(_ file: CIFile?) -> UIImage? {
     if let fileSource = getLoadedFileSource(file) {
         let filePath = getAppFilePath(fileSource.filePath)
         do {
@@ -38,7 +37,7 @@ public func getLoadedImage(_ file: CIFile?) -> UIImage? {
     return nil
 }
 
-public func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
+func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
     if let cfArgs = cfArgs {
         return try readCryptoFile(path: path.path, cryptoArgs: cfArgs)
     } else {
@@ -46,7 +45,7 @@ public func getFileData(_ path: URL, _ cfArgs: CryptoFileArgs?) throws -> Data {
     }
 }
 
-public func getLoadedVideo(_ file: CIFile?) -> URL? {
+func getLoadedVideo(_ file: CIFile?) -> URL? {
     if let fileSource = getLoadedFileSource(file) {
         let filePath = getAppFilePath(fileSource.filePath)
         if FileManager.default.fileExists(atPath: filePath.path) {
@@ -56,13 +55,13 @@ public func getLoadedVideo(_ file: CIFile?) -> URL? {
     return nil
 }
 
-public func saveAnimImage(_ image: UIImage) -> CryptoFile? {
+func saveAnimImage(_ image: UIImage) -> CryptoFile? {
     let fileName = generateNewFileName("IMG", "gif")
     guard let imageData = image.imageData else { return nil }
     return saveFile(imageData, fileName, encrypted: privacyEncryptLocalFilesGroupDefault.get())
 }
 
-public func saveImage(_ uiImage: UIImage) -> CryptoFile? {
+func saveImage(_ uiImage: UIImage) -> CryptoFile? {
     let hasAlpha = imageHasAlpha(uiImage)
     let ext = hasAlpha ? "png" : "jpg"
     if let imageDataResized = resizeImageToDataSize(uiImage, maxDataSize: MAX_IMAGE_SIZE, hasAlpha: hasAlpha) {
@@ -72,7 +71,7 @@ public func saveImage(_ uiImage: UIImage) -> CryptoFile? {
     return nil
 }
 
-public func cropToSquare(_ image: UIImage) -> UIImage {
+func cropToSquare(_ image: UIImage) -> UIImage {
     let size = image.size
     let side = min(size.width, size.height)
     let newSize = CGSize(width: side, height: side)
@@ -85,7 +84,7 @@ public func cropToSquare(_ image: UIImage) -> UIImage {
     return resizeImage(image, newBounds: CGRect(origin: .zero, size: newSize), drawIn: CGRect(origin: origin, size: size), hasAlpha: imageHasAlpha(image))
 }
 
-public func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha: Bool) -> Data? {
+func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha: Bool) -> Data? {
     var img = image
     var data = hasAlpha ? img.pngData() : img.jpegData(compressionQuality: 0.85)
     var dataSize = data?.count ?? 0
@@ -100,7 +99,7 @@ public func resizeImageToDataSize(_ image: UIImage, maxDataSize: Int64, hasAlpha
     return data
 }
 
-public func resizeImageToStrSizeSync(_ image: UIImage, maxDataSize: Int64) -> String? {
+func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) -> String? {
     var img = image
     let hasAlpha = imageHasAlpha(image)
     var str = compressImageStr(img, hasAlpha: hasAlpha)
@@ -116,15 +115,7 @@ public func resizeImageToStrSizeSync(_ image: UIImage, maxDataSize: Int64) -> St
     return str
 }
 
-public func resizeImageToStrSize(_ image: UIImage, maxDataSize: Int64) async -> String? {
-    resizeImageToStrSizeSync(image, maxDataSize: maxDataSize)
-}
-
-public func compressImageStr(_ image: UIImage, _ compressionQuality: CGFloat = 0.85, hasAlpha: Bool) -> String? {
-//    // Heavy workload to verify if UI gets blocked by the call
-//    for i in 0..<100 {
-//        print(image.jpegData(compressionQuality: Double(i) / 100)?.count ?? 0, terminator: ", ")
-//    }
+func compressImageStr(_ image: UIImage, _ compressionQuality: CGFloat = 0.85, hasAlpha: Bool) -> String? {
     let ext = hasAlpha ? "png" : "jpg"
     if let data = hasAlpha ? image.pngData() : image.jpegData(compressionQuality: compressionQuality) {
         return "data:image/\(ext);base64,\(data.base64EncodedString())"
@@ -147,7 +138,7 @@ private func resizeImage(_ image: UIImage, newBounds: CGRect, drawIn: CGRect, ha
     }
 }
 
-public func imageHasAlpha(_ img: UIImage) -> Bool {
+func imageHasAlpha(_ img: UIImage) -> Bool {
     if let cgImage = img.cgImage {
         let colorSpace = CGColorSpaceCreateDeviceRGB()
         let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
@@ -167,35 +158,7 @@ public func imageHasAlpha(_ img: UIImage) -> Bool {
     return false
 }
 
-/// Reduces image size, while consuming less RAM
-///
-/// Used by ShareExtension to downsize large images
-/// before passing them to regular image processing pipeline
-/// to avoid exceeding 120MB memory
-///
-/// - Parameters:
-///   - url: Location of the image data
-///   - size: Maximum dimension (width or height)
-/// - Returns: Downsampled image or `nil`, if the image can't be located
-public func downsampleImage(at url: URL, to size: Int64) -> UIImage? {
-    autoreleasepool {
-        if let source = CGImageSourceCreateWithURL(url as CFURL, nil) {
-            CGImageSourceCreateThumbnailAtIndex(
-                    source,
-                    0,
-                    [
-                        kCGImageSourceCreateThumbnailFromImageAlways: true,
-                        kCGImageSourceShouldCacheImmediately: true,
-                        kCGImageSourceCreateThumbnailWithTransform: true,
-                        kCGImageSourceThumbnailMaxPixelSize: String(size) as CFString
-                    ] as CFDictionary
-                )
-            .map { UIImage(cgImage: $0) }
-        } else { nil }
-    }
-}
-
-public func saveFileFromURL(_ url: URL) -> CryptoFile? {
+func saveFileFromURL(_ url: URL) -> CryptoFile? {
     let encrypted = privacyEncryptLocalFilesGroupDefault.get()
     let savedFile: CryptoFile?
     if url.startAccessingSecurityScopedResource() {
@@ -221,7 +184,7 @@ public func saveFileFromURL(_ url: URL) -> CryptoFile? {
     return savedFile
 }
 
-public func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
+func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     do {
         let encrypted = privacyEncryptLocalFilesGroupDefault.get()
         let fileName = uniqueCombine(url.lastPathComponent)
@@ -234,6 +197,7 @@ public func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
             try FileManager.default.moveItem(at: url, to: getAppFilePath(fileName))
             savedFile = CryptoFile.plain(fileName)
         }
+        ChatModel.shared.filesToDelete.remove(url)
         return savedFile
     } catch {
         logger.error("ImageUtils.moveTempFileFromURL error: \(error.localizedDescription)")
@@ -241,44 +205,7 @@ public func moveTempFileFromURL(_ url: URL) -> CryptoFile? {
     }
 }
 
-public func saveWallpaperFile(url: URL) -> String? {
-    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", "jpg", fullPath: true))
-    do {
-        try FileManager.default.copyItem(atPath: url.path, toPath: destFile.path)
-        return destFile.lastPathComponent
-    } catch {
-        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
-        return nil
-    }
-}
-
-public func saveWallpaperFile(image: UIImage) -> String? {
-    let hasAlpha = imageHasAlpha(image)
-    let destFile = URL(fileURLWithPath: generateNewFileName(getWallpaperDirectory().path + "/" + "wallpaper", hasAlpha ? "png" : "jpg", fullPath: true))
-    let dataResized = resizeImageToDataSize(image, maxDataSize: 5_000_000, hasAlpha: hasAlpha)
-    do {
-        try dataResized!.write(to: destFile)
-        return destFile.lastPathComponent
-    } catch {
-        logger.error("FileUtils.saveWallpaperFile error: \(error.localizedDescription)")
-        return nil
-    }
-}
-
-public func removeWallpaperFile(fileName: String? = nil) {
-    do {
-        try FileManager.default.contentsOfDirectory(atPath: getWallpaperDirectory().path).forEach {
-            if URL(fileURLWithPath: $0).lastPathComponent == fileName { try FileManager.default.removeItem(atPath: $0) }
-        }
-    } catch {
-        logger.error("FileUtils.removeWallpaperFile error: \(error.localizedDescription)")
-    }
-    if let fileName {
-        WallpaperType.cachedImages.removeValue(forKey: fileName)
-    }
-}
-
-public func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
+func generateNewFileName(_ prefix: String, _ ext: String, fullPath: Bool = false) -> String {
     uniqueCombine("\(prefix)_\(getTimestamp()).\(ext)", fullPath: fullPath)
 }
 
@@ -310,7 +237,7 @@ private func getTimestamp() -> String {
     return df.string(from: Date())
 }
 
-public func dropImagePrefix(_ s: String) -> String {
+func dropImagePrefix(_ s: String) -> String {
     dropPrefix(dropPrefix(s, "data:image/png;base64,"), "data:image/jpg;base64,")
 }
 
@@ -318,23 +245,8 @@ private func dropPrefix(_ s: String, _ prefix: String) -> String {
     s.hasPrefix(prefix) ? String(s.dropFirst(prefix.count)) : s
 }
 
-public func makeVideoQualityLower(_ input: URL, outputUrl: URL) async -> Bool {
-    let asset: AVURLAsset = AVURLAsset(url: input, options: nil)
-    if let s = AVAssetExportSession(asset: asset, presetName: AVAssetExportPreset640x480) {
-        s.outputURL = outputUrl
-        s.outputFileType = .mp4
-        s.metadataItemFilter = AVMetadataItemFilter.forSharing()
-        await s.export()
-        if let err = s.error {
-            logger.error("Failed to export video with error: \(err)")
-        }
-        return s.status == .completed
-    }
-    return false
-}
-
 extension AVAsset {
-    public func generatePreview() -> (UIImage, Int)? {
+    func generatePreview() -> (UIImage, Int)? {
         let generator = AVAssetImageGenerator(asset: self)
         generator.appliesPreferredTrackTransform = true
         var actualTime = CMTimeMake(value: 0, timescale: 0)
@@ -346,7 +258,7 @@ extension AVAsset {
 }
 
 extension UIImage {
-    public func replaceColor(_ from: UIColor, _ to: UIColor) -> UIImage {
+    func replaceColor(_ from: UIColor, _ to: UIColor) -> UIImage {
         if let cgImage = cgImage {
             let colorSpace = CGColorSpaceCreateDeviceRGB()
             let bitmapInfo = CGBitmapInfo(rawValue: CGImageAlphaInfo.premultipliedFirst.rawValue)
@@ -392,92 +304,3 @@ extension UIImage {
         return self
     }
 }
-
-public func imageFromBase64(_ base64Encoded: String?) -> UIImage? {
-    if let base64Encoded {
-        if let img = imageCache.object(forKey: base64Encoded as NSString) {
-            return img
-        } else if let data = Data(base64Encoded: dropImagePrefix(base64Encoded)),
-            let img = UIImage(data: data) {
-            imageCacheQueue.async {
-                imageCache.setObject(img, forKey: base64Encoded as NSString)
-            }
-            return img
-        } else {
-            return nil
-        }
-    } else {
-        return nil
-    }
-}
-
-private let imageCacheQueue = DispatchQueue.global(qos: .background)
-
-private var imageCache: NSCache<NSString, UIImage> = {
-    var cache = NSCache<NSString, UIImage>()
-    cache.countLimit = 1000
-    return cache
-}()
-
-public func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
-    logger.debug("getLinkMetadata: fetching URL preview")
-    LPMetadataProvider().startFetchingMetadata(for: url){ metadata, error in
-        if let e = error {
-            logger.error("Error retrieving link metadata: \(e.localizedDescription)")
-        }
-        if let metadata = metadata,
-           let imageProvider = metadata.imageProvider,
-           imageProvider.canLoadObject(ofClass: UIImage.self) {
-            imageProvider.loadObject(ofClass: UIImage.self){ object, error in
-                var linkPreview: LinkPreview? = nil
-                if let error = error {
-                    logger.error("Couldn't load image preview from link metadata with error: \(error.localizedDescription)")
-                } else {
-                    if let image = object as? UIImage,
-                       let resized = resizeImageToStrSizeSync(image, maxDataSize: 14000),
-                       let title = metadata.title,
-                       let uri = metadata.originalURL {
-                        linkPreview = LinkPreview(uri: uri, title: title, image: resized)
-                    }
-                }
-                cb(linkPreview)
-            }
-        } else {
-            logger.error("Could not load link preview image")
-            cb(nil)
-        }
-    }
-}
-
-public func getLinkPreview(for url: URL) async -> LinkPreview? {
-    await withCheckedContinuation { cont in
-        getLinkPreview(url: url) { cont.resume(returning: $0) }
-    }
-}
-
-private let squareToCircleRatio = 0.935
-
-private let radiusFactor = (1 - squareToCircleRatio) / 50
-
-@ViewBuilder public func clipProfileImage(_ img: Image, size: CGFloat, radius: Double, blurred: Bool = false) -> some View {
-    if radius >= 50 {
-        blurredFrame(img, size, blurred).clipShape(Circle())
-    } else if radius <= 0 {
-        let sz = size * squareToCircleRatio
-        blurredFrame(img, sz, blurred).padding((size - sz) / 2)
-    } else {
-        let sz = size * (squareToCircleRatio + radius * radiusFactor)
-        blurredFrame(img, sz, blurred)
-        .clipShape(RoundedRectangle(cornerRadius: sz * radius / 100, style: .continuous))
-        .padding((size - sz) / 2)
-    }
-}
-
-@ViewBuilder private func blurredFrame(_ img: Image, _ size: CGFloat, _ blurred: Bool) -> some View {
-    let v = img.resizable().frame(width: size, height: size)
-    if blurred {
-        v.blur(radius: size / 4)
-    } else {
-        v
-    }
-}

apps/ios/Shared/Model/NetworkObserver.swift

@@ -1,73 +0,0 @@
-//
-//  NetworkObserver.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 05.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import Network
-import SimpleXChat
-
-class NetworkObserver {
-    static let shared = NetworkObserver()
-    private let queue: DispatchQueue = DispatchQueue(label: "chat.simplex.app.NetworkObserver")
-    private var prevInfo: UserNetworkInfo? = nil
-    private var monitor: NWPathMonitor?
-    private let monitorLock: DispatchQueue = DispatchQueue(label: "chat.simplex.app.monitorLock")
-
-    func restartMonitor() {
-        monitorLock.sync {
-            monitor?.cancel()
-            let mon = NWPathMonitor()
-            mon.pathUpdateHandler = { [weak self] path in
-                self?.networkPathChanged(path: path)
-            }
-            mon.start(queue: queue)
-            monitor = mon
-        }
-    }
-
-    private func networkPathChanged(path: NWPath) {
-        let info = UserNetworkInfo(
-            networkType: networkTypeFromPath(path),
-            online: path.status == .satisfied
-        )
-        if (prevInfo != info) {
-            prevInfo = info
-            setNetworkInfo(info)
-        }
-    }
-
-    private func networkTypeFromPath(_ path: NWPath) -> UserNetworkType {
-        if path.usesInterfaceType(.wiredEthernet) {
-            .ethernet
-        } else if path.usesInterfaceType(.wifi) {
-            .wifi
-        } else if path.usesInterfaceType(.cellular) {
-            .cellular
-        } else if path.usesInterfaceType(.other) {
-            .other
-        } else {
-            .none
-        }
-    }
-
-    private static var networkObserver: NetworkObserver? = nil
-
-    private func setNetworkInfo(_ info: UserNetworkInfo) {
-        logger.debug("setNetworkInfo Network changed: \(String(describing: info))")
-        DispatchQueue.main.sync {
-            ChatModel.shared.networkInfo = info
-        }
-        if !hasChatCtrl() { return }
-        self.monitorLock.sync {
-            do {
-                try apiSetNetworkInfo(info)
-            } catch let err {
-                logger.error("setNetworkInfo error: \(responseError(err))")
-            }
-        }
-    }
-}

apps/ios/Shared/Model/NtfManager.swift

@@ -29,33 +29,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
     private var granted = false
     private var prevNtfTime: Dictionary<ChatId, Date> = [:]
 
-    override init() {
-        super.init()
-        UNUserNotificationCenter.current().delegate = self
-    }
-
     // Handle notification when app is in background
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 didReceive response: UNNotificationResponse,
                                 withCompletionHandler handler: () -> Void) {
         logger.debug("NtfManager.userNotificationCenter: didReceive")
-        if appStateGroupDefault.get() == .active {
-            processNotificationResponse(response)
-        } else {
-            logger.debug("NtfManager.userNotificationCenter: remember response in model")
-            ChatModel.shared.notificationResponse = response
-        }
-        handler()
-    }
-
-    func processNotificationResponse(_ ntfResponse: UNNotificationResponse) {
+        let content = response.notification.request.content
         let chatModel = ChatModel.shared
-        let content = ntfResponse.notification.request.content
-        let action = ntfResponse.actionIdentifier
-        logger.debug("NtfManager.processNotificationResponse: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
+        let action = response.actionIdentifier
+        logger.debug("NtfManager.userNotificationCenter: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
         if let userId = content.userInfo["userId"] as? Int64,
            userId != chatModel.currentUser?.userId {
-            logger.debug("NtfManager.processNotificationResponse changeActiveUser")
             changeActiveUser(userId, viewPwd: nil)
         }
         if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
@@ -73,10 +57,9 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 chatModel.ntfCallInvitationAction = (chatId, ntfAction)
             }
         } else {
-            if let chatId = content.targetContentIdentifier {
-                ItemsModel.shared.loadOpenChat(chatId)
-            }
+            chatModel.chatId = content.targetContentIdentifier
         }
+        handler()
     }
 
     private func ntfCallAction(_ content: UNNotificationContent, _ action: String) -> (ChatId, NtfCallAction)? {
@@ -91,6 +74,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         return nil
     }
 
+
     // Handle notification when the app is in foreground
     func userNotificationCenter(_ center: UNUserNotificationCenter,
                                 willPresent notification: UNNotification,
@@ -199,12 +183,6 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 actions: [],
                 intentIdentifiers: [],
                 hiddenPreviewsBodyPlaceholder: NSLocalizedString("SimpleX encrypted message or connection event", comment: "notification")
-            ),
-            UNNotificationCategory(
-                identifier: ntfCategoryManyEvents,
-                actions: [],
-                intentIdentifiers: [],
-                hiddenPreviewsBodyPlaceholder: NSLocalizedString("New events", comment: "notification")
             )
         ])
     }
@@ -230,28 +208,29 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 }
             }
         }
+        center.delegate = self
     }
 
     func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
         logger.debug("NtfManager.notifyContactRequest")
-        addNotification(createContactRequestNtf(user, contactRequest, 0))
+        addNotification(createContactRequestNtf(user, contactRequest))
     }
 
     func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
         logger.debug("NtfManager.notifyContactConnected")
-        addNotification(createContactConnectedNtf(user, contact, 0))
+        addNotification(createContactConnectedNtf(user, contact))
     }
 
     func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
         logger.debug("NtfManager.notifyMessageReceived")
         if cInfo.ntfsEnabled {
-            addNotification(createMessageReceivedNtf(user, cInfo, cItem, 0))
+            addNotification(createMessageReceivedNtf(user, cInfo, cItem))
         }
     }
 
     func notifyCallInvitation(_ invitation: RcvCallInvitation) {
         logger.debug("NtfManager.notifyCallInvitation")
-        addNotification(createCallInvitationNtf(invitation, 0))
+        addNotification(createCallInvitationNtf(invitation))
     }
 
     func setNtfBadgeCount(_ count: Int) {
@@ -259,8 +238,12 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
         ntfBadgeCountGroupDefault.set(count)
     }
 
-    func changeNtfBadgeCount(by count: Int = 1) {
-        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber + count))
+    func decNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber - count))
+    }
+
+    func incNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(UIApplication.shared.applicationIconBadgeNumber + count)
     }
 
     private func addNotification(_ content: UNMutableNotificationContent) {

apps/ios/Shared/Model/SuspendChat.swift

@@ -36,18 +36,6 @@ private func _suspendChat(timeout: Int) {
     }
 }
 
-let seSubscriber = seMessageSubscriber {
-    switch $0 {
-    case let .state(state):
-        switch state {
-        case .inactive:
-            if AppChatState.shared.value.inactive { activateChat() }
-        case .sendingMessage:
-            if AppChatState.shared.value.canSuspend { suspendChat() }
-        }
-    }
-}
-
 func suspendChat() {
     suspendLockQueue.sync {
         _suspendChat(timeout: appSuspendTimeout)

apps/ios/Shared/SimpleXApp.swift

@@ -39,7 +39,6 @@ struct SimpleXApp: App {
             // so that it's computed by the time view renders, and not on event after rendering
             ContentView(contentAccessAuthenticationExtended: !authenticationExpired())
                 .environmentObject(chatModel)
-                .environmentObject(AppTheme.shared)
                 .onOpenURL { url in
                     logger.debug("ContentView.onOpenURL: \(url)")
                     chatModel.appOpenUrl = url
@@ -58,7 +57,6 @@ struct SimpleXApp: App {
                 }
                 .onChange(of: scenePhase) { phase in
                     logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
-                    AppSheetState.shared.scenePhaseActive = phase == .active
                     switch (phase) {
                     case .background:
                         // --- authentication
@@ -82,18 +80,10 @@ struct SimpleXApp: App {
 
                         if appState != .stopped {
                             startChatAndActivate {
-                                if chatModel.chatRunning == true {
-                                    if let ntfResponse = chatModel.notificationResponse {
-                                        chatModel.notificationResponse = nil
-                                        NtfManager.shared.processNotificationResponse(ntfResponse)
-                                    }
-                                    if appState.inactive {
-                                        Task {
-                                            await updateChats()
-                                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                                await updateCallInvitations()
-                                            }
-                                        }
+                                if appState.inactive && chatModel.chatRunning == true {
+                                    updateChats()
+                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                        updateCallInvitations()
                                     }
                                 }
                             }
@@ -138,16 +128,16 @@ struct SimpleXApp: App {
         }
     }
 
-    private func updateChats() async {
+    private func updateChats() {
         do {
-            let chats = try await apiGetChatsAsync()
-            await MainActor.run { chatModel.updateChats(chats) }
+            let chats = try apiGetChats()
+            chatModel.updateChats(with: chats)
             if let id = chatModel.chatId,
                let chat = chatModel.getChat(id) {
-                Task { await loadChat(chat: chat, clearItems: false) }
+                loadChat(chat: chat)
             }
             if let ncr = chatModel.ntfContactRequest {
-                await MainActor.run { chatModel.ntfContactRequest = nil }
+                chatModel.ntfContactRequest = nil
                 if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
                     Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                 }
@@ -157,9 +147,9 @@ struct SimpleXApp: App {
         }
     }
 
-    private func updateCallInvitations() async {
+    private func updateCallInvitations() {
         do {
-            try await refreshCallInvitations()
+            try refreshCallInvitations()
         } catch let error {
             logger.error("apiGetCallInvitations: cannot update call invitations \(responseError(error))")
         }

apps/ios/Shared/Theme/Theme.swift

@@ -1,199 +0,0 @@
-//
-//  Theme.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 14.06.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-
-var CurrentColors: ThemeManager.ActiveTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-
-var MenuTextColor: Color { if isInDarkTheme() { AppTheme.shared.colors.onBackground.opacity(0.8) } else { Color.black } }
-var NoteFolderIconColor: Color { AppTheme.shared.appColors.primaryVariant2 }
-
-func isInDarkTheme() -> Bool { !CurrentColors.colors.isLight }
-
-class AppTheme: ObservableObject, Equatable {
-    static let shared = AppTheme(name: CurrentColors.name, base: CurrentColors.base, colors: CurrentColors.colors, appColors: CurrentColors.appColors, wallpaper: CurrentColors.wallpaper)
-
-    var name: String
-    var base: DefaultTheme
-    @ObservedObject var colors: Colors
-    @ObservedObject var appColors: AppColors
-    @ObservedObject var wallpaper: AppWallpaper
-
-    init(name: String, base: DefaultTheme, colors: Colors, appColors: AppColors, wallpaper: AppWallpaper) {
-        self.name = name
-        self.base = base
-        self.colors = colors
-        self.appColors = appColors
-        self.wallpaper = wallpaper
-    }
-
-    static func == (lhs: AppTheme, rhs: AppTheme) -> Bool {
-        lhs.name == rhs.name &&
-        lhs.colors == rhs.colors &&
-        lhs.appColors == rhs.appColors &&
-        lhs.wallpaper == rhs.wallpaper
-    }
-
-    func updateFromCurrentColors() {
-        objectWillChange.send()
-        name = CurrentColors.name
-        base = CurrentColors.base
-        colors.updateColorsFrom(CurrentColors.colors)
-        appColors.updateColorsFrom(CurrentColors.appColors)
-        wallpaper.updateWallpaperFrom(CurrentColors.wallpaper)
-    }
-}
-
-struct ThemedBackground: ViewModifier {
-    @EnvironmentObject var theme: AppTheme
-    var grouped: Bool = false
-
-    func body(content: Content) -> some View {
-        content
-            .background(
-                theme.base == DefaultTheme.SIMPLEX
-                ? LinearGradient(
-                    colors: [
-                        grouped
-                        ? theme.colors.background.lighter(0.4).asGroupedBackground(theme.base.mode)
-                        : theme.colors.background.lighter(0.4),
-                        grouped
-                        ? theme.colors.background.darker(0.4).asGroupedBackground(theme.base.mode)
-                        : theme.colors.background.darker(0.4)
-                    ],
-                    startPoint: .topLeading,
-                    endPoint: .bottomTrailing
-                )
-                : LinearGradient(
-                    colors: [],
-                    startPoint: .topLeading,
-                    endPoint: .bottomTrailing
-                )
-            )
-            .background(
-                theme.base == DefaultTheme.SIMPLEX
-                ? Color.clear
-                : grouped
-                ? theme.colors.background.asGroupedBackground(theme.base.mode)
-                : theme.colors.background
-            )
-    }
-}
-
-var systemInDarkThemeCurrently: Bool {
-    return UITraitCollection.current.userInterfaceStyle == .dark
-}
-
-func reactOnDarkThemeChanges(_ inDarkNow: Bool) {
-    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == inDarkNow {
-        // Change active colors from light to dark and back based on system theme
-        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
-    }
-}
-
-extension ThemeWallpaper {
-    public func importFromString() -> ThemeWallpaper {
-        if preset == nil, let image {
-            // Need to save image from string and to save its path
-            if let parsed = imageFromBase64(image),
-               let filename = saveWallpaperFile(image: parsed) {
-                var copy = self
-                copy.image = nil
-                copy.imageFile = filename
-                return copy
-            } else {
-                return ThemeWallpaper()
-            }
-        } else {
-            return self
-        }
-    }
-
-    func withFilledWallpaperBase64() -> ThemeWallpaper {
-        let aw = toAppWallpaper()
-        let type = aw.type
-        let preset: String? = if case let WallpaperType.preset(filename, _) = type { filename } else { nil }
-        let scale: Float? = if case let WallpaperType.preset(_, scale) = type { scale } else { if case let WallpaperType.image(_, scale, _) = type { scale } else { 1.0 } }
-        let scaleType: WallpaperScaleType? = if case let WallpaperType.image(_, _, scaleType) = type { scaleType } else { nil }
-        let image: String? = if case WallpaperType.image = type, let image = type.uiImage { resizeImageToStrSizeSync(image, maxDataSize: 5_000_000) } else { nil }
-        return ThemeWallpaper (
-            preset: preset,
-            scale: scale,
-            scaleType: scaleType,
-            background: aw.background?.toReadableHex(),
-            tint: aw.tint?.toReadableHex(),
-            image: image,
-            imageFile: nil
-        )
-    }
-}
-
-extension ThemeModeOverride {
-    func removeSameColors(_ base: DefaultTheme, colorsToCompare tc: ThemeColors) -> ThemeModeOverride {
-        let wallpaperType = WallpaperType.from(wallpaper) ?? WallpaperType.empty
-        let w: ThemeWallpaper
-        switch wallpaperType {
-        case let WallpaperType.preset(filename, scale):
-            let p = PresetWallpaper.from(filename)
-            w = ThemeWallpaper(
-                preset: filename,
-                scale: scale ?? wallpaper?.scale,
-                scaleType: nil,
-                background: p?.background[base]?.toReadableHex(),
-                tint: p?.tint[base]?.toReadableHex(),
-                image: nil,
-                imageFile: nil
-            )
-        case WallpaperType.image:
-            w = ThemeWallpaper(
-                preset: nil,
-                scale: nil,
-                scaleType: WallpaperScaleType.fill,
-                background: Color.clear.toReadableHex(),
-                tint: Color.clear.toReadableHex(),
-                image: nil,
-                imageFile: nil
-            )
-        default:
-            w = ThemeWallpaper()
-        }
-        let wallpaper: ThemeWallpaper? = if let wallpaper {
-            ThemeWallpaper(
-                preset: wallpaper.preset,
-                scale: wallpaper.scale != w.scale ? wallpaper.scale : nil,
-                scaleType: wallpaper.scaleType != w.scaleType ? wallpaper.scaleType : nil,
-                background: wallpaper.background != w.background ? wallpaper.background : nil,
-                tint: wallpaper.tint != w.tint ? wallpaper.tint : nil,
-                image: wallpaper.image,
-                imageFile: wallpaper.imageFile
-            )
-        } else {
-            nil
-        }
-        return ThemeModeOverride(
-            mode: self.mode,
-            colors: ThemeColors(
-                primary: colors.primary != tc.primary ? colors.primary : nil,
-                primaryVariant: colors.primaryVariant != tc.primaryVariant ? colors.primaryVariant : nil,
-                secondary: colors.secondary != tc.secondary ? colors.secondary : nil,
-                secondaryVariant: colors.secondaryVariant != tc.secondaryVariant ? colors.secondaryVariant : nil,
-                background: colors.background != tc.background ? colors.background : nil,
-                surface: colors.surface != tc.surface ? colors.surface : nil,
-                title: colors.title != tc.title ? colors.title : nil,
-                primaryVariant2: colors.primaryVariant2 != tc.primaryVariant2 ? colors.primary : nil,
-                sentMessage: colors.sentMessage != tc.sentMessage ? colors.sentMessage : nil,
-                sentQuote: colors.sentQuote != tc.sentQuote ? colors.sentQuote : nil,
-                receivedMessage: colors.receivedMessage != tc.receivedMessage ? colors.receivedMessage : nil,
-                receivedQuote: colors.receivedQuote != tc.receivedQuote ? colors.receivedQuote : nil
-            ),
-            wallpaper: wallpaper
-        )
-    }
-}

apps/ios/Shared/Theme/ThemeManager.swift

@@ -1,303 +0,0 @@
-//
-//  ThemeManager.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 03.06.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-
-class ThemeManager {
-    struct ActiveTheme: Equatable {
-        let name: String
-        let base: DefaultTheme
-        let colors: Colors
-        let appColors: AppColors
-        var wallpaper: AppWallpaper = AppWallpaper(background: nil, tint: nil, type: .empty)
-
-        func toAppTheme() -> AppTheme {
-            AppTheme(name: name, base: base, colors: colors, appColors: appColors, wallpaper: wallpaper)
-        }
-    }
-
-    private static func systemDarkThemeColors() -> (Colors, DefaultTheme) {
-        switch systemDarkThemeDefault.get() {
-        case DefaultTheme.DARK.themeName: (DarkColorPalette, DefaultTheme.DARK)
-        case DefaultTheme.SIMPLEX.themeName: (SimplexColorPalette, DefaultTheme.SIMPLEX)
-        case DefaultTheme.BLACK.themeName: (BlackColorPalette, DefaultTheme.BLACK)
-        default: (SimplexColorPalette, DefaultTheme.SIMPLEX)
-        }
-    }
-
-    private static func nonSystemThemeName() -> String {
-        let themeName = currentThemeDefault.get()
-        return if themeName != DefaultTheme.SYSTEM_THEME_NAME {
-            themeName
-        } else {
-            systemInDarkThemeCurrently ? systemDarkThemeDefault.get() : DefaultTheme.LIGHT.themeName
-        }
-    }
-
-    static func defaultActiveTheme(_ appSettingsTheme: [ThemeOverrides]) -> ThemeOverrides? {
-        let nonSystemThemeName = nonSystemThemeName()
-        let defaultThemeId = currentThemeIdsDefault.get()[nonSystemThemeName]
-        return appSettingsTheme.getTheme(defaultThemeId)
-    }
-
-    static func defaultActiveTheme(_ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ThemeModeOverride {
-        let perUserTheme = !CurrentColors.colors.isLight ? perUserTheme?.dark : perUserTheme?.light
-        if let perUserTheme {
-            return perUserTheme
-        }
-        let defaultTheme = defaultActiveTheme(appSettingsTheme)
-        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper ?? ThemeWallpaper.from(PresetWallpaper.school.toType(CurrentColors.base), nil, nil))
-    }
-
-    static func currentColors(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ActiveTheme {
-        let themeName = currentThemeDefault.get()
-        let nonSystemThemeName = nonSystemThemeName()
-        let defaultTheme = defaultActiveTheme(appSettingsTheme)
-
-        let baseTheme = switch nonSystemThemeName {
-        case DefaultTheme.LIGHT.themeName: ActiveTheme(name: DefaultTheme.LIGHT.themeName, base: DefaultTheme.LIGHT, colors: LightColorPalette.clone(), appColors: LightColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.LIGHT)))
-        case DefaultTheme.DARK.themeName: ActiveTheme(name: DefaultTheme.DARK.themeName, base: DefaultTheme.DARK, colors: DarkColorPalette.clone(), appColors: DarkColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.DARK)))
-        case DefaultTheme.SIMPLEX.themeName: ActiveTheme(name: DefaultTheme.SIMPLEX.themeName, base: DefaultTheme.SIMPLEX, colors: SimplexColorPalette.clone(), appColors: SimplexColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.SIMPLEX)))
-        case DefaultTheme.BLACK.themeName: ActiveTheme(name: DefaultTheme.BLACK.themeName, base: DefaultTheme.BLACK, colors: BlackColorPalette.clone(), appColors: BlackColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.BLACK)))
-        default: ActiveTheme(name: DefaultTheme.LIGHT.themeName, base: DefaultTheme.LIGHT, colors: LightColorPalette.clone(), appColors: LightColorPaletteApp.clone(), wallpaper: AppWallpaper(background: nil, tint: nil, type: PresetWallpaper.school.toType(DefaultTheme.LIGHT)))
-        }
-
-        let perUserTheme = baseTheme.colors.isLight ? perUserTheme?.light : perUserTheme?.dark
-        let theme = appSettingsTheme.sameTheme(themeOverridesForType ?? perChatTheme?.type ?? perUserTheme?.type ?? defaultTheme?.wallpaper?.toAppWallpaper().type, nonSystemThemeName) ?? defaultTheme
-
-        if theme == nil && perUserTheme == nil && perChatTheme == nil && themeOverridesForType == nil {
-            return ActiveTheme(name: themeName, base: baseTheme.base, colors: baseTheme.colors, appColors: baseTheme.appColors, wallpaper: baseTheme.wallpaper)
-        }
-        let presetWallpaperTheme: ThemeColors? = if let themeOverridesForType, case let WallpaperType.preset(filename, _) = themeOverridesForType {
-            PresetWallpaper.from(filename)?.colors[baseTheme.base]
-        } else if let wallpaper = perChatTheme?.wallpaper {
-            if let preset = wallpaper.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
-        } else if let wallpaper = perUserTheme?.wallpaper {
-            if let preset = wallpaper.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
-        } else {
-            if let preset = theme?.wallpaper?.preset { PresetWallpaper.from(preset)?.colors[baseTheme.base] } else { nil }
-        }
-
-        let themeOrEmpty = theme ?? ThemeOverrides(base: baseTheme.base)
-        let colors = themeOrEmpty.toColors(themeOrEmpty.base, perChatTheme?.colors, perUserTheme?.colors, presetWallpaperTheme)
-        return ActiveTheme(
-            name: themeName,
-            base: baseTheme.base,
-            colors: colors,
-            appColors: themeOrEmpty.toAppColors(themeOrEmpty.base, perChatTheme?.colors, perChatTheme?.type, perUserTheme?.colors, perUserTheme?.type, presetWallpaperTheme),
-            wallpaper: themeOrEmpty.toAppWallpaper(themeOverridesForType, perChatTheme, perUserTheme, colors.background)
-        )
-    }
-
-    static func currentThemeOverridesForExport(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?) -> ThemeOverrides {
-        let current = currentColors(themeOverridesForType, perChatTheme, perUserTheme, themeOverridesDefault.get())
-        let wType = current.wallpaper.type
-        let wBackground = current.wallpaper.background
-        let wTint = current.wallpaper.tint
-        let w: ThemeWallpaper? = if case WallpaperType.empty = wType {
-            nil
-        } else {
-            ThemeWallpaper.from(wType, wBackground?.toReadableHex(), wTint?.toReadableHex()).withFilledWallpaperBase64()
-        }
-        return ThemeOverrides(
-            themeId: "",
-            base: current.base,
-            colors: ThemeColors.from(current.colors, current.appColors),
-            wallpaper: w
-        )
-    }
-
-    static func applyTheme(_ theme: String) {
-        currentThemeDefault.set(theme)
-        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-        AppTheme.shared.updateFromCurrentColors()
-        let tint = UIColor(CurrentColors.colors.primary)
-        if SceneDelegate.windowStatic?.tintColor != tint {
-            SceneDelegate.windowStatic?.tintColor = tint
-        }
-//        applyNavigationBarColors(CurrentColors.toAppTheme())
-    }
-
-    static func adjustWindowStyle() {
-        let style = switch currentThemeDefault.get() {
-        case DefaultTheme.LIGHT.themeName: UIUserInterfaceStyle.light
-        case DefaultTheme.SYSTEM_THEME_NAME: UIUserInterfaceStyle.unspecified
-        default: UIUserInterfaceStyle.dark
-        }
-        if SceneDelegate.windowStatic?.overrideUserInterfaceStyle != style {
-            SceneDelegate.windowStatic?.overrideUserInterfaceStyle = style
-        }
-    }
-
-//    static func applyNavigationBarColors(_ theme: AppTheme) {
-//        let baseColors = switch theme.base {
-//        case DefaultTheme.LIGHT: LightColorPaletteApp
-//        case DefaultTheme.DARK: DarkColorPaletteApp
-//        case DefaultTheme.SIMPLEX: SimplexColorPaletteApp
-//        case DefaultTheme.BLACK: BlackColorPaletteApp
-//        }
-//        let isDefaultColor = baseColors.title == theme.appColors.title
-//
-//        let title = UIColor(theme.appColors.title)
-//        if !isDefaultColor && UINavigationBar.appearance().titleTextAttributes?.first as? UIColor != title {
-//            UINavigationBar.appearance().titleTextAttributes = [.foregroundColor: title]
-//            UINavigationBar.appearance().largeTitleTextAttributes = [.foregroundColor: title]
-//        } else {
-//            UINavigationBar.appearance().titleTextAttributes = nil
-//            UINavigationBar.appearance().largeTitleTextAttributes = nil
-//        }
-//    }
-
-    static func changeDarkTheme(_ theme: String) {
-        systemDarkThemeDefault.set(theme)
-        CurrentColors = currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-        AppTheme.shared.updateFromCurrentColors()
-    }
-
-    static func saveAndApplyThemeColor(_ baseTheme: DefaultTheme, _ name: ThemeColor, _ color: Color? = nil, _ pref: CodableDefault<[ThemeOverrides]>? = nil) {
-        let nonSystemThemeName = baseTheme.themeName
-        let pref = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        let themeId = currentThemeIdsDefault.get()[nonSystemThemeName]
-        let prevValue = overrides.getTheme(themeId) ?? ThemeOverrides(base: baseTheme)
-        pref.set(overrides.replace(prevValue.withUpdatedColor(name, color?.toReadableHex())))
-        var themeIds = currentThemeIdsDefault.get()
-        themeIds[nonSystemThemeName] = prevValue.themeId
-        currentThemeIdsDefault.set(themeIds)
-        applyTheme(currentThemeDefault.get())
-    }
-
-    static func applyThemeColor(name: ThemeColor, color: Color? = nil, pref: Binding<ThemeModeOverride>) {
-        pref.wrappedValue = pref.wrappedValue.withUpdatedColor(name, color?.toReadableHex())
-    }
-
-    static func saveAndApplyWallpaper(_ baseTheme: DefaultTheme, _ type: WallpaperType?, _ pref: CodableDefault<[ThemeOverrides]>?) {
-        let nonSystemThemeName = baseTheme.themeName
-        let pref = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        let theme = overrides.sameTheme(type, baseTheme.themeName)
-        var prevValue = theme ?? ThemeOverrides(base: baseTheme)
-        prevValue.wallpaper = if let type {
-            if case WallpaperType.empty = type {
-                nil as ThemeWallpaper?
-            } else {
-                ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
-            }
-        } else {
-            nil
-        }
-        pref.set(overrides.replace(prevValue))
-        var themeIds = currentThemeIdsDefault.get()
-        themeIds[nonSystemThemeName] = prevValue.themeId
-        currentThemeIdsDefault.set(themeIds)
-        applyTheme(currentThemeDefault.get())
-    }
-
-    static func copyFromSameThemeOverrides(_ type: WallpaperType?, _ lowerLevelOverride: ThemeModeOverride?, _ pref: Binding<ThemeModeOverride>) -> Bool {
-        let overrides = themeOverridesDefault.get()
-        let sameWallpaper: ThemeWallpaper? = if let wallpaper = lowerLevelOverride?.wallpaper, lowerLevelOverride?.type?.sameType(type) == true {
-            wallpaper
-        } else {
-            overrides.sameTheme(type, CurrentColors.base.themeName)?.wallpaper
-        }
-        guard let sameWallpaper else {
-            if let type {
-                var w: ThemeWallpaper = ThemeWallpaper.from(type, nil, nil)
-                w.scale = nil
-                w.scaleType = nil
-                w.background = nil
-                w.tint = nil
-                pref.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode, wallpaper: w)
-            } else {
-                // Make an empty wallpaper to override any top level ones
-                pref.wrappedValue = ThemeModeOverride(mode: CurrentColors.base.mode, wallpaper: ThemeWallpaper())
-            }
-            return true
-        }
-        var type = sameWallpaper.toAppWallpaper().type
-        if case let WallpaperType.image(filename, scale, scaleType) = type, sameWallpaper.imageFile == filename {
-            // same image file. Needs to be copied first in order to be able to remove the file once it's not needed anymore without affecting main theme override
-            if let filename = saveWallpaperFile(url: getWallpaperFilePath(filename)) {
-                type = WallpaperType.image(filename, scale, scaleType)
-            } else {
-                logger.error("Error while copying wallpaper from global overrides to chat overrides")
-                return false
-            }
-        }
-        var prevValue = pref.wrappedValue
-        var w = ThemeWallpaper.from(type, nil, nil)
-        w.scale = nil
-        w.scaleType = nil
-        w.background = nil
-        w.tint = nil
-        prevValue.colors = ThemeColors()
-        prevValue.wallpaper = w
-        pref.wrappedValue = prevValue
-        return true
-    }
-
-    static func applyWallpaper(_ type: WallpaperType?, _ pref: Binding<ThemeModeOverride>) {
-        var prevValue = pref.wrappedValue
-        prevValue.wallpaper = if let type {
-            ThemeWallpaper.from(type, prevValue.wallpaper?.background, prevValue.wallpaper?.tint)
-        } else {
-            nil
-        }
-        pref.wrappedValue = prevValue
-    }
-
-    static func saveAndApplyThemeOverrides(_ theme: ThemeOverrides, _ pref: CodableDefault<[ThemeOverrides]>? = nil) {
-        let wallpaper = theme.wallpaper?.importFromString()
-        let nonSystemThemeName = theme.base.themeName
-        let pref: CodableDefault<[ThemeOverrides]> = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        var prevValue = overrides.getTheme(nil, wallpaper?.toAppWallpaper().type, theme.base) ?? ThemeOverrides(base: theme.base)
-        if let imageFile = prevValue.wallpaper?.imageFile {
-            try? FileManager.default.removeItem(at: getWallpaperFilePath(imageFile))
-        }
-        prevValue.base = theme.base
-        prevValue.colors = theme.colors
-        prevValue.wallpaper = wallpaper
-        pref.set(overrides.replace(prevValue))
-        currentThemeDefault.set(nonSystemThemeName)
-        var currentThemeIds = currentThemeIdsDefault.get()
-        currentThemeIds[nonSystemThemeName] = prevValue.themeId
-        currentThemeIdsDefault.set(currentThemeIds)
-        applyTheme(nonSystemThemeName)
-    }
-
-    static func resetAllThemeColors(_ pref: CodableDefault<[ThemeOverrides]>? = nil) {
-        let nonSystemThemeName = nonSystemThemeName()
-        let pref: CodableDefault<[ThemeOverrides]> = pref ?? themeOverridesDefault
-        let overrides = pref.get()
-        guard let themeId = currentThemeIdsDefault.get()[nonSystemThemeName],
-              var prevValue = overrides.getTheme(themeId)
-        else { return }
-        prevValue.colors = ThemeColors()
-        prevValue.wallpaper?.background = nil
-        prevValue.wallpaper?.tint = nil
-        pref.set(overrides.replace(prevValue))
-        applyTheme(currentThemeDefault.get())
-    }
-
-    static func resetAllThemeColors(_ pref: Binding<ThemeModeOverride>) {
-        var prevValue = pref.wrappedValue
-        prevValue.colors = ThemeColors()
-        prevValue.wallpaper?.background = nil
-        prevValue.wallpaper?.tint = nil
-        pref.wrappedValue = prevValue
-    }
-
-    static func removeTheme(_ themeId: String?) {
-        var themes = themeOverridesDefault.get().map { $0 }
-        themes.removeAll(where: { $0.themeId == themeId })
-        themeOverridesDefault.set(themes)
-    }
-}

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

@@ -9,7 +9,6 @@
 import SwiftUI
 import WebKit
 import SimpleXChat
-import AVFoundation
 
 struct ActiveCallView: View {
     @EnvironmentObject var m: ChatModel
@@ -17,49 +16,33 @@ struct ActiveCallView: View {
     @ObservedObject var call: Call
     @Environment(\.scenePhase) var scenePhase
     @State private var client: WebRTCClient? = nil
+    @State private var activeCall: WebRTCClient.Call? = nil
     @State private var localRendererAspectRatio: CGFloat? = nil
-    @State var remoteContentMode: UIView.ContentMode = .scaleAspectFill
     @Binding var canConnectCall: Bool
     @State var prevColorScheme: ColorScheme = .dark
     @State var pipShown = false
-    @State var wasConnected = false
 
     var body: some View {
         ZStack(alignment: .topLeading) {
             ZStack(alignment: .bottom) {
-                if let client = client, call.hasVideo {
+                if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
                     GeometryReader { g in
                         let width = g.size.width * 0.3
                         ZStack(alignment: .topTrailing) {
+                            CallViewRemote(client: client, activeCall: $activeCall, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, pipShown: $pipShown)
+                            CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
+                                .cornerRadius(10)
+                                .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
+                                .padding([.top, .trailing], 17)
                             ZStack(alignment: .center) {
                                 // For some reason, when the view in GeometryReader and ZStack is visible, it steals clicks on a back button, so showing something on top like this with background color helps (.clear color doesn't work)
                             }
                             .frame(maxWidth: .infinity, maxHeight: .infinity)
                             .background(Color.primary.opacity(0.000001))
-
-                            CallViewRemote(client: client, call: call, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, contentMode: $remoteContentMode, pipShown: $pipShown)
-                                .onTapGesture {
-                                    remoteContentMode = remoteContentMode == .scaleAspectFill ? .scaleAspectFit : .scaleAspectFill
-                                }
-
-                            Group {
-                                let localVideoTrack = client.activeCall?.localVideoTrack ?? client.notConnectedCall?.localCameraAndTrack?.1
-                                if localVideoTrack != nil {
-                                    CallViewLocal(client: client, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
-                                        .onDisappear {
-                                            localRendererAspectRatio = nil
-                                        }
-                                } else {
-                                    Rectangle().fill(.black)
-                                }
-                            }
-                            .cornerRadius(10)
-                            .frame(width: width, height: localRendererAspectRatio == nil ? (g.size.width < g.size.height ? width * 1.33 : width / 1.33) : width / (localRendererAspectRatio ?? 1))
-                            .padding([.top, .trailing], 17)
                         }
                     }
                 }
-                if let call = m.activeCall, let client = client, (!pipShown || !call.hasVideo) {
+                if let call = m.activeCall, let client = client, (!pipShown || !call.supportsVideo) {
                     ActiveCallOverlay(call: call, client: client)
                 }
             }
@@ -69,9 +52,6 @@ struct ActiveCallView: View {
         .onAppear {
             logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
             AppDelegate.keepScreenOn(true)
-            Task {
-                await askRequiredPermissions()
-            }
             createWebRTCClient()
             dismissAllSheets()
             hideKeyboard()
@@ -89,11 +69,6 @@ struct ActiveCallView: View {
             Task { await m.callCommand.setClient(nil) }
             AppDelegate.keepScreenOn(false)
             client?.endCall()
-            CallSoundsPlayer.shared.stop()
-            try? AVAudioSession.sharedInstance().setCategory(.soloAmbient)
-            if (wasConnected) {
-                CallSoundsPlayer.shared.vibrate(long: true)
-            }
         }
         .background(m.activeCallViewIsCollapsed ? .clear : .black)
         // Quite a big delay when opening/closing the view when a scheme changes (globally) this way. It's not needed when CallKit is used since status bar is green with white text on it
@@ -102,7 +77,7 @@ struct ActiveCallView: View {
 
     private func createWebRTCClient() {
         if client == nil && canConnectCall {
-            client = WebRTCClient({ msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
+            client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
             Task {
                 await m.callCommand.setClient(client)
             }
@@ -117,7 +92,7 @@ struct ActiveCallView: View {
             logger.debug("ActiveCallView: response \(msg.resp.respType)")
             switch msg.resp {
             case let .capabilities(capabilities):
-                let callType = CallType(media: call.initialCallType, capabilities: capabilities)
+                let callType = CallType(media: call.localMedia, capabilities: capabilities)
                 Task {
                     do {
                         try await apiSendCallInvitation(call.contact, callType)
@@ -128,17 +103,12 @@ struct ActiveCallView: View {
                         call.callState = .invitationSent
                         call.localCapabilities = capabilities
                     }
-                    if call.hasVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
-                        try? AVAudioSession.sharedInstance().setCategory(.playback, options: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    }
-                    CallSoundsPlayer.shared.startConnectingCallSound()
-                    activeCallWaitDeliveryReceipt()
                 }
             case let .offer(offer, iceCandidates, capabilities):
                 Task {
                     do {
                         try await apiSendCallOffer(call.contact, offer, iceCandidates,
-                                                   media: call.initialCallType, capabilities: capabilities)
+                                                   media: call.localMedia, capabilities: capabilities)
                     } catch {
                         logger.error("apiSendCallOffer \(responseError(error))")
                     }
@@ -156,7 +126,6 @@ struct ActiveCallView: View {
                     }
                     await MainActor.run {
                         call.callState = .negotiated
-                        CallSoundsPlayer.shared.stop()
                     }
                 }
             case let .ice(iceCandidates):
@@ -175,16 +144,9 @@ struct ActiveCallView: View {
                     : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
                     call.callState = .connected
                     call.connectedAt = .now
-                    if !wasConnected {
-                        CallSoundsPlayer.shared.vibrate(long: false)
-                        wasConnected = true
-                    }
                 }
                 if state.connectionState == "closed" {
                     closeCallView(client)
-                    if let callUUID = m.activeCall?.callUUID {
-                        CallController.shared.endCall(callUUID: callUUID)
-                    }
                     m.activeCall = nil
                     m.activeCallViewIsCollapsed = false
                 }
@@ -199,22 +161,10 @@ struct ActiveCallView: View {
                 call.callState = .connected
                 call.connectionInfo = connectionInfo
                 call.connectedAt = .now
-                if !wasConnected {
-                    CallSoundsPlayer.shared.vibrate(long: false)
-                    wasConnected = true
-                }
-            case let .peerMedia(source, enabled):
-                switch source {
-                    case .mic: call.peerMediaSources.mic = enabled
-                    case .camera: call.peerMediaSources.camera = enabled
-                    case .screenAudio: call.peerMediaSources.screenAudio = enabled
-                    case .screenVideo: call.peerMediaSources.screenVideo = enabled
-                    case .unknown: ()
-                }
             case .ended:
                 closeCallView(client)
                 call.callState = .ended
-                if let uuid = call.callUUID {
+                if let uuid = call.callkitUUID {
                     CallController.shared.endCall(callUUID: uuid)
                 }
             case .ok:
@@ -237,44 +187,6 @@ struct ActiveCallView: View {
         }
     }
 
-    private func activeCallWaitDeliveryReceipt() {
-        ChatReceiver.shared.messagesChannel = { msg in
-            guard let call = ChatModel.shared.activeCall, call.callState == .invitationSent else {
-                ChatReceiver.shared.messagesChannel = nil
-                return
-            }
-            if case let .chatItemsStatusesUpdated(_, chatItems) = msg,
-               chatItems.contains(where: { ci in
-                   ci.chatInfo.id == call.contact.id &&
-                   ci.chatItem.content.isSndCall &&
-                   ci.chatItem.meta.itemStatus.isSndRcvd
-               }) {
-                CallSoundsPlayer.shared.startInCallSound()
-                ChatReceiver.shared.messagesChannel = nil
-            }
-        }
-    }
-
-    private func askRequiredPermissions() async {
-        let mic = await WebRTCClient.isAuthorized(for: .audio)
-        await MainActor.run {
-            call.localMediaSources.mic = mic
-        }
-        let cameraAuthorized = AVCaptureDevice.authorizationStatus(for: .video) == .authorized
-        var camera = call.initialCallType == .audio || cameraAuthorized
-        if call.initialCallType == .video && !cameraAuthorized {
-            camera = await WebRTCClient.isAuthorized(for: .video)
-            await MainActor.run {
-                if camera, let client {
-                    client.setCameraEnabled(true)
-                }
-            }
-        }
-        if !mic || !camera {
-            WebRTCClient.showUnauthorizedAlert(for: !mic ? .audio : .video)
-        }
-    }
-
     private func closeCallView(_ client: WebRTCClient) {
         if m.activeCall != nil {
             m.showCallView = false
@@ -286,20 +198,38 @@ struct ActiveCallOverlay: View {
     @EnvironmentObject var chatModel: ChatModel
     @ObservedObject var call: Call
     var client: WebRTCClient
-    @ObservedObject private var deviceManager = CallAudioDeviceManager.shared
 
     var body: some View {
         VStack {
-            switch call.hasVideo {
-            case true:
+            switch call.localMedia {
+            case .video:
                 videoCallInfoView(call)
                 .foregroundColor(.white)
                 .opacity(0.8)
-                .padding(.horizontal)
-                // Fixed vertical padding required for preserving position of buttons row when changing audio-to-video and back in landscape orientation.
-                // Otherwise, bigger padding is added by SwiftUI when switching call types
-                .padding(.vertical, 10)
-            case false:
+                .padding()
+
+                Spacer()
+
+                HStack {
+                    toggleAudioButton()
+                    Spacer()
+                    Color.clear.frame(width: 40, height: 40)
+                    Spacer()
+                    endCallButton()
+                    Spacer()
+                    if call.videoEnabled {
+                        flipCameraButton()
+                    } else {
+                        Color.clear.frame(width: 40, height: 40)
+                    }
+                    Spacer()
+                    toggleVideoButton()
+                }
+                .padding(.horizontal, 20)
+                .padding(.bottom, 16)
+                .frame(maxWidth: .infinity, alignment: .center)
+
+            case .audio:
                 ZStack(alignment: .topLeading) {
                     Button {
                         chatModel.activeCallViewIsCollapsed = true
@@ -309,45 +239,31 @@ struct ActiveCallOverlay: View {
                             .foregroundColor(.white.opacity(0.8))
                     }
                     VStack {
-                        ProfileImage(imageStr: call.contact.profile.image, size: 192)
+                        ProfileImage(imageStr: call.contact.profile.image)
+                            .scaledToFit()
+                            .frame(width: 192, height: 192)
                         audioCallInfoView(call)
                     }
                     .foregroundColor(.white)
                     .opacity(0.8)
-                    .padding(.horizontal)
-                    .padding(.vertical, 10)
+                    .padding()
                     .frame(maxHeight: .infinity)
                 }
-            }
 
-            Spacer()
+                Spacer()
 
-            HStack {
-                toggleMicButton()
-                Spacer()
-                audioDeviceButton()
-                Spacer()
-                endCallButton()
-                Spacer()
-                if call.localMediaSources.camera {
-                    flipCameraButton()
-                } else {
-                    Color.clear.frame(width: 60, height: 60)
+                ZStack(alignment: .bottom) {
+                    toggleAudioButton()
+                        .frame(maxWidth: .infinity, alignment: .leading)
+                    endCallButton()
+                    toggleSpeakerButton()
+                        .frame(maxWidth: .infinity, alignment: .trailing)
                 }
-                Spacer()
-                toggleCameraButton()
+                .padding(.bottom, 60)
+                .padding(.horizontal, 48)
             }
-            .padding(.horizontal, 20)
-            .padding(.bottom, 16)
-            .frame(maxWidth: 440, alignment: .center)
         }
         .frame(maxWidth: .infinity)
-        .onAppear {
-            deviceManager.start()
-        }
-        .onDisappear {
-            deviceManager.stop()
-        }
     }
 
     private func audioCallInfoView(_ call: Call) -> some View {
@@ -401,122 +317,85 @@ struct ActiveCallOverlay: View {
 
     private func endCallButton() -> some View {
         let cc = CallController.shared
-        return callButton("phone.down.fill", .red, padding: 10) {
-            if let uuid = call.callUUID {
+        return callButton("phone.down.fill", width: 60, height: 60) {
+            if let uuid = call.callkitUUID {
                 cc.endCall(callUUID: uuid)
             } else {
                 cc.endCall(call: call) {}
             }
         }
+        .foregroundColor(.red)
     }
 
-    private func toggleMicButton() -> some View {
-        controlButton(call, call.localMediaSources.mic ? "mic.fill" : "mic.slash", padding: 14) {
+    private func toggleAudioButton() -> some View {
+        controlButton(call, call.audioEnabled ? "mic.fill" : "mic.slash") {
             Task {
-                if await WebRTCClient.isAuthorized(for: .audio) {
-                    client.setAudioEnabled(!call.localMediaSources.mic)
-                } else { WebRTCClient.showUnauthorizedAlert(for: .audio) }
-            }
-        }
-    }
-
-    func audioDeviceButton() -> some View {
-        // Check if the only input is microphone. And in this case show toggle button,
-        // If there are more inputs, it probably means something like bluetooth headphones are available
-        // and in this case show iOS button for choosing different output.
-        // There is no way to get available outputs, only inputs
-        Group {
-            if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                toggleSpeakerButton()
-            } else {
-                audioDevicePickerButton()
-            }
-        }
-        .onChange(of: call.localMediaSources.hasVideo) { hasVideo in
-            let current = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType
-            let speakerEnabled = current == .builtInSpeaker
-            let receiverEnabled = current == .builtInReceiver
-            // react automatically only when receiver were selected, otherwise keep an external device selected
-            if !speakerEnabled && hasVideo && receiverEnabled {
-                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled, skipExternalDevice: true)
-                call.speakerEnabled = !speakerEnabled
+                client.setAudioEnabled(!call.audioEnabled)
+                DispatchQueue.main.async {
+                    call.audioEnabled = !call.audioEnabled
+                }
             }
         }
     }
 
     private func toggleSpeakerButton() -> some View {
-        controlButton(call, !call.peerMediaSources.mic ? "speaker.slash" : call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill", padding: !call.peerMediaSources.mic ? 16 : call.speakerEnabled ? 15 : 17) {
-            let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
-            client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
-            call.speakerEnabled = !speakerEnabled
-        }
-        .onAppear {
-            deviceManager.call = call
-            //call.speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
+        controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
+            Task {
+                client.setSpeakerEnabledAndConfigureSession(!call.speakerEnabled)
+                DispatchQueue.main.async {
+                    call.speakerEnabled = !call.speakerEnabled
+                }
+            }
         }
     }
 
-    private func toggleCameraButton() -> some View {
-        controlButton(call, call.localMediaSources.camera ? "video.fill" : "video.slash", padding: call.localMediaSources.camera ? 16 : 14) {
+    private func toggleVideoButton() -> some View {
+        controlButton(call, call.videoEnabled ? "video.fill" : "video.slash") {
             Task {
-                if await WebRTCClient.isAuthorized(for: .video) {
-                    client.setCameraEnabled(!call.localMediaSources.camera)
-                } else { WebRTCClient.showUnauthorizedAlert(for: .video) }
+                client.setVideoEnabled(!call.videoEnabled)
+                DispatchQueue.main.async {
+                    call.videoEnabled = !call.videoEnabled
+                }
             }
         }
-        .disabled(call.initialCallType == .audio && client.activeCall?.peerHasOldVersion == true)
     }
 
     @ViewBuilder private func flipCameraButton() -> some View {
-        controlButton(call, "arrow.triangle.2.circlepath", padding: 12) {
+        controlButton(call, "arrow.triangle.2.circlepath") {
                 Task {
-                    if await WebRTCClient.isAuthorized(for: .video) {
-                        client.flipCamera()
-                    }
+                    client.flipCamera()
                 }
         }
     }
 
-    @ViewBuilder 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 controlButton(_ call: Call, _ imageName: String, _ perform: @escaping () -> Void) -> some View {
+        if call.hasMedia {
+            callButton(imageName, width: 50, height: 38, perform)
+                .foregroundColor(.white)
+                .opacity(0.85)
+        } else {
+            Color.clear.frame(width: 50, height: 38)
+        }
     }
 
-    @ViewBuilder private func audioDevicePickerButton() -> some View {
-        AudioDevicePicker()
-            .opacity(0.8)
-            .scaleEffect(2)
-            .padding(10)
-            .frame(width: 60, height: 60)
-            .background(call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2))
-            .clipShape(.circle)
-    }
-
-    private func callButton(_ imageName: String, _ background: Color, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
+    private func callButton(_ imageName: String, width: CGFloat, height: CGFloat, _ perform: @escaping () -> Void) -> some View {
         Button {
             perform()
         } label: {
             Image(systemName: imageName)
                 .resizable()
                 .scaledToFit()
-                .padding(padding)
-                .frame(width: 60, height: 60)
-                .background(background)
+                .frame(maxWidth: width, maxHeight: height)
         }
-        .foregroundColor(whiteColorWithAlpha)
-        .clipShape(.circle)
-    }
-
-    private var whiteColorWithAlpha: Color {
-        get { Color(red: 204 / 255, green: 204 / 255, blue: 204 / 255) }
     }
 }
 
 struct ActiveCallOverlay_Previews: PreviewProvider {
     static var previews: some View {
         Group{
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, initialCallType: .video), client: WebRTCClient({ _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, initialCallType: .audio), client: WebRTCClient({ _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callkitUUID: UUID(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
         }
     }

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

@@ -1,25 +0,0 @@
-//
-//  MPVolumeView.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 24.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import UIKit
-import AVKit
-
-struct AudioDevicePicker: UIViewRepresentable {
-    func makeUIView(context: Context) -> some UIView {
-        let v = AVRoutePickerView(frame: .zero)
-        v.activeTintColor = .white
-        v.tintColor = .white
-        return v
-    }
-
-    func updateUIView(_ uiView: UIViewType, context: Context) {
-
-    }
-}

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

@@ -1,67 +0,0 @@
-//
-//  CallAudioDeviceManager.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import Foundation
-import SwiftUI
-import SimpleXChat
-import AVKit
-import WebRTC
-
-class CallAudioDeviceManager: ObservableObject {
-    static let shared = CallAudioDeviceManager()
-    let audioSession: AVAudioSession
-    let nc = NotificationCenter.default
-
-    var call: Call?
-    var timer: Timer? = nil
-
-    // Actually, only one output
-    @Published var outputs: [AVAudioSessionPortDescription]
-    @Published var currentDevice: AVAudioSessionPortDescription? = nil
-    // All devices that can record audio (the ones that can play audio are not included)
-    @Published var availableInputs: [AVAudioSessionPortDescription] = []
-
-
-    init(_ audioSession: AVAudioSession? = nil) {
-        self.audioSession = audioSession ?? RTCAudioSession.sharedInstance().session
-        self.outputs = self.audioSession.currentRoute.outputs
-        self.availableInputs = self.audioSession.availableInputs ?? []
-    }
-
-    func reloadDevices() {
-        outputs = audioSession.currentRoute.outputs
-        currentDevice = audioSession.currentRoute.outputs.first
-        availableInputs = audioSession.availableInputs ?? []
-        call?.speakerEnabled = currentDevice?.portType == .builtInSpeaker
-
-
-        // Workaround situation:
-        // have bluetooth device connected, choosing speaker, disconnecting bluetooth device. In this case iOS will not post notification, so do it manually
-        timer?.invalidate()
-        if availableInputs.contains(where: { $0.portType != .builtInReceiver && $0.portType != .builtInSpeaker }) {
-            timer = Timer.scheduledTimer(withTimeInterval: 2, repeats: false) { t in
-                self.reloadDevices()
-            }
-        }
-    }
-
-    @objc func audioCallback(notification: Notification) {
-        reloadDevices()
-
-        logger.debug("Changes in devices, current audio devices: \(String(describing: self.availableInputs.map({ $0.portType.rawValue }))), output: \(String(describing: self.currentDevice?.portType.rawValue))")
-    }
-
-    func start() {
-        nc.addObserver(self, selector: #selector(audioCallback), name: AVAudioSession.routeChangeNotification, object: nil)
-    }
-
-    func stop() {
-        nc.removeObserver(self, name: AVAudioSession.routeChangeNotification, object: nil)
-        timer?.invalidate()
-    }
-}

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

@@ -51,7 +51,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func provider(_ provider: CXProvider, perform action: CXStartCallAction) {
         logger.debug("CallController.provider CXStartCallAction")
-        if callManager.startOutgoingCall(callUUID: action.callUUID.uuidString.lowercased()) {
+        if callManager.startOutgoingCall(callUUID: action.callUUID) {
             action.fulfill()
             provider.reportOutgoingCall(with: action.callUUID, startedConnectingAt: nil)
         } else {
@@ -61,30 +61,12 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func provider(_ provider: CXProvider, perform action: CXAnswerCallAction) {
         logger.debug("CallController.provider CXAnswerCallAction")
-        Task {
-            let chatIsReady = await waitUntilChatStarted(timeoutMs: 30_000, stepMs: 500)
-            logger.debug("CallController chat started \(chatIsReady) \(ChatModel.shared.chatInitialized) \(ChatModel.shared.chatRunning == true) \(String(describing: AppChatState.shared.value))")
-            if !chatIsReady {
-                action.fail()
-                return
-            }
-            if !ChatModel.shared.callInvitations.values.contains(where: { inv in inv.callUUID == action.callUUID.uuidString.lowercased() }) {
-                try? await justRefreshCallInvitations()
-                logger.debug("CallController: updated call invitations chat")
-            }
-            await MainActor.run {
-                logger.debug("CallController.provider will answer on call")
-
-                if callManager.answerIncomingCall(callUUID: action.callUUID.uuidString.lowercased()) {
-                    logger.debug("CallController.provider answered on call")
-                    // WebRTC call should be in connected state to fulfill.
-                    // Otherwise no audio and mic working on lockscreen
-                    fulfillOnConnect = action
-                } else {
-                    logger.debug("CallController.provider will fail the call")
-                    action.fail()
-                }
-            }
+        if callManager.answerIncomingCall(callUUID: action.callUUID) {
+            // WebRTC call should be in connected state to fulfill.
+            // Otherwise no audio and mic working on lockscreen
+            fulfillOnConnect = action
+        } else {
+            action.fail()
         }
     }
 
@@ -93,7 +75,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         // Should be nil here if connection was in connected state
         fulfillOnConnect?.fail()
         fulfillOnConnect = nil
-        callManager.endCall(callUUID: action.callUUID.uuidString.lowercased()) { ok in
+        callManager.endCall(callUUID: action.callUUID) { ok in
             if ok {
                 action.fulfill()
             } else {
@@ -104,7 +86,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        if callManager.enableMedia(source: .mic, enable: !action.isMuted, callUUID:  action.callUUID.uuidString.lowercased()) {
+        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID) {
             action.fulfill()
         } else {
             action.fail()
@@ -121,23 +103,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
         RTCAudioSession.sharedInstance().isAudioEnabled = true
         do {
-            let hasVideo = ChatModel.shared.activeCall?.hasVideo == true
-            if hasVideo {
-                try audioSession.setCategory(.playAndRecord, mode: .videoChat, options: [.defaultToSpeaker, .mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            } else {
-                try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-            }
-            // Without any delay sound is not playing from speaker or external device in incoming call
-            Task {
-                for i in 0 ... 3 {
-                    try? await Task.sleep(nanoseconds: UInt64(i) * 300_000000)
-                    if let preferred = audioSession.preferredInputDevice() {
-                        await MainActor.run { try? audioSession.setPreferredInput(preferred) }
-                    } else if hasVideo {
-                        await MainActor.run { try? audioSession.overrideOutputAudioPort(.speaker) }
-                    }
-                }
-            }
+            try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: .mixWithOthers)
             logger.debug("audioSession category set")
             try audioSession.setActive(true)
             logger.debug("audioSession activated")
@@ -174,19 +140,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         }
     }
 
-    private func waitUntilChatStarted(timeoutMs: UInt64, stepMs: UInt64) async -> Bool {
-        logger.debug("CallController waiting until chat started")
-        var t: UInt64 = 0
-        repeat {
-            if ChatModel.shared.chatInitialized, ChatModel.shared.chatRunning == true, case .active = AppChatState.shared.value {
-                return true
-            }
-            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
-            t += stepMs
-        } while t < timeoutMs
-        return false
-    }
-
     @objc(pushRegistry:didUpdatePushCredentials:forType:)
     func pushRegistry(_ registry: PKPushRegistry, didUpdate pushCredentials: PKPushCredentials, for type: PKPushType) {
         logger.debug("CallController: didUpdate push credentials for type \(type.rawValue)")
@@ -202,19 +155,32 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
             self.reportExpiredCall(payload: payload, completion)
             return
         }
+        if (!ChatModel.shared.chatInitialized) {
+            logger.debug("CallController: initializing chat")
+            do {
+                try initializeChat(start: true, refreshInvitations: false)
+            } catch let error {
+                logger.error("CallController: initializing chat error: \(error)")
+                self.reportExpiredCall(payload: payload, completion)
+                return
+            }
+        }
+        logger.debug("CallController: initialized chat")
+        startChatForCall()
+        logger.debug("CallController: started chat")
+        self.shouldSuspendChat = true
+        // There are no invitations in the model, as it was processed by NSE
+        _ = try? justRefreshCallInvitations()
+        logger.debug("CallController: updated call invitations chat")
+        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
         // Extract the call information from the push notification payload
         let m = ChatModel.shared
         if let contactId = payload.dictionaryPayload["contactId"] as? String,
-           let displayName = payload.dictionaryPayload["displayName"] as? String,
-           let callUUID = payload.dictionaryPayload["callUUID"] as? String,
-           let uuid = UUID(uuidString: callUUID),
-           let callTsInterval = payload.dictionaryPayload["callTs"] as? TimeInterval,
-           let mediaStr = payload.dictionaryPayload["media"] as? String,
-           let media = CallMediaType(rawValue: mediaStr) {
-            let update = self.cxCallUpdate(contactId, displayName, media)
-            let callTs = Date(timeIntervalSince1970: callTsInterval)
-            if callTs.timeIntervalSinceNow >= -180 {
+           let invitation = m.callInvitations[contactId] {
+            let update = self.cxCallUpdate(invitation: invitation)
+            if let uuid = invitation.callkitUUID {
                 logger.debug("CallController: report pushkit call via CallKit")
+                let update = self.cxCallUpdate(invitation: invitation)
                 self.provider.reportNewIncomingCall(with: uuid, update: update) { error in
                     if error != nil {
                         m.callInvitations.removeValue(forKey: contactId)
@@ -223,31 +189,11 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                     completion()
                 }
             } else {
-                logger.debug("CallController will expire call 1")
                 self.reportExpiredCall(update: update, completion)
             }
         } else {
-            logger.debug("CallController will expire call 2")
             self.reportExpiredCall(payload: payload, completion)
         }
-
-        //DispatchQueue.main.asyncAfter(deadline: .now() + 10) {
-        if (!ChatModel.shared.chatInitialized) {
-            logger.debug("CallController: initializing chat")
-            do {
-                try initializeChat(start: true, refreshInvitations: false)
-            } catch let error {
-                logger.error("CallController: initializing chat error: \(error)")
-                if let call = ChatModel.shared.activeCall {
-                    self.endCall(call: call, completed: completion)
-                }
-                return
-            }
-        }
-        logger.debug("CallController: initialized chat")
-        startChatForCall()
-        logger.debug("CallController: started chat")
-        self.shouldSuspendChat = true
     }
 
     // This function fulfils the requirement to always report a call when PushKit notification is received,
@@ -277,8 +223,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
     }
 
     func reportNewIncomingCall(invitation: RcvCallInvitation, completion: @escaping (Error?) -> Void) {
-        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callUUID))")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+        logger.debug("CallController.reportNewIncomingCall, UUID=\(String(describing: invitation.callkitUUID))")
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             if invitation.callTs.timeIntervalSinceNow >= -180 {
                 let update = cxCallUpdate(invitation: invitation)
                 provider.reportNewIncomingCall(with: uuid, update: update, completion: completion)
@@ -299,14 +245,6 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         return update
     }
 
-    private func cxCallUpdate(_ contactId: String, _ displayName: String, _ media: CallMediaType) -> CXCallUpdate {
-        let update = CXCallUpdate()
-        update.remoteHandle = CXHandle(type: .generic, value: contactId)
-        update.hasVideo = media == .video
-        update.localizedCallerName = displayName
-        return update
-    }
-
     func reportIncomingCall(call: Call, connectedAt dateConnected: Date?) {
         logger.debug("CallController: reporting incoming call connected")
         if CallController.useCallKit() {
@@ -318,14 +256,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func reportOutgoingCall(call: Call, connectedAt dateConnected: Date?) {
         logger.debug("CallController: reporting outgoing call connected")
-        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
             provider.reportOutgoingCall(with: uuid, connectedAt: dateConnected)
         }
     }
 
     func reportCallRemoteEnded(invitation: RcvCallInvitation) {
         logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = invitation.callkitUUID {
             provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
         } else if invitation.contact.id == activeCallInvitation?.contact.id {
             activeCallInvitation = nil
@@ -334,17 +272,14 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
 
     func reportCallRemoteEnded(call: Call) {
         logger.debug("CallController: reporting remote ended")
-        if CallController.useCallKit(), let callUUID = call.callUUID, let uuid = UUID(uuidString: callUUID) {
+        if CallController.useCallKit(), let uuid = call.callkitUUID {
             provider.reportCall(with: uuid, endedAt: nil, reason: .remoteEnded)
         }
     }
 
     func startCall(_ contact: Contact, _ media: CallMediaType) {
         logger.debug("CallController.startCall")
-        let callUUID = callManager.newOutgoingCall(contact, media)
-        guard let uuid = UUID(uuidString: callUUID) else {
-            return
-        }
+        let uuid = callManager.newOutgoingCall(contact, media)
         if CallController.useCallKit() {
             let handle = CXHandle(type: .generic, value: contact.id)
             let action = CXStartCallAction(call: uuid, handle: handle)
@@ -356,17 +291,19 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                 update.localizedCallerName = contact.displayName
                 self.provider.reportCall(with: uuid, updated: update)
             }
-        } else if callManager.startOutgoingCall(callUUID: callUUID) {
-            logger.debug("CallController.startCall: call started")
-        } else {
-            logger.error("CallController.startCall: no active call")
+        } else if callManager.startOutgoingCall(callUUID: uuid) {
+            if callManager.startOutgoingCall(callUUID: uuid) {
+                logger.debug("CallController.startCall: call started")
+            } else {
+                logger.error("CallController.startCall: no active call")
+            }
         }
     }
 
     func answerCall(invitation: RcvCallInvitation) {
         logger.debug("CallController: answering a call")
-        if CallController.useCallKit(), let callUUID = invitation.callUUID, let uuid = UUID(uuidString: callUUID) {
-            requestTransaction(with: CXAnswerCallAction(call: uuid))
+        if CallController.useCallKit(), let callUUID = invitation.callkitUUID {
+            requestTransaction(with: CXAnswerCallAction(call: callUUID))
         } else {
             callManager.answerIncomingCall(invitation: invitation)
         }
@@ -375,13 +312,10 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         }
     }
 
-    func endCall(callUUID: String) {
-        let uuid = UUID(uuidString: callUUID)
-        logger.debug("CallController: ending the call with UUID \(callUUID)")
+    func endCall(callUUID: UUID) {
+        logger.debug("CallController: ending the call with UUID \(callUUID.uuidString)")
         if CallController.useCallKit() {
-            if let uuid {
-                requestTransaction(with: CXEndCallAction(call: uuid))
-            }
+            requestTransaction(with: CXEndCallAction(call: callUUID))
         } else {
             callManager.endCall(callUUID: callUUID) { ok in
                 if ok {

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

@@ -10,25 +10,25 @@ import Foundation
 import SimpleXChat
 
 class CallManager {
-    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> String {
-        let uuid = UUID().uuidString.lowercased()
-        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, initialCallType: media)
+    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> UUID {
+        let uuid = UUID()
+        let call = Call(direction: .outgoing, contact: contact, callkitUUID: uuid, callState: .waitCapabilities, localMedia: media)
         call.speakerEnabled = media == .video
         ChatModel.shared.activeCall = call
         return uuid
     }
 
-    func startOutgoingCall(callUUID: String) -> Bool {
+    func startOutgoingCall(callUUID: UUID) -> Bool {
         let m = ChatModel.shared
-        if let call = m.activeCall, call.callUUID == callUUID {
+        if let call = m.activeCall, call.callkitUUID == callUUID {
             m.showCallView = true
-            Task { await m.callCommand.processCommand(.capabilities(media: call.initialCallType)) }
+            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
             return true
         }
         return false
     }
 
-    func answerIncomingCall(callUUID: String) -> Bool {
+    func answerIncomingCall(callUUID: UUID) -> Bool {
         if let invitation = getCallInvitation(callUUID) {
             answerIncomingCall(invitation: invitation)
             return true
@@ -42,9 +42,9 @@ class CallManager {
         let call = Call(
             direction: .incoming,
             contact: invitation.contact,
-            callUUID: invitation.callUUID,
+            callkitUUID: invitation.callkitUUID,
             callState: .invitationAccepted,
-            initialCallType: invitation.callType.media,
+            localMedia: invitation.callType.media,
             sharedKey: invitation.sharedKey
         )
         call.speakerEnabled = invitation.callType.media == .video
@@ -68,17 +68,17 @@ class CallManager {
         }
     }
 
-    func enableMedia(source: CallMediaSource, enable: Bool, callUUID: String) -> Bool {
-        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
+    func enableMedia(media: CallMediaType, enable: Bool, callUUID: UUID) -> Bool {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
             let m = ChatModel.shared
-            Task { await m.callCommand.processCommand(.media(source: source, enable: enable)) }
+            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
             return true
         }
         return false
     }
 
-    func endCall(callUUID: String, completed: @escaping (Bool) -> Void) {
-        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
+    func endCall(callUUID: UUID, completed: @escaping (Bool) -> Void) {
+        if let call = ChatModel.shared.activeCall, call.callkitUUID == callUUID {
             endCall(call: call) { completed(true) }
         } else if let invitation = getCallInvitation(callUUID) {
             endCall(invitation: invitation) { completed(true) }
@@ -126,8 +126,8 @@ class CallManager {
         }
     }
 
-    private func getCallInvitation(_ callUUID: String) -> RcvCallInvitation? {
-        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callUUID == callUUID }) {
+    private func getCallInvitation(_ callUUID: UUID) -> RcvCallInvitation? {
+        if let (_, invitation) = ChatModel.shared.callInvitations.first(where: { (_, inv) in inv.callkitUUID == callUUID }) {
             return invitation
         }
         return nil

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

@@ -10,49 +10,40 @@ import AVKit
 
 struct CallViewRemote: UIViewRepresentable {
     var client: WebRTCClient
-    @ObservedObject var call: Call
+    var activeCall: Binding<WebRTCClient.Call?>
     @State var enablePip: (Bool) -> Void = {_ in }
     @Binding var activeCallViewIsCollapsed: Bool
-    @Binding var contentMode: UIView.ContentMode
     @Binding var pipShown: Bool
 
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, activeCallViewIsCollapsed: Binding<Bool>, pipShown: Binding<Bool>) {
+        self.client = client
+        self.activeCall = activeCall
+        self._activeCallViewIsCollapsed = activeCallViewIsCollapsed
+        self._pipShown = pipShown
+    }
+
     func makeUIView(context: Context) -> UIView {
         let view = UIView()
-        let remoteCameraRenderer = RTCMTLVideoView(frame: view.frame)
-        remoteCameraRenderer.videoContentMode = contentMode
-        remoteCameraRenderer.tag = 0
+        if let call = activeCall.wrappedValue {
+            let remoteRenderer = RTCMTLVideoView(frame: view.frame)
+            remoteRenderer.videoContentMode = .scaleAspectFill
+            client.addRemoteRenderer(call, remoteRenderer)
+            addSubviewAndResize(remoteRenderer, into: view)
 
-        let screenVideo = call.peerMediaSources.screenVideo
-        let remoteScreenRenderer = RTCMTLVideoView(frame: view.frame)
-        remoteScreenRenderer.videoContentMode = contentMode
-        remoteScreenRenderer.tag = 1
-        remoteScreenRenderer.alpha = screenVideo ? 1 : 0
-
-        context.coordinator.cameraRenderer = remoteCameraRenderer
-        context.coordinator.screenRenderer = remoteScreenRenderer
-        client.addRemoteCameraRenderer(remoteCameraRenderer)
-        client.addRemoteScreenRenderer(remoteScreenRenderer)
-        if screenVideo {
-            addSubviewAndResize(remoteScreenRenderer, remoteCameraRenderer, into: view)
-        } else {
-            addSubviewAndResize(remoteCameraRenderer, remoteScreenRenderer, into: view)
-        }
-
-        if AVPictureInPictureController.isPictureInPictureSupported() {
-            makeViewWithRTCRenderer(remoteCameraRenderer, remoteScreenRenderer, view, context)
+            if AVPictureInPictureController.isPictureInPictureSupported() {
+                makeViewWithRTCRenderer(call, remoteRenderer, view, context)
+            }
         }
         return view
     }
     
-    func makeViewWithRTCRenderer(_ remoteCameraRenderer: RTCMTLVideoView, _ remoteScreenRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
-        let pipRemoteCameraRenderer = RTCMTLVideoView(frame: view.frame)
-        pipRemoteCameraRenderer.videoContentMode = .scaleAspectFill
-
-        let pipRemoteScreenRenderer = RTCMTLVideoView(frame: view.frame)
-        pipRemoteScreenRenderer.videoContentMode = .scaleAspectFill
-
+    func makeViewWithRTCRenderer(_ call: WebRTCClient.Call, _ remoteRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
+        let pipRemoteRenderer = RTCMTLVideoView(frame: view.frame)
+        pipRemoteRenderer.videoContentMode = .scaleAspectFill
+        
         let pipVideoCallViewController = AVPictureInPictureVideoCallViewController()
         pipVideoCallViewController.preferredContentSize = CGSize(width: 1080, height: 1920)
+        addSubviewAndResize(pipRemoteRenderer, into: pipVideoCallViewController.view)
         let pipContentSource = AVPictureInPictureController.ContentSource(
             activeVideoCallSourceView: view,
             contentViewController: pipVideoCallViewController
@@ -64,9 +55,7 @@ struct CallViewRemote: UIViewRepresentable {
         context.coordinator.pipController = pipController
         context.coordinator.willShowHide = { show in
             if show {
-                client.addRemoteCameraRenderer(pipRemoteCameraRenderer)
-                client.addRemoteScreenRenderer(pipRemoteScreenRenderer)
-                context.coordinator.relayout()
+                client.addRemoteRenderer(call, pipRemoteRenderer)
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                     activeCallViewIsCollapsed = true
                 }
@@ -78,29 +67,13 @@ struct CallViewRemote: UIViewRepresentable {
         }
         context.coordinator.didShowHide = { show in
             if show {
-                remoteCameraRenderer.isHidden = true
-                remoteScreenRenderer.isHidden = true
+                remoteRenderer.isHidden = true
             } else {
-                client.removeRemoteCameraRenderer(pipRemoteCameraRenderer)
-                client.removeRemoteScreenRenderer(pipRemoteScreenRenderer)
-                remoteCameraRenderer.isHidden = false
-                remoteScreenRenderer.isHidden = false
+                client.removeRemoteRenderer(call, pipRemoteRenderer)
+                remoteRenderer.isHidden = false
             }
             pipShown = show
         }
-        context.coordinator.relayout = {
-            let camera = call.peerMediaSources.camera
-            let screenVideo = call.peerMediaSources.screenVideo
-            pipRemoteCameraRenderer.alpha = camera ? 1 : 0
-            pipRemoteScreenRenderer.alpha = screenVideo ? 1 : 0
-            if screenVideo {
-                addSubviewAndResize(pipRemoteScreenRenderer, pipRemoteCameraRenderer, pip: true, into: pipVideoCallViewController.view)
-            } else {
-                addSubviewAndResize(pipRemoteCameraRenderer, pipRemoteScreenRenderer, pip: true, into: pipVideoCallViewController.view)
-            }
-            (pipVideoCallViewController.view.subviews[0] as! RTCMTLVideoView).videoContentMode = contentMode
-            (pipVideoCallViewController.view.subviews[1] as! RTCMTLVideoView).videoContentMode = .scaleAspectFill
-        }
         DispatchQueue.main.async {
             enablePip = { enable in
                 if enable != pipShown /* pipController.isPictureInPictureActive */ {
@@ -115,50 +88,24 @@ struct CallViewRemote: UIViewRepresentable {
     }
     
     func makeCoordinator() -> Coordinator {
-        Coordinator(client)
+        Coordinator()
     }
 
     func updateUIView(_ view: UIView, context: Context) {
         logger.debug("CallView.updateUIView remote")
-        let camera = view.subviews.first(where: { $0.tag == 0 })!
-        let screen = view.subviews.first(where: { $0.tag == 1 })!
-        let screenVideo = call.peerMediaSources.screenVideo
-        if screenVideo && screen.alpha == 0 {
-            screen.alpha = 1
-            addSubviewAndResize(screen, camera, into: view)
-        } else if !screenVideo && screen.alpha == 1 {
-            screen.alpha = 0
-            addSubviewAndResize(camera, screen, into: view)
-        }
-        (view.subviews[0] as! RTCMTLVideoView).videoContentMode = contentMode
-        (view.subviews[1] as! RTCMTLVideoView).videoContentMode = .scaleAspectFill
-
-        camera.alpha = call.peerMediaSources.camera ? 1 : 0
-        screen.alpha = call.peerMediaSources.screenVideo ? 1 : 0
-
         DispatchQueue.main.async {
             if activeCallViewIsCollapsed != pipShown {
                 enablePip(activeCallViewIsCollapsed)
-            } else if pipShown {
-                context.coordinator.relayout()
             }
         }
     }
     
     // MARK: - Coordinator
     class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
-        var cameraRenderer: RTCMTLVideoView?
-        var screenRenderer: RTCMTLVideoView?
-        var client: WebRTCClient
         var pipController: AVPictureInPictureController? = nil
         var willShowHide: (Bool) -> Void = { _ in }
         var didShowHide: (Bool) -> Void = { _ in }
-        var relayout: () -> Void = {}
-
-        required init(_ client: WebRTCClient) {
-            self.client = client
-        }
-
+        
         func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
             willShowHide(true)
         }
@@ -180,20 +127,11 @@ struct CallViewRemote: UIViewRepresentable {
         }
 
         deinit {
-            // TODO: deinit is not called when changing call type from audio to video and back,
-            // which causes many renderers can be created and added to stream (if enabling/disabling
-            // video while not yet connected in outgoing call)
             pipController?.stopPictureInPicture()
             pipController?.canStartPictureInPictureAutomaticallyFromInline = false
             pipController?.contentSource = nil
             pipController?.delegate = nil
             pipController = nil
-            if let cameraRenderer {
-                client.removeRemoteCameraRenderer(cameraRenderer)
-            }
-            if let screenRenderer {
-                client.removeRemoteScreenRenderer(screenRenderer)
-            }
         }
     }
     
@@ -210,109 +148,51 @@ struct CallViewRemote: UIViewRepresentable {
 
 struct CallViewLocal: UIViewRepresentable {
     var client: WebRTCClient
+    var activeCall: Binding<WebRTCClient.Call?>
     var localRendererAspectRatio: Binding<CGFloat?>
     @State var pipStateChanged: (Bool) -> Void = {_ in }
     @Binding var pipShown: Bool
 
-    init(client: WebRTCClient, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
         self.client = client
+        self.activeCall = activeCall
         self.localRendererAspectRatio = localRendererAspectRatio
         self._pipShown = pipShown
     }
 
     func makeUIView(context: Context) -> UIView {
         let view = UIView()
-        let localRenderer = RTCEAGLVideoView(frame: .zero)
-        context.coordinator.renderer = localRenderer
-        client.addLocalRenderer(localRenderer)
-        addSubviewAndResize(localRenderer, nil, into: view)
-        DispatchQueue.main.async {
-            pipStateChanged = { shown in
-                localRenderer.isHidden = shown
+        if let call = activeCall.wrappedValue {
+            let localRenderer = RTCEAGLVideoView(frame: .zero)
+            client.addLocalRenderer(call, localRenderer)
+            client.startCaptureLocalVideo(call)
+            addSubviewAndResize(localRenderer, into: view)
+            DispatchQueue.main.async {
+                pipStateChanged = { shown in
+                    localRenderer.isHidden = shown
+                }
             }
         }
         return view
     }
 
-    func makeCoordinator() -> Coordinator {
-        Coordinator(client)
-    }
-
     func updateUIView(_ view: UIView, context: Context) {
         logger.debug("CallView.updateUIView local")
         pipStateChanged(pipShown)
     }
-
-    // MARK: - Coordinator
-    class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
-        var renderer: RTCEAGLVideoView?
-        var client: WebRTCClient
-
-        required init(_ client: WebRTCClient) {
-            self.client = client
-        }
-
-        deinit {
-            if let renderer {
-                client.removeLocalRenderer(renderer)
-            }
-        }
-    }
 }
 
-private func addSubviewAndResize(_ fullscreen: UIView, _ end: UIView?, pip: Bool = false, into containerView: UIView) {
-    if containerView.subviews.firstIndex(of: fullscreen) == 0 && ((end == nil && containerView.subviews.count == 1) || (end != nil && containerView.subviews.firstIndex(of: end!) == 1)) {
-        // Nothing to do, elements on their places
-        return
-    }
-    containerView.removeConstraints(containerView.constraints)
-    containerView.subviews.forEach { sub in sub.removeFromSuperview()}
-
-    containerView.addSubview(fullscreen)
-    fullscreen.translatesAutoresizingMaskIntoConstraints = false
-    fullscreen.layer.cornerRadius = 0
-    fullscreen.layer.masksToBounds = false
-
-    if let end {
-        containerView.addSubview(end)
-        end.translatesAutoresizingMaskIntoConstraints = false
-        end.layer.cornerRadius = pip ? 8 : 10
-        end.layer.masksToBounds = true
-    }
-
-    let constraintFullscreenV = NSLayoutConstraint.constraints(
-        withVisualFormat: "V:|[fullscreen]|",
+private func addSubviewAndResize(_ view: UIView, into containerView: UIView) {
+    containerView.addSubview(view)
+    view.translatesAutoresizingMaskIntoConstraints = false
+    containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|",
         options: [],
         metrics: nil,
-        views: ["fullscreen": fullscreen]
-    )
-    let constraintFullscreenH = NSLayoutConstraint.constraints(
-        withVisualFormat: "H:|[fullscreen]|",
+        views: ["view": view]))
+
+    containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|",
         options: [],
         metrics: nil,
-        views: ["fullscreen": fullscreen]
-    )
-
-    containerView.addConstraints(constraintFullscreenV)
-    containerView.addConstraints(constraintFullscreenH)
-
-    if let end {
-        let constraintEndWidth = NSLayoutConstraint(
-            item: end, attribute: .width, relatedBy: .equal, toItem: containerView, attribute: .width, multiplier: pip ? 0.5 : 0.3, constant: 0
-        )
-        let constraintEndHeight = NSLayoutConstraint(
-            item: end, attribute: .height, relatedBy: .equal, toItem: containerView, attribute: .width, multiplier: pip ? 0.5 * 1.33 : 0.3 * 1.33, constant: 0
-        )
-        let constraintEndX = NSLayoutConstraint(
-            item: end, attribute: .leading, relatedBy: .equal, toItem: containerView, attribute: .trailing, multiplier: pip ? 0.5 : 0.7, constant: pip ? -8 : -17
-        )
-        let constraintEndY = NSLayoutConstraint(
-            item: end, attribute: .bottom, relatedBy: .equal, toItem: containerView, attribute: .bottom, multiplier: 1, constant: pip ? -8 : -92
-        )
-        containerView.addConstraint(constraintEndWidth)
-        containerView.addConstraint(constraintEndHeight)
-        containerView.addConstraint(constraintEndX)
-        containerView.addConstraint(constraintEndY)
-    }
+        views: ["view": view]))
     containerView.layoutIfNeeded()
 }

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct IncomingCallView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @ObservedObject var cc = CallController.shared
 
     var body: some View {
@@ -31,21 +30,21 @@ struct IncomingCallView: View {
         VStack(alignment: .leading, spacing: 6) {
             HStack {
                 if m.users.count > 1 {
-                    ProfileImage(imageStr: invitation.user.image, size: 24, color: .white)
+                    ProfileImage(imageStr: invitation.user.image, color: .white)
+                        .frame(width: 24, height: 24)
                 }
                 Image(systemName: invitation.callType.media == .video ? "video.fill" : "phone.fill").foregroundColor(.green)
                 Text(invitation.callTypeText)
             }
             HStack {
                 ProfilePreview(profileOf: invitation.contact, color: .white)
-                    .padding(.vertical, 6)
                 Spacer()
 
                 callButton("Reject", "phone.down.fill", .red) {
                     cc.endCall(invitation: invitation)
                 }
 
-                callButton("Ignore", "multiply", .primary) {
+                callButton("Ignore", "multiply", .accentColor) {
                     cc.activeCallInvitation = nil
                 }
 
@@ -65,7 +64,7 @@ struct IncomingCallView: View {
         .padding(.horizontal, 16)
         .padding(.vertical, 12)
         .frame(maxWidth: .infinity)
-        .modifier(ThemedBackground())
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
         .onAppear { dismissAllSheets() }
     }
 
@@ -78,7 +77,7 @@ struct IncomingCallView: View {
                     .frame(width: 24, height: 24)
                 Text(text)
                     .font(.caption)
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
             }
             .frame(minWidth: 44)
         })

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

@@ -8,7 +8,6 @@
 
 import Foundation
 import AVFoundation
-import UIKit
 
 class SoundPlayer {
     static let shared = SoundPlayer()
@@ -44,63 +43,3 @@ class SoundPlayer {
         audioPlayer = nil
     }
 }
-
-class CallSoundsPlayer {
-    static let shared = CallSoundsPlayer()
-    private var audioPlayer: AVAudioPlayer?
-    private var playerTask: Task = Task {}
-
-    private func start(_ soundName: String, delayMs: Double) {
-        audioPlayer?.stop()
-        playerTask.cancel()
-        logger.debug("start \(soundName)")
-        guard let path = Bundle.main.path(forResource: soundName, ofType: "mp3", inDirectory: "sounds") else {
-            logger.debug("start: file not found")
-            return
-        }
-        do {
-            let player = try AVAudioPlayer(contentsOf: URL(fileURLWithPath: path))
-            if player.prepareToPlay() {
-                audioPlayer = player
-            }
-        } catch {
-            logger.debug("start: AVAudioPlayer error \(error.localizedDescription)")
-        }
-
-        playerTask = Task {
-            while let player = audioPlayer {
-                player.play()
-                do {
-                    try await Task.sleep(nanoseconds: UInt64((player.duration * 1_000_000_000) + delayMs * 1_000_000))
-                } catch {
-                    break
-                }
-            }
-        }
-    }
-
-    func startConnectingCallSound() {
-        start("connecting_call", delayMs: 0)
-    }
-
-    func startInCallSound() {
-        // Taken from https://github.com/TelegramOrg/Telegram-Android
-        // https://github.com/TelegramOrg/Telegram-Android/blob/master/LICENSE
-        start("in_call", delayMs: 1000)
-    }
-
-    func stop() {
-        playerTask.cancel()
-        audioPlayer?.stop()
-        audioPlayer = nil
-    }
-
-    func vibrate(long: Bool) {
-        // iOS just don't want to vibrate more than once after a short period of time, and all 'styles' feel the same
-        if long {
-            AudioServicesPlayAlertSound(kSystemSoundID_Vibrate)
-        } else {
-            UIImpactFeedbackGenerator(style: .heavy).impactOccurred()
-        }
-    }
-}

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

@@ -18,49 +18,49 @@ class Call: ObservableObject, Equatable {
 
     var direction: CallDirection
     var contact: Contact
-    var callUUID: String?
-    var initialCallType: CallMediaType
-    @Published var localMediaSources: CallMediaSources
+    var callkitUUID: UUID?
+    var localMedia: CallMediaType
     @Published var callState: CallState
     @Published var localCapabilities: CallCapabilities?
-    @Published var peerMediaSources: CallMediaSources = CallMediaSources()
+    @Published var peerMedia: CallMediaType?
     @Published var sharedKey: String?
+    @Published var audioEnabled = true
     @Published var speakerEnabled = false
+    @Published var videoEnabled: Bool
     @Published var connectionInfo: ConnectionInfo?
     @Published var connectedAt: Date? = nil
 
     init(
         direction: CallDirection,
         contact: Contact,
-        callUUID: String?,
+        callkitUUID: UUID?,
         callState: CallState,
-        initialCallType: CallMediaType,
+        localMedia: CallMediaType,
         sharedKey: String? = nil
     ) {
         self.direction = direction
         self.contact = contact
-        self.callUUID = callUUID
+        self.callkitUUID = callkitUUID
         self.callState = callState
-        self.initialCallType = initialCallType
+        self.localMedia = localMedia
         self.sharedKey = sharedKey
-        self.localMediaSources = CallMediaSources(
-            mic: AVCaptureDevice.authorizationStatus(for: .audio) == .authorized,
-            camera: initialCallType == .video && AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
+        self.videoEnabled = localMedia == .video
     }
 
     var encrypted: Bool { get { localEncrypted && sharedKey != nil } }
-    private var localEncrypted: Bool { get { localCapabilities?.encryption ?? false } }
+    var localEncrypted: Bool { get { localCapabilities?.encryption ?? false } }
     var encryptionStatus: LocalizedStringKey {
         get {
             switch callState {
             case .waitCapabilities: return ""
             case .invitationSent: return localEncrypted ? "e2e encrypted" : "no e2e encryption"
             case .invitationAccepted: return sharedKey == nil ? "contact has no e2e encryption" : "contact has e2e encryption"
-            default: return !localEncrypted ? "no e2e encryption" : sharedKey == nil ? "contact has no e2e encryption" : "e2e encrypted"
+            default: return !localEncrypted ? "no e2e encryption" : sharedKey == nil ? "contact has no e2e encryption" : "e2e encrypted" 
             }
         }
     }
-    var hasVideo: Bool { get { localMediaSources.hasVideo || peerMediaSources.hasVideo } }
+    var hasMedia: Bool { get { callState == .offerSent || callState == .negotiated || callState == .connected } }
+    var supportsVideo: Bool { get { peerMedia == .video || localMedia == .video } }
 }
 
 enum CallDirection {
@@ -105,28 +105,18 @@ struct WVAPIMessage: Equatable, Decodable, Encodable {
     var command: WCallCommand?
 }
 
-struct CallMediaSources: Equatable, Codable {
-  var mic: Bool = false
-  var camera: Bool = false
-  var screenAudio: Bool = false
-  var screenVideo: Bool = false
-
-  var hasVideo: Bool { get { camera || screenVideo } }
-}
-
 enum WCallCommand: Equatable, Encodable, Decodable {
     case capabilities(media: CallMediaType)
     case start(media: CallMediaType, aesKey: String? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
     case offer(offer: String, iceCandidates: String, media: CallMediaType, aesKey: String? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
     case answer(answer: String, iceCandidates: String)
     case ice(iceCandidates: String)
-    case media(source: CallMediaSource, enable: Bool)
+    case media(media: CallMediaType, enable: Bool)
     case end
 
     enum CodingKeys: String, CodingKey {
         case type
         case media
-        case source
         case aesKey
         case offer
         case answer
@@ -177,9 +167,9 @@ enum WCallCommand: Equatable, Encodable, Decodable {
         case let .ice(iceCandidates):
             try container.encode("ice", forKey: .type)
             try container.encode(iceCandidates, forKey: .iceCandidates)
-        case let .media(source, enable):
+        case let .media(media, enable):
             try container.encode("media", forKey: .type)
-            try container.encode(source, forKey: .media)
+            try container.encode(media, forKey: .media)
             try container.encode(enable, forKey: .enable)
         case .end:
             try container.encode("end", forKey: .type)
@@ -215,9 +205,9 @@ enum WCallCommand: Equatable, Encodable, Decodable {
             let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
             self = .ice(iceCandidates: iceCandidates)
         case "media":
-            let source = try container.decode(CallMediaSource.self, forKey: CodingKeys.source)
+            let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
             let enable = try container.decode(Bool.self, forKey: CodingKeys.enable)
-            self = .media(source: source, enable: enable)
+            self = .media(media: media, enable: enable)
         case "end":
             self = .end
         default:
@@ -234,7 +224,6 @@ enum WCallResponse: Equatable, Decodable {
     case ice(iceCandidates: String)
     case connection(state: ConnectionState)
     case connected(connectionInfo: ConnectionInfo)
-    case peerMedia(source: CallMediaSource, enabled: Bool)
     case ended
     case ok
     case error(message: String)
@@ -249,8 +238,6 @@ enum WCallResponse: Equatable, Decodable {
         case state
         case connectionInfo
         case message
-        case source
-        case enabled
     }
 
     var respType: String {
@@ -262,7 +249,6 @@ enum WCallResponse: Equatable, Decodable {
             case .ice: return "ice"
             case .connection: return "connection"
             case .connected: return "connected"
-            case .peerMedia: return "peerMedia"
             case .ended: return "ended"
             case .ok: return "ok"
             case .error: return "error"
@@ -297,10 +283,6 @@ enum WCallResponse: Equatable, Decodable {
             case "connected":
                 let connectionInfo = try container.decode(ConnectionInfo.self, forKey: CodingKeys.connectionInfo)
                 self = .connected(connectionInfo: connectionInfo)
-            case "peerMedia":
-                let source = try container.decode(CallMediaSource.self, forKey: CodingKeys.source)
-                let enabled = try container.decode(Bool.self, forKey: CodingKeys.enabled)
-                self = .peerMedia(source: source, enabled: enabled)
             case "ended":
                 self = .ended
             case "ok":
@@ -342,10 +324,6 @@ extension WCallResponse: Encodable {
         case let .connected(connectionInfo):
             try container.encode("connected", forKey: .type)
             try container.encode(connectionInfo, forKey: .connectionInfo)
-        case let .peerMedia(source, enabled):
-            try container.encode("peerMedia", forKey: .type)
-            try container.encode(source, forKey: .source)
-            try container.encode(enabled, forKey: .enabled)
         case .ended:
             try container.encode("ended", forKey: .type)
         case .ok:
@@ -398,7 +376,7 @@ actor WebRTCCommandProcessor {
     func shouldRunCommand(_ client: WebRTCClient, _ c: WCallCommand) -> Bool {
         switch c {
         case .capabilities, .start, .offer, .end: true
-        default: client.activeCall != nil
+        default: client.activeCall.wrappedValue != nil
         }
     }
 }
@@ -453,18 +431,17 @@ struct RTCIceServer: Codable, Equatable {
 }
 
 // the servers are expected in this format:
-// stuns:stun.simplex.im:443?transport=tcp
-// turns:private2:Hxuq2QxUjnhj96Zq2r4HjqHRj@turn.simplex.im:443?transport=tcp
+// stun:stun.simplex.im:443?transport=tcp
+// turn:private:yleob6AVkiNI87hpR94Z@turn.simplex.im:443?transport=tcp
 func parseRTCIceServer(_ str: String) -> RTCIceServer? {
     var s = replaceScheme(str, "stun:")
-    s = replaceScheme(s, "stuns:")
     s = replaceScheme(s, "turn:")
     s = replaceScheme(s, "turns:")
     if let u: URL = URL(string: s),
        let scheme = u.scheme,
        let host = u.host,
        let port = u.port,
-       u.path == "" && (scheme == "stun" || scheme == "stuns" || scheme == "turn" || scheme == "turns")  {
+       u.path == "" && (scheme == "stun" || scheme == "turn" || scheme == "turns")  {
         let query = u.query == nil || u.query == "" ? "" : "?" + (u.query ?? "")
         return RTCIceServer(
             urls: ["\(scheme):\(host):\(port)\(query)"],

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

@@ -23,24 +23,15 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     struct Call {
         var connection: RTCPeerConnection
         var iceCandidates: IceCandidates
+        var localMedia: CallMediaType
         var localCamera: RTCVideoCapturer?
-        var localAudioTrack: RTCAudioTrack?
-        var localVideoTrack: RTCVideoTrack?
-        var remoteAudioTrack: RTCAudioTrack?
-        var remoteVideoTrack: RTCVideoTrack?
-        var remoteScreenAudioTrack: RTCAudioTrack?
-        var remoteScreenVideoTrack: RTCVideoTrack?
-        var device: AVCaptureDevice.Position
+        var localVideoSource: RTCVideoSource?
+        var localStream: RTCVideoTrack?
+        var remoteStream: RTCVideoTrack?
+        var device: AVCaptureDevice.Position = .front
         var aesKey: String?
         var frameEncryptor: RTCFrameEncryptor?
         var frameDecryptor: RTCFrameDecryptor?
-        var peerHasOldVersion: Bool
-    }
-
-    struct NotConnectedCall {
-        var audioTrack: RTCAudioTrack?
-        var localCameraAndTrack: (RTCVideoCapturer, RTCVideoTrack)?
-        var device: AVCaptureDevice.Position = .front
     }
 
     actor IceCandidates {
@@ -58,77 +49,68 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }
 
     private let rtcAudioSession =  RTCAudioSession.sharedInstance()
-    private let audioQueue = DispatchQueue(label: "chat.simplex.app.audio")
+    private let audioQueue = DispatchQueue(label: "audio")
     private var sendCallResponse: (WVAPIMessage) async -> Void
-    var activeCall: Call?
-    var notConnectedCall: NotConnectedCall?
+    var activeCall: Binding<Call?>
     private var localRendererAspectRatio: Binding<CGFloat?>
 
-    var cameraRenderers: [RTCVideoRenderer] = []
-    var screenRenderers: [RTCVideoRenderer] = []
-
     @available(*, unavailable)
     override init() {
         fatalError("Unimplemented")
     }
 
-    required init(_ sendCallResponse: @escaping (WVAPIMessage) async -> Void, _ localRendererAspectRatio: Binding<CGFloat?>) {
+    required init(_ activeCall: Binding<Call?>, _ sendCallResponse: @escaping (WVAPIMessage) async -> Void, _ localRendererAspectRatio: Binding<CGFloat?>) {
         self.sendCallResponse = sendCallResponse
+        self.activeCall = activeCall
         self.localRendererAspectRatio = localRendererAspectRatio
         rtcAudioSession.useManualAudio = CallController.useCallKit()
         rtcAudioSession.isAudioEnabled = !CallController.useCallKit()
-        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)")
+        logger.debug("WebRTCClient: rtcAudioSession has manual audio \(self.rtcAudioSession.useManualAudio) and audio enabled \(self.rtcAudioSession.isAudioEnabled)}")
         super.init()
     }
 
     let defaultIceServers: [WebRTC.RTCIceServer] = [
-        WebRTC.RTCIceServer(urlStrings: ["stuns:stun.simplex.im:443"]),
-        //WebRTC.RTCIceServer(urlStrings: ["turns:turn.simplex.im:443?transport=udp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"),
-        WebRTC.RTCIceServer(urlStrings: ["turns:turn.simplex.im:443?transport=tcp"], username: "private2", credential: "Hxuq2QxUjnhj96Zq2r4HjqHRj"),
+        WebRTC.RTCIceServer(urlStrings: ["stun:stun.simplex.im:443"]),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=udp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
+        WebRTC.RTCIceServer(urlStrings: ["turn:turn.simplex.im:443?transport=tcp"], username: "private", credential: "yleob6AVkiNI87hpR94Z"),
     ]
 
     func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
         let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
         connection.delegate = self
-        let device = notConnectedCall?.device ?? .front
+        createAudioSender(connection)
+        var localStream: RTCVideoTrack? = nil
+        var remoteStream: RTCVideoTrack? = nil
         var localCamera: RTCVideoCapturer? = nil
-        var localAudioTrack: RTCAudioTrack? = nil
-        var localVideoTrack: RTCVideoTrack? = nil
-        if let localCameraAndTrack = notConnectedCall?.localCameraAndTrack {
-            (localCamera, localVideoTrack) = localCameraAndTrack
-        } else if notConnectedCall == nil && mediaType == .video {
-            (localCamera, localVideoTrack) = createVideoTrackAndStartCapture(device)
+        var localVideoSource: RTCVideoSource? = nil
+        if mediaType == .video {
+            (localStream, remoteStream, localCamera, localVideoSource) = createVideoSender(connection)
         }
-        if let audioTrack = notConnectedCall?.audioTrack {
-            localAudioTrack = audioTrack
-        } else if notConnectedCall == nil {
-            localAudioTrack = createAudioTrack()
-        }
-        notConnectedCall?.localCameraAndTrack = nil
-        notConnectedCall?.audioTrack = nil
-
         var frameEncryptor: RTCFrameEncryptor? = nil
         var frameDecryptor: RTCFrameDecryptor? = nil
         if aesKey != nil {
             let encryptor = RTCFrameEncryptor.init(sizeChange: Int32(WebRTCClient.ivTagBytes))
             encryptor.delegate = self
             frameEncryptor = encryptor
+            connection.senders.forEach { $0.setRtcFrameEncryptor(encryptor) }
 
             let decryptor = RTCFrameDecryptor.init(sizeChange: -Int32(WebRTCClient.ivTagBytes))
             decryptor.delegate = self
             frameDecryptor = decryptor
+            // Has no video receiver in outgoing call if applied here, see [peerConnection(_ connection: RTCPeerConnection, didChange newState]
+            // connection.receivers.forEach { $0.setRtcFrameDecryptor(decryptor) }
         }
         return Call(
             connection: connection,
             iceCandidates: IceCandidates(),
+            localMedia: mediaType,
             localCamera: localCamera,
-            localAudioTrack: localAudioTrack,
-            localVideoTrack: localVideoTrack,
-            device: device,
+            localVideoSource: localVideoSource,
+            localStream: localStream,
+            remoteStream: remoteStream,
             aesKey: aesKey,
             frameEncryptor: frameEncryptor,
-            frameDecryptor: frameDecryptor,
-            peerHasOldVersion: false
+            frameDecryptor: frameDecryptor
         )
     }
 
@@ -169,24 +151,18 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
 
     func sendCallCommand(command: WCallCommand) async {
         var resp: WCallResponse? = nil
-        let pc = activeCall?.connection
+        let pc = activeCall.wrappedValue?.connection
         switch command {
-        case let .capabilities(media): // outgoing
-            let localCameraAndTrack: (RTCVideoCapturer, RTCVideoTrack)? = media == .video
-            ? createVideoTrackAndStartCapture(.front)
-            : nil
-            notConnectedCall = NotConnectedCall(audioTrack: createAudioTrack(), localCameraAndTrack: localCameraAndTrack, device: .front)
+        case .capabilities:
             resp = .capabilities(capabilities: CallCapabilities(encryption: WebRTCClient.enableEncryption))
-        case let .start(media: media, aesKey, iceServers, relay): // incoming
+        case let .start(media: media, aesKey, iceServers, relay):
             logger.debug("starting incoming call - create webrtc session")
-            if activeCall != nil { endCall() }
+            if activeCall.wrappedValue != nil { endCall() }
             let encryption = WebRTCClient.enableEncryption
             let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
-            activeCall = call
-            setupLocalTracks(true, call)
+            activeCall.wrappedValue = call
             let (offer, error) = await call.connection.offer()
             if let offer = offer {
-                setupEncryptionForLocalTracks(call)
                 resp = .offer(
                     offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
                     iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
@@ -196,24 +172,18 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             } else {
                 resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
             }
-        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay): // outgoing
-            if activeCall != nil {
+        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
+            if activeCall.wrappedValue != nil {
                 resp = .error(message: "accept: call already started")
             } else if !WebRTCClient.enableEncryption && aesKey != nil {
                 resp = .error(message: "accept: encryption is not supported")
             } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                       let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
                 let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
-                activeCall = call
+                activeCall.wrappedValue = call
                 let pc = call.connection
                 if let type = offer.type, let sdp = offer.sdp {
                     if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                        setupLocalTracks(false, call)
-                        setupEncryptionForLocalTracks(call)
-                        pc.transceivers.forEach { transceiver in
-                            transceiver.setDirection(.sendRecv, error: nil)
-                        }
-                        await adaptToOldVersion(pc.transceivers.count <= 2)
                         let (answer, error) = await pc.answer()
                         if let answer = answer {
                             self.addIceCandidates(pc, remoteIceCandidates)
@@ -230,7 +200,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                     }
                 }
             }
-        case let .answer(answer, iceCandidates): // incoming
+        case let .answer(answer, iceCandidates):
             if pc == nil {
                 resp = .error(message: "answer: call not started")
             } else if pc?.localDescription == nil {
@@ -242,9 +212,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                       let type = answer.type, let sdp = answer.sdp,
                       let pc = pc {
                 if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
-                    var currentDirection: RTCRtpTransceiverDirection = .sendOnly
-                    pc.transceivers[2].currentDirection(&currentDirection)
-                    await adaptToOldVersion(currentDirection == .sendOnly)
                     addIceCandidates(pc, remoteIceCandidates)
                     resp = .ok
                 } else {
@@ -259,11 +226,13 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             } else {
                 resp = .error(message: "ice: call not started")
             }
-        case let .media(source, enable):
-            if activeCall == nil {
+        case let .media(media, enable):
+            if activeCall.wrappedValue == nil {
                 resp = .error(message: "media: call not started")
+            } else if activeCall.wrappedValue?.localMedia == .audio && media == .video {
+                resp = .error(message: "media: no video")
             } else {
-                await enableMedia(source, enable)
+                enableMedia(media, enable)
                 resp = .ok
             }
         case .end:
@@ -278,7 +247,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
 
     func getInitialIceCandidates() async -> [RTCIceCandidate] {
         await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
-        let candidates = await activeCall?.iceCandidates.getAndClear() ?? []
+        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
         logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
         return candidates
     }
@@ -286,7 +255,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     func waitForMoreIceCandidates() {
         Task {
             await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
-                let candidates = await self.activeCall?.iceCandidates.getAndClear() ?? []
+                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
                 if candidates.count > 0 {
                     logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
                     await self.sendIceCandidates(candidates)
@@ -303,202 +272,25 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         )
     }
 
-    func setupMuteUnmuteListener(_ transceiver: RTCRtpTransceiver, _ track: RTCMediaStreamTrack) {
-        // logger.log("Setting up mute/unmute listener in the call without encryption for mid = \(transceiver.mid)")
-        Task {
-            var lastBytesReceived: Int64 = 0
-            // muted initially
-            var mutedSeconds = 4
-            while let call = self.activeCall, transceiver.receiver.track?.readyState == .live {
-                let stats: RTCStatisticsReport = await call.connection.statistics(for: transceiver.receiver)
-                let stat = stats.statistics.values.first(where: { stat in stat.type == "inbound-rtp"})
-                if let stat {
-                    //logger.debug("Stat \(stat.debugDescription)")
-                    let bytes = stat.values["bytesReceived"] as! Int64
-                    if bytes <= lastBytesReceived {
-                        mutedSeconds += 1
-                        if mutedSeconds == 3 {
-                            await MainActor.run {
-                                self.onMediaMuteUnmute(transceiver.mid, true)
-                            }
-                        }
-                    } else {
-                        if mutedSeconds >= 3 {
-                            await MainActor.run {
-                                self.onMediaMuteUnmute(transceiver.mid, false)
-                            }
-                        }
-                        lastBytesReceived = bytes
-                        mutedSeconds = 0
-                    }
-                }
-                try? await Task.sleep(nanoseconds: 1000_000000)
-            }
-        }
+    func enableMedia(_ media: CallMediaType, _ enable: Bool) {
+        logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
+        media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
     }
 
-    @MainActor
-    func onMediaMuteUnmute(_ transceiverMid: String?, _ mute: Bool) {
-        guard let activeCall = ChatModel.shared.activeCall else { return }
-        let source = mediaSourceFromTransceiverMid(transceiverMid)
-        logger.log("Mute/unmute \(source.rawValue) track = \(mute) with mid = \(transceiverMid ?? "nil")")
-        if source == .mic && activeCall.peerMediaSources.mic == mute {
-            activeCall.peerMediaSources.mic = !mute
-        } else if (source == .camera && activeCall.peerMediaSources.camera == mute) {
-            activeCall.peerMediaSources.camera = !mute
-        } else if (source == .screenAudio && activeCall.peerMediaSources.screenAudio == mute) {
-            activeCall.peerMediaSources.screenAudio = !mute
-        } else if (source == .screenVideo && activeCall.peerMediaSources.screenVideo == mute) {
-            activeCall.peerMediaSources.screenVideo = !mute
-        }
-    }
-
-    @MainActor
-    func enableMedia(_ source: CallMediaSource, _ enable: Bool) {
-        logger.debug("WebRTCClient: enabling media \(source.rawValue) \(enable)")
-        source == .camera ? setCameraEnabled(enable) : setAudioEnabled(enable)
-    }
-
-    @MainActor
-    func adaptToOldVersion(_ peerHasOldVersion: Bool) {
-        activeCall?.peerHasOldVersion = peerHasOldVersion
-        if peerHasOldVersion {
-            logger.debug("The peer has an old version. Remote audio track is nil = \(self.activeCall?.remoteAudioTrack == nil), video = \(self.activeCall?.remoteVideoTrack == nil)")
-            onMediaMuteUnmute("0", false)
-            if activeCall?.remoteVideoTrack != nil {
-                onMediaMuteUnmute("1", false)
-            }
-            if ChatModel.shared.activeCall?.localMediaSources.camera == true && ChatModel.shared.activeCall?.peerMediaSources.camera == false {
-                logger.debug("Stopping video track for the old version")
-                activeCall?.connection.senders[1].track = nil
-                ChatModel.shared.activeCall?.localMediaSources.camera = false
-                (activeCall?.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
-                activeCall?.localCamera = nil
-                activeCall?.localVideoTrack = nil
-            }
-        }
-    }
-
-    func addLocalRenderer(_ renderer: RTCEAGLVideoView) {
-        if let activeCall {
-            if let track = activeCall.localVideoTrack {
-                track.add(renderer)
-            }
-        } else if let notConnectedCall {
-            if let track = notConnectedCall.localCameraAndTrack?.1 {
-                track.add(renderer)
-            }
-        }
+    func addLocalRenderer(_ activeCall: Call, _ renderer: RTCEAGLVideoView) {
+        activeCall.localStream?.add(renderer)
         // To get width and height of a frame, see videoView(videoView:, didChangeVideoSize)
         renderer.delegate = self
     }
 
-    func removeLocalRenderer(_ renderer: RTCEAGLVideoView) {
-        if let activeCall {
-            if let track = activeCall.localVideoTrack {
-                track.remove(renderer)
-            }
-        } else if let notConnectedCall {
-            if let track = notConnectedCall.localCameraAndTrack?.1 {
-                track.remove(renderer)
-            }
-        }
-        renderer.delegate = nil
-    }
-
     func videoView(_ videoView: RTCVideoRenderer, didChangeVideoSize size: CGSize) {
         guard size.height > 0 else { return }
         localRendererAspectRatio.wrappedValue = size.width / size.height
     }
 
-    func setupLocalTracks(_ incomingCall: Bool, _ call: Call) {
-        let pc = call.connection
-        let transceivers = call.connection.transceivers
-        let audioTrack = call.localAudioTrack
-        let videoTrack = call.localVideoTrack
-
-        if incomingCall {
-            let micCameraInit = RTCRtpTransceiverInit()
-            // streamIds required for old versions which adds tracks from stream, not from track property
-            micCameraInit.streamIds = ["micCamera"]
-
-            let screenAudioVideoInit = RTCRtpTransceiverInit()
-            screenAudioVideoInit.streamIds = ["screenAudioVideo"]
-
-            // incoming call, no transceivers yet. But they should be added in order: mic, camera, screen audio, screen video
-            // mid = 0, mic
-            if let audioTrack {
-                pc.addTransceiver(with: audioTrack, init: micCameraInit)
-            } else {
-                pc.addTransceiver(of: .audio, init: micCameraInit)
-            }
-            // mid = 1, camera
-            if let videoTrack {
-                pc.addTransceiver(with: videoTrack, init: micCameraInit)
-            } else {
-                pc.addTransceiver(of: .video, init: micCameraInit)
-            }
-            // mid = 2, screenAudio
-            pc.addTransceiver(of: .audio, init: screenAudioVideoInit)
-            // mid = 3, screenVideo
-            pc.addTransceiver(of: .video, init: screenAudioVideoInit)
-        } else {
-            // new version
-            if transceivers.count > 2 {
-                // Outgoing call. All transceivers are ready. Don't addTrack() because it will create new transceivers, replace existing (nil) tracks
-                transceivers
-                    .first(where: { elem in mediaSourceFromTransceiverMid(elem.mid) == .mic })?
-                    .sender.track = audioTrack
-                transceivers
-                    .first(where: { elem in mediaSourceFromTransceiverMid(elem.mid) == .camera })?
-                    .sender.track = videoTrack
-            } else {
-                // old version, only two transceivers
-                if let audioTrack {
-                    pc.add(audioTrack, streamIds: ["micCamera"])
-                } else {
-                    // it's important to have any track in order to be able to turn it on again (currently it's off)
-                    let sender = pc.add(createAudioTrack(), streamIds: ["micCamera"])
-                    sender?.track = nil
-                }
-                if let videoTrack {
-                    pc.add(videoTrack, streamIds: ["micCamera"])
-                } else {
-                    // it's important to have any track in order to be able to turn it on again (currently it's off)
-                    let localVideoSource = WebRTCClient.factory.videoSource()
-                    let localVideoTrack = WebRTCClient.factory.videoTrack(with: localVideoSource, trackId: "video0")
-                    let sender = pc.add(localVideoTrack, streamIds: ["micCamera"])
-                    sender?.track = nil
-                }
-            }
-        }
-    }
-
-    func mediaSourceFromTransceiverMid(_ mid: String?) -> CallMediaSource {
-        switch mid {
-        case "0":
-            return .mic
-        case "1":
-            return .camera
-        case "2":
-            return .screenAudio
-        case "3":
-            return .screenVideo
-        default:
-            return .unknown
-        }
-    }
-
-    // Should be called after local description set
-    func setupEncryptionForLocalTracks(_ call: Call) {
-        if let encryptor = call.frameEncryptor {
-            call.connection.senders.forEach { $0.setRtcFrameEncryptor(encryptor) }
-        }
-    }
-
     func frameDecryptor(_ decryptor: RTCFrameDecryptor, mediaType: RTCRtpMediaType, withFrame encrypted: Data) -> Data? {
         guard encrypted.count > 0 else { return nil }
-        if var key: [CChar] = activeCall?.aesKey?.cString(using: .utf8),
+        if var key: [CChar] = activeCall.wrappedValue?.aesKey?.cString(using: .utf8),
            let pointer: UnsafeMutableRawPointer = malloc(encrypted.count) {
             memcpy(pointer, (encrypted as NSData).bytes, encrypted.count)
             let isKeyFrame = encrypted[0] & 1 == 0
@@ -512,7 +304,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
 
     func frameEncryptor(_ encryptor: RTCFrameEncryptor, mediaType: RTCRtpMediaType, withFrame unencrypted: Data) -> Data? {
         guard unencrypted.count > 0 else { return nil }
-        if var key: [CChar] = activeCall?.aesKey?.cString(using: .utf8),
+        if var key: [CChar] = activeCall.wrappedValue?.aesKey?.cString(using: .utf8),
            let pointer: UnsafeMutableRawPointer = malloc(unencrypted.count + WebRTCClient.ivTagBytes) {
             memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
             let isKeyFrame = unencrypted[0] & 1 == 0
@@ -535,42 +327,18 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         }
     }
 
-    func addRemoteCameraRenderer(_ renderer: RTCVideoRenderer) {
-        if activeCall?.remoteVideoTrack != nil {
-            activeCall?.remoteVideoTrack?.add(renderer)
-        } else {
-            cameraRenderers.append(renderer)
-        }
+    func addRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
+        activeCall.remoteStream?.add(renderer)
     }
 
-    func removeRemoteCameraRenderer(_ renderer: RTCVideoRenderer) {
-        if activeCall?.remoteVideoTrack != nil {
-            activeCall?.remoteVideoTrack?.remove(renderer)
-        } else {
-            cameraRenderers.removeAll(where: { $0.isEqual(renderer) })
-        }
+    func removeRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
+        activeCall.remoteStream?.remove(renderer)
     }
 
-    func addRemoteScreenRenderer(_ renderer: RTCVideoRenderer) {
-        if activeCall?.remoteScreenVideoTrack != nil {
-            activeCall?.remoteScreenVideoTrack?.add(renderer)
-        } else {
-            screenRenderers.append(renderer)
-        }
-    }
-
-    func removeRemoteScreenRenderer(_ renderer: RTCVideoRenderer) {
-        if activeCall?.remoteScreenVideoTrack != nil {
-            activeCall?.remoteScreenVideoTrack?.remove(renderer)
-        } else {
-            screenRenderers.removeAll(where: { $0.isEqual(renderer) })
-        }
-    }
-
-    func startCaptureLocalVideo(_ device: AVCaptureDevice.Position?, _ capturer: RTCVideoCapturer?) {
+    func startCaptureLocalVideo(_ activeCall: Call) {
 #if targetEnvironment(simulator)
         guard
-            let capturer = (activeCall?.localCamera ?? notConnectedCall?.localCameraAndTrack?.0) as? RTCFileVideoCapturer
+            let capturer = activeCall.localCamera as? RTCFileVideoCapturer
         else {
             logger.error("Unable to work with a file capturer")
             return
@@ -580,10 +348,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         capturer.startCapturing(fromFileNamed: "sounds/video.mp4")
 #else
         guard
-            let capturer = capturer as? RTCCameraVideoCapturer,
-            let camera = (RTCCameraVideoCapturer.captureDevices().first { $0.position == device })
+            let capturer = activeCall.localCamera as? RTCCameraVideoCapturer,
+            let camera = (RTCCameraVideoCapturer.captureDevices().first { $0.position == activeCall.device })
         else {
-            logger.error("Unable to find a camera or local track")
+            logger.error("Unable to find a camera")
             return
         }
 
@@ -609,6 +377,19 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
 #endif
     }
 
+    private func createAudioSender(_ connection: RTCPeerConnection) {
+        let streamId = "stream"
+        let audioTrack = createAudioTrack()
+        connection.add(audioTrack, streamIds: [streamId])
+    }
+
+    private func createVideoSender(_ connection: RTCPeerConnection) -> (RTCVideoTrack?, RTCVideoTrack?, RTCVideoCapturer?, RTCVideoSource?) {
+        let streamId = "stream"
+        let (localVideoTrack, localCamera, localVideoSource) = createVideoTrack()
+        connection.add(localVideoTrack, streamIds: [streamId])
+        return (localVideoTrack, connection.transceivers.first { $0.mediaType == .video }?.receiver.track as? RTCVideoTrack, localCamera, localVideoSource)
+    }
+
     private func createAudioTrack() -> RTCAudioTrack {
         let audioConstrains = RTCMediaConstraints(mandatoryConstraints: nil, optionalConstraints: nil)
         let audioSource = WebRTCClient.factory.audioSource(with: audioConstrains)
@@ -616,7 +397,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         return audioTrack
     }
 
-    private func createVideoTrackAndStartCapture(_ device: AVCaptureDevice.Position) -> (RTCVideoCapturer, RTCVideoTrack) {
+    private func createVideoTrack() -> (RTCVideoTrack, RTCVideoCapturer, RTCVideoSource) {
         let localVideoSource = WebRTCClient.factory.videoSource()
 
         #if targetEnvironment(simulator)
@@ -626,30 +407,19 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         #endif
 
         let localVideoTrack = WebRTCClient.factory.videoTrack(with: localVideoSource, trackId: "video0")
-        startCaptureLocalVideo(device, localCamera)
-        return (localCamera, localVideoTrack)
+        return (localVideoTrack, localCamera, localVideoSource)
     }
 
     func endCall() {
-        if #available(iOS 16.0, *) {
-            _endCall()
-        } else {
-            // Fixes `connection.close()` getting locked up in iOS15
-            DispatchQueue.global(qos: .utility).async { self._endCall() }
-        }
-    }
-
-    private func _endCall() {
-        (notConnectedCall?.localCameraAndTrack?.0 as? RTCCameraVideoCapturer)?.stopCapture()
-        guard let call = activeCall else { return }
+        guard let call = activeCall.wrappedValue else { return }
         logger.debug("WebRTCClient: ending the call")
+        activeCall.wrappedValue = nil
+        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
         call.connection.close()
         call.connection.delegate = nil
         call.frameEncryptor?.delegate = nil
         call.frameDecryptor?.delegate = nil
-        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
         audioSessionToDefaults()
-        activeCall = nil
     }
 
     func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
@@ -658,7 +428,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
             _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
             t += stepMs
             await action()
-        } while t < timeoutMs && activeCall?.connection.iceGatheringState != .complete
+        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
     }
 }
 
@@ -719,40 +489,11 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
         logger.debug("Connection should negotiate")
     }
 
-    func peerConnection(_ peerConnection: RTCPeerConnection, didStartReceivingOn transceiver: RTCRtpTransceiver) {
-        if let track = transceiver.receiver.track {
-            DispatchQueue.main.async {
-                // Doesn't work for outgoing video call (audio in video call works ok still, same as incoming call)
-//                if let decryptor = self.activeCall?.frameDecryptor {
-//                    transceiver.receiver.setRtcFrameDecryptor(decryptor)
-//                }
-                let source = self.mediaSourceFromTransceiverMid(transceiver.mid)
-                switch source {
-                case .mic: self.activeCall?.remoteAudioTrack = track as? RTCAudioTrack
-                case .camera:
-                    self.activeCall?.remoteVideoTrack = track as? RTCVideoTrack
-                    self.cameraRenderers.forEach({ renderer in
-                        self.activeCall?.remoteVideoTrack?.add(renderer)
-                    })
-                    self.cameraRenderers.removeAll()
-                case .screenAudio: self.activeCall?.remoteScreenAudioTrack = track as? RTCAudioTrack
-                case .screenVideo:
-                    self.activeCall?.remoteScreenVideoTrack = track as? RTCVideoTrack
-                    self.screenRenderers.forEach({ renderer in
-                        self.activeCall?.remoteScreenVideoTrack?.add(renderer)
-                    })
-                    self.screenRenderers.removeAll()
-                case .unknown: ()
-                }
-            }
-            self.setupMuteUnmuteListener(transceiver, track)
-        }
-    }
-
     func peerConnection(_ connection: RTCPeerConnection, didChange newState: RTCIceConnectionState) {
         debugPrint("Connection new connection state: \(newState.toString() ?? "" + newState.rawValue.description) \(connection.receivers)")
 
-        guard let connectionStateString = newState.toString(),
+        guard let call = activeCall.wrappedValue,
+              let connectionStateString = newState.toString(),
               let iceConnectionStateString = connection.iceConnectionState.toString(),
               let iceGatheringStateString = connection.iceGatheringState.toString(),
               let signalingStateString = connection.signalingState.toString()
@@ -773,14 +514,18 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 
             switch newState {
             case .checking:
-                if let frameDecryptor = activeCall?.frameDecryptor {
+                if let frameDecryptor = activeCall.wrappedValue?.frameDecryptor {
                     connection.receivers.forEach { $0.setRtcFrameDecryptor(frameDecryptor) }
                 }
-                let enableSpeaker: Bool = ChatModel.shared.activeCall?.localMediaSources.hasVideo == true
+                let enableSpeaker: Bool
+                switch call.localMedia {
+                case .video: enableSpeaker = true
+                default: enableSpeaker = false
+                }
                 setSpeakerEnabledAndConfigureSession(enableSpeaker)
             case .connected: sendConnectedEvent(connection)
             case .disconnected, .failed: endCall()
-            default: ()
+            default: do {}
             }
         }
     }
@@ -792,7 +537,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
     func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
         Task {
-            await self.activeCall?.iceCandidates.append(candidate.toCandidate(nil, nil))
+            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
         }
     }
 
@@ -847,42 +592,11 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 }
 
 extension WebRTCClient {
-    static func isAuthorized(for type: AVMediaType) async -> Bool {
-        let status = AVCaptureDevice.authorizationStatus(for: type)
-        var isAuthorized = status == .authorized
-        if status == .notDetermined {
-            isAuthorized = await AVCaptureDevice.requestAccess(for: type)
-        }
-        return isAuthorized
+    func setAudioEnabled(_ enabled: Bool) {
+        setTrackEnabled(RTCAudioTrack.self, enabled)
     }
 
-    static func showUnauthorizedAlert(for type: AVMediaType) {
-        if type == .audio {
-            AlertManager.shared.showAlert(Alert(
-                title: Text("No permission to record speech"),
-                message: Text("To record speech please grant permission to use Microphone."),
-                primaryButton: .default(Text("Open Settings")) {
-                    DispatchQueue.main.async {
-                        UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
-                    }
-                },
-                secondaryButton: .cancel()
-            ))
-        } else if type == .video {
-            AlertManager.shared.showAlert(Alert(
-                title: Text("No permission to record video"),
-                message: Text("To record video please grant permission to use Camera."),
-                primaryButton: .default(Text("Open Settings")) {
-                    DispatchQueue.main.async {
-                        UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
-                    }
-                },
-                secondaryButton: .cancel()
-            ))
-        }
-    }
-
-    func setSpeakerEnabledAndConfigureSession( _ enabled: Bool, skipExternalDevice: Bool = false) {
+    func setSpeakerEnabledAndConfigureSession( _ enabled: Bool) {
         logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled)")
         audioQueue.async { [weak self] in
             guard let self = self else { return }
@@ -891,23 +605,9 @@ extension WebRTCClient {
                 self.rtcAudioSession.unlockForConfiguration()
             }
             do {
-                let hasExternalAudioDevice = self.rtcAudioSession.session.hasExternalAudioDevice()
-                if enabled {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.defaultToSpeaker, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.videoChat.rawValue)
-                    if hasExternalAudioDevice && !skipExternalDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
-                        try self.rtcAudioSession.setPreferredInput(preferred)
-                    } else {
-                        try self.rtcAudioSession.overrideOutputAudioPort(.speaker)
-                    }
-                } else {
-                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
-                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
-                    try self.rtcAudioSession.overrideOutputAudioPort(.none)
-                }
-                if hasExternalAudioDevice && !skipExternalDevice {
-                    logger.debug("WebRTCClient: configuring session with external device available, skip configuring speaker")
-                }
+                try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
+                try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
+                try self.rtcAudioSession.overrideOutputAudioPort(enabled ? .speaker : .none)
                 try self.rtcAudioSession.setActive(true)
                 logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled) success")
             } catch let error {
@@ -936,70 +636,25 @@ extension WebRTCClient {
         }
     }
 
-    @MainActor
-    func setAudioEnabled(_ enabled: Bool) {
-        if activeCall != nil {
-            activeCall?.localAudioTrack = enabled ? createAudioTrack() : nil
-            activeCall?.connection.transceivers.first(where: { t in mediaSourceFromTransceiverMid(t.mid) == .mic })?.sender.track = activeCall?.localAudioTrack
-        } else if notConnectedCall != nil {
-            notConnectedCall?.audioTrack = enabled ? createAudioTrack() : nil
-        }
-        ChatModel.shared.activeCall?.localMediaSources.mic = enabled
-    }
-
-    @MainActor
-    func setCameraEnabled(_ enabled: Bool) {
-        if let call = activeCall {
-            if enabled {
-                if call.localVideoTrack == nil {
-                    let device = activeCall?.device ?? notConnectedCall?.device ?? .front
-                    let (camera, track) = createVideoTrackAndStartCapture(device)
-                    activeCall?.localCamera = camera
-                    activeCall?.localVideoTrack = track
-                }
-            } else {
-                (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
-                activeCall?.localCamera = nil
-                activeCall?.localVideoTrack = nil
-            }
-            call.connection.transceivers
-                .first(where: { t in mediaSourceFromTransceiverMid(t.mid) == .camera })?
-                .sender.track = activeCall?.localVideoTrack
-            ChatModel.shared.activeCall?.localMediaSources.camera = activeCall?.localVideoTrack != nil
-        } else if let call = notConnectedCall {
-            if enabled {
-                let device = activeCall?.device ?? notConnectedCall?.device ?? .front
-                notConnectedCall?.localCameraAndTrack = createVideoTrackAndStartCapture(device)
-            } else {
-                (call.localCameraAndTrack?.0 as? RTCCameraVideoCapturer)?.stopCapture()
-                notConnectedCall?.localCameraAndTrack = nil
-            }
-            ChatModel.shared.activeCall?.localMediaSources.camera = notConnectedCall?.localCameraAndTrack != nil
-        }
+    func setVideoEnabled(_ enabled: Bool) {
+        setTrackEnabled(RTCVideoTrack.self, enabled)
     }
 
     func flipCamera() {
-        let device = activeCall?.device ?? notConnectedCall?.device
-        if activeCall != nil {
-            activeCall?.device = device == .front ? .back : .front
-        } else {
-            notConnectedCall?.device = device == .front ? .back : .front
+        switch activeCall.wrappedValue?.device {
+        case .front: activeCall.wrappedValue?.device = .back
+        case .back: activeCall.wrappedValue?.device = .front
+        default: ()
+        }
+        if let call = activeCall.wrappedValue {
+            startCaptureLocalVideo(call)
         }
-        startCaptureLocalVideo(
-            activeCall?.device ?? notConnectedCall?.device,
-            (activeCall?.localCamera ?? notConnectedCall?.localCameraAndTrack?.0) as? RTCCameraVideoCapturer
-        )
-    }
-}
-
-extension AVAudioSession {
-    func hasExternalAudioDevice() -> Bool {
-        availableInputs?.allSatisfy({ $0.portType == .builtInMic }) != true
     }
 
-    func preferredInputDevice() -> AVAudioSessionPortDescription? {
-//        logger.debug("Preferred input device: \(String(describing: self.availableInputs?.filter({ $0.portType != .builtInMic })))")
-        return availableInputs?.filter({ $0.portType != .builtInMic }).last
+    private func setTrackEnabled<T: RTCMediaStreamTrack>(_ type: T.Type, _ enabled: Bool) {
+        activeCall.wrappedValue?.connection.transceivers
+        .compactMap { $0.sender.track as? T }
+        .forEach { $0.isEnabled = enabled }
     }
 }
 

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

@@ -9,9 +9,10 @@
 import SwiftUI
 import SimpleXChat
 
+let chatImageColorLight = Color(red: 0.9, green: 0.9, blue: 0.9)
+let chatImageColorDark = Color(red: 0.2, green: 0.2, blue: 0.2)
 struct ChatInfoToolbar: View {
     @Environment(\.colorScheme) var colorScheme
-    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var imageSize: CGFloat = 32
 
@@ -24,30 +25,30 @@ struct ChatInfoToolbar: View {
             }
             ChatInfoImage(
                 chat: chat,
-                size: imageSize,
-                color: Color(uiColor: .tertiaryLabel)
+                color: colorScheme == .dark
+                        ? chatImageColorDark
+                        : chatImageColorLight
             )
+            .frame(width: imageSize, height: imageSize)
             .padding(.trailing, 4)
-            let t = Text(cInfo.displayName).font(.headline)
-            (cInfo.contact?.verified == true ? contactVerifiedShield + t : t)
-                .lineLimit(1)
-                .if (cInfo.fullName != "" && cInfo.displayName != cInfo.fullName) { v in
-                    VStack(spacing: 0) {
-                        v
-                        Text(cInfo.fullName).font(.subheadline)
-                            .lineLimit(1)
-                            .padding(.top, -2)
-                    }
+            VStack {
+                let t = Text(cInfo.displayName).font(.headline)
+                (cInfo.contact?.verified == true ? contactVerifiedShield + t : t)
+                    .lineLimit(1)
+                if cInfo.fullName != "" && cInfo.displayName != cInfo.fullName {
+                    Text(cInfo.fullName).font(.subheadline)
+                        .lineLimit(1)
                 }
+            }
         }
-        .foregroundColor(theme.colors.onBackground)
+        .foregroundColor(.primary)
         .frame(width: 220)
     }
 
     private var contactVerifiedShield: Text {
         (Text(Image(systemName: "checkmark.shield")) + Text(" "))
             .font(.caption)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
             .baselineOffset(1)
             .kerning(-2)
     }
@@ -56,6 +57,5 @@ struct ChatInfoToolbar: View {
 struct ChatInfoToolbar_Previews: PreviewProvider {
     static var previews: some View {
         ChatInfoToolbar(chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []))
-            .environmentObject(CurrentColors.toAppTheme())
     }
 }

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

@@ -9,7 +9,6 @@ import SwiftUI
 class AnimatedImageView: UIView {
     var image: UIImage? = nil
     var imageView: UIImageView? = nil
-    var cMode: UIView.ContentMode = .scaleAspectFit
 
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -19,12 +18,11 @@ class AnimatedImageView: UIView {
         fatalError("Not implemented")
     }
 
-    convenience init(image: UIImage, contentMode: UIView.ContentMode) {
+    convenience init(image: UIImage) {
         self.init()
         self.image = image
-        self.cMode = contentMode
         imageView = UIImageView(gifImage: image)
-        imageView!.contentMode = contentMode
+        imageView!.contentMode = .scaleAspectFit
         self.addSubview(imageView!)
     }
 
@@ -37,7 +35,7 @@ class AnimatedImageView: UIView {
         if let subview = self.subviews.first as? UIImageView {
             if image.imageData != subview.gifImage?.imageData {
                 imageView = UIImageView(gifImage: image)
-                imageView!.contentMode = contentMode
+                imageView!.contentMode = .scaleAspectFit
                 self.addSubview(imageView!)
                 subview.removeFromSuperview()
             }
@@ -49,15 +47,13 @@ class AnimatedImageView: UIView {
 
 struct SwiftyGif: UIViewRepresentable {
     private let image: UIImage
-    private let contentMode: UIView.ContentMode
 
-    init(image: UIImage, contentMode: UIView.ContentMode = .scaleAspectFit) {
+    init(image: UIImage) {
         self.image = image
-        self.contentMode = contentMode
     }
 
     func makeUIView(context: Context) -> AnimatedImageView {
-        AnimatedImageView(image: image, contentMode: contentMode)
+        AnimatedImageView(image: image)
     }
 
     func updateUIView(_ imageView: AnimatedImageView, context: Context) {

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct CICallItemView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
     var status: CICallStatus
@@ -23,7 +22,7 @@ struct CICallItemView: View {
             switch status {
             case .pending:
                 if sent {
-                    Image(systemName: "phone.arrow.up.right").foregroundColor(theme.colors.secondary)
+                    Image(systemName: "phone.arrow.up.right").foregroundColor(.secondary)
                 } else {
                     acceptCallButton()
                 }
@@ -36,7 +35,9 @@ struct CICallItemView: View {
             case .error: missedCallIcon(sent).foregroundColor(.orange)
             }
 
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }
@@ -53,7 +54,7 @@ struct CICallItemView: View {
     @ViewBuilder private func endedCallIcon(_ sent: Bool) -> some View {
         HStack {
             Image(systemName: "phone.down")
-            Text(durationText(duration)).foregroundColor(theme.colors.secondary)
+            Text(durationText(duration)).foregroundColor(.secondary)
         }
     }
 
@@ -71,7 +72,7 @@ struct CICallItemView: View {
                 Label("Answer call", systemImage: "phone.arrow.down.left")
             }
         } else {
-            Image(systemName: "phone.arrow.down.left").foregroundColor(theme.colors.secondary)
+            Image(systemName: "phone.arrow.down.left").foregroundColor(.secondary)
         }
     }
 }

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

@@ -11,17 +11,14 @@ import SimpleXChat
 
 struct CIChatFeatureView: View {
     @EnvironmentObject var m: ChatModel
-    @Environment(\.revealed) var revealed: Bool
-    @ObservedObject var im = ItemsModel.shared
-    @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
+    @Binding var revealed: Bool
     var feature: Feature
     var icon: String? = nil
     var iconColor: Color
 
     var body: some View {
-        if !revealed, let fs = mergedFeatures() {
+        if !revealed, let fs = mergedFeautures() {
             HStack {
                 ForEach(fs, content: featureIconView)
             }
@@ -50,12 +47,12 @@ struct CIChatFeatureView: View {
         }
     }
 
-    private func mergedFeatures() -> [FeatureInfo]? {
+    private func mergedFeautures() -> [FeatureInfo]? {
         var fs: [FeatureInfo] = []
         var icons: Set<String> = []
         if var i = m.getChatItemIndex(chatItem) {
-            while i < im.reversedChatItems.count,
-                  let f = featureInfo(im.reversedChatItems[i]) {
+            while i < m.reversedChatItems.count,
+                  let f = featureInfo(m.reversedChatItems[i]) {
                 if !icons.contains(f.icon) {
                     fs.insert(f, at: 0)
                     icons.insert(f.icon)
@@ -68,10 +65,10 @@ struct CIChatFeatureView: View {
 
     private func featureInfo(_ ci: ChatItem) -> FeatureInfo? {
         switch ci.content {
-        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor(theme.colors.secondary), param)
-        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor(theme.colors.secondary), param)
-        case let .rcvGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary), param)
-        case let .sndGroupFeature(feature, preference, param, role): FeatureInfo(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary), param)
+        case let .rcvChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .sndChatFeature(feature, enabled, param): FeatureInfo(feature, enabled.iconColor, param)
+        case let .rcvGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
+        case let .sndGroupFeature(feature, preference, param): FeatureInfo(feature, preference.enable.iconColor, param)
         default: nil
         }
     }
@@ -83,7 +80,7 @@ struct CIChatFeatureView: View {
         if let param = f.param {
             HStack {
                 i
-                chatEventText(Text(param), theme.colors.secondary).lineLimit(1)
+                chatEventText(Text(param)).lineLimit(1)
             }
         } else {
             i
@@ -95,7 +92,7 @@ struct CIChatFeatureView: View {
             Image(systemName: icon ?? feature.iconFilled)
                 .foregroundColor(iconColor)
                 .scaleEffect(feature.iconScale)
-            chatEventText(chatItem, theme.colors.secondary)
+            chatEventText(chatItem)
         }
         .padding(.horizontal, 6)
         .padding(.vertical, 4)
@@ -106,9 +103,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
     static var previews: some View {
         let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(
-            chat: Chat.sampleData,
-            chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary)
-        ).environment(\.revealed, true)
+        CIChatFeatureView(chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor)
     }
 }

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

@@ -17,7 +17,6 @@ struct CIEventView: View {
         .padding(.horizontal, 6)
         .padding(.vertical, 4)
         .textSelection(.disabled)
-        .lineLimit(4)
     }
 }
 

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct CIFeaturePreferenceView: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var feature: ChatFeature
     var allowed: FeatureAllowed
@@ -20,7 +19,7 @@ struct CIFeaturePreferenceView: View {
     var body: some View {
         HStack(alignment: .center, spacing: 4) {
             Image(systemName: feature.icon)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
                 .scaleEffect(feature.iconScale)
             if let ct = chat.chatInfo.contact,
                allowed != .no && ct.allowsFeature(feature) && !ct.userAllowsFeature(feature) {
@@ -41,17 +40,17 @@ struct CIFeaturePreferenceView: View {
     private func featurePreferenceView(acceptText: LocalizedStringKey? = nil) -> some View {
         var r = Text(CIContent.preferenceText(feature, allowed, param) + "  ")
             .fontWeight(.light)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
         if let acceptText {
             r = r
             + Text(acceptText)
                 .fontWeight(.medium)
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
             + Text("  ")
         }
         r = r + chatItem.timestampText
             .fontWeight(.light)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
         return r.font(.caption)
     }
 }

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

@@ -11,48 +11,42 @@ import SimpleXChat
 
 struct CIFileView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     let file: CIFile?
     let edited: Bool
-    var smallViewSize: CGFloat?
 
     var body: some View {
-        if smallViewSize != nil {
-            fileIndicator()
-            .onTapGesture(perform: fileAction)
-        } else {
-            let metaReserve = edited
-            ? "                           "
-            : "                       "
-            Button(action: fileAction) {
-                HStack(alignment: .bottom, spacing: 6) {
-                    fileIndicator()
-                        .padding(.top, 5)
-                        .padding(.bottom, 3)
-                    if let file = file {
-                        let prettyFileSize = ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
-                        VStack(alignment: .leading, spacing: 2) {
-                            Text(file.fileName)
-                                .lineLimit(1)
-                                .multilineTextAlignment(.leading)
-                                .foregroundColor(theme.colors.onBackground)
-                            Text(prettyFileSize + metaReserve)
-                                .font(.caption)
-                                .lineLimit(1)
-                                .multilineTextAlignment(.leading)
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    } else {
-                        Text(metaReserve)
+        let metaReserve = edited
+        ? "                           "
+        : "                       "
+        Button(action: fileAction) {
+            HStack(alignment: .bottom, spacing: 6) {
+                fileIndicator()
+                    .padding(.top, 5)
+                    .padding(.bottom, 3)
+                if let file = file {
+                    let prettyFileSize = ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
+                    VStack(alignment: .leading, spacing: 2) {
+                        Text(file.fileName)
+                            .lineLimit(1)
+                            .multilineTextAlignment(.leading)
+                            .foregroundColor(.primary)
+                        Text(prettyFileSize + metaReserve)
+                            .font(.caption)
+                            .lineLimit(1)
+                            .multilineTextAlignment(.leading)
+                            .foregroundColor(.secondary)
                     }
+                } else {
+                    Text(metaReserve)
                 }
-                .padding(.top, 4)
-                .padding(.bottom, 6)
-                .padding(.leading, 10)
-                .padding(.trailing, 12)
             }
-            .disabled(!itemInteractive)
+            .padding(.top, 4)
+            .padding(.bottom, 6)
+            .padding(.leading, 10)
+            .padding(.trailing, 12)
         }
+        .disabled(!itemInteractive)
     }
 
     private var itemInteractive: Bool {
@@ -60,32 +54,36 @@ struct CIFileView: View {
             switch (file.fileStatus) {
             case .sndStored: return file.fileProtocol == .local
             case .sndTransfer: return false
-            case .sndComplete: return true
+            case .sndComplete: return false
             case .sndCancelled: return false
-            case .sndError: return true
-            case .sndWarning: return true
+            case .sndError: return false
             case .rcvInvitation: return true
             case .rcvAccepted: return true
             case .rcvTransfer: return false
-            case .rcvAborted: return true
             case .rcvComplete: return true
             case .rcvCancelled: return false
-            case .rcvError: return true
-            case .rcvWarning: return true
+            case .rcvError: return false
             case .invalid: return false
             }
         }
         return false
     }
 
+    private func fileSizeValid() -> Bool {
+        if let file = file {
+            return file.fileSize <= getMaxFileSize(file.fileProtocol)
+        }
+        return false
+    }
+
     private func fileAction() {
         logger.debug("CIFileView fileAction")
         if let file = file {
             switch (file.fileStatus) {
-            case .rcvInvitation, .rcvAborted:
-                if fileSizeValid(file) {
+            case .rcvInvitation:
+                if fileSizeValid() {
                     Task {
-                        logger.debug("CIFileView fileAction - in .rcvInvitation, .rcvAborted, in Task")
+                        logger.debug("CIFileView fileAction - in .rcvInvitation, in Task")
                         if let user = m.currentUser {
                             await receiveFile(user: user, fileId: file.fileId)
                         }
@@ -116,40 +114,11 @@ struct CIFileView: View {
                 if let fileSource = getLoadedFileSource(file) {
                     saveCryptoFile(fileSource)
                 }
-            case let .rcvError(rcvFileError):
-                logger.debug("CIFileView fileAction - in .rcvError")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("File error"),
-                    message: Text(rcvFileError.errorInfo)
-                ))
-            case let .rcvWarning(rcvFileError):
-                logger.debug("CIFileView fileAction - in .rcvWarning")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("Temporary file error"),
-                    message: Text(rcvFileError.errorInfo)
-                ))
             case .sndStored:
                 logger.debug("CIFileView fileAction - in .sndStored")
                 if file.fileProtocol == .local, let fileSource = getLoadedFileSource(file) {
                     saveCryptoFile(fileSource)
                 }
-            case .sndComplete:
-                logger.debug("CIFileView fileAction - in .sndComplete")
-                if let fileSource = getLoadedFileSource(file) {
-                    saveCryptoFile(fileSource)
-                }
-            case let .sndError(sndFileError):
-                logger.debug("CIFileView fileAction - in .sndError")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("File error"),
-                    message: Text(sndFileError.errorInfo)
-                ))
-            case let .sndWarning(sndFileError):
-                logger.debug("CIFileView fileAction - in .sndWarning")
-                AlertManager.shared.showAlert(Alert(
-                    title: Text("Temporary file error"),
-                    message: Text(sndFileError.errorInfo)
-                ))
             default: break
             }
         }
@@ -173,10 +142,9 @@ struct CIFileView: View {
             case .sndComplete: fileIcon("doc.fill", innerIcon: "checkmark", innerIconSize: 10)
             case .sndCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .sndError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
-            case .sndWarning: fileIcon("doc.fill", innerIcon: "exclamationmark.triangle.fill", innerIconSize: 10)
             case .rcvInvitation:
-                if fileSizeValid(file) {
-                    fileIcon("arrow.down.doc.fill", color: theme.colors.primary)
+                if fileSizeValid() {
+                    fileIcon("arrow.down.doc.fill", color: .accentColor)
                 } else {
                     fileIcon("doc.fill", color: .orange, innerIcon: "exclamationmark", innerIconSize: 12)
                 }
@@ -187,12 +155,9 @@ struct CIFileView: View {
                 } else {
                     progressView()
                 }
-            case .rcvAborted:
-                fileIcon("doc.fill", color: theme.colors.primary, innerIcon: "exclamationmark.arrow.circlepath", innerIconSize: 12)
             case .rcvComplete: fileIcon("doc.fill")
             case .rcvCancelled: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
             case .rcvError: fileIcon("doc.fill", innerIcon: "xmark", innerIconSize: 10)
-            case .rcvWarning: fileIcon("doc.fill", innerIcon: "exclamationmark.triangle.fill", innerIconSize: 10)
             case .invalid: fileIcon("doc.fill", innerIcon: "questionmark", innerIconSize: 10)
             }
         } else {
@@ -201,22 +166,21 @@ struct CIFileView: View {
     }
 
     private func fileIcon(_ icon: String, color: Color = Color(uiColor: .tertiaryLabel), innerIcon: String? = nil, innerIconSize: CGFloat? = nil) -> some View {
-        let size = smallViewSize ?? 30
-        return ZStack(alignment: .center) {
+        ZStack(alignment: .center) {
             Image(systemName: icon)
                 .resizable()
                 .aspectRatio(contentMode: .fit)
-                .frame(width: size, height: size)
+                .frame(width: 30, height: 30)
                 .foregroundColor(color)
             if let innerIcon = innerIcon,
-               let innerIconSize = innerIconSize, (smallViewSize == nil || file?.showStatusIconInSmallView == true) {
+               let innerIconSize = innerIconSize {
                 Image(systemName: innerIcon)
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(maxHeight: 16)
                     .frame(width: innerIconSize, height: innerIconSize)
                     .foregroundColor(.white)
-                    .padding(.top, size / 2.5)
+                    .padding(.top, 12)
             }
         }
     }
@@ -237,13 +201,6 @@ struct CIFileView: View {
     }
 }
 
-func fileSizeValid(_ file: CIFile?) -> Bool {
-    if let file = file {
-        return file.fileSize <= getMaxFileSize(file.fileProtocol)
-    }
-    return false
-}
-
 func saveCryptoFile(_ fileSource: CryptoFile) {
     if let cfArgs = fileSource.cryptoArgs {
         let url = getAppFilePath(fileSource.filePath)
@@ -285,18 +242,17 @@ 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, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
         }
-        .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 360))
     }
 }

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

@@ -11,9 +11,7 @@ import SimpleXChat
 
 struct CIGroupInvitationView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.showTimestamp) var showTimestamp: Bool
-    @ObservedObject var chat: Chat
+    @Environment(\.colorScheme) var colorScheme
     var chatItem: ChatItem
     var groupInvitation: CIGroupInvitation
     var memberRole: GroupMemberRole
@@ -22,8 +20,6 @@ struct CIGroupInvitationView: View {
     @State private var inProgress = false
     @State private var progressByTimeout = false
 
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
     var body: some View {
         let action = !chatItem.chatDir.sent && groupInvitation.status == .pending
         let v = ZStack(alignment: .bottomTrailing) {
@@ -41,22 +37,16 @@ struct CIGroupInvitationView: View {
                         VStack(alignment: .leading, spacing: 2) {
                             groupInvitationText()
                                 .overlay(DetermineWidth())
-                            (
-                                Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
-                                    .foregroundColor(inProgress ? theme.colors.secondary : chatIncognito ? .indigo : theme.colors.primary)
-                                    .font(.callout)
-                                + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
-                            )
-                            .overlay(DetermineWidth())
+                            Text(chatIncognito ? "Tap to join incognito" : "Tap to join")
+                                .foregroundColor(inProgress ? .secondary : chatIncognito ? .indigo : .accentColor)
+                                .font(.callout)
+                                .padding(.trailing, 60)
+                                .overlay(DetermineWidth())
                         }
                     } else {
-                        (
-                            groupInvitationText()
-                            + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
-                        )
-                        .overlay(DetermineWidth())
+                        groupInvitationText()
+                            .padding(.trailing, 60)
+                            .overlay(DetermineWidth())
                     }
                 }
                 .padding(.bottom, 2)
@@ -66,11 +56,14 @@ struct CIGroupInvitationView: View {
                 }
             }
 
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary, showStatus: false, showEdited: false)
+            chatItem.timestampText
+                .font(.caption)
+                .foregroundColor(.secondary)
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
         .textSelection(.disabled)
         .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
         .onChange(of: inProgress) { inProgress in
@@ -99,7 +92,7 @@ struct CIGroupInvitationView: View {
     private func groupInfoView(_ action: Bool) -> some View {
         var color: Color
         if action && !inProgress {
-            color = chatIncognito ? .indigo : theme.colors.primary
+            color = chatIncognito ? .indigo : .accentColor
         } else {
             color = Color(uiColor: .tertiaryLabel)
         }
@@ -107,9 +100,9 @@ struct CIGroupInvitationView: View {
             ProfileImage(
                 imageStr: groupInvitation.groupProfile.image,
                 iconName: "person.2.circle.fill",
-                size: 44,
                 color: color
             )
+            .frame(width: 44, height: 44)
             .padding(.trailing, 4)
             VStack(alignment: .leading) {
                 let p = groupInvitation.groupProfile
@@ -122,7 +115,7 @@ struct CIGroupInvitationView: View {
         }
     }
 
-    private func groupInvitationText() -> Text {
+    private func groupInvitationText() -> some View {
         Text(groupInvitationStr())
             .font(.callout)
     }
@@ -144,8 +137,8 @@ struct CIGroupInvitationView: View {
 struct CIGroupInvitationView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
-            CIGroupInvitationView(chat: Chat.sampleData, chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(groupProfile: GroupProfile(displayName: "team", fullName: "team")), memberRole: .admin)
+            CIGroupInvitationView(chatItem: ChatItem.getGroupInvitationSample(), groupInvitation: CIGroupInvitation.getSample(status: .accepted), memberRole: .admin)
         }
     }
 }

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

@@ -11,41 +11,34 @@ import SimpleXChat
 
 struct CIImageView: View {
     @EnvironmentObject var m: ChatModel
+    @Environment(\.colorScheme) var colorScheme
     let chatItem: ChatItem
-    var preview: UIImage?
+    let image: String
     let maxWidth: CGFloat
-    var imgWidth: CGFloat?
-    var smallView: Bool = false
-    @Binding var showFullScreenImage: Bool
-    @State private var blurred: Bool = UserDefaults.standard.integer(forKey: DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS) > 0
+    @Binding var imgWidth: CGFloat?
+    @State var scrollProxy: ScrollViewProxy?
+    @State var metaColor: Color
+    @State private var showFullScreenImage = false
 
     var body: some View {
         let file = chatItem.file
         VStack(alignment: .center, spacing: 6) {
             if let uiImage = getLoadedImage(file) {
-                Group { if smallView { smallViewImageView(uiImage) } else { imageView(uiImage) } }
+                imageView(uiImage)
                 .fullScreenCover(isPresented: $showFullScreenImage) {
-                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage)
-                }
-                .if(!smallView) { view in
-                    view.modifier(PrivacyBlur(blurred: $blurred))
+                    FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage, scrollProxy: scrollProxy)
                 }
                 .onTapGesture { showFullScreenImage = true }
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenImage = false
                 }
-            } else if let preview {
-                Group {
-                    if smallView {
-                        smallViewImageView(preview)
-                    } else {
-                        imageView(preview).modifier(PrivacyBlur(blurred: $blurred))
-                    }
-                }
+            } else if let data = Data(base64Encoded: dropImagePrefix(image)),
+                      let uiImage = UIImage(data: data) {
+                imageView(uiImage)
                     .onTapGesture {
                         if let file = file {
                             switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                 Task {
                                     if let user = m.currentUser {
                                         await receiveFile(user: user, fileId: file.fileId)
@@ -68,39 +61,17 @@ struct CIImageView: View {
                             case .rcvTransfer: () // ?
                             case .rcvComplete: () // ?
                             case .rcvCancelled: () // TODO
-                            case let .rcvError(rcvFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("File error"),
-                                    message: Text(rcvFileError.errorInfo)
-                                ))
-                            case let .rcvWarning(rcvFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("Temporary file error"),
-                                    message: Text(rcvFileError.errorInfo)
-                                ))
-                            case let .sndError(sndFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("File error"),
-                                    message: Text(sndFileError.errorInfo)
-                                ))
-                            case let .sndWarning(sndFileError):
-                                AlertManager.shared.showAlert(Alert(
-                                    title: Text("Temporary file error"),
-                                    message: Text(sndFileError.errorInfo)
-                                ))
                             default: ()
                             }
                         }
                     }
             }
         }
-        .onDisappear {
-            showFullScreenImage = false
-        }
     }
 
     private func imageView(_ img: UIImage) -> some View {
         let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        DispatchQueue.main.async { imgWidth = w }
         return ZStack(alignment: .topTrailing) {
             if img.imageData == nil {
                 Image(uiImage: img)
@@ -112,26 +83,7 @@ struct CIImageView: View {
                         .frame(width: w, height: w * img.size.height / img.size.width)
                         .scaledToFit()
             }
-            if !blurred || !showDownloadButton(chatItem.file?.fileStatus) {
-                loadingIndicator()
-            }
-        }
-    }
-
-    private func smallViewImageView(_ img: UIImage) -> some View {
-        ZStack(alignment: .topTrailing) {
-            if img.imageData == nil {
-                Image(uiImage: img)
-                    .resizable()
-                    .aspectRatio(contentMode: .fill)
-                    .frame(width: maxWidth, height: maxWidth)
-            } else {
-                SwiftyGif(image: img, contentMode: .scaleAspectFill)
-                    .frame(width: maxWidth, height: maxWidth)
-            }
-            if chatItem.file?.showStatusIconInSmallView == true {
-                loadingIndicator()
-            }
+            loadingIndicator()
         }
     }
 
@@ -148,16 +100,13 @@ struct CIImageView: View {
             case .sndComplete: fileIcon("checkmark", 10, 13)
             case .sndCancelled: fileIcon("xmark", 10, 13)
             case .sndError: fileIcon("xmark", 10, 13)
-            case .sndWarning: fileIcon("exclamationmark.triangle.fill", 10, 13)
             case .rcvInvitation: fileIcon("arrow.down", 10, 13)
             case .rcvAccepted: fileIcon("ellipsis", 14, 11)
             case .rcvTransfer: progressView()
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
-            case .rcvComplete: EmptyView()
             case .rcvCancelled: fileIcon("xmark", 10, 13)
             case .rcvError: fileIcon("xmark", 10, 13)
-            case .rcvWarning: fileIcon("exclamationmark.triangle.fill", 10, 13)
             case .invalid: fileIcon("questionmark", 10, 13)
+            default: EmptyView()
             }
         }
     }
@@ -165,9 +114,9 @@ struct CIImageView: View {
     private func fileIcon(_ icon: String, _ size: CGFloat, _ padding: CGFloat) -> some View {
         Image(systemName: icon)
             .resizable()
-            .invertedForegroundStyle()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
+            .foregroundColor(metaColor)
             .padding(padding)
     }
 
@@ -178,12 +127,4 @@ struct CIImageView: View {
             .tint(.white)
             .padding(8)
     }
-
-    private func showDownloadButton(_ fileStatus: CIFileStatus?) -> Bool {
-        switch fileStatus {
-        case .rcvInvitation: true
-        case .rcvAborted: true
-        default: false
-        }
-    }
 }

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

@@ -9,7 +9,6 @@
 import SwiftUI
 
 struct CIInvalidJSONView: View {
-    @EnvironmentObject var theme: AppTheme
     var json: String
     @State private var showJSON = false
     
@@ -22,9 +21,10 @@ struct CIInvalidJSONView: View {
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
         .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
         .textSelection(.disabled)
         .onTapGesture { showJSON = true }
-        .appSheet(isPresented: $showJSON) {
+        .sheet(isPresented: $showJSON) {
             invalidJSONView(json)
         }
     }
@@ -44,7 +44,6 @@ func invalidJSONView(_ json: String) -> some View {
     }
     .frame(maxHeight: .infinity)
     .padding()
-    .modifier(ThemedBackground())
 }
 
 struct CIInvalidJSONView_Previews: PreviewProvider {

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

@@ -10,17 +10,16 @@ import SwiftUI
 import SimpleXChat
 
 struct CILinkView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     let linkPreview: LinkPreview
-    @State private var blurred: Bool = UserDefaults.standard.integer(forKey: DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS) > 0
 
     var body: some View {
         VStack(alignment: .center, spacing: 6) {
-            if let uiImage = imageFromBase64(linkPreview.image) {
+            if let data = Data(base64Encoded: dropImagePrefix(linkPreview.image)),
+               let uiImage = UIImage(data: data) {
                 Image(uiImage: uiImage)
                     .resizable()
                     .scaledToFit()
-                    .modifier(PrivacyBlur(blurred: $blurred))
             }
             VStack(alignment: .leading, spacing: 6) {
                 Text(linkPreview.title)
@@ -33,7 +32,7 @@ struct CILinkView: View {
                 Text(linkPreview.uri.absoluteString)
                     .font(.caption)
                     .lineLimit(1)
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
             }
             .padding(.horizontal, 12)
             .frame(maxWidth: .infinity, alignment: .leading)

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct CIMemberCreatedContactView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     
     var body: some View {
@@ -44,12 +43,12 @@ struct CIMemberCreatedContactView: View {
             r = r
             + Text(openText)
                 .fontWeight(.medium)
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
             + Text("  ")
         }
         r = r + chatItem.timestampText
             .fontWeight(.light)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
         return r.font(.caption)
     }
     
@@ -57,11 +56,11 @@ struct CIMemberCreatedContactView: View {
         if let member = chatItem.memberDisplayName {
             return Text(member + " " + chatItem.content.text + "  ")
                 .fontWeight(.light)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
         } else {
             return Text(chatItem.content.text + "  ")
                 .fontWeight(.light)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
         }
     }
 }

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

@@ -11,171 +11,97 @@ import SimpleXChat
 
 struct CIMetaView: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     var chatItem: ChatItem
-    var metaColor: Color
+    var metaColor = Color.secondary
     var paleMetaColor = Color(UIColor.tertiaryLabel)
-    var showStatus = true
-    var showEdited = true
-    var invertedMaterial = false
-
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
 
     var body: some View {
         if chatItem.isDeletedContent {
             chatItem.timestampText.font(.caption).foregroundColor(metaColor)
         } else {
-            ZStack {
-                ciMetaText(
-                    chatItem.meta,
-                    chatTTL: chat.chatInfo.timedMessagesTTL,
-                    encrypted: chatItem.encryptedFile,
-                    color: metaColor,
-                    paleColor: paleMetaColor,
-                    colorMode: invertedMaterial
-                        ? .invertedMaterial
-                        : .normal,
-                    showStatus: showStatus,
-                    showEdited: showEdited,
-                    showViaProxy: showSentViaProxy,
-                    showTimesamp: showTimestamp
-                ).invertedForegroundStyle(enabled: invertedMaterial)
-                if invertedMaterial {
-                    ciMetaText(
-                        chatItem.meta,
-                        chatTTL: chat.chatInfo.timedMessagesTTL,
-                        encrypted: chatItem.encryptedFile,
-                        colorMode: .normal,
-                        onlyOverrides: true,
-                        showStatus: showStatus,
-                        showEdited: showEdited,
-                        showViaProxy: showSentViaProxy,
-                        showTimesamp: showTimestamp
-                    )
+            let meta = chatItem.meta
+            let ttl = chat.chatInfo.timedMessagesTTL
+            let encrypted = chatItem.encryptedFile
+            switch meta.itemStatus {
+            case let .sndSent(sndProgress):
+                switch sndProgress {
+                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent)
+                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent)
                 }
+            case let .sndRcvd(_, sndProgress):
+                switch sndProgress {
+                case .complete:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2)
+                    }
+                case .partial:
+                    ZStack {
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1)
+                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2)
+                    }
+                }
+            default:
+                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor)
             }
         }
     }
 }
 
-enum MetaColorMode {
-    // Renders provided colours
-    case normal
-    // Fully transparent meta - used for reserving space
-    case transparent
-    // Renders white on dark backgrounds and black on light ones
-    case invertedMaterial
-
-    func resolve(_ c: Color?) -> Color? {
-        switch self {
-        case .normal: c
-        case .transparent: .clear
-        case .invertedMaterial: nil
-        }
-    }
-
-    func statusSpacer(_ sent: Bool) -> Text {
-        switch self {
-        case .normal, .transparent:
-            Text(
-                sent
-                ? Image("checkmark.wide")
-                : Image(systemName: "circlebadge.fill")
-            ).foregroundColor(.clear)
-        case .invertedMaterial: Text(" ").kerning(13)
-        }
-    }
+enum SentCheckmark {
+    case sent
+    case rcvd1
+    case rcvd2
 }
 
-func ciMetaText(
-    _ meta: CIMeta,
-    chatTTL: Int?,
-    encrypted: Bool?,
-    color: Color = .clear, // we use this function to reserve space without rendering meta
-    paleColor: Color? = nil,
-    primaryColor: Color = .accentColor,
-    colorMode: MetaColorMode = .normal,
-    onlyOverrides: Bool = false, // only render colors that differ from base
-    showStatus: Bool = true,
-    showEdited: Bool = true,
-    showViaProxy: Bool,
-    showTimesamp: Bool
-) -> Text {
+func ciMetaText(_ meta: CIMeta, chatTTL: Int?, encrypted: Bool?,  color: Color = .clear, transparent: Bool = false, sent: SentCheckmark? = nil) -> Text {
     var r = Text("")
-    var space: Text? = nil
-    let appendSpace = {
-        if let sp = space {
-            r = r + sp
-            space = nil
-        }
-    }
-    let resolved = colorMode.resolve(color)
-    if showEdited, meta.itemEdited {
-        r = r + statusIconText("pencil", resolved)
+    if meta.itemEdited {
+        r = r + statusIconText("pencil", color)
     }
     if meta.disappearing {
-        r = r + statusIconText("timer", resolved).font(.caption2)
+        r = r + statusIconText("timer", color).font(.caption2)
         let ttl = meta.itemTimed?.ttl
         if ttl != chatTTL {
-            r = r + colored(Text(shortTimeText(ttl)), resolved)
+            r = r + Text(shortTimeText(ttl)).foregroundColor(color)
         }
-        space = Text(" ")
+        r = r + Text(" ")
     }
-    if showViaProxy, meta.sentViaProxy == true {
-        appendSpace()
-        r = r + statusIconText("arrow.forward", resolved?.opacity(0.67)).font(.caption2)
-    }
-    if showStatus {
-        appendSpace()
-        if let (image, statusColor) = meta.itemStatus.statusIcon(color, paleColor ?? color, primaryColor) {
-            let metaColor = if onlyOverrides && statusColor == color {
-                Color.clear
-            } else {
-                colorMode.resolve(statusColor)
-            }
-            r = r + colored(Text(image), metaColor)
-        } else if !meta.disappearing {
-            r = r + colorMode.statusSpacer(meta.itemStatus.sent)
+    if let (icon, statusColor) = meta.statusIcon(color) {
+        let t = Text(Image(systemName: icon)).font(.caption2)
+        let gap = Text("  ").kerning(-1.25)
+        let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
+        switch sent {
+        case nil: r = r + t1
+        case .sent: r = r + t1 + gap
+        case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
+        case .rcvd2: r = r + gap + t1
         }
-        space = Text(" ")
+        r = r + Text(" ")
+    } else if !meta.disappearing {
+        r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
     }
     if let enc = encrypted {
-        appendSpace()
-        r = r + statusIconText(enc ? "lock" : "lock.open", resolved)
-        space = Text(" ")
-    }
-    if showTimesamp {
-        appendSpace()
-        r = r + colored(meta.timestampText, resolved)
+        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
     }
+    r = r + meta.timestampText.foregroundColor(color)
     return r.font(.caption)
 }
 
-private func statusIconText(_ icon: String, _ color: Color?) -> Text {
-    colored(Text(Image(systemName: icon)), color)
-}
-
-// Applying `foregroundColor(nil)` breaks `.invertedForegroundStyle` modifier
-private func colored(_ t: Text, _ color: Color?) -> Text {
-    if let color {
-        t.foregroundColor(color)
-    } else {
-        t
-    }
+private func statusIconText(_ icon: String, _ color: Color) -> Text {
+    Text(Image(systemName: icon)).foregroundColor(color)
 }
 
 struct CIMetaView_Previews: PreviewProvider {
-    static let metaColor = Color.secondary
     static var previews: some View {
         Group {
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true), metaColor: metaColor)
-            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), metaColor: metaColor)
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .ok, sndProgress: .partial)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndRcvd(msgRcptStatus: .badMsgHash, sndProgress: .complete)))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directSnd, .now, "https://simplex.chat", .sndSent(sndProgress: .complete), itemEdited: true))
+            CIMetaView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
         }
         .previewLayout(.fixed(width: 360, height: 100))
     }

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

@@ -13,22 +13,18 @@ let decryptErrorReason: LocalizedStringKey = "It can happen when you or your con
 
 struct CIRcvDecryptionError: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
-    @Environment(\.showTimestamp) var showTimestamp: Bool
     var msgDecryptError: MsgDecryptError
     var msgCount: UInt32
     var chatItem: ChatItem
     @State private var alert: CIRcvDecryptionErrorAlert?
 
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
     enum CIRcvDecryptionErrorAlert: Identifiable {
         case syncAllowedAlert(_ syncConnection: () -> Void)
         case syncNotSupportedContactAlert
         case syncNotSupportedMemberAlert
         case decryptionErrorAlert
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
         var id: String {
             switch self {
@@ -48,7 +44,7 @@ struct CIRcvDecryptionError: View {
                 if case let .group(groupInfo) = chat.chatInfo,
                    case let .groupRcv(groupMember) = chatItem.chatDir {
                     do {
-                        let (member, stats) = try apiGroupMemberInfoSync(groupInfo.apiId, groupMember.groupMemberId)
+                        let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
                         if let s = stats {
                             m.updateGroupMemberConnectionStats(groupInfo, member, s)
                         }
@@ -63,46 +59,43 @@ struct CIRcvDecryptionError: View {
                 case .syncNotSupportedContactAlert: return Alert(title: Text("Fix not supported by contact"), message: message())
                 case .syncNotSupportedMemberAlert: return Alert(title: Text("Fix not supported by group member"), message: message())
                 case .decryptionErrorAlert: return Alert(title: Text("Decryption error"), message: message())
-                case let .error(title, error): return mkAlert(title: title, message: error)
+                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
                 }
             }
     }
 
     @ViewBuilder private func viewBody() -> some View {
-        Group {
-            if case let .direct(contact) = chat.chatInfo,
-               let contactStats = contact.activeConn?.connectionStats {
-                if contactStats.ratchetSyncAllowed {
-                    decryptionErrorItemFixButton(syncSupported: true) {
-                        alert = .syncAllowedAlert { syncContactConnection(contact) }
-                    }
-                } else if !contactStats.ratchetSyncSupported {
-                    decryptionErrorItemFixButton(syncSupported: false) {
-                        alert = .syncNotSupportedContactAlert
-                    }
-                } else {
-                    basicDecryptionErrorItem()
+        if case let .direct(contact) = chat.chatInfo,
+           let contactStats = contact.activeConn?.connectionStats {
+            if contactStats.ratchetSyncAllowed {
+                decryptionErrorItemFixButton(syncSupported: true) {
+                    alert = .syncAllowedAlert { syncContactConnection(contact) }
                 }
-            } 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 {
-                if memberStats.ratchetSyncAllowed {
-                    decryptionErrorItemFixButton(syncSupported: true) {
-                        alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
-                    }
-                } else if !memberStats.ratchetSyncSupported {
-                    decryptionErrorItemFixButton(syncSupported: false) {
-                        alert = .syncNotSupportedMemberAlert
-                    }
-                } else {
-                    basicDecryptionErrorItem()
+            } else if !contactStats.ratchetSyncSupported {
+                decryptionErrorItemFixButton(syncSupported: false) {
+                    alert = .syncNotSupportedContactAlert
                 }
             } else {
                 basicDecryptionErrorItem()
             }
+        } 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 {
+            if memberStats.ratchetSyncAllowed {
+                decryptionErrorItemFixButton(syncSupported: true) {
+                    alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
+                }
+            } else if !memberStats.ratchetSyncSupported {
+                decryptionErrorItemFixButton(syncSupported: false) {
+                    alert = .syncNotSupportedMemberAlert
+                }
+            } else {
+                basicDecryptionErrorItem()
+            }
+        } else {
+            basicDecryptionErrorItem()
         }
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
     }
 
     private func basicDecryptionErrorItem() -> some View {
@@ -119,22 +112,24 @@ struct CIRcvDecryptionError: View {
                 }
                 (
                     Text(Image(systemName: "exclamationmark.arrow.triangle.2.circlepath"))
-                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
+                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text(" ")
                     + Text("Fix connection")
-                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
+                        .foregroundColor(syncSupported ? .accentColor : .secondary)
                         .font(.callout)
                     + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
                 )
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
         .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
         .textSelection(.disabled)
     }
 
@@ -145,14 +140,16 @@ struct CIRcvDecryptionError: View {
                     .foregroundColor(.red)
                     .italic()
                 + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true)
             }
             .padding(.horizontal, 12)
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .onTapGesture(perform: { onClick() })
         .padding(.vertical, 6)
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
         .textSelection(.disabled)
     }
 

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

@@ -13,53 +13,63 @@ import Combine
 
 struct CIVideoView: View {
     @EnvironmentObject var m: ChatModel
+    @Environment(\.colorScheme) var colorScheme
     private let chatItem: ChatItem
-    private let preview: UIImage?
+    private let image: String
     @State private var duration: Int
     @State private var progress: Int = 0
     @State private var videoPlaying: Bool = false
     private let maxWidth: CGFloat
-    private var videoWidth: CGFloat?
-    private let smallView: Bool
+    @Binding private var videoWidth: CGFloat?
+    @State private var scrollProxy: ScrollViewProxy?
+    @State private var preview: UIImage? = nil
     @State private var player: AVPlayer?
     @State private var fullPlayer: AVPlayer?
     @State private var url: URL?
     @State private var urlDecrypted: URL?
     @State private var decryptionInProgress: Bool = false
-    @Binding private var showFullScreenPlayer: Bool
+    @State private var showFullScreenPlayer = false
     @State private var timeObserver: Any? = nil
     @State private var fullScreenTimeObserver: Any? = nil
     @State private var publisher: AnyCancellable? = nil
-    private var sizeMultiplier: CGFloat { smallView ? 0.38 : 1 }
-    @State private var blurred: Bool = UserDefaults.standard.integer(forKey: DEFAULT_PRIVACY_MEDIA_BLUR_RADIUS) > 0
 
-    init(chatItem: ChatItem, preview: UIImage?, duration: Int, maxWidth: CGFloat, videoWidth: CGFloat?, smallView: Bool = false, showFullscreenPlayer: Binding<Bool>) {
+    init(chatItem: ChatItem, image: String, duration: Int, maxWidth: CGFloat, videoWidth: Binding<CGFloat?>, scrollProxy: ScrollViewProxy?) {
         self.chatItem = chatItem
-        self.preview = preview
+        self.image = image
         self._duration = State(initialValue: duration)
         self.maxWidth = maxWidth
-        self.videoWidth = videoWidth
-        self.smallView = smallView
-        self._showFullScreenPlayer = showFullscreenPlayer
+        self._videoWidth = videoWidth
+        self.scrollProxy = scrollProxy
+        if let url = getLoadedVideo(chatItem.file) {
+            let decrypted = chatItem.file?.fileSource?.cryptoArgs == nil ? url : chatItem.file?.fileSource?.decryptedGet()
+            self._urlDecrypted = State(initialValue: decrypted)
+            if let decrypted = decrypted {
+                self._player = State(initialValue: VideoPlayerView.getOrCreatePlayer(decrypted, false))
+                self._fullPlayer = State(initialValue: AVPlayer(url: decrypted))
+            }
+            self._url = State(initialValue: url)
+        }
+        if let data = Data(base64Encoded: dropImagePrefix(image)),
+           let uiImage = UIImage(data: data) {
+            self._preview = State(initialValue: uiImage)
+        }
     }
 
     var body: some View {
         let file = chatItem.file
-        ZStack(alignment: smallView ? .topLeading : .center) {
+        ZStack {
             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 {
+                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 {
-                    Group { if smallView { smallViewImageView(preview, file) } else { imageView(preview) } }
-                        .onTapGesture {
+                } else if let data = Data(base64Encoded: dropImagePrefix(image)),
+                          let uiImage = UIImage(data: data) {
+                    imageView(uiImage)
+                    .onTapGesture {
+                        if let file = file {
                             switch file.fileStatus {
-                            case .rcvInvitation, .rcvAborted:
+                            case .rcvInvitation:
                                 receiveFileIfValidSize(file: file, receiveFile: receiveFile)
                             case .rcvAccepted:
                                 switch file.fileProtocol {
@@ -81,69 +91,18 @@ struct CIVideoView: View {
                             default: ()
                             }
                         }
-                }
-                if !smallView {
-                    durationProgress()
-                }
-            }
-            if !blurred, let file, showDownloadButton(file.fileStatus) {
-                if !smallView {
-                    Button {
-                        receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                    } label: {
-                        playPauseIcon("play.fill")
                     }
-                } else if !file.showStatusIconInSmallView {
+                }
+                durationProgress()
+            }
+            if let file = file, case .rcvInvitation = file.fileStatus {
+                Button {
+                    receiveFileIfValidSize(file: file, receiveFile: receiveFile)
+                } label: {
                     playPauseIcon("play.fill")
-                        .onTapGesture {
-                            receiveFileIfValidSize(file: file, receiveFile: receiveFile)
-                        }
                 }
             }
         }
-        .fullScreenCover(isPresented: $showFullScreenPlayer) {
-            if let decrypted = urlDecrypted {
-                fullScreenPlayer(decrypted)
-            }
-        }
-        .onAppear {
-            setupPlayer(chatItem.file)
-        }
-        .onChange(of: chatItem.file) { file in
-            // ChatItem can be changed in small view on chat list screen
-            setupPlayer(file)
-        }
-        .onDisappear {
-            showFullScreenPlayer = false
-        }
-    }
-
-    private func setupPlayer(_ file: CIFile?) {
-        let newUrl = getLoadedVideo(file)
-        if newUrl == url {
-            return
-        }
-        url = nil
-        urlDecrypted = nil
-        player = nil
-        fullPlayer = nil
-        if let newUrl {
-            let decrypted = file?.fileSource?.cryptoArgs == nil ? newUrl : file?.fileSource?.decryptedGet()
-            urlDecrypted = decrypted
-            if let decrypted = decrypted {
-                player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
-                fullPlayer = AVPlayer(url: decrypted)
-            }
-            url = newUrl
-        }
-    }
-
-    private func showDownloadButton(_ fileStatus: CIFileStatus?) -> Bool {
-        switch fileStatus {
-        case .rcvInvitation: true
-        case .rcvAborted: true
-        default: false
-        }
     }
 
     private func videoViewEncrypted(_ file: CIFile, _ defaultPreview: UIImage, _ duration: Int) -> some View {
@@ -151,6 +110,11 @@ struct CIVideoView: View {
             ZStack(alignment: .center) {
                 let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
                 imageView(defaultPreview)
+                .fullScreenCover(isPresented: $showFullScreenPlayer) {
+                    if let decrypted = urlDecrypted {
+                        fullScreenPlayer(decrypted)
+                    }
+                }
                 .onTapGesture {
                     decrypt(file: file) {
                         showFullScreenPlayer = urlDecrypted != nil
@@ -159,22 +123,20 @@ struct CIVideoView: View {
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenPlayer = false
                 }
-                if !blurred {
-                    if !decryptionInProgress {
-                        Button {
-                            decrypt(file: file) {
-                                if urlDecrypted != nil {
-                                    videoPlaying = true
-                                    player?.play()
-                                }
+                if !decryptionInProgress {
+                    Button {
+                        decrypt(file: file) {
+                            if let decrypted = urlDecrypted {
+                                videoPlaying = true
+                                player?.play()
                             }
-                        } label: {
-                            playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                         }
-                        .disabled(!canBePlayed)
-                    } else {
-                        videoDecryptionProgress()
+                    } label: {
+                        playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
                     }
+                    .disabled(!canBePlayed)
+                } else {
+                    videoDecryptionProgress()
                 }
             }
         }
@@ -182,6 +144,7 @@ struct CIVideoView: View {
 
     private func videoView(_ player: AVPlayer, _ url: URL, _ file: CIFile, _ preview: UIImage, _ duration: Int) -> some View {
         let w = preview.size.width <= preview.size.height ? maxWidth * 0.75 : maxWidth
+        DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             ZStack(alignment: .center) {
                 let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
@@ -193,7 +156,9 @@ struct CIVideoView: View {
                         videoPlaying = false
                     }
                 }
-                .modifier(PrivacyBlur(enabled: !videoPlaying, blurred: $blurred))
+                .fullScreenCover(isPresented: $showFullScreenPlayer) {
+                    fullScreenPlayer(url)
+                }
                 .onTapGesture {
                     switch player.timeControlStatus {
                     case .playing:
@@ -209,7 +174,7 @@ struct CIVideoView: View {
                 .onChange(of: m.activeCallViewIsCollapsed) { _ in
                     showFullScreenPlayer = false
                 }
-                if !videoPlaying && !blurred {
+                if !videoPlaying {
                     Button {
                         m.stopPreviousRecPlay = url
                         player.play()
@@ -219,7 +184,7 @@ struct CIVideoView: View {
                     .disabled(!canBePlayed)
                 }
             }
-            fileStatusIcon()
+            loadingIndicator()
         }
         .onAppear {
             addObserver(player, url)
@@ -231,53 +196,14 @@ struct CIVideoView: View {
         }
     }
 
-    private func smallVideoViewEncrypted(_ file: CIFile, _ preview: UIImage) -> some View {
-        return ZStack(alignment: .topLeading) {
-            let canBePlayed = !chatItem.chatDir.sent || file.fileStatus == CIFileStatus.sndComplete || (file.fileStatus == .sndStored && file.fileProtocol == .local)
-            smallViewImageView(preview, file)
-                .onTapGesture {
-                    decrypt(file: file) {
-                        showFullScreenPlayer = urlDecrypted != nil
-                    }
-                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
-            if file.showStatusIconInSmallView {
-                // Show nothing
-            } else if !decryptionInProgress {
-                playPauseIcon(canBePlayed ? "play.fill" : "play.slash")
-            } else {
-                videoDecryptionProgress()
-            }
-        }
-    }
-
-    private func smallVideoView(_ url: URL, _ file: CIFile, _ preview: UIImage) -> some View {
-        return ZStack(alignment: .topLeading) {
-            smallViewImageView(preview, file)
-                .onTapGesture {
-                    showFullScreenPlayer = true
-                }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
-
-            if !file.showStatusIconInSmallView {
-                playPauseIcon("play.fill")
-            }
-        }
-    }
-
-
     private func playPauseIcon(_ image: String, _ color: Color = .white) -> some View {
         Image(systemName: image)
         .resizable()
         .aspectRatio(contentMode: .fit)
-        .frame(width: smallView ? 12 * sizeMultiplier * 1.6 : 12, height: smallView ? 12 * sizeMultiplier * 1.6 : 12)
+        .frame(width: 12, height: 12)
         .foregroundColor(color)
-        .padding(.leading, smallView ? 0 : 4)
-        .frame(width: 40 * sizeMultiplier, height: 40 * sizeMultiplier)
+        .padding(.leading, 4)
+        .frame(width: 40, height: 40)
         .background(Color.black.opacity(0.35))
         .clipShape(Circle())
     }
@@ -285,57 +211,50 @@ struct CIVideoView: View {
     private func videoDecryptionProgress(_ color: Color = .white) -> some View {
         ProgressView()
             .progressViewStyle(.circular)
-            .frame(width: smallView ? 12 * sizeMultiplier : 12, height: smallView ? 12 * sizeMultiplier : 12)
+            .frame(width: 12, height: 12)
             .tint(color)
-            .frame(width: smallView ? 40 * sizeMultiplier * 0.9 : 40, height: smallView ? 40 * sizeMultiplier * 0.9 : 40)
+            .frame(width: 40, height: 40)
             .background(Color.black.opacity(0.35))
             .clipShape(Circle())
     }
 
-    private var fileSizeString: String {
-        if let file = chatItem.file, !videoPlaying {
-            "  " + ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
-        } else {
-            ""
-        }
-    }
-
     private func durationProgress() -> some View {
-        Text((durationText(videoPlaying ? progress : duration)) + fileSizeString)
-            .invertedForegroundStyle()
+        HStack {
+            Text("\(durationText(videoPlaying ? progress : duration))")
+            .foregroundColor(.white)
             .font(.caption)
-            .padding(.vertical, 6)
-            .padding(.horizontal, 12)
+            .padding(.vertical, 3)
+            .padding(.horizontal, 6)
+            .background(Color.black.opacity(0.35))
+            .cornerRadius(10)
+            .padding([.top, .leading], 6)
+
+            if let file = chatItem.file, !videoPlaying {
+                Text("\(ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary))")
+                .foregroundColor(.white)
+                .font(.caption)
+                .padding(.vertical, 3)
+                .padding(.horizontal, 6)
+                .background(Color.black.opacity(0.35))
+                .cornerRadius(10)
+                .padding(.top, 6)
+            }
+        }
     }
 
     private func imageView(_ img: UIImage) -> some View {
         let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
+        DispatchQueue.main.async { videoWidth = w }
         return ZStack(alignment: .topTrailing) {
             Image(uiImage: img)
             .resizable()
             .scaledToFit()
             .frame(width: w)
-            .modifier(PrivacyBlur(blurred: $blurred))
-            if !blurred || !showDownloadButton(chatItem.file?.fileStatus) {
-                fileStatusIcon()
-            }
+            loadingIndicator()
         }
     }
 
-    private func smallViewImageView(_ img: UIImage, _ file: CIFile) -> some View {
-        ZStack(alignment: .center) {
-            Image(uiImage: img)
-                .resizable()
-                .aspectRatio(contentMode: .fill)
-                .frame(width: maxWidth, height: maxWidth)
-            if file.showStatusIconInSmallView {
-                fileStatusIcon()
-                    .allowsHitTesting(false)
-            }
-        }
-    }
-
-    @ViewBuilder private func fileStatusIcon() -> some View {
+    @ViewBuilder private func loadingIndicator() -> some View {
         if let file = chatItem.file {
             switch file.fileStatus {
             case .sndStored:
@@ -352,22 +271,7 @@ struct CIVideoView: View {
                 }
             case .sndComplete: fileIcon("checkmark", 10, 13)
             case .sndCancelled: fileIcon("xmark", 10, 13)
-            case let .sndError(sndFileError):
-                fileIcon("xmark", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("File error"),
-                            message: Text(sndFileError.errorInfo)
-                        ))
-                    }
-            case let .sndWarning(sndFileError):
-                fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("Temporary file error"),
-                            message: Text(sndFileError.errorInfo)
-                        ))
-                    }
+            case .sndError: fileIcon("xmark", 10, 13)
             case .rcvInvitation: fileIcon("arrow.down", 10, 13)
             case .rcvAccepted: fileIcon("ellipsis", 14, 11)
             case let .rcvTransfer(rcvProgress, rcvTotal):
@@ -376,26 +280,10 @@ struct CIVideoView: View {
                 } else {
                     progressView()
                 }
-            case .rcvAborted: fileIcon("exclamationmark.arrow.circlepath", 14, 11)
-            case .rcvComplete: EmptyView()
             case .rcvCancelled: fileIcon("xmark", 10, 13)
-            case let .rcvError(rcvFileError):
-                fileIcon("xmark", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("File error"),
-                            message: Text(rcvFileError.errorInfo)
-                        ))
-                    }
-            case let .rcvWarning(rcvFileError):
-                fileIcon("exclamationmark.triangle.fill", 10, 13)
-                    .onTapGesture {
-                        AlertManager.shared.showAlert(Alert(
-                            title: Text("Temporary file error"),
-                            message: Text(rcvFileError.errorInfo)
-                        ))
-                    }
+            case .rcvError: fileIcon("xmark", 10, 13)
             case .invalid: fileIcon("questionmark", 10, 13)
+            default: EmptyView()
             }
         }
     }
@@ -403,10 +291,10 @@ struct CIVideoView: View {
     private func fileIcon(_ icon: String, _ size: CGFloat, _ padding: CGFloat) -> some View {
         Image(systemName: icon)
             .resizable()
-            .invertedForegroundStyle()
             .aspectRatio(contentMode: .fit)
             .frame(width: size, height: size)
-            .padding(smallView ? 0 : padding)
+            .foregroundColor(.white)
+            .padding(padding)
     }
 
     private func progressView() -> some View {
@@ -414,24 +302,26 @@ struct CIVideoView: View {
         .progressViewStyle(.circular)
         .frame(width: 16, height: 16)
         .tint(.white)
-        .padding(smallView ? 0 : 11)
+        .padding(11)
     }
 
     private func progressCircle(_ progress: Int64, _ total: Int64) -> some View {
         Circle()
         .trim(from: 0, to: Double(progress) / Double(total))
-        .stroke(style: StrokeStyle(lineWidth: 2))
-        .invertedForegroundStyle()
+        .stroke(
+            Color(uiColor: .white),
+            style: StrokeStyle(lineWidth: 2)
+        )
         .rotationEffect(.degrees(-90))
         .frame(width: 16, height: 16)
-        .padding([.trailing, .top], smallView ? 0 : 11)
+        .padding([.trailing, .top], 11)
     }
 
     // TODO encrypt: where file size is checked?
-    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool, Bool) async -> Void) {
+    private func receiveFileIfValidSize(file: CIFile, receiveFile: @escaping (User, Int64, Bool) async -> Void) {
         Task {
             if let user = m.currentUser {
-                await receiveFile(user, file.fileId, false, false)
+                await receiveFile(user, file.fileId, false)
             }
         }
     }
@@ -464,8 +354,7 @@ struct CIVideoView: View {
             )
             .onAppear {
                 DispatchQueue.main.asyncAfter(deadline: .now()) {
-                    // Prevent feedback loop - setting `ChatModel`s property causes `onAppear` to be called on iOS17+
-                    if m.stopPreviousRecPlay != url { m.stopPreviousRecPlay = url }
+                    m.stopPreviousRecPlay = url
                     if let player = fullPlayer {
                         player.play()
                         var played = false
@@ -502,12 +391,10 @@ struct CIVideoView: View {
             urlDecrypted = await file.fileSource?.decryptedGetOrCreate(&ChatModel.shared.filesToDelete)
             await MainActor.run {
                 if let decrypted = urlDecrypted {
-                    if !smallView {
-                        player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
-                    }
+                    player = VideoPlayerView.getOrCreatePlayer(decrypted, false)
                     fullPlayer = AVPlayer(url: decrypted)
                 }
-                decryptionInProgress = false
+                decryptionInProgress = true
                 completed?()
             }
         }

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

@@ -11,30 +11,18 @@ import SimpleXChat
 
 struct CIVoiceView: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
-    @State var audioPlayer: AudioPlayer? = nil
-    @State var playbackState: VoiceMessagePlaybackState = .noPlayback
-    @State var playbackTime: TimeInterval? = nil
-
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
     @Binding var allowMenu: Bool
-    var smallViewSize: CGFloat?
     @State private var seek: (TimeInterval) -> Void = { _ in }
 
     var body: some View {
         Group {
-            if smallViewSize != nil {
-                HStack(spacing: 10) {
-                    player()
-                    playerTime()
-                        .allowsHitTesting(false)
-                    if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
-                        playbackSlider()
-                    }
-                }
-            } else if chatItem.chatDir.sent {
+            if chatItem.chatDir.sent {
                 VStack (alignment: .trailing, spacing: 6) {
                     HStack {
                         if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
@@ -65,13 +53,7 @@ struct CIVoiceView: View {
     }
 
     private func player() -> some View {
-        let sizeMultiplier: CGFloat = if let sz = smallViewSize {
-            voiceMessageSizeBasedOnSquareSize(sz) / 56
-        } else {
-            1
-        }
-        return VoiceMessagePlayer(
-            chat: chat,
+        VoiceMessagePlayer(
             chatItem: chatItem,
             recordingFile: recordingFile,
             recordingTime: TimeInterval(duration),
@@ -80,8 +62,7 @@ struct CIVoiceView: View {
             audioPlayer: $audioPlayer,
             playbackState: $playbackState,
             playbackTime: $playbackTime,
-            allowMenu: $allowMenu,
-            sizeMultiplier: sizeMultiplier
+            allowMenu: $allowMenu
         )
     }
 
@@ -91,7 +72,7 @@ struct CIVoiceView: View {
             playbackState: $playbackState,
             playbackTime: $playbackTime
         )
-        .foregroundColor(theme.colors.secondary)
+        .foregroundColor(.secondary)
     }
     
     private func playbackSlider() -> some View {
@@ -108,11 +89,10 @@ struct CIVoiceView: View {
                     allowMenu = true
                 }
             }
-            .tint(theme.colors.primary)
     }
 
     private func metaView() -> some View {
-        CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+        CIMetaView(chat: chat, chatItem: chatItem)
     }
 }
 
@@ -137,9 +117,8 @@ struct VoiceMessagePlayerTime: View {
 }
 
 struct VoiceMessagePlayer: View {
-    @ObservedObject var chat: Chat
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     var chatItem: ChatItem
     var recordingFile: CIFile?
     var recordingTime: TimeInterval
@@ -149,61 +128,23 @@ struct VoiceMessagePlayer: View {
     @Binding var audioPlayer: AudioPlayer?
     @Binding var playbackState: VoiceMessagePlaybackState
     @Binding var playbackTime: TimeInterval?
-
     @Binding var allowMenu: Bool
-    var sizeMultiplier: CGFloat
 
     var body: some View {
         ZStack {
             if let recordingFile = recordingFile {
                 switch recordingFile.fileStatus {
-                case .sndStored:
-                    if recordingFile.fileProtocol == .local {
-                        playbackButton()
-                    } else {
-                        loadingIcon()
-                    }
-                case .sndTransfer: loadingIcon()
+                case .sndStored: playbackButton()
+                case .sndTransfer: playbackButton()
                 case .sndComplete: playbackButton()
                 case .sndCancelled: playbackButton()
-                case let .sndError(sndFileError):
-                    fileStatusIcon("multiply", 14)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("File error"),
-                                message: Text(sndFileError.errorInfo)
-                            ))
-                        }
-                case let .sndWarning(sndFileError):
-                    fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("Temporary file error"),
-                                message: Text(sndFileError.errorInfo)
-                            ))
-                        }
-                case .rcvInvitation: downloadButton(recordingFile, "play.fill")
+                case .sndError: playbackButton()
+                case .rcvInvitation: downloadButton(recordingFile)
                 case .rcvAccepted: loadingIcon()
                 case .rcvTransfer: loadingIcon()
-                case .rcvAborted: downloadButton(recordingFile, "exclamationmark.arrow.circlepath")
                 case .rcvComplete: playbackButton()
                 case .rcvCancelled: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
-                case let .rcvError(rcvFileError):
-                    fileStatusIcon("multiply", 14)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("File error"),
-                                message: Text(rcvFileError.errorInfo)
-                            ))
-                        }
-                case let .rcvWarning(rcvFileError):
-                    fileStatusIcon("exclamationmark.triangle.fill", 16)
-                        .onTapGesture {
-                            AlertManager.shared.showAlert(Alert(
-                                title: Text("Temporary file error"),
-                                message: Text(rcvFileError.errorInfo)
-                            ))
-                        }
+                case .rcvError: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 case .invalid: playPauseIcon("play.fill", Color(uiColor: .tertiaryLabel))
                 }
             } else {
@@ -211,170 +152,84 @@ struct VoiceMessagePlayer: View {
             }
         }
         .onAppear {
-            if audioPlayer == nil {
-                let small = sizeMultiplier != 1
-                audioPlayer = small ? VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)]?.audioPlayer : VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)]?.audioPlayer
-                playbackState = (small ? VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)]?.playbackState : VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)]?.playbackState) ?? .noPlayback
-                playbackTime = small ? VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)]?.playbackTime : VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)]?.playbackTime
-            }
             seek = { to in audioPlayer?.seek(to) }
-            let audioPath: URL? = if let recordingSource = getLoadedFileSource(recordingFile) {
-                getAppFilePath(recordingSource.filePath)
-            } else {
-                nil
-            }
-            let chatId = chatModel.chatId
-            let userId = chatModel.currentUser?.userId
-            audioPlayer?.onTimer = {
-                playbackTime = $0
-                notifyStateChange()
-                // Manual check here is needed because when this view is not visible, SwiftUI don't react on stopPreviousRecPlay, chatId and current user changes and audio keeps playing when it should stop
-                if (audioPath != nil && chatModel.stopPreviousRecPlay != audioPath) || chatModel.chatId != chatId || chatModel.currentUser?.userId != userId {
-                    stopPlayback()
-                }
-            }
+            audioPlayer?.onTimer = { playbackTime = $0 }
             audioPlayer?.onFinishPlayback = {
                 playbackState = .noPlayback
                 playbackTime = TimeInterval(0)
-                notifyStateChange()
-            }
-            // One voice message was paused, then scrolled far from it, started to play another one, drop to stopped state
-            if let audioPath, chatModel.stopPreviousRecPlay != audioPath {
-                stopPlayback()
             }
         }
         .onChange(of: chatModel.stopPreviousRecPlay) { it in
             if let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
                chatModel.stopPreviousRecPlay != getAppFilePath(recordingFileName) {
-                stopPlayback()
+                audioPlayer?.stop()
+                playbackState = .noPlayback
+                playbackTime = TimeInterval(0)
             }
         }
         .onChange(of: playbackState) { state in
             allowMenu = state == .paused || state == .noPlayback
-            // Notify activeContentPreview in ChatPreviewView that playback is finished
-            if state == .noPlayback, let recordingFileName = getLoadedFileSource(recordingFile)?.filePath,
-               chatModel.stopPreviousRecPlay == getAppFilePath(recordingFileName) {
-                chatModel.stopPreviousRecPlay = nil
-            }
-        }
-        .onChange(of: chatModel.chatId) { _ in
-            stopPlayback()
-        }
-        .onDisappear {
-            if sizeMultiplier == 1 && chatModel.chatId == nil {
-                stopPlayback()
-            }
         }
     }
 
     @ViewBuilder private func playbackButton() -> some View {
-        if sizeMultiplier != 1 {
-            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()
-                    }
+        switch playbackState {
+        case .noPlayback:
+            Button {
+                if let recordingSource = getLoadedFileSource(recordingFile) {
+                    startPlayback(recordingSource)
+                }
+            } label: {
+                playPauseIcon("play.fill")
             }
-        } 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)
-                }
+        case .playing:
+            Button {
+                audioPlayer?.pause()
+                playbackState = .paused
+            } label: {
+                playPauseIcon("pause.fill")
+            }
+        case .paused:
+            Button {
+                audioPlayer?.play()
+                playbackState = .playing
+            } label: {
+                playPauseIcon("play.fill")
             }
         }
     }
 
-    private func playPauseIcon(_ image: String, _ color: Color/* = .accentColor*/) -> some View {
+    private func playPauseIcon(_ image: String, _ color: Color = .accentColor) -> some View {
         ZStack {
             Image(systemName: image)
                 .resizable()
                 .aspectRatio(contentMode: .fit)
-                .frame(width: 20 * sizeMultiplier, height: 20 * sizeMultiplier)
+                .frame(width: 20, height: 20)
                 .foregroundColor(color)
                 .padding(.leading, image == "play.fill" ? 4 : 0)
-                .frame(width: 56 * sizeMultiplier, height: 56 * sizeMultiplier)
-                .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
+                .frame(width: 56, height: 56)
+                .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
                 .clipShape(Circle())
             if recordingTime > 0 {
                 ProgressCircle(length: recordingTime, progress: $playbackTime)
-                    .frame(width: 53 * sizeMultiplier, height: 53 * sizeMultiplier) // this + ProgressCircle lineWidth = background circle diameter
+                    .frame(width: 53, height: 53) // this + ProgressCircle lineWidth = background circle diameter
             }
         }
     }
 
-    private func downloadButton(_ recordingFile: CIFile, _ icon: String) -> some View {
-        Group {
-            if sizeMultiplier != 1 {
-                playPauseIcon(icon, theme.colors.primary)
-                    .onTapGesture {
-                        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)
+    private func downloadButton(_ recordingFile: CIFile) -> some View {
+        Button {
+            Task {
+                if let user = chatModel.currentUser {
+                    await receiveFile(user: user, fileId: recordingFile.fileId)
                 }
             }
-        }
-    }
-
-    func notifyStateChange() {
-        if sizeMultiplier != 1 {
-            VoiceItemState.smallView[VoiceItemState.id(chat, chatItem)] = VoiceItemState(audioPlayer: audioPlayer, playbackState: playbackState, playbackTime: playbackTime)
-        } else {
-            VoiceItemState.chatView[VoiceItemState.id(chat, chatItem)] = VoiceItemState(audioPlayer: audioPlayer, playbackState: playbackState, playbackTime: playbackTime)
+        } label: {
+            playPauseIcon("play.fill")
         }
     }
 
     private struct ProgressCircle: View {
-        @EnvironmentObject var theme: AppTheme
         var length: TimeInterval
         @Binding var progress: TimeInterval?
 
@@ -382,7 +237,7 @@ struct VoiceMessagePlayer: View {
             Circle()
                 .trim(from: 0, to: ((progress ?? TimeInterval(0)) / length))
                 .stroke(
-                    theme.colors.primary,
+                    Color.accentColor,
                     style: StrokeStyle(lineWidth: 3)
                 )
                 .rotationEffect(.degrees(-90))
@@ -390,100 +245,26 @@ struct VoiceMessagePlayer: View {
         }
     }
 
-    private func fileStatusIcon(_ image: String, _ size: CGFloat) -> some View {
-        Image(systemName: image)
-            .resizable()
-            .aspectRatio(contentMode: .fit)
-            .frame(width: size * sizeMultiplier, height: size * sizeMultiplier)
-            .foregroundColor(Color(uiColor: .tertiaryLabel))
-            .frame(width: 56 * sizeMultiplier, height: 56 * sizeMultiplier)
-            .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
-            .clipShape(Circle())
-    }
-
     private func loadingIcon() -> some View {
         ProgressView()
-            .frame(width: 30 * sizeMultiplier, height: 30 * sizeMultiplier)
-            .frame(width: 56 * sizeMultiplier, height: 56 * sizeMultiplier)
-            .background(showBackground ? chatItemFrameColor(chatItem, theme) : .clear)
+            .frame(width: 30, height: 30)
+            .frame(width: 56, height: 56)
+            .background(showBackground ? chatItemFrameColor(chatItem, colorScheme) : .clear)
             .clipShape(Circle())
     }
 
     private func startPlayback(_ recordingSource: CryptoFile) {
-        let audioPath = getAppFilePath(recordingSource.filePath)
-        let chatId = chatModel.chatId
-        let userId = chatModel.currentUser?.userId
-        chatModel.stopPreviousRecPlay = audioPath
+        chatModel.stopPreviousRecPlay = getAppFilePath(recordingSource.filePath)
         audioPlayer = AudioPlayer(
-            onTimer: {
-                playbackTime = $0
-                notifyStateChange()
-                // Manual check here is needed because when this view is not visible, SwiftUI don't react on stopPreviousRecPlay, chatId and current user changes and audio keeps playing when it should stop
-                if chatModel.stopPreviousRecPlay != audioPath || chatModel.chatId != chatId || chatModel.currentUser?.userId != userId {
-                    stopPlayback()
-                }
-            },
+            onTimer: { playbackTime = $0 },
             onFinishPlayback: {
                 playbackState = .noPlayback
                 playbackTime = TimeInterval(0)
-                notifyStateChange()
             }
         )
         audioPlayer?.start(fileSource: recordingSource, at: playbackTime)
         playbackState = .playing
-        notifyStateChange()
     }
-
-    private func stopPlayback() {
-        audioPlayer?.stop()
-        playbackState = .noPlayback
-        playbackTime = TimeInterval(0)
-        notifyStateChange()
-    }
-}
-
-func voiceMessageSizeBasedOnSquareSize(_ squareSize: CGFloat) -> CGFloat {
-    let squareToCircleRatio = 0.935
-    return squareSize + squareSize * (1 - squareToCircleRatio)
-}
-
-class VoiceItemState {
-    var audioPlayer: AudioPlayer?
-    var playbackState: VoiceMessagePlaybackState
-    var playbackTime: TimeInterval?
-
-    init(audioPlayer: AudioPlayer? = nil, playbackState: VoiceMessagePlaybackState, playbackTime: TimeInterval? = nil) {
-        self.audioPlayer = audioPlayer
-        self.playbackState = playbackState
-        self.playbackTime = playbackTime
-    }
-
-    static func id(_ chat: Chat, _ chatItem: ChatItem) -> String {
-        "\(chat.id) \(chatItem.id)"
-    }
-
-    static func id(_ chatInfo: ChatInfo, _ chatItem: ChatItem) -> String {
-        "\(chatInfo.id) \(chatItem.id)"
-    }
-
-    static func stopVoiceInSmallView(_ chatInfo: ChatInfo, _ chatItem: ChatItem) {
-        let id = id(chatInfo, chatItem)
-        if let item = smallView[id] {
-            item.audioPlayer?.stop()
-            ChatModel.shared.stopPreviousRecPlay = nil
-        }
-    }
-
-    static func stopVoiceInChatView(_ chatInfo: ChatInfo, _ chatItem: ChatItem) {
-        let id = id(chatInfo, chatItem)
-        if let item = chatView[id] {
-            item.audioPlayer?.stop()
-            ChatModel.shared.stopPreviousRecPlay = nil
-        }
-    }
-
-    static var smallView: [String: VoiceItemState] = [:]
-    static var chatView: [String: VoiceItemState] = [:]
 }
 
 struct CIVoiceView_Previews: PreviewProvider {
@@ -508,12 +289,15 @@ struct CIVoiceView_Previews: PreviewProvider {
                 chatItem: ChatItem.getVoiceMsgContentSample(),
                 recordingFile: CIFile.getSample(fileName: "voice.m4a", fileSize: 65536, fileStatus: .rcvComplete),
                 duration: 30,
+                audioPlayer: .constant(nil),
+                playbackState: .constant(.playing),
+                playbackTime: .constant(TimeInterval(20)),
                 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, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true), playbackState: .constant(.noPlayback), playbackTime: .constant(nil))
         }
         .previewLayout(.fixed(width: 360, height: 360))
     }

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

@@ -10,21 +10,22 @@ import SwiftUI
 import SimpleXChat
 
 struct DeletedItemView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
 
     var body: some View {
         HStack(alignment: .bottom, spacing: 0) {
             Text(chatItem.content.text)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
         .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, theme))
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
         .textSelection(.disabled)
     }
 }

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct EmojiItemView: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
 
     var body: some View {
@@ -19,7 +18,7 @@ struct EmojiItemView: View {
             emojiText(chatItem.content.text)
                 .padding(.top, 8)
                 .padding(.horizontal, 6)
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.bottom, 8)
                 .padding(.horizontal, 12)
         }

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

@@ -12,24 +12,21 @@ import SwiftUI
 import SimpleXChat
 
 struct FramedCIVoiceView: View {
-    @EnvironmentObject var theme: AppTheme
-    @ObservedObject var chat: Chat
     var chatItem: ChatItem
     let recordingFile: CIFile?
     let duration: Int
-
-    @State var audioPlayer: AudioPlayer? = nil
-    @State var playbackState: VoiceMessagePlaybackState = .noPlayback
-    @State var playbackTime: TimeInterval? = nil
-
+    
     @Binding var allowMenu: Bool
-
+    
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
+    
     @State private var seek: (TimeInterval) -> Void = { _ in }
     
     var body: some View {
         HStack {
             VoiceMessagePlayer(
-                chat: chat,
                 chatItem: chatItem,
                 recordingFile: recordingFile,
                 recordingTime: TimeInterval(duration),
@@ -38,15 +35,14 @@ struct FramedCIVoiceView: View {
                 audioPlayer: $audioPlayer,
                 playbackState: $playbackState,
                 playbackTime: $playbackTime,
-                allowMenu: $allowMenu,
-                sizeMultiplier: 1
+                allowMenu: $allowMenu
             )
             VoiceMessagePlayerTime(
                 recordingTime: TimeInterval(duration),
                 playbackState: $playbackState,
                 playbackTime: $playbackTime
             )
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
             .frame(width: 50, alignment: .leading)
             if .playing == playbackState || (playbackTime ?? 0) > 0 || !allowMenu {
                 playbackSlider()
@@ -92,13 +88,12 @@ 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, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
         }
-        .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 360))
     }
 }

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

@@ -13,12 +13,12 @@ import AVKit
 
 struct FullScreenMediaView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var scrollModel: ReverseListScrollModel
     @State var chatItem: ChatItem
     @State var image: UIImage?
     @State var player: AVPlayer? = nil
     @State var url: URL? = nil
     @Binding var showView: Bool
+    @State var scrollProxy: ScrollViewProxy?
     @State private var showNext = false
     @State private var nextImage: UIImage?
     @State private var nextPlayer: AVPlayer?
@@ -71,7 +71,9 @@ struct FullScreenMediaView: View {
                 let w = abs(t.width)
                 if t.height > 60 && t.height > w * 2  {
                     showView = false
-                    scrollModel.scrollToItem(id: chatItem.id)
+                    if let proxy = scrollProxy {
+                        proxy.scrollTo(chatItem.viewId)
+                    }
                 } else if w > 60 && w > abs(t.height) * 2 && !scrolling {
                     let previous = t.width > 0
                     scrolling = true

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

@@ -11,7 +11,6 @@ import SimpleXChat
 
 struct IntegrityErrorItemView: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
     var msgError: MsgErrorType
     var chatItem: ChatItem
 
@@ -55,7 +54,6 @@ struct IntegrityErrorItemView: View {
 
 struct CIMsgError: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
     var chatItem: ChatItem
     var onTap: () -> Void
 
@@ -64,12 +62,13 @@ struct CIMsgError: View {
             Text(chatItem.content.text)
                 .foregroundColor(.red)
                 .italic()
-            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
+            CIMetaView(chat: chat, chatItem: chatItem)
                 .padding(.horizontal, 12)
         }
         .padding(.leading, 12)
         .padding(.vertical, 6)
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
+        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .cornerRadius(18)
         .textSelection(.disabled)
         .onTapGesture(perform: onTap)
     }

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

@@ -11,18 +11,19 @@ import SimpleXChat
 
 struct MarkedDeletedItemView: View {
     @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.revealed) var revealed: Bool
+    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
+    @Binding var revealed: Bool
 
     var body: some View {
         (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
         .font(.caption)
-        .foregroundColor(theme.colors.secondary)
+        .foregroundColor(.secondary)
         .padding(.horizontal, 12)
         .padding(.vertical, 6)
-        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
+        .background(chatItemFrameColor(chatItem, colorScheme))
+        .cornerRadius(18)
         .textSelection(.disabled)
     }
 
@@ -35,8 +36,8 @@ struct MarkedDeletedItemView: View {
             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 < m.reversedChatItems.count,
+                  let ci = .some(m.reversedChatItems[i]),
                   ci.mergeCategory == ciCategory,
                   let itemDeleted = ci.meta.itemDeleted {
                 switch itemDeleted {
@@ -79,10 +80,7 @@ struct MarkedDeletedItemView: View {
 struct MarkedDeletedItemView_Previews: PreviewProvider {
     static var previews: some View {
         Group {
-            MarkedDeletedItemView(
-                chat: Chat.sampleData,
-                chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))
-            ).environment(\.revealed, true)
+            MarkedDeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 200))
     }

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

@@ -26,8 +26,6 @@ private func typing(_ w: Font.Weight = .light) -> Text {
 
 struct MsgContentView: View {
     @ObservedObject var chat: Chat
-    @Environment(\.showTimestamp) var showTimestamp: Bool
-    @EnvironmentObject var theme: AppTheme
     var text: String
     var formattedText: [FormattedText]? = nil
     var sender: String? = nil
@@ -37,8 +35,6 @@ struct MsgContentView: View {
     @State private var typingIdx = 0
     @State private var timer: Timer?
 
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-
     var body: some View {
         if meta?.isLive == true {
             msgContentView()
@@ -67,7 +63,7 @@ struct MsgContentView: View {
     }
 
     private func msgContentView() -> Text {
-        var v = messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary)
+        var v = messageText(text, formattedText, sender, showSecrets: showSecrets)
         if let mt = meta {
             if mt.isLive {
                 v = v + typingIndicator(mt.recent)
@@ -81,15 +77,15 @@ struct MsgContentView: View {
         return (recent ? typingIndicators[typingIdx] : noTyping)
             .font(.body.monospaced())
             .kerning(-2)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
     }
 
     private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true)
     }
 }
 
-func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool, secondaryColor: Color) -> Text {
+func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: String?, icon: String? = nil, preview: Bool = false, showSecrets: Bool) -> Text {
     let s = text
     var res: Text
     if let ft = formattedText, ft.count > 0 && ft.count <= 200 {
@@ -104,7 +100,7 @@ func messageText(_ text: String, _ formattedText: [FormattedText]?, _ sender: St
     }
 
     if let i = icon {
-        res = Text(Image(systemName: i)).foregroundColor(secondaryColor) + Text(" ") + res
+        res = Text(Image(systemName: i)).foregroundColor(Color(uiColor: .tertiaryLabel)) + Text(" ") + res
     }
 
     if let s = sender {

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

@@ -1,132 +0,0 @@
-//
-//  ChatItemForwardingView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 12.04.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct ChatItemForwardingView: View {
-    @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.dismiss) var dismiss
-
-    var chatItems: [ChatItem]
-    var fromChatInfo: ChatInfo
-    @Binding var composeState: ComposeState
-
-    @State private var searchText: String = ""
-    @State private var alert: SomeAlert?
-    private let chatsToForwardTo = filterChatsToForwardTo(chats: ChatModel.shared.chats)
-
-    var body: some View {
-        NavigationView {
-            forwardListView()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarLeading) {
-                        Button("Cancel") {
-                            dismiss()
-                        }
-                    }
-                    ToolbarItem(placement: .principal) {
-                        Text("Forward")
-                            .bold()
-                    }
-                }
-        }
-        .modifier(ThemedBackground())
-        .alert(item: $alert) { $0.alert }
-    }
-
-    @ViewBuilder private func forwardListView() -> some View {
-        VStack(alignment: .leading) {
-            if !chatsToForwardTo.isEmpty {
-                List {
-                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
-                    let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { foundChat($0, s) }
-                    ForEach(chats) { chat in
-                        forwardListChatView(chat)
-                            .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
-                    }
-                }
-                .searchable(text: $searchText, placement: .navigationBarDrawer(displayMode: .always))
-                .modifier(ThemedBackground(grouped: true))
-            } else {
-                ZStack {
-                    emptyList()
-                }
-                .frame(maxWidth: .infinity, maxHeight: .infinity)
-                .modifier(ThemedBackground())
-            }
-        }
-    }
-
-    private func emptyList() -> some View {
-        Text("No filtered chats")
-            .foregroundColor(theme.colors.secondary)
-            .frame(maxWidth: .infinity)
-    }
-
-    @ViewBuilder private func forwardListChatView(_ chat: Chat) -> some View {
-        let prohibited = chatItems.map { ci in
-            chat.prohibitedByPref(
-                hasSimplexLink: hasSimplexLink(ci.content.msgContent?.text),
-                isMediaOrFileAttachment: ci.content.msgContent?.isMediaOrFileAttachment ?? false,
-                isVoice: ci.content.msgContent?.isVoice ?? false
-            )
-        }.contains(true)
-
-        Button {
-            if prohibited {
-                alert = SomeAlert(
-                    alert: mkAlert(
-                        title: "Cannot forward message",
-                        message: "Selected chat preferences prohibit this message."
-                    ),
-                    id: "forward prohibited by preferences"
-                )
-            } else {
-                dismiss()
-                if chat.id == fromChatInfo.id {
-                    composeState = ComposeState(
-                        message: composeState.message,
-                        preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
-                        contextItem: .forwardingItems(chatItems: chatItems, fromChatInfo: fromChatInfo)
-                    )
-                } else {
-                    composeState = ComposeState.init(forwardingItems: chatItems, fromChatInfo: fromChatInfo)
-                    ItemsModel.shared.loadOpenChat(chat.id)
-                }
-            }
-        } label: {
-            HStack {
-                ChatInfoImage(chat: chat, size: 30)
-                    .padding(.trailing, 2)
-                Text(chat.chatInfo.chatViewName)
-                    .foregroundColor(prohibited ? theme.colors.secondary : theme.colors.onBackground)
-                    .lineLimit(1)
-                if chat.chatInfo.incognito {
-                    Spacer()
-                    Image(systemName: "theatermasks")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: 22, height: 22)
-                        .foregroundColor(theme.colors.secondary)
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-        }
-    }
-}
-
-#Preview {
-    ChatItemForwardingView(
-        chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")],
-        fromChatInfo: .direct(contact: Contact.sampleData),
-        composeState: Binding.constant(ComposeState(message: "hello"))
-    ).environmentObject(CurrentColors.toAppTheme())
-}
-

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

@@ -11,20 +11,16 @@ import SimpleXChat
 
 struct ChatItemInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @Environment(\.dismiss) var dismiss
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     var ci: ChatItem
     @Binding var chatItemInfo: ChatItemInfo?
     @State private var selection: CIInfoTab = .history
     @State private var alert: CIInfoViewAlert? = nil
-    @State private var messageStatusLimited: Bool = true
-    @State private var fileStatusLimited: Bool = true
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
     enum CIInfoTab {
         case history
         case quote
-        case forwarded
         case delivery
     }
 
@@ -72,20 +68,9 @@ struct ChatItemInfoView: View {
         if ci.quotedItem != nil {
             numTabs += 1
         }
-        if chatItemInfo?.forwardedFromChatItem != nil {
-            numTabs += 1
-        }
         return numTabs
     }
 
-    private var local: Bool {
-        switch ci.chatDir {
-        case .localSnd: true
-        case .localRcv: true
-        default: false
-        }
-    }
-
     @ViewBuilder private func itemInfoView() -> some View {
         if numTabs > 1 {
             TabView(selection: $selection) {
@@ -101,22 +86,12 @@ struct ChatItemInfoView: View {
                         Label("History", systemImage: "clock")
                     }
                     .tag(CIInfoTab.history)
-                    .modifier(ThemedBackground())
                 if let qi = ci.quotedItem {
                     quoteTab(qi)
                         .tabItem {
                             Label("In reply to", systemImage: "arrowshape.turn.up.left")
                         }
                         .tag(CIInfoTab.quote)
-                        .modifier(ThemedBackground())
-                }
-                if let forwardedFromItem = chatItemInfo?.forwardedFromChatItem {
-                    forwardedFromTab(forwardedFromItem)
-                        .tabItem {
-                            Label(local ? "Saved" : "Forwarded", systemImage: "arrowshape.turn.up.forward")
-                        }
-                        .tag(CIInfoTab.forwarded)
-                        .modifier(ThemedBackground())
                 }
             }
             .onAppear {
@@ -126,7 +101,6 @@ struct ChatItemInfoView: View {
             }
         } else {
             historyTab()
-            .modifier(ThemedBackground())
         }
     }
 
@@ -163,35 +137,6 @@ struct ChatItemInfoView: View {
             if developerTools {
                 infoRow("Database ID", "\(meta.itemId)")
                 infoRow("Record updated at", localTimestamp(meta.updatedAt))
-                let msv = infoRow("Message status", ci.meta.itemStatus.id)
-                Group {
-                    if messageStatusLimited {
-                        msv.lineLimit(1)
-                    } else {
-                        msv
-                    }
-                }
-                .onTapGesture {
-                    withAnimation {
-                        messageStatusLimited.toggle()
-                    }
-                }
-
-                if let file = ci.file {
-                    let fsv = infoRow("File status", file.fileStatus.id)
-                    Group {
-                        if fileStatusLimited {
-                            fsv.lineLimit(1)
-                        } else {
-                            fsv
-                        }
-                    }
-                    .onTapGesture {
-                        withAnimation {
-                            fileStatusLimited.toggle()
-                        }
-                    }
-                }
             }
         }
     }
@@ -216,7 +161,7 @@ struct ChatItemInfoView: View {
                     }
                     else {
                         Text("No history")
-                            .foregroundColor(theme.colors.secondary)
+                            .foregroundColor(.secondary)
                             .frame(maxWidth: .infinity)
                     }
                 }
@@ -231,8 +176,8 @@ struct ChatItemInfoView: View {
             textBubble(itemVersion.msgContent.text, itemVersion.formattedText, nil)
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
-                .background(chatItemFrameColor(ci, theme))
-                .modifier(ChatItemClipped())
+                .background(chatItemFrameColor(ci, colorScheme))
+                .cornerRadius(18)
                 .contextMenu {
                     if itemVersion.msgContent.text != "" {
                         Button {
@@ -262,19 +207,18 @@ struct ChatItemInfoView: View {
         } else {
             Text("no text")
                 .italic()
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
         }
     }
 
     private struct TextBubble: View {
-        @EnvironmentObject var theme: AppTheme
         var text: String
         var formattedText: [FormattedText]?
         var sender: String? = nil
         @State private var showSecrets = false
 
         var body: some View {
-            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets, secondaryColor: theme.colors.secondary))
+            toggleSecrets(formattedText, $showSecrets, messageText(text, formattedText, sender, showSecrets: showSecrets))
         }
     }
 
@@ -301,8 +245,8 @@ struct ChatItemInfoView: View {
             textBubble(qi.text, qi.formattedText, qi.getSender(nil))
                 .padding(.horizontal, 12)
                 .padding(.vertical, 6)
-                .background(quotedMsgFrameColor(qi, theme))
-                .modifier(ChatItemClipped())
+                .background(quotedMsgFrameColor(qi, colorScheme))
+                .cornerRadius(18)
                 .contextMenu {
                     if qi.text != "" {
                         Button {
@@ -325,78 +269,10 @@ struct ChatItemInfoView: View {
         .frame(maxWidth: maxWidth, alignment: .leading)
     }
 
-    func quotedMsgFrameColor(_ qi: CIQuote, _ theme: AppTheme) -> Color {
+    func quotedMsgFrameColor(_ qi: CIQuote, _ colorScheme: ColorScheme) -> Color {
         (qi.chatDir?.sent ?? false)
-        ? theme.appColors.sentMessage
-        : theme.appColors.receivedMessage
-    }
-
-    @ViewBuilder private func forwardedFromTab(_ forwardedFromItem: AChatItem) -> some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 16) {
-                details()
-                Divider().padding(.vertical)
-                Text(local ? "Saved from" : "Forwarded from")
-                    .font(.title2)
-                    .padding(.bottom, 4)
-                forwardedFromView(forwardedFromItem)
-            }
-            .padding()
-        }
-        .frame(maxHeight: .infinity, alignment: .top)
-    }
-
-    private func forwardedFromView(_ forwardedFromItem: AChatItem) -> some View {
-        VStack(alignment: .leading, spacing: 8) {
-            Button {
-                Task {
-                    await MainActor.run {
-                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
-                        dismiss()
-                    }
-                }
-            } label: {
-                forwardedFromSender(forwardedFromItem)
-            }
-
-            if !local {
-                Divider().padding(.top, 32)
-                Text("Recipient(s) can't see who this message is from.")
-                    .font(.caption)
-                    .foregroundColor(theme.colors.secondary)
-            }
-        }
-    }
-
-    @ViewBuilder private func forwardedFromSender(_ forwardedFromItem: AChatItem) -> some View {
-        HStack {
-            ChatInfoImage(chat: Chat(chatInfo: forwardedFromItem.chatInfo), size: 48)
-                .padding(.trailing, 6)
-
-            if forwardedFromItem.chatItem.chatDir.sent {
-                VStack(alignment: .leading) {
-                    Text("you")
-                        .italic()
-                        .foregroundColor(theme.colors.onBackground)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(theme.colors.secondary)
-                        .lineLimit(1)
-                }
-            } else if case let .groupRcv(groupMember) = forwardedFromItem.chatItem.chatDir {
-                VStack(alignment: .leading) {
-                    Text(groupMember.chatViewName)
-                        .foregroundColor(theme.colors.onBackground)
-                        .lineLimit(1)
-                    Text(forwardedFromItem.chatInfo.chatViewName)
-                        .foregroundColor(theme.colors.secondary)
-                        .lineLimit(1)
-                }
-            } else {
-                Text(forwardedFromItem.chatInfo.chatViewName)
-                    .foregroundColor(theme.colors.onBackground)
-                    .lineLimit(1)
-            }
-        }
+        ? (colorScheme == .light ? sentColorLight : sentColorDark)
+        : Color(uiColor: .tertiarySystemGroupedBackground)
     }
 
     @ViewBuilder private func deliveryTab(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
@@ -415,43 +291,56 @@ struct ChatItemInfoView: View {
     }
 
     @ViewBuilder private func memberDeliveryStatusesView(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> some View {
-        LazyVStack(alignment: .leading, spacing: 12) {
+        VStack(alignment: .leading, spacing: 12) {
             let mss = membersStatuses(memberDeliveryStatuses)
             if !mss.isEmpty {
                 ForEach(mss, id: \.0.groupMemberId) { memberStatus in
-                    memberDeliveryStatusView(memberStatus.0, memberStatus.1, memberStatus.2)
+                    memberDeliveryStatusView(memberStatus.0, memberStatus.1)
                 }
             } else {
                 Text("No delivery information")
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
             }
         }
     }
 
-    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, GroupSndStatus, Bool?)] {
+    private func membersStatuses(_ memberDeliveryStatuses: [MemberDeliveryStatus]) -> [(GroupMember, CIStatus)] {
         memberDeliveryStatuses.compactMap({ mds in
             if let mem = chatModel.getGroupMember(mds.groupMemberId) {
-                return (mem.wrapped, mds.memberDeliveryStatus, mds.sentViaProxy)
+                return (mem.wrapped, mds.memberDeliveryStatus)
             } else {
                 return nil
             }
         })
     }
 
-    private func memberDeliveryStatusView(_ member: GroupMember, _ status: GroupSndStatus, _ sentViaProxy: Bool?) -> some View {
+    private func memberDeliveryStatusView(_ member: GroupMember, _ status: CIStatus) -> some View {
         HStack{
-            MemberProfileImage(member, size: 30)
+            ProfileImage(imageStr: member.image)
+                .frame(width: 30, height: 30)
                 .padding(.trailing, 2)
             Text(member.chatViewName)
                 .lineLimit(1)
             Spacer()
-            if sentViaProxy == true {
-                Image(systemName: "arrow.forward")
-                    .foregroundColor(theme.colors.secondary).opacity(0.67)
-            }
             let v = Group {
-                let (image, statusColor) = status.statusIcon(theme.colors.secondary, theme.colors.primary)
-                image.foregroundColor(statusColor)
+                if let (icon, statusColor) = status.statusIcon(Color.secondary) {
+                    switch status {
+                    case .sndRcvd:
+                        ZStack(alignment: .trailing) {
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                                .padding(.trailing, 6)
+                            Image(systemName: icon)
+                                .foregroundColor(statusColor.opacity(0.67))
+                        }
+                    default:
+                        Image(systemName: icon)
+                            .foregroundColor(statusColor)
+                    }
+                } else {
+                    Image(systemName: "ellipsis")
+                        .foregroundColor(Color.secondary)
+                }
             }
 
             if let (title, text) = status.statusInfo {
@@ -493,12 +382,8 @@ struct ChatItemInfoView: View {
         if developerTools {
             shareText += [
                 String.localizedStringWithFormat(NSLocalizedString("Database ID: %d", comment: "copied message info"), meta.itemId),
-                String.localizedStringWithFormat(NSLocalizedString("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt)),
-                String.localizedStringWithFormat(NSLocalizedString("Message status: %@", comment: "copied message info"), meta.itemStatus.id)
+                String.localizedStringWithFormat(NSLocalizedString("Record updated at: %@", comment: "copied message info"), localTimestamp(meta.updatedAt))
             ]
-            if let file = ci.file {
-                shareText += [String.localizedStringWithFormat(NSLocalizedString("File status: %@", comment: "copied message info"), file.fileStatus.id)]
-            }
         }
         if let qi = ci.quotedItem {
             shareText += ["", NSLocalizedString("## In reply to", comment: "copied message info")]

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

@@ -9,59 +9,50 @@
 import SwiftUI
 import SimpleXChat
 
-extension EnvironmentValues {
-    struct ShowTimestamp: EnvironmentKey {
-        static let defaultValue: Bool = true
-    }
-
-    struct Revealed: EnvironmentKey {
-        static let defaultValue: Bool = true
-    }
-
-    var showTimestamp: Bool {
-        get { self[ShowTimestamp.self] }
-        set { self[ShowTimestamp.self] = newValue }
-    }
-
-    var revealed: Bool {
-        get { self[Revealed.self] }
-        set { self[Revealed.self] = newValue }
-    }
-}
-
 struct ChatItemView: View {
     @ObservedObject var chat: Chat
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.showTimestamp) var showTimestamp: Bool
-    @Environment(\.revealed) var revealed: Bool
     var chatItem: ChatItem
     var maxWidth: CGFloat = .infinity
+    @State var scrollProxy: ScrollViewProxy? = nil
+    @Binding var revealed: Bool
     @Binding var allowMenu: Bool
-
+    @Binding var audioPlayer: AudioPlayer?
+    @Binding var playbackState: VoiceMessagePlaybackState
+    @Binding var playbackTime: TimeInterval?
     init(
         chat: Chat,
         chatItem: ChatItem,
         showMember: Bool = false,
         maxWidth: CGFloat = .infinity,
-        allowMenu: Binding<Bool> = .constant(false)
+        scrollProxy: ScrollViewProxy? = nil,
+        revealed: Binding<Bool>,
+        allowMenu: Binding<Bool> = .constant(false),
+        audioPlayer: Binding<AudioPlayer?> = .constant(nil),
+        playbackState: Binding<VoiceMessagePlaybackState> = .constant(.noPlayback),
+        playbackTime: Binding<TimeInterval?> = .constant(nil)
     ) {
         self.chat = chat
         self.chatItem = chatItem
         self.maxWidth = maxWidth
+        _scrollProxy = .init(initialValue: scrollProxy)
+        _revealed = revealed
         _allowMenu = allowMenu
+        _audioPlayer = audioPlayer
+        _playbackState = playbackState
+        _playbackTime = playbackTime
     }
 
     var body: some View {
         let ci = chatItem
         if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem)
-        } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
+            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
+        } else if ci.quotedItem == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                 EmojiItemView(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)
+                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -71,40 +62,15 @@ struct ChatItemView: View {
     }
 
     private func framedItemView() -> some View {
-        let preview = chatItem.content.msgContent
-            .flatMap {
-                switch $0 {
-                case let .image(_, image): image
-                case let .video(_, image, _): image
-                default: nil
-                }
-            }
-            .flatMap { imageFromBase64($0) }
-        let adjustedMaxWidth = {
-            if let preview, preview.size.width <= preview.size.height {
-                maxWidth * 0.75
-            } else {
-                maxWidth
-            }
-        }()
-        return FramedItemView(
-            chat: chat,
-            chatItem: chatItem,
-            preview: preview,
-            maxWidth: maxWidth,
-            imgWidth: adjustedMaxWidth,
-            videoWidth: adjustedMaxWidth,
-            allowMenu: $allowMenu
-        )
+        FramedItemView(chat: chat, chatItem: chatItem, revealed: $revealed, maxWidth: maxWidth, scrollProxy: scrollProxy, allowMenu: $allowMenu, audioPlayer: $audioPlayer, playbackState: $playbackState, playbackTime: $playbackTime)
     }
 }
 
 struct ChatItemContentView<Content: View>: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.revealed) var revealed: Bool
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
+    @Binding var revealed: Bool
     var msgContentView: () -> Content
     @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
 
@@ -131,14 +97,14 @@ struct ChatItemContentView<Content: View>: View {
         case .sndGroupEvent: eventItemView()
         case .rcvConnEvent: eventItemView()
         case .sndConnEvent: eventItemView()
-        case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor(theme.colors.secondary))
-        case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor(theme.colors.secondary))
+        case let .rcvChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
+        case let .sndChatFeature(feature, enabled, _): chatFeatureView(feature, enabled.iconColor)
         case let .rcvChatPreference(feature, allowed, param):
             CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, 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))
+            CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: .secondary)
+        case let .rcvGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
+        case let .sndGroupFeature(feature, preference, _): chatFeatureView(feature, preference.enable.iconColor)
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
         case let .rcvGroupFeatureRejected(feature): chatFeatureView(feature, .red)
         case .sndModerated: deletedItemView()
@@ -161,29 +127,29 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func groupInvitationItemView(_ groupInvitation: CIGroupInvitation, _ memberRole: GroupMemberRole) -> some View {
-        CIGroupInvitationView(chat: chat, chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
+        CIGroupInvitationView(chatItem: chatItem, groupInvitation: groupInvitation, memberRole: memberRole, chatIncognito: chat.chatInfo.incognito)
     }
 
     private func eventItemView() -> some View {
-        CIEventView(eventText: eventItemViewText(theme.colors.secondary))
+        return CIEventView(eventText: eventItemViewText())
     }
 
-    private func eventItemViewText(_ secondaryColor: Color) -> Text {
+    private func eventItemViewText() -> Text {
         if !revealed, let t = mergedGroupEventText {
-            return chatEventText(t + Text(" ") + chatItem.timestampText, secondaryColor)
+            return chatEventText(t + Text(" ") + chatItem.timestampText)
         } else if let member = chatItem.memberDisplayName {
             return Text(member + " ")
                     .font(.caption)
-                    .foregroundColor(secondaryColor)
+                    .foregroundColor(.secondary)
                     .fontWeight(.light)
-                + chatEventText(chatItem, secondaryColor)
+                + chatEventText(chatItem)
         } else {
-            return chatEventText(chatItem, secondaryColor)
+            return chatEventText(chatItem)
         }
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
     }
 
     private var mergedGroupEventText: Text? {
@@ -213,7 +179,7 @@ struct ChatItemContentView<Content: View>: View {
         info.pqEnabled
         ? Text("Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.")
             .font(.caption)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
             .fontWeight(.light)
         : e2eeInfoNoPQText()
     }
@@ -221,40 +187,39 @@ struct ChatItemContentView<Content: View>: View {
     private func e2eeInfoNoPQText() -> Text {
         Text("Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.")
             .font(.caption)
-            .foregroundColor(theme.colors.secondary)
+            .foregroundColor(.secondary)
             .fontWeight(.light)
     }
 }
 
-func chatEventText(_ text: Text, _ secondaryColor: Color) -> Text {
+func chatEventText(_ text: Text) -> Text {
     text
         .font(.caption)
-        .foregroundColor(secondaryColor)
+        .foregroundColor(.secondary)
         .fontWeight(.light)
 }
 
-func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text, _ secondaryColor: Color) -> Text {
-    chatEventText(Text(eventText) + Text(" ") + ts, secondaryColor)
+func chatEventText(_ eventText: LocalizedStringKey, _ ts: Text) -> Text {
+    chatEventText(Text(eventText) + Text(" ") + ts)
 }
 
-func chatEventText(_ ci: ChatItem, _ secondaryColor: Color) -> Text {
-    chatEventText("\(ci.content.text)", ci.timestampText, secondaryColor)
+func chatEventText(_ ci: ChatItem) -> Text {
+    chatEventText("\(ci.content.text)", ci.timestampText)
 }
 
 struct ChatItemView_Previews: PreviewProvider {
     static var previews: some View {
         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, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
         }
-        .environment(\.revealed, false)
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)
     }
@@ -272,7 +237,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                     content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: 1, toMsgId: 2)),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
             )
             ChatItemView(
                 chat: Chat.sampleData,
@@ -282,7 +248,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                     content: .rcvDecryptionError(msgDecryptError: .ratchetHeader, msgCount: 2),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
             )
             ChatItemView(
                 chat: Chat.sampleData,
@@ -292,7 +259,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                     content: .rcvGroupInvitation(groupInvitation: CIGroupInvitation.getSample(status: .pending), memberRole: .admin),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
             )
             ChatItemView(
                 chat: Chat.sampleData,
@@ -302,7 +270,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                     content: .rcvGroupEvent(rcvGroupEvent: .memberAdded(groupMemberId: 1, profile: Profile.sampleData)),
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
             )
             ChatItemView(
                 chat: Chat.sampleData,
@@ -312,10 +281,10 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                     content: ciFeatureContent,
                     quotedItem: nil,
                     file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
             )
         }
-        .environment(\.revealed, true)
         .previewLayout(.fixed(width: 360, height: 70))
         .environmentObject(Chat.sampleData)
     }

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

@@ -9,7 +9,7 @@
 import SwiftUI
 
 struct ComposeFileView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     let fileName: String
     let cancelFile: (() -> Void)
     let cancelEnabled: Bool
@@ -32,8 +32,9 @@ struct ComposeFileView: View {
         }
         .padding(.vertical, 1)
         .padding(.trailing, 12)
-        .frame(height: 54)
-        .background(theme.appColors.sentMessage)
+        .frame(height: 50)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
         .frame(maxWidth: .infinity)
+        .padding(.top, 8)
     }
 }

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

@@ -10,7 +10,7 @@ import SwiftUI
 import SimpleXChat
 
 struct ComposeImageView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     let images: [String]
     let cancelImage: (() -> Void)
     let cancelEnabled: Bool
@@ -18,7 +18,10 @@ struct ComposeImageView: View {
     var body: some View {
         HStack(alignment: .center, spacing: 8) {
             let imgs: [UIImage] = images.compactMap { image in
-                imageFromBase64(image)
+                if let data = Data(base64Encoded: dropImagePrefix(image)) {
+                    return UIImage(data: data)
+                }
+                return nil
             }
             if imgs.count == 0 {
                 ProgressView()
@@ -45,9 +48,9 @@ struct ComposeImageView: View {
         }
         .padding(.vertical, 1)
         .padding(.trailing, 12)
-        .background(theme.appColors.sentMessage)
-        .frame(minHeight: 54)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
         .frame(maxWidth: .infinity)
+        .padding(.top, 8)
     }
 }
 

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

@@ -10,8 +10,37 @@ import SwiftUI
 import LinkPresentation
 import SimpleXChat
 
+func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
+    logger.debug("getLinkMetadata: fetching URL preview")
+    LPMetadataProvider().startFetchingMetadata(for: url){ metadata, error in
+        if let e = error {
+            logger.error("Error retrieving link metadata: \(e.localizedDescription)")
+        }
+        if let metadata = metadata,
+           let imageProvider = metadata.imageProvider,
+           imageProvider.canLoadObject(ofClass: UIImage.self) {
+            imageProvider.loadObject(ofClass: UIImage.self){ object, error in
+                var linkPreview: LinkPreview? = nil
+                if let error = error {
+                    logger.error("Couldn't load image preview from link metadata with error: \(error.localizedDescription)")
+                } else {
+                    if let image = object as? UIImage,
+                       let resized = resizeImageToStrSize(image, maxDataSize: 14000),
+                       let title = metadata.title,
+                       let uri = metadata.originalURL {
+                        linkPreview = LinkPreview(uri: uri, title: title, image: resized)
+                    }
+                }
+                cb(linkPreview)
+            }
+        } else {
+            cb(nil)
+        }
+    }
+}
+
 struct ComposeLinkView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     let linkPreview: LinkPreview?
     var cancelPreview: (() -> Void)? = nil
     let cancelEnabled: Bool
@@ -33,14 +62,15 @@ struct ComposeLinkView: View {
         }
         .padding(.vertical, 1)
         .padding(.trailing, 12)
-        .background(theme.appColors.sentMessage)
-        .frame(minHeight: 54)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
         .frame(maxWidth: .infinity)
+        .padding(.top, 8)
     }
 
     private func linkPreviewView(_ linkPreview: LinkPreview) -> some View {
         HStack(alignment: .center, spacing: 8) {
-            if let uiImage = imageFromBase64(linkPreview.image) {
+            if let data = Data(base64Encoded: dropImagePrefix(linkPreview.image)),
+               let uiImage = UIImage(data: data) {
                 Image(uiImage: uiImage)
                     .resizable()
                     .aspectRatio(contentMode: .fit)
@@ -52,10 +82,10 @@ struct ComposeLinkView: View {
                 Text(linkPreview.uri.absoluteString)
                     .font(.caption)
                     .lineLimit(1)
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
             }
             .padding(.vertical, 5)
-            .frame(maxWidth: .infinity, minHeight: 60)
+            .frame(maxWidth: .infinity, minHeight: 60, maxHeight: 60)
         }
     }
 }

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

@@ -23,7 +23,6 @@ enum ComposeContextItem {
     case noContextItem
     case quotedItem(chatItem: ChatItem)
     case editingItem(chatItem: ChatItem)
-    case forwardingItems(chatItems: [ChatItem], fromChatInfo: ChatInfo)
 }
 
 enum VoiceMessageRecordingState {
@@ -73,13 +72,6 @@ struct ComposeState {
         }
     }
 
-    init(forwardingItems: [ChatItem], fromChatInfo: ChatInfo) {
-        self.message = ""
-        self.preview = .noPreview
-        self.contextItem = .forwardingItems(chatItems: forwardingItems, fromChatInfo: fromChatInfo)
-        self.voiceMessageRecordingState = .noRecording
-    }
-
     func copy(
         message: String? = nil,
         liveMessage: LiveMessage? = nil,
@@ -110,19 +102,12 @@ struct ComposeState {
         }
     }
 
-    var forwarding: Bool {
-        switch contextItem {
-        case .forwardingItems: return true
-        default: return false
-        }
-    }
-
     var sendEnabled: Bool {
         switch preview {
         case let .mediaPreviews(media): return !media.isEmpty
         case .voicePreview: return voiceMessageRecordingState == .finished
         case .filePreview: return true
-        default: return !message.isEmpty || forwarding || liveMessage != nil
+        default: return !message.isEmpty || liveMessage != nil
         }
     }
 
@@ -167,15 +152,8 @@ struct ComposeState {
         }
     }
 
-    var manyMediaPreviews: Bool {
-        switch preview {
-        case let .mediaPreviews(mediaPreviews): return mediaPreviews.count > 1
-        default: return false
-        }
-    }
-
     var attachmentDisabled: Bool {
-        if editing || forwarding || liveMessage != nil || inProgress { return true }
+        if editing || liveMessage != nil || inProgress { return true }
         switch preview {
         case .noPreview: return false
         case .linkPreview: return false
@@ -183,16 +161,6 @@ struct ComposeState {
         }
     }
 
-    var attachmentPreview: Bool {
-        switch preview {
-        case .noPreview: false
-        case .linkPreview: false
-        case let .mediaPreviews(mediaPreviews): !mediaPreviews.isEmpty
-        case .voicePreview: false
-        case .filePreview: true
-        }
-    }
-
     var empty: Bool {
         message == "" && noPreview
     }
@@ -261,13 +229,11 @@ enum UploadContent: Equatable {
 
 struct ComposeView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @ObservedObject var chat: Chat
     @Binding var composeState: ComposeState
     @Binding var keyboardVisible: Bool
 
     @State var linkUrl: URL? = nil
-    @State var hasSimplexLink: Bool = false
     @State var prevLinkUrl: URL? = nil
     @State var pendingLinkUrl: URL? = nil
     @State var cancelledLinks: Set<String> = []
@@ -287,29 +253,12 @@ struct ComposeView: View {
     // this is a workaround to fire an explicit event in certain cases
     @State private var stopPlayback: Bool = false
 
-    @UserDefault(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @UserDefault(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
 
     var body: some View {
         VStack(spacing: 0) {
-            Divider()
             if chat.chatInfo.contact?.nextSendGrpInv ?? false {
                 ContextInvitingContactMemberView()
-                Divider()
-            }
-            // preference checks should match checks in forwarding list
-            let simplexLinkProhibited = hasSimplexLink && !chat.groupFeatureEnabled(.simplexLinks)
-            let fileProhibited = composeState.attachmentPreview && !chat.groupFeatureEnabled(.files)
-            let voiceProhibited = composeState.voicePreview && !chat.chatInfo.featureEnabled(.voice)
-            if simplexLinkProhibited {
-                msgNotAllowedView("SimpleX links not allowed", icon: "link")
-                Divider()
-            } else if fileProhibited {
-                msgNotAllowedView("Files and media not allowed", icon: "doc")
-                Divider()
-            } else if voiceProhibited {
-                msgNotAllowedView("Voice messages not allowed", icon: "mic")
-                Divider()
             }
             contextItemView()
             switch (composeState.editing, composeState.preview) {
@@ -328,9 +277,8 @@ struct ComposeView: View {
                 .frame(width: 25, height: 25)
                 .padding(.bottom, 12)
                 .padding(.leading, 12)
-                .tint(theme.colors.primary)
                 if case let .group(g) = chat.chatInfo,
-                   !g.fullGroupPreferences.files.on(for: g.membership) {
+                   !g.fullGroupPreferences.files.on {
                     b.disabled(true).onTapGesture {
                         AlertManager.shared.showAlertMsg(
                             title: "Files and media prohibited!",
@@ -355,7 +303,6 @@ struct ComposeView: View {
                         },
                         nextSendGrpInv: chat.chatInfo.contact?.nextSendGrpInv ?? false,
                         voiceMessageAllowed: chat.chatInfo.featureEnabled(.voice),
-                        disableSendButton: simplexLinkProhibited || fileProhibited || voiceProhibited,
                         showEnableVoiceMessagesAlert: chat.chatInfo.showEnableVoiceMessagesAlert,
                         startVoiceMessageRecording: {
                             Task {
@@ -369,15 +316,16 @@ struct ComposeView: View {
                         keyboardVisible: $keyboardVisible,
                         sendButtonColor: chat.chatInfo.incognito
                             ? .indigo.opacity(colorScheme == .dark ? 1 : 0.7)
-                            : theme.colors.primary
+                            : .accentColor
                     )
                     .padding(.trailing, 12)
+                    .background(.background)
                     .disabled(!chat.userCanSend)
 
                     if chat.userIsObserver {
                         Text("you are observer")
                             .italic()
-                            .foregroundColor(theme.colors.secondary)
+                            .foregroundColor(.secondary)
                             .padding(.horizontal, 12)
                             .onTapGesture {
                                 AlertManager.shared.showAlertMsg(
@@ -389,23 +337,13 @@ struct ComposeView: View {
                 }
             }
         }
-        .background {
-            Color.clear
-                .overlay(ToolbarMaterial.material(toolbarMaterial))
-                .ignoresSafeArea(.all, edges: .bottom)
-        }
-        .onChange(of: composeState.message) { msg in
+        .onChange(of: composeState.message) { _ in
             if composeState.linkPreviewAllowed {
-                if msg.count > 0 {
-                    showLinkPreview(msg)
+                if composeState.message.count > 0 {
+                    showLinkPreview(composeState.message)
                 } else {
                     resetLinkPreview()
-                    hasSimplexLink = false
                 }
-            } else if msg.count > 0 && !chat.groupFeatureEnabled(.simplexLinks) {
-                (_, hasSimplexLink) = parseMessage(msg)
-            } else {
-                hasSimplexLink = false
             }
         }
         .onChange(of: chat.userCanSend) { canSend in
@@ -459,7 +397,7 @@ struct ComposeView: View {
             Task {
                 var media: [(String, UploadContent)] = []
                 for content in selected {
-                    if let img = await resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
+                    if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
                         media.append((img, content))
                         await MainActor.run {
                             composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: media))
@@ -551,7 +489,7 @@ struct ComposeView: View {
     }
 
     private func addMediaContent(_ content: UploadContent) async {
-        if let img = await resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
+        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
             var newMedia: [(String, UploadContent?)] = []
             if case var .mediaPreviews(media) = composeState.preview {
                 media.append((img, content))
@@ -642,7 +580,6 @@ struct ComposeView: View {
                 cancelPreview: cancelLinkPreview,
                 cancelEnabled: !composeState.inProgress
             )
-            Divider()
         case let .mediaPreviews(mediaPreviews: media):
             ComposeImageView(
                 images: media.map { (img, _) in img },
@@ -651,7 +588,6 @@ struct ComposeView: View {
                     chosenMedia = []
                 },
                 cancelEnabled: !composeState.editing && !composeState.inProgress)
-            Divider()
         case let .voicePreview(recordingFileName, _):
             ComposeVoiceView(
                 recordingFileName: recordingFileName,
@@ -664,7 +600,6 @@ struct ComposeView: View {
                 cancelEnabled: !composeState.editing && !composeState.inProgress,
                 stopPlayback: $stopPlayback
             )
-            Divider()
         case let .filePreview(fileName, _):
             ComposeFileView(
                 fileName: fileName,
@@ -672,21 +607,9 @@ struct ComposeView: View {
                     composeState = composeState.copy(preview: .noPreview)
                 },
                 cancelEnabled: !composeState.editing && !composeState.inProgress)
-            Divider()
         }
     }
 
-    private func msgNotAllowedView(_ reason: LocalizedStringKey, icon: String) -> some View {
-        HStack {
-            Image(systemName: icon).foregroundColor(theme.colors.secondary)
-            Text(reason).italic()
-        }
-        .padding(12)
-        .frame(minHeight: 54)
-        .frame(maxWidth: .infinity, alignment: .leading)
-        .background(.thinMaterial)
-    }
-
     @ViewBuilder private func contextItemView() -> some View {
         switch composeState.contextItem {
         case .noContextItem:
@@ -694,27 +617,17 @@ struct ComposeView: View {
         case let .quotedItem(chatItem: quotedItem):
             ContextItemView(
                 chat: chat,
-                contextItems: [quotedItem],
+                contextItem: quotedItem,
                 contextIcon: "arrowshape.turn.up.left",
                 cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
             )
-            Divider()
         case let .editingItem(chatItem: editingItem):
             ContextItemView(
                 chat: chat,
-                contextItems: [editingItem],
+                contextItem: editingItem,
                 contextIcon: "pencil",
                 cancelContextItem: { clearState() }
             )
-            Divider()
-        case let .forwardingItems(chatItems, _):
-            ContextItemView(
-                chat: chat,
-                contextItems: chatItems,
-                contextIcon: "arrowshape.turn.up.forward",
-                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
-            )
-            Divider()
         }
     }
 
@@ -736,12 +649,6 @@ struct ComposeView: View {
         }
         if chat.chatInfo.contact?.nextSendGrpInv ?? false {
             await sendMemberContactInvitation()
-        } else if case let .forwardingItems(chatItems, fromChatInfo) = composeState.contextItem {
-            // 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)
-            }
         } else if case let .editingItem(ci) = composeState.contextItem {
             sent = await updateMessage(ci, live: live)
         } else if let liveMessage = liveMessage, liveMessage.sentMsg != nil {
@@ -757,28 +664,26 @@ struct ComposeView: View {
                 sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
             case .linkPreview:
                 sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl)
-            case let .mediaPreviews(media):
+            case let .mediaPreviews(mediaPreviews: media):
                 let last = media.count - 1
-                var msgs: [ComposedMessage] = []
                 if last >= 0 {
                     for i in 0..<last {
-                        if i > 0 {
-                            // Sleep to allow `progressByTimeout` update be rendered
-                            try? await Task.sleep(nanoseconds: 100_000000)
-                        }
-                        if let (fileSource, msgContent) = mediaContent(media[i], text: "") {
-                            msgs.append(ComposedMessage(fileSource: fileSource, msgContent: msgContent))
+                        if case (_, .video(_, _, _)) = media[i] {
+                            sent = await sendVideo(media[i], ttl: ttl)
+                        } else {
+                            sent = await sendImage(media[i], ttl: ttl)
                         }
+                        _ = try? await Task.sleep(nanoseconds: 100_000000)
                     }
-                    if let (fileSource, msgContent) = mediaContent(media[last], text: msgText) {
-                        msgs.append(ComposedMessage(fileSource: fileSource, quotedItemId: quoted, msgContent: msgContent))
+                    if case (_, .video(_, _, _)) = media[last] {
+                        sent = await sendVideo(media[last], text: msgText, quoted: quoted, live: live, ttl: ttl)
+                    } else {
+                        sent = await sendImage(media[last], text: msgText, quoted: quoted, live: live, ttl: ttl)
                     }
                 }
-                if msgs.isEmpty {
-                    msgs = [ComposedMessage(quotedItemId: quoted, msgContent: .text(msgText))]
+                if sent == nil {
+                    sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
                 }
-                sent = await send(msgs, live: live, ttl: ttl).last
-
             case let .voicePreview(recordingFileName, duration):
                 stopPlayback.toggle()
                 let file = voiceCryptoFile(recordingFileName)
@@ -789,31 +694,9 @@ struct ComposeView: View {
                 }
             }
         }
-        await MainActor.run {
-            let wasForwarding = composeState.forwarding
-            clearState(live: live)
-            if wasForwarding,
-               chatModel.draftChatId == chat.chatInfo.id,
-               let draft = chatModel.draft {
-                composeState = draft
-            }
-        }
+        await MainActor.run { clearState(live: live) }
         return sent
 
-        func mediaContent(_ media: (String, UploadContent?), text: String) -> (CryptoFile?, MsgContent)? {
-            let (previewImage, uploadContent) = media
-            return switch uploadContent {
-            case let .simpleImage(image):
-                (saveImage(image), .image(text: text, image: previewImage))
-            case let .animatedImage(image):
-                (saveAnimImage(image), .image(text: text, image: previewImage))
-            case let .video(_, url, duration):
-                (moveTempFileFromURL(url), .video(text: text, image: previewImage, duration: duration))
-            case .none:
-                nil
-            }
-        }
-        
         func sending() async {
             await MainActor.run { composeState.inProgress = true }
         }
@@ -877,6 +760,22 @@ struct ComposeView: View {
             }
         }
 
+        func sendImage(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+            let (image, data) = imageData
+            if let data = data, let savedFile = saveAnyImage(data) {
+                return await send(.image(text: text, image: image), quoted: quoted, file: savedFile, live: live, ttl: ttl)
+            }
+            return nil
+        }
+
+        func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+            let (image, data) = imageData
+            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
+                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
+            }
+            return nil
+        }
+
         func voiceCryptoFile(_ fileName: String) -> CryptoFile? {
             if !privacyEncryptLocalFilesGroupDefault.get() {
                 return CryptoFile.plain(fileName)
@@ -893,72 +792,33 @@ struct ComposeView: View {
         }
 
         func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            await send(
-                [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc)],
-                live: live,
-                ttl: ttl
-            ).first
-        }
-
-        func send(_ msgs: [ComposedMessage], live: Bool, ttl: Int?) async -> [ChatItem] {
-            if let chatItems = chat.chatInfo.chatType == .local
-                ? await apiCreateChatItems(noteFolderId: chat.chatInfo.apiId, composedMessages: msgs)
-                : await apiSendMessages(
+            if let chatItem = chat.chatInfo.chatType == .local
+                ? await apiCreateChatItem(noteFolderId: chat.chatInfo.apiId, file: file, msg: mc)
+                : await apiSendMessage(
                     type: chat.chatInfo.chatType,
                     id: chat.chatInfo.apiId,
+                    file: file,
+                    quotedItemId: quoted,
+                    msg: mc,
                     live: live,
-                    ttl: ttl,
-                    composedMessages: msgs
+                    ttl: ttl
                 ) {
                 await MainActor.run {
                     chatModel.removeLiveDummy(animated: false)
-                    for chatItem in chatItems {
-                        chatModel.addChatItem(chat.chatInfo, chatItem)
-                    }
+                    chatModel.addChatItem(chat.chatInfo, chatItem)
                 }
-                return chatItems
+                return chatItem
             }
-            for msg in msgs {
-                if let file = msg.fileSource {
-                    removeFile(file.filePath)
-                }
-            }
-            return []
-        }
-
-        func forwardItems(_ forwardedItems: [ChatItem], _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> [ChatItem] {
-            if let chatItems = await apiForwardChatItems(
-                toChatType: chat.chatInfo.chatType,
-                toChatId: chat.chatInfo.apiId,
-                fromChatType: fromChatInfo.chatType,
-                fromChatId: fromChatInfo.apiId,
-                itemIds: forwardedItems.map { $0.id },
-                ttl: ttl
-            ) {
-                await MainActor.run {
-                    for chatItem in chatItems {
-                        chatModel.addChatItem(chat.chatInfo, chatItem)
-                    }
-                    if forwardedItems.count != chatItems.count {
-                        showAlert(
-                            String.localizedStringWithFormat(
-                                NSLocalizedString("%d messages not forwarded", comment: "alert title"),
-                                forwardedItems.count - chatItems.count
-                            ),
-                            message: NSLocalizedString("Messages were deleted after you selected them.", comment: "alert message")
-                        )
-                    }
-                }
-                return chatItems
-            } else {
-                return []
+            if let file = file {
+                removeFile(file.filePath)
             }
+            return nil
         }
 
         func checkLinkPreview() -> MsgContent {
             switch (composeState.preview) {
             case let .linkPreview(linkPreview: linkPreview):
-                if let url = parseMessage(msgText).url,
+                if let url = parseMessage(msgText),
                    let linkPreview = linkPreview,
                    url == linkPreview.uri {
                     return .link(text: msgText, preview: linkPreview)
@@ -969,6 +829,14 @@ struct ComposeView: View {
                 return .text(msgText)
             }
         }
+
+        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
+            switch img {
+            case let .simpleImage(image): return saveImage(image)
+            case let .animatedImage(image): return saveAnimImage(image)
+            default: return nil
+            }
+        }
     }
 
     private func startVoiceMessageRecording() async {
@@ -1079,7 +947,7 @@ struct ComposeView: View {
 
     private func showLinkPreview(_ s: String) {
         prevLinkUrl = linkUrl
-        (linkUrl, hasSimplexLink) = parseMessage(s)
+        linkUrl = parseMessage(s)
         if let url = linkUrl {
             if url != composeState.linkPreview?.uri && url != pendingLinkUrl {
                 pendingLinkUrl = url
@@ -1096,17 +964,13 @@ struct ComposeView: View {
         }
     }
 
-    private func parseMessage(_ msg: String) -> (url: URL?, hasSimplexLink: Bool) {
-        guard let parsedMsg = parseSimpleXMarkdown(msg) else { return (nil, false) }
-        let url: URL? = if let uri = parsedMsg.first(where: { ft in
+    private func parseMessage(_ msg: String) -> URL? {
+        let parsedMsg = parseSimpleXMarkdown(msg)
+        let uri = parsedMsg?.first(where: { ft in
             ft.format == .uri && !cancelledLinks.contains(ft.text) && !isSimplexLink(ft.text)
-        }) {
-            URL(string: uri.text)
-        } else {
-            nil
-        }
-        let simplexLink = parsedMsgHasSimplexLink(parsedMsg)
-        return (url, simplexLink)
+        })
+        if let uri = uri { return URL(string: uri.text) }
+        else { return nil }
     }
 
     private func isSimplexLink(_ link: String) -> Bool {

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

@@ -25,7 +25,7 @@ func voiceMessageTime_(_ time: TimeInterval?) -> String {
 
 struct ComposeVoiceView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     var recordingFileName: String
     @Binding var recordingTime: TimeInterval?
     @Binding var recordingState: VoiceMessageRecordingState
@@ -50,9 +50,9 @@ struct ComposeVoiceView: View {
         }
         .padding(.vertical, 1)
         .frame(height: ComposeVoiceView.previewHeight)
-        .background(theme.appColors.sentMessage)
-        .frame(minHeight: 54)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
         .frame(maxWidth: .infinity)
+        .padding(.top, 8)
     }
 
     private func recordingMode() -> some View {
@@ -80,7 +80,7 @@ struct ComposeVoiceView: View {
                     Button {
                         startPlayback()
                     } label: {
-                        playPauseIcon("play.fill", theme.colors.primary)
+                        playPauseIcon("play.fill")
                     }
                     Text(voiceMessageTime_(recordingTime))
                 case .playing:
@@ -88,7 +88,7 @@ struct ComposeVoiceView: View {
                         audioPlayer?.pause()
                         playbackState = .paused
                     } label: {
-                        playPauseIcon("pause.fill", theme.colors.primary)
+                        playPauseIcon("pause.fill")
                     }
                     Text(voiceMessageTime_(playbackTime))
                 case .paused:
@@ -96,7 +96,7 @@ struct ComposeVoiceView: View {
                         audioPlayer?.play()
                         playbackState = .playing
                     } label: {
-                        playPauseIcon("play.fill", theme.colors.primary)
+                        playPauseIcon("play.fill")
                     }
                     Text(voiceMessageTime_(playbackTime))
                 }
@@ -131,7 +131,7 @@ struct ComposeVoiceView: View {
         }
     }
 
-    private func playPauseIcon(_ image: String, _ color: Color) -> some View {
+    private func playPauseIcon(_ image: String, _ color: Color = .accentColor) -> some View {
         Image(systemName: image)
             .resizable()
             .aspectRatio(contentMode: .fit)
@@ -147,11 +147,9 @@ struct ComposeVoiceView: View {
         } label: {
             Image(systemName: "multiply")
         }
-        .tint(theme.colors.primary)
     }
 
     struct SliderBar: View {
-        @EnvironmentObject var theme: AppTheme
         var length: TimeInterval
         @Binding var progress: TimeInterval?
         var seek: (TimeInterval) -> Void
@@ -160,12 +158,10 @@ struct ComposeVoiceView: View {
             Slider(value: Binding(get: { progress ?? TimeInterval(0) }, set: { seek($0) }), in: 0 ... length)
                 .frame(maxWidth: .infinity)
                 .frame(height: 4)
-                .tint(theme.colors.primary)
         }
     }
 
     private struct ProgressBar: View {
-        @EnvironmentObject var theme: AppTheme
         var length: TimeInterval
         @Binding var progress: TimeInterval?
 
@@ -173,7 +169,7 @@ struct ComposeVoiceView: View {
             GeometryReader { geometry in
                 ZStack {
                     Rectangle()
-                        .fill(theme.colors.primary)
+                        .fill(Color.accentColor)
                         .frame(width: min(CGFloat((progress ?? TimeInterval(0)) / length) * geometry.size.width, geometry.size.width), height: 4)
                         .animation(.linear, value: progress)
                 }

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

@@ -9,18 +9,19 @@
 import SwiftUI
 
 struct ContextInvitingContactMemberView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
         HStack {
             Image(systemName: "message")
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
             Text("Send direct message to connect")
         }
         .padding(12)
-        .frame(minHeight: 54)
+        .frame(minHeight: 50)
         .frame(maxWidth: .infinity, alignment: .leading)
-        .background(.thinMaterial)
+        .background(colorScheme == .light ? sentColorLight : sentColorDark)
+        .padding(.top, 8)
     }
 }
 

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

@@ -10,12 +10,11 @@ import SwiftUI
 import SimpleXChat
 
 struct ContextItemView: View {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var chat: Chat
-    let contextItems: [ChatItem]
+    let contextItem: ChatItem
     let contextIcon: String
     let cancelContextItem: () -> Void
-    var showSender: Bool = true
 
     var body: some View {
         HStack {
@@ -23,23 +22,14 @@ struct ContextItemView: View {
                 .resizable()
                 .aspectRatio(contentMode: .fit)
                 .frame(width: 16, height: 16)
-                .foregroundColor(theme.colors.secondary)
-            if let singleItem = contextItems.first, contextItems.count == 1 {
-                if showSender, let sender = singleItem.memberDisplayName {
-                     VStack(alignment: .leading, spacing: 4) {
-                         Text(sender).font(.caption).foregroundColor(theme.colors.secondary)
-                         msgContentView(lines: 2, contextItem: singleItem)
-                     }
-                 } else {
-                     msgContentView(lines: 3, contextItem: singleItem)
-                 }
+                .foregroundColor(.secondary)
+            if let sender = contextItem.memberDisplayName {
+                VStack(alignment: .leading, spacing: 4) {
+                    Text(sender).font(.caption).foregroundColor(.secondary)
+                    msgContentView(lines: 2)
+                }
             } else {
-                Text(
-                    chat.chatInfo.chatType == .local
-                    ? "Saving \(contextItems.count) messages"
-                    : "Forwarding \(contextItems.count) messages"
-                )
-                .italic()
+                msgContentView(lines: 3)
             }
             Spacer()
             Button {
@@ -49,50 +39,29 @@ struct ContextItemView: View {
             } label: {
                 Image(systemName: "multiply")
             }
-            .tint(theme.colors.primary)
         }
         .padding(12)
-        .frame(minHeight: 54)
+        .frame(minHeight: 50)
         .frame(maxWidth: .infinity)
-        .background(background)
+        .background(chatItemFrameColor(contextItem, colorScheme))
+        .padding(.top, 8)
     }
 
-    private var background: Color {
-        contextItems.first
-            .map { chatItemFrameColor($0, theme) }
-            ?? Color(uiColor: .tertiarySystemBackground)
-    }
-
-    private func msgContentView(lines: Int, contextItem: ChatItem) -> some View {
-        contextMsgPreview(contextItem)
-            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
-            .lineLimit(lines)
-    }
-
-    private func contextMsgPreview(_ contextItem: ChatItem) -> Text {
-        return attachment() + messageText(contextItem.text, contextItem.formattedText, nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)
-
-        func attachment() -> Text {
-            let isFileLoaded = if let fileSource = getLoadedFileSource(contextItem.file) {
-                FileManager.default.fileExists(atPath: getAppFilePath(fileSource.filePath).path)
-            } else { false }
-            switch contextItem.content.msgContent {
-            case .file: return isFileLoaded ? image("doc.fill") : Text("")
-            case .image: return image("photo")
-            case .voice: return isFileLoaded ? image("play.fill") : Text("")
-            default: return Text("")
-            }
-        }
-
-        func image(_ s: String) -> Text {
-            Text(Image(systemName: s)).foregroundColor(Color(uiColor: .tertiaryLabel)) + Text(" ")
-        }
+    private func msgContentView(lines: Int) -> some View {
+        MsgContentView(
+            chat: chat,
+            text: contextItem.text,
+            formattedText: contextItem.formattedText,
+            showSecrets: false
+        )
+        .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
+        .lineLimit(lines)
     }
 }
 
 struct ContextItemView_Previews: PreviewProvider {
     static var previews: some View {
         let contextItem: ChatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
-        return ContextItemView(chat: Chat.sampleData, contextItems: [contextItem], contextIcon: "pencil.circle", cancelContextItem: {})
+        return ContextItemView(chat: Chat.sampleData, contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
     }
 }

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

@@ -16,6 +16,7 @@ struct NativeTextEditor: UIViewRepresentable {
     @Binding var disableEditing: Bool
     @Binding var height: CGFloat
     @Binding var focused: Bool
+    let alignment: TextAlignment
     let onImagesAdded: ([UploadContent]) -> Void
     
     private let minHeight: CGFloat = 37
@@ -28,18 +29,14 @@ struct NativeTextEditor: UIViewRepresentable {
     
     func makeUIView(context: Context) -> UITextView {
         let field = CustomUITextField(height: _height)
-        field.backgroundColor = .clear
         field.text = text
-        field.textAlignment = alignment(text)
+        field.textAlignment = alignment == .leading ? .left : .right
         field.autocapitalizationType = .sentences
         field.setOnTextChangedListener { newText, images in
             if !disableEditing {
-                text = newText
-                field.textAlignment = alignment(text)
-                updateFont(field)
                 // Speed up the process of updating layout, reduce jumping content on screen
-                updateHeight(field)
-                self.height = field.frame.size.height
+                if !isShortEmoji(newText) { updateHeight(field) }
+                text = newText
             } else {
                 field.text = text
             }
@@ -56,12 +53,10 @@ struct NativeTextEditor: UIViewRepresentable {
     }
     
     func updateUIView(_ field: UITextView, context: Context) {
-        if field.markedTextRange == nil && field.text != text {
-            field.text = text
-            field.textAlignment = alignment(text)
-            updateFont(field)
-            updateHeight(field)
-        }
+        field.text = text
+        field.textAlignment = alignment == .leading ? .left : .right
+        updateFont(field)
+        updateHeight(field)
     }
 
     private func updateHeight(_ field: UITextView) {
@@ -78,19 +73,12 @@ struct NativeTextEditor: UIViewRepresentable {
     }
 
     private func updateFont(_ field: UITextView) {
-        let newFont = isShortEmoji(field.text)
+        field.font = isShortEmoji(field.text)
         ? (field.text.count < 4 ? largeEmojiUIFont : mediumEmojiUIFont)
         : UIFont.preferredFont(forTextStyle: .body)
-        if field.font != newFont {
-            field.font = newFont
-        }
     }
 }
 
-private func alignment(_ text: String) -> NSTextAlignment {
-    isRightToLeft(text) ? .right : .left
-}
-
 private class CustomUITextField: UITextView, UITextViewDelegate {
     var height: Binding<CGFloat>
     var newHeight: CGFloat = 0
@@ -217,6 +205,7 @@ struct NativeTextEditor_Previews: PreviewProvider{
             disableEditing: Binding.constant(false),
             height: Binding.constant(100),
             focused: Binding.constant(false),
+            alignment: TextAlignment.leading,
             onImagesAdded: { _ in }
         )
         .fixedSize(horizontal: false, vertical: true)

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

@@ -13,7 +13,6 @@ private let liveMsgInterval: UInt64 = 3000_000000
 
 struct SendMessageView: View {
     @Binding var composeState: ComposeState
-    @EnvironmentObject var theme: AppTheme
     var sendMessage: (Int?) -> Void
     var sendLiveMessage: (() async -> Void)? = nil
     var updateLiveMessage: (() async -> Void)? = nil
@@ -21,7 +20,6 @@ struct SendMessageView: View {
     var nextSendGrpInv: Bool = false
     var showVoiceMessageButton: Bool = true
     var voiceMessageAllowed: Bool = true
-    var disableSendButton = false
     var showEnableVoiceMessagesAlert: ChatInfo.ShowEnableVoiceMessagesAlert = .other
     var startVoiceMessageRecording: (() -> Void)? = nil
     var finishVoiceMessageRecording: (() -> Void)? = nil
@@ -40,33 +38,35 @@ struct SendMessageView: View {
     @State private var showCustomTimePicker = false
     @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
     @State private var progressByTimeout = false
-    @UserDefault(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
+    @AppStorage(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…")
                             .font(teFont.italic())
                             .multilineTextAlignment(.leading)
-                            .foregroundColor(theme.colors.secondary)
+                            .foregroundColor(.secondary)
                             .padding(.horizontal, 10)
                             .padding(.vertical, 8)
                             .frame(maxWidth: .infinity)
                     } else {
+                        let alignment: TextAlignment = isRightToLeft(composeState.message) ? .trailing : .leading
                         NativeTextEditor(
                             text: $composeState.message,
                             disableEditing: $composeState.inProgress,
                             height: $teHeight,
                             focused: $keyboardVisible,
+                            alignment: alignment,
                             onImagesAdded: onMediaAdded
                         )
                         .allowsTightening(false)
                         .fixedSize(horizontal: false, vertical: true)
                     }
                 }
+
                 if progressByTimeout {
                     ProgressView()
                         .scaleEffect(1.4)
@@ -84,9 +84,10 @@ struct SendMessageView: View {
                 }
             }
             .padding(.vertical, 1)
-            .background(theme.colors.background)
-            .clipShape(composeShape)
-            .overlay(composeShape.strokeBorder(.secondary, lineWidth: 0.5).opacity(0.7))
+            .overlay(
+            RoundedRectangle(cornerSize: CGSize(width: 20, height: 20))
+                .strokeBorder(.secondary, lineWidth: 0.3, antialiased: true)
+            )
         }
         .onChange(of: composeState.message, perform: { text in updateFont(text) })
         .onChange(of: composeState.inProgress) { inProgress in
@@ -108,7 +109,6 @@ struct SendMessageView: View {
         } else if showVoiceMessageButton
             && composeState.message.isEmpty
             && !composeState.editing
-            && !composeState.forwarding
             && composeState.liveMessage == nil
             && ((composeState.noPreview && vmrs == .noRecording)
                 || (vmrs == .recording && holdingVMR)) {
@@ -184,8 +184,7 @@ struct SendMessageView: View {
             !composeState.sendEnabled ||
             composeState.inProgress ||
             (!voiceMessageAllowed && composeState.voicePreview) ||
-            composeState.endLiveDisabled ||
-            disableSendButton
+            composeState.endLiveDisabled
         )
         .frame(width: 29, height: 29)
         .contextMenu{
@@ -227,7 +226,6 @@ struct SendMessageView: View {
            !composeState.editing {
             if case .noContextItem = composeState.contextItem,
                !composeState.voicePreview,
-               !composeState.manyMediaPreviews,
                let send = sendLiveMessage,
                let update = updateLiveMessage {
                 Button {
@@ -248,7 +246,6 @@ struct SendMessageView: View {
     }
 
     private struct RecordVoiceMessageButton: View {
-        @EnvironmentObject var theme: AppTheme
         var startVoiceMessageRecording: (() -> Void)?
         var finishVoiceMessageRecording: (() -> Void)?
         @Binding var holdingVMR: Bool
@@ -258,10 +255,7 @@ struct SendMessageView: View {
         var body: some View {
             Button(action: {}) {
                 Image(systemName: "mic.fill")
-                    .resizable()
-                    .scaledToFit()
-                    .frame(width: 20, height: 20)
-                    .foregroundColor(theme.colors.primary)
+                    .foregroundColor(.accentColor)
             }
             .disabled(disabled)
             .frame(width: 29, height: 29)
@@ -314,10 +308,7 @@ struct SendMessageView: View {
             }
         } label: {
             Image(systemName: "mic")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 20, height: 20)
-                .foregroundColor(theme.colors.secondary)
+                .foregroundColor(.secondary)
         }
         .disabled(composeState.inProgress)
         .frame(width: 29, height: 29)
@@ -331,7 +322,7 @@ struct SendMessageView: View {
             Image(systemName: "multiply")
                 .resizable()
                 .scaledToFit()
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
                 .frame(width: 15, height: 15)
         }
         .frame(width: 29, height: 29)
@@ -348,7 +339,7 @@ struct SendMessageView: View {
             Image(systemName: "bolt.fill")
                 .resizable()
                 .scaledToFit()
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
                 .frame(width: 20, height: 20)
         }
         .frame(width: 29, height: 29)
@@ -391,7 +382,7 @@ struct SendMessageView: View {
             }
             Task {
                 _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
-                while await composeState.liveMessage != nil {
+                while composeState.liveMessage != nil {
                     await update()
                     _ = try? await Task.sleep(nanoseconds: liveMsgInterval)
                 }
@@ -402,7 +393,7 @@ struct SendMessageView: View {
     private func finishVoiceMessageRecordingButton() -> some View {
         Button(action: { finishVoiceMessageRecording?() }) {
             Image(systemName: "stop.fill")
-                .foregroundColor(theme.colors.primary)
+                .foregroundColor(.accentColor)
         }
         .disabled(composeState.inProgress)
         .frame(width: 29, height: 29)

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

@@ -12,7 +12,6 @@ import SimpleXChat
 struct ContactPreferencesView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @Binding var contact: Contact
     @State var featuresAllowed: ContactFeaturesAllowed
     @State var currentFeaturesAllowed: ContactFeaturesAllowed
@@ -67,8 +66,8 @@ struct ContactPreferencesView: View {
             .frame(height: 36)
             infoRow("Contact allows", pref.contactPreference.allow.text)
         }
-        header: { featureHeader(feature, enabled).foregroundColor(theme.colors.secondary) }
-        footer: { featureFooter(feature, enabled).foregroundColor(theme.colors.secondary) }
+        header: { featureHeader(feature, enabled) }
+        footer: { featureFooter(feature, enabled) }
     }
 
     private func timedMessagesFeatureSection() -> some View {
@@ -103,8 +102,8 @@ struct ContactPreferencesView: View {
                 infoRow("Delete after", timeText(pref.contactPreference.ttl))
             }
         }
-        header: { featureHeader(.timedMessages, enabled).foregroundColor(theme.colors.secondary) }
-        footer: { featureFooter(.timedMessages, enabled).foregroundColor(theme.colors.secondary) }
+        header: { featureHeader(.timedMessages, enabled) }
+        footer: { featureFooter(.timedMessages, enabled) }
     }
 
     private func featureHeader(_ feature: ChatFeature, _ enabled: FeatureEnabled) -> some View {

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

@@ -21,7 +21,6 @@ struct AddGroupMembersView: View {
 
 struct AddGroupMembersViewCommon: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
     var chat: Chat
     @State var groupInfo: GroupInfo
     var creatingGroup: Bool = false
@@ -35,7 +34,7 @@ struct AddGroupMembersViewCommon: View {
 
     private enum AddGroupMembersAlert: Identifiable {
         case prohibitedToInviteIncognito
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
 
         var id: String {
             switch self {
@@ -47,13 +46,14 @@ struct AddGroupMembersViewCommon: View {
 
     var body: some View {
         if creatingGroup {
-            addGroupMembersView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Skip") { addedMembersCb(selectedContacts) }
+            NavigationView {
+                addGroupMembersView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Skip") { addedMembersCb(selectedContacts) }
+                        }
                     }
-                }
+            }
         } else {
             addGroupMembersView()
         }
@@ -70,7 +70,7 @@ struct AddGroupMembersViewCommon: View {
 
                 if (membersToAdd.isEmpty) {
                     Text("No contacts to add")
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                         .padding()
                         .frame(maxWidth: .infinity, alignment: .center)
                         .listRowBackground(Color.clear)
@@ -90,25 +90,21 @@ struct AddGroupMembersViewCommon: View {
                                     Button { selectedContacts.removeAll() } label: { Text("Clear").font(.caption) }
                                     Spacer()
                                     Text("\(count) contact(s) selected")
-                                        .foregroundColor(theme.colors.secondary)
                                 }
                             } else {
                                 Text("No contacts selected")
                                     .frame(maxWidth: .infinity, alignment: .trailing)
-                                    .foregroundColor(theme.colors.secondary)
                             }
                         }
                     }
 
                     Section {
-                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.primary, theme.colors.secondary)
+                        searchFieldView(text: $searchText, focussed: $searchFocussed)
                             .padding(.leading, 2)
                         let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
                         let members = s == "" ? membersToAdd : membersToAdd.filter { $0.chatViewName.localizedLowercase.contains(s) }
-                        ForEach(members + [dummyContact]) { contact in
-                            if contact.contactId != dummyContact.contactId {
-                                contactCheckView(contact)
-                            }
+                        ForEach(members) { contact in
+                            contactCheckView(contact)
                         }
                     }
                 }
@@ -123,23 +119,14 @@ struct AddGroupMembersViewCommon: View {
                     message: Text("You're trying to invite contact with whom you've shared an incognito profile to the group in which you're using your main profile")
                 )
             case let .error(title, error):
-                return mkAlert(title: title, message: error)
+                return Alert(title: Text(title), message: Text(error))
             }
         }
         .onChange(of: selectedContacts) { _ in
             searchFocussed = false
         }
-        .modifier(ThemedBackground(grouped: true))
     }
 
-    // Resolves keyboard losing focus bug in iOS16 and iOS17,
-    // when there are no items inside `ForEach(memebers)` loop
-    private let dummyContact: Contact = {
-        var dummy = Contact.sampleData
-        dummy.contactId = -1
-        return dummy
-    }()
-
     private func inviteMembersButton() -> some View {
         Button {
             inviteMembers()
@@ -185,14 +172,14 @@ struct AddGroupMembersViewCommon: View {
         var iconColor: Color
         if prohibitedToInviteIncognito {
             icon = "theatermasks.circle.fill"
-            iconColor = Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
+            iconColor = Color(uiColor: .tertiaryLabel)
         } else {
             if checked {
                 icon = "checkmark.circle.fill"
-                iconColor = theme.colors.primary
+                iconColor = .accentColor
             } else {
                 icon = "circle"
-                iconColor = Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
+                iconColor = Color(uiColor: .tertiaryLabel)
             }
         }
         return Button {
@@ -207,10 +194,11 @@ struct AddGroupMembersViewCommon: View {
             }
         } label: {
             HStack{
-                ProfileImage(imageStr: contact.image, size: 30)
+                ProfileImage(imageStr: contact.image)
+                    .frame(width: 30, height: 30)
                     .padding(.trailing, 2)
                 Text(ChatInfo.direct(contact: contact).chatViewName)
-                    .foregroundColor(prohibitedToInviteIncognito ? theme.colors.secondary : theme.colors.onBackground)
+                    .foregroundColor(prohibitedToInviteIncognito ? .secondary : .primary)
                     .lineLimit(1)
                 Spacer()
                 Image(systemName: icon)
@@ -220,7 +208,7 @@ struct AddGroupMembersViewCommon: View {
     }
 }
 
-func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding, _ onBackgroundColor: Color, _ secondaryColor: Color) -> some View {
+func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding) -> some View {
     HStack {
         Image(systemName: "magnifyingglass")
             .resizable()
@@ -229,7 +217,7 @@ func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding,
             .padding(.trailing, 10)
         TextField("Search", text: text)
             .focused(focussed)
-            .foregroundColor(onBackgroundColor)
+            .foregroundColor(.primary)
             .frame(maxWidth: .infinity)
         Image(systemName: "xmark.circle.fill")
             .resizable()
@@ -241,7 +229,7 @@ func searchFieldView(text: Binding<String>, focussed: FocusState<Bool>.Binding,
                 focussed.wrappedValue = false
             }
     }
-    .foregroundColor(secondaryColor)
+    .foregroundColor(.secondary)
     .frame(height: 36)
 }
 

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

@@ -13,16 +13,13 @@ let SMALL_GROUPS_RCPS_MEM_LIMIT: Int = 20
 
 struct GroupChatInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @ObservedObject var chat: Chat
     @Binding var groupInfo: GroupInfo
-    var onSearch: () -> Void
     @State private var alert: GroupChatInfoViewAlert? = nil
     @State private var groupLink: String?
     @State private var groupLinkMemberRole: GroupMemberRole = .member
-    @State private var groupLinkNavLinkActive: Bool = false
-    @State private var addMembersNavLinkActive: Bool = false
+    @State private var showAddMembersSheet: Bool = false
     @State private var connectionStats: ConnectionStats?
     @State private var connectionCode: String?
     @State private var sendReceipts = SendReceipts.userDefault(true)
@@ -42,7 +39,7 @@ struct GroupChatInfoView: View {
         case blockForAllAlert(mem: GroupMember)
         case unblockForAllAlert(mem: GroupMember)
         case removeMemberAlert(mem: GroupMember)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
         var id: String {
             switch self {
@@ -65,20 +62,11 @@ struct GroupChatInfoView: View {
         NavigationView {
             let members = chatModel.groupMembers
                 .filter { m in let status = m.wrapped.memberStatus; return status != .memLeft && status != .memRemoved }
-                .sorted { $0.wrapped.memberRole > $1.wrapped.memberRole }
+                .sorted { $0.displayName.lowercased() < $1.displayName.lowercased() }
 
             List {
                 groupInfoHeader()
                     .listRowBackground(Color.clear)
-                    .padding(.bottom, 18)
-
-                infoActionButtons()
-                    .padding(.horizontal)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: infoViewActionButtonHeight)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
                 Section {
                     if groupInfo.canEdit {
@@ -93,19 +81,13 @@ struct GroupChatInfoView: View {
                     } else {
                         sendReceiptsOptionDisabled()
                     }
-                    NavigationLink {
-                        ChatWallpaperEditorSheet(chat: chat)
-                    } label: {
-                        Label("Chat theme", systemImage: "photo")
-                    }
                 } header: {
                     Text("")
                 } footer: {
                     Text("Only group owners can change group preferences.")
-                        .foregroundColor(theme.colors.secondary)
                 }
 
-                Section(header: Text("\(members.count + 1) members").foregroundColor(theme.colors.secondary)) {
+                Section("\(members.count + 1) members") {
                     if groupInfo.canAddMembers {
                         groupLinkButton()
                         if (chat.chatInfo.incognito) {
@@ -117,7 +99,7 @@ struct GroupChatInfoView: View {
                         }
                     }
                     if members.count > 8 {
-                        searchFieldView(text: $searchText, focussed: $searchFocussed, theme.colors.onBackground, theme.colors.secondary)
+                        searchFieldView(text: $searchText, focussed: $searchFocussed)
                             .padding(.leading, 8)
                     }
                     let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
@@ -147,13 +129,12 @@ struct GroupChatInfoView: View {
                 }
 
                 if developerTools {
-                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
+                    Section(header: Text("For console")) {
                         infoRow("Local name", chat.chatInfo.localDisplayName)
                         infoRow("Database ID", "\(chat.chatInfo.apiId)")
                     }
                 }
             }
-            .modifier(ThemedBackground(grouped: true))
             .navigationBarHidden(true)
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
@@ -169,7 +150,7 @@ struct GroupChatInfoView: View {
             case let .blockForAllAlert(mem): return blockForAllAlert(groupInfo, mem)
             case let .unblockForAllAlert(mem): return unblockForAllAlert(groupInfo, mem)
             case let .removeMemberAlert(mem): return removeMemberAlert(mem)
-            case let .error(title, error): return mkAlert(title: title, message: error)
+            case let .error(title, error): return Alert(title: Text(title), message: Text(error))
             }
         }
         .onAppear {
@@ -185,12 +166,14 @@ struct GroupChatInfoView: View {
                 logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
             }
         }
+         .keyboardPadding()
     }
 
     private func groupInfoHeader() -> some View {
         VStack {
             let cInfo = chat.chatInfo
-            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ChatInfoImage(chat: chat, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                 .padding(.top, 12)
                 .padding()
             Text(cInfo.displayName)
@@ -208,116 +191,45 @@ struct GroupChatInfoView: View {
         .frame(maxWidth: .infinity, alignment: .center)
     }
 
-    func infoActionButtons() -> some View {
-        GeometryReader { g in
-            let buttonWidth = g.size.width / 4
-            HStack(alignment: .center, spacing: 8) {
-                searchButton(width: buttonWidth)
-                if groupInfo.canAddMembers {
-                    addMembersActionButton(width: buttonWidth)
-                }
-                muteButton(width: buttonWidth)
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    private func searchButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "magnifyingglass", title: "search", width: width) {
-            dismiss()
-            onSearch()
-        }
-        .disabled(!groupInfo.ready || chat.chatItems.isEmpty)
-    }
-
-    @ViewBuilder private func addMembersActionButton(width: CGFloat) -> some View {
-        if chat.chatInfo.incognito {
-            ZStack {
-                InfoViewButton(image: "link.badge.plus", title: "invite", width: width) {
-                    groupLinkNavLinkActive = true
-                }
-
-                NavigationLink(isActive: $groupLinkNavLinkActive) {
-                    groupLinkDestinationView()
-                } label: {
-                    EmptyView()
-                }
-                .frame(width: 1, height: 1)
-                .hidden()
-            }
-            .disabled(!groupInfo.ready)
-        } else {
-            ZStack {
-                InfoViewButton(image: "person.fill.badge.plus", title: "invite", width: width) {
-                    addMembersNavLinkActive = true
-                }
-
-                NavigationLink(isActive: $addMembersNavLinkActive) {
-                    addMembersDestinationView()
-                } label: {
-                    EmptyView()
-                }
-                .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",
-            width: width
-        ) {
-            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
-        }
-        .disabled(!groupInfo.ready)
-    }
-
     private func addMembersButton() -> some View {
         NavigationLink {
-            addMembersDestinationView()
+            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+                .onAppear {
+                    searchFocussed = false
+                    Task {
+                        let groupMembers = await apiListMembers(groupInfo.groupId)
+                        await MainActor.run {
+                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                        }
+                    }
+                }
         } label: {
             Label("Invite members", systemImage: "plus")
         }
     }
 
-    private func addMembersDestinationView() -> some View {
-        AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-            .onAppear {
-                searchFocussed = false
-                Task {
-                    let groupMembers = await apiListMembers(groupInfo.groupId)
-                    await MainActor.run {
-                        chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                        chatModel.populateGroupMembersIndexes()
-                    }
-                }
-            }
-    }
-
     private struct MemberRowView: View {
         var groupInfo: GroupInfo
         @ObservedObject var groupMember: GMember
-        @EnvironmentObject var theme: AppTheme
         var user: Bool = false
         @Binding var alert: GroupChatInfoViewAlert?
 
         var body: some View {
             let member = groupMember.wrapped
             let v = HStack{
-                MemberProfileImage(member, size: 38)
+                ProfileImage(imageStr: member.image)
+                    .frame(width: 38, height: 38)
                     .padding(.trailing, 2)
                 // TODO server connection status
                 VStack(alignment: .leading) {
-                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : theme.colors.onBackground)
+                    let t = Text(member.chatViewName).foregroundColor(member.memberIncognito ? .indigo : .primary)
                     (member.verified ? memberVerifiedShield + t : t)
                         .lineLimit(1)
-                    (user ? Text ("you: ") + Text(member.memberStatus.shortText) : Text(memberConnStatus(member)))
+                    let s = Text(member.memberStatus.shortText)
+                    (user ? Text ("you: ") + s : s)
                         .lineLimit(1)
                         .font(.caption)
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                 }
                 Spacer()
                 memberInfo(member)
@@ -347,25 +259,15 @@ struct GroupChatInfoView: View {
             }
         }
 
-        private func memberConnStatus(_ member: GroupMember) -> LocalizedStringKey {
-            if member.activeConn?.connDisabled ?? false {
-                return "disabled"
-            } else if member.activeConn?.connInactive ?? false {
-                return "inactive"
-            } else {
-                return member.memberStatus.shortText
-            }
-        }
-
         @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {
             if member.blocked {
                 Text("blocked")
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
             } else {
                 let role = member.memberRole
                 if [.owner, .admin, .observer].contains(role) {
                     Text(member.memberRole.text)
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                 }
             }
         }
@@ -376,13 +278,13 @@ struct GroupChatInfoView: View {
                     Button {
                         alert = .blockMemberAlert(mem: member)
                     } label: {
-                        Label("Block member", systemImage: "hand.raised").foregroundColor(theme.colors.secondary)
+                        Label("Block member", systemImage: "hand.raised").foregroundColor(.secondary)
                     }
                 } else {
                     Button {
                         alert = .unblockMemberAlert(mem: member)
                     } label: {
-                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
+                        Label("Unblock member", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
                     }
                 }
             }
@@ -394,13 +296,13 @@ struct GroupChatInfoView: View {
                     Button {
                         alert = .unblockForAllAlert(mem: member)
                     } label: {
-                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(theme.colors.primary)
+                        Label("Unblock for all", systemImage: "hand.raised.slash").foregroundColor(.accentColor)
                     }
                 } else {
                     Button {
                         alert = .blockForAllAlert(mem: member)
                     } label: {
-                        Label("Block for all", systemImage: "hand.raised").foregroundColor(theme.colors.secondary)
+                        Label("Block for all", systemImage: "hand.raised").foregroundColor(.secondary)
                     }
                 }
             }
@@ -416,14 +318,6 @@ struct GroupChatInfoView: View {
                 }
             }
         }
-
-        private var memberVerifiedShield: Text {
-            (Text(Image(systemName: "checkmark.shield")) + Text(" "))
-                .font(.caption)
-                .baselineOffset(2)
-                .kerning(-2)
-                .foregroundColor(theme.colors.secondary)
-        }
     }
 
     private func memberInfoView(_ groupMember: GMember) -> some View {
@@ -433,7 +327,15 @@ struct GroupChatInfoView: View {
 
     private func groupLinkButton() -> some View {
         NavigationLink {
-            groupLinkDestinationView()
+            GroupLinkView(
+                groupId: groupInfo.groupId,
+                groupLink: $groupLink,
+                groupLinkMemberRole: $groupLinkMemberRole,
+                showTitle: false,
+                creatingGroup: false
+            )
+            .navigationBarTitle("Group link")
+            .navigationBarTitleDisplayMode(.large)
         } label: {
             if groupLink == nil {
                 Label("Create group link", systemImage: "link.badge.plus")
@@ -443,19 +345,6 @@ struct GroupChatInfoView: View {
         }
     }
 
-    private func groupLinkDestinationView() -> some View {
-        GroupLinkView(
-            groupId: groupInfo.groupId,
-            groupLink: $groupLink,
-            groupLinkMemberRole: $groupLinkMemberRole,
-            showTitle: false,
-            creatingGroup: false
-        )
-        .navigationBarTitle("Group link")
-        .modifier(ThemedBackground(grouped: true))
-        .navigationBarTitleDisplayMode(.large)
-    }
-
     private func editGroupButton() -> some View {
         NavigationLink {
             GroupProfileView(
@@ -463,7 +352,6 @@ struct GroupChatInfoView: View {
                 groupProfile: groupInfo.groupProfile
             )
             .navigationBarTitle("Group profile")
-            .modifier(ThemedBackground())
             .navigationBarTitleDisplayMode(.large)
         } label: {
             Label("Edit group profile", systemImage: "pencil")
@@ -478,7 +366,6 @@ struct GroupChatInfoView: View {
                 welcomeText: groupInfo.groupProfile.description ?? ""
             )
             .navigationTitle("Welcome message")
-            .modifier(ThemedBackground(grouped: true))
             .navigationBarTitleDisplayMode(.large)
         } label: {
             groupInfo.groupProfile.description == nil
@@ -633,7 +520,6 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
             creatingGroup: creatingGroup
         )
         .navigationBarTitle("Group preferences")
-        .modifier(ThemedBackground(grouped: true))
         .navigationBarTitleDisplayMode(.large)
     } label: {
         if creatingGroup {
@@ -644,6 +530,14 @@ func groupPreferencesButton(_ groupInfo: Binding<GroupInfo>, _ creatingGroup: Bo
     }
 }
 
+private var memberVerifiedShield: Text {
+    (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+        .font(.caption)
+        .baselineOffset(2)
+        .kerning(-2)
+        .foregroundColor(.secondary)
+}
+
 func cantInviteIncognitoAlert() -> Alert {
     Alert(
         title: Text("Can't invite contacts!"),
@@ -662,8 +556,7 @@ struct GroupChatInfoView_Previews: PreviewProvider {
     static var previews: some View {
         GroupChatInfoView(
             chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData),
-            onSearch: {}
+            groupInfo: Binding.constant(GroupInfo.sampleData)
         )
     }
 }

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

@@ -22,7 +22,7 @@ struct GroupLinkView: View {
 
     private enum GroupLinkAlert: Identifiable {
         case deleteLink
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
 
         var id: String {
             switch self {
@@ -34,13 +34,14 @@ struct GroupLinkView: View {
 
     var body: some View {
         if creatingGroup {
-            groupLinkView()
-                .navigationBarBackButtonHidden()
-                .toolbar {
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        Button ("Continue") { linkCreatedCb?() }
+            NavigationView {
+                groupLinkView()
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarTrailing) {
+                            Button ("Continue") { linkCreatedCb?() }
+                        }
                     }
-                }
+            }
         } else {
             groupLinkView()
         }
@@ -112,7 +113,7 @@ struct GroupLinkView: View {
                         }, secondaryButton: .cancel()
                     )
                 case let .error(title, error):
-                    return mkAlert(title: title, message: error)
+                    return Alert(title: Text(title), message: Text(error))
                 }
             }
             .onChange(of: groupLinkMemberRole) { _ in
@@ -132,7 +133,6 @@ struct GroupLinkView: View {
                 shouldCreate = false
             }
         }
-        .modifier(ThemedBackground(grouped: true))
     }
 
     private func createGroupLink() {

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

@@ -11,14 +11,12 @@ import SimpleXChat
 
 struct GroupMemberInfoView: View {
     @EnvironmentObject var chatModel: ChatModel
-    @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
     @State var groupInfo: GroupInfo
     @ObservedObject var groupMember: GMember
     var navigation: Bool = false
     @State private var connectionStats: ConnectionStats? = nil
     @State private var connectionCode: String? = nil
-    @State private var connectionLoaded: Bool = false
     @State private var newRole: GroupMemberRole = .member
     @State private var alert: GroupMemberInfoViewAlert?
     @State private var sheet: PlanAndConnectActionSheet?
@@ -37,9 +35,7 @@ struct GroupMemberInfoView: View {
         case abortSwitchAddressAlert
         case syncConnectionForceAlert
         case planAndConnectAlert(alert: PlanAndConnectAlert)
-        case queueInfo(info: String)
-        case someAlert(alert: SomeAlert)
-        case error(title: LocalizedStringKey, error: LocalizedStringKey?)
+        case error(title: LocalizedStringKey, error: LocalizedStringKey)
 
         var id: String {
             switch self {
@@ -53,8 +49,6 @@ struct GroupMemberInfoView: View {
             case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
             case .syncConnectionForceAlert: return "syncConnectionForceAlert"
             case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
-            case let .queueInfo(info): return "queueInfo \(info)"
-            case let .someAlert(alert): return "someAlert \(alert.id)"
             case let .error(title, _): return "error \(title)"
             }
         }
@@ -68,11 +62,10 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    private func knownDirectChat(_ contactId: Int64) -> (Chat, Contact)? {
+    private func knownDirectChat(_ contactId: Int64) -> Chat? {
         if let chat = chatModel.getContactChat(contactId),
-           let contact = chat.chatInfo.contact,
-           contact.directOrUsed == true {
-            return (chat, contact)
+           chat.chatInfo.contact?.directOrUsed == true {
+            return chat
         } else {
             return nil
         }
@@ -80,25 +73,23 @@ struct GroupMemberInfoView: View {
 
     private func groupMemberInfoView() -> some View {
         ZStack {
-            let member = groupMember.wrapped
-            List {
-                groupMemberInfoHeader(member)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .padding(.bottom, 18)
-
-                infoActionButtons(member)
-                    .padding(.horizontal)
-                    .frame(maxWidth: .infinity)
-                    .frame(height: infoViewActionButtonHeight)
-                    .listRowBackground(Color.clear)
-                    .listRowSeparator(.hidden)
-                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
-
-                if connectionLoaded {
+            VStack {
+                let member = groupMember.wrapped
+                List {
+                    groupMemberInfoHeader(member)
+                        .listRowBackground(Color.clear)
 
                     if member.memberActive {
                         Section {
+                            if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
+                                knownDirectChatButton(chat)
+                            } else if groupInfo.fullGroupPreferences.directMessages.on {
+                                if let contactId = member.memberContactId {
+                                    newDirectChatButton(contactId)
+                                } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
+                                    createMemberContactButton()
+                                }
+                            }
                             if let code = connectionCode { verifyCodeButton(code) }
                             if let connStats = connectionStats,
                                connStats.ratchetSyncAllowed {
@@ -119,7 +110,7 @@ struct GroupMemberInfoView: View {
                                 Label("Share address", systemImage: "square.and.arrow.up")
                             }
                             if let contactId = member.memberContactId {
-                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on {
                                     connectViaAddressButton(contactLink)
                                 }
                             } else {
@@ -127,14 +118,12 @@ struct GroupMemberInfoView: View {
                             }
                         } header: {
                             Text("Address")
-                                .foregroundColor(theme.colors.secondary)
                         } footer: {
                             Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
-                                .foregroundColor(theme.colors.secondary)
                         }
                     }
 
-                    Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
+                    Section("Member") {
                         infoRow("Group", groupInfo.displayName)
 
                         if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
@@ -147,10 +136,16 @@ struct GroupMemberInfoView: View {
                         } else {
                             infoRow("Role", member.memberRole.text)
                         }
+
+                        // TODO invited by - need to get contact by contact id
+                        if let conn = member.activeConn {
+                            let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
+                            infoRow("Connection", connLevelDesc)
+                        }
                     }
 
                     if let connStats = connectionStats {
-                        Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
+                        Section("Servers") {
                             // TODO network connection status
                             Button("Change receiving address") {
                                 alert = .switchAddressAlert
@@ -168,8 +163,8 @@ struct GroupMemberInfoView: View {
                                     || connStats.ratchetSyncSendProhibited
                                 )
                             }
-                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
-                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
+                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer })
+                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer })
                         }
                     }
 
@@ -180,61 +175,40 @@ struct GroupMemberInfoView: View {
                     }
 
                     if developerTools {
-                        Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
+                        Section("For console") {
                             infoRow("Local name", member.localDisplayName)
                             infoRow("Database ID", "\(member.groupMemberId)")
-                            if let conn = member.activeConn {
-                                let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
-                                infoRow("Connection", connLevelDesc)
-                            }
-                            Button ("Debug delivery") {
-                                Task {
-                                    do {
-                                        let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
-                                        await MainActor.run { alert = .queueInfo(info: info) }
-                                    } catch let e {
-                                        logger.error("apiContactQueueInfo error: \(responseError(e))")
-                                        let a = getErrorAlert(e, "Error")
-                                        await MainActor.run { alert = .error(title: a.title, error: a.message) }
-                                    }
-                                }
-                            }
                         }
                     }
-
                 }
-            }
-            .navigationBarHidden(true)
-            .task {
-                if #unavailable(iOS 16) {
-                    // this condition prevents re-setting picker
-                    if !justOpened { return }
-                }
-                justOpened = false
-                newRole = member.memberRole
-                do {
-                    let (_, stats) = try await apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                    let (mem, code) = member.memberActive ? try await apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
-                    await MainActor.run {
-                        _ = chatModel.upsertGroupMember(groupInfo, mem)
-                        connectionStats = stats
-                        connectionCode = code
-                        connectionLoaded = true
+                .navigationBarHidden(true)
+                .onAppear {
+                    if #unavailable(iOS 16) {
+                        // this condition prevents re-setting picker
+                        if !justOpened { return }
                     }
-                } catch let error {
-                    await MainActor.run {
-                        connectionLoaded = true
+                    justOpened = false
+                    DispatchQueue.main.async {
+                        newRole = member.memberRole
+                        do {
+                            let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                            let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                            _ = chatModel.upsertGroupMember(groupInfo, mem)
+                            connectionStats = stats
+                            connectionCode = code
+                        } catch let error {
+                            logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                        }
                     }
-                    logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                 }
-            }
-            .onChange(of: newRole) { newRole in
-                if newRole != member.memberRole {
-                    alert = .changeMemberRoleAlert(mem: member, role: newRole)
+                .onChange(of: newRole) { newRole in
+                    if newRole != member.memberRole {
+                        alert = .changeMemberRoleAlert(mem: member, role: newRole)
+                    }
+                }
+                .onChange(of: member.memberRole) { role in
+                    newRole = role
                 }
-            }
-            .onChange(of: member.memberRole) { role in
-                newRole = role
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
             .alert(item: $alert) { alertItem in
@@ -249,9 +223,7 @@ struct GroupMemberInfoView: View {
                 case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchMemberAddress)
                 case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
                 case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
-                case let .queueInfo(info): return queueInfoAlert(info)
-                case let .someAlert(a): return a.alert
-                case let .error(title, error): return mkAlert(title: title, message: error)
+                case let .error(title, error): return Alert(title: Text(title), message: Text(error))
                 }
             }
             .actionSheet(item: $sheet) { s in planAndConnectActionSheet(s, dismiss: true) }
@@ -260,58 +232,6 @@ struct GroupMemberInfoView: View {
                 ProgressView().scaleEffect(2)
             }
         }
-        .modifier(ThemedBackground(grouped: true))
-    }
-
-    func infoActionButtons(_ member: GroupMember) -> some View {
-        GeometryReader { g in
-            let buttonWidth = g.size.width / 4
-            HStack(alignment: .center, spacing: 8) {
-                if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
-                    knownDirectChatButton(chat, width: buttonWidth)
-                    AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                    VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
-                } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
-                    if let contactId = member.memberContactId {
-                        newDirectChatButton(contactId, width: buttonWidth)
-                    } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
-                        createMemberContactButton(width: buttonWidth)
-                    }
-                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
-                    }
-                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
-                    }
-                } else { // no known contact chat && directMessages are off
-                    InfoViewButton(image: "message.fill", title: "message", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't message member")
-                    }
-                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
-                    }
-                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
-                    }
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    func showSendMessageToEnableCallsAlert() {
-        alert = .someAlert(alert: SomeAlert(
-            alert: mkAlert(
-                title: "Can't call member",
-                message: "Send message to enable calls."
-            ),
-            id: "can't call member, send message"
-        ))
-    }
-
-    func showDirectMessagesProhibitedAlert(_ title: LocalizedStringKey) {
-        alert = .someAlert(alert: SomeAlert(
-            alert: mkAlert(
-                title: title,
-                message: "Direct messages between members are prohibited in this group."
-            ),
-            id: "can't message member, direct messages prohibited"
-        ))
     }
 
     func connectViaAddressButton(_ contactLink: String) -> some View {
@@ -328,32 +248,36 @@ struct GroupMemberInfoView: View {
         }
     }
 
-    func knownDirectChatButton(_ chat: Chat, width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
-            ItemsModel.shared.loadOpenChat(chat.id) {
+    func knownDirectChatButton(_ chat: Chat) -> some View {
+        Button {
+            dismissAllSheets(animated: true)
+            DispatchQueue.main.async {
+                chatModel.chatId = chat.id
+            }
+        } label: {
+            Label("Send direct message", systemImage: "message")
+        }
+    }
+
+    func newDirectChatButton(_ contactId: Int64) -> some View {
+        Button {
+            do {
+                let chat = try apiGetChat(type: .direct, id: contactId)
+                chatModel.addChat(chat)
                 dismissAllSheets(animated: true)
-            }
-        }
-    }
-
-    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) {
-                        dismissAllSheets(animated: true)
-                    }
-                } catch let error {
-                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
+                DispatchQueue.main.async {
+                    chatModel.chatId = chat.id
                 }
+            } catch let error {
+                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
             }
+        } label: {
+            Label("Send direct message", systemImage: "message")
         }
     }
 
-    func createMemberContactButton(width: CGFloat) -> some View {
-        InfoViewButton(image: "message.fill", title: "message", width: width) {
+    func createMemberContactButton() -> some View {
+        Button {
             progressIndicator = true
             Task {
                 do {
@@ -361,10 +285,9 @@ struct GroupMemberInfoView: View {
                     await MainActor.run {
                         progressIndicator = false
                         chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                        ItemsModel.shared.loadOpenChat(memberContact.id) {
-                            dismissAllSheets(animated: true)
-                        }
-                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
+                        dismissAllSheets(animated: true)
+                        chatModel.chatId = memberContact.id
+                        chatModel.setContactNetworkStatus(memberContact, .connected)
                     }
                 } catch let error {
                     logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
@@ -375,18 +298,21 @@ struct GroupMemberInfoView: View {
                     }
                 }
             }
+        } label: {
+            Label("Send direct message", systemImage: "message")
         }
     }
 
     private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
         VStack {
-            MemberProfileImage(mem, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            ProfileImage(imageStr: mem.image, color: Color(uiColor: .tertiarySystemFill))
+                .frame(width: 192, height: 192)
                 .padding(.top, 12)
                 .padding()
             if mem.verified {
                 (
                     Text(Image(systemName: "checkmark.shield"))
-                        .foregroundColor(theme.colors.secondary)
+                        .foregroundColor(.secondary)
                         .font(.title2)
                     + Text(" ")
                     + Text(mem.displayName)
@@ -434,7 +360,6 @@ struct GroupMemberInfoView: View {
             )
             .navigationBarTitleDisplayMode(.inline)
             .navigationTitle("Security code")
-            .modifier(ThemedBackground())
         } label: {
             Label(
                 member.verified ? "View security code" : "Verify security code",
@@ -484,7 +409,7 @@ struct GroupMemberInfoView: View {
         Section {
             if mem.blockedByAdmin {
                 Label("Blocked by admin", systemImage: "hand.raised")
-                    .foregroundColor(theme.colors.secondary)
+                    .foregroundColor(.secondary)
             } else if mem.memberSettings.showMessages {
                 blockMemberButton(mem)
             } else {
@@ -642,21 +567,6 @@ struct GroupMemberInfoView: View {
     }
 }
 
-func MemberProfileImage(
-    _ mem: GroupMember,
-    size: CGFloat,
-    color: Color = Color(uiColor: .tertiarySystemGroupedBackground),
-    backgroundColor: Color? = nil
-) -> some View {
-    ProfileImage(
-        imageStr: mem.image,
-        size: size,
-        color: color,
-        backgroundColor: backgroundColor,
-        blurred: mem.blocked
-    )
-}
-
 func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
     Alert(
         title: Text("Block member?"),