Merge master

.github/workflows/build.yml

@@ -124,12 +124,12 @@ jobs:
         run: |
           echo "ignore-project: False"                                         >> cabal.project.local
           echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /opt/homebrew/opt/openssl@3.0/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib"         >> cabal.project.local
+          echo "    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@3.0/include" >> cabal.project.local
-          echo "    extra-lib-dirs: /opt/homebrew/opt/openssl@3.0/lib"         >> 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
@@ -138,21 +138,21 @@ jobs:
         run: |
           echo "ignore-project: False"                                         >> cabal.project.local
           echo "package simplexmq"                                             >> cabal.project.local
-          echo "    extra-include-dirs: /usr/local/opt/openssl@3.0/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@3.0/lib"            >> cabal.project.local
+          echo "    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@3.0/include"    >> cabal.project.local
-          echo "    extra-lib-dirs: /usr/local/opt/openssl@3.0/lib"            >> 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 openssl for Mac
+      - name: Install pkg-config for Mac
         if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
-        run: brew install openssl@3.0
+        run: brew install pkg-config
 
       - name: Unix prepare cabal.project.local for Ubuntu
         if: matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04'
@@ -334,7 +334,7 @@ jobs:
         run: |
           export PATH=$PATH:/c/ghcup/bin:$(echo /c/tools/ghc-*/bin || echo)
           scripts/desktop/prepare-openssl-windows.sh
-          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-3.0.15 | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
+          openssl_windows_style_path=$(echo `pwd`/dist-newstyle/openssl-1.1.1w | sed 's#/\([a-zA-Z]\)#\1:#' | sed 's#/#\\#g')
           rm cabal.project.local 2>/dev/null || true
           echo "ignore-project: False" >> cabal.project.local
           echo "package direct-sqlcipher" >> cabal.project.local

.github/workflows/web.yml

@@ -10,7 +10,6 @@ on:
       - blog/**
       - docs/**
       - .github/workflows/web.yml
-      - PRIVACY.md
 
 jobs:
   build:

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

@@ -3,93 +3,63 @@ layout: layouts/privacy.html
 permalink: /privacy/index.html
 ---
 
-# SimpleX Chat Operators Privacy Policy and Conditions of Use
+# SimpleX Chat Privacy Policy and Conditions of Use
 
-## Summary
+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.
 
-[Introduction](#introduction) and [General principles](#general-principles) cover SimpleX Chat network design, the network operators, and the principles of privacy and security provided by SimpleX network.
-
-[Privacy policy](#privacy-policy) covers:
-- data stored only on your device - [your profiles](#user-profiles), delivered [messages and files](#messages-and-files). You can transfer this information to another device, and you are responsible for its preservation - if you delete the app it will be lost.
-- [private message delivery](#private-message-delivery) that protects your IP address and connection graph from the destination servers.
-- [undelivered messages and files](#storage-of-messages-and-files-on-the-servers) stored on the servers.
-- [how users connect](#connections-with-other-users) without any user profile identifiers.
-- [iOS push notifications](#ios-push-notifications) privacy limitations.
-- [user support](#user-support), [SimpleX directory](#simplex-directory) and [any other data](#another-information-stored-on-the-servers) that may be stored on the servers.
-- [preset server operators](#preset-server-operators) and the [information they may share](#information-preset-server-operators-may-share).
-- [source code license](#source-code-license) and [updates to this document](#updates).
-
-[Conditions of Use](#conditions-of-use-of-software-and-infrastructure) are the conditions you need to accept to use SimpleX Chat applications and the relay servers of preset operators. Their purpose is to protect the users and preset server operators.
-
-*Please note*: this summary and any links in this document are provided for information only - they are not a part of the Privacy Policy and Conditions of Use.
-
-## Introduction
-
-SimpleX Chat (also referred to as SimpleX) 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 messaging 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 apps allow their users to send messages and files via relay server infrastructure. Relay server owners and operators 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 host user accounts.
+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)).
 
-If you believe that any part of this document is not aligned with SimpleX network mission or values, please raise it 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](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).
 
 ## Privacy Policy
 
-### General principles
+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 network software 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 is protected from being 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).
+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.
 
-SimpleX 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 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.
+SimpleX Chat software is similar in its design approach to email clients and browsers - it allows you to have full control of your data and freely choose the relay server providers, in the same way you choose which website or email provider to use, or use your own relay servers, simply by changing the configuration of the client software. The only current restriction to that is Apple push notifications - at the moment they can only be delivered via the preset servers that we operate, as explained below. We are exploring the solutions to deliver push notifications to iOS devices via other providers or users' own servers.
 
-SimpleX software is similar in its design approach to email clients and browsers - it allows you to have full control of your data and freely choose the relay server operators, in the same way you choose which website or email provider to use, or use your own relay servers, simply by changing the configuration of the client software. The only current restriction to that is Apple push notifications - at the moment they can only be delivered via the servers operated by SimpleX Chat Ltd, as explained below. We are exploring the solutions to deliver push notifications to iOS devices via other providers or users' own servers.
+While SimpleX Chat Ltd is not a communication service provider, and provide public preset relays "as is", as experimental, without any guarantees of availability or data retention, we are committed to maintain a high level of availability, reliability and security of these preset relays. We will be adding alternative preset infrastructure providers to the software in the future, and you will continue to be able to use any other providers or your own servers.
 
-SimpleX network operators are not communication service provider, and provide public relays "as is", as experimental, without any guarantees of availability or data retention. The operators of the relay servers preset in the app ("Preset Server Operators"), including SimpleX Chat Ltd, are committed to maintain a high level of availability, reliability and security. SimpleX client apps can have multiple preset relay server operators that you can opt-in or opt-out of using. You are and will continue to be able to use any other operators or your own servers.
+We see users and data sovereignty, and device and provider portability as critically important properties for any communication system.
 
-SimpleX network design is based on the principles of users and data sovereignty, and device and operator portability.
-
-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
 
 #### User profiles
 
-Servers used by SimpleX Chat apps do not create, store or identify user chat profiles. The profiles you can create in the app are local to your device, and can be removed at any time via the app.
+Servers used by SimpleX Chat apps do not create, store or identify user profiles. The profiles you can create in the app are local to your device, and can be removed at any time via the app.
 
-When you create the local profile, no records are created on any of the relay servers, and infrastructure operators, whether preset in the app or any other, have no access to any part of your information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all your data and the private connections you created with other software users.
+When you create the local profile, no records are created on any of the relay servers, and infrastructure providers, whether SimpleX Chat Ltd or any other, have no access to any part of your information, and even to the fact that you created a profile - it is a local record stored only on your device. That means that if you delete the app, and have no backup, you will permanently lose all your data and the private connections you created with other software users.
 
 You can transfer the profile to another device by creating a backup of the app data and restoring it on the new device, but you cannot use more than one device with the copy of the same profile at the same time - it will disrupt any active conversations on either or both devices, as a security property of end-to-end encryption.
 
 #### 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 4mb 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.
 
-#### Private message delivery 
+You do not have control over which servers are used to send messages to your contacts - they are chosen by them. To send messages your client needs to connect to these servers, therefore the servers chosen by your contacts can observe your IP address. You can use VPN or some overlay network (e.g., Tor) to hide your IP address from the servers chosen by your contacts. In the near future we will add the layer in the messaging protocol that will route sent message via the relays chosen by you as well.
 
-You do not have control over which servers are used to send messages to your contacts - these servers are chosen by your contacts. To send messages your client by default uses configured servers to forward messages to the destination servers, thus protecting your IP address from the servers chosen by your contacts.
-
-In case you use preset servers of more than one operator, the app will prefer to use a server of an operator different from the operator of the destination server to forward messages, preventing destination server to correlate messages as belonging to one client.
-
-You can additionally use VPN or some overlay network (e.g., Tor) to hide your IP address from the servers chosen by you.
-
-*Please note*: the clients allow changing configuration to connect to the destination servers directly. It is not recommended - if you make such change, your IP address will be visible to the destination servers.
-
-#### Storage of messages and files on the servers
-
-The messages are removed from the relay servers as soon as all messages of the file they were stored in are delivered and saving new messages switches to another file, as long as these servers use unmodified published code. Undelivered messages are also marked as delivered after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
+The messages are permanently removed from the used relay servers as soon as they are delivered, as long as these servers used unmodified published code. Undelivered messages are deleted after the time that is configured in the messaging servers you use (21 days for preset messaging servers).
 
 The files are stored on file relay servers for the time configured in the relay servers you use (48 hours for preset file servers).
 
-The encrypted messages can be stored for some time after they are delivered or expired (because servers use append-only logs for message storage). This time varies, and may be longer in connections with fewer messages, but it is usually limited to 1 month, including any backup storage.
+If a messaging servers are restarted, the encrypted message can be stored in a backup file until it is overwritten by the next restart (usually within 1 week for preset relay servers).
+
+As this software is fully open-source and provided under AGPLv3 license, all infrastructure providers and owners, and the developers of the client and server applications who use the SimpleX Chat source code, are required to publish any changes to this software under the same AGPLv3 license - including any modifications to the provided servers.
+
+In addition to the AGPLv3 license terms, SimpleX Chat Ltd is committed to the software users that the preset relays that we provide via the apps will always be compiled from the [published open-source code](https://github.com/simplex-chat/simplexmq), without any modifications.
 
 #### Connections with other users
 
-When you create a connection with another user, two messaging queues (you can think about them as mailboxes) are created on messaging relay servers (chosen by you and your contact each), that can be the preset servers or the servers that you and your contact configured in the app. SimpleX messaging protocol uses separate queues for direct and response messages, and the apps prefer to create these queues on two different relay servers, or, if available, the relays of two different operators, for increased privacy, in case you have more than one relay server configured in the app, which is the default.
+When you create a connection with another user, two messaging queues (you can think about them as mailboxes) are created on messaging relay servers (chosen by you and your contact each), that can be the preset servers or the servers that you and your contact configured in the app. SimpleX messaging protocol uses separate queues for direct and response messages, and the apps prefer to create these queues on two different relay servers for increased privacy, in case you have more than one relay server configured in the app, which is the default.
 
-Preset and unmodified SimpleX relay servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow infrastructure owners and operators to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
+SimpleX relay servers do not store information about which queues are linked to your profile on the device, and they do not collect any information that would allow infrastructure owners and providers to establish that these queues are related to your device or your profile - the access to each queue is authorized by two anonymous unique cryptographic keys, different for each queue, and separate for sender and recipient of the messages.
 
 #### Connection links privacy
 
@@ -105,8 +75,6 @@ You can always safely replace the initial part of the link `https://simplex.chat
 
 #### iOS Push Notifications
 
-This section applies only to the notification servers operated by SimpleX Chat Ltd.
-
 When you choose to use instant push notifications in SimpleX iOS app, because the design of push notifications requires storing the device token on notification server, the notifications server can observe how many messaging queues your device has notifications enabled for, and approximately how many messages are sent to each queue.
 
 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.
@@ -115,111 +83,93 @@ You can read more about the design of iOS push notifications [here](./blog/20220
 
 #### Another information stored on the servers
 
-Additional technical information can be stored on the network servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX network design limits this additional technical information to the minimum required to operate the software and servers. To prevent server overloading or attacks, the servers can temporarily store data that can link to particular users or devices, including IP addresses, geographic location, or information related to the transport sessions. This information is not stored for the absolute majority of the app users, even for those who use the servers very actively.
+Additional technical information can be stored on our servers, including randomly generated authentication tokens, keys, push tokens, and other material that is necessary to transmit messages. SimpleX Chat design limits this additional technical information to the minimum required to operate the software and servers. To prevent server overloading or attacks, the servers can temporarily store data that can link to particular users or devices, including IP addresses, geographic location, or information related to the transport sessions. This information is not stored for the absolute majority of the app users, even for those who use the servers very actively.
 
 #### SimpleX Directory
 
-This section applies only to the experimental group directory operated by SimpleX Chat Ltd.
-
 [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
 
-The app includes support contact operated by SimpleX Chat Ltd. If you contact support, any personal data you share is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion) when it is possible, and avoid sharing any personal information.
+If you contact SimpleX Chat Ltd, any personal data you share with us is kept only for the purposes of researching the issue and contacting you about your case. We recommend contacting support [via chat](https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23%2F%3Fv%3D1%26dh%3DMCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion) when it is possible, and avoid sharing any personal information.
 
-### Preset Server Operators
+### Information we may share
 
-Preset server operators will not share the information on their servers with each other, other than aggregate usage statistics. 
+SimpleX Chat Ltd operates preset relay servers using third parties. While we do not have access and cannot share any user data, these third parties may access the encrypted user messages (but NOT the actual unencrypted message content or size) as it is stored or transmitted via our servers. Hosting providers can also store IP addresses and other transport information as part of their logs.
 
-Preset server operators will not provide general access to their servers or the data on their servers to each other.
+We use a third party for email services - if you ask for support via email, your and SimpleX Chat Ltd email providers may access these emails according to their privacy policies and terms. When the request is sensitive, we recommend contacting us via SimpleX Chat or using encrypted email using PGP key published at [openpgp.org](https://keys.openpgp.org/search?q=chat%40simplex.chat).
 
-Preset server operators will provide non-administrative access to control port of preset servers to SimpleX Chat Ltd, for the purposes of removing identified illegal content. This control port access only allows deleting known links and files, and access to aggregate statistics, but does NOT allow enumerating any information on the servers.
-
-### Information Preset Server Operators May Share
-
-The preset server operators use third parties. While they do not have access and cannot share any user data, these third parties may access the encrypted user messages (but NOT the actual unencrypted message content or size) as it is stored or transmitted via the servers. Hosting and network providers can also store IP addresses and other transport information as part of their logs.
-
-SimpleX Chat Ltd uses a third party for email services - if you ask for support via email, your and SimpleX Chat Ltd email providers may access these emails according to their privacy policies and terms. When the request is sensitive, please contact us via SimpleX Chat apps or using encrypted email using PGP key published at [openpgp.org](https://keys.openpgp.org/search?q=chat%40simplex.chat).
-
-The cases when the preset server operators may share the data temporarily stored on the servers:
+The cases when SimpleX Chat Ltd may share the data temporarily stored on the servers:
 
 - To meet any applicable law, or enforceable governmental request or court order.
 - To enforce applicable terms, including investigation of potential violations.
 - To detect, prevent, or otherwise address fraud, security, or technical issues.
-- To protect against harm to the rights, property, or safety of software users, operators of preset servers, or the public as required or permitted by law.
+- To protect against harm to the rights, property, or safety of software users, SimpleX Chat Ltd, or the public as required or permitted by law.
 
-At the time of updating this document, the preset server operators have never provided or have been requested the access to the preset relay servers or any information from the servers by any third parties. If the preset server operators are ever requested to provide such access or information, they will follow the due legal process to limit any information shared with the third parties to the minimally required by law.
+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.
 
-Preset server operators will publish information they are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
-
-### Source code license
-
-As this software is fully open-source and provided under AGPLv3 license, all infrastructure owners and operators, and the developers of the client and server applications who use the SimpleX Chat source code, are required to publish any changes to this software under the same AGPLv3 license - including any modifications to the servers.
-
-In addition to the AGPLv3 license terms, the preset relay server operators are committed to the software users that these servers will always be compiled from the [published open-source code](https://github.com/simplex-chat/simplexmq), without any modifications.
+We will publish information we are legally allowed to share about such requests in the [Transparency reports](./docs/TRANSPARENCY.md).
 
 ### Updates
 
-This Privacy Policy applies to SimpleX Chat Ltd and all other preset server operators you use in the app.
+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.
 
-This Privacy Policy may be updated as needed so that it is current, accurate, and as clear as possible. When it is updated, you will have to review and accept the changed policy within 30 days of such changes to continue using preset relay servers. Even if you fail to accept the changed policy, your continued use of SimpleX Chat software applications and preset relay servers confirms your acceptance of the updated Privacy Policy.
+Please also read our Conditions of Use of Software and Infrastructure below.
 
-Please also read The Conditions of Use of Software and Infrastructure below.
-
-If you have questions about this Privacy Policy please contact SimpleX Chat Ltd 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](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).
 
 ## Conditions of Use of Software and Infrastructure
 
-You accept the Conditions of Use of Software and Infrastructure ("Conditions") by installing or using any of SimpleX Chat software or using any of server infrastructure (collectively referred to as "Applications") operated by the Preset Server Operators, including SimpleX Chat Ltd, whether these servers are preset in the software or not.
+You accept the Conditions of Use of Software and Infrastructure ("Conditions") by installing or using any of our software or using any of our server infrastructure (collectively referred to as "Applications"), whether preset in the software or not.
 
-**Minimal age**. You must be at least 13 years old to use SimpleX Chat Applications. The minimum age to use SimpleX Applications without parental approval may be higher in your country.
+**Minimal age**. You must be at least 13 years old to use our Applications. The minimum age to use our Applications without parental approval may be higher in your country.
 
-**Infrastructure**. Infrastructure of the preset server operators includes messaging and file relay servers. SimpleX Chat Ltd also provides iOS push notification servers for public use. This infrastructure does not have any modifications from the [published open-source code](https://github.com/simplex-chat/simplexmq) available under AGPLv3 license. Any infrastructure provider, whether commercial or not, is required by the Affero clause (named after Affero Inc. company that pioneered the community-based Q&A sites in early 2000s) to publish any modifications under the same license. The statements in relation to Infrastructure and relay servers anywhere in this document assume no modifications to the published code, even in the cases when it is not explicitly stated.
+**Infrastructure**. Our Infrastructure includes preset messaging and file relay servers, and iOS push notification servers provided by SimpleX Chat Ltd for public use. Our infrastructure does not have any modifications from the [published open-source code](https://github.com/simplex-chat/simplexmq) available under AGPLv3 license. Any infrastructure provider, whether commercial or not, is required by the Affero clause (named after Affero Inc. company that pioneered the community-based Q&A sites in early 2000s) to publish any modifications under the same license. The statements in relation to Infrastructure and relay servers anywhere in this document assume no modifications to the published code, even in the cases when it is not explicitly stated.
 
-**Client applications**. SimpleX Chat client application Software (referred to as "app" or "apps") also has no modifications compared with published open-source code, and any developers of the alternative client apps based on SimpleX Chat code are required to publish any modifications under the same AGPLv3 license. Client applications should not include any tracking or analytics code, and do not share any tracking information with SimpleX Chat Ltd, preset server operators or any other third parties. If you ever discover any tracking or analytics code, please report it to SimpleX Chat Ltd, so it can be removed.
+**Client applications**. Our client application Software (referred to as "app" or "apps") also has no modifications compared with published open-source code, and any developers of the alternative client apps based on our code are required to publish any modifications under the same AGPLv3 license. Client applications should not include any tracking or analytics code, and do not share any information with SimpleX Chat Ltd or any other third parties. If you ever discover any tracking or analytics code, please report it to us, so we can remove it.
 
-**Accessing the infrastructure**. For the efficiency of the network access, the client Software by default accesses all queues your app creates on any relay server within one user profile via the same network (TCP/IP) connection. At the cost of additional traffic this configuration can be changed to use different transport session for each connection. Relay servers do not collect information about which queues were created or accessed via the same connection, so the relay servers cannot establish which queues belong to the same user profile. Whoever might observe your network traffic would know which relay servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common, even inside TLS encryption layer. Please refer to the [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about the privacy model and known security and privacy risks.
+**Accessing the infrastructure**. For the efficiency of the network access, the client Software by default accesses all queues your app creates on any relay server within one user profile via the same network (TCP/IP) connection. At the cost of additional traffic this configuration can be changed to use different transport session for each connection. Relay servers do not collect information about which queues were created or accessed via the same connection, so the relay servers cannot establish which queues belong to the same user profile. Whoever might observe your network traffic would know which relay servers you use, and how much data you send, but not to whom it is sent - the data that leaves the servers is always different from the data they receive - there are no identifiers or ciphertext in common, even inside TLS encryption layer. Please refer to our [technical design document](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information about our privacy model and known security and privacy risks.
 
-**Privacy of user data**. Servers do not retain any data you transmit for any longer than necessary to deliver the messages between apps. Preset server operators collect aggregate statistics across all their servers, as supported by published code and can be enabled by any infrastructure operator, but not any statistics per-user, or per geographic location, or per IP address, or per transport session. SimpleX Chat Ltd does not have information about how many people use SimpleX Chat applications, it only knows an approximate number of app installations and the aggregate traffic through the preset servers. In any case, preset server operators do not and will not sell or in any way monetize user data. The future business model assumes charging for some optional Software features instead, in a transparent and fair way.
+**Privacy of user data**. Servers do not retain any data we transmit for any longer than necessary to deliver the messages between apps. SimpleX Chat Ltd collects aggregate statistics across all its servers, as supported by published code and can be enabled by any infrastructure provider, but not any statistics per-user, or per geographic location, or per IP address, or per transport session. We do not have information about how many people use SimpleX Chat applications, we only know an approximate number of app installations and the aggregate traffic through the preset servers. In any case, we do not and will not sell or in any way monetize user data. Our future business model assumes charging for some optional Software features instead, in a transparent and fair way.
 
-**Operating Infrastructure**. For the purpose of using SimpleX Chat Software, if you continue using preset servers, you agree that your end-to-end encrypted messages are transferred via the preset servers in any countries where preset server operators have or use facilities and service providers or partners. The information about geographic location and hosting providers of the preset messaging servers is available on server pages.
+**Operating our Infrastructure**. For the purpose of using our Software, if you continue using preset servers, you agree that your end-to-end encrypted messages are transferred via the preset servers in any countries where we have or use facilities and service providers or partners. The information about geographic location of the servers will be made available in the apps in the near future.
 
-**Software**. You agree to downloading and installing updates to SimpleX Chat Applications when they are available; they would only be automatic if you configure your devices in this way.
+**Software**. You agree to downloading and installing updates to our Applications when they are available; they would only be automatic if you configure your devices in this way.
 
-**Traffic and device costs**. You are solely responsible for the traffic and device costs that you incur while using SimpleX Chat Applications, and any associated taxes.
+**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 SimpleX Chat Applications only for legal purposes. You will not use (or assist others in using) the Applications in ways that: 1) violate or infringe the rights of Software users, SimpleX Chat Ltd, other preset server operators, or others, including privacy, publicity, intellectual property, or other proprietary rights; 2) involve sending illegal communications, e.g. spam. While server operators cannot access content or identify messages or groups, in some cases the links to the illegal communications can be shared publicly on social media or websites. Preset server operators reserve the right to remove such links from the preset servers and disrupt the conversations that send illegal content via their servers, whether they were reported by the users or discovered by the operators themselves.
+**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.
 
-**Damage to SimpleX Chat Ltd and Preset Server Operators**. You must not (or assist others to) access, use, modify, distribute, transfer, or exploit SimpleX Chat Applications in unauthorized manners, or in ways that harm Software users, SimpleX Chat Ltd, other preset server operators, their Infrastructure, or any other systems. For example, you must not 1) access preset operators' Infrastructure or systems without authorization, in any way other than by using the Software; 2) disrupt the integrity or performance of preset operators' Infrastructure; 3) collect information about the users in any manner; or 4) sell, rent, or charge for preset operators' Infrastructure. This does not prohibit you from providing your own Infrastructure to others, whether free or for a fee, as long as you do not violate these Conditions and AGPLv3 license, including the requirement to publish any modifications of the relay server software.
+**Damage to SimpleX Chat Ltd**. 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.
 
-**Keeping your data secure**. SimpleX Chat is the first communication software that aims to be 100% private by design - server software neither has the ability to access your messages, nor it has information about who you communicate with. That means that you are solely responsible for keeping your device, your user profile and any data safe and secure. If you lose your phone or remove the Software from the device, you will not be able to recover the lost data, unless you made a back up. To protect the data you need to make regular backups, as using old backups may disrupt your communication with some of the contacts. SimpleX Chat Ltd and other preset server operators are not responsible for any data loss.
+**Keeping your data secure**. SimpleX Chat is the first communication software that aims to be 100% private by design - server software neither has the ability to access your messages, nor it has information about who you communicate with. That means that you are solely responsible for keeping your device, your user profile and any data safe and secure. If you lose your phone or remove the Software from the device, you will not be able to recover the lost data, unless you made a back up. To protect the data you need to make regular backups, as using old backups may disrupt your communication with some of the contacts.
 
 **Storing the messages on the device**. The messages are stored in the encrypted database on your device. Whether and how database passphrase is stored is determined by the configuration of the Software you use. The databases created prior to 2023 or in CLI (terminal) app may remain unencrypted, and it will be indicated in the app interface. In this case, if you make a backup of the data and store it unencrypted, the backup provider may be able to access the messages. Please note, that the desktop apps can be configured to store the database passphrase in the configuration file in plaintext, and unless you set the passphrase when first running the app, a random passphrase will be used and stored on the device. You can remove it from the device via the app settings.
 
 **Storing the files on the device**. The files currently sent and received in the apps by default (except CLI app) are stored on your device encrypted using unique keys, different for each file, that are stored in the database. Once the message that the file was attached to is removed, even if the copy of the encrypted file is retained, it should be impossible to recover the key allowing to decrypt the file. This local file encryption may affect app performance, and it can be disabled via the app settings. This change will only affect the new files. If you later re-enable the encryption, it will also affect only the new files. If you make a backup of the app data and store it unencrypted, the backup provider will be able to access any unencrypted files. In any case, irrespective of the storage setting, the files are always sent by all apps end-to-end encrypted.
 
-**No Access to Emergency Services**. SimpleX Chat Applications do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.
+**No Access to Emergency Services**. Our Applications do not provide access to emergency service providers like the police, fire department, hospitals, or other public safety organizations. Make sure you can contact emergency service providers through a mobile, fixed-line telephone, or other service.
 
-**Third-party services**. SimpleX Chat Applications may allow you to access, use, or interact with the websites of SimpleX Chat Ltd, preset server operators or other third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.
+**Third-party services**. Our Applications may allow you to access, use, or interact with our or third-party websites, apps, content, and other products and services. When you use third-party services, their terms and privacy policies govern your use of those services.
 
-**Your Rights**. You own the messages and the information you transmit through SimpleX Applications. Your recipients are able to retain the messages they receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the Software. At the same time, repudiation property of the end-to-end encryption algorithm allows you to plausibly deny having sent the message, like you can deny what you said in a private face-to-face conversation, as the recipient cannot provide any proof to the third parties, by design.
+**Your Rights**. You own the messages and the information you transmit through our Applications. Your recipients are able to retain the messages they receive from you; there is no technical ability to delete data from their devices. While there are various app features that allow deleting messages from the recipients' devices, such as _disappearing messages_ and _full message deletion_, their functioning on your recipients' devices cannot be guaranteed or enforced, as the device may be offline or have a modified version of the Software. At the same time, repudiation property of the end-to-end encryption algorithm allows you to plausibly deny having sent the message, like you can deny what you said in a private face-to-face conversation, as the recipient cannot provide any proof to the third parties, by design.
 
-**License**. SimpleX Chat Ltd grants you a limited, revocable, non-exclusive, and non-transferable license to use SimpleX Chat Applications in accordance with these Conditions. The source-code of Applications is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE).
+**License**. SimpleX Chat Ltd grants you a limited, revocable, non-exclusive, and non-transferable license to use our Applications in accordance with these Conditions. The source-code of Applications is available and can be used under [AGPL v3 license](https://github.com/simplex-chat/simplex-chat/blob/stable/LICENSE).
 
-**SimpleX Chat Ltd Rights**. SimpleX Chat Ltd (and, where applicable, preset server operators) owns all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with the Applications. You may not use SimpleX Chat Ltd copyrights, trademarks, domains, logos, and other intellectual property rights unless you have SimpleX Chat Ltd written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.
+**SimpleX Chat Ltd Rights**. We own all copyrights, trademarks, domains, logos, trade secrets, and other intellectual property rights associated with our Applications. You may not use our copyrights, trademarks, domains, logos, and other intellectual property rights unless you have our written permission, and unless under an open-source license distributed together with the source code. To report copyright, trademark, or other intellectual property infringement, please contact chat@simplex.chat.
 
-**Disclaimers**. YOU USE SIMPLEX APPLICATIONS AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. SIMPLEX CHAT LTD PROVIDES APPLICATIONS ON AN “AS IS” BASIS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND FREEDOM FROM COMPUTER VIRUS OR OTHER HARMFUL CODE. SIMPLEX CHAT LTD DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY THEM IS ACCURATE, COMPLETE, OR USEFUL, THAT THEIR APPLICATIONS WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT THEIR APPLICATIONS WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. SIMPLEX CHAT LTD AND OTHER PRESET OPERATORS DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN THE USERS USE APPLICATIONS. SIMPLEX CHAT LTD AND OTHER PRESET OPERATORS ARE NOT RESPONSIBLE FOR THE ACTIONS OR INFORMATION (INCLUDING CONTENT) OF THEIR USERS OR OTHER THIRD PARTIES. YOU RELEASE SIMPLEX CHAT LTD, OTHER PRESET OPERATORS, AFFILIATES, DIRECTORS, OFFICERS, EMPLOYEES, PARTNERS, AND AGENTS ("SIMPLEX PARTIES") FROM ANY CLAIM, COMPLAINT, CAUSE OF ACTION, CONTROVERSY, OR DISPUTE (TOGETHER, "CLAIM") AND DAMAGES, KNOWN AND UNKNOWN, RELATING TO, ARISING OUT OF, OR IN ANY WAY CONNECTED WITH ANY SUCH CLAIM YOU HAVE AGAINST ANY THIRD PARTIES.
+**Disclaimers**. YOU USE OUR APPLICATIONS AT YOUR OWN RISK AND SUBJECT TO THE FOLLOWING DISCLAIMERS. WE PROVIDE OUR APPLICATIONS ON AN “AS IS” BASIS WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE, NON-INFRINGEMENT, AND FREEDOM FROM COMPUTER VIRUS OR OTHER HARMFUL CODE. SIMPLEX CHAT LTD DOES NOT WARRANT THAT ANY INFORMATION PROVIDED BY US IS ACCURATE, COMPLETE, OR USEFUL, THAT OUR APPLICATIONS WILL BE OPERATIONAL, ERROR-FREE, SECURE, OR SAFE, OR THAT OUR APPLICATIONS WILL FUNCTION WITHOUT DISRUPTIONS, DELAYS, OR IMPERFECTIONS. WE DO NOT CONTROL, AND ARE NOT RESPONSIBLE FOR, CONTROLLING HOW OR WHEN OUR USERS USE OUR APPLICATIONS. WE ARE NOT RESPONSIBLE FOR THE ACTIONS OR INFORMATION (INCLUDING CONTENT) OF OUR USERS OR OTHER THIRD PARTIES. YOU RELEASE US, AFFILIATES, DIRECTORS, OFFICERS, EMPLOYEES, PARTNERS, AND AGENTS ("SIMPLEX PARTIES") FROM ANY CLAIM, COMPLAINT, CAUSE OF ACTION, CONTROVERSY, OR DISPUTE (TOGETHER, "CLAIM") AND DAMAGES, KNOWN AND UNKNOWN, RELATING TO, ARISING OUT OF, OR IN ANY WAY CONNECTED WITH ANY SUCH CLAIM YOU HAVE AGAINST ANY THIRD PARTIES.
 
-**Limitation of liability**. THE SIMPLEX PARTIES WILL NOT BE LIABLE TO YOU FOR ANY LOST PROFITS OR CONSEQUENTIAL, SPECIAL, PUNITIVE, INDIRECT, OR INCIDENTAL DAMAGES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR CONDITIONS, US, OR SIMPLEX APPLICATIONS, EVEN IF THE SIMPLEX PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. THE AGGREGATE LIABILITY OF THE SIMPLEX PARTIES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH THESE CONDITIONS, THE SIMPLEX PARTIES, OR THE APPLICATIONS WILL NOT EXCEED ONE DOLLAR ($1). THE FOREGOING DISCLAIMER OF CERTAIN DAMAGES AND LIMITATION OF LIABILITY WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. THE LAWS OF SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO SOME OR ALL OF THE EXCLUSIONS AND LIMITATIONS SET FORTH ABOVE MAY NOT APPLY TO YOU. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN THE CONDITIONS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+**Limitation of liability**. THE SIMPLEX PARTIES WILL NOT BE LIABLE TO YOU FOR ANY LOST PROFITS OR CONSEQUENTIAL, SPECIAL, PUNITIVE, INDIRECT, OR INCIDENTAL DAMAGES RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR CONDITIONS, US, OR OUR APPLICATIONS, EVEN IF THE SIMPLEX PARTIES HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR AGGREGATE LIABILITY RELATING TO, ARISING OUT OF, OR IN ANY WAY IN CONNECTION WITH OUR CONDITIONS, US, OR OUR APPLICATIONS WILL NOT EXCEED ONE DOLLAR ($1). THE FOREGOING DISCLAIMER OF CERTAIN DAMAGES AND LIMITATION OF LIABILITY WILL APPLY TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW. THE LAWS OF SOME JURISDICTIONS MAY NOT ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO SOME OR ALL OF THE EXCLUSIONS AND LIMITATIONS SET FORTH ABOVE MAY NOT APPLY TO YOU. NOTWITHSTANDING ANYTHING TO THE CONTRARY IN OUR CONDITIONS, IN SUCH CASES, THE LIABILITY OF THE SIMPLEX PARTIES WILL BE LIMITED TO THE EXTENT PERMITTED BY APPLICABLE LAW.
 
-**Availability**. The Applications may be disrupted, including for maintenance, upgrades, or network or equipment failures. SimpleX Chat Ltd may discontinue some or all of their Applications, including certain features and the support for certain devices and platforms, at any time. Preset server operators may discontinue providing the servers, at any time.
+**Availability**. Our Applications may be disrupted, including for maintenance, upgrades, or network or equipment failures. We may discontinue some or all of our Applications, including certain features and the support for certain devices and platforms, at any time.
 
-**Resolving disputes**. You agree to resolve any Claim you have with SimpleX Chat Ltd and/or preset server operators relating to or arising from these Conditions, them, or the Applications in the courts of England and Wales. You also agree to submit to the personal jurisdiction of such courts for the purpose of resolving all such disputes. The laws of England govern these Conditions, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat Ltd (or preset server operators) and you, without regard to conflict of law provisions.
+**Resolving disputes**. You agree to resolve any Claim you have with us relating to or arising from our Conditions, us, or our Applications in the courts of England and Wales. You also agree to submit to the personal jurisdiction of such courts for the purpose of resolving all such disputes. The laws of England govern our Conditions, as well as any disputes, whether in court or arbitration, which might arise between SimpleX Chat Ltd and you, without regard to conflict of law provisions.
 
-**Changes to the conditions**. SimpleX Chat Ltd may update the Conditions from time to time. The updated conditions have to be accepted within 30 days. Even if you fail to accept updated conditions, your continued use of SimpleX Chat Applications confirms your acceptance of the updated Conditions and supersedes any prior Conditions. You will comply with all applicable export control and trade sanctions laws. These Conditions cover the entire agreement between you and SimpleX Chat Ltd, and any preset server operators where applicable, regarding SimpleX Chat Applications. If you do not agree with these Conditions, you should stop using the Applications.
+**Changes to the conditions**. SimpleX Chat Ltd may update the Conditions from time to time. Your continued use of our Applications confirms your acceptance of our updated Conditions and supersedes any prior Conditions. You will comply with all applicable export control and trade sanctions laws. Our Conditions cover the entire agreement between you and SimpleX Chat Ltd regarding our Applications. If you do not agree with our Conditions, you should stop using our Applications.
 
-**Enforcing the conditions**. If SimpleX Chat Ltd or preset server operators fail to enforce any of these Conditions, that does not mean they waive the right to enforce them. If any provision of the Conditions is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from the Conditions and shall not affect the enforceability of the remaining provisions. The Applications are not intended for distribution to or use in any country where such distribution or use would violate local law or would subject SimpleX Chat Ltd to any regulations in another country. SimpleX Chat Ltd reserve the right to limit the access to the Applications in any country. Preset operators reserve the right to limit access to their servers in any country. If you have specific questions about these Conditions, please contact SimpleX Chat Ltd at chat@simplex.chat.
+**Enforcing the conditions**. If we fail to enforce any of our Conditions, that does not mean we waive the right to enforce them. If any provision of the Conditions is deemed unlawful, void, or unenforceable, that provision shall be deemed severable from our Conditions and shall not affect the enforceability of the remaining provisions. Our Applications are not intended for distribution to or use in any country where such distribution or use would violate local law or would subject us to any regulations in another country. We reserve the right to limit our Applications in any country. If you have specific questions about these Conditions, please contact us at chat@simplex.chat.
 
-**Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd and preset server operators at any time by deleting the Applications from your devices and discontinuing use of the Infrastructure of SimpleX Chat Ltd and preset server operators. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the conditions, Enforcing the conditions, and Ending these conditions will survive termination of your relationship with SimpleX Chat Ltd and/or preset server operators.
+**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 November 14, 2024
+Updated April 24, 2024

README.md

@@ -72,7 +72,7 @@ You must:
 
 Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.
 
-You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=2-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=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:
 
@@ -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.
 
@@ -233,12 +233,14 @@ 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)
 
+[Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.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)
 
 [Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
@@ -247,6 +249,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).
@@ -403,9 +409,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.
 

apps/ios/Shared/Assets.xcassets/flux_logo-light.imageset/Contents.json

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

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

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

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

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

apps/ios/Shared/ContentView.swift

@@ -9,23 +9,10 @@ import SwiftUI
 import Intents
 import SimpleXChat
 
-private enum NoticesSheet: Identifiable {
-    case whatsNew(updatedConditions: Bool)
-    case updatedConditions
-
-    var id: String {
-        switch self {
-        case .whatsNew: return "whatsNew"
-        case .updatedConditions: return "updatedConditions"
-        }
-    }
-}
-
 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
@@ -42,13 +29,12 @@ 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 noticesShown = false
-    @State private var noticesSheetItem: NoticesSheet? = nil
+    @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
 
@@ -100,7 +86,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
@@ -123,6 +109,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 }
@@ -264,8 +253,7 @@ struct ContentView: View {
 
     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
@@ -274,15 +262,8 @@ struct ContentView: View {
                     alertManager.showAlert(laNoticeAlert())
                 } else if !chatModel.showCallView && CallController.shared.activeCallInvitation == nil {
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                        if !noticesShown {
-                            let showWhatsNew = shouldShowWhatsNew()
-                            let showUpdatedConditions = chatModel.conditions.conditionsAction?.showNotice ?? false
-                            noticesShown = showWhatsNew || showUpdatedConditions
-                            if showWhatsNew {
-                                noticesSheetItem = .whatsNew(updatedConditions: showUpdatedConditions)
-                            } else if showUpdatedConditions {
-                                noticesSheetItem = .updatedConditions
-                            }
+                        if !showWhatsNew {
+                            showWhatsNew = shouldShowWhatsNew()
                         }
                     }
                 }
@@ -290,22 +271,8 @@ struct ContentView: View {
                 connectViaUrl()
             }
             .onChange(of: chatModel.appOpenUrl) { _ in connectViaUrl() }
-            .sheet(item: $noticesSheetItem) { item in
-                switch item {
-                case let .whatsNew(updatedConditions):
-                    WhatsNewView(updatedConditions: updatedConditions)
-                        .modifier(ThemedBackground())
-                        .if(updatedConditions) { v in
-                            v.task { await setConditionsNotified_() }
-                        }
-                case .updatedConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
-                    .modifier(ThemedBackground(grouped: true))
-                    .task { await setConditionsNotified_() }
-                }
+            .sheet(isPresented: $showWhatsNew) {
+                WhatsNewView()
             }
             if chatModel.setDeliveryReceipts {
                 SetDeliveryReceiptsView()
@@ -317,15 +284,6 @@ struct ContentView: View {
         .onContinueUserActivity("INStartVideoCallIntent", perform: processUserActivity)
     }
 
-    private func setConditionsNotified_() async {
-        do {
-            let conditionsId = ChatModel.shared.conditions.currentConditions.conditionsId
-            try await setConditionsNotified(conditionsId: conditionsId)
-        } catch let error {
-            logger.error("setConditionsNotified error: \(responseError(error))")
-        }
-    }
-
     private func processUserActivity(_ activity: NSUserActivity) {
         let intent = activity.interaction?.intent
         if let intent = intent as? INStartCallIntent {
@@ -342,18 +300,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/ChatModel.swift

@@ -147,7 +147,6 @@ 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?
@@ -193,8 +192,6 @@ final class ChatModel: ObservableObject {
     @Published var draft: ComposeState?
     @Published var draftChatId: String?
     @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)
-    // usage conditions
-    @Published var conditions: ServerOperatorConditions = .empty
 
     var messageDelivery: Dictionary<Int64, () -> Void> = [:]
 
@@ -529,7 +526,7 @@ final class ChatModel: ObservableObject {
     }
 
     func updateCurrentUserUiThemes(uiThemes: ThemeModeOverrides?) {
-        guard var current = currentUser, current.uiThemes != uiThemes else { return }
+        guard var current = currentUser else { return }
         current.uiThemes = uiThemes
         let i = users.firstIndex(where: { $0.user.userId == current.userId })
         if let i {

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),
@@ -77,6 +61,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                 ItemsModel.shared.loadOpenChat(chatId)
             }
         }
+        handler()
     }
 
     private func ntfCallAction(_ content: UNNotificationContent, _ action: String) -> (ChatId, NtfCallAction)? {
@@ -91,6 +76,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 +185,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 +210,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) {

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -462,7 +462,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String
     let r = chatSendCmdSync(.apiGetNtfToken)
     switch r {
     case let .ntfToken(token, status, ntfMode, ntfServer): return (token, status, ntfMode, ntfServer)
-    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED, _))): return (nil, nil, .off, nil)
+    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off, nil)
     default:
         logger.debug("apiGetNtfToken response: \(String(describing: r))")
         return (nil, nil, .off, nil)
@@ -500,6 +500,18 @@ func apiDeleteToken(token: DeviceToken) async throws {
     try await sendCommandOkResp(.apiDeleteToken(token: token))
 }
 
+func getUserProtoServers(_ serverProtocol: ServerProtocol) throws -> UserProtoServers {
+    let userId = try currentUserId("getUserProtoServers")
+    let r = chatSendCmdSync(.apiGetUserProtoServers(userId: userId, serverProtocol: serverProtocol))
+    if case let .userProtoServers(_, servers) = r { return servers }
+    throw r
+}
+
+func setUserProtoServers(_ serverProtocol: ServerProtocol, servers: [ServerCfg]) async throws {
+    let userId = try currentUserId("setUserProtoServers")
+    try await sendCommandOkResp(.apiSetUserProtoServers(userId: userId, serverProtocol: serverProtocol, servers: servers))
+}
+
 func testProtoServer(server: String) async throws -> Result<(), ProtocolTestFailure> {
     let userId = try currentUserId("testProtoServer")
     let r = await chatSendCmd(.apiTestProtoServer(userId: userId, server: server))
@@ -512,65 +524,6 @@ func testProtoServer(server: String) async throws -> Result<(), ProtocolTestFail
     throw r
 }
 
-func getServerOperators() throws -> ServerOperatorConditions {
-    let r = chatSendCmdSync(.apiGetServerOperators)
-    if case let .serverOperatorConditions(conditions) = r { return conditions }
-    logger.error("getServerOperators error: \(String(describing: r))")
-    throw r
-}
-
-func setServerOperators(operators: [ServerOperator]) async throws -> ServerOperatorConditions {
-    let r = await chatSendCmd(.apiSetServerOperators(operators: operators))
-    if case let .serverOperatorConditions(conditions) = r { return conditions }
-    logger.error("setServerOperators error: \(String(describing: r))")
-    throw r
-}
-
-func getUserServers() async throws -> [UserOperatorServers] {
-    let userId = try currentUserId("getUserServers")
-    let r = await chatSendCmd(.apiGetUserServers(userId: userId))
-    if case let .userServers(_, userServers) = r { return userServers }
-    logger.error("getUserServers error: \(String(describing: r))")
-    throw r
-}
-
-func setUserServers(userServers: [UserOperatorServers]) async throws {
-    let userId = try currentUserId("setUserServers")
-    let r = await chatSendCmd(.apiSetUserServers(userId: userId, userServers: userServers))
-    if case .cmdOk = r { return }
-    logger.error("setUserServers error: \(String(describing: r))")
-    throw r
-}
-
-func validateServers(userServers: [UserOperatorServers]) async throws -> [UserServersError] {
-    let userId = try currentUserId("validateServers")
-    let r = await chatSendCmd(.apiValidateServers(userId: userId, userServers: userServers))
-    if case let .userServersValidation(_, serverErrors) = r { return serverErrors }
-    logger.error("validateServers error: \(String(describing: r))")
-    throw r
-}
-
-func getUsageConditions() async throws -> (UsageConditions, String?, UsageConditions?) {
-    let r = await chatSendCmd(.apiGetUsageConditions)
-    if case let .usageConditions(usageConditions, conditionsText, acceptedConditions) = r { return (usageConditions, conditionsText, acceptedConditions) }
-    logger.error("getUsageConditions error: \(String(describing: r))")
-    throw r
-}
-
-func setConditionsNotified(conditionsId: Int64) async throws {
-    let r = await chatSendCmd(.apiSetConditionsNotified(conditionsId: conditionsId))
-    if case .cmdOk = r { return }
-    logger.error("setConditionsNotified error: \(String(describing: r))")
-    throw r
-}
-
-func acceptConditions(conditionsId: Int64, operatorIds: [Int64]) async throws -> ServerOperatorConditions {
-    let r = await chatSendCmd(.apiAcceptConditions(conditionsId: conditionsId, operatorIds: operatorIds))
-    if case let .serverOperatorConditions(conditions) = r { return conditions }
-    logger.error("acceptConditions error: \(String(describing: r))")
-    throw r
-}
-
 func getChatItemTTL() throws -> ChatItemTTL {
     let userId = try currentUserId("getChatItemTTL")
     return try chatItemTTLResponse(chatSendCmdSync(.apiGetChatItemTTL(userId: userId)))
@@ -632,18 +585,12 @@ func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profi
     throw r
 }
 
-func apiGroupMemberInfoSync(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
+func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
     let r = chatSendCmdSync(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
     throw r
 }
 
-func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, ConnectionStats?) {
-    let r = await chatSendCmd(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
-    if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
-    throw r
-}
-
 func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
     let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
     if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
@@ -698,8 +645,8 @@ func apiGetContactCode(_ contactId: Int64) async throws -> (Contact, String) {
     throw r
 }
 
-func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, String) {
-    let r = await chatSendCmd(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
+func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, String) {
+    let r = chatSendCmdSync(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
     if case let .groupMemberCode(_, _, member, connectionCode) = r { return (member, connectionCode) }
     throw r
 }
@@ -790,12 +737,6 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
             message: "Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection."
         )
         return (nil, alert)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .QUOTA))):
-        let alert = mkAlert(
-            title: "Undelivered messages",
-            message: "The connection reached the limit of undelivered messages, your contact may be offline."
-        )
-        return (nil, alert)
     case let .chatCmdError(_, .errorAgent(.INTERNAL(internalErr))):
         if internalErr == "SEUniqueID" {
             let alert = mkAlert(
@@ -1170,8 +1111,8 @@ func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool
                 showAlert(
                     title: NSLocalizedString("Unknown servers!", comment: "alert title"),
                     message: (
-                        String.localizedStringWithFormat(NSLocalizedString("Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.", comment: "alert message"), srvs) +
-                        (otherErrsStr != "" ? "\n\n" + String.localizedStringWithFormat(NSLocalizedString("Other file errors:\n%@", comment: "alert message"), otherErrsStr) : "")
+                        NSLocalizedString("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs).", comment: "alert message") +
+                        (otherErrsStr != "" ? "\n\n" + NSLocalizedString("Other file errors:\n\(otherErrsStr)", comment: "alert message") : "")
                     ),
                     buttonTitle: NSLocalizedString("Download", comment: "alert button"),
                     buttonAction: {
@@ -1215,7 +1156,7 @@ func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool
             await MainActor.run {
                 showAlert(
                     NSLocalizedString("Error receiving file", comment: "alert title"),
-                    message: String.localizedStringWithFormat(NSLocalizedString("File errors:\n%@", comment: "alert message"), otherErrsStr)
+                    message: NSLocalizedString("File errors:\n\(otherErrsStr)", comment: "alert message")
                 )
             }
         }
@@ -1605,7 +1546,6 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
     try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
-    m.conditions = try getServerOperators()
     if m.currentUser == nil {
         onboardingStageDefault.set(.step1_SimpleXInfo)
         privacyDeliveryReceiptsSet.set(true)
@@ -1650,7 +1590,7 @@ private func chatInitialized(start: Bool, refreshInvitations: Bool) throws {
     }
 }
 
-func startChat(refreshInvitations: Bool = true, onboarding: Bool = false) throws {
+func startChat(refreshInvitations: Bool = true) throws {
     logger.debug("startChat")
     let m = ChatModel.shared
     try setNetworkConfig(getNetCfg())
@@ -1669,15 +1609,13 @@ func startChat(refreshInvitations: Bool = true, onboarding: Bool = false) throws
         if let token = m.deviceToken {
             registerToken(token: token)
         }
-        if !onboarding {
-            withAnimation {
-                let savedOnboardingStage = onboardingStageDefault.get()
-                m.onboardingStage = [.step1_SimpleXInfo, .step2_CreateProfile].contains(savedOnboardingStage) && m.users.count == 1
-                ? .step3_ChooseServerOperators
-                : savedOnboardingStage
-                if m.onboardingStage == .onboardingComplete && !privacyDeliveryReceiptsSet.get() {
-                    m.setDeliveryReceipts = true
-                }
+        withAnimation {
+            let savedOnboardingStage = onboardingStageDefault.get()
+            m.onboardingStage = [.step1_SimpleXInfo, .step2_CreateProfile].contains(savedOnboardingStage) && m.users.count == 1
+                                ? .step3_CreateSimpleXAddress
+                                : savedOnboardingStage
+            if m.onboardingStage == .onboardingComplete && !privacyDeliveryReceiptsSet.get() {
+                m.setDeliveryReceipts = true
             }
         }
     }
@@ -2146,6 +2084,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
         await withCall(contact) { call in
             await MainActor.run {
                 call.callState = .offerReceived
+                call.peerMedia = callType.media
                 call.sharedKey = sharedKey
             }
             let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)

apps/ios/Shared/SimpleXApp.swift

@@ -82,17 +82,11 @@ 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 {
+                                    Task {
+                                        await updateChats()
+                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                            await updateCallInvitations()
                                         }
                                     }
                                 }

apps/ios/Shared/Theme/Theme.swift

@@ -122,7 +122,7 @@ extension ThemeWallpaper {
         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 }
+        let image: String? = if case WallpaperType.image = type, let image = type.uiImage { resizeImageToStrSize(image, maxDataSize: 5_000_000) } else { nil }
         return ThemeWallpaper (
             preset: preset,
             scale: scale,

apps/ios/Shared/Theme/ThemeManager.swift

@@ -197,7 +197,7 @@ class ThemeManager {
         var themeIds = currentThemeIdsDefault.get()
         themeIds[nonSystemThemeName] = prevValue.themeId
         currentThemeIdsDefault.set(themeIds)
-        applyTheme(currentThemeDefault.get())
+        applyTheme(nonSystemThemeName)
     }
 
     static func copyFromSameThemeOverrides(_ type: WallpaperType?, _ lowerLevelOverride: ThemeModeOverride?, _ pref: Binding<ThemeModeOverride>) -> Bool {

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

@@ -17,8 +17,8 @@ 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
@@ -27,39 +27,24 @@ struct ActiveCallView: View {
     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 +54,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()
@@ -102,7 +84,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 +99,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,7 +110,7 @@ struct ActiveCallView: View {
                         call.callState = .invitationSent
                         call.localCapabilities = capabilities
                     }
-                    if call.hasVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
+                    if call.supportsVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
                         try? AVAudioSession.sharedInstance().setCategory(.playback, options: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
                     }
                     CallSoundsPlayer.shared.startConnectingCallSound()
@@ -138,7 +120,7 @@ struct ActiveCallView: View {
                 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))")
                     }
@@ -182,9 +164,6 @@ struct ActiveCallView: View {
                 }
                 if state.connectionState == "closed" {
                     closeCallView(client)
-                    if let callUUID = m.activeCall?.callUUID {
-                        CallController.shared.endCall(callUUID: callUUID)
-                    }
                     m.activeCall = nil
                     m.activeCallViewIsCollapsed = false
                 }
@@ -203,14 +182,6 @@ struct ActiveCallView: View {
                     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
@@ -255,26 +226,6 @@ struct ActiveCallView: View {
         }
     }
 
-    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
@@ -290,16 +241,44 @@ struct ActiveCallOverlay: View {
 
     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()
+                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
+                        toggleSpeakerButton()
+                            .frame(width: 40, height: 40)
+                    } else if call.hasMedia {
+                        AudioDevicePicker()
+                            .scaleEffect(2)
+                            .frame(maxWidth: 40, maxHeight: 40)
+                    } else {
+                        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
@@ -314,32 +293,35 @@ struct ActiveCallOverlay: View {
                     }
                     .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()
+                    // 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
+                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
+                        toggleSpeakerButton()
+                            .frame(maxWidth: .infinity, alignment: .trailing)
+                    } else if call.hasMedia {
+                        AudioDevicePicker()
+                            .scaleEffect(2)
+                            .frame(maxWidth: 50, maxHeight: 40)
+                            .frame(maxWidth: .infinity, alignment: .trailing)
+                    } else {
+                        Color.clear.frame(width: 50, height: 40)
+                    }
                 }
-                Spacer()
-                toggleCameraButton()
+                .padding(.bottom, 60)
+                .padding(.horizontal, 48)
             }
-            .padding(.horizontal, 20)
-            .padding(.bottom, 16)
-            .frame(maxWidth: 440, alignment: .center)
         }
         .frame(maxWidth: .infinity)
         .onAppear {
@@ -401,54 +383,36 @@ struct ActiveCallOverlay: View {
 
     private func endCallButton() -> some View {
         let cc = CallController.shared
-        return callButton("phone.down.fill", .red, padding: 10) {
+        return callButton("phone.down.fill", width: 60, height: 60) {
             if let uuid = call.callUUID {
                 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
+        controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
+            Task {
+                let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
+                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
+                DispatchQueue.main.async {
+                    call.speakerEnabled = !speakerEnabled
+                }
+            }
         }
         .onAppear {
             deviceManager.call = call
@@ -456,67 +420,53 @@ struct ActiveCallOverlay: View {
         }
     }
 
-    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, callUUID: UUID().uuidString.lowercased(), 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, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
                 .background(.black)
         }
     }

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

@@ -104,7 +104,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.uuidString.lowercased()) {
             action.fulfill()
         } else {
             action.fail()
@@ -121,8 +121,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
         RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
         RTCAudioSession.sharedInstance().isAudioEnabled = true
         do {
-            let hasVideo = ChatModel.shared.activeCall?.hasVideo == true
-            if hasVideo {
+            let supportsVideo = ChatModel.shared.activeCall?.supportsVideo == true
+            if supportsVideo {
                 try audioSession.setCategory(.playAndRecord, mode: .videoChat, options: [.defaultToSpeaker, .mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
             } else {
                 try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
@@ -133,7 +133,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                     try? await Task.sleep(nanoseconds: UInt64(i) * 300_000000)
                     if let preferred = audioSession.preferredInputDevice() {
                         await MainActor.run { try? audioSession.setPreferredInput(preferred) }
-                    } else if hasVideo {
+                    } else if supportsVideo {
                         await MainActor.run { try? audioSession.overrideOutputAudioPort(.speaker) }
                     }
                 }
@@ -357,9 +357,11 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                 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")
+            if callManager.startOutgoingCall(callUUID: callUUID) {
+                logger.debug("CallController.startCall: call started")
+            } else {
+                logger.error("CallController.startCall: no active call")
+            }
         }
     }
 

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

@@ -12,7 +12,7 @@ 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)
+        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, localMedia: media)
         call.speakerEnabled = media == .video
         ChatModel.shared.activeCall = call
         return uuid
@@ -22,7 +22,7 @@ class CallManager {
         let m = ChatModel.shared
         if let call = m.activeCall, call.callUUID == 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
@@ -44,7 +44,7 @@ class CallManager {
             contact: invitation.contact,
             callUUID: invitation.callUUID,
             callState: .invitationAccepted,
-            initialCallType: invitation.callType.media,
+            localMedia: invitation.callType.media,
             sharedKey: invitation.sharedKey
         )
         call.speakerEnabled = invitation.callType.media == .video
@@ -68,10 +68,10 @@ class CallManager {
         }
     }
 
-    func enableMedia(source: CallMediaSource, enable: Bool, callUUID: String) -> Bool {
+    func enableMedia(media: CallMediaType, enable: Bool, callUUID: String) -> Bool {
         if let call = ChatModel.shared.activeCall, call.callUUID == 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

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/WebRTC.swift

@@ -19,13 +19,14 @@ class Call: ObservableObject, Equatable {
     var direction: CallDirection
     var contact: Contact
     var callUUID: String?
-    var initialCallType: CallMediaType
-    @Published var localMediaSources: CallMediaSources
+    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
 
@@ -34,33 +35,32 @@ class Call: ObservableObject, Equatable {
         contact: Contact,
         callUUID: String?,
         callState: CallState,
-        initialCallType: CallMediaType,
+        localMedia: CallMediaType,
         sharedKey: String? = nil
     ) {
         self.direction = direction
         self.contact = contact
         self.callUUID = callUUID
         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
         }
     }
 }

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 {
@@ -60,20 +51,17 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     private let rtcAudioSession =  RTCAudioSession.sharedInstance()
     private let audioQueue = DispatchQueue(label: "chat.simplex.app.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()
@@ -90,45 +78,39 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     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,8 +407,7 @@ 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() {
@@ -640,16 +420,15 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
     }
 
     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 +437,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 +498,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 +523,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 +546,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 +601,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 }
@@ -895,7 +618,7 @@ extension WebRTCClient {
                 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() {
+                    if hasExternalAudioDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
                         try self.rtcAudioSession.setPreferredInput(preferred)
                     } else {
                         try self.rtcAudioSession.overrideOutputAudioPort(.speaker)
@@ -905,7 +628,7 @@ extension WebRTCClient {
                     try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
                     try self.rtcAudioSession.overrideOutputAudioPort(.none)
                 }
-                if hasExternalAudioDevice && !skipExternalDevice {
+                if hasExternalAudioDevice {
                     logger.debug("WebRTCClient: configuring session with external device available, skip configuring speaker")
                 }
                 try self.rtcAudioSession.setActive(true)
@@ -936,59 +659,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: ()
         }
-        startCaptureLocalVideo(
-            activeCall?.device ?? notConnectedCall?.device,
-            (activeCall?.localCamera ?? notConnectedCall?.localCameraAndTrack?.0) as? RTCCameraVideoCapturer
-        )
+        if let call = activeCall.wrappedValue {
+            startCaptureLocalVideo(call)
+        }
+    }
+
+    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/ChatItem/CIChatFeatureView.swift

@@ -11,11 +11,11 @@ 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
@@ -106,9 +106,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(chat: Chat.sampleData, chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary))
     }
 }

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

@@ -285,18 +285,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/CIMetaView.swift

@@ -75,14 +75,9 @@ enum MetaColorMode {
         }
     }
 
-    func statusSpacer(_ sent: Bool) -> Text {
+    var statusSpacer: Text {
         switch self {
-        case .normal, .transparent:
-            Text(
-                sent
-                ? Image("checkmark.wide")
-                : Image(systemName: "circlebadge.fill")
-            ).foregroundColor(.clear)
+        case .normal, .transparent: Text(Image(systemName: "circlebadge.fill")).foregroundColor(.clear)
         case .invertedMaterial: Text(" ").kerning(13)
         }
     }
@@ -135,10 +130,10 @@ func ciMetaText(
                 colorMode.resolve(statusColor)
             }
             r = r + colored(Text(image), metaColor)
+            space = Text(" ")
         } else if !meta.disappearing {
-            r = r + colorMode.statusSpacer(meta.itemStatus.sent)
+            space = colorMode.statusSpacer + Text(" ")
         }
-        space = Text(" ")
     }
     if let enc = encrypted {
         appendSpace()

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

@@ -48,7 +48,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)
                         }

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

@@ -510,10 +510,10 @@ struct CIVoiceView_Previews: PreviewProvider {
                 duration: 30,
                 allowMenu: Binding.constant(true)
             )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true))
         }
         .previewLayout(.fixed(width: 360, height: 360))
     }

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

@@ -92,13 +92,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/MarkedDeletedItemView.swift

@@ -12,9 +12,9 @@ import SimpleXChat
 struct MarkedDeletedItemView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
-    @Environment(\.revealed) var revealed: Bool
     @ObservedObject var chat: Chat
     var chatItem: ChatItem
+    @Binding var revealed: Bool
 
     var body: some View {
         (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
@@ -79,10 +79,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/ChatItemForwardingView.swift

@@ -19,6 +19,7 @@ struct ChatItemForwardingView: View {
     @Binding var composeState: ComposeState
 
     @State private var searchText: String = ""
+    @FocusState private var searchFocused
     @State private var alert: SomeAlert?
     private let chatsToForwardTo = filterChatsToForwardTo(chats: ChatModel.shared.chats)
 
@@ -45,6 +46,8 @@ struct ChatItemForwardingView: View {
         VStack(alignment: .leading) {
             if !chatsToForwardTo.isEmpty {
                 List {
+                    searchFieldView(text: $searchText, focussed: $searchFocused, theme.colors.onBackground, theme.colors.secondary)
+                        .padding(.leading, 2)
                     let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
                     let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { foundChat($0, s) }
                     ForEach(chats) { chat in
@@ -52,7 +55,6 @@ struct ChatItemForwardingView: View {
                             .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
                     }
                 }
-                .searchable(text: $searchText, placement: .navigationBarDrawer(displayMode: .always))
                 .modifier(ThemedBackground(grouped: true))
             } else {
                 ZStack {

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

@@ -14,28 +14,19 @@ extension EnvironmentValues {
         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
+    @Binding var revealed: Bool
     @Binding var allowMenu: Bool
 
     init(
@@ -43,25 +34,27 @@ struct ChatItemView: View {
         chatItem: ChatItem,
         showMember: Bool = false,
         maxWidth: CGFloat = .infinity,
+        revealed: Binding<Bool>,
         allowMenu: Binding<Bool> = .constant(false)
     ) {
         self.chat = chat
         self.chatItem = chatItem
         self.maxWidth = maxWidth
+        _revealed = revealed
         _allowMenu = allowMenu
     }
 
     var body: some View {
         let ci = chatItem
         if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem)
+            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
         } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
             if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                 EmojiItemView(chat: chat, chatItem: ci)
             } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
                 CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, allowMenu: $allowMenu)
             } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
             } else {
                 framedItemView()
             }
@@ -91,6 +84,7 @@ struct ChatItemView: View {
             chat: chat,
             chatItem: chatItem,
             preview: preview,
+            revealed: $revealed,
             maxWidth: maxWidth,
             imgWidth: adjustedMaxWidth,
             videoWidth: adjustedMaxWidth,
@@ -102,9 +96,9 @@ struct ChatItemView: View {
 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
 
@@ -136,7 +130,7 @@ struct ChatItemContentView<Content: View>: View {
         case let .rcvChatPreference(feature, allowed, param):
             CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
         case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
+            CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
         case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
         case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
         case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -183,7 +177,7 @@ struct ChatItemContentView<Content: View>: View {
     }
 
     private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
     }
 
     private var mergedGroupEventText: Text? {
@@ -244,17 +238,16 @@ func chatEventText(_ ci: ChatItem, _ secondaryColor: Color) -> Text {
 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 +265,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 +276,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 +287,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 +298,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 +309,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/ChatView.swift

@@ -137,14 +137,6 @@ struct ChatView: View {
                 }
             }
         }
-        // it should be presented on top level in order to prevent a bug in SwiftUI on iOS 16 related to .focused() modifier in AddGroupMembersView's search field
-        .appSheet(isPresented: $showAddMembersSheet) {
-            Group {
-                if case let .group(groupInfo) = cInfo {
-                    AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-                }
-            }
-        }
         .sheet(isPresented: Binding(
             get: { !forwardedChatItems.isEmpty },
             set: { isPresented in
@@ -312,6 +304,9 @@ struct ChatView: View {
                                         }
                                 } else {
                                     addMembersButton()
+                                        .appSheet(isPresented: $showAddMembersSheet) {
+                                            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+                                        }
                                 }
                             }
                             Menu {
@@ -627,11 +622,7 @@ struct ChatView: View {
             Text(String.localizedStringWithFormat(
                 NSLocalizedString("%@, %@", comment: "format for date separator in chat"),
                 date.formatted(.dateTime.weekday(.abbreviated)),
-                date.formatted(
-                    Calendar.current.isDate(date, equalTo: .now, toGranularity: .year)
-                    ? .dateTime.day().month(.abbreviated)
-                    : .dateTime.day().month(.abbreviated).year()
-                )
+                date.formatted(.dateTime.day().month(.abbreviated))
             ))
             .font(.callout)
             .fontWeight(.medium)
@@ -900,6 +891,7 @@ struct ChatView: View {
         @State private var showDeleteMessages = false
         @State private var showChatItemInfoSheet: Bool = false
         @State private var chatItemInfo: ChatItemInfo?
+        @State private var showTranslationSheet: Bool = false
         @State private var msgWidth: CGFloat = 0
         
         @Binding var selectedChatItems: Set<Int64>?
@@ -1183,11 +1175,11 @@ struct ChatView: View {
                     chat: chat,
                     chatItem: ci,
                     maxWidth: maxWidth,
+                    revealed: .constant(revealed),
                     allowMenu: $allowMenu
                 )
-                .environment(\.revealed, revealed)
                 .environment(\.showTimestamp, itemSeparation.timestamp)
-                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap && (ci.meta.itemDeleted == nil || revealed)))
+                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap))
                 .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
                 .accessibilityLabel("")
                 if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
@@ -1217,6 +1209,11 @@ struct ChatView: View {
                 }) {
                     ChatItemInfoView(ci: ci, chatItemInfo: $chatItemInfo)
                 }
+                .sheet(isPresented: $showTranslationSheet) {
+                    if #available(iOS 18.0, *) {
+                        TranslateView(source: ci.text).presentationDetents([.medium, .large])
+                    }
+                }
         }
 
         private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
@@ -1273,6 +1270,9 @@ struct ChatView: View {
                     shareButton(ci)
                     copyButton(ci)
                 }
+                if #available(iOS 18.0, *) {
+                    if !ci.text.isEmpty { translateButton(ci) }
+                }
                 if let fileSource = fileSource, fileExists {
                     if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                         if image.imageData != nil {
@@ -1457,6 +1457,14 @@ struct ChatView: View {
             }
         }
 
+        private func translateButton(_ ci: ChatItem) -> Button<some View> {
+            Button {
+                showTranslationSheet = true
+            } label: {
+                Label("Translate", systemImage: "globe")
+            }
+        }
+
         func saveButton(image: UIImage) -> Button<some View> {
             Button {
                 UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil)

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

@@ -287,8 +287,8 @@ 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
+    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
     var body: some View {
         VStack(spacing: 0) {
@@ -459,7 +459,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 +551,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))

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

@@ -40,7 +40,7 @@ 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 {

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

@@ -105,10 +105,8 @@ struct AddGroupMembersViewCommon: View {
                             .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)
                         }
                     }
                 }
@@ -132,14 +130,6 @@ struct AddGroupMembersViewCommon: View {
         .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()

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

@@ -18,7 +18,6 @@ struct GroupMemberInfoView: View {
     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?
@@ -95,137 +94,129 @@ struct GroupMemberInfoView: View {
                     .listRowSeparator(.hidden)
                     .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
 
-                if connectionLoaded {
-
-                    if member.memberActive {
-                        Section {
-                            if let code = connectionCode { verifyCodeButton(code) }
-                            if let connStats = connectionStats,
-                               connStats.ratchetSyncAllowed {
-                                synchronizeConnectionButton()
-                            }
-                            // } else if developerTools {
-                            //     synchronizeConnectionButtonForce()
-                            // }
+                if member.memberActive {
+                    Section {
+                        if let code = connectionCode { verifyCodeButton(code) }
+                        if let connStats = connectionStats,
+                            connStats.ratchetSyncAllowed {
+                            synchronizeConnectionButton()
                         }
+                        // } else if developerTools {
+                        //     synchronizeConnectionButtonForce()
+                        // }
                     }
+                }
 
-                    if let contactLink = member.contactLink {
-                        Section {
-                            SimpleXLinkQRCode(uri: contactLink)
-                            Button {
-                                showShareSheet(items: [simplexChatLink(contactLink)])
-                            } label: {
-                                Label("Share address", systemImage: "square.and.arrow.up")
-                            }
-                            if let contactId = member.memberContactId {
-                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
-                                    connectViaAddressButton(contactLink)
-                                }
-                            } else {
+                if let contactLink = member.contactLink {
+                    Section {
+                        SimpleXLinkQRCode(uri: contactLink)
+                        Button {
+                            showShareSheet(items: [simplexChatLink(contactLink)])
+                        } label: {
+                            Label("Share address", systemImage: "square.and.arrow.up")
+                        }
+                        if let contactId = member.memberContactId {
+                            if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
                                 connectViaAddressButton(contactLink)
                             }
-                        } 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)) {
-                        infoRow("Group", groupInfo.displayName)
-
-                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
-                            Picker("Change role", selection: $newRole) {
-                                ForEach(roles) { role in
-                                    Text(role.text)
-                                }
-                            }
-                            .frame(height: 36)
                         } else {
-                            infoRow("Role", member.memberRole.text)
+                            connectViaAddressButton(contactLink)
                         }
+                    } header: {
+                        Text("Address")
+                            .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)
                     }
+                }
 
-                    if let connStats = connectionStats {
-                        Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
-                            // TODO network connection status
-                            Button("Change receiving address") {
-                                alert = .switchAddressAlert
+                Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
+                    infoRow("Group", groupInfo.displayName)
+
+                    if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
+                        Picker("Change role", selection: $newRole) {
+                            ForEach(roles) { role in
+                                Text(role.text)
+                            }
+                        }
+                        .frame(height: 36)
+                    } else {
+                        infoRow("Role", member.memberRole.text)
+                    }
+                }
+
+                if let connStats = connectionStats {
+                    Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
+                        // TODO network connection status
+                        Button("Change receiving address") {
+                            alert = .switchAddressAlert
+                        }
+                        .disabled(
+                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                            || connStats.ratchetSyncSendProhibited
+                        )
+                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
+                            Button("Abort changing address") {
+                                alert = .abortSwitchAddressAlert
                             }
                             .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
                                 || connStats.ratchetSyncSendProhibited
                             )
-                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
-                                Button("Abort changing address") {
-                                    alert = .abortSwitchAddressAlert
-                                }
-                                .disabled(
-                                    connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
-                                    || connStats.ratchetSyncSendProhibited
-                                )
-                            }
-                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
-                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                         }
+                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
+                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                     }
+                }
 
-                    if groupInfo.membership.memberRole >= .admin {
-                        adminDestructiveSection(member)
-                    } else {
-                        nonAdminBlockSection(member)
-                    }
+                if groupInfo.membership.memberRole >= .admin {
+                    adminDestructiveSection(member)
+                } else {
+                    nonAdminBlockSection(member)
+                }
 
-                    if developerTools {
-                        Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
-                            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) }
-                                    }
+                if developerTools {
+                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
+                        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 {
+            .onAppear {
                 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 {
+                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
-                        connectionLoaded = true
+                    } catch let error {
+                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                     }
-                } catch let error {
-                    await MainActor.run {
-                        connectionLoaded = true
-                    }
-                    logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                 }
             }
             .onChange(of: newRole) { newRole in

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

@@ -110,13 +110,10 @@ struct GroupProfileView: View {
             }
         }
         .onChange(of: chosenImage) { image in
-            Task {
-                let resized: String? = if let image {
-                    await resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
-                } else {
-                    nil
-                }
-                await MainActor.run { groupProfile.image = resized }
+            if let image = image {
+                groupProfile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
+            } else {
+                groupProfile.image = nil
             }
         }
         .onAppear {

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

@@ -78,7 +78,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
             self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
                 tableView: tableView
             ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8 {
+                if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
                     self.representer.loadPage()
                 }
                 let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)

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

@@ -41,8 +41,7 @@ struct SelectedItemsBottomToolbar: View {
 
     @State var forwardEnabled: Bool = false
 
-    @State var deleteCountProhibited = false
-    @State var forwardCountProhibited = false
+    @State var allButtonsDisabled = false
 
     var body: some View {
         VStack(spacing: 0) {
@@ -56,9 +55,9 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!deleteEnabled || deleteCountProhibited ? theme.colors.secondary: .red)
+                        .foregroundColor(!deleteEnabled || allButtonsDisabled ? theme.colors.secondary: .red)
                 }
-                .disabled(!deleteEnabled || deleteCountProhibited)
+                .disabled(!deleteEnabled || allButtonsDisabled)
 
                 Spacer()
                 Button {
@@ -68,9 +67,9 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || deleteCountProhibited ? theme.colors.secondary : .red)
+                        .foregroundColor(!moderateEnabled || allButtonsDisabled ? theme.colors.secondary : .red)
                 }
-                .disabled(!moderateEnabled || deleteCountProhibited)
+                .disabled(!moderateEnabled || allButtonsDisabled)
                 .opacity(canModerate ? 1 : 0)
 
                 Spacer()
@@ -81,9 +80,9 @@ struct SelectedItemsBottomToolbar: View {
                         .resizable()
                         .scaledToFit()
                         .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!forwardEnabled || forwardCountProhibited ? theme.colors.secondary : theme.colors.primary)
+                        .foregroundColor(!forwardEnabled || allButtonsDisabled ? theme.colors.secondary : theme.colors.primary)
                 }
-                .disabled(!forwardEnabled || forwardCountProhibited)
+                .disabled(!forwardEnabled || allButtonsDisabled)
             }
             .frame(maxHeight: .infinity)
             .padding([.leading, .trailing], 12)
@@ -106,8 +105,7 @@ struct SelectedItemsBottomToolbar: View {
 
     private func recheckItems(_ chatInfo: ChatInfo, _ chatItems: [ChatItem], _ selectedItems: Set<Int64>?) {
         let count = selectedItems?.count ?? 0
-        deleteCountProhibited = count == 0 || count > 200
-        forwardCountProhibited = count == 0 || count > 20
+        allButtonsDisabled = count == 0 || count > 20
         canModerate = possibleToModerate(chatInfo)
         if let selected = selectedItems {
             let me: Bool

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

@@ -0,0 +1,73 @@
+//
+//  TranslateView.swift
+//  SimpleX
+//
+//  Created by user on 19/09/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import Translation
+
+@available(iOS 18.0, *)
+struct TranslateView: View {
+    let source: String
+    @State private var supprtedLanguages = [Locale.Language]()
+    @State private var target: String?
+    @State private var configuration = TranslationSession.Configuration()
+
+    var body: some View {
+        NavigationStack {
+            List {
+                Section {
+                    languagePicker("From", selection: $configuration.source)
+                    Text(source).foregroundStyle(.secondary).lineLimit(1)
+                }
+                Section {
+                    languagePicker("To ", selection: $configuration.target)
+                    if let target {
+                        Text(target)
+                    } else {
+                        ProgressView()
+                    }
+                } footer: {
+                    Text("\(Image(systemName: "info.circle")) Uses on device translation")
+                }
+            }
+            .navigationTitle("Translate")
+        }
+        .task { supprtedLanguages = await LanguageAvailability().supportedLanguages }
+        .translationTask(configuration) { session in
+            do {
+                target = nil
+                let response = try await session.translate(source)
+                await MainActor.run {
+                    configuration.source = response.sourceLanguage
+                    configuration.target = response.targetLanguage
+                    target = response.targetText
+                }
+            } catch {
+                print(error)
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func languagePicker(_ label: String, selection: Binding<Locale.Language?>) -> some View {
+        Picker(label, selection: selection) {
+            Text("Detect language").tag(Optional<Locale.Language>.none)
+            ForEach(supprtedLanguages, id: \.self) { language in
+                Text(title(for: language)).tag(language)
+            }
+        }
+    }
+
+    private func title(for language: Locale.Language) -> String {
+        if let code = language.languageCode,
+           let string = Locale.current.localizedString(forLanguageCode: code.identifier) {
+            string
+        } else {
+            language.minimalIdentifier
+        }
+    }
+}

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

@@ -10,7 +10,7 @@ import SwiftUI
 
 struct ChatHelp: View {
     @EnvironmentObject var chatModel: ChatModel
-    let dismissSettingsSheet: DismissAction
+    @Binding var showSettings: Bool
 
     var body: some View {
         ScrollView { chatHelp() }
@@ -23,7 +23,7 @@ struct ChatHelp: View {
             VStack(alignment: .leading, spacing: 0) {
                 Text("To ask any questions and to receive updates:")
                 Button("connect to SimpleX Chat developers.") {
-                    dismissSettingsSheet()
+                    showSettings = false
                     DispatchQueue.main.async {
                         UIApplication.shared.open(simplexTeamURL)
                     }
@@ -61,9 +61,8 @@ struct ChatHelp: View {
 }
 
 struct ChatHelp_Previews: PreviewProvider {
-    @Environment(\.dismiss) static var mockDismiss
-
     static var previews: some View {
-        ChatHelp(dismissSettingsSheet: mockDismiss)
+        @State var showSettings = false
+        return ChatHelp(showSettings: $showSettings)
     }
 }

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

@@ -18,110 +18,24 @@ enum UserPickerSheet: Identifiable {
     case settings
 
     var id: Self { self }
-
-    var navigationTitle: LocalizedStringKey {
-        switch self {
-        case .address: "SimpleX address"
-        case .chatPreferences: "Your preferences"
-        case .chatProfiles: "Your chat profiles"
-        case .currentProfile: "Your current profile"
-        case .useFromDesktop: "Connect to desktop"
-        case .settings: "Your settings"
-        }
-    }
-}
-
-class SaveableSettings: ObservableObject {
-    @Published var servers: ServerSettings = ServerSettings(currUserServers: [], userServers: [], serverErrors: [])
-}
-
-struct ServerSettings {
-    public var currUserServers: [UserOperatorServers]
-    public var userServers: [UserOperatorServers]
-    public var serverErrors: [UserServersError]
-}
-
-struct UserPickerSheetView: View {
-    let sheet: UserPickerSheet
-    @EnvironmentObject var chatModel: ChatModel
-    @StateObject private var ss = SaveableSettings()
-
-    @State private var loaded = false
-
-    var body: some View {
-        NavigationView {
-            ZStack {
-                if loaded, let currentUser = chatModel.currentUser {
-                    switch sheet {
-                    case .address:
-                        UserAddressView(shareViaProfile: currentUser.addressShared)
-                    case .chatPreferences:
-                        PreferencesView(
-                            profile: currentUser.profile,
-                            preferences: currentUser.fullPreferences,
-                            currentPreferences: currentUser.fullPreferences
-                        )
-                    case .chatProfiles:
-                        UserProfilesView()
-                    case .currentProfile:
-                        UserProfile()
-                    case .useFromDesktop:
-                        ConnectDesktopView()
-                    case .settings:
-                        SettingsView()
-                    }
-                }
-                Color.clear // Required for list background to be rendered during loading
-            }
-            .navigationTitle(sheet.navigationTitle)
-            .navigationBarTitleDisplayMode(.large)
-            .modifier(ThemedBackground(grouped: true))
-        }
-        .overlay {
-            if let la = chatModel.laRequest {
-                LocalAuthView(authRequest: la)
-            }
-        }
-        .task {
-            withAnimation(
-                .easeOut(duration: 0.1),
-                { loaded = true }
-            )
-        }
-        .onDisappear {
-            if serversCanBeSaved(
-                ss.servers.currUserServers,
-                ss.servers.userServers,
-                ss.servers.serverErrors
-            ) {
-                showAlert(
-                    title: NSLocalizedString("Save servers?", comment: "alert title"),
-                    buttonTitle: NSLocalizedString("Save", comment: "alert button"),
-                    buttonAction: { saveServers($ss.servers.currUserServers, $ss.servers.userServers) },
-                    cancelButton: true
-                )
-            }
-        }
-        .environmentObject(ss)
-    }
 }
 
 struct ChatListView: View {
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
-    @Binding var activeUserPickerSheet: UserPickerSheet?
+    @Binding var showSettings: Bool
     @State private var searchMode = false
     @FocusState private var searchFocussed
     @State private var searchText = ""
     @State private var searchShowingSimplexLink = false
     @State private var searchChatFilteredBySimplexLink: String? = nil
     @State private var scrollToSearchBar = false
+    @State private var activeUserPickerSheet: UserPickerSheet? = nil
     @State private var userPickerShown: Bool = false
 
     @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
     @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
     @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
-    @AppStorage(DEFAULT_ADDRESS_CREATION_CARD_SHOWN) private var addressCreationCardShown = false
     @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
 
     var body: some View {
@@ -144,22 +58,43 @@ struct ChatListView: View {
                 destination: chatView
             ) { chatListView }
         }
-        .modifier(
-            Sheet(isPresented: $userPickerShown) {
-                UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
-            }
-        )
-        .appSheet(
-            item: $activeUserPickerSheet,
-            onDismiss: { chatModel.laRequest = nil },
-            content: { UserPickerSheetView(sheet: $0) }
-        )
-        .onChange(of: activeUserPickerSheet) {
-            if $0 != nil {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                    userPickerShown = false
+        .sheet(isPresented: $userPickerShown) {
+            UserPicker(activeSheet: $activeUserPickerSheet)
+                .sheet(item: $activeUserPickerSheet) { sheet in
+                    if let currentUser = chatModel.currentUser {
+                        switch sheet {
+                        case .address:
+                            NavigationView {
+                                UserAddressView(shareViaProfile: currentUser.addressShared)
+                                    .navigationTitle("SimpleX address")
+                                    .navigationBarTitleDisplayMode(.large)
+                                    .modifier(ThemedBackground(grouped: true))
+                            }
+                        case .chatProfiles:
+                            NavigationView {
+                                UserProfilesView()
+                            }
+                        case .currentProfile:
+                            NavigationView {
+                                UserProfile()
+                                    .navigationTitle("Your current profile")
+                                    .modifier(ThemedBackground(grouped: true))
+                            }
+                        case .chatPreferences:
+                            NavigationView {
+                                PreferencesView(profile: currentUser.profile, preferences: currentUser.fullPreferences, currentPreferences: currentUser.fullPreferences)
+                                    .navigationTitle("Your preferences")
+                                    .navigationBarTitleDisplayMode(.large)
+                                    .modifier(ThemedBackground(grouped: true))
+                            }
+                        case .useFromDesktop:
+                            ConnectDesktopView(viaSettings: false)
+                        case .settings:
+                            SettingsView(showSettings: $showSettings)
+                                .navigationBarTitleDisplayMode(.large)
+                        }
+                    }
                 }
-            }
         }
     }
 
@@ -304,6 +239,12 @@ struct ChatListView: View {
                         .padding(.top, oneHandUI ? 8 : 0)
                         .id("searchBar")
                     }
+                    if !oneHandUICardShown {
+                        OneHandUICard()
+                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                            .listRowSeparator(.hidden)
+                            .listRowBackground(Color.clear)
+                    }
                     if #available(iOS 16.0, *) {
                         ForEach(cs, id: \.viewId) { chat in
                             ChatListNavLink(chat: chat)
@@ -329,20 +270,6 @@ struct ChatListView: View {
                             .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
                         }
                     }
-                    if !oneHandUICardShown {
-                        OneHandUICard()
-                            .padding(.vertical, 6)
-                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                            .listRowSeparator(.hidden)
-                            .listRowBackground(Color.clear)
-                    }
-                    if !addressCreationCardShown {
-                        AddressCreationCard()
-                            .padding(.vertical, 6)
-                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-                            .listRowSeparator(.hidden)
-                            .listRowBackground(Color.clear)
-                    }
                 }
                 .listStyle(.plain)
                 .onChange(of: chatModel.chatId) { currentChatId in
@@ -475,7 +402,7 @@ struct SubsStatusIndicator: View {
     private func startTask() {
         task = Task {
             while !Task.isCancelled {
-                if AppChatState.shared.value == .active, ChatModel.shared.chatRunning == true {
+                if AppChatState.shared.value == .active {
                     do {
                         let (subs, hasSess) = try await getAgentSubsTotal()
                         await MainActor.run {
@@ -617,8 +544,6 @@ func chatStoppedIcon() -> some View {
 }
 
 struct ChatListView_Previews: PreviewProvider {
-    @State static var userPickerSheet: UserPickerSheet? = .none
-
     static var previews: some View {
         let chatModel = ChatModel()
         chatModel.updateChats([
@@ -637,9 +562,9 @@ struct ChatListView_Previews: PreviewProvider {
 
         ])
         return Group {
-            ChatListView(activeUserPickerSheet: $userPickerSheet)
+            ChatListView(showSettings: Binding.constant(false))
                 .environmentObject(chatModel)
-            ChatListView(activeUserPickerSheet: $userPickerSheet)
+            ChatListView(showSettings: Binding.constant(false))
                 .environmentObject(ChatModel())
         }
     }

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

@@ -35,16 +35,11 @@ struct ChatPreviewView: View {
             }
             .padding(.leading, 4)
 
-            let chatTs = if let cItem {
-                cItem.meta.itemTs
-            } else {
-                chat.chatInfo.chatTs
-            }
             VStack(spacing: 0) {
                 HStack(alignment: .top) {
                     chatPreviewTitle()
                     Spacer()
-                    (formatTimestampText(chatTs))
+                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
                         .font(.subheadline)
                         .frame(minWidth: 60, alignment: .trailing)
                         .foregroundColor(theme.colors.secondary)

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

@@ -32,6 +32,7 @@ struct OneHandUICard: View {
         .background(theme.appColors.sentMessage)
         .cornerRadius(12)
         .frame(height: dynamicSize(userFont).rowHeight)
+        .padding(.vertical, 12)
         .alert(isPresented: $showOneHandUIAlert) {
             Alert(
                 title: Text("Reachable chat toolbar"),

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

@@ -491,6 +491,15 @@ struct SMPServerSummaryView: View {
             Section("Server address") {
                 Text(summary.smpServer)
                     .textSelection(.enabled)
+                if summary.known == true {
+                    NavigationLink {
+                        ProtocolServersView(serverProtocol: .smp)
+                            .navigationTitle("Your SMP servers")
+                            .modifier(ThemedBackground(grouped: true))
+                    } label: {
+                        Text("Open server settings")
+                    }
+                }
             }
 
             if let stats = summary.stats {
@@ -670,6 +679,15 @@ struct XFTPServerSummaryView: View {
             Section("Server address") {
                 Text(summary.xftpServer)
                     .textSelection(.enabled)
+                if summary.known == true {
+                    NavigationLink {
+                        ProtocolServersView(serverProtocol: .xftp)
+                            .navigationTitle("Your XFTP servers")
+                            .modifier(ThemedBackground(grouped: true))
+                    } label: {
+                        Text("Open server settings")
+                    }
+                }
             }
 
             if let stats = summary.stats {

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

@@ -12,268 +12,216 @@ struct UserPicker: View {
     @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
     @Environment(\.scenePhase) private var scenePhase: ScenePhase
     @Environment(\.colorScheme) private var colorScheme: ColorScheme
-    @Binding var userPickerShown: Bool
+    @Environment(\.dismiss) private var dismiss: DismissAction
     @Binding var activeSheet: UserPickerSheet?
-    @State private var currentUser: Int64?
     @State private var switchingProfile = false
-    @State private var frameWidth: CGFloat = 0
-    @State private var resetScroll = ResetScrollAction()
-
-    // Inset grouped list dimensions
-    private let imageSize: CGFloat = 44
-    private let rowPadding: CGFloat = 16
-    private let rowVerticalPadding: CGFloat = 11
-    private let sectionSpacing: CGFloat = 35
-    private var sectionHorizontalPadding: CGFloat { frameWidth > 375 ? 20 : 16 }
-    private let sectionShape = RoundedRectangle(cornerRadius: 10, style: .continuous)
 
     var body: some View {
-        let otherUsers: [UserInfo] = m.users
-            .filter { u in !u.user.hidden && u.user.userId != m.currentUser?.userId }
-            .sorted(using: KeyPathComparator<UserInfo>(\.user.activeOrder, order: .reverse))
-        let sectionWidth = max(frameWidth - sectionHorizontalPadding * 2, 0)
-        let currentUserWidth = max(frameWidth - sectionHorizontalPadding - rowPadding * 2 - 14 - imageSize, 0)
-        let stopped = m.chatRunning != true
-        VStack(spacing: sectionSpacing) {
-            if let user = m.currentUser {
-                StickyScrollView(resetScroll: $resetScroll) {
-                    HStack(spacing: rowPadding) {
-                        HStack {
-                            ProfileImage(imageStr: user.image, size: imageSize, color: Color(uiColor: .tertiarySystemGroupedBackground))
-                                .padding(.trailing, 6)
-                            profileName(user).lineLimit(1)
-                        }
-                        .padding(rowPadding)
-                        .frame(width: otherUsers.isEmpty ? sectionWidth : currentUserWidth, alignment: .leading)
-                        .modifier(ListRow { activeSheet = .currentProfile })
-                        .clipShape(sectionShape)
-                        .disabled(stopped)
-                        .opacity(stopped ? 0.4 : 1)
-                        ForEach(otherUsers) { u in
-                            userView(u, size: imageSize)
-                                .frame(maxWidth: sectionWidth * 0.618)
-                                .fixedSize()
-                                .disabled(stopped)
-                                .opacity(stopped ? 0.4 : 1)
-                        }
-                    }
-                    .padding(.horizontal, sectionHorizontalPadding)
-                }
-                .frame(height: 2 * rowPadding + imageSize)
-                .padding(.top, sectionSpacing)
-                .overlay(DetermineWidth())
-                .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
+        if #available(iOS 16.0, *) {
+            let v = viewBody.presentationDetents([.height(420)])
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
             }
-            VStack(spacing: 0) {
-                openSheetOnTap("qrcode", title: m.userAddress == nil ? "Create SimpleX address" : "Your SimpleX address", sheet: .address, disabled: stopped)
-                openSheetOnTap("switch.2", title: "Chat preferences", sheet: .chatPreferences, disabled: stopped)
-                openSheetOnTap("person.crop.rectangle.stack", title: "Your chat profiles", sheet: .chatProfiles, disabled: stopped)
-                openSheetOnTap("desktopcomputer", title: "Use from desktop", sheet: .useFromDesktop, disabled: stopped)
-                ZStack(alignment: .trailing) {
-                    openSheetOnTap("gearshape", title: "Settings", sheet: .settings, showDivider: false)
-                    Image(systemName: colorScheme == .light ? "sun.max" : "moon.fill")
-                        .resizable()
-                        .scaledToFit()
-                        .symbolRenderingMode(.monochrome)
-                        .foregroundColor(theme.colors.secondary)
-                        .frame(maxWidth: 20, maxHeight: .infinity)
-                        .padding(.horizontal, rowPadding)
-                        .background(Color(.systemBackground).opacity(0.01))
-                        .onTapGesture {
-                            if (colorScheme == .light) {
-                                ThemeManager.applyTheme(systemDarkThemeDefault.get())
+        } else {
+            viewBody
+        }
+    }
+    
+    private var viewBody: some View {
+        let otherUsers = m.users.filter { u in !u.user.hidden && u.user.userId != m.currentUser?.userId }
+        return List {
+            Section(header: Text("You").foregroundColor(theme.colors.secondary)) {
+                if let user = m.currentUser {
+                    openSheetOnTap(label: {
+                        ZStack {
+                            let v = ProfilePreview(profileOf: user)
+                                .foregroundColor(.primary)
+                                .padding(.leading, -8)
+                            if #available(iOS 16.0, *) {
+                                v
                             } else {
-                                ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
+                                v.padding(.vertical, 4)
                             }
                         }
-                        .onLongPressGesture {
-                            ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
-                        }
+                    }) {
+                        activeSheet = .currentProfile
+                    }
+
+                    openSheetOnTap(title: m.userAddress == nil ? "Create SimpleX address" : "Your SimpleX address", icon: "qrcode") {
+                        activeSheet = .address
+                    }
+                    
+                    openSheetOnTap(title: "Chat preferences", icon: "switch.2") {
+                        activeSheet = .chatPreferences
+                    }
+                }
+            }
+
+            Section {
+                if otherUsers.isEmpty {
+                    openSheetOnTap(title: "Your chat profiles", icon: "person.crop.rectangle.stack") {
+                        activeSheet = .chatProfiles
+                    }
+                } else {
+                    let v = userPickerRow(otherUsers, size: 44)
+                        .padding(.leading, -11)
+                    if #available(iOS 16.0, *) {
+                        v
+                    } else {
+                        v.padding(.vertical, 4)
+                    }
+                }
+
+                openSheetOnTap(title: "Use from desktop", icon: "desktopcomputer") {
+                    activeSheet = .useFromDesktop
+                }
+
+                ZStack(alignment: .trailing) {
+                    openSheetOnTap(title: "Settings", icon: "gearshape") {
+                        activeSheet = .settings
+                    }
+                    Label {} icon: {
+                        Image(systemName: colorScheme == .light ? "sun.max" : "moon.fill")
+                            .resizable()
+                            .symbolRenderingMode(.monochrome)
+                            .foregroundColor(theme.colors.secondary)
+                            .frame(maxWidth: 20, maxHeight: 20)
+                    }
+                    .onTapGesture {
+                        if (colorScheme == .light) {
+                            ThemeManager.applyTheme(systemDarkThemeDefault.get())
+                        } else {
+                            ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
+                        }
+                    }
+                    .onLongPressGesture {
+                        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
+                    }
                 }
             }
-            .clipShape(sectionShape)
-            .padding(.horizontal, sectionHorizontalPadding)
-            .padding(.bottom, sectionSpacing)
         }
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .onAppear {
             // This check prevents the call of listUsers after the app is suspended, and the database is closed.
             if case .active = scenePhase {
-                currentUser = m.currentUser?.userId
                 Task {
                     do {
                         let users = try await listUsersAsync()
-                        await MainActor.run {
-                            m.users = users
-                            currentUser = m.currentUser?.userId
-                        }
+                        await MainActor.run { m.users = users }
                     } catch {
                         logger.error("Error loading users \(responseError(error))")
                     }
                 }
             }
         }
-        .onChange(of: userPickerShown) {
-            if !$0 { resetScroll() }
-        }
         .modifier(ThemedBackground(grouped: true))
         .disabled(switchingProfile)
     }
+        
+    private func userPickerRow(_ users: [UserInfo], size: CGFloat) -> some View {
+        HStack(spacing: 6) {
+            let s = ScrollView(.horizontal) {
+                HStack(spacing: 27) {
+                    ForEach(users) { u in
+                        if !u.user.hidden && u.user.userId != m.currentUser?.userId {
+                            userView(u, size: size)
+                        }
+                    }
+                }
+                .padding(.leading, 4)
+                .padding(.trailing, 22)
+            }
+            ZStack(alignment: .trailing) {
+                if #available(iOS 16.0, *) {
+                    s.scrollIndicators(.hidden)
+                } else {
+                    s
+                }
+                LinearGradient(
+                    colors: [.clear, .black],
+                    startPoint: .leading,
+                    endPoint: .trailing
+                )
+                .frame(width: size, height: size + 3)
+                .blendMode(.destinationOut)
+                .allowsHitTesting(false)
+            }
+            .compositingGroup()
+            .padding(.top, -3) // to fit unread badge
+            Spacer()
+            Image(systemName: "chevron.right")
+                .foregroundColor(theme.colors.secondary)
+                .padding(.trailing, 4)
+                .onTapGesture {
+                    activeSheet = .chatProfiles
+                }
+        }
+    }
 
     private func userView(_ u: UserInfo, size: CGFloat) -> some View {
-        HStack {
-            ZStack(alignment: .topTrailing) {
-                ProfileImage(imageStr: u.user.image, size: size, color: Color(uiColor: .tertiarySystemGroupedBackground))
-                if (u.unreadCount > 0) {
-                    UnreadBadge(userInfo: u).offset(x: 4, y: -4)
-                }
+        ZStack(alignment: .topTrailing) {
+            ProfileImage(imageStr: u.user.image, size: size, color: Color(uiColor: .tertiarySystemGroupedBackground))
+                .padding([.top, .trailing], 3)
+            if (u.unreadCount > 0) {
+                unreadBadge(u)
             }
-            .padding(.trailing, 6)
-            Text(u.user.displayName).font(.title2).lineLimit(1)
         }
-        .padding(rowPadding)
-        .modifier(ListRow {
+        .frame(width: size)
+        .onTapGesture {
             switchingProfile = true
             Task {
                 do {
                     try await changeActiveUserAsync_(u.user.userId, viewPwd: nil)
                     await MainActor.run {
                         switchingProfile = false
-                        userPickerShown = false
+                        dismiss()
                     }
                 } catch {
                     await MainActor.run {
                         switchingProfile = false
-                        showAlert(
-                            NSLocalizedString("Error switching profile!", comment: "alertTitle"),
-                            message: String.localizedStringWithFormat(NSLocalizedString("Error: %@", comment: "alert message"), responseError(error))
+                        AlertManager.shared.showAlertMsg(
+                            title: "Error switching profile!",
+                            message: "Error: \(responseError(error))"
                         )
                     }
                 }
             }
-        })
-        .clipShape(sectionShape)
-    }
-
-    private func openSheetOnTap(_ icon: String, title: LocalizedStringKey, sheet: UserPickerSheet, showDivider: Bool = true, disabled: Bool = false) -> some View {
-        ZStack(alignment: .bottom) {
-            settingsRow(icon, color: theme.colors.secondary) {
-                Text(title).foregroundColor(.primary).opacity(disabled ? 0.4 : 1)
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            .padding(.horizontal, rowPadding)
-            .padding(.vertical, rowVerticalPadding)
-            .modifier(ListRow { activeSheet = sheet })
-            .disabled(disabled)
-            if showDivider {
-                Divider().padding(.leading, 52)
-            }
         }
     }
-}
-
-struct UnreadBadge: View {
-    var userInfo: UserInfo
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
-
-    var body: some View {
+    
+    private func openSheetOnTap(title: LocalizedStringKey, icon: String, action: @escaping () -> Void) -> some View {
+        openSheetOnTap(label: {
+            ZStack(alignment: .leading) {
+                Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                    .symbolRenderingMode(.monochrome)
+                    .foregroundColor(theme.colors.secondary)
+                Text(title)
+                    .foregroundColor(.primary)
+                    .padding(.leading, 36)
+            }
+        }, action: action)
+    }
+    
+    private func openSheetOnTap<V: View>(label: () -> V, action: @escaping () -> Void) -> some View {
+        Button(action: action, label: label)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .contentShape(Rectangle())
+    }
+    
+    private func unreadBadge(_ u: UserInfo) -> some View {
         let size = dynamicSize(userFont).chatInfoSize
-        unreadCountText(userInfo.unreadCount)
-            .font(userFont <= .xxxLarge ? .caption : .caption2)
+        return unreadCountText(u.unreadCount)
+            .font(userFont <= .xxxLarge ? .caption  : .caption2)
             .foregroundColor(.white)
             .padding(.horizontal, dynamicSize(userFont).unreadPadding)
             .frame(minWidth: size, minHeight: size)
-            .background(userInfo.user.showNtfs ? theme.colors.primary : theme.colors.secondary)
+            .background(u.user.showNtfs ? theme.colors.primary : theme.colors.secondary)
             .cornerRadius(dynamicSize(userFont).unreadCorner)
     }
 }
 
-struct ListRow: ViewModifier {
-    @Environment(\.colorScheme) private var colorScheme: ColorScheme
-    @State private var touchDown = false
-    let action: () -> Void
-
-    func body(content: Content) -> some View {
-        ZStack {
-            elevatedSecondarySystemGroupedBackground
-            Color(.systemGray4).opacity(touchDown ? 1 : 0)
-            content
-            TouchOverlay(touchDown: $touchDown, action: action)
-        }
-    }
-
-    var elevatedSecondarySystemGroupedBackground: Color {
-        switch colorScheme {
-        case .dark: Color(0xFF2C2C2E)
-        default:    Color(0xFFFFFFFF)
-        }
-    }
-
-    struct TouchOverlay: UIViewRepresentable {
-        @Binding var touchDown: Bool
-        let action: () -> Void
-
-        func makeUIView(context: Context) -> TouchView {
-            let touchView = TouchView()
-            let gesture = UILongPressGestureRecognizer(
-                target: touchView,
-                action: #selector(touchView.longPress(gesture:))
-            )
-            gesture.delegate = touchView
-            gesture.minimumPressDuration = 0
-            touchView.addGestureRecognizer(gesture)
-            return touchView
-        }
-
-        func updateUIView(_ touchView: TouchView, context: Context) {
-            touchView.representer = self
-        }
-
-        class TouchView: UIView, UIGestureRecognizerDelegate {
-            var representer: TouchOverlay?
-            private var startLocation: CGPoint?
-            private var task: Task<Void, Never>?
-
-            @objc
-            func longPress(gesture: UILongPressGestureRecognizer) {
-                switch gesture.state {
-                case .began:
-                    startLocation = gesture.location(in: nil)
-                    task = Task {
-                        do {
-                            try await Task.sleep(nanoseconds: 200_000000)
-                            await MainActor.run { representer?.touchDown = true }
-                        } catch { }
-                    }
-                case .ended:
-                    if hitTest(gesture.location(in: self), with: nil) == self {
-                        representer?.action()
-                    }
-                    task?.cancel()
-                    representer?.touchDown = false
-                case .changed:
-                    if let startLocation {
-                        let location = gesture.location(in: nil)
-                        let dx = location.x - startLocation.x
-                        let dy = location.y - startLocation.y
-                        if sqrt(pow(dx, 2) + pow(dy, 2)) > 10 { gesture.state = .failed }
-                    }
-                case .cancelled, .failed:
-                    task?.cancel()
-                    representer?.touchDown = false
-                default: break
-                }
-            }
-
-            func gestureRecognizer(
-                _: UIGestureRecognizer,
-                shouldRecognizeSimultaneouslyWith: UIGestureRecognizer
-            ) -> Bool { true }
-        }
-    }
-}
-
-
 struct UserPicker_Previews: PreviewProvider {
     static var previews: some View {
         @State var activeSheet: UserPickerSheet?
@@ -281,7 +229,6 @@ struct UserPicker_Previews: PreviewProvider {
         let m = ChatModel()
         m.users = [UserInfo.sampleData, UserInfo.sampleData]
         return UserPicker(
-            userPickerShown: .constant(true),
             activeSheet: $activeSheet
         )
         .environmentObject(m)

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

@@ -44,7 +44,7 @@ enum DatabaseAlert: Identifiable {
 struct DatabaseView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
-    let dismissSettingsSheet: DismissAction
+    @Binding var showSettings: Bool
     @State private var runChat = false
     @State private var alert: DatabaseAlert? = nil
     @State private var showFileImporter = false
@@ -439,7 +439,7 @@ struct DatabaseView: View {
 
     private func startChat() {
         if m.chatDbChanged {
-            dismissSettingsSheet()
+            showSettings = false
             DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                 resetChatCtrl()
                 do {
@@ -533,9 +533,7 @@ func deleteChatAsync() async throws {
 }
 
 struct DatabaseView_Previews: PreviewProvider {
-    @Environment(\.dismiss) static var mockDismiss
-
     static var previews: some View {
-        DatabaseView(dismissSettingsSheet: mockDismiss, chatItemTTL: .none)
+        DatabaseView(showSettings: Binding.constant(false), chatItemTTL: .none)
     }
 }

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

@@ -11,12 +11,6 @@ import SwiftUI
 class AppSheetState: ObservableObject {
     static let shared = AppSheetState()
     @Published var scenePhaseActive: Bool = false
-
-    func redactionReasons(_ protectScreen: Bool) -> RedactionReasons {
-        !protectScreen || scenePhaseActive
-        ? RedactionReasons()
-        : RedactionReasons.placeholder
-    }
 }
 
 private struct PrivacySensitive: ViewModifier {
@@ -25,7 +19,11 @@ private struct PrivacySensitive: ViewModifier {
     @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared
 
     func body(content: Content) -> some View {
-        content.redacted(reason: appSheetState.redactionReasons(protectScreen))
+        if !protectScreen {
+            content
+        } else {
+            content.privacySensitive(!appSheetState.scenePhaseActive).redacted(reason: .privacy)
+        }
     }
 }
 

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

@@ -36,7 +36,12 @@ struct ChatItemClipped: ViewModifier {
                     .sndMsgContent,
                     .rcvMsgContent,
                     .rcvDecryptionError,
+                    .sndDeleted,
+                    .rcvDeleted,
                     .rcvIntegrityError,
+                    .sndModerated,
+                    .rcvModerated,
+                    .rcvBlocked,
                     .invalidJSON:
                 let tail = if let mc = ci.content.msgContent, mc.isImageOrVideo && mc.text.isEmpty {
                     false

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

@@ -1,188 +0,0 @@
-//
-//  SwiftUISheet.swift
-//  SimpleX (iOS)
-//
-//  Created by user on 23/09/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-private let sheetAnimationDuration: Double = 0.35
-
-// Refrence: https://easings.net/
-private let easeOutCubic = UICubicTimingParameters(
-    controlPoint1: CGPoint(x: 0.215, y: 0.61),
-    controlPoint2: CGPoint(x: 0.355, y: 1)
-)
-
-struct Sheet<SheetContent: View>: ViewModifier {
-    @Binding var isPresented: Bool
-    @ViewBuilder let sheetContent: () -> SheetContent
-
-    func body(content: Content) -> some View {
-        ZStack {
-            content
-            SheetRepresentable(isPresented: $isPresented, content: sheetContent())
-                .allowsHitTesting(isPresented)
-                .ignoresSafeArea()
-        }
-    }
-}
-
-struct SheetRepresentable<Content: View>: UIViewControllerRepresentable {
-    @Binding var isPresented: Bool
-    let content:  Content
-
-    func makeUIViewController(context: Context) -> Controller<Content> {
-        Controller(content: content, representer: self)
-    }
-
-    func updateUIViewController(_ sheetController: Controller<Content>, context: Context) {
-        sheetController.animate(isPresented: isPresented)
-    }
-
-    class Controller<C: View>: UIViewController {
-        let hostingController: UIHostingController<C>
-        private let animator = UIViewPropertyAnimator(
-            duration: sheetAnimationDuration,
-            timingParameters: easeOutCubic
-        )
-        private let representer: SheetRepresentable<C>
-        private var retainedFraction: CGFloat = 0
-        private var sheetHeight: Double { hostingController.view.frame.height }
-        private var task: Task<Void, Never>?
-
-        init(content: C, representer: SheetRepresentable<C>) {
-            self.representer = representer
-            self.hostingController = UIHostingController(rootView: content)
-            super.init(nibName: nil, bundle: nil)
-        }
-
-        @available(*, unavailable)
-        required init?(coder: NSCoder) { fatalError("init(coder:) missing") }
-
-        deinit {
-            animator.stopAnimation(true)
-            animator.finishAnimation(at: .current)
-        }
-
-        func animate(isPresented: Bool) {
-            let alreadyAnimating = animator.isRunning && isPresented != animator.isReversed
-            let sheetFullyDismissed = animator.fractionComplete == (animator.isReversed ? 1 : 0)
-            let sheetFullyPresented = animator.fractionComplete == (animator.isReversed ? 0 : 1)
-
-            if !isPresented && sheetFullyDismissed ||
-                isPresented && sheetFullyPresented ||
-                alreadyAnimating {
-                return
-            }
-
-            animator.pauseAnimation()
-            animator.isReversed = !isPresented
-            animator.continueAnimation(
-                withTimingParameters: isPresented
-                ? easeOutCubic
-                : UICubicTimingParameters(animationCurve: .easeIn),
-                durationFactor: 1 - animator.fractionComplete
-            )
-            handleVisibility()
-        }
-
-        func handleVisibility() {
-            if animator.isReversed {
-                task = Task {
-                    do {
-                        let sleepDuration = UInt64(sheetAnimationDuration * Double(NSEC_PER_SEC))
-                        try await Task.sleep(nanoseconds: sleepDuration)
-                        view.isHidden = true
-                    } catch { }
-                }
-            } else {
-                task?.cancel()
-                task = nil
-                view.isHidden = false
-            }
-        }
-
-        override func viewDidLoad() {
-            view.isHidden = true
-            view.backgroundColor = .clear
-            view.addGestureRecognizer(
-                UITapGestureRecognizer(target: self, action: #selector(tap(gesture:)))
-            )
-            addChild(hostingController)
-            hostingController.didMove(toParent: self)
-            if let sheet = hostingController.view {
-                sheet.isHidden = true
-                sheet.clipsToBounds = true
-                sheet.layer.cornerRadius = 10
-                sheet.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMinXMinYCorner]
-                sheet.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(pan(gesture:))))
-                sheet.translatesAutoresizingMaskIntoConstraints = false
-                view.addSubview(sheet)
-                NSLayoutConstraint.activate([
-                    hostingController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-                    hostingController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-                    hostingController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
-                ])
-            }
-        }
-
-        override func viewDidAppear(_ animated: Bool) {
-            // Ensures animations are only setup once
-            // on some iOS version `viewDidAppear` can get called on each state change.
-            if hostingController.view.isHidden {
-                hostingController.view.transform = CGAffineTransform(translationX: 0, y: self.sheetHeight)
-                hostingController.view.isHidden = false
-                animator.pausesOnCompletion = true
-                animator.addAnimations {
-                    self.hostingController.view.transform = .identity
-                    self.view.backgroundColor = UIColor {
-                        switch $0.userInterfaceStyle {
-                        case .dark: .black.withAlphaComponent(0.290)
-                        default:    .black.withAlphaComponent(0.121)
-                        }
-                    }
-                }
-                animator.startAnimation()
-                animator.pauseAnimation()
-            }
-        }
-
-        @objc
-        func pan(gesture: UIPanGestureRecognizer) {
-            switch gesture.state {
-            case .began:
-                animator.isReversed = false
-                animator.pauseAnimation()
-                retainedFraction = animator.fractionComplete
-            case .changed:
-                animator.fractionComplete = retainedFraction - gesture.translation(in: view).y / sheetHeight
-            case .ended, .cancelled:
-                let velocity = gesture.velocity(in: view).y
-                animator.isReversed = (velocity - (animator.fractionComplete - 0.5) * 100).sign == .plus
-                let defaultVelocity = sheetHeight / sheetAnimationDuration
-                let fractionRemaining = 1 - animator.fractionComplete
-                let durationFactor = min(max(fractionRemaining / (abs(velocity) / defaultVelocity), 0.5), 1)
-                animator.continueAnimation(withTimingParameters: nil, durationFactor: durationFactor * fractionRemaining)
-                handleVisibility()
-                DispatchQueue.main.asyncAfter(deadline: .now() + sheetAnimationDuration) {
-                    self.representer.isPresented = !self.animator.isReversed
-                }
-            default: break
-            }
-        }
-
-        @objc
-        func tap(gesture: UITapGestureRecognizer) {
-            switch gesture.state {
-            case .ended:
-                if gesture.location(in: view).y < view.frame.height - sheetHeight {
-                    representer.isPresented = false
-                }
-            default: break
-            }
-        }
-    }
-}

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

@@ -1,61 +0,0 @@
-//
-//  StickyScrollView.swift
-//  SimpleX (iOS)
-//
-//  Created by user on 20/09/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-struct StickyScrollView<Content: View>: UIViewRepresentable {
-    @Binding var resetScroll: ResetScrollAction
-    @ViewBuilder let content: () -> Content
-
-    func makeUIView(context: Context) -> UIScrollView {
-        let hc = context.coordinator.hostingController
-        hc.view.backgroundColor = .clear
-        let sv = UIScrollView()
-        sv.showsHorizontalScrollIndicator = false
-        sv.addSubview(hc.view)
-        sv.delegate = context.coordinator
-        DispatchQueue.main.async {
-            resetScroll = ResetScrollAction { sv.setContentOffset(.zero, animated: false) }
-        }
-        return sv
-    }
-
-    func updateUIView(_ scrollView: UIScrollView, context: Context) {
-        let hc = context.coordinator.hostingController
-        hc.rootView = content()
-        hc.view.frame.size = hc.view.intrinsicContentSize
-        scrollView.contentSize = hc.view.intrinsicContentSize
-    }
-
-    func makeCoordinator() -> Coordinator {
-        Coordinator(content: content())
-    }
-
-    class Coordinator: NSObject, UIScrollViewDelegate {
-        let hostingController: UIHostingController<Content>
-
-        init(content: Content) {
-            self.hostingController = UIHostingController(rootView: content)
-        }
-
-        func scrollViewWillEndDragging(
-            _ scrollView: UIScrollView,
-            withVelocity velocity: CGPoint,
-            targetContentOffset: UnsafeMutablePointer<CGPoint>
-        ) {
-            if targetContentOffset.pointee.x < 32 {
-                targetContentOffset.pointee.x = 0
-            }
-        }
-    }
-}
-
-struct ResetScrollAction {
-    var action = { }
-    func callAsFunction() { action() }
-}

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

@@ -16,7 +16,6 @@ struct UserWallpaperEditor: View {
     @State var themeModeOverride: ThemeModeOverride
     @State var applyToMode: DefaultThemeMode?
     @State var showMore: Bool = false
-    @State var showFileImporter: Bool = false
     @Binding var globalThemeUsed: Bool
     var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void
 
@@ -126,27 +125,24 @@ struct UserWallpaperEditor: View {
 
                 CustomizeThemeColorsSection(editColor: { name in editColor(name, theme) })
 
-                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes)
+                ImportExportThemeSection(perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes) { imported in
+                    let importedFromString = imported.wallpaper?.importFromString()
+                    let importedType = importedFromString?.toAppWallpaper().type
+                    let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
+                    let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
+                    let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
+                    let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
+                    Task {
+                        await MainActor.run {
+                            themeModeOverride = res
+                        }
+                        await save(applyToMode, res)
+                    }
+                }
             } else {
                 AdvancedSettingsButton(theme.colors.primary) { showMore = true }
             }
         }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { imported in
-                let importedFromString = imported.wallpaper?.importFromString()
-                let importedType = importedFromString?.toAppWallpaper().type
-                let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
-                let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
-                let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
-                let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
-                Task {
-                    await MainActor.run {
-                        themeModeOverride = res
-                    }
-                    await save(applyToMode, res)
-                }
-            }
-        )
     }
 
     private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {
@@ -220,7 +216,6 @@ struct ChatWallpaperEditor: View {
     @State var themeModeOverride: ThemeModeOverride
     @State var applyToMode: DefaultThemeMode?
     @State var showMore: Bool = false
-    @State var showFileImporter: Bool = false
     @Binding var globalThemeUsed: Bool
     var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void
 
@@ -333,27 +328,24 @@ struct ChatWallpaperEditor: View {
 
                 CustomizeThemeColorsSection(editColor: editColor)
 
-                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes)
+                ImportExportThemeSection(perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes) { imported in
+                    let importedFromString = imported.wallpaper?.importFromString()
+                    let importedType = importedFromString?.toAppWallpaper().type
+                    let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+                    let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
+                    let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
+                    let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
+                    Task {
+                        await MainActor.run {
+                            themeModeOverride = res
+                        }
+                        await save(applyToMode, res)
+                    }
+                }
             } else {
                 AdvancedSettingsButton(theme.colors.primary) { showMore = true }
             }
         }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { imported in
-                let importedFromString = imported.wallpaper?.importFromString()
-                let importedType = importedFromString?.toAppWallpaper().type
-                let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-                let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
-                let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
-                let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
-                Task {
-                    await MainActor.run {
-                        themeModeOverride = res
-                    }
-                    await save(applyToMode, res)
-                }
-            }
-        )
     }
 
     private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {

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

@@ -1,62 +0,0 @@
-//
-//  UserDefault.swift
-//  SimpleX (iOS)
-//
-//  Created by user on 14/10/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import Combine
-
-@propertyWrapper
-public struct UserDefault<Value: Equatable>: DynamicProperty {
-    @StateObject private var observer = UserDefaultObserver()
-    let initialValue: Value
-    let key: String
-    let store: UserDefaults
-
-    public init(
-        wrappedValue: Value,
-        _ key: String,
-        store: UserDefaults = .standard
-    ) {
-        self.initialValue = wrappedValue
-        self.key = key
-        self.store = store
-    }
-
-    public var wrappedValue: Value {
-        get {
-            // Observer can only be accessed after the property wrapper is installed in view (runtime exception)
-            observer.subscribe(to: key)
-            return store.object(forKey: key) as? Value ?? initialValue
-        }
-        nonmutating set {
-            store.set(newValue, forKey: key)
-        }
-    }
-}
-
-private class UserDefaultObserver: ObservableObject {
-    private var subscribed = false
-
-    func subscribe(to key: String) {
-        if !subscribed {
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(userDefaultsDidChange),
-                name: UserDefaults.didChangeNotification,
-                object: nil
-            )
-            subscribed = true
-        }
-    }
-
-    @objc
-    private func userDefaultsDidChange(_ notification: Notification) {
-        Task { @MainActor in objectWillChange.send() }
-    }
-
-    deinit { NotificationCenter.default.removeObserver(self) }
-}

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

@@ -137,13 +137,10 @@ struct AddGroupView: View {
             createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
         }
         .onChange(of: chosenImage) { image in
-            Task {
-                let resized: String? = if let image {
-                    await resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
-                } else {
-                    nil
-                }
-                await MainActor.run { profile.image = resized }
+            if let image = image {
+                profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
+            } else {
+                profile.image = nil
             }
         }
         .modifier(ThemedBackground(grouped: true))

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

@@ -14,8 +14,7 @@ enum ContactType: Int {
 }
 
 struct NewChatMenuButton: View {
-    // do not use chatModel here because it prevents showing AddGroupMembersView after group creation and QR code after link creation on iOS 16
-//    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var chatModel: ChatModel
     @State private var showNewChatSheet = false
     @State private var alert: SomeAlert? = nil
     @State private var pendingConnection: PendingContactConnection? = nil
@@ -33,7 +32,7 @@ struct NewChatMenuButton: View {
             NewChatSheet(pendingConnection: $pendingConnection)
                 .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
                 .onDisappear {
-                    alert = cleanupPendingConnection(contactConnection: pendingConnection)
+                    alert = cleanupPendingConnection(chatModel: chatModel, contactConnection: pendingConnection)
                     pendingConnection = nil
                 }
         }

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

@@ -45,10 +45,10 @@ enum NewChatOption: Identifiable {
     var id: Self { self }
 }
 
-func cleanupPendingConnection(contactConnection: PendingContactConnection?) -> SomeAlert? {
+func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingContactConnection?) -> SomeAlert? {
     var alert: SomeAlert? = nil
 
-    if !(ChatModel.shared.showingInvitation?.connChatUsed ?? true),
+    if !(chatModel.showingInvitation?.connChatUsed ?? true),
        let conn = contactConnection {
         alert = SomeAlert(
             alert: Alert(
@@ -68,7 +68,7 @@ func cleanupPendingConnection(contactConnection: PendingContactConnection?) -> S
         )
     }
     
-    ChatModel.shared.showingInvitation = nil
+    chatModel.showingInvitation = nil
 
     return alert
 }
@@ -97,11 +97,6 @@ struct NewChatView: View {
             }
             .pickerStyle(.segmented)
             .padding()
-            .onChange(of: $selection.wrappedValue) { opt in
-                if opt == NewChatOption.connect {
-                    showQRCodeScanner = true
-                }
-            }
 
             VStack {
                 // it seems there's a bug in iOS 15 if several views in switch (or if-else) statement have different transitions
@@ -157,7 +152,7 @@ struct NewChatView: View {
         }
         .onDisappear {
             if !choosingProfile {
-                parentAlert = cleanupPendingConnection(contactConnection: contactConnection)
+                parentAlert = cleanupPendingConnection(chatModel: m, contactConnection: contactConnection)
                 contactConnection = nil
             }
         }
@@ -246,6 +241,7 @@ private struct InviteView: View {
     @Binding var choosingProfile: Bool
 
     @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
+    @State private var showSettings: Bool = false
 
     var body: some View {
         List {
@@ -697,7 +693,6 @@ struct ScannerInView: View {
                             .frame(maxWidth: .infinity, maxHeight: .infinity)
                             .foregroundColor(Color.clear)
                         switch cameraAuthorizationStatus {
-                        case .authorized, nil: EmptyView()
                         case .restricted: Text("Camera not available")
                         case .denied:  Label("Enable camera access", systemImage: "camera")
                         default: Label("Tap to scan", systemImage: "qrcode")
@@ -717,26 +712,21 @@ struct ScannerInView: View {
                 .disabled(cameraAuthorizationStatus == .restricted)
             }
         }
-        .task {
+        .onAppear {
             let status = AVCaptureDevice.authorizationStatus(for: .video)
             cameraAuthorizationStatus = status
             if showQRCodeScanner {
                 switch status {
-                case .notDetermined: await askCameraAuthorizationAsync()
+                case .notDetermined: askCameraAuthorization()
                 case .restricted: showQRCodeScanner = false
                 case .denied: showQRCodeScanner = false
                 case .authorized: ()
-                @unknown default: await askCameraAuthorizationAsync()
+                @unknown default: askCameraAuthorization()
                 }
             }
         }
     }
 
-    func askCameraAuthorizationAsync() async {
-        await AVCaptureDevice.requestAccess(for: .video)
-        cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
-    }
-
     func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
         AVCaptureDevice.requestAccess(for: .video) { allowed in
             cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)

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

@@ -49,34 +49,34 @@ struct QRCode: View {
         ZStack {
             if let image = image {
                 qrCodeImage(image)
-                GeometryReader { geo in
-                    ZStack {
-                        if withLogo {
-                            let w = geo.size.width
-                            Image("icon-light")
-                            .resizable()
-                            .scaledToFit()
-                            .frame(width: w * 0.16, height: w * 0.16)
-                            .frame(width: w * 0.165, height: w * 0.165)
-                            .background(.white)
-                            .clipShape(Circle())
-                        }
+            }
+            GeometryReader { geo in
+                ZStack {
+                    if withLogo {
+                        let w = geo.size.width
+                        Image("icon-light")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: w * 0.16, height: w * 0.16)
+                        .frame(width: w * 0.165, height: w * 0.165)
+                        .background(.white)
+                        .clipShape(Circle())
                     }
-                    .onAppear {
-                        makeScreenshotFunc = {
-                            let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                            showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
-                            onShare?()
-                        }
-                    }
-                    .frame(width: geo.size.width, height: geo.size.height)
                 }
-            } else {
-                Color.clear.aspectRatio(1, contentMode: .fit)
+                .onAppear {
+                    makeScreenshotFunc = {
+                        let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
+                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                        onShare?()
+                    }
+                }
+                .frame(width: geo.size.width, height: geo.size.height)
             }
         }
         .onTapGesture(perform: makeScreenshotFunc)
-        .task { image = await generateImage(uri, tintColor: tintColor) }
+        .onAppear {
+            image = image ?? generateImage(uri, tintColor: tintColor)
+        }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
     }
 }
@@ -89,7 +89,7 @@ private func qrCodeImage(_ image: UIImage) -> some View {
         .textSelection(.enabled)
 }
 
-private func generateImage(_ uri: String, tintColor: UIColor) async -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
     let context = CIContext()
     let filter = CIFilter.qrCodeGenerator()
     filter.message = Data(uri.utf8)

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

@@ -1,115 +0,0 @@
-//
-//  AddressCreationCard.swift
-//  SimpleX (iOS)
-//
-//  Created by Diogo Cunha on 13/11/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct AddressCreationCard: View {
-    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject private var chatModel: ChatModel
-    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
-    @AppStorage(DEFAULT_ADDRESS_CREATION_CARD_SHOWN) private var addressCreationCardShown = false
-    @State private var showAddressCreationAlert = false
-    @State private var showAddressSheet = false
-    @State private var showAddressInfoSheet = false
-
-    var body: some View {
-        let addressExists = chatModel.userAddress != nil
-        let chats = chatModel.chats.filter { chat in
-            !chat.chatInfo.chatDeleted && chatContactType(chat: chat) != ContactType.card
-        }
-        ZStack(alignment: .topTrailing) {
-            HStack(alignment: .top, spacing: 16) {
-                let envelopeSize = dynamicSize(userFont).profileImageSize
-                Image(systemName: "envelope.circle.fill")
-                    .resizable()
-                    .frame(width: envelopeSize, height: envelopeSize)
-                    .foregroundColor(.accentColor)
-                VStack(alignment: .leading) {
-                    Text("Your SimpleX address")
-                        .font(.title3)
-                    Spacer()
-                    HStack(alignment: .center) {
-                        Text("How to use it")
-                        VStack {
-                            Image(systemName: "info.circle")
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    }
-                }
-            }
-            .frame(maxWidth: .infinity, alignment: .leading)
-            VStack(alignment: .trailing) {
-                Image(systemName: "multiply")
-                    .foregroundColor(theme.colors.secondary)
-                    .onTapGesture {
-                        showAddressCreationAlert = true
-                    }
-                Spacer()
-                Text("Create")
-                    .foregroundColor(.accentColor)
-                    .onTapGesture {
-                        showAddressSheet = true
-                    }
-            }
-        }
-        .onTapGesture {
-            showAddressInfoSheet = true
-        }
-        .padding()
-        .background(theme.appColors.sentMessage)
-        .cornerRadius(12)
-        .frame(height: dynamicSize(userFont).rowHeight)
-        .alert(isPresented: $showAddressCreationAlert) {
-            Alert(
-                title: Text("SimpleX address"),
-                message: Text("You can create it in user picker."),
-                dismissButton: .default(Text("Ok")) {
-                    withAnimation {
-                        addressCreationCardShown = true
-                    }
-                }
-            )
-        }
-        .sheet(isPresented: $showAddressSheet) {
-            NavigationView {
-                UserAddressView(autoCreate: true)
-                    .navigationTitle("SimpleX address")
-                    .navigationBarTitleDisplayMode(.large)
-                    .modifier(ThemedBackground(grouped: true))
-            }
-        }
-        .sheet(isPresented: $showAddressInfoSheet) {
-            NavigationView {
-                UserAddressLearnMore(showCreateAddressButton: true)
-                    .navigationTitle("SimpleX address")
-                    .navigationBarTitleDisplayMode(.large)
-                    .modifier(ThemedBackground(grouped: true))
-            }
-        }
-        .onChange(of: addressExists) { exists in
-            if exists, !addressCreationCardShown {
-                addressCreationCardShown = true
-            }
-        }
-        .onChange(of: chats.count) { size in
-            if size >= 3, !addressCreationCardShown  {
-                addressCreationCardShown = true
-            }
-        }
-        .onAppear {
-            if addressExists, !addressCreationCardShown {
-                addressCreationCardShown = true
-            }
-        }
-    }
-}
-
-#Preview {
-    AddressCreationCard()
-}

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

@@ -1,436 +0,0 @@
-//
-//  ChooseServerOperators.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 31.10.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-let conditionsURL = URL(string: "https://github.com/simplex-chat/simplex-chat/blob/stable/PRIVACY.md")!
-
-struct OnboardingButtonStyle: ButtonStyle {
-    @EnvironmentObject var theme: AppTheme
-    var isDisabled: Bool = false
-
-    func makeBody(configuration: Configuration) -> some View {
-        configuration.label
-            .font(.system(size: 17, weight: .semibold))
-            .padding()
-            .frame(maxWidth: .infinity)
-            .background(
-                isDisabled
-                ? (
-                    theme.colors.isLight
-                    ? .gray.opacity(0.17)
-                    : .gray.opacity(0.27)
-                )
-                : theme.colors.primary
-            )
-            .foregroundColor(
-                isDisabled
-                ? (
-                    theme.colors.isLight
-                    ? .gray.opacity(0.4)
-                    : .white.opacity(0.2)
-                )
-                : .white
-            )
-            .cornerRadius(16)
-            .scaleEffect(configuration.isPressed ? 0.95 : 1.0)
-    }
-}
-
-private enum ChooseServerOperatorsSheet: Identifiable {
-    case showInfo
-    case showConditions
-
-    var id: String {
-        switch self {
-        case .showInfo: return "showInfo"
-        case .showConditions: return "showConditions"
-        }
-    }
-}
-
-struct ChooseServerOperators: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
-    @EnvironmentObject var theme: AppTheme
-    var onboarding: Bool
-    @State private var serverOperators: [ServerOperator] = []
-    @State private var selectedOperatorIds = Set<Int64>()
-    @State private var reviewConditionsNavLinkActive = false
-    @State private var sheetItem: ChooseServerOperatorsSheet? = nil
-    @State private var notificationsModeNavLinkActive = false
-    @State private var justOpened = true
-
-    var selectedOperators: [ServerOperator] { serverOperators.filter { selectedOperatorIds.contains($0.operatorId) } }
-
-    var body: some View {
-        GeometryReader { g in
-            ScrollView {
-                VStack(alignment: .leading, spacing: 20) {
-                    if !onboarding {
-                        Text("Choose operators")
-                            .font(.largeTitle)
-                            .bold()
-                    }
-
-                    infoText()
-                    
-                    Spacer()
-                    
-                    ForEach(serverOperators) { srvOperator in
-                        operatorCheckView(srvOperator)
-                    }
-                    Text("You can configure servers via settings.")
-                        .font(.footnote)
-                        .multilineTextAlignment(.center)
-                        .frame(maxWidth: .infinity, alignment: .center)
-                        .padding(.horizontal, 32)
-                    
-                    Spacer()
-                    
-                    let reviewForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-                    let canReviewLater = reviewForOperators.allSatisfy { $0.conditionsAcceptance.usageAllowed }
-                    let currEnabledOperatorIds = Set(serverOperators.filter { $0.enabled }.map { $0.operatorId })
-                    
-                    VStack(spacing: 8) {
-                        if !reviewForOperators.isEmpty {
-                            reviewConditionsButton()
-                        } else if selectedOperatorIds != currEnabledOperatorIds && !selectedOperatorIds.isEmpty {
-                            setOperatorsButton()
-                        } else {
-                            continueButton()
-                        }
-                        if onboarding {
-                            Group {
-                                if reviewForOperators.isEmpty {
-                                    Button("Conditions of use") {
-                                        sheetItem = .showConditions
-                                    }
-                                } else {
-                                    Text("Conditions of use")
-                                        .foregroundColor(.clear)
-                                }
-                            }
-                            .font(.callout)
-                            .padding(.top)
-                        }
-                    }
-                    .padding(.bottom)
-                    
-                    if !onboarding && !reviewForOperators.isEmpty {
-                        VStack(spacing: 8) {
-                            reviewLaterButton()
-                            (
-                                Text("Conditions will be accepted for enabled operators after 30 days.")
-                                + Text(" ")
-                                + Text("You can configure operators in Network & servers settings.")
-                            )
-                            .multilineTextAlignment(.center)
-                            .font(.footnote)
-                            .padding(.horizontal, 32)
-                        }
-                        .disabled(!canReviewLater)
-                        .padding(.bottom)
-                    }
-                }
-                .frame(minHeight: g.size.height)
-            }
-            .onAppear {
-                if justOpened {
-                    serverOperators = ChatModel.shared.conditions.serverOperators
-                    selectedOperatorIds = Set(serverOperators.filter { $0.enabled }.map { $0.operatorId })
-                    justOpened = false
-                }
-            }
-            .sheet(item: $sheetItem) { item in
-                switch item {
-                case .showInfo:
-                    ChooseServerOperatorsInfoView()
-                case .showConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
-                    .modifier(ThemedBackground(grouped: true))
-                }
-            }
-        }
-        .frame(maxHeight: .infinity)
-        .padding()
-    }
-
-    private func infoText() -> some View {
-        HStack(spacing: 12) {
-            Image(systemName: "info.circle")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 20, height: 20)
-                .foregroundColor(theme.colors.primary)
-                .onTapGesture {
-                    sheetItem = .showInfo
-                }
-
-            Text("Select network operators to use.")
-        }
-    }
-
-    @ViewBuilder private func operatorCheckView(_ serverOperator: ServerOperator) -> some View {
-        let checked = selectedOperatorIds.contains(serverOperator.operatorId)
-        let icon = checked ? "checkmark.circle.fill" : "circle"
-        let iconColor = checked ? theme.colors.primary : Color(uiColor: .tertiaryLabel).asAnotherColorFromSecondary(theme)
-        HStack(spacing: 10) {
-            Image(serverOperator.largeLogo(colorScheme))
-                .resizable()
-                .scaledToFit()
-                .frame(height: 48)
-            Spacer()
-            Image(systemName: icon)
-                .resizable()
-                .scaledToFit()
-                .frame(width: 26, height: 26)
-                .foregroundColor(iconColor)
-        }
-        .background(theme.colors.background)
-        .padding()
-        .clipShape(RoundedRectangle(cornerRadius: 18))
-        .overlay(
-            RoundedRectangle(cornerRadius: 18)
-                .stroke(Color(uiColor: .secondarySystemFill), lineWidth: 2)
-        )
-        .padding(.horizontal, 2)
-        .onTapGesture {
-            if checked {
-                selectedOperatorIds.remove(serverOperator.operatorId)
-            } else {
-                selectedOperatorIds.insert(serverOperator.operatorId)
-            }
-        }
-    }
-
-    private func reviewConditionsButton() -> some View {
-        ZStack {
-            Button {
-                reviewConditionsNavLinkActive = true
-            } label: {
-                Text("Review conditions")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-
-            NavigationLink(isActive: $reviewConditionsNavLinkActive) {
-                reviewConditionsDestinationView()
-            } label: {
-                EmptyView()
-            }
-            .frame(width: 1, height: 1)
-            .hidden()
-        }
-    }
-
-    private func setOperatorsButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                Task {
-                    if let enabledOperators = enabledOperators(serverOperators) {
-                        let r = try await setServerOperators(operators: enabledOperators)
-                        await MainActor.run {
-                            ChatModel.shared.conditions = r
-                            continueToNextStep()
-                        }
-                    } else {
-                        await MainActor.run {
-                            continueToNextStep()
-                        }
-                    }
-                }
-            } label: {
-                Text("Update")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-        }
-    }
-
-    private func continueButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                continueToNextStep()
-            } label: {
-                Text("Continue")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: selectedOperatorIds.isEmpty))
-            .disabled(selectedOperatorIds.isEmpty)
-        }
-    }
-
-    private func reviewLaterButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                continueToNextStep()
-            } label: {
-                Text("Review later")
-            }
-            .buttonStyle(.borderless)
-        }
-    }
-
-    private func continueToNextStep() {
-        if onboarding {
-            onboardingStageDefault.set(.step4_SetNotificationsMode)
-            notificationsModeNavLinkActive = true
-        } else {
-            dismiss()
-        }
-    }
-
-    func notificationsModeNavLinkButton(_ button: @escaping (() -> some View)) -> some View {
-        ZStack {
-            button()
-
-            NavigationLink(isActive: $notificationsModeNavLinkActive) {
-                notificationsModeDestinationView()
-            } label: {
-                EmptyView()
-            }
-            .frame(width: 1, height: 1)
-            .hidden()
-        }
-    }
-
-    private func notificationsModeDestinationView() -> some View {
-        SetNotificationsMode()
-            .navigationTitle("Push notifications")
-            .navigationBarTitleDisplayMode(.large)
-            .navigationBarBackButtonHidden(true)
-            .modifier(ThemedBackground())
-    }
-
-    private func reviewConditionsDestinationView() -> some View {
-        reviewConditionsView()
-            .navigationTitle("Conditions of use")
-            .navigationBarTitleDisplayMode(.large)
-            .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
-            .modifier(ThemedBackground(grouped: true))
-    }
-
-    @ViewBuilder private func reviewConditionsView() -> some View {
-        let operatorsWithConditionsAccepted = ChatModel.shared.conditions.serverOperators.filter { $0.conditionsAcceptance.conditionsAccepted }
-        let acceptForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-        VStack(alignment: .leading, spacing: 20) {
-            if !operatorsWithConditionsAccepted.isEmpty {
-                Text("Conditions are already accepted for following operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
-                Text("Same conditions will apply to operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
-            } else {
-                Text("Conditions will be accepted for operator(s): **\(acceptForOperators.map { $0.legalName_ }.joined(separator: ", "))**.")
-            }
-            ConditionsTextView()
-            acceptConditionsButton()
-                .padding(.bottom)
-                .padding(.bottom)
-        }
-        .padding(.horizontal)
-        .frame(maxHeight: .infinity)
-    }
-
-    private func acceptConditionsButton() -> some View {
-        notificationsModeNavLinkButton {
-            Button {
-                Task {
-                    do {
-                        let conditionsId = ChatModel.shared.conditions.currentConditions.conditionsId
-                        let acceptForOperators = selectedOperators.filter { !$0.conditionsAcceptance.conditionsAccepted }
-                        let operatorIds = acceptForOperators.map { $0.operatorId }
-                        let r = try await acceptConditions(conditionsId: conditionsId, operatorIds: operatorIds)
-                        await MainActor.run {
-                            ChatModel.shared.conditions = r
-                        }
-                        if let enabledOperators = enabledOperators(r.serverOperators) {
-                            let r2 = try await setServerOperators(operators: enabledOperators)
-                            await MainActor.run {
-                                ChatModel.shared.conditions = r2
-                                continueToNextStep()
-                            }
-                        } else {
-                            await MainActor.run {
-                                continueToNextStep()
-                            }
-                        }
-                    } catch let error {
-                        await MainActor.run {
-                            showAlert(
-                                NSLocalizedString("Error accepting conditions", comment: "alert title"),
-                                message: responseError(error)
-                            )
-                        }
-                    }
-                }
-            } label: {
-                Text("Accept conditions")
-            }
-            .buttonStyle(OnboardingButtonStyle())
-        }
-    }
-
-    private func enabledOperators(_ operators: [ServerOperator]) -> [ServerOperator]? {
-        var ops = operators
-        if !ops.isEmpty {
-            for i in 0..<ops.count {
-                var op = ops[i]
-                op.enabled = selectedOperatorIds.contains(op.operatorId)
-                ops[i] = op
-            }
-            let haveSMPStorage = ops.contains(where: { $0.enabled && $0.smpRoles.storage })
-            let haveSMPProxy = ops.contains(where: { $0.enabled && $0.smpRoles.proxy })
-            let haveXFTPStorage = ops.contains(where: { $0.enabled && $0.xftpRoles.storage })
-            let haveXFTPProxy = ops.contains(where: { $0.enabled && $0.xftpRoles.proxy })
-            if haveSMPStorage && haveSMPProxy && haveXFTPStorage && haveXFTPProxy {
-                return ops
-            } else if let firstEnabledIndex = ops.firstIndex(where: { $0.enabled }) {
-                var op = ops[firstEnabledIndex]
-                if !haveSMPStorage { op.smpRoles.storage = true }
-                if !haveSMPProxy { op.smpRoles.proxy = true }
-                if !haveXFTPStorage { op.xftpRoles.storage = true }
-                if !haveXFTPProxy { op.xftpRoles.proxy = true }
-                ops[firstEnabledIndex] = op
-                return ops
-            } else { // Shouldn't happen - view doesn't let to proceed if no operators are enabled
-                return nil
-            }
-        } else {
-            return nil
-        }
-    }
-}
-
-struct ChooseServerOperatorsInfoView: View {
-    var body: some View {
-        VStack(alignment: .leading) {
-            Text("Network operators")
-                .font(.largeTitle)
-                .bold()
-                .padding(.vertical)
-            ScrollView {
-                VStack(alignment: .leading) {
-                    Group {
-                        Text("When more than one network operator is enabled, the app will use the servers of different operators for each conversation.")
-                        Text("For example, if you receive messages via SimpleX Chat server, the app will use one of Flux servers for private routing.")
-                    }
-                    .padding(.bottom)
-                }
-            }
-        }
-        .padding()
-        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
-        .modifier(ThemedBackground())
-    }
-}
-
-#Preview {
-    ChooseServerOperators(onboarding: true)
-}

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

@@ -38,7 +38,7 @@ struct CreateProfile: View {
                 TextField("Enter your name…", text: $displayName)
                     .focused($focusDisplayName)
                 Button {
-                    createProfile()
+                    createProfile(displayName, showAlert: { alert = $0 }, dismiss: dismiss)
                 } label: {
                     Label("Create profile", systemImage: "checkmark")
                 }
@@ -78,35 +78,6 @@ struct CreateProfile: View {
             }
         }
     }
-
-    private func createProfile() {
-        hideKeyboard()
-        let profile = Profile(
-            displayName: displayName.trimmingCharacters(in: .whitespaces),
-            fullName: ""
-        )
-        let m = ChatModel.shared
-        do {
-            AppChatState.shared.set(.active)
-            m.currentUser = try apiCreateActiveUser(profile)
-            // .isEmpty check is redundant here, but it makes it clearer what is going on
-            if m.users.isEmpty || m.users.allSatisfy({ $0.user.hidden }) {
-                try startChat()
-                withAnimation {
-                    onboardingStageDefault.set(.step3_ChooseServerOperators)
-                    m.onboardingStage = .step3_ChooseServerOperators
-                }
-            } else {
-                onboardingStageDefault.set(.onboardingComplete)
-                m.onboardingStage = .onboardingComplete
-                dismiss()
-                m.users = try listUsers()
-                try getUserChatData()
-            }
-        } catch let error {
-            showCreateProfileAlert(showAlert: { alert = $0 }, error)
-        }
-    }
 }
 
 struct CreateFirstProfile: View {
@@ -115,47 +86,40 @@ struct CreateFirstProfile: View {
     @Environment(\.dismiss) var dismiss
     @State private var displayName: String = ""
     @FocusState private var focusDisplayName
-    @State private var nextStepNavLinkActive = false
 
     var body: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            Text("Your profile, contacts and delivered messages are stored on your device.")
-                .font(.callout)
-                .foregroundColor(theme.colors.secondary)
-            Text("The profile is only shared with your contacts.")
-                .font(.callout)
-                .foregroundColor(theme.colors.secondary)
+        VStack(alignment: .leading) {
+            Group {
+                Text("Create your profile")
+                    .font(.largeTitle)
+                    .bold()
+                Text("Your profile, contacts and delivered messages are stored on your device.")
+                    .foregroundColor(theme.colors.secondary)
+                Text("The profile is only shared with your contacts.")
+                    .foregroundColor(theme.colors.secondary)
+                    .padding(.bottom)
+            }
+            .padding(.bottom)
 
-            HStack {
+            ZStack(alignment: .topLeading) {
                 let name = displayName.trimmingCharacters(in: .whitespaces)
                 let validName = mkValidName(name)
-                ZStack {
-                    if name != validName {
-                        Button {
-                            showAlert(.invalidNameError(validName: validName))
-                        } label: {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        }
-                    } else {
-                        Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
-                        Image(systemName: "pencil").foregroundColor(theme.colors.secondary)
+                if name != validName {
+                    Button {
+                        showAlert(.invalidNameError(validName: validName))
+                    } label: {
+                        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
                     }
+                } else {
+                    Image(systemName: "exclamationmark.circle").foregroundColor(.clear)
                 }
                 TextField("Enter your name…", text: $displayName)
                     .focused($focusDisplayName)
-                    .padding(.horizontal)
-                    .padding(.vertical, 10)
-                    .background(
-                        RoundedRectangle(cornerRadius: 10, style: .continuous)
-                            .fill(Color(uiColor: .tertiarySystemFill))
-                    )
+                    .padding(.leading, 32)
             }
-            .padding(.top)
-
+            .padding(.bottom)
             Spacer()
-
-            createProfileButton()
-                .padding(.bottom)
+            onboardingButtons()
         }
         .onAppear() {
             focusDisplayName = true
@@ -165,85 +129,88 @@ struct CreateFirstProfile: View {
         .frame(maxWidth: .infinity, alignment: .leading)
     }
 
-    func createProfileButton() -> some View {
-        ZStack {
+    func onboardingButtons() -> some View {
+        HStack {
             Button {
-                createProfile()
+                hideKeyboard()
+                withAnimation {
+                    m.onboardingStage = .step1_SimpleXInfo
+                }
             } label: {
-                Text("Create profile")
+                HStack {
+                    Image(systemName: "lessthan")
+                    Text("About SimpleX")
+                }
             }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: !canCreateProfile(displayName)))
-            .disabled(!canCreateProfile(displayName))
 
-            NavigationLink(isActive: $nextStepNavLinkActive) {
-                nextStepDestinationView()
+            Spacer()
+
+            Button {
+                createProfile(displayName, showAlert: showAlert, dismiss: dismiss)
             } label: {
-                EmptyView()
+                HStack {
+                    Text("Create")
+                    Image(systemName: "greaterthan")
+                }
             }
-            .frame(width: 1, height: 1)
-            .hidden()
+            .disabled(!canCreateProfile(displayName))
         }
     }
 
     private func showAlert(_ alert: UserProfileAlert) {
         AlertManager.shared.showAlert(userProfileAlert(alert, $displayName))
     }
-
-    private func nextStepDestinationView() -> some View {
-        ChooseServerOperators(onboarding: true)
-            .navigationTitle("Choose operators")
-            .navigationBarTitleDisplayMode(.large)
-            .navigationBarBackButtonHidden(true)
-            .modifier(ThemedBackground())
-    }
-
-    private func createProfile() {
-        hideKeyboard()
-        let profile = Profile(
-            displayName: displayName.trimmingCharacters(in: .whitespaces),
-            fullName: ""
-        )
-        let m = ChatModel.shared
-        do {
-            AppChatState.shared.set(.active)
-            m.currentUser = try apiCreateActiveUser(profile)
-            try startChat(onboarding: true)
-            onboardingStageDefault.set(.step3_ChooseServerOperators)
-            nextStepNavLinkActive = true
-        } catch let error {
-            showCreateProfileAlert(showAlert: showAlert, error)
-        }
-    }
 }
 
-private func showCreateProfileAlert(
-    showAlert: (UserProfileAlert) -> Void,
-    _ error: Error
-) {
+private func createProfile(_ displayName: String, showAlert: (UserProfileAlert) -> Void, dismiss: DismissAction) {
+    hideKeyboard()
+    let profile = Profile(
+        displayName: displayName.trimmingCharacters(in: .whitespaces),
+        fullName: ""
+    )
     let m = ChatModel.shared
-    switch error as? ChatResponse {
-    case .chatCmdError(_, .errorStore(.duplicateName)),
-         .chatCmdError(_, .error(.userExists)):
-        if m.currentUser == nil {
-            AlertManager.shared.showAlert(duplicateUserAlert)
+    do {
+        AppChatState.shared.set(.active)
+        m.currentUser = try apiCreateActiveUser(profile)
+        // .isEmpty check is redundant here, but it makes it clearer what is going on
+        if m.users.isEmpty || m.users.allSatisfy({ $0.user.hidden }) {
+            try startChat()
+            withAnimation {
+                onboardingStageDefault.set(.step3_CreateSimpleXAddress)
+                m.onboardingStage = .step3_CreateSimpleXAddress
+            }
         } else {
-            showAlert(.duplicateUserError)
+            onboardingStageDefault.set(.onboardingComplete)
+            m.onboardingStage = .onboardingComplete
+            dismiss()
+            m.users = try listUsers()
+            try getUserChatData()
         }
-    case .chatCmdError(_, .error(.invalidDisplayName)):
-        if m.currentUser == nil {
-            AlertManager.shared.showAlert(invalidDisplayNameAlert)
-        } else {
-            showAlert(.invalidDisplayNameError)
-        }
-    default:
-        let err: LocalizedStringKey = "Error: \(responseError(error))"
-        if m.currentUser == nil {
-            AlertManager.shared.showAlert(creatUserErrorAlert(err))
-        } else {
-            showAlert(.createUserError(error: err))
+    } catch let error {
+        switch error as? ChatResponse {
+        case .chatCmdError(_, .errorStore(.duplicateName)),
+             .chatCmdError(_, .error(.userExists)):
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(duplicateUserAlert)
+            } else {
+                showAlert(.duplicateUserError)
+            }
+        case .chatCmdError(_, .error(.invalidDisplayName)):
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(invalidDisplayNameAlert)
+            } else {
+                showAlert(.invalidDisplayNameError)
+            }
+        default:
+            let err: LocalizedStringKey = "Error: \(responseError(error))"
+            if m.currentUser == nil {
+                AlertManager.shared.showAlert(creatUserErrorAlert(err))
+            } else {
+                showAlert(.createUserError(error: err))
+            }
         }
+        logger.error("Failed to create user or start chat: \(responseError(error))")
     }
-    logger.error("Failed to create user or start chat: \(responseError(error))")
 }
 
 private func canCreateProfile(_ displayName: String) -> Bool {

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

@@ -9,16 +9,13 @@
 import SwiftUI
 
 struct HowItWorks: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var m: ChatModel
     var onboarding: Bool
-    @Binding var createProfileNavLinkActive: Bool
 
     var body: some View {
         VStack(alignment: .leading) {
             Text("How SimpleX works")
                 .font(.largeTitle)
-                .bold()
                 .padding(.vertical)
             ScrollView {
                 VStack(alignment: .leading) {
@@ -40,8 +37,8 @@ struct HowItWorks: View {
             Spacer()
 
             if onboarding {
-                createFirstProfileButton()
-                    .padding(.bottom)
+                OnboardingActionButton()
+                    .padding(.bottom, 8)
             }
         }
         .lineLimit(10)
@@ -49,23 +46,10 @@ struct HowItWorks: View {
         .frame(maxHeight: .infinity, alignment: .top)
         .modifier(ThemedBackground())
     }
-
-    private func createFirstProfileButton() -> some View {
-        Button {
-            dismiss()
-            createProfileNavLinkActive = true
-        } label: {
-            Text("Create your profile")
-        }
-        .buttonStyle(OnboardingButtonStyle(isDisabled: false))
-    }
 }
 
 struct HowItWorks_Previews: PreviewProvider {
     static var previews: some View {
-        HowItWorks(
-            onboarding: true,
-            createProfileNavLinkActive: Binding.constant(false)
-        )
+        HowItWorks(onboarding: true)
     }
 }

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

@@ -12,39 +12,20 @@ struct OnboardingView: View {
     var onboarding: OnboardingStage
 
     var body: some View {
-        NavigationView {
-            switch onboarding {
-            case .step1_SimpleXInfo:
-                SimpleXInfo(onboarding: true)
-                    .modifier(ThemedBackground())
-            case .step2_CreateProfile: // deprecated
-                CreateFirstProfile()
-                    .modifier(ThemedBackground())
-            case .step3_CreateSimpleXAddress: // deprecated
-                CreateSimpleXAddress()
-            case .step3_ChooseServerOperators:
-                ChooseServerOperators(onboarding: true)
-                    .navigationTitle("Choose operators")
-                    .navigationBarTitleDisplayMode(.large)
-                    .navigationBarBackButtonHidden(true)
-                    .modifier(ThemedBackground())
-            case .step4_SetNotificationsMode:
-                SetNotificationsMode()
-                    .navigationTitle("Push notifications")
-                    .navigationBarTitleDisplayMode(.large)
-                    .navigationBarBackButtonHidden(true)
-                    .modifier(ThemedBackground())
-            case .onboardingComplete: EmptyView()
-            }
+        switch onboarding {
+        case .step1_SimpleXInfo: SimpleXInfo(onboarding: true)
+        case .step2_CreateProfile: CreateFirstProfile()
+        case .step3_CreateSimpleXAddress: CreateSimpleXAddress()
+        case .step4_SetNotificationsMode: SetNotificationsMode()
+        case .onboardingComplete: EmptyView()
         }
     }
 }
 
 enum OnboardingStage: String, Identifiable {
     case step1_SimpleXInfo
-    case step2_CreateProfile // deprecated
-    case step3_CreateSimpleXAddress // deprecated
-    case step3_ChooseServerOperators
+    case step2_CreateProfile
+    case step3_CreateSimpleXAddress
     case step4_SetNotificationsMode
     case onboardingComplete
 

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

@@ -15,39 +15,41 @@ struct SetNotificationsMode: View {
     @State private var showAlert: NotificationAlert?
 
     var body: some View {
-        GeometryReader { g in
-            ScrollView {
-                VStack(alignment: .leading, spacing: 20) {
-                    Text("Send notifications:")
-                    ForEach(NotificationsMode.values) { mode in
-                        NtfModeSelector(mode: mode, selection: $notificationMode)
-                    }
-                    
-                    Spacer()
-                    
-                    Button {
-                        if let token = m.deviceToken {
-                            setNotificationsMode(token, notificationMode)
-                        } else {
-                            AlertManager.shared.showAlertMsg(title: "No device token!")
-                        }
-                        onboardingStageDefault.set(.onboardingComplete)
-                        m.onboardingStage = .onboardingComplete
-                    } label: {
-                        if case .off = notificationMode {
-                            Text("Use chat")
-                        } else {
-                            Text("Enable notifications")
-                        }
-                    }
-                    .buttonStyle(OnboardingButtonStyle())
-                    .padding(.bottom)
+        ScrollView {
+            VStack(alignment: .leading, spacing: 16) {
+                Text("Push notifications")
+                    .font(.largeTitle)
+                    .bold()
+                    .frame(maxWidth: .infinity)
+
+                Text("Send notifications:")
+                ForEach(NotificationsMode.values) { mode in
+                    NtfModeSelector(mode: mode, selection: $notificationMode)
                 }
-                .padding()
-                .frame(minHeight: g.size.height)
+
+                Spacer()
+
+                Button {
+                    if let token = m.deviceToken {
+                        setNotificationsMode(token, notificationMode)
+                    } else {
+                        AlertManager.shared.showAlertMsg(title: "No device token!")
+                    }
+                    onboardingStageDefault.set(.onboardingComplete)
+                    m.onboardingStage = .onboardingComplete
+                } label: {
+                    if case .off = notificationMode {
+                        Text("Use chat")
+                    } else {
+                        Text("Enable notifications")
+                    }
+                }
+                .font(.title)
+                .frame(maxWidth: .infinity)
             }
+            .padding()
+            .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .bottom)
         }
-        .frame(maxHeight: .infinity)
     }
 
     private func setNotificationsMode(_ token: DeviceToken, _ mode: NotificationsMode) {

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

@@ -13,13 +13,12 @@ struct SimpleXInfo: View {
     @EnvironmentObject var m: ChatModel
     @Environment(\.colorScheme) var colorScheme: ColorScheme
     @State private var showHowItWorks = false
-    @State private var createProfileNavLinkActive = false
     var onboarding: Bool
 
     var body: some View {
         GeometryReader { g in
             ScrollView {
-                VStack(alignment: .leading, spacing: 20) {
+                VStack(alignment: .leading) {
                     Image(colorScheme == .light ? "logo" : "logo-light")
                         .resizable()
                         .aspectRatio(contentMode: .fit)
@@ -43,9 +42,9 @@ struct SimpleXInfo: View {
                     }
 
                     Spacer()
-
                     if onboarding {
-                        createFirstProfileButton()
+                        OnboardingActionButton()
+                        Spacer()
 
                         Button {
                             m.migrationState = .pasteOrScanLink
@@ -53,6 +52,7 @@ struct SimpleXInfo: View {
                             Label("Migrate from another device", systemImage: "tray.and.arrow.down")
                                 .font(.subheadline)
                         }
+                        .padding(.bottom, 8)
                         .frame(maxWidth: .infinity)
                     }
 
@@ -62,8 +62,9 @@ struct SimpleXInfo: View {
                         Label("How it works", systemImage: "info.circle")
                             .font(.subheadline)
                     }
+                    .padding(.bottom, 8)
                     .frame(maxWidth: .infinity)
-                    .padding(.bottom)
+
                 }
                 .frame(minHeight: g.size.height)
             }
@@ -82,10 +83,7 @@ struct SimpleXInfo: View {
                 }
             }
             .sheet(isPresented: $showHowItWorks) {
-                HowItWorks(
-                    onboarding: onboarding,
-                    createProfileNavLinkActive: $createProfileNavLinkActive
-                )
+                HowItWorks(onboarding: onboarding)
             }
         }
         .frame(maxHeight: .infinity)
@@ -110,31 +108,49 @@ struct SimpleXInfo: View {
         .padding(.bottom, 20)
         .padding(.trailing, 6)
     }
+}
 
-    private func createFirstProfileButton() -> some View {
-        ZStack {
-            Button {
-                createProfileNavLinkActive = true
-            } label: {
-                Text("Create your profile")
-            }
-            .buttonStyle(OnboardingButtonStyle(isDisabled: false))
+struct OnboardingActionButton: View {
+    @EnvironmentObject var m: ChatModel
+    @Environment(\.colorScheme) var colorScheme
 
-            NavigationLink(isActive: $createProfileNavLinkActive) {
-                createProfileDestinationView()
-            } label: {
-                EmptyView()
-            }
-            .frame(width: 1, height: 1)
-            .hidden()
+    var body: some View {
+        if m.currentUser == nil {
+            actionButton("Create your profile", onboarding: .step2_CreateProfile)
+        } else {
+            actionButton("Make a private connection", onboarding: .onboardingComplete)
         }
     }
 
-    private func createProfileDestinationView() -> some View {
-        CreateFirstProfile()
-            .navigationTitle("Create your profile")
-            .navigationBarTitleDisplayMode(.large)
-            .modifier(ThemedBackground())
+    private func actionButton(_ label: LocalizedStringKey, onboarding: OnboardingStage) -> some View {
+        Button {
+            withAnimation {
+                onboardingStageDefault.set(onboarding)
+                m.onboardingStage = onboarding
+            }
+        } label: {
+            HStack {
+                Text(label).font(.title2)
+                Image(systemName: "greaterthan")
+            }
+        }
+        .frame(maxWidth: .infinity)
+        .padding(.bottom)
+    }
+
+    private func actionButton(_ label: LocalizedStringKey, action: @escaping () -> Void) -> some View {
+        Button {
+            withAnimation {
+                action()
+            }
+        } label: {
+            HStack {
+                Text(label).font(.title2)
+                Image(systemName: "greaterthan")
+            }
+        }
+        .frame(maxWidth: .infinity)
+        .padding(.bottom)
     }
 }
 

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

@@ -7,209 +7,190 @@
 //
 
 import SwiftUI
-import SimpleXChat
 
 private struct VersionDescription {
     var version: String
     var post: URL?
-    var features: [Feature]
+    var features: [FeatureDescription]
 }
 
-private enum Feature: Identifiable {
-    case feature(Description)
-    case view(FeatureView)
-    
-    var id: LocalizedStringKey {
-        switch self {
-        case let .feature(d): d.title
-        case let .view(v): v.title
-        }
-    }
-}
-
-private struct Description {
-    let icon: String?
-    let title: LocalizedStringKey
-    let description: LocalizedStringKey?
+private struct FeatureDescription {
+    var icon: String?
+    var title: LocalizedStringKey
+    var description: LocalizedStringKey?
     var subfeatures: [(icon: String, description: LocalizedStringKey)] = []
 }
 
-private struct FeatureView {
-    let icon: String?
-    let title: LocalizedStringKey
-    let view: () -> any View
-}
-
 private let versionDescriptions: [VersionDescription] = [
     VersionDescription(
         version: "v4.2",
         post: URL(string: "https://simplex.chat/blog/20221108-simplex-chat-v4.2-security-audit-new-website.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "checkmark.shield",
                 title: "Security assessment",
                 description: "SimpleX Chat security was audited by Trail of Bits."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "person.2",
                 title: "Group links",
                 description: "Admins can create the links to join groups."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "checkmark",
                 title: "Auto-accept contact requests",
                 description: "With optional welcome message."
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v4.3",
         post: URL(string: "https://simplex.chat/blog/20221206-simplex-chat-v4.3-voice-messages.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "mic",
                 title: "Voice messages",
                 description: "Max 30 seconds, received instantly."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "trash.slash",
                 title: "Irreversible message deletion",
                 description: "Your contacts can allow full message deletion."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "externaldrive.connected.to.line.below",
                 title: "Improved server configuration",
                 description: "Add servers by scanning QR codes."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "eye.slash",
                 title: "Improved privacy and security",
                 description: "Hide app screen in the recent apps."
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v4.4",
         post: URL(string: "https://simplex.chat/blog/20230103-simplex-chat-v4.4-disappearing-messages.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "stopwatch",
                 title: "Disappearing messages",
                 description: "Sent messages will be deleted after set time."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "ellipsis.circle",
                 title: "Live messages",
                 description: "Recipients see updates as you type them."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "checkmark.shield",
                 title: "Verify connection security",
                 description: "Compare security codes with your contacts."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "camera",
                 title: "GIFs and stickers",
                 description: "Send them from gallery or custom keyboards."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "French interface",
                 description: "Thanks to the users – contribute via Weblate!"
-            )),
+            )
         ]
     ),
     VersionDescription(
         version: "v4.5",
         post: URL(string: "https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "person.crop.rectangle.stack",
                 title: "Multiple chat profiles",
                 description: "Different names, avatars and transport isolation."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "rectangle.and.pencil.and.ellipsis",
                 title: "Message draft",
                 description: "Preserve the last message draft, with attachments."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "network.badge.shield.half.filled",
                 title: "Transport isolation",
                 description: "By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "lock.doc",
                 title: "Private filenames",
                 description: "To protect timezone, image/voice files use UTC."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "battery.25",
                 title: "Reduced battery usage",
                 description: "More improvements are coming soon!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "Italian interface",
                 description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            )
         ]
     ),
     VersionDescription(
         version: "v4.6",
         post: URL(string: "https://simplex.chat/blog/20230328-simplex-chat-v4-6-hidden-profiles.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "lock",
                 title: "Hidden chat profiles",
                 description: "Protect your chat profiles with a password!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "phone.arrow.up.right",
                 title: "Audio and video calls",
                 description: "Fully re-implemented - work in background!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "flag",
                 title: "Group moderation",
                 description: "Now admins can:\n- delete members' messages.\n- disable members (\"observer\" role)"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "plus.message",
                 title: "Group welcome message",
                 description: "Set the message shown to new members!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "battery.50",
                 title: "Further reduced battery usage",
                 description: "More improvements are coming soon!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "Chinese and Spanish interface",
                 description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.0",
         post: URL(string: "https://simplex.chat/blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "arrow.up.doc",
                 title: "Videos and files up to 1gb",
                 description: "Fast and no wait until the sender is online!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "lock",
                 title: "App passcode",
                 description: "Set it instead of system authentication."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "Polish interface",
                 description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            ),
         ]
     ),
     // Also
@@ -219,240 +200,240 @@ private let versionDescriptions: [VersionDescription] = [
         version: "v5.1",
         post: URL(string: "https://simplex.chat/blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "face.smiling",
                 title: "Message reactions",
                 description: "Finally, we have them! 🚀"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "arrow.up.message",
                 title: "Better messages",
                 description: "- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "lock",
                 title: "Self-destruct passcode",
                 description: "All data is erased when it is entered."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "Japanese interface",
                 description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.2",
         post: URL(string: "https://simplex.chat/blog/20230722-simplex-chat-v5-2-message-delivery-receipts.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "checkmark",
                 title: "Message delivery receipts!",
                 description: "The second tick we missed! ✅"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "star",
                 title: "Find chats faster",
                 description: "Filter unread and favorite chats."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "exclamationmark.arrow.triangle.2.circlepath",
                 title: "Keep your connections",
                 description: "Fix encryption after restoring backups."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "stopwatch",
                 title: "Make one message disappear",
                 description: "Even when disabled in the conversation."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "gift",
                 title: "A few more things",
                 description: "- more stable message delivery.\n- a bit better groups.\n- and more!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.3",
         post: URL(string: "https://simplex.chat/blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "desktopcomputer",
                 title: "New desktop app!",
                 description: "Create new profile in [desktop app](https://simplex.chat/downloads/). 💻"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "lock",
                 title: "Encrypt stored files & media",
                 description: "App encrypts new local files (except videos)."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "magnifyingglass",
                 title: "Discover and join groups",
                 description: "- connect to [directory service](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!\n- delivery receipts (up to 20 members).\n- faster and more stable."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "theatermasks",
                 title: "Simplified incognito mode",
                 description: "Toggle incognito when connecting."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "\(4) new interface languages",
                 description: "Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.4",
         post: URL(string: "https://simplex.chat/blog/20231125-simplex-chat-v5-4-link-mobile-desktop-quantum-resistant-better-groups.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "desktopcomputer",
                 title: "Link mobile and desktop apps! 🔗",
                 description: "Via secure quantum resistant protocol."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "person.2",
                 title: "Better groups",
                 description: "Faster joining and more reliable messages."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "theatermasks",
                 title: "Incognito groups",
                 description: "Create a group using a random profile."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "hand.raised",
                 title: "Block group members",
                 description: "To hide unwanted messages."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "gift",
                 title: "A few more things",
                 description: "- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.5",
         post: URL(string: "https://simplex.chat/blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "folder",
                 title: "Private notes",
                 description: "With encrypted files and media."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "link",
                 title: "Paste link to connect!",
                 description: "Search bar accepts invitation links."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "bubble.left.and.bubble.right",
                 title: "Join group conversations",
                 description: "Recent history and improved [directory bot](simplex:/contact#/?v=1-4&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion)."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "battery.50",
                 title: "Improved message delivery",
                 description: "With reduced battery usage."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "Turkish interface",
                 description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.6",
         post: URL(string: "https://simplex.chat/blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "key",
                 title: "Quantum resistant encryption",
                 description: "Enable in direct chats (BETA)!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "tray.and.arrow.up",
                 title: "App data migration",
                 description: "Migrate to another device via QR code."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "phone",
                 title: "Picture-in-picture calls",
                 description: "Use the app while in the call."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "hand.raised",
                 title: "Safer groups",
                 description: "Admins can block a member for all."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "character",
                 title: "Hungarian interface",
                 description: "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!"
-            )),
+            ),
         ]
     ),
     VersionDescription(
         version: "v5.7",
         post: URL(string: "https://simplex.chat/blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "key",
                 title: "Quantum resistant encryption",
                 description: "Will be enabled in direct chats!"
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "arrowshape.turn.up.forward",
                 title: "Forward and save messages",
                 description: "Message source remains private."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "music.note",
                 title: "In-call sounds",
                 description: "When connecting audio and video calls."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "person.crop.square",
                 title: "Shape profile images",
                 description: "Square, circle, or anything in between."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "antenna.radiowaves.left.and.right",
                 title: "Network management",
                 description: "More reliable network connection."
-            )),
+            )
         ]
     ),
     VersionDescription(
         version: "v5.8",
         post: URL(string: "https://simplex.chat/blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: "arrow.forward",
                 title: "Private message routing 🚀",
                 description: "Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "network.badge.shield.half.filled",
                 title: "Safely receive files",
                 description: "Confirm files from unknown servers."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "battery.50",
                 title: "Improved message delivery",
                 description: "With reduced battery usage."
-            )),
+            )
         ]
     ),
     VersionDescription(
         version: "v6.0",
         post: URL(string: "https://simplex.chat/blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.html"),
         features: [
-            .feature(Description(
+            FeatureDescription(
                 icon: nil,
                 title: "New chat experience 🎉",
                 description: nil,
@@ -463,8 +444,8 @@ private let versionDescriptions: [VersionDescription] = [
                     ("platter.filled.bottom.and.arrow.down.iphone", "Use the app with one hand."),
                     ("paintpalette", "Color chats with the new themes."),
                 ]
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: nil,
                 title: "New media options",
                 description: nil,
@@ -473,68 +454,19 @@ private let versionDescriptions: [VersionDescription] = [
                     ("play.circle", "Play from the chat list."),
                     ("circle.filled.pattern.diagonalline.rectangle", "Blur for better privacy.")
                 ]
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "arrow.forward",
                 title: "Private message routing 🚀",
                 description: "It protects your IP address and connections."
-            )),
-            .feature(Description(
+            ),
+            FeatureDescription(
                 icon: "network",
                 title: "Better networking",
                 description: "Connection and servers status."
-            )),
+            )
         ]
     ),
-    VersionDescription(
-        version: "v6.1",
-        post: URL(string: "https://simplex.chat/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html"),
-        features: [
-            .feature(Description(
-                icon: "checkmark.shield",
-                title: "Better security ✅",
-                description: "SimpleX protocols reviewed by Trail of Bits."
-            )),
-            .feature(Description(
-                icon: "video",
-                title: "Better calls",
-                description: "Switch audio and video during the call."
-            )),
-            .feature(Description(
-                icon: "bolt",
-                title: "Better notifications",
-                description: "Improved delivery, reduced traffic usage.\nMore improvements are coming soon!"
-            )),
-            .feature(Description(
-                icon: nil,
-                title: "Better user experience",
-                description: nil,
-                subfeatures: [
-                    ("link", "Switch chat profile for 1-time invitations."),
-                    ("message", "Customizable message shape."),
-                    ("calendar", "Better message dates."),
-                    ("arrowshape.turn.up.right", "Forward up to 20 messages at once."),
-                    ("flag", "Delete or moderate up to 200 messages.")
-                ]
-            )),
-        ]
-    ),
-    VersionDescription(
-        version: "v6.2 (beta.1)",
-        post: URL(string: "https://simplex.chat/blog/20241125-servers-operated-by-flux-true-privacy-and-decentralization-for-all-users.html"),
-        features: [
-            .view(FeatureView(
-                icon: nil,
-                title: "Network decentralization",
-                view: { NewOperatorsView() }
-            )),
-            .feature(Description(
-                icon: "bolt",
-                title: "More reliable notifications",
-                description: "Delivered even when Apple drops them."
-            )),
-        ]
-    )
 ]
 
 private let lastVersion = versionDescriptions.last!.version
@@ -549,68 +481,14 @@ func shouldShowWhatsNew() -> Bool {
     return v != lastVersion
 }
 
-fileprivate struct NewOperatorsView: View {
-    @State private var showOperatorsSheet = false
-
-    var body: some View {
-        VStack(alignment: .leading) {
-            Image((operatorsInfo[.flux] ?? ServerOperator.dummyOperatorInfo).largeLogo)
-                .resizable()
-                .scaledToFit()
-                .frame(height: 48)
-            Text("The second preset operator in the app!")
-                .multilineTextAlignment(.leading)
-                .lineLimit(10)
-            HStack {
-                Button("Enable Flux") {
-                    showOperatorsSheet = true
-                }
-                Text("for better metadata privacy.")
-            }
-        }
-        .sheet(isPresented: $showOperatorsSheet) {
-            NavigationView {
-                ChooseServerOperators(onboarding: false)
-                    .modifier(ThemedBackground())
-            }
-        }
-    }
-}
-
-private enum WhatsNewViewSheet: Identifiable {
-    case showConditions
-
-    var id: String {
-        switch self {
-        case .showConditions: return "showConditions"
-        }
-    }
-}
-
 struct WhatsNewView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var theme: AppTheme
     @State var currentVersion = versionDescriptions.count - 1
     @State var currentVersionNav = versionDescriptions.count - 1
     var viaSettings = false
-    var updatedConditions: Bool
-    @State private var sheetItem: WhatsNewViewSheet? = nil
 
     var body: some View {
-        whatsNewView()
-            .sheet(item: $sheetItem) { item in
-                switch item {
-                case .showConditions:
-                    UsageConditionsView(
-                        currUserServers: Binding.constant([]),
-                        userServers: Binding.constant([])
-                    )
-                    .modifier(ThemedBackground(grouped: true))
-                }
-            }
-    }
-
-    private func whatsNewView() -> some View {
         VStack {
             TabView(selection: $currentVersion) {
                 ForEach(Array(versionDescriptions.enumerated()), id: \.0) { (i, v) in
@@ -621,11 +499,9 @@ struct WhatsNewView: View {
                                 .foregroundColor(theme.colors.secondary)
                                 .frame(maxWidth: .infinity)
                                 .padding(.vertical)
-                            ForEach(v.features) { f in
-                                switch f {
-                                case let .feature(d): featureDescription(d).padding(.bottom, 8)
-                                case let .view(v): AnyView(v.view()).padding(.bottom, 8)
-                                }
+                            ForEach(v.features, id: \.title) { f in
+                                featureDescription(f)
+                                    .padding(.bottom, 8)
                             }
                             if let post = v.post {
                                 Link(destination: post) {
@@ -635,20 +511,13 @@ struct WhatsNewView: View {
                                     }
                                 }
                             }
-                            if updatedConditions {
-                                Button("View updated conditions") {
-                                    sheetItem = .showConditions
-                                }
-                            }
                             if !viaSettings {
                                 Spacer()
-
                                 Button("Ok") {
                                     dismiss()
                                 }
                                 .font(.title3)
                                 .frame(maxWidth: .infinity, alignment: .center)
-
                                 Spacer()
                             }
                         }
@@ -666,24 +535,20 @@ struct WhatsNewView: View {
             currentVersionNav = currentVersion
         }
     }
-    
-    @ViewBuilder private func featureHeader(_ icon: String?, _ title: LocalizedStringKey) -> some View {
-        if let icon {
-            HStack(alignment: .center, spacing: 4) {
-                Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(theme.colors.secondary)
-                    .frame(minWidth: 30, alignment: .center)
-                Text(title).font(.title3).bold()
-            }
-        } else {
-            Text(title).font(.title3).bold()
-        }
-    }
 
-    private func featureDescription(_ f: Description) -> some View {
+    private func featureDescription(_ f: FeatureDescription) -> some View {
         VStack(alignment: .leading, spacing: 4) {
-            featureHeader(f.icon, f.title)
+            if let icon = f.icon {
+                HStack(alignment: .center, spacing: 4) {
+                    Image(systemName: icon)
+                        .symbolRenderingMode(.monochrome)
+                        .foregroundColor(theme.colors.secondary)
+                        .frame(minWidth: 30, alignment: .center)
+                    Text(f.title).font(.title3).bold()
+                }
+            } else {
+                Text(f.title).font(.title3).bold()
+            }
             if let d = f.description {
                 Text(d)
                     .multilineTextAlignment(.leading)
@@ -738,6 +603,6 @@ struct WhatsNewView: View {
 
 struct NewFeaturesView_Previews: PreviewProvider {
     static var previews: some View {
-        WhatsNewView(updatedConditions: false)
+        WhatsNewView()
     }
 }

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

@@ -14,6 +14,7 @@ struct ConnectDesktopView: View {
     @EnvironmentObject var m: ChatModel
     @EnvironmentObject var theme: AppTheme
     @Environment(\.dismiss) var dismiss: DismissAction
+    var viaSettings = false
     @AppStorage(DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS) private var deviceName = UIDevice.current.name
     @AppStorage(DEFAULT_CONFIRM_REMOTE_SESSIONS) private var confirmRemoteSessions = false
     @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST) private var connectRemoteViaMulticast = true
@@ -56,6 +57,16 @@ struct ConnectDesktopView: View {
     }
 
     var body: some View {
+        if viaSettings {
+            viewBody
+        } else {
+            NavigationView {
+                viewBody
+            }
+        }
+    }
+
+    var viewBody: some View {
         Group {
             let discovery = m.remoteCtrlSession?.discovery
             if discovery == true || (discovery == nil && !showConnectScreen) {

apps/ios/Shared/Views/TerminalView.swift

@@ -105,12 +105,7 @@ struct TerminalView: View {
             }
         }
         .navigationViewStyle(.stack)
-        .toolbar {
-            // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-            ToolbarItem(placement: .principal) {
-                Text("Chat console").font(.headline)
-            }
-        }
+        .navigationTitle("Chat console")
         .modifier(ThemedBackground())
     }
 

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

@@ -196,14 +196,11 @@ struct AdvancedNetworkSettings: View {
                 if developerTools {
                     Section {
                         Picker("Transport isolation", selection: $netCfg.sessionMode) {
-                            let modes = TransportSessionMode.values.contains(netCfg.sessionMode)
-                                ? TransportSessionMode.values
-                                : TransportSessionMode.values + [netCfg.sessionMode]
-                            ForEach(modes, id: \.self) { Text($0.text) }
+                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
                         }
                         .frame(height: 36)
                     } footer: {
-                        sessionModeInfo(netCfg.sessionMode)
+                        Text(sessionModeInfo(netCfg.sessionMode))
                             .foregroundColor(theme.colors.secondary)
                     }
                 }
@@ -356,13 +353,10 @@ struct AdvancedNetworkSettings: View {
         }
     }
 
-    private func sessionModeInfo(_ mode: TransportSessionMode) -> Text {
-        let userMode = Text("A separate TCP connection will be used **for each chat profile you have in the app**.")
-        return switch mode {
-        case .user: userMode
-        case .session: userMode + Text("\n") + Text("New SOCKS credentials will be used every time you start the app.")
-        case .server: userMode + Text("\n") + Text("New SOCKS credentials will be used for each server.")
-        case .entity: Text("A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.")
+    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
+        switch mode {
+        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
+        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
         }
     }
     

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

@@ -58,8 +58,6 @@ extension AppSettings {
             profileImageCornerRadiusGroupDefault.set(val)
             def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
         }
-        if let val = uiChatItemRoundness { def.setValue(val, forKey: DEFAULT_CHAT_ITEM_ROUNDNESS)}
-        if let val = uiChatItemTail { def.setValue(val, forKey: DEFAULT_CHAT_ITEM_TAIL)}
         if let val = uiColorScheme { currentThemeDefault.set(val) }
         if let val = uiDarkColorScheme { systemDarkThemeDefault.set(val) }
         if let val = uiCurrentThemeIds { currentThemeIdsDefault.set(val) }
@@ -93,8 +91,6 @@ extension AppSettings {
         c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
         c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
         c.uiProfileImageCornerRadius = def.double(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
-        c.uiChatItemRoundness = def.double(forKey: DEFAULT_CHAT_ITEM_ROUNDNESS)
-        c.uiChatItemTail = def.bool(forKey: DEFAULT_CHAT_ITEM_TAIL)
         c.uiColorScheme = currentThemeDefault.get()
         c.uiDarkColorScheme = systemDarkThemeDefault.get()
         c.uiCurrentThemeIds = currentThemeIdsDefault.get()

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

@@ -367,13 +367,13 @@ struct ChatThemePreview: View {
                 let alice = ChatItem.getSample(1, CIDirection.directRcv, Date.now, NSLocalizedString("Good afternoon!", comment: "message preview"))
                 let bob = ChatItem.getSample(2, CIDirection.directSnd, Date.now, NSLocalizedString("Good morning!", comment: "message preview"), quotedItem: CIQuote.getSample(alice.id, alice.meta.itemTs, alice.content.text, chatDir: alice.chatDir))
                 HStack {
-                    ChatItemView(chat: Chat.sampleData, chatItem: alice)
+                    ChatItemView(chat: Chat.sampleData, chatItem: alice, revealed: Binding.constant(false))
                         .modifier(ChatItemClipped(alice, tailVisible: true))
                     Spacer()
                 }
                 HStack {
                     Spacer()
-                    ChatItemView(chat: Chat.sampleData, chatItem: bob)
+                    ChatItemView(chat: Chat.sampleData, chatItem: bob, revealed: Binding.constant(false))
                         .modifier(ChatItemClipped(bob, tailVisible: true))
                         .frame(alignment: .trailing)
                 }
@@ -583,14 +583,11 @@ struct CustomizeThemeView: View {
                 }
             }
 
-            ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: nil)
-        }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { theme in
+            ImportExportThemeSection(perChat: nil, perUser: nil, save: { theme in
                 ThemeManager.saveAndApplyThemeOverrides(theme)
                 saveThemeToDatabase(nil)
-            }
-        )
+            })
+        }
         /// When changing app theme, user overrides are hidden. User overrides will be returned back after closing Appearance screen, see ThemeDestinationPicker()
         .interactiveDismissDisabled(true)
     }
@@ -598,9 +595,10 @@ struct CustomizeThemeView: View {
 
 struct ImportExportThemeSection: View {
     @EnvironmentObject var theme: AppTheme
-    @Binding var showFileImporter: Bool
     var perChat: ThemeModeOverride?
     var perUser: ThemeModeOverrides?
+    var save: (ThemeOverrides) -> Void
+    @State private var showFileImporter = false
 
     var body: some View {
         Section {
@@ -628,47 +626,39 @@ struct ImportExportThemeSection: View {
             } label: {
                 Text("Import theme").foregroundColor(theme.colors.primary)
             }
-        }
-    }
-}
-
-struct ThemeImporter: ViewModifier {
-    @Binding var isPresented: Bool
-    var save: (ThemeOverrides) -> Void
-
-    func body(content: Content) -> some View {
-        content.fileImporter(
-            isPresented: $isPresented,
-            allowedContentTypes: [.data/*.plainText*/],
-            allowsMultipleSelection: false
-        ) { result in
-            if case let .success(files) = result, let fileURL = files.first {
-                do {
-                    var fileSize: Int? = nil
-                    if fileURL.startAccessingSecurityScopedResource() {
-                        let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
-                        fileSize = resourceValues.fileSize
-                    }
-                    if let fileSize = fileSize,
-                       // Same as Android/desktop
-                       fileSize <= 5_500_000 {
-                        if let string = try? String(contentsOf: fileURL, encoding: .utf8), let theme: ThemeOverrides = decodeYAML("themeId: \(UUID().uuidString)\n" + string) {
-                            save(theme)
-                            logger.error("Saved theme from file")
-                        } else {
-                            logger.error("Error decoding theme file")
+            .fileImporter(
+                isPresented: $showFileImporter,
+                allowedContentTypes: [.data/*.plainText*/],
+                allowsMultipleSelection: false
+            ) { result in
+                if case let .success(files) = result, let fileURL = files.first {
+                    do {
+                        var fileSize: Int? = nil
+                        if fileURL.startAccessingSecurityScopedResource() {
+                            let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
+                            fileSize = resourceValues.fileSize
                         }
-                        fileURL.stopAccessingSecurityScopedResource()
-                    } else {
-                        fileURL.stopAccessingSecurityScopedResource()
-                        let prettyMaxFileSize = ByteCountFormatter.string(fromByteCount: 5_500_000, countStyle: .binary)
-                        AlertManager.shared.showAlertMsg(
-                            title: "Large file!",
-                            message: "Currently maximum supported file size is \(prettyMaxFileSize)."
-                        )
+                        if let fileSize = fileSize,
+                           // Same as Android/desktop
+                           fileSize <= 5_500_000 {
+                            if let string = try? String(contentsOf: fileURL, encoding: .utf8), let theme: ThemeOverrides = decodeYAML("themeId: \(UUID().uuidString)\n" + string) {
+                                save(theme)
+                                logger.error("Saved theme from file")
+                            } else {
+                                logger.error("Error decoding theme file")
+                            }
+                            fileURL.stopAccessingSecurityScopedResource()
+                        } else {
+                            fileURL.stopAccessingSecurityScopedResource()
+                            let prettyMaxFileSize = ByteCountFormatter.string(fromByteCount: 5_500_000, countStyle: .binary)
+                            AlertManager.shared.showAlertMsg(
+                                title: "Large file!",
+                                message: "Currently maximum supported file size is \(prettyMaxFileSize)."
+                            )
+                        }
+                    } catch {
+                        logger.error("Appearance fileImporter error \(error.localizedDescription)")
                     }
-                } catch {
-                    logger.error("Appearance fileImporter error \(error.localizedDescription)")
                 }
             }
         }
@@ -818,7 +808,7 @@ struct ThemeDestinationPicker: View {
     @Binding var customizeThemeIsOpen: Bool
 
     var body: some View {
-        let values = [(nil, NSLocalizedString("All profiles", comment: "profile dropdown"))] + m.users.filter { $0.user.activeUser }.map { ($0.user.userId, $0.user.chatViewName)}
+        let values = [(nil, "All profiles")] + m.users.filter { $0.user.activeUser }.map { ($0.user.userId, $0.user.chatViewName)}
 
         if values.contains(where: { (userId, text) in userId == themeUserDestination?.0 }) {
             Picker("Apply to", selection: $themeUserDest) {

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

@@ -0,0 +1,84 @@
+//
+//  NetworkServersView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 02/08/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+private enum NetworkAlert: Identifiable {
+    case error(err: String)
+
+    var id: String {
+        switch self {
+        case let .error(err): return "error \(err)"
+        }
+    }
+}
+
+struct NetworkAndServers: View {
+    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
+
+    var body: some View {
+        VStack {
+            List {
+                Section {
+                    NavigationLink {
+                        ProtocolServersView(serverProtocol: .smp)
+                            .navigationTitle("Your SMP servers")
+                            .modifier(ThemedBackground(grouped: true))
+                    } label: {
+                        Text("Message servers")
+                    }
+
+                    NavigationLink {
+                        ProtocolServersView(serverProtocol: .xftp)
+                            .navigationTitle("Your XFTP servers")
+                            .modifier(ThemedBackground(grouped: true))
+                    } label: {
+                        Text("Media & file servers")
+                    }
+
+                    NavigationLink {
+                        AdvancedNetworkSettings()
+                            .navigationTitle("Advanced settings")
+                            .modifier(ThemedBackground(grouped: true))
+                    } label: {
+                        Text("Advanced network settings")
+                    }
+                } header: {
+                    Text("Messages & files")
+                        .foregroundColor(theme.colors.secondary)
+                }
+
+                Section(header: Text("Calls").foregroundColor(theme.colors.secondary)) {
+                    NavigationLink {
+                        RTCServers()
+                            .navigationTitle("Your ICE servers")
+                            .modifier(ThemedBackground(grouped: true))
+                    } label: {
+                        Text("WebRTC ICE servers")
+                    }
+                }
+
+                Section(header: Text("Network connection").foregroundColor(theme.colors.secondary)) {
+                    HStack {
+                        Text(m.networkInfo.networkType.text)
+                        Spacer()
+                        Image(systemName: "circle.fill").foregroundColor(m.networkInfo.online ? .green : .red)
+                    }
+                }
+            }
+        }
+    }
+}
+
+struct NetworkServersView_Previews: PreviewProvider {
+    static var previews: some View {
+        NetworkAndServers()
+    }
+}

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

@@ -1,434 +0,0 @@
-//
-//  NetworkServersView.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 02/08/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-private enum NetworkAlert: Identifiable {
-    case error(err: String)
-
-    var id: String {
-        switch self {
-        case let .error(err): return "error \(err)"
-        }
-    }
-}
-
-private enum NetworkAndServersSheet: Identifiable {
-    case showConditions
-
-    var id: String {
-        switch self {
-        case .showConditions: return "showConditions"
-        }
-    }
-}
-
-struct NetworkAndServers: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
-    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var ss: SaveableSettings
-    @State private var sheetItem: NetworkAndServersSheet? = nil
-    @State private var justOpened = true
-    @State private var showSaveDialog = false
-
-    var body: some View {
-        VStack {
-            List {
-                let conditionsAction = m.conditions.conditionsAction
-                let anyOperatorEnabled = ss.servers.userServers.contains(where: { $0.operator?.enabled ?? false })
-                Section {
-                    ForEach(ss.servers.userServers.enumerated().map { $0 }, id: \.element.id) { idx, userOperatorServers in
-                        if let serverOperator = userOperatorServers.operator {
-                            serverOperatorView(idx, serverOperator)
-                        } else {
-                            EmptyView()
-                        }
-                    }
-
-                    if let conditionsAction = conditionsAction, anyOperatorEnabled {
-                        conditionsButton(conditionsAction)
-                    }
-                } header: {
-                    Text("Preset servers")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    switch conditionsAction {
-                    case let .review(_, deadline, _):
-                        if let deadline = deadline, anyOperatorEnabled {
-                            Text("Conditions will be accepted on: \(conditionsTimestamp(deadline)).")
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    default:
-                        EmptyView()
-                    }
-                }
-
-                Section {
-                    if let idx = ss.servers.userServers.firstIndex(where: { $0.operator == nil }) {
-                        NavigationLink {
-                            YourServersView(
-                                userServers: $ss.servers.userServers,
-                                serverErrors: $ss.servers.serverErrors,
-                                operatorIndex: idx
-                            )
-                            .navigationTitle("Your servers")
-                            .modifier(ThemedBackground(grouped: true))
-                        } label: {
-                            HStack {
-                                Text("Your servers")
-                                
-                                if ss.servers.userServers[idx] != ss.servers.currUserServers[idx] {
-                                    Spacer()
-                                    unsavedChangesIndicator()
-                                }
-                            }
-                        }
-                    }
-
-                    NavigationLink {
-                        AdvancedNetworkSettings()
-                            .navigationTitle("Advanced settings")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        Text("Advanced network settings")
-                    }
-                } header: {
-                    Text("Messages & files")
-                        .foregroundColor(theme.colors.secondary)
-                }
-
-                Section {
-                    Button("Save servers", action: { saveServers($ss.servers.currUserServers, $ss.servers.userServers) })
-                        .disabled(!serversCanBeSaved(ss.servers.currUserServers, ss.servers.userServers, ss.servers.serverErrors))
-                } footer: {
-                    if let errStr = globalServersError(ss.servers.serverErrors) {
-                        ServersErrorView(errStr: errStr)
-                    } else if !ss.servers.serverErrors.isEmpty {
-                        ServersErrorView(errStr: NSLocalizedString("Errors in servers configuration.", comment: "servers error"))
-                    }
-                }
-
-                Section(header: Text("Calls").foregroundColor(theme.colors.secondary)) {
-                    NavigationLink {
-                        RTCServers()
-                            .navigationTitle("Your ICE servers")
-                            .modifier(ThemedBackground(grouped: true))
-                    } label: {
-                        Text("WebRTC ICE servers")
-                    }
-                }
-
-                Section(header: Text("Network connection").foregroundColor(theme.colors.secondary)) {
-                    HStack {
-                        Text(m.networkInfo.networkType.text)
-                        Spacer()
-                        Image(systemName: "circle.fill").foregroundColor(m.networkInfo.online ? .green : .red)
-                    }
-                }
-            }
-        }
-        .task {
-            // this condition is needed to prevent re-setting the servers when exiting single server view
-            if justOpened {
-                do {
-                    ss.servers.currUserServers = try await getUserServers()
-                    ss.servers.userServers = ss.servers.currUserServers
-                    ss.servers.serverErrors = []
-                } catch let error {
-                    await MainActor.run {
-                        showAlert(
-                            NSLocalizedString("Error loading servers", comment: "alert title"),
-                            message: responseError(error)
-                        )
-                    }
-                }
-                justOpened = false
-            }
-        }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
-            if serversCanBeSaved(ss.servers.currUserServers, ss.servers.userServers, ss.servers.serverErrors) {
-                showSaveDialog = true
-            } else {
-                dismiss()
-            }
-        })
-        .confirmationDialog("Save servers?", isPresented: $showSaveDialog, titleVisibility: .visible) {
-            Button("Save") {
-                saveServers($ss.servers.currUserServers, $ss.servers.userServers)
-                dismiss()
-            }
-            Button("Exit without saving") { dismiss() }
-        }
-        .sheet(item: $sheetItem) { item in
-            switch item {
-            case .showConditions:
-                UsageConditionsView(
-                    currUserServers: $ss.servers.currUserServers,
-                    userServers: $ss.servers.userServers
-                )
-                .modifier(ThemedBackground(grouped: true))
-            }
-        }
-    }
-
-    private func serverOperatorView(_ operatorIndex: Int, _ serverOperator: ServerOperator) -> some View {
-        NavigationLink() {
-            OperatorView(
-                currUserServers: $ss.servers.currUserServers,
-                userServers: $ss.servers.userServers,
-                serverErrors: $ss.servers.serverErrors,
-                operatorIndex: operatorIndex,
-                useOperator: serverOperator.enabled
-            )
-            .navigationBarTitle("\(serverOperator.tradeName) servers")
-            .modifier(ThemedBackground(grouped: true))
-            .navigationBarTitleDisplayMode(.large)
-        } label: {
-            HStack {
-                Image(serverOperator.logo(colorScheme))
-                    .resizable()
-                    .scaledToFit()
-                    .grayscale(serverOperator.enabled ? 0.0 : 1.0)
-                    .frame(width: 24, height: 24)
-                Text(serverOperator.tradeName)
-                    .foregroundColor(serverOperator.enabled ? theme.colors.onBackground : theme.colors.secondary)
-
-                if ss.servers.userServers[operatorIndex] != ss.servers.currUserServers[operatorIndex] {
-                    Spacer()
-                    unsavedChangesIndicator()
-                }
-            }
-        }
-    }
-
-    private func unsavedChangesIndicator() -> some View {
-        Image(systemName: "pencil")
-            .foregroundColor(theme.colors.secondary)
-            .symbolRenderingMode(.monochrome)
-            .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
-    }
-
-    private func conditionsButton(_ conditionsAction: UsageConditionsAction) -> some View {
-        Button {
-            sheetItem = .showConditions
-        } label: {
-            switch conditionsAction {
-            case .review:
-                Text("Review conditions")
-            case .accepted:
-                Text("Accepted conditions")
-            }
-        }
-    }
-}
-
-struct UsageConditionsView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var theme: AppTheme
-    @Binding var currUserServers: [UserOperatorServers]
-    @Binding var userServers: [UserOperatorServers]
-
-    var body: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            HStack {
-                Text("Conditions of use").font(.largeTitle).bold()
-                Spacer()
-                conditionsLinkButton()
-            }
-            .padding(.top)
-            .padding(.top)
-
-            switch ChatModel.shared.conditions.conditionsAction {
-
-            case .none:
-                ConditionsTextView()
-                    .padding(.bottom)
-                    .padding(.bottom)
-
-            case let .review(operators, deadline, _):
-                Text("Conditions will be accepted for the operator(s): **\(operators.map { $0.legalName_ }.joined(separator: ", "))**.")
-                ConditionsTextView()
-                VStack(spacing: 8) {
-                    acceptConditionsButton(operators.map { $0.operatorId })
-                    if let deadline = deadline {
-                        Text("Conditions will be automatically accepted for enabled operators on: \(conditionsTimestamp(deadline)).")
-                            .foregroundColor(theme.colors.secondary)
-                            .font(.footnote)
-                            .multilineTextAlignment(.center)
-                            .frame(maxWidth: .infinity, alignment: .center)
-                            .padding(.horizontal, 32)
-                    }
-                }
-                .padding(.bottom)
-                .padding(.bottom)
-
-            case let .accepted(operators):
-                Text("Conditions are accepted for the operator(s): **\(operators.map { $0.legalName_ }.joined(separator: ", "))**.")
-                ConditionsTextView()
-                    .padding(.bottom)
-                    .padding(.bottom)
-            }
-        }
-        .padding(.horizontal)
-        .frame(maxHeight: .infinity)
-    }
-
-    private func acceptConditionsButton(_ operatorIds: [Int64]) -> some View {
-        Button {
-            acceptForOperators(operatorIds)
-        } label: {
-            Text("Accept conditions")
-        }
-        .buttonStyle(OnboardingButtonStyle())
-    }
-
-    func acceptForOperators(_ operatorIds: [Int64]) {
-        Task {
-            do {
-                let conditionsId = ChatModel.shared.conditions.currentConditions.conditionsId
-                let r = try await acceptConditions(conditionsId: conditionsId, operatorIds: operatorIds)
-                await MainActor.run {
-                    ChatModel.shared.conditions = r
-                    updateOperatorsConditionsAcceptance($currUserServers, r.serverOperators)
-                    updateOperatorsConditionsAcceptance($userServers, r.serverOperators)
-                    dismiss()
-                }
-            } catch let error {
-                await MainActor.run {
-                    showAlert(
-                        NSLocalizedString("Error accepting conditions", comment: "alert title"),
-                        message: responseError(error)
-                    )
-                }
-            }
-        }
-    }
-}
-
-func validateServers_(_ userServers: Binding<[UserOperatorServers]>, _ serverErrors: Binding<[UserServersError]>) {
-    let userServersToValidate = userServers.wrappedValue
-    Task {
-        do {
-            let errs = try await validateServers(userServers: userServersToValidate)
-            await MainActor.run {
-                serverErrors.wrappedValue = errs
-            }
-        } catch let error {
-            logger.error("validateServers error: \(responseError(error))")
-        }
-    }
-}
-
-func serversCanBeSaved(
-    _ currUserServers: [UserOperatorServers],
-    _ userServers: [UserOperatorServers],
-    _ serverErrors: [UserServersError]
-) -> Bool {
-    return userServers != currUserServers && serverErrors.isEmpty
-}
-
-struct ServersErrorView: View {
-    @EnvironmentObject var theme: AppTheme
-    var errStr: String
-
-    var body: some View {
-        HStack {
-            Image(systemName: "exclamationmark.circle")
-                .foregroundColor(.red)
-            Text(errStr)
-                .foregroundColor(theme.colors.secondary)
-        }
-    }
-}
-
-func globalServersError(_ serverErrors: [UserServersError]) -> String? {
-    for err in serverErrors {
-        if let errStr = err.globalError {
-            return errStr
-        }
-    }
-    return nil
-}
-
-func globalSMPServersError(_ serverErrors: [UserServersError]) -> String? {
-    for err in serverErrors {
-        if let errStr = err.globalSMPError {
-            return errStr
-        }
-    }
-    return nil
-}
-
-func globalXFTPServersError(_ serverErrors: [UserServersError]) -> String? {
-    for err in serverErrors {
-        if let errStr = err.globalXFTPError {
-            return errStr
-        }
-    }
-    return nil
-}
-
-func findDuplicateHosts(_ serverErrors: [UserServersError]) -> Set<String> {
-    let duplicateHostsList = serverErrors.compactMap { err in
-        if case let .duplicateServer(_, _, duplicateHost) = err {
-            return duplicateHost
-        } else {
-            return nil
-        }
-    }
-    return Set(duplicateHostsList)
-}
-
-func saveServers(_ currUserServers: Binding<[UserOperatorServers]>, _ userServers: Binding<[UserOperatorServers]>) {
-    let userServersToSave = userServers.wrappedValue
-    Task {
-        do {
-            try await setUserServers(userServers: userServersToSave)
-            // Get updated servers to learn new server ids (otherwise it messes up delete of newly added and saved servers)
-            do {
-                let updatedServers = try await getUserServers()
-                let updatedOperators = try await getServerOperators()
-                await MainActor.run {
-                    ChatModel.shared.conditions = updatedOperators
-                    currUserServers.wrappedValue = updatedServers
-                    userServers.wrappedValue = updatedServers
-                }
-            } catch let error {
-                logger.error("saveServers getUserServers error: \(responseError(error))")
-                await MainActor.run {
-                    currUserServers.wrappedValue = userServersToSave
-                }
-            }
-        } catch let error {
-            logger.error("saveServers setUserServers error: \(responseError(error))")
-            await MainActor.run {
-                showAlert(
-                    NSLocalizedString("Error saving servers", comment: "alert title"),
-                    message: responseError(error)
-                )
-            }
-        }
-    }
-}
-
-func updateOperatorsConditionsAcceptance(_ usvs: Binding<[UserOperatorServers]>, _ updatedOperators: [ServerOperator]) {
-    for i in 0..<usvs.wrappedValue.count {
-        if let updatedOperator = updatedOperators.first(where: { $0.operatorId == usvs.wrappedValue[i].operator?.operatorId }) {
-            usvs.wrappedValue[i].operator?.conditionsAcceptance = updatedOperator.conditionsAcceptance
-        }
-    }
-}
-
-struct NetworkServersView_Previews: PreviewProvider {
-    static var previews: some View {
-        NetworkAndServers()
-    }
-}

apps/ios/Shared/Views/UserSettings/NetworkAndServers/NewServerView.swift

@@ -1,156 +0,0 @@
-//
-//  NewServerView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 13.11.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct NewServerView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var theme: AppTheme
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
-    @State private var serverToEdit: UserServer = .empty
-    @State private var showTestFailure = false
-    @State private var testing = false
-    @State private var testFailure: ProtocolTestFailure?
-
-    var body: some View {
-        ZStack {
-            customServer()
-            if testing {
-                ProgressView().scaleEffect(2)
-            }
-        }
-        .modifier(BackButton(disabled: Binding.constant(false)) {
-            addServer(serverToEdit, $userServers, $serverErrors, dismiss)
-        })
-        .alert(isPresented: $showTestFailure) {
-            Alert(
-                title: Text("Server test failed!"),
-                message: Text(testFailure?.localizedDescription ?? "")
-            )
-        }
-    }
-
-    // TODO Possibly refactor - similar functions in ProtocolServerView
-    private func customServer() -> some View {
-        VStack {
-            let serverAddress = parseServerAddress(serverToEdit.server)
-            let valid = serverAddress?.valid == true
-            List {
-                Section {
-                    TextEditor(text: $serverToEdit.server)
-                        .multilineTextAlignment(.leading)
-                        .autocorrectionDisabled(true)
-                        .autocapitalization(.none)
-                        .allowsTightening(true)
-                        .lineLimit(10)
-                        .frame(height: 144)
-                        .padding(-6)
-                } header: {
-                    HStack {
-                        Text("Your server address")
-                            .foregroundColor(theme.colors.secondary)
-                        if !valid {
-                            Spacer()
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        }
-                    }
-                }
-                useServerSection(valid)
-                if valid {
-                    Section(header: Text("Add to another device").foregroundColor(theme.colors.secondary)) {
-                        MutableQRCode(uri: $serverToEdit.server)
-                            .listRowInsets(EdgeInsets(top: 12, leading: 12, bottom: 12, trailing: 12))
-                    }
-                }
-            }
-        }
-    }
-
-    private func useServerSection(_ valid: Bool) -> some View {
-        Section(header: Text("Use server").foregroundColor(theme.colors.secondary)) {
-            HStack {
-                Button("Test server") {
-                    testing = true
-                    serverToEdit.tested = nil
-                    Task {
-                        if let f = await testServerConnection(server: $serverToEdit) {
-                            showTestFailure = true
-                            testFailure = f
-                        }
-                        await MainActor.run { testing = false }
-                    }
-                }
-                .disabled(!valid || testing)
-                Spacer()
-                showTestStatus(server: serverToEdit)
-            }
-            Toggle("Use for new connections", isOn: $serverToEdit.enabled)
-        }
-    }
-}
-
-func serverProtocolAndOperator(_ server: UserServer, _ userServers: [UserOperatorServers]) -> (ServerProtocol, ServerOperator?)? {
-    if let serverAddress = parseServerAddress(server.server) {
-        let serverProtocol = serverAddress.serverProtocol
-        let hostnames = serverAddress.hostnames
-        let matchingOperator = userServers.compactMap { $0.operator }.first { op in
-            op.serverDomains.contains { domain in
-                hostnames.contains { hostname in
-                    hostname.hasSuffix(domain)
-                }
-            }
-        }
-        return (serverProtocol, matchingOperator)
-    } else {
-        return nil
-    }
-}
-
-func addServer(
-    _ server: UserServer,
-    _ userServers: Binding<[UserOperatorServers]>,
-    _ serverErrors: Binding<[UserServersError]>,
-    _ dismiss: DismissAction
-) {
-    if let (serverProtocol, matchingOperator) = serverProtocolAndOperator(server, userServers.wrappedValue) {
-        if let i = userServers.wrappedValue.firstIndex(where: { $0.operator?.operatorId == matchingOperator?.operatorId }) {
-            switch serverProtocol {
-            case .smp: userServers[i].wrappedValue.smpServers.append(server)
-            case .xftp: userServers[i].wrappedValue.xftpServers.append(server)
-            }
-            validateServers_(userServers, serverErrors)
-            dismiss()
-            if let op = matchingOperator {
-                showAlert(
-                    NSLocalizedString("Operator server", comment: "alert title"),
-                    message: String.localizedStringWithFormat(NSLocalizedString("Server added to operator %@.", comment: "alert message"), op.tradeName)
-                )
-            }
-        } else { // Shouldn't happen
-            dismiss()
-            showAlert(NSLocalizedString("Error adding server", comment: "alert title"))
-        }
-    } else {
-        dismiss()
-        if server.server.trimmingCharacters(in: .whitespaces) != "" {
-            showAlert(
-                NSLocalizedString("Invalid server address!", comment: "alert title"),
-                message: NSLocalizedString("Check server address and try again.", comment: "alert title")
-            )
-        }
-    }
-}
-
-#Preview {
-    NewServerView(
-        userServers: Binding.constant([UserOperatorServers.sampleDataNilOperator]),
-        serverErrors: Binding.constant([])
-    )
-}

apps/ios/Shared/Views/UserSettings/NetworkAndServers/OperatorView.swift

@@ -1,585 +0,0 @@
-//
-//  OperatorView.swift
-//  SimpleX (iOS)
-//
-//  Created by spaced4ndy on 28.10.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-struct OperatorView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.editMode) private var editMode
-    @Binding var currUserServers: [UserOperatorServers]
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
-    var operatorIndex: Int
-    @State var useOperator: Bool
-    @State private var useOperatorToggleReset: Bool = false
-    @State private var showConditionsSheet: Bool = false
-    @State private var selectedServer: String? = nil
-    @State private var testing = false
-
-    var body: some View {
-        operatorView()
-            .opacity(testing ? 0.4 : 1)
-            .overlay {
-                if testing {
-                    ProgressView()
-                        .scaleEffect(2)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                }
-            }
-            .allowsHitTesting(!testing)
-    }
-
-    @ViewBuilder private func operatorView() -> some View {
-        let duplicateHosts = findDuplicateHosts(serverErrors)
-        VStack {
-            List {
-                Section {
-                    infoViewLink()
-                    useOperatorToggle()
-                } header: {
-                    Text("Operator")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    if let errStr = globalServersError(serverErrors) {
-                        ServersErrorView(errStr: errStr)
-                    } else {
-                        switch (userServers[operatorIndex].operator_.conditionsAcceptance) {
-                        case let .accepted(acceptedAt):
-                            if let acceptedAt = acceptedAt {
-                                Text("Conditions accepted on: \(conditionsTimestamp(acceptedAt)).")
-                                    .foregroundColor(theme.colors.secondary)
-                            }
-                        case let .required(deadline):
-                            if userServers[operatorIndex].operator_.enabled, let deadline = deadline {
-                                Text("Conditions will be accepted on: \(conditionsTimestamp(deadline)).")
-                                    .foregroundColor(theme.colors.secondary)
-                            }
-                        }
-                    }
-                }
-
-                if userServers[operatorIndex].operator_.enabled {
-                    if !userServers[operatorIndex].smpServers.filter({ !$0.deleted }).isEmpty {
-                        Section {
-                            Toggle("To receive", isOn: $userServers[operatorIndex].operator_.smpRoles.storage)
-                                .onChange(of: userServers[operatorIndex].operator_.smpRoles.storage) { _ in
-                                    validateServers_($userServers, $serverErrors)
-                                }
-                            Toggle("For private routing", isOn: $userServers[operatorIndex].operator_.smpRoles.proxy)
-                                .onChange(of: userServers[operatorIndex].operator_.smpRoles.proxy) { _ in
-                                    validateServers_($userServers, $serverErrors)
-                                }
-                        } header: {
-                            Text("Use for messages")
-                                .foregroundColor(theme.colors.secondary)
-                        } footer: {
-                            if let errStr = globalSMPServersError(serverErrors) {
-                                ServersErrorView(errStr: errStr)
-                            }
-                        }
-                    }
-
-                    // Preset servers can't be deleted
-                    if !userServers[operatorIndex].smpServers.filter({ $0.preset }).isEmpty {
-                        Section {
-                            ForEach($userServers[operatorIndex].smpServers) { srv in
-                                if srv.wrappedValue.preset {
-                                    ProtocolServerViewLink(
-                                        userServers: $userServers,
-                                        serverErrors: $serverErrors,
-                                        duplicateHosts: duplicateHosts,
-                                        server: srv,
-                                        serverProtocol: .smp,
-                                        backLabel: "\(userServers[operatorIndex].operator_.tradeName) servers",
-                                        selectedServer: $selectedServer
-                                    )
-                                } else {
-                                    EmptyView()
-                                }
-                            }
-                        } header: {
-                            Text("Message servers")
-                                .foregroundColor(theme.colors.secondary)
-                        } footer: {
-                            if let errStr = globalSMPServersError(serverErrors) {
-                                ServersErrorView(errStr: errStr)
-                            } else {
-                                Text("The servers for new connections of your current chat profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
-                                    .foregroundColor(theme.colors.secondary)
-                                    .lineLimit(10)
-                            }
-                        }
-                    }
-
-                    if !userServers[operatorIndex].smpServers.filter({ !$0.preset && !$0.deleted }).isEmpty {
-                        Section {
-                            ForEach($userServers[operatorIndex].smpServers) { srv in
-                                if !srv.wrappedValue.preset && !srv.wrappedValue.deleted {
-                                    ProtocolServerViewLink(
-                                        userServers: $userServers,
-                                        serverErrors: $serverErrors,
-                                        duplicateHosts: duplicateHosts,
-                                        server: srv,
-                                        serverProtocol: .smp,
-                                        backLabel: "\(userServers[operatorIndex].operator_.tradeName) servers",
-                                        selectedServer: $selectedServer
-                                    )
-                                } else {
-                                    EmptyView()
-                                }
-                            }
-                            .onDelete { indexSet in
-                                deleteSMPServer($userServers, operatorIndex, indexSet)
-                                validateServers_($userServers, $serverErrors)
-                            }
-                        } header: {
-                            Text("Added message servers")
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    }
-
-                    if !userServers[operatorIndex].xftpServers.filter({ !$0.deleted }).isEmpty {
-                        Section {
-                            Toggle("To send", isOn: $userServers[operatorIndex].operator_.xftpRoles.storage)
-                                .onChange(of: userServers[operatorIndex].operator_.xftpRoles.storage) { _ in
-                                    validateServers_($userServers, $serverErrors)
-                                }
-                        } header: {
-                            Text("Use for files")
-                                .foregroundColor(theme.colors.secondary)
-                        } footer: {
-                            if let errStr = globalXFTPServersError(serverErrors) {
-                                ServersErrorView(errStr: errStr)
-                            }
-                        }
-                    }
-
-                    // Preset servers can't be deleted
-                    if !userServers[operatorIndex].xftpServers.filter({ $0.preset }).isEmpty {
-                        Section {
-                            ForEach($userServers[operatorIndex].xftpServers) { srv in
-                                if srv.wrappedValue.preset {
-                                    ProtocolServerViewLink(
-                                        userServers: $userServers,
-                                        serverErrors: $serverErrors,
-                                        duplicateHosts: duplicateHosts,
-                                        server: srv,
-                                        serverProtocol: .xftp,
-                                        backLabel: "\(userServers[operatorIndex].operator_.tradeName) servers",
-                                        selectedServer: $selectedServer
-                                    )
-                                } else {
-                                    EmptyView()
-                                }
-                            }
-                        } header: {
-                            Text("Media & file servers")
-                                .foregroundColor(theme.colors.secondary)
-                        } footer: {
-                            if let errStr = globalXFTPServersError(serverErrors) {
-                                ServersErrorView(errStr: errStr)
-                            } else {
-                                Text("The servers for new files of your current chat profile **\(ChatModel.shared.currentUser?.displayName ?? "")**.")
-                                    .foregroundColor(theme.colors.secondary)
-                                    .lineLimit(10)
-                            }
-                        }
-                    }
-
-                    if !userServers[operatorIndex].xftpServers.filter({ !$0.preset && !$0.deleted }).isEmpty {
-                        Section {
-                            ForEach($userServers[operatorIndex].xftpServers) { srv in
-                                if !srv.wrappedValue.preset && !srv.wrappedValue.deleted {
-                                    ProtocolServerViewLink(
-                                        userServers: $userServers,
-                                        serverErrors: $serverErrors,
-                                        duplicateHosts: duplicateHosts,
-                                        server: srv,
-                                        serverProtocol: .xftp,
-                                        backLabel: "\(userServers[operatorIndex].operator_.tradeName) servers",
-                                        selectedServer: $selectedServer
-                                    )
-                                } else {
-                                    EmptyView()
-                                }
-                            }
-                            .onDelete { indexSet in
-                                deleteXFTPServer($userServers, operatorIndex, indexSet)
-                                validateServers_($userServers, $serverErrors)
-                            }
-                        } header: {
-                            Text("Added media & file servers")
-                                .foregroundColor(theme.colors.secondary)
-                        }
-                    }
-
-                    Section {
-                        TestServersButton(
-                            smpServers: $userServers[operatorIndex].smpServers,
-                            xftpServers: $userServers[operatorIndex].xftpServers,
-                            testing: $testing
-                        )
-                    }
-                }
-            }
-        }
-        .toolbar {
-            if (
-                !userServers[operatorIndex].smpServers.filter({ !$0.preset && !$0.deleted }).isEmpty ||
-                !userServers[operatorIndex].xftpServers.filter({ !$0.preset && !$0.deleted }).isEmpty
-            ) {
-                EditButton()
-            }
-        }
-        .sheet(isPresented: $showConditionsSheet, onDismiss: onUseToggleSheetDismissed) {
-            SingleOperatorUsageConditionsView(
-                currUserServers: $currUserServers,
-                userServers: $userServers,
-                serverErrors: $serverErrors,
-                operatorIndex: operatorIndex
-            )
-            .modifier(ThemedBackground(grouped: true))
-        }
-    }
-
-    private func infoViewLink() -> some View {
-        NavigationLink() {
-            OperatorInfoView(serverOperator: userServers[operatorIndex].operator_)
-                .navigationBarTitle("Network operator")
-                .modifier(ThemedBackground(grouped: true))
-                .navigationBarTitleDisplayMode(.large)
-        } label: {
-            Image(userServers[operatorIndex].operator_.largeLogo(colorScheme))
-                .resizable()
-                .scaledToFit()
-                .grayscale(userServers[operatorIndex].operator_.enabled ? 0.0 : 1.0)
-                .frame(height: 40)
-        }
-    }
-
-    private func useOperatorToggle() -> some View {
-        Toggle("Use servers", isOn: $useOperator)
-            .onChange(of: useOperator) { useOperatorToggle in
-                if useOperatorToggleReset {
-                    useOperatorToggleReset = false
-                } else if useOperatorToggle {
-                    switch userServers[operatorIndex].operator_.conditionsAcceptance {
-                    case .accepted:
-                        userServers[operatorIndex].operator_.enabled = true
-                        validateServers_($userServers, $serverErrors)
-                    case let .required(deadline):
-                        if deadline == nil {
-                            showConditionsSheet = true
-                        } else {
-                            userServers[operatorIndex].operator_.enabled = true
-                            validateServers_($userServers, $serverErrors)
-                        }
-                    }
-                } else {
-                    userServers[operatorIndex].operator_.enabled = false
-                    validateServers_($userServers, $serverErrors)
-                }
-            }
-    }
-
-    private func onUseToggleSheetDismissed() {
-        if useOperator && !userServers[operatorIndex].operator_.conditionsAcceptance.usageAllowed {
-            useOperatorToggleReset = true
-            useOperator = false
-        }
-    }
-}
-
-func conditionsTimestamp(_ date: Date) -> String {
-    let localDateFormatter = DateFormatter()
-    localDateFormatter.dateStyle = .medium
-    localDateFormatter.timeStyle = .none
-    return localDateFormatter.string(from: date)
-}
-
-struct OperatorInfoView: View {
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.colorScheme) var colorScheme: ColorScheme
-    var serverOperator: ServerOperator
-
-    var body: some View {
-        VStack {
-            List {
-                Section {
-                    VStack(alignment: .leading) {
-                        Image(serverOperator.largeLogo(colorScheme))
-                            .resizable()
-                            .scaledToFit()
-                            .frame(height: 48)
-                        if let legalName = serverOperator.legalName {
-                            Text(legalName)
-                        }
-                    }
-                }
-                Section {
-                    VStack(alignment: .leading, spacing: 12) {
-                        ForEach(serverOperator.info.description, id: \.self) { d in
-                            Text(d)
-                        }
-                    }
-                }
-                Section {
-                    Link("\(serverOperator.info.website)", destination: URL(string: serverOperator.info.website)!)
-                }
-            }
-        }
-    }
-}
-
-struct ConditionsTextView: View {
-    @State private var conditionsData: (UsageConditions, String?, UsageConditions?)?
-    @State private var failedToLoad: Bool = false
-
-    let defaultConditionsLink = "https://github.com/simplex-chat/simplex-chat/blob/stable/PRIVACY.md"
-
-    var body: some View {
-        viewBody()
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
-            .task {
-                do {
-                    conditionsData = try await getUsageConditions()
-                } catch let error {
-                    logger.error("ConditionsTextView getUsageConditions error: \(responseError(error))")
-                    failedToLoad = true
-                }
-            }
-    }
-
-    // TODO Markdown & diff rendering
-    @ViewBuilder private func viewBody() -> some View {
-        if let (usageConditions, conditionsText, acceptedConditions) = conditionsData {
-            if let conditionsText = conditionsText {
-                ScrollView {
-                    Text(conditionsText.trimmingCharacters(in: .whitespacesAndNewlines))
-                        .padding()
-                }
-                .background(
-                    RoundedRectangle(cornerRadius: 12, style: .continuous)
-                        .fill(Color(uiColor: .secondarySystemGroupedBackground))
-                )
-            } else {
-                let conditionsLink = "https://github.com/simplex-chat/simplex-chat/blob/\(usageConditions.conditionsCommit)/PRIVACY.md"
-                conditionsLinkView(conditionsLink)
-            }
-        } else if failedToLoad {
-            conditionsLinkView(defaultConditionsLink)
-        } else {
-            ProgressView()
-                .scaleEffect(2)
-        }
-    }
-
-    private func conditionsLinkView(_ conditionsLink: String) -> some View {
-        VStack(alignment: .leading, spacing: 20) {
-            Text("Current conditions text couldn't be loaded, you can review conditions via this link:")
-            Link(destination: URL(string: conditionsLink)!) {
-                Text(conditionsLink)
-                    .multilineTextAlignment(.leading)
-            }
-        }
-    }
-}
-
-struct SingleOperatorUsageConditionsView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject var theme: AppTheme
-    @Binding var currUserServers: [UserOperatorServers]
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
-    var operatorIndex: Int
-    @State private var usageConditionsNavLinkActive: Bool = false
-
-    var body: some View {
-        viewBody()
-    }
-
-    @ViewBuilder private func viewBody() -> some View {
-        let operatorsWithConditionsAccepted = ChatModel.shared.conditions.serverOperators.filter { $0.conditionsAcceptance.conditionsAccepted }
-        if case .accepted = userServers[operatorIndex].operator_.conditionsAcceptance {
-
-            // In current UI implementation this branch doesn't get shown - as conditions can't be opened from inside operator once accepted
-            VStack(alignment: .leading, spacing: 20) {
-                Group {
-                    viewHeader()
-                    ConditionsTextView()
-                        .padding(.bottom)
-                        .padding(.bottom)
-                }
-                .padding(.horizontal)
-            }
-            .frame(maxHeight: .infinity)
-
-        } else if !operatorsWithConditionsAccepted.isEmpty {
-
-            NavigationView {
-                VStack(alignment: .leading, spacing: 20) {
-                    Group {
-                        viewHeader()
-                        Text("Conditions are already accepted for following operator(s): **\(operatorsWithConditionsAccepted.map { $0.legalName_ }.joined(separator: ", "))**.")
-                        Text("Same conditions will apply to operator **\(userServers[operatorIndex].operator_.legalName_)**.")
-                        conditionsAppliedToOtherOperatorsText()
-                        usageConditionsNavLinkButton()
-
-                        Spacer()
-
-                        acceptConditionsButton()
-                            .padding(.bottom)
-                            .padding(.bottom)
-                    }
-                    .padding(.horizontal)
-                }
-                .frame(maxHeight: .infinity)
-            }
-
-        } else {
-
-            VStack(alignment: .leading, spacing: 20) {
-                Group {
-                    viewHeader()
-                    Text("To use the servers of **\(userServers[operatorIndex].operator_.legalName_)**, accept conditions of use.")
-                    conditionsAppliedToOtherOperatorsText()
-                    ConditionsTextView()
-                    acceptConditionsButton()
-                        .padding(.bottom)
-                        .padding(.bottom)
-                }
-                .padding(.horizontal)
-            }
-            .frame(maxHeight: .infinity)
-
-        }
-    }
-
-    private func viewHeader() -> some View {
-        HStack {
-            Text("Use \(userServers[operatorIndex].operator_.tradeName)").font(.largeTitle).bold()
-            Spacer()
-            conditionsLinkButton()
-        }
-        .padding(.top)
-        .padding(.top)
-    }
-
-    @ViewBuilder private func conditionsAppliedToOtherOperatorsText() -> some View {
-        let otherOperatorsToApply = ChatModel.shared.conditions.serverOperators.filter {
-            $0.enabled &&
-            !$0.conditionsAcceptance.conditionsAccepted &&
-            $0.operatorId != userServers[operatorIndex].operator_.operatorId
-        }
-        if !otherOperatorsToApply.isEmpty {
-            Text("These conditions will also apply for: **\(otherOperatorsToApply.map { $0.legalName_ }.joined(separator: ", "))**.")
-        }
-    }
-    
-    @ViewBuilder private func acceptConditionsButton() -> some View {
-        let operatorIds = ChatModel.shared.conditions.serverOperators
-            .filter {
-                $0.operatorId == userServers[operatorIndex].operator_.operatorId || // Opened operator
-                ($0.enabled && !$0.conditionsAcceptance.conditionsAccepted) // Other enabled operators with conditions not accepted
-            }
-            .map { $0.operatorId }
-        Button {
-            acceptForOperators(operatorIds, operatorIndex)
-        } label: {
-            Text("Accept conditions")
-        }
-        .buttonStyle(OnboardingButtonStyle())
-    }
-
-    func acceptForOperators(_ operatorIds: [Int64], _ operatorIndexToEnable: Int) {
-        Task {
-            do {
-                let conditionsId = ChatModel.shared.conditions.currentConditions.conditionsId
-                let r = try await acceptConditions(conditionsId: conditionsId, operatorIds: operatorIds)
-                await MainActor.run {
-                    ChatModel.shared.conditions = r
-                    updateOperatorsConditionsAcceptance($currUserServers, r.serverOperators)
-                    updateOperatorsConditionsAcceptance($userServers, r.serverOperators)
-                    userServers[operatorIndexToEnable].operator?.enabled = true
-                    validateServers_($userServers, $serverErrors)
-                    dismiss()
-                }
-            } catch let error {
-                await MainActor.run {
-                    showAlert(
-                        NSLocalizedString("Error accepting conditions", comment: "alert title"),
-                        message: responseError(error)
-                    )
-                }
-            }
-        }
-    }
-
-    private func usageConditionsNavLinkButton() -> some View {
-        ZStack {
-            Button {
-                usageConditionsNavLinkActive = true
-            } label: {
-                Text("View conditions")
-            }
-
-            NavigationLink(isActive: $usageConditionsNavLinkActive) {
-                usageConditionsDestinationView()
-            } label: {
-                EmptyView()
-            }
-            .frame(width: 1, height: 1)
-            .hidden()
-        }
-    }
-
-    private func usageConditionsDestinationView() -> some View {
-        ConditionsTextView()
-            .padding()
-            .padding(.bottom)
-            .navigationTitle("Conditions of use")
-            .navigationBarTitleDisplayMode(.large)
-            .toolbar { ToolbarItem(placement: .navigationBarTrailing, content: conditionsLinkButton) }
-            .modifier(ThemedBackground(grouped: true))
-    }
-}
-
-func conditionsLinkButton() -> some View {
-    let commit = ChatModel.shared.conditions.currentConditions.conditionsCommit
-    let mdUrl = URL(string: "https://github.com/simplex-chat/simplex-chat/blob/\(commit)/PRIVACY.md") ?? conditionsURL
-    return Menu {
-        Link(destination: mdUrl) {
-            Label("Open conditions", systemImage: "doc")
-        }
-        if let commitUrl = URL(string: "https://github.com/simplex-chat/simplex-chat/commit/\(commit)") {
-            Link(destination: commitUrl) {
-                Label("Open changes", systemImage: "ellipsis")
-            }
-        }
-    } label: {
-        Image(systemName: "arrow.up.right.circle")
-            .resizable()
-            .scaledToFit()
-            .frame(width: 20)
-            .padding(2)
-            .contentShape(Circle())
-    }
-}
-
-#Preview {
-    OperatorView(
-        currUserServers: Binding.constant([UserOperatorServers.sampleData1, UserOperatorServers.sampleDataNilOperator]),
-        userServers: Binding.constant([UserOperatorServers.sampleData1, UserOperatorServers.sampleDataNilOperator]),
-        serverErrors: Binding.constant([]),
-        operatorIndex: 1,
-        useOperator: ServerOperator.sampleData1.enabled
-    )
-}

apps/ios/Shared/Views/UserSettings/NetworkAndServers/ProtocolServersView.swift

@@ -1,359 +0,0 @@
-//
-//  ProtocolServersView.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 15/11/2022.
-//  Copyright © 2022 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-private let howToUrl = URL(string: "https://simplex.chat/docs/server.html")!
-
-struct YourServersView: View {
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject private var m: ChatModel
-    @EnvironmentObject var theme: AppTheme
-    @Environment(\.editMode) private var editMode
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
-    var operatorIndex: Int
-    @State private var selectedServer: String? = nil
-    @State private var showAddServer = false
-    @State private var newServerNavLinkActive = false
-    @State private var showScanProtoServer = false
-    @State private var testing = false
-
-    var body: some View {
-        yourServersView()
-            .opacity(testing ? 0.4 : 1)
-            .overlay {
-                if testing {
-                    ProgressView()
-                        .scaleEffect(2)
-                        .frame(maxWidth: .infinity, maxHeight: .infinity)
-                }
-            }
-            .allowsHitTesting(!testing)
-    }
-
-    @ViewBuilder private func yourServersView() -> some View {
-        let duplicateHosts = findDuplicateHosts(serverErrors)
-        List {
-            if !userServers[operatorIndex].smpServers.filter({ !$0.deleted }).isEmpty {
-                Section {
-                    ForEach($userServers[operatorIndex].smpServers) { srv in
-                        if !srv.wrappedValue.deleted {
-                            ProtocolServerViewLink(
-                                userServers: $userServers,
-                                serverErrors: $serverErrors,
-                                duplicateHosts: duplicateHosts,
-                                server: srv,
-                                serverProtocol: .smp,
-                                backLabel: "Your servers",
-                                selectedServer: $selectedServer
-                            )
-                        } else {
-                            EmptyView()
-                        }
-                    }
-                    .onDelete { indexSet in
-                        deleteSMPServer($userServers, operatorIndex, indexSet)
-                        validateServers_($userServers, $serverErrors)
-                    }
-                } header: {
-                    Text("Message servers")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    if let errStr = globalSMPServersError(serverErrors) {
-                        ServersErrorView(errStr: errStr)
-                    } else {
-                        Text("The servers for new connections of your current chat profile **\(m.currentUser?.displayName ?? "")**.")
-                            .foregroundColor(theme.colors.secondary)
-                            .lineLimit(10)
-                    }
-                }
-            }
-
-            if !userServers[operatorIndex].xftpServers.filter({ !$0.deleted }).isEmpty {
-                Section {
-                    ForEach($userServers[operatorIndex].xftpServers) { srv in
-                        if !srv.wrappedValue.deleted {
-                            ProtocolServerViewLink(
-                                userServers: $userServers,
-                                serverErrors: $serverErrors,
-                                duplicateHosts: duplicateHosts,
-                                server: srv,
-                                serverProtocol: .xftp,
-                                backLabel: "Your servers",
-                                selectedServer: $selectedServer
-                            )
-                        } else {
-                            EmptyView()
-                        }
-                    }
-                    .onDelete { indexSet in
-                        deleteXFTPServer($userServers, operatorIndex, indexSet)
-                        validateServers_($userServers, $serverErrors)
-                    }
-                } header: {
-                    Text("Media & file servers")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    if let errStr = globalXFTPServersError(serverErrors) {
-                        ServersErrorView(errStr: errStr)
-                    } else {
-                        Text("The servers for new files of your current chat profile **\(m.currentUser?.displayName ?? "")**.")
-                            .foregroundColor(theme.colors.secondary)
-                            .lineLimit(10)
-                    }
-                }
-            }
-
-            Section {
-                ZStack {
-                    Button("Add server") {
-                        showAddServer = true
-                    }
-
-                    NavigationLink(isActive: $newServerNavLinkActive) {
-                        newServerDestinationView()
-                    } label: {
-                        EmptyView()
-                    }
-                    .frame(width: 1, height: 1)
-                    .hidden()
-                }
-            } footer: {
-                if let errStr = globalServersError(serverErrors) {
-                    ServersErrorView(errStr: errStr)
-                }
-            }
-
-            Section {
-                TestServersButton(
-                    smpServers: $userServers[operatorIndex].smpServers,
-                    xftpServers: $userServers[operatorIndex].xftpServers,
-                    testing: $testing
-                )
-                howToButton()
-            }
-        }
-        .toolbar {
-            if (
-                !userServers[operatorIndex].smpServers.filter({ !$0.deleted }).isEmpty ||
-                !userServers[operatorIndex].xftpServers.filter({ !$0.deleted }).isEmpty
-            ) {
-                EditButton()
-            }
-        }
-        .confirmationDialog("Add server", isPresented: $showAddServer, titleVisibility: .hidden) {
-            Button("Enter server manually") { newServerNavLinkActive = true }
-            Button("Scan server QR code") { showScanProtoServer = true }
-        }
-        .sheet(isPresented: $showScanProtoServer) {
-            ScanProtocolServer(
-                userServers: $userServers,
-                serverErrors: $serverErrors
-            )
-            .modifier(ThemedBackground(grouped: true))
-        }
-    }
-
-    private func newServerDestinationView() -> some View {
-        NewServerView(
-            userServers: $userServers,
-            serverErrors: $serverErrors
-        )
-        .navigationTitle("New server")
-        .navigationBarTitleDisplayMode(.large)
-        .modifier(ThemedBackground(grouped: true))
-    }
-
-    func howToButton() -> some View {
-        Button {
-            DispatchQueue.main.async {
-                UIApplication.shared.open(howToUrl)
-            }
-        } label: {
-            HStack {
-                Text("How to use your servers")
-                Image(systemName: "arrow.up.right.circle")
-            }
-        }
-    }
-}
-
-struct ProtocolServerViewLink: View {
-    @EnvironmentObject var theme: AppTheme
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
-    var duplicateHosts: Set<String>
-    @Binding var server: UserServer
-    var serverProtocol: ServerProtocol
-    var backLabel: LocalizedStringKey
-    @Binding var selectedServer: String?
-
-    var body: some View {
-        let proto = serverProtocol.rawValue.uppercased()
-
-        NavigationLink(tag: server.id, selection: $selectedServer) {
-            ProtocolServerView(
-                userServers: $userServers,
-                serverErrors: $serverErrors,
-                server: $server,
-                serverToEdit: server,
-                backLabel: backLabel
-            )
-            .navigationBarTitle("\(proto) server")
-            .modifier(ThemedBackground(grouped: true))
-            .navigationBarTitleDisplayMode(.large)
-        } label: {
-            let address = parseServerAddress(server.server)
-            HStack {
-                Group {
-                    if let address = address {
-                        if !address.valid || address.serverProtocol != serverProtocol {
-                            invalidServer()
-                        } else if address.hostnames.contains(where: duplicateHosts.contains) {
-                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-                        } else if !server.enabled {
-                            Image(systemName: "slash.circle").foregroundColor(theme.colors.secondary)
-                        } else {
-                            showTestStatus(server: server)
-                        }
-                    } else {
-                        invalidServer()
-                    }
-                }
-                .frame(width: 16, alignment: .center)
-                .padding(.trailing, 4)
-
-                let v = Text(address?.hostnames.first ?? server.server).lineLimit(1)
-                if server.enabled {
-                    v
-                } else {
-                    v.foregroundColor(theme.colors.secondary)
-                }
-            }
-        }
-    }
-
-    private func invalidServer() -> some View {
-        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
-    }
-}
-
-func deleteSMPServer(
-    _ userServers: Binding<[UserOperatorServers]>,
-    _ operatorServersIndex: Int,
-    _ serverIndexSet: IndexSet
-) {
-    if let idx = serverIndexSet.first {
-        let server = userServers[operatorServersIndex].wrappedValue.smpServers[idx]
-        if server.serverId == nil {
-            userServers[operatorServersIndex].wrappedValue.smpServers.remove(at: idx)
-        } else {
-            var updatedServer = server
-            updatedServer.deleted = true
-            userServers[operatorServersIndex].wrappedValue.smpServers[idx] = updatedServer
-        }
-    }
-}
-
-func deleteXFTPServer(
-    _ userServers: Binding<[UserOperatorServers]>,
-    _ operatorServersIndex: Int,
-    _ serverIndexSet: IndexSet
-) {
-    if let idx = serverIndexSet.first {
-        let server = userServers[operatorServersIndex].wrappedValue.xftpServers[idx]
-        if server.serverId == nil {
-            userServers[operatorServersIndex].wrappedValue.xftpServers.remove(at: idx)
-        } else {
-            var updatedServer = server
-            updatedServer.deleted = true
-            userServers[operatorServersIndex].wrappedValue.xftpServers[idx] = updatedServer
-        }
-    }
-}
-
-struct TestServersButton: View {
-    @Binding var smpServers: [UserServer]
-    @Binding var xftpServers: [UserServer]
-    @Binding var testing: Bool
-
-    var body: some View {
-        Button("Test servers", action: testServers)
-            .disabled(testing || allServersDisabled)
-    }
-
-    private var allServersDisabled: Bool {
-        smpServers.allSatisfy { !$0.enabled } && xftpServers.allSatisfy { !$0.enabled }
-    }
-
-    private func testServers() {
-        resetTestStatus()
-        testing = true
-        Task {
-            let fs = await runServersTest()
-            await MainActor.run {
-                testing = false
-                if !fs.isEmpty {
-                    let msg = fs.map { (srv, f) in
-                        "\(srv): \(f.localizedDescription)"
-                    }.joined(separator: "\n")
-                    showAlert(
-                        NSLocalizedString("Tests failed!", comment: "alert title"),
-                        message: String.localizedStringWithFormat(NSLocalizedString("Some servers failed the test:\n%@", comment: "alert message"), msg)
-                    )
-                }
-            }
-        }
-    }
-
-    private func resetTestStatus() {
-        for i in 0..<smpServers.count {
-            if smpServers[i].enabled {
-                smpServers[i].tested = nil
-            }
-        }
-
-        for i in 0..<xftpServers.count {
-            if xftpServers[i].enabled {
-                xftpServers[i].tested = nil
-            }
-        }
-    }
-
-    private func runServersTest() async -> [String: ProtocolTestFailure] {
-        var fs: [String: ProtocolTestFailure] = [:]
-        for i in 0..<smpServers.count {
-            if smpServers[i].enabled {
-                if let f = await testServerConnection(server: $smpServers[i]) {
-                    fs[serverHostname(smpServers[i].server)] = f
-                }
-            }
-        }
-
-        for i in 0..<xftpServers.count {
-            if xftpServers[i].enabled {
-                if let f = await testServerConnection(server: $xftpServers[i]) {
-                    fs[serverHostname(xftpServers[i].server)] = f
-                }
-            }
-        }
-        return fs
-    }
-}
-
-struct YourServersView_Previews: PreviewProvider {
-    static var previews: some View {
-        YourServersView(
-            userServers: Binding.constant([UserOperatorServers.sampleDataNilOperator]),
-            serverErrors: Binding.constant([]),
-            operatorIndex: 1
-        )
-    }
-}

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

@@ -12,15 +12,15 @@ import SimpleXChat
 struct ProtocolServerView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
     @EnvironmentObject var theme: AppTheme
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
-    @Binding var server: UserServer
-    @State var serverToEdit: UserServer
-    var backLabel: LocalizedStringKey
+    let serverProtocol: ServerProtocol
+    @Binding var server: ServerCfg
+    @State var serverToEdit: ServerCfg
     @State private var showTestFailure = false
     @State private var testing = false
     @State private var testFailure: ProtocolTestFailure?
 
+    var proto: String { serverProtocol.rawValue.uppercased() }
+
     var body: some View {
         ZStack {
             if server.preset {
@@ -32,33 +32,9 @@ struct ProtocolServerView: View {
                 ProgressView().scaleEffect(2)
             }
         }
-        .modifier(BackButton(label: backLabel, disabled: Binding.constant(false)) {
-            if let (serverToEditProtocol, serverToEditOperator) = serverProtocolAndOperator(serverToEdit, userServers),
-               let (serverProtocol, serverOperator) = serverProtocolAndOperator(server, userServers) {
-                if serverToEditProtocol != serverProtocol {
-                    dismiss()
-                    showAlert(
-                        NSLocalizedString("Error updating server", comment: "alert title"),
-                        message: NSLocalizedString("Server protocol changed.", comment: "alert title")
-                    )
-                } else if serverToEditOperator != serverOperator {
-                    dismiss()
-                    showAlert(
-                        NSLocalizedString("Error updating server", comment: "alert title"),
-                        message: NSLocalizedString("Server operator changed.", comment: "alert title")
-                    )
-                } else {
-                    server = serverToEdit
-                    validateServers_($userServers, $serverErrors)
-                    dismiss()
-                }
-            } else {
-                dismiss()
-                showAlert(
-                    NSLocalizedString("Invalid server address!", comment: "alert title"),
-                    message: NSLocalizedString("Check server address and try again.", comment: "alert title")
-                )
-            }
+        .modifier(BackButton(label: "Your \(proto) servers", disabled: Binding.constant(false)) {
+            server = serverToEdit
+            dismiss()
         })
         .alert(isPresented: $showTestFailure) {
             Alert(
@@ -86,7 +62,7 @@ struct ProtocolServerView: View {
     private func customServer() -> some View {
         VStack {
             let serverAddress = parseServerAddress(serverToEdit.server)
-            let valid = serverAddress?.valid == true
+            let valid = serverAddress?.valid == true && serverAddress?.serverProtocol == serverProtocol
             List {
                 Section {
                     TextEditor(text: $serverToEdit.server)
@@ -136,7 +112,10 @@ struct ProtocolServerView: View {
                 Spacer()
                 showTestStatus(server: serverToEdit)
             }
+            let useForNewDisabled = serverToEdit.tested != true && !serverToEdit.preset
             Toggle("Use for new connections", isOn: $serverToEdit.enabled)
+                .disabled(useForNewDisabled)
+                .foregroundColor(useForNewDisabled ? theme.colors.secondary : theme.colors.onBackground)
         }
     }
 }
@@ -163,7 +142,7 @@ struct BackButton: ViewModifier {
     }
 }
 
-@ViewBuilder func showTestStatus(server: UserServer) -> some View {
+@ViewBuilder func showTestStatus(server: ServerCfg) -> some View {
     switch server.tested {
     case .some(true):
         Image(systemName: "checkmark")
@@ -176,7 +155,7 @@ struct BackButton: ViewModifier {
     }
 }
 
-func testServerConnection(server: Binding<UserServer>) async -> ProtocolTestFailure? {
+func testServerConnection(server: Binding<ServerCfg>) async -> ProtocolTestFailure? {
     do {
         let r = try await testProtoServer(server: server.wrappedValue.server)
         switch r {
@@ -199,11 +178,9 @@ func testServerConnection(server: Binding<UserServer>) async -> ProtocolTestFail
 struct ProtocolServerView_Previews: PreviewProvider {
     static var previews: some View {
         ProtocolServerView(
-            userServers: Binding.constant([UserOperatorServers.sampleDataNilOperator]),
-            serverErrors: Binding.constant([]),
-            server: Binding.constant(UserServer.sampleData.custom),
-            serverToEdit: UserServer.sampleData.custom,
-            backLabel: "Your SMP servers"
+            serverProtocol: .smp,
+            server: Binding.constant(ServerCfg.sampleData.custom),
+            serverToEdit: ServerCfg.sampleData.custom
         )
     }
 }

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

@@ -0,0 +1,359 @@
+//
+//  ProtocolServersView.swift
+//  SimpleX (iOS)
+//
+//  Created by Evgeny on 15/11/2022.
+//  Copyright © 2022 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+private let howToUrl = URL(string: "https://simplex.chat/docs/server.html")!
+
+struct ProtocolServersView: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
+    @EnvironmentObject private var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @Environment(\.editMode) private var editMode
+    let serverProtocol: ServerProtocol
+    @State private var currServers: [ServerCfg] = []
+    @State private var presetServers: [ServerCfg] = []
+    @State private var configuredServers: [ServerCfg] = []
+    @State private var otherServers: [ServerCfg] = []
+    @State private var selectedServer: String? = nil
+    @State private var showAddServer = false
+    @State private var showScanProtoServer = false
+    @State private var justOpened = true
+    @State private var testing = false
+    @State private var alert: ServerAlert? = nil
+    @State private var showSaveDialog = false
+
+    var proto: String { serverProtocol.rawValue.uppercased() }
+
+    var body: some View {
+        ZStack {
+            protocolServersView()
+            if testing {
+                ProgressView().scaleEffect(2)
+            }
+        }
+    }
+
+    enum ServerAlert: Identifiable {
+        case testsFailed(failures: [String: ProtocolTestFailure])
+        case error(title: LocalizedStringKey, error: LocalizedStringKey = "")
+
+        var id: String {
+            switch self {
+            case .testsFailed: return "testsFailed"
+            case let .error(title, _): return "error \(title)"
+            }
+        }
+    }
+
+    private func protocolServersView() -> some View {
+        List {
+            if !configuredServers.isEmpty {
+                Section {
+                    ForEach($configuredServers) { srv in
+                        protocolServerView(srv)
+                    }
+                    .onMove { indexSet, offset in
+                        configuredServers.move(fromOffsets: indexSet, toOffset: offset)
+                    }
+                    .onDelete { indexSet in
+                        configuredServers.remove(atOffsets: indexSet)
+                    }
+                } header: {
+                    Text("Configured \(proto) servers")
+                        .foregroundColor(theme.colors.secondary)
+                } footer: {
+                    Text("The servers for new connections of your current chat profile **\(m.currentUser?.displayName ?? "")**.")
+                        .foregroundColor(theme.colors.secondary)
+                        .lineLimit(10)
+                }
+            }
+
+            if !otherServers.isEmpty {
+                Section {
+                    ForEach($otherServers) { srv in
+                        protocolServerView(srv)
+                    }
+                    .onMove { indexSet, offset in
+                        otherServers.move(fromOffsets: indexSet, toOffset: offset)
+                    }
+                    .onDelete { indexSet in
+                        otherServers.remove(atOffsets: indexSet)
+                    }
+                } header: {
+                    Text("Other \(proto) servers")
+                        .foregroundColor(theme.colors.secondary)
+                }
+            }
+
+            Section {
+                Button("Add server") {
+                    showAddServer = true
+                }
+            }
+
+            Section {
+                Button("Reset") { partitionServers(currServers) }
+                    .disabled(Set(allServers) == Set(currServers) || testing)
+                Button("Test servers", action: testServers)
+                    .disabled(testing || allServersDisabled)
+                Button("Save servers", action: saveServers)
+                    .disabled(saveDisabled)
+                howToButton()
+            }
+        }
+        .toolbar { EditButton() }
+        .confirmationDialog("Add server", isPresented: $showAddServer, titleVisibility: .hidden) {
+            Button("Enter server manually") {
+                otherServers.append(ServerCfg.empty)
+                selectedServer = allServers.last?.id
+            }
+            Button("Scan server QR code") { showScanProtoServer = true }
+            Button("Add preset servers", action: addAllPresets)
+                .disabled(hasAllPresets())
+        }
+        .sheet(isPresented: $showScanProtoServer) {
+            ScanProtocolServer(servers: $otherServers)
+            .modifier(ThemedBackground(grouped: true))
+        }
+        .modifier(BackButton(disabled: Binding.constant(false)) {
+            if saveDisabled {
+                dismiss()
+                justOpened = false
+            } else {
+                showSaveDialog = true
+            }
+        })
+        .confirmationDialog("Save servers?", isPresented: $showSaveDialog, titleVisibility: .visible) {
+            Button("Save") {
+                saveServers()
+                dismiss()
+                justOpened = false
+            }
+            Button("Exit without saving") { dismiss() }
+        }
+        .alert(item: $alert) { a in
+            switch a {
+            case let .testsFailed(fs):
+                let msg = fs.map { (srv, f) in
+                    "\(srv): \(f.localizedDescription)"
+                }.joined(separator: "\n")
+                return Alert(
+                    title: Text("Tests failed!"),
+                    message: Text("Some servers failed the test:\n" + msg)
+                )
+            case .error:
+                return Alert(
+                    title: Text("Error")
+                )
+            }
+        }
+        .onAppear {
+            // this condition is needed to prevent re-setting the servers when exiting single server view
+            if justOpened {
+                do {
+                    let r = try getUserProtoServers(serverProtocol)
+                    currServers = r.protoServers
+                    presetServers = r.presetServers
+                    partitionServers(currServers)
+                } catch let error {
+                    alert = .error(
+                        title: "Error loading \(proto) servers",
+                        error: "Error: \(responseError(error))"
+                    )
+                }
+                justOpened = false
+            } else {
+                partitionServers(allServers)
+            }
+        }
+    }
+
+    private func partitionServers(_ servers: [ServerCfg]) {
+        configuredServers = servers.filter { $0.preset || $0.enabled }
+        otherServers = servers.filter { !($0.preset || $0.enabled) }
+    }
+
+    private var allServers: [ServerCfg] {
+        configuredServers + otherServers
+    }
+
+    private var saveDisabled: Bool {
+        allServers.isEmpty ||
+        Set(allServers) == Set(currServers) ||
+        testing ||
+        !allServers.allSatisfy { srv in
+            if let address = parseServerAddress(srv.server) {
+                return uniqueAddress(srv, address)
+            }
+            return false
+        } ||
+        allServersDisabled
+    }
+
+    private var allServersDisabled: Bool {
+        allServers.allSatisfy { !$0.enabled }
+    }
+
+    private func protocolServerView(_ server: Binding<ServerCfg>) -> some View {
+        let srv = server.wrappedValue
+        return NavigationLink(tag: srv.id, selection: $selectedServer) {
+            ProtocolServerView(
+                serverProtocol: serverProtocol,
+                server: server,
+                serverToEdit: srv
+            )
+            .navigationBarTitle(srv.preset ? "Preset server" : "Your server")
+            .modifier(ThemedBackground(grouped: true))
+            .navigationBarTitleDisplayMode(.large)
+        } label: {
+            let address = parseServerAddress(srv.server)
+            HStack {
+                Group {
+                    if let address = address {
+                        if !address.valid || address.serverProtocol != serverProtocol {
+                            invalidServer()
+                        } else if !uniqueAddress(srv, address) {
+                            Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+                        } else if !srv.enabled {
+                            Image(systemName: "slash.circle").foregroundColor(theme.colors.secondary)
+                        } else {
+                            showTestStatus(server: srv)
+                        }
+                    } else {
+                        invalidServer()
+                    }
+                }
+                .frame(width: 16, alignment: .center)
+                .padding(.trailing, 4)
+
+                let v = Text(address?.hostnames.first ?? srv.server).lineLimit(1)
+                if srv.enabled {
+                    v
+                } else {
+                    v.foregroundColor(theme.colors.secondary)
+                }
+            }
+        }
+    }
+
+    func howToButton() -> some View {
+        Button {
+            DispatchQueue.main.async {
+                UIApplication.shared.open(howToUrl)
+            }
+        } label: {
+            HStack {
+                Text("How to use your servers")
+                Image(systemName: "arrow.up.right.circle")
+            }
+        }
+    }
+
+    private func invalidServer() -> some View {
+        Image(systemName: "exclamationmark.circle").foregroundColor(.red)
+    }
+
+    private func uniqueAddress(_ s: ServerCfg, _ address: ServerAddress) -> Bool {
+        allServers.allSatisfy { srv in
+            address.hostnames.allSatisfy { host in
+                srv.id == s.id || !srv.server.contains(host)
+            }
+        }
+    }
+
+    private func hasAllPresets() -> Bool {
+        presetServers.allSatisfy { hasPreset($0) }
+    }
+
+    private func addAllPresets() {
+        for srv in presetServers {
+            if !hasPreset(srv) {
+                configuredServers.append(srv)
+            }
+        }
+    }
+
+    private func hasPreset(_ srv: ServerCfg) -> Bool {
+        allServers.contains(where: { $0.server == srv.server })
+    }
+
+    private func testServers() {
+        resetTestStatus()
+        testing = true
+        Task {
+            let fs = await runServersTest()
+            await MainActor.run {
+                testing = false
+                if !fs.isEmpty {
+                    alert = .testsFailed(failures: fs)
+                }
+            }
+        }
+    }
+
+    private func resetTestStatus() {
+        for i in 0..<configuredServers.count {
+            if configuredServers[i].enabled {
+                configuredServers[i].tested = nil
+            }
+        }
+        for i in 0..<otherServers.count {
+            if otherServers[i].enabled {
+                otherServers[i].tested = nil
+            }
+        }
+    }
+
+    private func runServersTest() async -> [String: ProtocolTestFailure] {
+        var fs: [String: ProtocolTestFailure] = [:]
+        for i in 0..<configuredServers.count {
+            if configuredServers[i].enabled {
+                if let f = await testServerConnection(server: $configuredServers[i]) {
+                    fs[serverHostname(configuredServers[i].server)] = f
+                }
+            }
+        }
+        for i in 0..<otherServers.count {
+            if otherServers[i].enabled {
+                if let f = await testServerConnection(server: $otherServers[i]) {
+                    fs[serverHostname(otherServers[i].server)] = f
+                }
+            }
+        }
+        return fs
+    }
+
+    func saveServers() {
+        Task {
+            do {
+                try await setUserProtoServers(serverProtocol, servers: allServers)
+                await MainActor.run {
+                    currServers = allServers
+                    editMode?.wrappedValue = .inactive
+                }
+            } catch let error {
+                let err = responseError(error)
+                logger.error("saveServers setUserProtocolServers error: \(err)")
+                await MainActor.run {
+                    alert = .error(
+                        title: "Error saving \(proto) servers",
+                        error: "Make sure \(proto) server addresses are in correct format, line separated and are not duplicated (\(responseError(error)))."
+                    )
+                }
+            }
+        }
+    }
+}
+
+struct ProtocolServersView_Previews: PreviewProvider {
+    static var previews: some View {
+        ProtocolServersView(serverProtocol: .smp)
+    }
+}

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

@@ -12,8 +12,8 @@ import CodeScanner
 
 struct ScanProtocolServer: View {
     @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var userServers: [UserOperatorServers]
-    @Binding var serverErrors: [UserServersError]
+    @Binding var servers: [ServerCfg]
+    @State private var showAddressError = false
 
     var body: some View {
         VStack(alignment: .leading) {
@@ -28,14 +28,23 @@ struct ScanProtocolServer: View {
         }
         .padding()
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
+        .alert(isPresented: $showAddressError) {
+            Alert(
+                title: Text("Invalid server address!"),
+                message: Text("Check server address and try again.")
+            )
+        }
     }
 
     func processQRCode(_ resp: Result<ScanResult, ScanError>) {
         switch resp {
         case let .success(r):
-            var server: UserServer = .empty
-            server.server = r.string
-            addServer(server, $userServers, $serverErrors, dismiss)
+            if parseServerAddress(r.string) != nil {
+                servers.append(ServerCfg(server: r.string, preset: false, tested: nil, enabled: false))
+                dismiss()
+            } else {
+                showAddressError = true
+            }
         case let .failure(e):
             logger.error("ScanProtocolServer.processQRCode QR code error: \(e.localizedDescription)")
             dismiss()
@@ -45,9 +54,6 @@ struct ScanProtocolServer: View {
 
 struct ScanProtocolServer_Previews: PreviewProvider {
     static var previews: some View {
-        ScanProtocolServer(
-            userServers: Binding.constant([UserOperatorServers.sampleDataNilOperator]),
-            serverErrors: Binding.constant([])
-        )
+        ScanProtocolServer(servers: Binding.constant([]))
     }
 }

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

@@ -50,7 +50,6 @@ let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
 let DEFAULT_CHAT_ITEM_ROUNDNESS = "chatItemRoundness"
 let DEFAULT_CHAT_ITEM_TAIL = "chatItemTail"
 let DEFAULT_ONE_HAND_UI_CARD_SHOWN = "oneHandUICardShown"
-let DEFAULT_ADDRESS_CREATION_CARD_SHOWN = "addressCreationCardShown"
 let DEFAULT_TOOLBAR_MATERIAL = "toolbarMaterial"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
 let DEFAULT_LIVE_MESSAGE_ALERT_SHOWN = "liveMessageAlertShown"
@@ -108,7 +107,6 @@ let appDefaults: [String: Any] = [
     DEFAULT_CHAT_ITEM_ROUNDNESS: defaultChatItemRoundness,
     DEFAULT_CHAT_ITEM_TAIL: true,
     DEFAULT_ONE_HAND_UI_CARD_SHOWN: false,
-    DEFAULT_ADDRESS_CREATION_CARD_SHOWN: false,
     DEFAULT_TOOLBAR_MATERIAL: ToolbarMaterial.defaultMaterial,
     DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
     DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
@@ -137,7 +135,6 @@ let appDefaults: [String: Any] = [
 let hintDefaults = [
     DEFAULT_LA_NOTICE_SHOWN,
     DEFAULT_ONE_HAND_UI_CARD_SHOWN,
-    DEFAULT_ADDRESS_CREATION_CARD_SHOWN,
     DEFAULT_LIVE_MESSAGE_ALERT_SHOWN,
     DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE,
     DEFAULT_SHOW_MUTE_PROFILE_ALERT,
@@ -260,18 +257,23 @@ let networkProxyDefault: CodableDefault<NetworkProxy> = CodableDefault(defaults:
 
 struct SettingsView: View {
     @Environment(\.colorScheme) var colorScheme
-    @Environment(\.dismiss) var dismiss
     @EnvironmentObject var chatModel: ChatModel
     @EnvironmentObject var sceneDelegate: SceneDelegate
     @EnvironmentObject var theme: AppTheme
+    @Binding var showSettings: Bool
     @State private var showProgress: Bool = false
 
     var body: some View {
         ZStack {
-            settingsView()
+            NavigationView {
+                settingsView()
+            }
             if showProgress {
                 progressView()
             }
+            if let la = chatModel.laRequest {
+                LocalAuthView(authRequest: la)
+            }
         }
     }
 
@@ -334,12 +336,7 @@ struct SettingsView: View {
                     chatDatabaseRow()
                     NavigationLink {
                         MigrateFromDevice(showProgressOnSettings: $showProgress)
-                            .toolbar {
-                                // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-                                ToolbarItem(placement: .principal) {
-                                    Text("Migrate device").font(.headline)
-                                }
-                            }
+                            .navigationTitle("Migrate device")
                             .modifier(ThemedBackground(grouped: true))
                             .navigationBarTitleDisplayMode(.large)
                     } label: {
@@ -350,7 +347,7 @@ struct SettingsView: View {
                 Section(header: Text("Help").foregroundColor(theme.colors.secondary)) {
                     if let user = user {
                         NavigationLink {
-                            ChatHelp(dismissSettingsSheet: dismiss)
+                            ChatHelp(showSettings: $showSettings)
                                 .navigationTitle("Welcome \(user.displayName)!")
                                 .modifier(ThemedBackground())
                                 .frame(maxHeight: .infinity, alignment: .top)
@@ -359,7 +356,7 @@ struct SettingsView: View {
                         }
                     }
                     NavigationLink {
-                        WhatsNewView(viaSettings: true, updatedConditions: false)
+                        WhatsNewView(viaSettings: true)
                             .modifier(ThemedBackground())
                             .navigationBarTitleDisplayMode(.inline)
                     } label: {
@@ -375,7 +372,7 @@ struct SettingsView: View {
                     }
                     settingsRow("number", color: theme.colors.secondary) {
                         Button("Send questions and ideas") {
-                            dismiss()
+                            showSettings = false
                             DispatchQueue.main.async {
                                 UIApplication.shared.open(simplexTeamURL)
                             }
@@ -432,7 +429,7 @@ struct SettingsView: View {
     
     private func chatDatabaseRow() -> some View {
         NavigationLink {
-            DatabaseView(dismissSettingsSheet: dismiss, chatItemTTL: chatModel.chatItemTTL)
+            DatabaseView(showSettings: $showSettings, chatItemTTL: chatModel.chatItemTTL)
                 .navigationTitle("Your chat database")
                 .modifier(ThemedBackground(grouped: true))
         } label: {
@@ -510,25 +507,27 @@ struct ProfilePreview: View {
         HStack {
             ProfileImage(imageStr: profileOf.image, size: 44, color: color)
                 .padding(.trailing, 6)
-            profileName(profileOf).lineLimit(1)
+            profileName().lineLimit(1)
         }
     }
-}
-
-func profileName(_ profileOf: NamedChat) -> Text {
-    var t = Text(profileOf.displayName).fontWeight(.semibold).font(.title2)
-    if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
-        t = t + Text(" (" + profileOf.fullName + ")")
+    
+    private func profileName() -> Text {
+        var t = Text(profileOf.displayName).fontWeight(.semibold).font(.title2)
+        if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
+            t = t + Text(" (" + profileOf.fullName + ")")
 //                        .font(.callout)
-        }
-    return t
+            }
+        return t
+    }
 }
 
 struct SettingsView_Previews: PreviewProvider {
     static var previews: some View {
         let chatModel = ChatModel()
         chatModel.currentUser = User.sampleData
-        return SettingsView()
+        @State var showSettings = false
+
+        return SettingsView(showSettings: $showSettings)
             .environmentObject(chatModel)
     }
 }

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

@@ -9,47 +9,15 @@
 import SwiftUI
 
 struct UserAddressLearnMore: View {
-    @State var showCreateAddressButton = false
-    @State private var createAddressLinkActive = false
-    
     var body: some View {
-        VStack {
-            List {
-                VStack(alignment: .leading, spacing: 18) {
-                    Text("You can share your address as a link or QR code - anybody can connect to you.")
-                    Text("You won't lose your contacts if you later delete your address.")
-                    Text("When people request to connect, you can accept or reject it.")
-                    Text("Read more in [User Guide](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).")
-                }
-                .listRowBackground(Color.clear)
+        List {
+            VStack(alignment: .leading, spacing: 18) {
+                Text("You can share your address as a link or QR code - anybody can connect to you.")
+                Text("You won't lose your contacts if you later delete your address.")
+                Text("When people request to connect, you can accept or reject it.")
+                Text("Read more in [User Guide](https://simplex.chat/docs/guide/app-settings.html#your-simplex-contact-address).")
             }
-            .frame(maxHeight: .infinity)
-
-            if showCreateAddressButton {
-                addressCreationButton()
-                    .padding()
-            }
-        }
-    }
-    
-    private func addressCreationButton() -> some View {
-        ZStack {
-            Button {
-                createAddressLinkActive = true
-            } label: {
-                Text("Create SimpleX address")
-            }
-            .buttonStyle(OnboardingButtonStyle())
-
-            NavigationLink(isActive: $createAddressLinkActive) {
-                UserAddressView(autoCreate: true)
-                    .navigationTitle("SimpleX address")
-                    .navigationBarTitleDisplayMode(.large)
-            } label: {
-                EmptyView()
-            }
-            .frame(width: 1, height: 1)
-            .hidden()
+            .listRowBackground(Color.clear)
         }
     }
 }

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

@@ -15,7 +15,6 @@ struct UserAddressView: View {
     @EnvironmentObject private var chatModel: ChatModel
     @EnvironmentObject var theme: AppTheme
     @State var shareViaProfile = false
-    @State var autoCreate = false
     @State private var aas = AutoAcceptState()
     @State private var savedAAS = AutoAcceptState()
     @State private var ignoreShareViaProfileChange = false
@@ -68,11 +67,6 @@ struct UserAddressView: View {
                 }
             }
         }
-        .onAppear {
-            if chatModel.userAddress == nil, autoCreate {
-                createAddress()
-            }
-        }
     }
 
     @Namespace private var bottomID
@@ -218,30 +212,26 @@ struct UserAddressView: View {
 
     private func createAddressButton() -> some View {
         Button {
-            createAddress()
+            progressIndicator = true
+            Task {
+                do {
+                    let connReqContact = try await apiCreateUserAddress()
+                    DispatchQueue.main.async {
+                        chatModel.userAddress = UserContactLink(connReqContact: connReqContact)
+                        alert = .shareOnCreate
+                        progressIndicator = false
+                    }
+                } catch let error {
+                    logger.error("UserAddressView apiCreateUserAddress: \(responseError(error))")
+                    let a = getErrorAlert(error, "Error creating address")
+                    alert = .error(title: a.title, error: a.message)
+                    await MainActor.run { progressIndicator = false }
+                }
+            }
         } label: {
             Label("Create SimpleX address", systemImage: "qrcode")
         }
     }
-    
-    private func createAddress() {
-        progressIndicator = true
-        Task {
-            do {
-                let connReqContact = try await apiCreateUserAddress()
-                DispatchQueue.main.async {
-                    chatModel.userAddress = UserContactLink(connReqContact: connReqContact)
-                    alert = .shareOnCreate
-                    progressIndicator = false
-                }
-            } catch let error {
-                logger.error("UserAddressView apiCreateUserAddress: \(responseError(error))")
-                let a = getErrorAlert(error, "Error creating address")
-                alert = .error(title: a.title, error: a.message)
-                await MainActor.run { progressIndicator = false }
-            }
-        }
-    }
 
     private func deleteAddressButton() -> some View {
         Button(role: .destructive) {

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

@@ -94,13 +94,10 @@ struct UserProfile: View {
             }
         }
         .onChange(of: chosenImage) { image in
-            Task {
-                let resized: String? = if let image {
-                    await resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
-                } else {
-                    nil
-                }
-                await MainActor.run { profile.image = resized }
+            if let image {
+                profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
+            } else {
+                profile.image = nil
             }
         }
         // Modals

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

@@ -21,7 +21,6 @@ struct UserProfilesView: View {
     @State private var profileHidden = false
     @State private var profileAction: UserProfileAction?
     @State private var actionPassword = ""
-    @State private var navigateToProfileCreate = false
 
     var trimmedSearchTextOrPassword: String { searchTextOrPassword.trimmingCharacters(in: .whitespaces)}
 
@@ -56,6 +55,17 @@ struct UserProfilesView: View {
     }
 
     var body: some View {
+        if authorized {
+            userProfilesView()
+        } else {
+            Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
+            .onAppear(perform: runAuth)
+        }
+    }
+
+    private func runAuth() { authorize(NSLocalizedString("Open user profiles", comment: "authentication reason"), $authorized) }
+
+    private func userProfilesView() -> some View {
         List {
             if profileHidden {
                 Button {
@@ -67,14 +77,12 @@ struct UserProfilesView: View {
             Section {
                 let users = filteredUsers()
                 let v = ForEach(users) { u in
-                    userView(u)
+                    userView(u.user)
                 }
                 if #available(iOS 16, *) {
                     v.onDelete { indexSet in
                         if let i = indexSet.first {
-                            withAuth {
-                                confirmDeleteUser(users[i].user)
-                            }
+                            confirmDeleteUser(users[i].user)
                         }
                     }
                 } else {
@@ -82,22 +90,12 @@ struct UserProfilesView: View {
                 }
 
                 if trimmedSearchTextOrPassword == "" {
-                    NavigationLink(
-                        destination: CreateProfile(),
-                        isActive: $navigateToProfileCreate
-                    ) {
+                    NavigationLink {
+                        CreateProfile()
+                    } label: {
                         Label("Add profile", systemImage: "plus")
-                            .frame(maxWidth: .infinity, alignment: .leading)
-                            .frame(height: 38)
-                            .padding(.leading, 16).padding(.vertical, 8).padding(.trailing, 32)
-                            .contentShape(Rectangle())
-                            .onTapGesture {
-                                withAuth {
-                                    self.navigateToProfileCreate = true
-                                }
-                            }
-                            .padding(.leading, -16).padding(.vertical, -8).padding(.trailing, -32)
                     }
+                    .frame(height: 38)
                 }
             } footer: {
                 Text("Tap to activate profile.")
@@ -191,25 +189,7 @@ struct UserProfilesView: View {
     private var visibleUsersCount: Int {
         m.users.filter({ u in !u.user.hidden }).count
     }
-    
-    private func withAuth(_ action: @escaping () -> Void) {
-        if authorized {
-            action()
-        } else {
-            authenticate(
-                reason: NSLocalizedString("Change user profiles", comment: "authentication reason")
-            ) { laResult in
-                switch laResult {
-                case .success, .unavailable:
-                    authorized = true
-                    AppSheetState.shared.scenePhaseActive = true
-                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5, execute: action)
-                case .failed: authorized = false
-                }
-            }
-        }
-    }
-    
+
     private func correctPassword(_ user: User, _ pwd: String) -> Bool {
         if let ph = user.viewPwdHash {
             return pwd != "" && chatPasswordHash(pwd, ph.salt) == ph.hash
@@ -233,10 +213,8 @@ struct UserProfilesView: View {
                     passwordField
                     settingsRow("trash", color: theme.colors.secondary) {
                         Button("Delete chat profile", role: .destructive) {
-                            withAuth {
-                                profileAction = nil
-                                Task { await removeUser(user, delSMPQueues, viewPwd: actionPassword) }
-                            }
+                            profileAction = nil
+                            Task { await removeUser(user, delSMPQueues, viewPwd: actionPassword) }
                         }
                         .disabled(!actionEnabled(user))
                     }
@@ -253,10 +231,8 @@ struct UserProfilesView: View {
                     passwordField
                     settingsRow("lock.open", color: theme.colors.secondary) {
                         Button("Unhide chat profile") {
-                            withAuth{
-                                profileAction = nil
-                                setUserPrivacy(user) { try await apiUnhideUser(user.userId, viewPwd: actionPassword) }
-                            }
+                            profileAction = nil
+                            setUserPrivacy(user) { try await apiUnhideUser(user.userId, viewPwd: actionPassword) }
                         }
                         .disabled(!actionEnabled(user))
                     }
@@ -279,13 +255,11 @@ struct UserProfilesView: View {
 
     private func deleteModeButton(_ title: LocalizedStringKey, _ delSMPQueues: Bool) -> some View {
         Button(title, role: .destructive) {
-            withAuth {
-                if let user = userToDelete {
-                    if passwordEntryRequired(user) {
-                        profileAction = .deleteUser(user: user, delSMPQueues: delSMPQueues)
-                    } else {
-                        alert = .deleteUser(user: user, delSMPQueues: delSMPQueues)
-                    }
+            if let user = userToDelete {
+                if passwordEntryRequired(user) {
+                    profileAction = .deleteUser(user: user, delSMPQueues: delSMPQueues)
+                } else {
+                    alert = .deleteUser(user: user, delSMPQueues: delSMPQueues)
                 }
             }
         }
@@ -327,8 +301,7 @@ struct UserProfilesView: View {
         }
     }
 
-    @ViewBuilder private func userView(_ userInfo: UserInfo) -> some View {
-        let user = userInfo.user
+    @ViewBuilder private func userView(_ user: User) -> some View {
         let v = Button {
             Task {
                 do {
@@ -346,19 +319,12 @@ struct UserProfilesView: View {
                 Spacer()
                 if user.activeUser {
                     Image(systemName: "checkmark").foregroundColor(theme.colors.onBackground)
+                } else if user.hidden {
+                    Image(systemName: "lock").foregroundColor(theme.colors.secondary)
+                } else if !user.showNtfs {
+                    Image(systemName: "speaker.slash").foregroundColor(theme.colors.secondary)
                 } else {
-                    if userInfo.unreadCount > 0 {
-                        UnreadBadge(userInfo: userInfo)
-                    }
-                    if user.hidden {
-                        Image(systemName: "lock").foregroundColor(theme.colors.secondary)
-                    } else if userInfo.unreadCount == 0 {
-                        if !user.showNtfs {
-                            Image(systemName: "speaker.slash").foregroundColor(theme.colors.secondary)
-                        } else {
-                            Image(systemName: "checkmark").foregroundColor(.clear)
-                        }
-                    }
+                    Image(systemName: "checkmark").foregroundColor(.clear)
                 }
             }
         }
@@ -366,38 +332,30 @@ struct UserProfilesView: View {
         .swipeActions(edge: .leading, allowsFullSwipe: true) {
             if user.hidden {
                 Button("Unhide") {
-                    withAuth {
-                        if passwordEntryRequired(user) {
-                            profileAction = .unhideUser(user: user)
-                        } else {
-                            setUserPrivacy(user) { try await apiUnhideUser(user.userId, viewPwd: trimmedSearchTextOrPassword) }
-                        }
+                    if passwordEntryRequired(user) {
+                        profileAction = .unhideUser(user: user)
+                    } else {
+                        setUserPrivacy(user) { try await apiUnhideUser(user.userId, viewPwd: trimmedSearchTextOrPassword) }
                     }
                 }
                 .tint(.green)
             } else {
                 if visibleUsersCount > 1 {
                     Button("Hide") {
-                        withAuth {
-                            selectedUser = user
-                        }
+                        selectedUser = user
                     }
                     .tint(.gray)
                 }
                 Group {
                     if user.showNtfs {
                         Button("Mute") {
-                            withAuth {
-                                setUserPrivacy(user, successAlert: showMuteProfileAlert ? .muteProfileAlert : nil) {
-                                    try await apiMuteUser(user.userId)
-                                }
+                            setUserPrivacy(user, successAlert: showMuteProfileAlert ? .muteProfileAlert : nil) {
+                                try await apiMuteUser(user.userId)
                             }
                         }
                     } else {
                         Button("Unmute") {
-                            withAuth {
-                                setUserPrivacy(user) { try await apiUnmuteUser(user.userId) }
-                            }
+                            setUserPrivacy(user) { try await apiUnmuteUser(user.userId) }
                         }
                     }
                 }
@@ -409,9 +367,7 @@ struct UserProfilesView: View {
         } else {
             v.swipeActions(edge: .trailing, allowsFullSwipe: true) {
                 Button("Delete", role: .destructive) {
-                    withAuth {
-                        confirmDeleteUser(user)
-                    }
+                    confirmDeleteUser(user)
                 }
             }
         }

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

@@ -161,31 +161,11 @@
         <target>%d дни</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d часа</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d мин.</target>
@@ -737,7 +717,7 @@
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -925,10 +905,6 @@
         <target>Кода за достъп до приложение се заменя с код за самоунищожение.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Версия на приложението</target>
@@ -1059,19 +1035,11 @@
         <target>Лош хеш на съобщението</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>По-добри групи</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>По-добри съобщения</target>
@@ -1081,18 +1049,6 @@
         <source>Better networking</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <note>No comment provided by engineer.</note>
@@ -1238,7 +1194,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Файлът не може да бъде получен</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1366,11 +1322,6 @@
         <source>Chat preferences were changed.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Потребителски профил</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <note>No comment provided by engineer.</note>
@@ -1873,10 +1824,6 @@ This is your own one-time link!</source>
         <target>Персонализирано време</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <note>No comment provided by engineer.</note>
@@ -2166,10 +2113,6 @@ This is your own one-time link!</source>
         <target>Изтрий старата база данни?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Изтрий предстоящата връзка?</target>
@@ -2407,10 +2350,6 @@ This is your own one-time link!</source>
         <target>Не изпращай история на нови членове.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Не създавай адрес</target>
@@ -2434,8 +2373,7 @@ This is your own one-time link!</source>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Изтегли</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2451,10 +2389,6 @@ This is your own one-time link!</source>
         <target>Свали файл</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <note>No comment provided by engineer.</note>
@@ -2875,7 +2809,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Грешка при получаване на файл</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -2971,7 +2905,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Грешка при смяна на профил!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3016,7 +2950,8 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Грешка: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3100,11 +3035,6 @@ This is your own one-time link!</source>
         <source>File error</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3235,27 +3165,11 @@ This is your own one-time link!</source>
         <target>Препрати</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Препращане и запазване на съобщения</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Препратено</target>
@@ -3266,10 +3180,6 @@ This is your own one-time link!</source>
         <target>Препратено от</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -3555,10 +3465,6 @@ Error: %2$@</source>
         <target>ICE сървъри (по един на ред)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Ако не можете да се срещнете лично, покажете QR код във видеоразговора или споделете линка.</target>
@@ -3633,11 +3539,6 @@ Error: %2$@</source>
         <target>Импортиране на архив</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Подобрена доставка на съобщения</target>
@@ -4245,10 +4146,6 @@ This is your link for group %@!</source>
         <source>Messages sent</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Съобщенията, файловете и разговорите са защитени чрез **криптиране от край до край** с перфектна секретност при препращане, правдоподобно опровержение и възстановяване при взлом.</target>
@@ -4403,14 +4300,6 @@ This is your link for group %@!</source>
         <target>Нов kод за достъп</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Нов чат</target>
@@ -4527,14 +4416,6 @@ This is your link for group %@!</source>
         <target>Няма мрежова връзка</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Няма разрешение за запис на гласово съобщение</target>
@@ -4554,10 +4435,6 @@ This is your link for group %@!</source>
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Известия</target>
@@ -4590,7 +4467,7 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ок</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4778,11 +4655,6 @@ Requires compatible VPN.</source>
         <source>Other %@ servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING бройка</target>
@@ -4818,10 +4690,6 @@ Requires compatible VPN.</source>
         <target>Кодът за достъп е зададен!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Парола за показване</target>
@@ -4966,10 +4834,6 @@ Error: %@</source>
         <target>Полски интерфейс</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Въжможно е пръстовият отпечатък на сертификата в адреса на сървъра да е неправилен</target>
@@ -5146,10 +5010,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Proxied servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Push известия</target>
@@ -5538,10 +5398,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <note>No comment provided by engineer.</note>
@@ -5650,10 +5506,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Запазено съобщение</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <note>No comment provided by engineer.</note>
@@ -5846,7 +5698,7 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Подателят отмени прехвърлянето на файла.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -5938,10 +5790,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Sent via proxy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <note>No comment provided by engineer.</note>
@@ -6225,10 +6073,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Еднократна покана за SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Опростен режим инкогнито</target>
@@ -6393,14 +6237,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Подкрепете SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Системен</target>
@@ -6754,14 +6590,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Ще бъдете подканени да извършите идентификация, преди тази функция да бъде активирана.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>За да запишете гласово съобщение, моля, дайте разрешение за използване на микрофон.</target>
@@ -6910,7 +6738,7 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7020,10 +6848,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Използвай .onion хостове</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Използвай сървърите на SimpleX Chat?</target>
@@ -7086,12 +6910,13 @@ To connect, please ask your contact to create another connection link and check
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="User selection" xml:space="preserve">
-        <source>User selection</source>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Потребителски профил</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
+      <trans-unit id="User selection" xml:space="preserve">
+        <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
@@ -7323,7 +7148,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7347,6 +7172,11 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Вие</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>**Не трябва** да използвате една и съща база данни на две устройства.</target>
@@ -7717,10 +7547,6 @@ Repeat connection request?</source>
         <target>Вашите контакти ще останат свързани.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Вашата текуща чат база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.</target>

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

@@ -158,31 +158,11 @@
         <target>%d dní</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d hodin</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d minuty</target>
@@ -715,7 +695,7 @@
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -898,10 +878,6 @@
         <target>Přístupový kód aplikace je nahrazen sebedestrukčním přístupovým heslem.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Verze aplikace</target>
@@ -1028,18 +1004,10 @@
         <target>Špatný hash zprávy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Lepší zprávy</target>
@@ -1049,18 +1017,6 @@
         <source>Better networking</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <note>No comment provided by engineer.</note>
@@ -1197,7 +1153,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Nelze přijmout soubor</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1322,11 +1278,6 @@
         <source>Chat preferences were changed.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Profil uživatele</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <note>No comment provided by engineer.</note>
@@ -1803,10 +1754,6 @@ This is your own one-time link!</source>
         <target>Vlastní čas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <note>No comment provided by engineer.</note>
@@ -2093,10 +2040,6 @@ This is your own one-time link!</source>
         <target>Smazat starou databázi?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Smazat čekající připojení?</target>
@@ -2328,10 +2271,6 @@ This is your own one-time link!</source>
         <source>Do not send history to new members.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Nevytvářet adresu</target>
@@ -2354,8 +2293,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2370,10 +2308,6 @@ This is your own one-time link!</source>
         <target>Stáhnout soubor</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <note>No comment provided by engineer.</note>
@@ -2779,7 +2713,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Chyba při příjmu souboru</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -2873,7 +2807,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Chyba při přepínání profilu!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -2916,7 +2850,8 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Chyba: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2997,11 +2932,6 @@ This is your own one-time link!</source>
         <source>File error</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3128,26 +3058,10 @@ This is your own one-time link!</source>
         <source>Forward</source>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <note>No comment provided by engineer.</note>
@@ -3156,10 +3070,6 @@ This is your own one-time link!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -3438,10 +3348,6 @@ Error: %2$@</source>
         <target>Servery ICE (jeden na řádek)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Pokud se nemůžete setkat osobně, zobrazte QR kód ve videohovoru nebo sdílejte odkaz.</target>
@@ -3514,11 +3420,6 @@ Error: %2$@</source>
         <source>Importing archive</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <note>No comment provided by engineer.</note>
@@ -4101,10 +4002,6 @@ This is your link for group %@!</source>
         <source>Messages sent</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <note>No comment provided by engineer.</note>
@@ -4247,14 +4144,6 @@ This is your link for group %@!</source>
         <target>Nové heslo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <note>No comment provided by engineer.</note>
@@ -4369,14 +4258,6 @@ This is your link for group %@!</source>
         <source>No network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Nemáte oprávnění nahrávat hlasové zprávy</target>
@@ -4395,10 +4276,6 @@ This is your link for group %@!</source>
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Oznámení</target>
@@ -4430,7 +4307,7 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4610,11 +4487,6 @@ Vyžaduje povolení sítě VPN.</target>
         <source>Other %@ servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Počet PING</target>
@@ -4650,10 +4522,6 @@ Vyžaduje povolení sítě VPN.</target>
         <target>Heslo nastaveno!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Heslo k zobrazení</target>
@@ -4790,10 +4658,6 @@ Error: %@</source>
         <target>Polské rozhraní</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Je možné, že otisk certifikátu v adrese serveru je nesprávný</target>
@@ -4967,10 +4831,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Proxied servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Nabízená oznámení</target>
@@ -5348,10 +5208,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <note>No comment provided by engineer.</note>
@@ -5456,10 +5312,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Saved message</source>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <note>No comment provided by engineer.</note>
@@ -5648,7 +5500,7 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Odesílatel zrušil přenos souboru.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -5740,10 +5592,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Sent via proxy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <note>No comment provided by engineer.</note>
@@ -6020,10 +5868,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Jednorázová pozvánka SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Zjednodušený inkognito režim</target>
@@ -6184,14 +6028,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Podpořte SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Systém</target>
@@ -6533,14 +6369,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Chcete-li nahrávat hlasové zprávy, udělte povolení k použití mikrofonu.</target>
@@ -6683,7 +6511,7 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
       </trans-unit>
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6788,10 +6616,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <target>Použít hostitele .onion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Používat servery SimpleX Chat?</target>
@@ -6851,12 +6675,13 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="User selection" xml:space="preserve">
-        <source>User selection</source>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Profil uživatele</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
+      <trans-unit id="User selection" xml:space="preserve">
+        <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
@@ -7071,7 +6896,7 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
       </trans-unit>
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7095,6 +6920,11 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Vy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <note>No comment provided by engineer.</note>
@@ -7448,10 +7278,6 @@ Repeat connection request?</source>
         <target>Vaše kontakty zůstanou připojeny.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Vaše aktuální chat databáze bude ODSTRANĚNA a NAHRAZENA importovanou.</target>

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

@@ -139,7 +139,6 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -162,36 +161,11 @@
         <target>%d Tage</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <target>%d Datei(en) wird/werden immer noch heruntergeladen.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <target>Bei %d Datei(en) ist das Herunterladen fehlgeschlagen.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <target>%d Datei(en) wurde(n) gelöscht.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <target>%d Datei(en) wurde(n) nicht heruntergeladen.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d Stunden</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <target>%d Nachrichten wurden nicht weitergeleitet</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -753,7 +727,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>Alle Profile</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -945,11 +919,6 @@
         <target>App-Zugangscode wurde durch den Selbstzerstörungs-Zugangscode ersetzt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <target>App-Sitzung</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>App Version</target>
@@ -1057,7 +1026,6 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
-        <target>Einstellungen automatisch akzeptieren</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1085,21 +1053,11 @@
         <target>Ungültiger Nachrichten-Hash</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <target>Verbesserte Anrufe</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Bessere Gruppen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <target>Verbesserte Nachrichten-Datumsinformation</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Verbesserungen bei Nachrichten</target>
@@ -1110,21 +1068,6 @@
         <target>Kontrollieren Sie Ihr Netzwerk</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <target>Verbesserte Benachrichtigungen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <target>Verbesserte Sicherheit ✅</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <target>Verbesserte Nutzer-Erfahrung</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Schwarz</target>
@@ -1278,7 +1221,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Datei kann nicht empfangen werden</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1408,14 +1351,8 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
-        <target>Die Chat-Präferenzen wurden geändert.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Benutzerprofil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Chat-Design</target>
@@ -1817,7 +1754,6 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
         <source>Corner</source>
-        <target>Abrundung Ecken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1945,11 +1881,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Zeit anpassen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <target>Anpassbares Format des Nachrichtenfelds</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Design anpassen</target>
@@ -2244,11 +2175,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Alte Datenbank löschen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <target>Bis zu 200 Nachrichten löschen oder moderieren</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Ausstehende Verbindung löschen?</target>
@@ -2499,11 +2425,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Den Nachrichtenverlauf nicht an neue Mitglieder senden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <target>Verwenden Sie keine Anmeldeinformationen mit einem Proxy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Keine Adresse erstellt</target>
@@ -2527,8 +2448,7 @@ Das ist Ihr eigener Einmal-Link!</target>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Herunterladen</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2545,11 +2465,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Datei herunterladen</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <target>Dateien herunterladen</target>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Heruntergeladen</target>
@@ -2827,7 +2742,6 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
-        <target>Fehler beim Wechseln des Verbindungs-Profils</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
@@ -2842,7 +2756,6 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
-        <target>Fehler beim Wechseln zum Inkognito-Profil!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2967,7 +2880,6 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
-        <target>Fehler beim Migrieren der Einstellungen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
@@ -2978,7 +2890,7 @@ Das ist Ihr eigener Einmal-Link!</target>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Fehler beim Empfangen der Datei</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3072,13 +2984,12 @@ Das ist Ihr eigener Einmal-Link!</target>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
-        <target>Fehler beim Wechseln des Profils</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Fehler beim Umschalten des Profils!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3123,7 +3034,8 @@ Das ist Ihr eigener Einmal-Link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Fehler: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3210,13 +3122,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Datei-Fehler</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <target>Datei-Fehler:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Datei nicht gefunden - höchstwahrscheinlich wurde die Datei gelöscht oder der Transfer abgebrochen.</target>
@@ -3352,31 +3257,11 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Weiterleiten</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <target>%d Nachricht(en) weiterleiten?</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Nachrichten weiterleiten und speichern</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <target>Nachrichten weiterleiten</target>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <target>Nachrichten ohne Dateien weiterleiten?</target>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <target>Bis zu 20 Nachrichten auf einmal weiterleiten</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Weitergeleitet</target>
@@ -3387,11 +3272,6 @@ Das ist Ihr eigener Einmal-Link!</target>
         <target>Weitergeleitet aus</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <target>%lld Nachricht(en) wird/werden weitergeleitet</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>Weiterleitungsserver %@ konnte sich nicht mit dem Zielserver %@ verbinden. Bitte versuchen Sie es später erneut.</target>
@@ -3686,11 +3566,6 @@ Fehler: %2$@</target>
         <target>ICE-Server (einer pro Zeile)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <target>IP-Adresse</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Falls Sie sich nicht persönlich treffen können, zeigen Sie den QR-Code in einem Videoanruf oder teilen Sie den Link.</target>
@@ -3766,13 +3641,6 @@ Fehler: %2$@</target>
         <target>Archiv wird importiert</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <target>Verbesserte Nachrichten-Auslieferung und verringerter Datenverbrauch.
-Weitere Verbesserungen sind bald verfügbar!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Verbesserte Zustellung von Nachrichten</target>
@@ -4345,7 +4213,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
-        <target>Nachrichten-Form</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4398,11 +4265,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Gesendete Nachrichten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <target>Die Nachrichten wurden gelöscht, nachdem Sie sie ausgewählt hatten.</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Nachrichten, Dateien und Anrufe sind durch **Ende-zu-Ende-Verschlüsselung** mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.</target>
@@ -4558,16 +4420,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Neuer Zugangscode</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <target>Jedes Mal wenn Sie die App starten, werden neue SOCKS-Anmeldeinformationen genutzt</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <target>Für jeden Server werden neue SOCKS-Anmeldeinformationen genutzt</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Neuer Chat</target>
@@ -4688,16 +4540,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Keine Netzwerkverbindung</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <target>Keine Genehmigung für Sprach-Aufnahmen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <target>Keine Genehmigung für Video-Aufnahmen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Keine Berechtigung für das Aufnehmen von Sprachnachrichten</target>
@@ -4718,11 +4560,6 @@ Das ist Ihr Link für die Gruppe %@!</target>
         <target>Nichts ausgewählt</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <target>Es gibt nichts zum Weiterleiten!</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Benachrichtigungen</target>
@@ -4755,7 +4592,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4946,13 +4783,6 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Andere %@ Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <target>Andere(r) Datei-Fehler:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING-Zähler</target>
@@ -4988,11 +4818,6 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Zugangscode eingestellt!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <target>Passwort</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Passwort anzeigen</target>
@@ -5142,11 +4967,6 @@ Fehler: %@</target>
         <target>Polnische Bedienoberfläche</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <target>Port</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Der Fingerabdruck des Zertifikats in der Serveradresse ist wahrscheinlich ungültig</target>
@@ -5334,11 +5154,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Proxy-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <target>Der Proxy benötigt ein Passwort</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Push-Benachrichtigungen</target>
@@ -5562,7 +5377,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Remove archive?" xml:space="preserve">
         <source>Remove archive?</source>
-        <target>Archiv entfernen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove image" xml:space="preserve">
@@ -5745,11 +5559,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>SMP-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <target>SOCKS-Proxy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Dateien sicher empfangen</target>
@@ -5838,7 +5647,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
-        <target>Ihr Profil speichern?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -5861,11 +5669,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Gespeicherte Nachricht</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <target>Es wird/werden %lld Nachricht(en) gesichert</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Skalieren</target>
@@ -5948,7 +5751,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Select chat profile" xml:space="preserve">
         <source>Select chat profile</source>
-        <target>Chat-Profil auswählen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
@@ -6069,7 +5871,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Der Absender hat die Dateiübertragung abgebrochen.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6166,11 +5968,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Über einen Proxy gesendet</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <target>Server</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Server-Adresse</target>
@@ -6293,7 +6090,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Settings were changed." xml:space="preserve">
         <source>Settings were changed.</source>
-        <target>Die Einstellungen wurden geändert.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
@@ -6333,7 +6129,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
         <source>Share profile</source>
-        <target>Profil teilen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6471,11 +6266,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>SimpleX-Einmal-Einladung</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Die SimpleX-Protokolle wurden von Trail of Bits überprüft.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Vereinfachter Inkognito-Modus</target>
@@ -6508,7 +6298,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Some app settings were not migrated." xml:space="preserve">
         <source>Some app settings were not migrated.</source>
-        <target>Einige App-Einstellungen wurden nicht migriert.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
@@ -6651,16 +6440,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
         <target>Unterstützung von SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <target>Während des Anrufs zwischen Audio und Video wechseln</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Das Chat-Profil für Einmal-Einladungen wechseln</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>System</target>
@@ -6698,7 +6477,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
       </trans-unit>
       <trans-unit id="Tail" xml:space="preserve">
         <source>Tail</source>
-        <target>Sprechblasen-Format</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
@@ -6895,7 +6673,6 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
         <source>The uploaded database archive will be permanently removed from the servers.</source>
-        <target>Das hochgeladene Datenbank-Archiv wird dauerhaft von den Servern entfernt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Themes" xml:space="preserve">
@@ -7025,16 +6802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <target>Bitte erteilen Sie für Sprach-Aufnahmen die Genehmigung das Mikrofon zu nutzen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <target>Bitte erteilen Sie für Video-Aufnahmen die Genehmigung die Kamera zu nutzen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Bitte erlauben Sie die Nutzung des Mikrofons, um Sprachnachrichten aufnehmen zu können.</target>
@@ -7188,7 +6955,7 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>Unbekannte Server!</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7302,11 +7069,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Verwende .onion-Hosts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <target>SOCKS-Proxy nutzen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Verwenden Sie SimpleX-Chat-Server?</target>
@@ -7372,16 +7134,16 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>Die App mit einer Hand bedienen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Benutzerprofil</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Benutzer-Auswahl</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Benutzername</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Verwendung von SimpleX-Chat-Servern.</target>
@@ -7615,7 +7377,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Ohne Tor- oder VPN-Nutzung wird Ihre IP-Adresse für diese XFTP-Relais sichtbar sein: %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7642,6 +7404,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
         <target>XFTP-Server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Profil</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>Sie dürfen die selbe Datenbank **nicht** auf zwei Geräten nutzen.</target>
@@ -7993,7 +7760,6 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
         <source>Your chat preferences</source>
-        <target>Ihre Chat-Präferenzen</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -8003,7 +7769,6 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
         <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <target>Ihre Verbindung wurde auf %@ verschoben. Während Sie auf das Profil weitergeleitet wurden trat aber ein unerwarteter Fehler auf.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -8021,11 +7786,6 @@ Verbindungsanfrage wiederholen?</target>
         <target>Ihre Kontakte bleiben weiterhin verbunden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <target>Ihre Anmeldeinformationen können unverschlüsselt versendet werden.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Ihre aktuelle Chat-Datenbank wird GELÖSCHT und durch die Importierte ERSETZT.</target>
@@ -8063,7 +7823,6 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
-        <target>Ihr Profil wurde geändert. Wenn Sie es speichern, wird das aktualisierte Profil an alle Ihre Kontakte gesendet.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
@@ -8503,7 +8262,7 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="expired" xml:space="preserve">
         <source>expired</source>
-        <target>Abgelaufen</target>
+        <target>abgelaufen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="forwarded" xml:space="preserve">
@@ -8735,7 +8494,7 @@ Verbindungsanfrage wiederholen?</target>
       </trans-unit>
       <trans-unit id="other" xml:space="preserve">
         <source>other</source>
-        <target>Andere</target>
+        <target>andere</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="other errors" xml:space="preserve">

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

@@ -4200,7 +4200,7 @@ SimpleX servers cannot see your profile.</source>
       </trans-unit>
       <trans-unit id="## In reply to" xml:space="preserve" approved="no">
         <source>## In reply to</source>
-        <target state="translated">## Ως απάντηση σε</target>
+        <target state="translated">## Ως απαντηση σε</target>
         <note>copied message info</note>
       </trans-unit>
       <trans-unit id="%@ (current)" xml:space="preserve" approved="no">

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

@@ -162,36 +162,11 @@
         <target>%d days</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <target>%d file(s) are still being downloaded.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <target>%d file(s) failed to download.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <target>%d file(s) were deleted.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <target>%d file(s) were not downloaded.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d hours</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <target>%d messages not forwarded</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -753,7 +728,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>All profiles</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -945,11 +920,6 @@
         <target>App passcode is replaced with self-destruct passcode.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <target>App session</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>App version</target>
@@ -1085,21 +1055,11 @@
         <target>Bad message hash</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <target>Better calls</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Better groups</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <target>Better message dates.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Better messages</target>
@@ -1110,21 +1070,6 @@
         <target>Better networking</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <target>Better notifications</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <target>Better security ✅</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <target>Better user experience</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Black</target>
@@ -1278,7 +1223,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Cannot receive file</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1411,11 +1356,6 @@
         <target>Chat preferences were changed.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Chat profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Chat theme</target>
@@ -1945,11 +1885,6 @@ This is your own one-time link!</target>
         <target>Custom time</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <target>Customizable message shape.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Customize theme</target>
@@ -2244,11 +2179,6 @@ This is your own one-time link!</target>
         <target>Delete old database?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <target>Delete or moderate up to 200 messages.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Delete pending connection?</target>
@@ -2499,11 +2429,6 @@ This is your own one-time link!</target>
         <target>Do not send history to new members.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <target>Do not use credentials with proxy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Don't create address</target>
@@ -2527,8 +2452,7 @@ This is your own one-time link!</target>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Download</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2545,11 +2469,6 @@ This is your own one-time link!</target>
         <target>Download file</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <target>Download files</target>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Downloaded</target>
@@ -2978,7 +2897,7 @@ This is your own one-time link!</target>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Error receiving file</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3078,7 +2997,7 @@ This is your own one-time link!</target>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Error switching profile!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3123,7 +3042,8 @@ This is your own one-time link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Error: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3210,13 +3130,6 @@ This is your own one-time link!</target>
         <target>File error</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <target>File errors:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>File not found - most likely file was deleted or cancelled.</target>
@@ -3352,31 +3265,11 @@ This is your own one-time link!</target>
         <target>Forward</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <target>Forward %d message(s)?</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Forward and save messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <target>Forward messages</target>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <target>Forward messages without files?</target>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <target>Forward up to 20 messages at once.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Forwarded</target>
@@ -3387,11 +3280,6 @@ This is your own one-time link!</target>
         <target>Forwarded from</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <target>Forwarding %lld messages</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>Forwarding server %@ failed to connect to destination server %@. Please try later.</target>
@@ -3686,11 +3574,6 @@ Error: %2$@</target>
         <target>ICE servers (one per line)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <target>IP address</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>If you can't meet in person, show QR code in a video call, or share the link.</target>
@@ -3766,13 +3649,6 @@ Error: %2$@</target>
         <target>Importing archive</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <target>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Improved message delivery</target>
@@ -4398,11 +4274,6 @@ This is your link for group %@!</target>
         <target>Messages sent</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <target>Messages were deleted after you selected them.</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</target>
@@ -4558,16 +4429,6 @@ This is your link for group %@!</target>
         <target>New Passcode</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <target>New SOCKS credentials will be used every time you start the app.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <target>New SOCKS credentials will be used for each server.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>New chat</target>
@@ -4688,16 +4549,6 @@ This is your link for group %@!</target>
         <target>No network connection</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <target>No permission to record speech</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <target>No permission to record video</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>No permission to record voice message</target>
@@ -4718,11 +4569,6 @@ This is your link for group %@!</target>
         <target>Nothing selected</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <target>Nothing to forward!</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Notifications</target>
@@ -4755,7 +4601,7 @@ This is your link for group %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4946,13 +4792,6 @@ Requires compatible VPN.</target>
         <target>Other %@ servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <target>Other file errors:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING count</target>
@@ -4988,11 +4827,6 @@ Requires compatible VPN.</target>
         <target>Passcode set!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <target>Password</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Password to show</target>
@@ -5142,11 +4976,6 @@ Error: %@</target>
         <target>Polish interface</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <target>Port</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Possibly, certificate fingerprint in server address is incorrect</target>
@@ -5334,11 +5163,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Proxied servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <target>Proxy requires password</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Push notifications</target>
@@ -5745,11 +5569,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>SMP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <target>SOCKS proxy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Safely receive files</target>
@@ -5861,11 +5680,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Saved message</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <target>Saving %lld messages</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Scale</target>
@@ -6069,7 +5883,7 @@ Enable in *Network &amp; servers* settings.</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Sender cancelled file transfer.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6166,11 +5980,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Sent via proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <target>Server</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Server address</target>
@@ -6471,11 +6280,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>SimpleX one-time invitation</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>SimpleX protocols reviewed by Trail of Bits.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Simplified incognito mode</target>
@@ -6651,16 +6455,6 @@ Enable in *Network &amp; servers* settings.</target>
         <target>Support SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <target>Switch audio and video during the call.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Switch chat profile for 1-time invitations.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>System</target>
@@ -7025,16 +6819,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 You will be prompted to complete authentication before this feature is enabled.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <target>To record speech please grant permission to use Microphone.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <target>To record video please grant permission to use Camera.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>To record voice message please grant permission to use Microphone.</target>
@@ -7188,7 +6972,7 @@ You will be prompted to complete authentication before this feature is enabled.<
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>Unknown servers!</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7302,11 +7086,6 @@ To connect, please ask your contact to create another connection link and check
         <target>Use .onion hosts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <target>Use SOCKS proxy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Use SimpleX Chat servers?</target>
@@ -7372,16 +7151,16 @@ To connect, please ask your contact to create another connection link and check
         <target>Use the app with one hand.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>User profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>User selection</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Username</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Using SimpleX Chat servers.</target>
@@ -7615,7 +7394,7 @@ To connect, please ask your contact to create another connection link and check
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7642,6 +7421,11 @@ To connect, please ask your contact to create another connection link and check
         <target>XFTP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>You</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>You **must not** use the same database on two devices.</target>
@@ -8021,11 +7805,6 @@ Repeat connection request?</target>
         <target>Your contacts will remain connected.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <target>Your credentials may be sent unencrypted.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Your current chat database will be DELETED and REPLACED with the imported one.</target>

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

@@ -139,7 +139,6 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -162,36 +161,11 @@
         <target>%d días</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <target>%d archivo(s) se está(n) descargando todavía.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <target>La descarga ha fallado para %d archivo(s).</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <target>%d archivo(s) ha(n) sido eliminado(s).</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <target>%d archivo(s) no se ha(n) descargado.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d horas</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <target>%d mensajes no enviados</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d minutos</target>
@@ -537,7 +511,7 @@
       </trans-unit>
       <trans-unit id="A new random profile will be shared." xml:space="preserve">
         <source>A new random profile will be shared.</source>
-        <target>Compartirás un perfil nuevo aleatorio.</target>
+        <target>Se compartirá un perfil nuevo aleatorio.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -753,7 +727,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>Todos los perfiles</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -945,11 +919,6 @@
         <target>El código de acceso será reemplazado por código de autodestrucción.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <target>Sesión de aplicación</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Versión de la aplicación</target>
@@ -1057,7 +1026,6 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
-        <target>Auto aceptar configuración</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1085,21 +1053,11 @@
         <target>Hash de mensaje incorrecto</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <target>Llamadas mejoradas</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Grupos mejorados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <target>Sistema de fechas mejorado.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Mensajes mejorados</target>
@@ -1110,21 +1068,6 @@
         <target>Uso de red mejorado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <target>Notificaciones mejoradas</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <target>Seguridad mejorada ✅</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <target>Experiencia de usuario mejorada</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Negro</target>
@@ -1278,7 +1221,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>No se puede recibir el archivo</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1408,14 +1351,8 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
-        <target>Las preferencias del chat han sido modificadas.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Perfil de usuario</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Tema de chat</target>
@@ -1568,7 +1505,7 @@
       </trans-unit>
       <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
         <source>Confirm that you remember database passphrase to migrate it.</source>
-        <target>Para migrar la base de datos confirma que recuerdas la frase de contraseña.</target>
+        <target>Para migrar confirma que recuerdas la frase de contraseña de la base de datos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Confirm upload" xml:space="preserve">
@@ -1817,7 +1754,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
         <source>Corner</source>
-        <target>Esquina</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1945,11 +1881,6 @@ This is your own one-time link!</source>
         <target>Tiempo personalizado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <target>Forma personalizable de los mensajes.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Personalizar tema</target>
@@ -2031,7 +1962,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
         <source>Database passphrase is different from saved in the keychain.</source>
-        <target>La contraseña es diferente a la almacenada en Keychain.</target>
+        <target>La contraseña es distinta a la almacenada en Keychain.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
@@ -2244,11 +2175,6 @@ This is your own one-time link!</source>
         <target>¿Eliminar base de datos antigua?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <target>Borra o modera hasta 200 mensajes a la vez.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>¿Eliminar conexión pendiente?</target>
@@ -2461,7 +2387,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Disconnect desktop?" xml:space="preserve">
         <source>Disconnect desktop?</source>
-        <target>¿Desconectar del ordenador?</target>
+        <target>¿Desconectar ordenador?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Discover and join groups" xml:space="preserve">
@@ -2499,11 +2425,6 @@ This is your own one-time link!</source>
         <target>No se envía el historial a los miembros nuevos.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <target>No uses credenciales con proxy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>No crear dirección SimpleX</target>
@@ -2516,7 +2437,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Don't show again" xml:space="preserve">
         <source>Don't show again</source>
-        <target>No volver a mostrar</target>
+        <target>No mostrar de nuevo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2527,8 +2448,7 @@ This is your own one-time link!</source>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Descargar</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2545,11 +2465,6 @@ This is your own one-time link!</source>
         <target>Descargar archivo</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <target>Descargar archivos</target>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Descargado</target>
@@ -2827,7 +2742,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
-        <target>Error al cambiar el perfil de conexión</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
@@ -2842,7 +2756,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
-        <target>¡Error al cambiar a incógnito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2967,7 +2880,6 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
-        <target>Error al migrar la configuración</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
@@ -2978,7 +2890,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Error al recibir archivo</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3072,13 +2984,12 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
-        <target>Error al cambiar perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>¡Error al cambiar perfil!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3123,7 +3034,8 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Error: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3210,13 +3122,6 @@ This is your own one-time link!</source>
         <target>Error de archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <target>Error(es) de archivo
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Archivo no encontrado, probablemente haya sido borrado o cancelado.</target>
@@ -3352,31 +3257,11 @@ This is your own one-time link!</source>
         <target>Reenviar</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <target>¿Reenviar %d mensaje(s)?</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Reenviar y guardar mensajes</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <target>Reenviar mensajes</target>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <target>¿Reenviar mensajes sin los archivos?</target>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <target>Desplazamiento de hasta 20 mensajes.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Reenviado</target>
@@ -3387,11 +3272,6 @@ This is your own one-time link!</source>
         <target>Reenviado por</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <target>Reenviando %lld mensajes</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>El servidor de reenvío %@ no ha podido conectarse al servidor de destino %@. Por favor, intentalo más tarde.</target>
@@ -3443,12 +3323,12 @@ Error: %2$@</target>
       </trans-unit>
       <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
         <source>Fully decentralized – visible only to members.</source>
-        <target>Totalmente descentralizado. Visible sólo para los miembros.</target>
+        <target>Completamente descentralizado y sólo visible para los miembros.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
         <source>Fully re-implemented - work in background!</source>
-        <target>Totalmente revisado. ¡Funciona en segundo plano!</target>
+        <target>Completamente reimplementado: ¡funciona en segundo plano!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Further reduced battery usage" xml:space="preserve">
@@ -3686,11 +3566,6 @@ Error: %2$@</target>
         <target>Servidores ICE (uno por línea)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <target>Dirección IP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Si no puedes reunirte en persona, muestra el código QR por videollamada o comparte el enlace.</target>
@@ -3766,13 +3641,6 @@ Error: %2$@</target>
         <target>Importando archivo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <target>Reducción del tráfico y entrega mejorada.
-¡Pronto habrá nuevas mejoras!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Entrega de mensajes mejorada</target>
@@ -4175,7 +4043,7 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Local profile data only" xml:space="preserve">
         <source>Local profile data only</source>
-        <target>Eliminar sólo el perfil</target>
+        <target>Sólo datos del perfil local</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Lock after" xml:space="preserve">
@@ -4345,7 +4213,6 @@ This is your link for group %@!</source>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
-        <target>Forma del mensaje</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4398,11 +4265,6 @@ This is your link for group %@!</source>
         <target>Mensajes enviados</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <target>Los mensajes han sido borrados después de seleccionarlos.</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Los mensajes, archivos y llamadas están protegidos mediante **cifrado de extremo a extremo** con secreto perfecto hacía adelante, repudio y recuperación tras ataque.</target>
@@ -4558,16 +4420,6 @@ This is your link for group %@!</source>
         <target>Código Nuevo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <target>Se usarán credenciales SOCKS nuevas cada vez que inicies la aplicación.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <target>Se usarán credenciales SOCKS nuevas por cada servidor.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Nuevo chat</target>
@@ -4688,16 +4540,6 @@ This is your link for group %@!</source>
         <target>Sin conexión de red</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <target>Sin permiso para grabación de voz</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <target>Sin permiso para grabación de vídeo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Sin permiso para grabar mensajes de voz</target>
@@ -4718,11 +4560,6 @@ This is your link for group %@!</source>
         <target>Nada seleccionado</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <target>¡Nada para reenviar!</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Notificaciones</target>
@@ -4755,7 +4592,7 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4946,13 +4783,6 @@ Requiere activación de la VPN.</target>
         <target>Otros servidores %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <target>Otro(s) error(es) de archivo.
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Contador PING</target>
@@ -4988,11 +4818,6 @@ Requiere activación de la VPN.</target>
         <target>¡Código de acceso guardado!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <target>Contraseña</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Contraseña para hacerlo visible</target>
@@ -5142,14 +4967,9 @@ Error: %@</target>
         <target>Interfaz en polaco</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <target>Puerto</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
-        <target>Posiblemente la huella del certificado en la dirección del servidor es incorrecta</target>
+        <target>Posiblemente la huella digital del certificado en la dirección del servidor es incorrecta</target>
         <note>server test error</note>
       </trans-unit>
       <trans-unit id="Preserve the last message draft, with attachments." xml:space="preserve">
@@ -5219,7 +5039,7 @@ Error: %@</target>
       </trans-unit>
       <trans-unit id="Profile and server connections" xml:space="preserve">
         <source>Profile and server connections</source>
-        <target>Eliminar perfil y conexiones</target>
+        <target>Datos del perfil y conexiones</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Profile image" xml:space="preserve">
@@ -5334,11 +5154,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Servidores con proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <target>El proxy requiere contraseña</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Notificaciones automáticas</target>
@@ -5562,7 +5377,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Remove archive?" xml:space="preserve">
         <source>Remove archive?</source>
-        <target>¿Eliminar archivo?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove image" xml:space="preserve">
@@ -5745,11 +5559,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Servidor SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <target>Proxy SOCKS</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Recibe archivos de forma segura</target>
@@ -5838,7 +5647,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
-        <target>¿Guardar tu perfil?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -5861,11 +5669,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Mensaje guardado</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <target>Guardando %lld mensajes</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Escala</target>
@@ -5948,7 +5751,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Select chat profile" xml:space="preserve">
         <source>Select chat profile</source>
-        <target>Selecciona perfil de chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
@@ -5998,7 +5800,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Send direct message to connect" xml:space="preserve">
         <source>Send direct message to connect</source>
-        <target>Envía un mensaje para conectar</target>
+        <target>Envia un mensaje para conectar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -6069,7 +5871,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>El remitente ha cancelado la transferencia de archivos.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6166,11 +5968,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Mediante proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <target>Servidor</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Dirección del servidor</target>
@@ -6198,7 +5995,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Server test failed!" xml:space="preserve">
         <source>Server test failed!</source>
-        <target>¡Prueba no superada!</target>
+        <target>¡Error en prueba del servidor!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Server type" xml:space="preserve">
@@ -6293,7 +6090,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Settings were changed." xml:space="preserve">
         <source>Settings were changed.</source>
-        <target>La configuración ha sido modificada.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
@@ -6333,7 +6129,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
         <source>Share profile</source>
-        <target>Comparte perfil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6471,11 +6266,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Invitación SimpleX de un uso</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Protocolos de SimpleX auditados por Trail of Bits.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Modo incógnito simplificado</target>
@@ -6508,7 +6298,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Some app settings were not migrated." xml:space="preserve">
         <source>Some app settings were not migrated.</source>
-        <target>Algunas configuraciones de la app no han sido migradas.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
@@ -6651,16 +6440,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
         <target>Soporte SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <target>Intercambia audio y video durante la llamada.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Cambia el perfil de chat para invitaciones de un solo uso.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Sistema</target>
@@ -6698,7 +6477,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Tail" xml:space="preserve">
         <source>Tail</source>
-        <target>Cola</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
@@ -6748,7 +6526,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Test failed at step %@." xml:space="preserve">
         <source>Test failed at step %@.</source>
-        <target>Prueba no superada en el paso %@.</target>
+        <target>La prueba ha fallado en el paso %@.</target>
         <note>server test failure</note>
       </trans-unit>
       <trans-unit id="Test server" xml:space="preserve">
@@ -6763,7 +6541,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
       </trans-unit>
       <trans-unit id="Tests failed!" xml:space="preserve">
         <source>Tests failed!</source>
-        <target>¡Pruebas no superadas!</target>
+        <target>¡Pruebas fallidas!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Thank you for installing SimpleX Chat!" xml:space="preserve">
@@ -6895,7 +6673,6 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
         <source>The uploaded database archive will be permanently removed from the servers.</source>
-        <target>El archivo de bases de datos subido será eliminado permanentemente de los servidores.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Themes" xml:space="preserve">
@@ -7025,16 +6802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Se te pedirá que completes la autenticación antes de activar esta función.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <target>Para grabación de voz, por favor concede el permiso para usar el micrófono.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <target>Para grabación de vídeo, por favor concede el permiso para usar la cámara.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Para grabar el mensaje de voz concede permiso para usar el micrófono.</target>
@@ -7188,7 +6955,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>¡Servidores desconocidos!</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7302,11 +7069,6 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Usar hosts .onion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <target>Usar proxy SOCKS</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>¿Usar servidores SimpleX Chat?</target>
@@ -7372,16 +7134,16 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Usa la aplicación con una sola mano.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Perfil de usuario</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Selección de usuarios</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Nombre de usuario</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Usar servidores SimpleX Chat.</target>
@@ -7615,7 +7377,7 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Sin Tor o VPN, tu dirección IP será visible para estos servidores XFTP: %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7642,6 +7404,11 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
         <target>Servidor XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Tú</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>**No debes** usar la misma base de datos en dos dispositivos.</target>
@@ -7993,7 +7760,6 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
         <source>Your chat preferences</source>
-        <target>Tus preferencias de chat</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -8003,7 +7769,6 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
         <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <target>Tu conexión ha sido trasladada a %@ pero ha ocurrido un error inesperado al redirigirte al perfil.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -8021,11 +7786,6 @@ Repeat connection request?</source>
         <target>Tus contactos permanecerán conectados.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <target>Tus credenciales podrían ser enviadas sin cifrar.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>La base de datos actual será ELIMINADA y SUSTITUIDA por la importada.</target>
@@ -8063,7 +7823,6 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
-        <target>Tu perfil ha sido modificado. Si lo guardas la actualización será enviada a todos tus contactos.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
@@ -8083,7 +7842,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="Your server address" xml:space="preserve">
         <source>Your server address</source>
-        <target>Dirección del servidor</target>
+        <target>Dirección de tu servidor</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your settings" xml:space="preserve">
@@ -8795,7 +8554,7 @@ Repeat connection request?</source>
       </trans-unit>
       <trans-unit id="removed profile picture" xml:space="preserve">
         <source>removed profile picture</source>
-        <target>ha eliminado la imagen del perfil</target>
+        <target>imagen de perfil eliminada</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="removed you" xml:space="preserve">
@@ -8859,7 +8618,7 @@ last received msg: %2$@</source>
       </trans-unit>
       <trans-unit id="set new profile picture" xml:space="preserve">
         <source>set new profile picture</source>
-        <target>tiene nueva imagen del perfil</target>
+        <target>nueva imagen de perfil</target>
         <note>profile update event chat item</note>
       </trans-unit>
       <trans-unit id="standard end-to-end encryption" xml:space="preserve">
@@ -9207,7 +8966,7 @@ last received msg: %2$@</source>
       </trans-unit>
       <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
         <source>Database passphrase is different from saved in the keychain.</source>
-        <target>La contraseña de la base de datos es diferente a la almacenada en keychain.</target>
+        <target>La contraseña de la base de datos es distinta a la almacenada en keychain.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">

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

@@ -156,31 +156,11 @@
         <target>%d päivää</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d tuntia</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -710,7 +690,7 @@
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -892,10 +872,6 @@
         <target>Sovelluksen pääsykoodi korvataan itsetuhoutuvalla pääsykoodilla.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Sovellusversio</target>
@@ -1022,18 +998,10 @@
         <target>Virheellinen viestin tarkiste</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Parempia viestejä</target>
@@ -1043,18 +1011,6 @@
         <source>Better networking</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <note>No comment provided by engineer.</note>
@@ -1190,7 +1146,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Tiedostoa ei voi vastaanottaa</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1315,11 +1271,6 @@
         <source>Chat preferences were changed.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Käyttäjäprofiili</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <note>No comment provided by engineer.</note>
@@ -1796,10 +1747,6 @@ This is your own one-time link!</source>
         <target>Mukautettu aika</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <note>No comment provided by engineer.</note>
@@ -2086,10 +2033,6 @@ This is your own one-time link!</source>
         <target>Poista vanha tietokanta?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Poistetaanko odottava yhteys?</target>
@@ -2321,10 +2264,6 @@ This is your own one-time link!</source>
         <source>Do not send history to new members.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Älä luo osoitetta</target>
@@ -2347,8 +2286,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2363,10 +2301,6 @@ This is your own one-time link!</source>
         <target>Lataa tiedosto</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <note>No comment provided by engineer.</note>
@@ -2770,7 +2704,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Virhe tiedoston vastaanottamisessa</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -2863,7 +2797,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Virhe profiilin vaihdossa!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -2906,7 +2840,8 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Virhe: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -2987,11 +2922,6 @@ This is your own one-time link!</source>
         <source>File error</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3118,26 +3048,10 @@ This is your own one-time link!</source>
         <source>Forward</source>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <note>No comment provided by engineer.</note>
@@ -3146,10 +3060,6 @@ This is your own one-time link!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -3428,10 +3338,6 @@ Error: %2$@</source>
         <target>ICE-palvelimet (yksi per rivi)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Jos et voi tavata henkilökohtaisesti, näytä QR-koodi videopuhelussa tai jaa linkki.</target>
@@ -3504,11 +3410,6 @@ Error: %2$@</source>
         <source>Importing archive</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <note>No comment provided by engineer.</note>
@@ -4091,10 +3992,6 @@ This is your link for group %@!</source>
         <source>Messages sent</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <note>No comment provided by engineer.</note>
@@ -4237,14 +4134,6 @@ This is your link for group %@!</source>
         <target>Uusi pääsykoodi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <note>No comment provided by engineer.</note>
@@ -4358,14 +4247,6 @@ This is your link for group %@!</source>
         <source>No network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Ei lupaa ääniviestin tallentamiseen</target>
@@ -4384,10 +4265,6 @@ This is your link for group %@!</source>
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Ilmoitukset</target>
@@ -4419,7 +4296,7 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4598,11 +4475,6 @@ Edellyttää VPN:n sallimista.</target>
         <source>Other %@ servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING-määrä</target>
@@ -4638,10 +4510,6 @@ Edellyttää VPN:n sallimista.</target>
         <target>Pääsykoodi asetettu!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Salasana näytettäväksi</target>
@@ -4778,10 +4646,6 @@ Error: %@</source>
         <target>Puolalainen käyttöliittymä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Palvelimen osoitteen varmenteen sormenjälki on mahdollisesti virheellinen</target>
@@ -4955,10 +4819,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Proxied servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Push-ilmoitukset</target>
@@ -5336,10 +5196,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <note>No comment provided by engineer.</note>
@@ -5444,10 +5300,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Saved message</source>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <note>No comment provided by engineer.</note>
@@ -5635,7 +5487,7 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Lähettäjä peruutti tiedoston siirron.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -5727,10 +5579,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Sent via proxy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <note>No comment provided by engineer.</note>
@@ -6007,10 +5855,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>SimpleX-kertakutsu</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <note>No comment provided by engineer.</note>
@@ -6170,14 +6014,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>SimpleX Chat tuki</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Järjestelmä</target>
@@ -6519,14 +6355,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus otetaan käyttöön.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Jos haluat nauhoittaa ääniviestin, anna lupa käyttää mikrofonia.</target>
@@ -6668,7 +6496,7 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
       </trans-unit>
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6773,10 +6601,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <target>Käytä .onion-isäntiä</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Käytä SimpleX Chat palvelimia?</target>
@@ -6836,12 +6660,13 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="User selection" xml:space="preserve">
-        <source>User selection</source>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Käyttäjäprofiili</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
+      <trans-unit id="User selection" xml:space="preserve">
+        <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
@@ -7056,7 +6881,7 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
       </trans-unit>
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7080,6 +6905,11 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Sinä</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <note>No comment provided by engineer.</note>
@@ -7433,10 +7263,6 @@ Repeat connection request?</source>
         <target>Kontaktisi pysyvät yhdistettyinä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Nykyinen keskustelut-tietokantasi poistetaan ja korvataan tuodulla tietokannalla.</target>

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

@@ -161,31 +161,11 @@
         <target>%d jours</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d heures</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -747,7 +727,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>Tous les profiles</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -939,10 +919,6 @@
         <target>Le code d'accès de l'application est remplacé par un code d'autodestruction.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Version de l'app</target>
@@ -1077,19 +1053,11 @@
         <target>Mauvais hash de message</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Des groupes plus performants</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Meilleurs messages</target>
@@ -1100,18 +1068,6 @@
         <target>Meilleure gestion de réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Noir</target>
@@ -1265,7 +1221,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Impossible de recevoir le fichier</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1397,11 +1353,6 @@
         <source>Chat preferences were changed.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Profil d'utilisateur</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Thème de chat</target>
@@ -1930,10 +1881,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Délai personnalisé</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Personnaliser le thème</target>
@@ -2228,10 +2175,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Supprimer l'ancienne base de données ?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Supprimer la connexion en attente ?</target>
@@ -2482,10 +2425,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Ne pas envoyer d'historique aux nouveaux membres.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Ne pas créer d'adresse</target>
@@ -2509,8 +2448,7 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Télécharger</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2527,10 +2465,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Télécharger le fichier</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Téléchargé</target>
@@ -2956,7 +2890,7 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Erreur lors de la réception du fichier</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3055,7 +2989,7 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Erreur lors du changement de profil !</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3100,7 +3034,8 @@ Il s'agit de votre propre lien unique !</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Erreur : %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3187,11 +3122,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Erreur de fichier</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Fichier introuvable - le fichier a probablement été supprimé ou annulé.</target>
@@ -3327,27 +3257,11 @@ Il s'agit de votre propre lien unique !</target>
         <target>Transférer</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Transférer et sauvegarder des messages</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Transféré</target>
@@ -3358,10 +3272,6 @@ Il s'agit de votre propre lien unique !</target>
         <target>Transféré depuis</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>Le serveur de redirection %@ n'a pas réussi à se connecter au serveur de destination %@. Veuillez réessayer plus tard.</target>
@@ -3656,10 +3566,6 @@ Erreur : %2$@</target>
         <target>Serveurs ICE (un par ligne)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Si vous ne pouvez pas vous rencontrer en personne, montrez le code QR lors d'un appel vidéo ou partagez le lien.</target>
@@ -3735,11 +3641,6 @@ Erreur : %2$@</target>
         <target>Importation de l'archive</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Amélioration de la transmission des messages</target>
@@ -4364,10 +4265,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Messages envoyés</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Les messages, fichiers et appels sont protégés par un chiffrement **de bout en bout** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.</target>
@@ -4523,14 +4420,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Nouveau code d'accès</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Nouveau chat</target>
@@ -4651,14 +4540,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Pas de connexion au réseau</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Pas l'autorisation d'enregistrer un message vocal</target>
@@ -4679,10 +4560,6 @@ Voici votre lien pour le groupe %@ !</target>
         <target>Aucune sélection</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Notifications</target>
@@ -4715,7 +4592,7 @@ Voici votre lien pour le groupe %@ !</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4906,11 +4783,6 @@ Nécessite l'activation d'un VPN.</target>
         <target>Autres serveurs %@</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Nombre de PING</target>
@@ -4946,10 +4818,6 @@ Nécessite l'activation d'un VPN.</target>
         <target>Code d'accès défini !</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Mot de passe à entrer</target>
@@ -5099,10 +4967,6 @@ Erreur : %@</target>
         <target>Interface en polonais</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Il est possible que l'empreinte du certificat dans l'adresse du serveur soit incorrecte</target>
@@ -5290,10 +5154,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Serveurs routés via des proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Notifications push</target>
@@ -5699,10 +5559,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Serveur SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Réception de fichiers en toute sécurité</target>
@@ -5813,10 +5669,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Message enregistré</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Échelle</target>
@@ -6019,7 +5871,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>L'expéditeur a annulé le transfert de fichiers.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6116,10 +5968,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Envoyé via le proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Adresse du serveur</target>
@@ -6418,10 +6266,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Invitation unique SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Mode incognito simplifié</target>
@@ -6596,14 +6440,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
         <target>Supporter SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Système</target>
@@ -6966,14 +6802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Vous serez invité à confirmer l'authentification avant que cette fonction ne soit activée.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Pour enregistrer un message vocal, veuillez accorder la permission d'utiliser le microphone.</target>
@@ -7127,7 +6955,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>Serveurs inconnus !</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7241,10 +7069,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser les hôtes .onions</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Utiliser les serveurs SimpleX Chat ?</target>
@@ -7310,15 +7134,16 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Utiliser l'application d'une main.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Profil d'utilisateur</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Sélection de l'utilisateur</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Vous utilisez les serveurs SimpleX.</target>
@@ -7552,7 +7377,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Sans Tor ni VPN, votre adresse IP sera visible par ces relais XFTP : %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7579,6 +7404,11 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
         <target>Serveur XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Vous</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>Vous **ne devez pas** utiliser la même base de données sur deux appareils.</target>
@@ -7956,10 +7786,6 @@ Répéter la demande de connexion ?</target>
         <target>Vos contacts resteront connectés.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Votre base de données de chat actuelle va être SUPPRIMEE et REMPLACEE par celle importée.</target>

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

@@ -139,7 +139,6 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -162,36 +161,11 @@
         <target>%d giorni</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <target>%d file è/sono ancora in scaricamento.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <target>%d file ha/hanno fallito lo scaricamento.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <target>%d file è/sono stato/i eliminato/i.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <target>%d file non è/sono stato/i scaricato/i.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d ore</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <target>%d messaggi non inoltrati</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -753,7 +727,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>Tutti gli profili</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -945,11 +919,6 @@
         <target>Il codice di accesso dell'app viene sostituito da un codice di autodistruzione.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <target>Sessione dell'app</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Versione dell'app</target>
@@ -1057,7 +1026,6 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
-        <target>Accetta automaticamente le impostazioni</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1085,21 +1053,11 @@
         <target>Hash del messaggio errato</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <target>Chiamate migliorate</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Gruppi migliorati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <target>Date dei messaggi migliorate.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Messaggi migliorati</target>
@@ -1110,21 +1068,6 @@
         <target>Rete migliorata</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <target>Notifiche migliorate</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <target>Sicurezza migliorata ✅</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <target>Esperienza utente migliorata</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Nero</target>
@@ -1278,7 +1221,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Impossibile ricevere il file</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1408,14 +1351,8 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
-        <target>Le preferenze della chat sono state cambiate.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Profilo utente</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Tema della chat</target>
@@ -1817,7 +1754,6 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
         <source>Corner</source>
-        <target>Angolo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1945,11 +1881,6 @@ Questo è il tuo link una tantum!</target>
         <target>Tempo personalizzato</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <target>Forma dei messaggi personalizzabile.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Personalizza il tema</target>
@@ -2244,11 +2175,6 @@ Questo è il tuo link una tantum!</target>
         <target>Eliminare il database vecchio?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <target>Elimina o modera fino a 200 messaggi.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Eliminare la connessione in attesa?</target>
@@ -2499,11 +2425,6 @@ Questo è il tuo link una tantum!</target>
         <target>Non inviare la cronologia ai nuovi membri.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <target>Non usare credenziali con proxy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Non creare un indirizzo</target>
@@ -2527,8 +2448,7 @@ Questo è il tuo link una tantum!</target>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Scarica</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2545,11 +2465,6 @@ Questo è il tuo link una tantum!</target>
         <target>Scarica file</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <target>Scarica i file</target>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Scaricato</target>
@@ -2827,7 +2742,6 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
-        <target>Errore nel cambio di profilo di connessione</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
@@ -2842,7 +2756,6 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
-        <target>Errore nel passaggio a incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2967,7 +2880,6 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
-        <target>Errore nella migrazione delle impostazioni</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
@@ -2978,7 +2890,7 @@ Questo è il tuo link una tantum!</target>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Errore nella ricezione del file</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3072,13 +2984,12 @@ Questo è il tuo link una tantum!</target>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
-        <target>Errore nel cambio di profilo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Errore nel cambio di profilo!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3123,7 +3034,8 @@ Questo è il tuo link una tantum!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Errore: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3210,13 +3122,6 @@ Questo è il tuo link una tantum!</target>
         <target>Errore del file</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <target>Errori di file:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>File non trovato - probabilmente è stato eliminato o annullato.</target>
@@ -3352,31 +3257,11 @@ Questo è il tuo link una tantum!</target>
         <target>Inoltra</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <target>Inoltrare %d messaggio/i?</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Inoltra e salva i messaggi</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <target>Inoltra i messaggi</target>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <target>Inoltrare i messaggi senza file?</target>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <target>Inoltra fino a 20 messaggi alla volta.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Inoltrato</target>
@@ -3387,11 +3272,6 @@ Questo è il tuo link una tantum!</target>
         <target>Inoltrato da</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <target>Inoltro di %lld messaggi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>Il server di inoltro %@ non è riuscito a connettersi al server di destinazione %@. Riprova più tardi.</target>
@@ -3686,11 +3566,6 @@ Errore: %2$@</target>
         <target>Server ICE (uno per riga)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <target>Indirizzo IP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Se non potete incontrarvi di persona, mostra il codice QR in una videochiamata o condividi il link.</target>
@@ -3766,13 +3641,6 @@ Errore: %2$@</target>
         <target>Importazione archivio</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <target>Consegna migliorata, utilizzo di traffico ridotto.
-Altri miglioramenti sono in arrivo!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Consegna dei messaggi migliorata</target>
@@ -4345,7 +4213,6 @@ Questo è il tuo link per il gruppo %@!</target>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
-        <target>Forma del messaggio</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4398,11 +4265,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Messaggi inviati</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <target>I messaggi sono stati eliminati dopo che li hai selezionati.</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>I messaggi, i file e le chiamate sono protetti da **crittografia end-to-end** con perfect forward secrecy, ripudio e recupero da intrusione.</target>
@@ -4558,16 +4420,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nuovo codice di accesso</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <target>Le nuove credenziali SOCKS verranno usate ogni volta che avvii l'app.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <target>Le nuove credenziali SOCKS verranno usate per ogni server.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Nuova chat</target>
@@ -4688,16 +4540,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nessuna connessione di rete</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <target>Nessuna autorizzazione per registrare l'audio</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <target>Nessuna autorizzazione per registrare il video</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Nessuna autorizzazione per registrare messaggi vocali</target>
@@ -4718,11 +4560,6 @@ Questo è il tuo link per il gruppo %@!</target>
         <target>Nessuna selezione</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <target>Niente da inoltrare!</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Notifiche</target>
@@ -4755,7 +4592,7 @@ Questo è il tuo link per il gruppo %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4946,13 +4783,6 @@ Richiede l'attivazione della VPN.</target>
         <target>Altri %@ server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <target>Altri errori di file:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Conteggio PING</target>
@@ -4988,11 +4818,6 @@ Richiede l'attivazione della VPN.</target>
         <target>Codice di accesso impostato!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <target>Password</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Password per mostrare</target>
@@ -5142,11 +4967,6 @@ Errore: %@</target>
         <target>Interfaccia polacca</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <target>Porta</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Probabilmente l'impronta del certificato nell'indirizzo del server è sbagliata</target>
@@ -5334,11 +5154,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Server via proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <target>Il proxy richiede una password</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Notifiche push</target>
@@ -5562,7 +5377,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Remove archive?" xml:space="preserve">
         <source>Remove archive?</source>
-        <target>Rimuovere l'archivio?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove image" xml:space="preserve">
@@ -5745,11 +5559,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Server SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <target>Proxy SOCKS</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Ricevi i file in sicurezza</target>
@@ -5838,7 +5647,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
-        <target>Salvare il profilo?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -5861,11 +5669,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Messaggio salvato</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <target>Salvataggio di %lld messaggi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Scala</target>
@@ -5948,7 +5751,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Select chat profile" xml:space="preserve">
         <source>Select chat profile</source>
-        <target>Seleziona il profilo di chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
@@ -6069,7 +5871,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Il mittente ha annullato il trasferimento del file.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6166,11 +5968,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Inviato via proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <target>Server</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Indirizzo server</target>
@@ -6293,7 +6090,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Settings were changed." xml:space="preserve">
         <source>Settings were changed.</source>
-        <target>Le impostazioni sono state cambiate.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
@@ -6333,7 +6129,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
         <source>Share profile</source>
-        <target>Condividi il profilo</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6471,11 +6266,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Invito SimpleX una tantum</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Protocolli di SimpleX esaminati da Trail of Bits.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Modalità incognito semplificata</target>
@@ -6508,7 +6298,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Some app settings were not migrated." xml:space="preserve">
         <source>Some app settings were not migrated.</source>
-        <target>Alcune impostazioni dell'app non sono state migrate.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
@@ -6651,16 +6440,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
         <target>Supporta SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <target>Cambia tra audio e video durante la chiamata.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Cambia profilo di chat per inviti una tantum.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Sistema</target>
@@ -6698,7 +6477,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
       </trans-unit>
       <trans-unit id="Tail" xml:space="preserve">
         <source>Tail</source>
-        <target>Coda</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
@@ -6895,7 +6673,6 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
         <source>The uploaded database archive will be permanently removed from the servers.</source>
-        <target>L'archivio del database caricato verrà rimosso definitivamente dai server.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Themes" xml:space="preserve">
@@ -7025,16 +6802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzionalità.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <target>Per registrare l'audio, concedi l'autorizzazione di usare il microfono.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <target>Per registrare il video, concedi l'autorizzazione di usare la fotocamera.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Per registrare un messaggio vocale, concedi l'autorizzazione all'uso del microfono.</target>
@@ -7188,7 +6955,7 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>Server sconosciuti!</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7302,11 +7069,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa gli host .onion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <target>Usa proxy SOCKS</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Usare i server di SimpleX Chat?</target>
@@ -7372,16 +7134,16 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Usa l'app con una mano sola.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Profilo utente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Selezione utente</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Nome utente</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Utilizzo dei server SimpleX Chat.</target>
@@ -7615,7 +7377,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Senza Tor o VPN, il tuo indirizzo IP sarà visibile a questi relay XFTP: %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7642,6 +7404,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
         <target>Server XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Tu</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>**Non devi** usare lo stesso database su due dispositivi.</target>
@@ -7993,7 +7760,6 @@ Ripetere la richiesta di connessione?</target>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
         <source>Your chat preferences</source>
-        <target>Le tue preferenze della chat</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -8003,7 +7769,6 @@ Ripetere la richiesta di connessione?</target>
       </trans-unit>
       <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
         <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <target>La tua connessione è stata spostata a %@, ma si è verificato un errore imprevisto durante il reindirizzamento al profilo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -8021,11 +7786,6 @@ Ripetere la richiesta di connessione?</target>
         <target>I tuoi contatti resteranno connessi.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <target>Le credenziali potrebbero essere inviate in chiaro.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Il tuo attuale database della chat verrà ELIMINATO e SOSTITUITO con quello importato.</target>
@@ -8063,7 +7823,6 @@ Ripetere la richiesta di connessione?</target>
       </trans-unit>
       <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
-        <target>Il tuo profilo è stato cambiato. Se lo salvi, il profilo aggiornato verrà inviato a tutti i tuoi contatti.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
@@ -8243,7 +8002,7 @@ Ripetere la richiesta di connessione?</target>
       </trans-unit>
       <trans-unit id="changed your role to %@" xml:space="preserve">
         <source>changed your role to %@</source>
-        <target>ha cambiato il tuo ruolo in %@</target>
+        <target>cambiato il tuo ruolo in %@</target>
         <note>rcv group event chat item</note>
       </trans-unit>
       <trans-unit id="changing address for %@…" xml:space="preserve">

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

@@ -161,31 +161,11 @@
         <target>%d 日</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d 時</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d 分</target>
@@ -727,7 +707,7 @@
       </trans-unit>
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -915,10 +895,6 @@
         <target>アプリのパスコードは自己破壊パスコードに置き換えられます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>アプリのバージョン</target>
@@ -1045,18 +1021,10 @@
         <target>メッセージのハッシュ値問題</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>より良いメッセージ</target>
@@ -1066,18 +1034,6 @@
         <source>Better networking</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <note>No comment provided by engineer.</note>
@@ -1214,7 +1170,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>ファイル受信ができません</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1339,11 +1295,6 @@
         <source>Chat preferences were changed.</source>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>ユーザープロフィール</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <note>No comment provided by engineer.</note>
@@ -1820,10 +1771,6 @@ This is your own one-time link!</source>
         <target>カスタム時間</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <note>No comment provided by engineer.</note>
@@ -2110,10 +2057,6 @@ This is your own one-time link!</source>
         <target>古いデータベースを削除しますか？</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>接続待ちの接続を削除しますか？</target>
@@ -2345,10 +2288,6 @@ This is your own one-time link!</source>
         <source>Do not send history to new members.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>アドレスを作成しないでください</target>
@@ -2371,8 +2310,7 @@ This is your own one-time link!</source>
       </trans-unit>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2387,10 +2325,6 @@ This is your own one-time link!</source>
         <target>ファイルをダウンロード</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <note>No comment provided by engineer.</note>
@@ -2795,7 +2729,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>ファイル受信にエラー発生</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -2888,7 +2822,7 @@ This is your own one-time link!</source>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>プロフィール切り替えにエラー発生！</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -2931,7 +2865,8 @@ This is your own one-time link!</source>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>エラー : %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3012,11 +2947,6 @@ This is your own one-time link!</source>
         <source>File error</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <note>file error text</note>
@@ -3143,26 +3073,10 @@ This is your own one-time link!</source>
         <source>Forward</source>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <note>No comment provided by engineer.</note>
@@ -3171,10 +3085,6 @@ This is your own one-time link!</source>
         <source>Forwarded from</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <note>No comment provided by engineer.</note>
@@ -3453,10 +3363,6 @@ Error: %2$@</source>
         <target>ICEサーバ (1行に1サーバ)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>直接会えない場合は、ビデオ通話で QR コードを表示するか、リンクを共有してください。</target>
@@ -3529,11 +3435,6 @@ Error: %2$@</source>
         <source>Importing archive</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <note>No comment provided by engineer.</note>
@@ -4115,18 +4016,12 @@ This is your link for group %@!</source>
         <source>Messages sent</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**エンドツーエンドの暗号化**によって保護されます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**耐量子E2E暗号化**によって保護されます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Migrate device" xml:space="preserve">
@@ -4263,14 +4158,6 @@ This is your link for group %@!</source>
         <target>新しいパスコード</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <note>No comment provided by engineer.</note>
@@ -4385,14 +4272,6 @@ This is your link for group %@!</source>
         <source>No network connection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>音声メッセージを録音する権限がありません</target>
@@ -4411,10 +4290,6 @@ This is your link for group %@!</source>
         <source>Nothing selected</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>通知</target>
@@ -4446,7 +4321,7 @@ This is your link for group %@!</source>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>OK</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4626,11 +4501,6 @@ VPN を有効にする必要があります。</target>
         <source>Other %@ servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING回数</target>
@@ -4666,10 +4536,6 @@ VPN を有効にする必要があります。</target>
         <target>パスコードを設定しました！</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>パスワードを表示する</target>
@@ -4806,10 +4672,6 @@ Error: %@</source>
         <target>ポーランド語UI</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>サーバアドレスの証明証IDが正しくないかもしれません</target>
@@ -4983,10 +4845,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Proxied servers</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>プッシュ通知</target>
@@ -5363,10 +5221,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>SMP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <note>No comment provided by engineer.</note>
@@ -5471,10 +5325,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Saved message</source>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <note>No comment provided by engineer.</note>
@@ -5661,7 +5511,7 @@ Enable in *Network &amp; servers* settings.</source>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>送信者がファイル転送をキャンセルしました。</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -5747,10 +5597,6 @@ Enable in *Network &amp; servers* settings.</source>
         <source>Sent via proxy</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <note>No comment provided by engineer.</note>
@@ -6027,10 +5873,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>SimpleX使い捨て招待リンク</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>シークレットモードの簡素化</target>
@@ -6191,14 +6033,6 @@ Enable in *Network &amp; servers* settings.</source>
         <target>Simplex Chatを支援</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>システム</target>
@@ -6539,14 +6373,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 オンにするには、認証ステップが行われます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>音声メッセージを録音する場合は、マイクの使用を許可してください。</target>
@@ -6688,7 +6514,7 @@ You will be prompted to complete authentication before this feature is enabled.<
       </trans-unit>
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6793,10 +6619,6 @@ To connect, please ask your contact to create another connection link and check
         <target>.onionホストを使う</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>SimpleX チャット サーバーを使用しますか?</target>
@@ -6856,12 +6678,13 @@ To connect, please ask your contact to create another connection link and check
         <source>Use the app with one hand.</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="User selection" xml:space="preserve">
-        <source>User selection</source>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>ユーザープロフィール</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
+      <trans-unit id="User selection" xml:space="preserve">
+        <source>User selection</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
@@ -7076,7 +6899,7 @@ To connect, please ask your contact to create another connection link and check
       </trans-unit>
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7100,6 +6923,11 @@ To connect, please ask your contact to create another connection link and check
         <source>XFTP server</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>あなた</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <note>No comment provided by engineer.</note>
@@ -7453,10 +7281,6 @@ Repeat connection request?</source>
         <target>連絡先は接続されたままになります。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>現在のチャット データベースは削除され、インポートされたデータベースに置き換えられます。</target>

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

@@ -139,7 +139,6 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -162,36 +161,11 @@
         <target>%d dagen</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <target>%d bestand(en) worden nog gedownload.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <target>%d bestand(en) konden niet worden gedownload.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <target>%d bestand(en) zijn verwijderd.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <target>%d bestand(en) zijn niet gedownload.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d uren</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <target>%d berichten niet doorgestuurd</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -542,7 +516,7 @@
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
         <source>A separate TCP connection will be used **for each chat profile you have in the app**.</source>
-        <target>Er wordt een aparte TCP-verbinding gebruikt **voor elk chatprofiel dat je in de app hebt**.</target>
+        <target>Er wordt een aparte TCP-verbinding gebruikt **voor elk chat profiel dat je in de app hebt**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve">
@@ -753,7 +727,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>Alle profielen</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -945,11 +919,6 @@
         <target>De app-toegangscode wordt vervangen door een zelfvernietigings wachtwoord.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <target>Appsessie</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>App versie</target>
@@ -1057,7 +1026,6 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
-        <target>Instellingen automatisch accepteren</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1085,21 +1053,11 @@
         <target>Onjuiste bericht hash</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <target>Betere gesprekken</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Betere groepen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <target>Betere datums voor berichten.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Betere berichten</target>
@@ -1110,21 +1068,6 @@
         <target>Beter netwerk</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <target>Betere meldingen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <target>Betere beveiliging ✅</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <target>Betere gebruikerservaring</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Zwart</target>
@@ -1207,7 +1150,7 @@
       </trans-unit>
       <trans-unit id="By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA)." xml:space="preserve">
         <source>By chat profile (default) or [by connection](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</source>
-        <target>Via chatprofiel (standaard) of [via verbinding](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
+        <target>Via chat profiel (standaard) of [via verbinding](https://simplex.chat/blog/20230204-simplex-chat-v4-5-user-chat-profiles.html#transport-isolation) (BETA).</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Call already ended!" xml:space="preserve">
@@ -1278,7 +1221,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Kan bestand niet ontvangen</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1408,14 +1351,8 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
-        <target>Chatvoorkeuren zijn gewijzigd.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Gebruikers profiel</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Chat thema</target>
@@ -1423,7 +1360,7 @@
       </trans-unit>
       <trans-unit id="Chats" xml:space="preserve">
         <source>Chats</source>
-        <target>Chats</target>
+        <target>Gesprekken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Check server address and try again." xml:space="preserve">
@@ -1513,7 +1450,7 @@
       </trans-unit>
       <trans-unit id="Completed" xml:space="preserve">
         <source>Completed</source>
-        <target>Voltooid</target>
+        <target>voltooid</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Configure ICE servers" xml:space="preserve">
@@ -1817,7 +1754,6 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
         <source>Corner</source>
-        <target>Hoek</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1945,11 +1881,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Aangepaste tijd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <target>Aanpasbare berichtvorm.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Thema aanpassen</target>
@@ -2036,7 +1967,7 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
         <source>Database passphrase is required to open chat.</source>
-        <target>Database wachtwoord is vereist om je chats te openen.</target>
+        <target>Database wachtwoord is vereist om je gesprekken te openen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database upgrade" xml:space="preserve">
@@ -2131,12 +2062,12 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Delete chat profile" xml:space="preserve">
         <source>Delete chat profile</source>
-        <target>Chatprofiel verwijderen</target>
+        <target>Chat profiel verwijderen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete chat profile?" xml:space="preserve">
         <source>Delete chat profile?</source>
-        <target>Chatprofiel verwijderen?</target>
+        <target>Chat profiel verwijderen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete connection" xml:space="preserve">
@@ -2176,7 +2107,7 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Delete files for all chat profiles" xml:space="preserve">
         <source>Delete files for all chat profiles</source>
-        <target>Verwijder bestanden voor alle chatprofielen</target>
+        <target>Verwijder bestanden voor alle chat profielen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Delete for everyone" xml:space="preserve">
@@ -2244,11 +2175,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Oude database verwijderen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <target>Maximaal 200 berichten verwijderen of modereren.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Wachtende verbinding verwijderen?</target>
@@ -2499,11 +2425,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Stuur geen geschiedenis naar nieuwe leden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <target>Gebruik geen inloggegevens met proxy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Maak geen adres aan</target>
@@ -2527,8 +2448,7 @@ Dit is uw eigen eenmalige link!</target>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Downloaden</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2545,11 +2465,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Download bestand</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <target>‐Bestanden downloaden</target>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Gedownload</target>
@@ -2827,7 +2742,6 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
-        <target>Fout bij wijzigen van verbindingsprofiel</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
@@ -2842,7 +2756,6 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
-        <target>Fout bij het overschakelen naar incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2967,7 +2880,6 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
-        <target>Fout bij migreren van instellingen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
@@ -2978,7 +2890,7 @@ Dit is uw eigen eenmalige link!</target>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Fout bij ontvangen van bestand</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3072,13 +2984,12 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
-        <target>Fout bij wisselen van profiel</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Fout bij wisselen van profiel!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3123,7 +3034,8 @@ Dit is uw eigen eenmalige link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Fout: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3210,13 +3122,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Bestandsfout</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <target>Bestandsfouten:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Bestand niet gevonden - hoogstwaarschijnlijk is het bestand verwijderd of geannuleerd.</target>
@@ -3309,7 +3214,7 @@ Dit is uw eigen eenmalige link!</target>
       </trans-unit>
       <trans-unit id="Find chats faster" xml:space="preserve">
         <source>Find chats faster</source>
-        <target>Vind chats sneller</target>
+        <target>Vind gesprekken sneller</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Fix" xml:space="preserve">
@@ -3352,31 +3257,11 @@ Dit is uw eigen eenmalige link!</target>
         <target>Doorsturen</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <target>%d bericht(en) doorsturen?</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Berichten doorsturen en opslaan</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <target>Berichten doorsturen</target>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <target>Berichten doorsturen zonder bestanden?</target>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <target>Stuur maximaal 20 berichten tegelijk door.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Doorgestuurd</target>
@@ -3387,11 +3272,6 @@ Dit is uw eigen eenmalige link!</target>
         <target>Doorgestuurd vanuit</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <target>%lld berichten doorsturen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>De doorstuurserver %@ kon geen verbinding maken met de bestemmingsserver %@. Probeer het later opnieuw.</target>
@@ -3613,7 +3493,7 @@ Fout: %2$@</target>
       </trans-unit>
       <trans-unit id="Hidden chat profiles" xml:space="preserve">
         <source>Hidden chat profiles</source>
-        <target>Verborgen chatprofielen</target>
+        <target>Verborgen chat profielen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Hidden profile password" xml:space="preserve">
@@ -3686,11 +3566,6 @@ Fout: %2$@</target>
         <target>ICE servers (één per lijn)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <target>IP-adres</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Als je elkaar niet persoonlijk kunt ontmoeten, laat dan de QR-code zien in een videogesprek of deel de link.</target>
@@ -3766,13 +3641,6 @@ Fout: %2$@</target>
         <target>Archief importeren</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <target>Verbeterde levering, minder data gebruik.
-Binnenkort meer verbeteringen!</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Verbeterde berichtbezorging</target>
@@ -3977,7 +3845,7 @@ Binnenkort meer verbeteringen!</target>
       </trans-unit>
       <trans-unit id="It allows having many anonymous connections without any shared data between them in a single chat profile." xml:space="preserve">
         <source>It allows having many anonymous connections without any shared data between them in a single chat profile.</source>
-        <target>Het maakt het mogelijk om veel anonieme verbindingen te hebben zonder enige gedeelde gegevens tussen hen in een enkel chatprofiel.</target>
+        <target>Het maakt het mogelijk om veel anonieme verbindingen te hebben zonder enige gedeelde gegevens tussen hen in een enkel chat profiel.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="It can happen when you or your connection used the old database backup." xml:space="preserve">
@@ -4345,7 +4213,6 @@ Dit is jouw link voor groep %@!</target>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
-        <target>Berichtvorm</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4398,11 +4265,6 @@ Dit is jouw link voor groep %@!</target>
         <target>Berichten verzonden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <target>Berichten zijn verwijderd nadat u ze had geselecteerd.</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Berichten, bestanden en oproepen worden beschermd door **end-to-end codering** met perfecte voorwaartse geheimhouding, afwijzing en inbraakherstel.</target>
@@ -4505,7 +4367,7 @@ Dit is jouw link voor groep %@!</target>
       </trans-unit>
       <trans-unit id="Multiple chat profiles" xml:space="preserve">
         <source>Multiple chat profiles</source>
-        <target>Meerdere chatprofielen</target>
+        <target>Meerdere chat profielen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Mute" xml:space="preserve">
@@ -4558,16 +4420,6 @@ Dit is jouw link voor groep %@!</target>
         <target>Nieuwe toegangscode</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <target>Elke keer dat u de app start, worden er nieuwe SOCKS-inloggegevens gebruikt.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <target>Voor elke server worden nieuwe SOCKS-inloggegevens gebruikt.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Nieuw gesprek</target>
@@ -4665,7 +4517,7 @@ Dit is jouw link voor groep %@!</target>
       </trans-unit>
       <trans-unit id="No filtered chats" xml:space="preserve">
         <source>No filtered chats</source>
-        <target>Geen gefilterde chats</target>
+        <target>Geen gefilterde gesprekken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="No group!" xml:space="preserve">
@@ -4688,16 +4540,6 @@ Dit is jouw link voor groep %@!</target>
         <target>Geen netwerkverbinding</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <target>Geen toestemming om spraak op te nemen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <target>Geen toestemming om video op te nemen</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Geen toestemming om spraakbericht op te nemen</target>
@@ -4718,11 +4560,6 @@ Dit is jouw link voor groep %@!</target>
         <target>Niets geselecteerd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <target>Niets om door te sturen!</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Meldingen</target>
@@ -4755,7 +4592,7 @@ Dit is jouw link voor groep %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>OK</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4946,13 +4783,6 @@ Vereist het inschakelen van VPN.</target>
         <target>Andere %@ servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <target>Andere bestandsfouten:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>PING count</target>
@@ -4988,11 +4818,6 @@ Vereist het inschakelen van VPN.</target>
         <target>Toegangscode ingesteld!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <target>Wachtwoord</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Wachtwoord om weer te geven</target>
@@ -5050,7 +4875,7 @@ Vereist het inschakelen van VPN.</target>
       </trans-unit>
       <trans-unit id="Play from the chat list." xml:space="preserve">
         <source>Play from the chat list.</source>
-        <target>Afspelen via de chat lijst.</target>
+        <target>Afspelen via de gesprekken lijst.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please ask your contact to enable calls." xml:space="preserve">
@@ -5129,7 +4954,7 @@ Fout: %@</target>
       </trans-unit>
       <trans-unit id="Please store passphrase securely, you will NOT be able to access chat if you lose it." xml:space="preserve">
         <source>Please store passphrase securely, you will NOT be able to access chat if you lose it.</source>
-        <target>Sla het wachtwoord veilig op. Als u deze kwijtraakt, heeft u GEEN toegang tot de chats.</target>
+        <target>Sla het wachtwoord veilig op. Als u deze kwijtraakt, heeft u GEEN toegang tot de gesprekken.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Please store passphrase securely, you will NOT be able to change it if you lose it." xml:space="preserve">
@@ -5142,11 +4967,6 @@ Fout: %@</target>
         <target>Poolse interface</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <target>Poort</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Mogelijk is de certificaat vingerafdruk in het server adres onjuist</target>
@@ -5311,7 +5131,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Protect your chat profiles with a password!" xml:space="preserve">
         <source>Protect your chat profiles with a password!</source>
-        <target>Bescherm je chatprofielen met een wachtwoord!</target>
+        <target>Bescherm je chat profielen met een wachtwoord!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Protocol timeout" xml:space="preserve">
@@ -5334,11 +5154,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Proxied servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <target>Proxy vereist wachtwoord</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Push meldingen</target>
@@ -5562,7 +5377,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Remove archive?" xml:space="preserve">
         <source>Remove archive?</source>
-        <target>Archief verwijderen?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove image" xml:space="preserve">
@@ -5677,7 +5491,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Restart the app to create a new chat profile" xml:space="preserve">
         <source>Restart the app to create a new chat profile</source>
-        <target>Start de app opnieuw om een nieuw chatprofiel aan te maken</target>
+        <target>Start de app opnieuw om een nieuw chat profiel aan te maken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Restart the app to use imported chat database" xml:space="preserve">
@@ -5745,11 +5559,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>SMP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <target>SOCKS proxy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Veilig bestanden ontvangen</target>
@@ -5803,7 +5612,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Save passphrase and open chat" xml:space="preserve">
         <source>Save passphrase and open chat</source>
-        <target>Bewaar het wachtwoord en open je chats</target>
+        <target>Bewaar het wachtwoord en open je gesprekken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save passphrase in Keychain" xml:space="preserve">
@@ -5823,7 +5632,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Save servers" xml:space="preserve">
         <source>Save servers</source>
-        <target>Servers opslaan</target>
+        <target>Bewaar servers</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Save servers?" xml:space="preserve">
@@ -5838,7 +5647,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
-        <target>Uw profiel opslaan?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -5861,11 +5669,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Opgeslagen bericht</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <target>%lld berichten opslaan</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Schaal</target>
@@ -5948,7 +5751,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Select chat profile" xml:space="preserve">
         <source>Select chat profile</source>
-        <target>Selecteer chatprofiel</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
@@ -6069,7 +5871,7 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Afzender heeft bestandsoverdracht geannuleerd.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6166,11 +5968,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Verzonden via proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <target>Server</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Server adres</target>
@@ -6293,7 +6090,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Settings were changed." xml:space="preserve">
         <source>Settings were changed.</source>
-        <target>Instellingen zijn gewijzigd.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
@@ -6333,7 +6129,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
         <source>Share profile</source>
-        <target>Profiel delen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6471,11 +6266,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Eenmalige SimpleX uitnodiging</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>SimpleX-protocollen beoordeeld door Trail of Bits.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Vereenvoudigde incognitomodus</target>
@@ -6508,7 +6298,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Some app settings were not migrated." xml:space="preserve">
         <source>Some app settings were not migrated.</source>
-        <target>Sommige app-instellingen zijn niet gemigreerd.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
@@ -6633,17 +6422,17 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Subscribed" xml:space="preserve">
         <source>Subscribed</source>
-        <target>Subscribed</target>
+        <target>Ingeschreven</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Subscription errors" xml:space="preserve">
         <source>Subscription errors</source>
-        <target>Subscription fouten</target>
+        <target>Inschrijving fouten</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Subscriptions ignored" xml:space="preserve">
         <source>Subscriptions ignored</source>
-        <target>Subscriptions genegeerd</target>
+        <target>Inschrijvingen genegeerd</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Support SimpleX Chat" xml:space="preserve">
@@ -6651,16 +6440,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
         <target>Ondersteuning van SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <target>Wisselen tussen audio en video tijdens het gesprek.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Wijzig chatprofiel voor eenmalige uitnodigingen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>Systeem</target>
@@ -6698,7 +6477,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
       </trans-unit>
       <trans-unit id="Tail" xml:space="preserve">
         <source>Tail</source>
-        <target>Staart</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
@@ -6885,7 +6663,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
       </trans-unit>
       <trans-unit id="The servers for new connections of your current chat profile **%@**." xml:space="preserve">
         <source>The servers for new connections of your current chat profile **%@**.</source>
-        <target>De servers voor nieuwe verbindingen van uw huidige chatprofiel **%@**.</target>
+        <target>De servers voor nieuwe verbindingen van uw huidige chat profiel **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="The text you pasted is not a SimpleX link." xml:space="preserve">
@@ -6895,7 +6673,6 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
         <source>The uploaded database archive will be permanently removed from the servers.</source>
-        <target>Het geüploade databasearchief wordt permanent van de servers verwijderd.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Themes" xml:space="preserve">
@@ -6975,7 +6752,7 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
       </trans-unit>
       <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
         <source>This setting applies to messages in your current chat profile **%@**.</source>
-        <target>Deze instelling is van toepassing op berichten in je huidige chatprofiel **%@**.</target>
+        <target>Deze instelling is van toepassing op berichten in je huidige chat profiel **%@**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Title" xml:space="preserve">
@@ -7025,16 +6802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingeschakeld.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <target>Geef toestemming om de microfoon te gebruiken om spraak op te nemen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <target>Om video op te nemen, dient u toestemming te geven om de camera te gebruiken.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Geef toestemming om de microfoon te gebruiken om een spraakbericht op te nemen.</target>
@@ -7042,7 +6809,7 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
       </trans-unit>
       <trans-unit id="To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page." xml:space="preserve">
         <source>To reveal your hidden profile, enter a full password into a search field in **Your chat profiles** page.</source>
-        <target>Om uw verborgen profiel te onthullen, voert u een volledig wachtwoord in een zoek veld in op de pagina **Uw chatprofielen**.</target>
+        <target>Om uw verborgen profiel te onthullen, voert u een volledig wachtwoord in een zoek veld in op de pagina **Uw chat profielen**.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
@@ -7157,7 +6924,7 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
       </trans-unit>
       <trans-unit id="Unhide chat profile" xml:space="preserve">
         <source>Unhide chat profile</source>
-        <target>Chatprofiel zichtbaar maken</target>
+        <target>Chat profiel zichtbaar maken</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unhide profile" xml:space="preserve">
@@ -7188,7 +6955,7 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>Onbekende servers!</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7302,11 +7069,6 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Gebruik .onion-hosts</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <target>Gebruik SOCKS proxy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>SimpleX Chat servers gebruiken?</target>
@@ -7372,16 +7134,16 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>Gebruik de app met één hand.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Gebruikers profiel</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Gebruikersselectie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Gebruikersnaam</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>SimpleX Chat servers gebruiken.</target>
@@ -7615,7 +7377,7 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Zonder Tor of VPN zal uw IP-adres zichtbaar zijn voor deze XFTP-relays: %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7642,6 +7404,11 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
         <target>XFTP server</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Jij</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>U **mag** niet dezelfde database op twee apparaten gebruiken.</target>
@@ -7659,7 +7426,7 @@ Om verbinding te maken, vraagt u uw contact om een andere verbinding link te mak
       </trans-unit>
       <trans-unit id="You already have a chat profile with the same display name. Please choose another name." xml:space="preserve">
         <source>You already have a chat profile with the same display name. Please choose another name.</source>
-        <target>Je hebt al een chatprofiel met dezelfde weergave naam. Kies een andere naam.</target>
+        <target>Je hebt al een chat profiel met dezelfde weergave naam. Kies een andere naam.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="You are already connected to %@." xml:space="preserve">
@@ -7993,7 +7760,6 @@ Verbindingsverzoek herhalen?</target>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
         <source>Your chat preferences</source>
-        <target>Uw chat voorkeuren</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -8003,7 +7769,6 @@ Verbindingsverzoek herhalen?</target>
       </trans-unit>
       <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
         <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <target>Uw verbinding is verplaatst naar %@, maar er is een onverwachte fout opgetreden tijdens het omleiden naar het profiel.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -8021,11 +7786,6 @@ Verbindingsverzoek herhalen?</target>
         <target>Uw contacten blijven verbonden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <target>Uw inloggegevens worden mogelijk niet-versleuteld verzonden.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Uw huidige chat database wordt VERWIJDERD en VERVANGEN door de geïmporteerde.</target>
@@ -8063,7 +7823,6 @@ Verbindingsverzoek herhalen?</target>
       </trans-unit>
       <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
-        <target>Je profiel is gewijzigd. Als je het opslaat, wordt het bijgewerkte profiel naar al je contacten verzonden.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
@@ -9004,7 +8763,7 @@ laatst ontvangen bericht: %2$@</target>
       </trans-unit>
       <trans-unit id="you are observer" xml:space="preserve">
         <source>you are observer</source>
-        <target>je bent waarnemer</target>
+        <target>jij bent waarnemer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="you blocked %@" xml:space="preserve">
@@ -9034,7 +8793,7 @@ laatst ontvangen bericht: %2$@</target>
       </trans-unit>
       <trans-unit id="you left" xml:space="preserve">
         <source>you left</source>
-        <target>je bent vertrokken</target>
+        <target>jij bent vertrokken</target>
         <note>snd group event chat item</note>
       </trans-unit>
       <trans-unit id="you removed %@" xml:space="preserve">
@@ -9212,7 +8971,7 @@ laatst ontvangen bericht: %2$@</target>
       </trans-unit>
       <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
         <source>Database passphrase is required to open chat.</source>
-        <target>Database wachtwoord is vereist om je chats te openen.</target>
+        <target>Database wachtwoord is vereist om je gesprekken te openen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Database upgrade required" xml:space="preserve">

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

@@ -139,7 +139,6 @@
       </trans-unit>
       <trans-unit id="%@, %@" xml:space="preserve">
         <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
         <note>format for date separator in chat</note>
       </trans-unit>
       <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -162,36 +161,11 @@
         <target>%d dni</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
-        <source>%d file(s) are still being downloaded.</source>
-        <target>%d plik(ów) jest dalej pobieranych.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
-        <source>%d file(s) failed to download.</source>
-        <target>%d plik(ów) nie udało się pobrać.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
-        <source>%d file(s) were deleted.</source>
-        <target>%d plik(ów) zostało usuniętych.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
-        <source>%d file(s) were not downloaded.</source>
-        <target>%d plik(ów) nie zostało pobranych.</target>
-        <note>forward confirmation reason</note>
-      </trans-unit>
       <trans-unit id="%d hours" xml:space="preserve">
         <source>%d hours</source>
         <target>%d godzin</target>
         <note>time interval</note>
       </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve">
-        <source>%d messages not forwarded</source>
-        <target>%d wiadomości nie przekazanych</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="%d min" xml:space="preserve">
         <source>%d min</source>
         <target>%d min</target>
@@ -753,7 +727,7 @@
       <trans-unit id="All profiles" xml:space="preserve">
         <source>All profiles</source>
         <target>Wszystkie profile</target>
-        <note>profile dropdown</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="All your contacts will remain connected." xml:space="preserve">
         <source>All your contacts will remain connected.</source>
@@ -945,11 +919,6 @@
         <target>Pin aplikacji został zastąpiony pinem samozniszczenia.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="App session" xml:space="preserve">
-        <source>App session</source>
-        <target>Sesja aplikacji</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="App version" xml:space="preserve">
         <source>App version</source>
         <target>Wersja aplikacji</target>
@@ -1057,7 +1026,6 @@
       </trans-unit>
       <trans-unit id="Auto-accept settings" xml:space="preserve">
         <source>Auto-accept settings</source>
-        <target>Ustawienia automatycznej akceptacji</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Back" xml:space="preserve">
@@ -1085,19 +1053,11 @@
         <target>Zły hash wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better calls" xml:space="preserve">
-        <source>Better calls</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better groups" xml:space="preserve">
         <source>Better groups</source>
         <target>Lepsze grupy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better message dates." xml:space="preserve">
-        <source>Better message dates.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Better messages" xml:space="preserve">
         <source>Better messages</source>
         <target>Lepsze wiadomości</target>
@@ -1108,18 +1068,6 @@
         <target>Lepsze sieciowanie</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Better notifications" xml:space="preserve">
-        <source>Better notifications</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better security ✅" xml:space="preserve">
-        <source>Better security ✅</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Better user experience" xml:space="preserve">
-        <source>Better user experience</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Black" xml:space="preserve">
         <source>Black</source>
         <target>Czarny</target>
@@ -1273,7 +1221,7 @@
       <trans-unit id="Cannot receive file" xml:space="preserve">
         <source>Cannot receive file</source>
         <target>Nie można odebrać pliku</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
         <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1403,14 +1351,8 @@
       </trans-unit>
       <trans-unit id="Chat preferences were changed." xml:space="preserve">
         <source>Chat preferences were changed.</source>
-        <target>Preferencje czatu zostały zmienione.</target>
         <note>alert message</note>
       </trans-unit>
-      <trans-unit id="Chat profile" xml:space="preserve">
-        <source>Chat profile</source>
-        <target>Profil użytkownika</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Chat theme" xml:space="preserve">
         <source>Chat theme</source>
         <target>Motyw czatu</target>
@@ -1812,7 +1754,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Corner" xml:space="preserve">
         <source>Corner</source>
-        <target>Róg</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1940,10 +1881,6 @@ To jest twój jednorazowy link!</target>
         <target>Niestandardowy czas</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Customizable message shape." xml:space="preserve">
-        <source>Customizable message shape.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Customize theme" xml:space="preserve">
         <source>Customize theme</source>
         <target>Dostosuj motyw</target>
@@ -2238,10 +2175,6 @@ To jest twój jednorazowy link!</target>
         <target>Usunąć starą bazę danych?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
-        <source>Delete or moderate up to 200 messages.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Delete pending connection?" xml:space="preserve">
         <source>Delete pending connection?</source>
         <target>Usunąć oczekujące połączenie?</target>
@@ -2492,11 +2425,6 @@ To jest twój jednorazowy link!</target>
         <target>Nie wysyłaj historii do nowych członków.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
-        <source>Do not use credentials with proxy.</source>
-        <target>Nie używaj danych logowania do proxy.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Don't create address" xml:space="preserve">
         <source>Don't create address</source>
         <target>Nie twórz adresu</target>
@@ -2520,8 +2448,7 @@ To jest twój jednorazowy link!</target>
       <trans-unit id="Download" xml:space="preserve">
         <source>Download</source>
         <target>Pobierz</target>
-        <note>alert button
-   chat item action</note>
+        <note>chat item action</note>
       </trans-unit>
       <trans-unit id="Download errors" xml:space="preserve">
         <source>Download errors</source>
@@ -2538,11 +2465,6 @@ To jest twój jednorazowy link!</target>
         <target>Pobierz plik</target>
         <note>server test step</note>
       </trans-unit>
-      <trans-unit id="Download files" xml:space="preserve">
-        <source>Download files</source>
-        <target>Pobierz pliki</target>
-        <note>alert action</note>
-      </trans-unit>
       <trans-unit id="Downloaded" xml:space="preserve">
         <source>Downloaded</source>
         <target>Pobrane</target>
@@ -2820,7 +2742,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Error changing connection profile" xml:space="preserve">
         <source>Error changing connection profile</source>
-        <target>Błąd zmiany połączenia profilu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error changing role" xml:space="preserve">
@@ -2835,7 +2756,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Error changing to incognito!" xml:space="preserve">
         <source>Error changing to incognito!</source>
-        <target>Błąd zmiany na incognito!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2960,7 +2880,6 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Error migrating settings" xml:space="preserve">
         <source>Error migrating settings</source>
-        <target>Błąd migracji ustawień</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error opening chat" xml:space="preserve">
@@ -2971,7 +2890,7 @@ To jest twój jednorazowy link!</target>
       <trans-unit id="Error receiving file" xml:space="preserve">
         <source>Error receiving file</source>
         <target>Błąd odbioru pliku</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error reconnecting server" xml:space="preserve">
         <source>Error reconnecting server</source>
@@ -3065,13 +2984,12 @@ To jest twój jednorazowy link!</target>
       </trans-unit>
       <trans-unit id="Error switching profile" xml:space="preserve">
         <source>Error switching profile</source>
-        <target>Błąd zmiany profilu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error switching profile!" xml:space="preserve">
         <source>Error switching profile!</source>
         <target>Błąd przełączania profilu!</target>
-        <note>alertTitle</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Error synchronizing connection" xml:space="preserve">
         <source>Error synchronizing connection</source>
@@ -3116,7 +3034,8 @@ To jest twój jednorazowy link!</target>
       <trans-unit id="Error: %@" xml:space="preserve">
         <source>Error: %@</source>
         <target>Błąd: %@</target>
-        <note>alert message</note>
+        <note>file error text
+   snd error text</note>
       </trans-unit>
       <trans-unit id="Error: URL is invalid" xml:space="preserve">
         <source>Error: URL is invalid</source>
@@ -3203,13 +3122,6 @@ To jest twój jednorazowy link!</target>
         <target>Błąd pliku</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
-        <source>File errors:
-%@</source>
-        <target>Błędy pliku:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
         <source>File not found - most likely file was deleted or cancelled.</source>
         <target>Nie odnaleziono pliku - najprawdopodobniej plik został usunięty lub anulowany.</target>
@@ -3345,30 +3257,11 @@ To jest twój jednorazowy link!</target>
         <target>Przekaż dalej</target>
         <note>chat item action</note>
       </trans-unit>
-      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
-        <source>Forward %d message(s)?</source>
-        <target>Przekazać %d wiadomość(i)?</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Forward and save messages" xml:space="preserve">
         <source>Forward and save messages</source>
         <target>Przesyłaj dalej i zapisuj wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forward messages" xml:space="preserve">
-        <source>Forward messages</source>
-        <target>Przekaż wiadomości</target>
-        <note>alert action</note>
-      </trans-unit>
-      <trans-unit id="Forward messages without files?" xml:space="preserve">
-        <source>Forward messages without files?</source>
-        <target>Przekazać wiadomości bez plików?</target>
-        <note>alert message</note>
-      </trans-unit>
-      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
-        <source>Forward up to 20 messages at once.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarded" xml:space="preserve">
         <source>Forwarded</source>
         <target>Przekazane dalej</target>
@@ -3379,11 +3272,6 @@ To jest twój jednorazowy link!</target>
         <target>Przekazane dalej od</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
-        <source>Forwarding %lld messages</source>
-        <target>Przekazywanie %lld wiadomości</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
         <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
         <target>Serwer przekazujący %@ nie mógł połączyć się z serwerem docelowym %@. Spróbuj ponownie później.</target>
@@ -3678,11 +3566,6 @@ Błąd: %2$@</target>
         <target>Serwery ICE (po jednym na linię)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="IP address" xml:space="preserve">
-        <source>IP address</source>
-        <target>Adres IP</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
         <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
         <target>Jeśli nie możesz spotkać się osobiście, pokaż kod QR w rozmowie wideo lub udostępnij link.</target>
@@ -3758,11 +3641,6 @@ Błąd: %2$@</target>
         <target>Importowanie archiwum</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
-        <source>Improved delivery, reduced traffic usage.
-More improvements are coming soon!</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Improved message delivery" xml:space="preserve">
         <source>Improved message delivery</source>
         <target>Ulepszona dostawa wiadomości</target>
@@ -4335,7 +4213,6 @@ To jest twój link do grupy %@!</target>
       </trans-unit>
       <trans-unit id="Message shape" xml:space="preserve">
         <source>Message shape</source>
-        <target>Kształt wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4388,11 +4265,6 @@ To jest twój link do grupy %@!</target>
         <target>Wysłane wiadomości</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
-        <source>Messages were deleted after you selected them.</source>
-        <target>Wiadomości zostały usunięte po wybraniu ich.</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
         <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
         <target>Wiadomości, pliki i połączenia są chronione przez **szyfrowanie end-to-end** z doskonałym utajnianiem z wyprzedzeniem i odzyskiem po złamaniu.</target>
@@ -4548,16 +4420,6 @@ To jest twój link do grupy %@!</target>
         <target>Nowy Pin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
-        <source>New SOCKS credentials will be used every time you start the app.</source>
-        <target>Nowe poświadczenia SOCKS będą używane przy każdym uruchomieniu aplikacji.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
-        <source>New SOCKS credentials will be used for each server.</source>
-        <target>Dla każdego serwera zostaną użyte nowe poświadczenia SOCKS.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="New chat" xml:space="preserve">
         <source>New chat</source>
         <target>Nowy czat</target>
@@ -4678,16 +4540,6 @@ To jest twój link do grupy %@!</target>
         <target>Brak połączenia z siecią</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="No permission to record speech" xml:space="preserve">
-        <source>No permission to record speech</source>
-        <target>Brak zezwoleń do nagrania rozmowy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="No permission to record video" xml:space="preserve">
-        <source>No permission to record video</source>
-        <target>Brak zezwoleń do nagrania wideo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="No permission to record voice message" xml:space="preserve">
         <source>No permission to record voice message</source>
         <target>Brak uprawnień do nagrywania wiadomości głosowej</target>
@@ -4708,11 +4560,6 @@ To jest twój link do grupy %@!</target>
         <target>Nic nie jest zaznaczone</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Nothing to forward!" xml:space="preserve">
-        <source>Nothing to forward!</source>
-        <target>Nic do przekazania!</target>
-        <note>alert title</note>
-      </trans-unit>
       <trans-unit id="Notifications" xml:space="preserve">
         <source>Notifications</source>
         <target>Powiadomienia</target>
@@ -4745,7 +4592,7 @@ To jest twój link do grupy %@!</target>
       <trans-unit id="Ok" xml:space="preserve">
         <source>Ok</source>
         <target>Ok</target>
-        <note>alert button</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Old database" xml:space="preserve">
         <source>Old database</source>
@@ -4936,13 +4783,6 @@ Wymaga włączenia VPN.</target>
         <target>Inne %@ serwery</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
-        <source>Other file errors:
-%@</source>
-        <target>Inne błędy pliku:
-%@</target>
-        <note>alert message</note>
-      </trans-unit>
       <trans-unit id="PING count" xml:space="preserve">
         <source>PING count</source>
         <target>Liczba PINGÓW</target>
@@ -4978,11 +4818,6 @@ Wymaga włączenia VPN.</target>
         <target>Pin ustawiony!</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Password" xml:space="preserve">
-        <source>Password</source>
-        <target>Hasło</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Password to show" xml:space="preserve">
         <source>Password to show</source>
         <target>Hasło do wyświetlenia</target>
@@ -5132,11 +4967,6 @@ Błąd: %@</target>
         <target>Polski interfejs</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Port" xml:space="preserve">
-        <source>Port</source>
-        <target>Port</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
         <source>Possibly, certificate fingerprint in server address is incorrect</source>
         <target>Możliwe, że odcisk palca certyfikatu w adresie serwera jest nieprawidłowy</target>
@@ -5324,11 +5154,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Serwery trasowane przez proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Proxy requires password" xml:space="preserve">
-        <source>Proxy requires password</source>
-        <target>Proxy wymaga hasła</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Push notifications" xml:space="preserve">
         <source>Push notifications</source>
         <target>Powiadomienia push</target>
@@ -5552,7 +5377,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Remove archive?" xml:space="preserve">
         <source>Remove archive?</source>
-        <target>Usunąć archiwum?</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Remove image" xml:space="preserve">
@@ -5735,11 +5559,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Serwer SMP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="SOCKS proxy" xml:space="preserve">
-        <source>SOCKS proxy</source>
-        <target>Proxy SOCKS</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Safely receive files" xml:space="preserve">
         <source>Safely receive files</source>
         <target>Bezpiecznie otrzymuj pliki</target>
@@ -5828,7 +5647,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Save your profile?" xml:space="preserve">
         <source>Save your profile?</source>
-        <target>Zapisać Twój profil?</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Saved" xml:space="preserve">
@@ -5851,11 +5669,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Zachowano wiadomość</target>
         <note>message info title</note>
       </trans-unit>
-      <trans-unit id="Saving %lld messages" xml:space="preserve">
-        <source>Saving %lld messages</source>
-        <target>Zapisywanie %lld wiadomości</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Scale" xml:space="preserve">
         <source>Scale</source>
         <target>Skaluj</target>
@@ -5938,7 +5751,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Select chat profile" xml:space="preserve">
         <source>Select chat profile</source>
-        <target>Wybierz profil czatu</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Selected %lld" xml:space="preserve">
@@ -6059,7 +5871,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
         <source>Sender cancelled file transfer.</source>
         <target>Nadawca anulował transfer pliku.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
         <source>Sender may have deleted the connection request.</source>
@@ -6156,11 +5968,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Wysłano przez proxy</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Server" xml:space="preserve">
-        <source>Server</source>
-        <target>Serwer</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Server address" xml:space="preserve">
         <source>Server address</source>
         <target>Adres serwera</target>
@@ -6283,7 +6090,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Settings were changed." xml:space="preserve">
         <source>Settings were changed.</source>
-        <target>Ustawienia zostały zmienione.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Shape profile images" xml:space="preserve">
@@ -6323,7 +6129,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Share profile" xml:space="preserve">
         <source>Share profile</source>
-        <target>Udostępnij profil</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6461,10 +6266,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Zaproszenie jednorazowe SimpleX</target>
         <note>simplex link type</note>
       </trans-unit>
-      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
-        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Simplified incognito mode" xml:space="preserve">
         <source>Simplified incognito mode</source>
         <target>Uproszczony tryb incognito</target>
@@ -6497,7 +6298,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Some app settings were not migrated." xml:space="preserve">
         <source>Some app settings were not migrated.</source>
-        <target>Niektóre ustawienia aplikacji nie zostały zmigrowane.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
@@ -6640,14 +6440,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
         <target>Wspieraj SimpleX Chat</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
-        <source>Switch audio and video during the call.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
-        <source>Switch chat profile for 1-time invitations.</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="System" xml:space="preserve">
         <source>System</source>
         <target>System</target>
@@ -6685,7 +6477,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
       </trans-unit>
       <trans-unit id="Tail" xml:space="preserve">
         <source>Tail</source>
-        <target>Ogon</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Take picture" xml:space="preserve">
@@ -6882,7 +6673,6 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
       </trans-unit>
       <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
         <source>The uploaded database archive will be permanently removed from the servers.</source>
-        <target>Przesłane archiwum bazy danych zostanie trwale usunięte z serwerów.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Themes" xml:space="preserve">
@@ -7012,16 +6802,6 @@ You will be prompted to complete authentication before this feature is enabled.<
 Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
-        <source>To record speech please grant permission to use Microphone.</source>
-        <target>Aby nagrać rozmowę, proszę zezwolić na użycie Mikrofonu.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
-        <source>To record video please grant permission to use Camera.</source>
-        <target>Aby nagrać wideo, proszę zezwolić na użycie Aparatu.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
         <source>To record voice message please grant permission to use Microphone.</source>
         <target>Aby nagrać wiadomość głosową należy udzielić zgody na użycie Mikrofonu.</target>
@@ -7175,7 +6955,7 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
       <trans-unit id="Unknown servers!" xml:space="preserve">
         <source>Unknown servers!</source>
         <target>Nieznane serwery!</target>
-        <note>alert title</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
         <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7289,11 +7069,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Użyj hostów .onion</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
-        <source>Use SOCKS proxy</source>
-        <target>Użyj proxy SOCKS</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
         <source>Use SimpleX Chat servers?</source>
         <target>Użyć serwerów SimpleX Chat?</target>
@@ -7359,16 +7134,16 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Korzystaj z aplikacji jedną ręką.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="User profile" xml:space="preserve">
+        <source>User profile</source>
+        <target>Profil użytkownika</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="User selection" xml:space="preserve">
         <source>User selection</source>
         <target>Wybór użytkownika</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Username" xml:space="preserve">
-        <source>Username</source>
-        <target>Nazwa użytkownika</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
         <source>Using SimpleX Chat servers.</source>
         <target>Używanie serwerów SimpleX Chat.</target>
@@ -7602,7 +7377,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
       <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
         <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
         <target>Bez Tor lub VPN, Twój adres IP będzie widoczny dla tych przekaźników XFTP: %@.</target>
-        <note>alert message</note>
+        <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Wrong database passphrase" xml:space="preserve">
         <source>Wrong database passphrase</source>
@@ -7629,6 +7404,11 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
         <target>Serwer XFTP</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="You" xml:space="preserve">
+        <source>You</source>
+        <target>Ty</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
         <source>You **must not** use the same database on two devices.</source>
         <target>**Nie możesz** używać tej samej bazy na dwóch urządzeniach.</target>
@@ -7980,7 +7760,6 @@ Powtórzyć prośbę połączenia?</target>
       </trans-unit>
       <trans-unit id="Your chat preferences" xml:space="preserve">
         <source>Your chat preferences</source>
-        <target>Twoje preferencje czatu</target>
         <note>alert title</note>
       </trans-unit>
       <trans-unit id="Your chat profiles" xml:space="preserve">
@@ -7990,7 +7769,6 @@ Powtórzyć prośbę połączenia?</target>
       </trans-unit>
       <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
         <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
-        <target>Twoje połączenie zostało przeniesione do %@, ale podczas przekierowywania do profilu wystąpił nieoczekiwany błąd.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
       <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -8008,11 +7786,6 @@ Powtórzyć prośbę połączenia?</target>
         <target>Twoje kontakty pozostaną połączone.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
-      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
-        <source>Your credentials may be sent unencrypted.</source>
-        <target>Twoje poświadczenia mogą zostać wysłane niezaszyfrowane.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
       <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
         <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
         <target>Twoja obecna baza danych czatu zostanie usunięta i zastąpiona zaimportowaną.</target>
@@ -8050,7 +7823,6 @@ Powtórzyć prośbę połączenia?</target>
       </trans-unit>
       <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
         <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
-        <target>Twój profil został zmieniony. Jeśli go zapiszesz, zaktualizowany profil zostanie wysłany do wszystkich kontaktów.</target>
         <note>alert message</note>
       </trans-unit>
       <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">

apps/ios/SimpleX Localizations/pt-BR.xcloc/Localized Contents/pt-BR.xliff

@@ -5502,74 +5502,6 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
         <source>Archived contacts</source>
         <target state="translated">Contatos arquivados</target>
       </trans-unit>
-      <trans-unit id="Cellular" xml:space="preserve" approved="no">
-        <source>Cellular</source>
-        <target state="translated">Rede móvel</target>
-      </trans-unit>
-      <trans-unit id="%d file(s) failed to download." xml:space="preserve" approved="no">
-        <source>%d file(s) failed to download.</source>
-        <target state="translated">%d arquivo(s) falharam ao ser baixados.</target>
-      </trans-unit>
-      <trans-unit id="%d file(s) were deleted." xml:space="preserve" approved="no">
-        <source>%d file(s) were deleted.</source>
-        <target state="translated">%d arquivo(s) foram apagados.</target>
-      </trans-unit>
-      <trans-unit id="%d messages not forwarded" xml:space="preserve" approved="no">
-        <source>%d messages not forwarded</source>
-        <target state="translated">%d mensagens não encaminhadas</target>
-      </trans-unit>
-      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
-        <source>Bad desktop address</source>
-        <target state="translated">Endereço de desktop incorreto</target>
-      </trans-unit>
-      <trans-unit id="Blur for better privacy." xml:space="preserve" approved="no">
-        <source>Blur for better privacy.</source>
-        <target state="translated">Borrar para melhor privacidade.</target>
-      </trans-unit>
-      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve" approved="no">
-        <source>%d file(s) are still being downloaded.</source>
-        <target state="translated">%d arquivo(s) ainda estão sendo baixados.</target>
-      </trans-unit>
-      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve" approved="no">
-        <source>%d file(s) were not downloaded.</source>
-        <target state="translated">%d arquivo(s) não foram baixados.</target>
-      </trans-unit>
-      <trans-unit id="Chat colors" xml:space="preserve" approved="no">
-        <source>Chat colors</source>
-        <target state="translated">Cores do chat</target>
-      </trans-unit>
-      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
-        <source>%lld group events</source>
-        <target state="translated">%lld eventos do grupo</target>
-      </trans-unit>
-      <trans-unit id="%lld messages moderated by %@" xml:space="preserve" approved="no">
-        <source>%lld messages moderated by %@</source>
-        <target state="translated">%lld mensagens moderadas por %@</target>
-      </trans-unit>
-      <trans-unit id="%@, %@" xml:space="preserve" approved="no">
-        <source>%1$@, %2$@</source>
-        <target state="translated">%1$@, %2$@</target>
-      </trans-unit>
-      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
-        <source>%lld new interface languages</source>
-        <target state="translated">%lld novos idiomas de interface</target>
-      </trans-unit>
-      <trans-unit id="Better networking" xml:space="preserve" approved="no">
-        <source>Better networking</source>
-        <target state="translated">Melhores redes</target>
-      </trans-unit>
-      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
-        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
-        <target state="translated">Búlgaro, Finlandês, Tailandês e Ucraniano - obrigado aos usuários e [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
-      </trans-unit>
-      <trans-unit id="Better groups" xml:space="preserve" approved="no">
-        <source>Better groups</source>
-        <target state="translated">Melhores grupos</target>
-      </trans-unit>
-      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve" approved="no">
-        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
-        <target state="translated">Capacidade excedida - o destinatário não recebeu as mensagens enviadas anteriormente.</target>
-      </trans-unit>
     </body>
   </file>
   <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pt-BR" datatype="plaintext">