Version 6.3.9.

- Fix possible crash in audio playback speed menu.
- Fix possible crash in forum or bot topic deletion.

.cursor/rules/rpl_guide.mdc

@@ -60,7 +60,7 @@ rpl::lifetime &parentLifetime = /* ... get lifetime from context ... */;
 
 To consume values from a producer, you start a pipeline using one of the `rpl::start_...` methods. These methods subscribe to the producer and execute callbacks for the events they handle.
 
-The most common method is `rpl::start_with_next`:
+The most common method is `rpl::on_next`:
 
 ```cpp
 auto counter = /* ... */; // Type: rpl::producer<int>
@@ -69,20 +69,20 @@ rpl::lifetime lifetime;
 // Counter is consumed here, use std::move if it's an l-value.
 std::move(
     counter
-) | rpl::start_with_next([=]\(int nextValue) {
+) | rpl::on_next([=]\(int nextValue) {
     // Process the next integer value emitted by the producer.
     qDebug() << "Received: " << nextValue;
 }, lifetime); // Pass the lifetime to manage the subscription.
 // Note: `counter` is now in a moved-from state and likely invalid.
 
 // If you need to start the same producer multiple times, duplicate it:
-// rpl::duplicate(counter) | rpl::start_with_next(...);
+// rpl::duplicate(counter) | rpl::on_next(...);
 
 // If you DON'T pass a lifetime to a start_... method:
 auto counter2 = /* ... */; // Type: rpl::producer<int>
 rpl::lifetime subscriptionLifetime = std::move(
     counter2
-) | rpl::start_with_next([=]\(int nextValue) { /* ... */ });
+) | rpl::on_next([=]\(int nextValue) { /* ... */ });
 // The returned lifetime MUST be stored. If it's discarded immediately,
 // the subscription stops instantly.
 // `counter2` is also moved-from here.
@@ -98,7 +98,7 @@ rpl::lifetime lifetime;
 // If it's the only use, std::move(dataStream) would be preferred.
 rpl::duplicate(
     dataStream
-) | rpl::start_with_error([=]\(Error &&error) {
+) | rpl::on_error([=]\(Error &&error) {
     // Handle the error signaled by the producer.
     qDebug() << "Error: " << error.text();
 }, lifetime);
@@ -106,7 +106,7 @@ rpl::duplicate(
 // Using dataStream again, perhaps duplicated again or moved if last use.
 rpl::duplicate(
     dataStream
-) | rpl::start_with_done([=] {
+) | rpl::on_done([=] {
     // Execute when the producer signals it's finished emitting values.
     qDebug() << "Stream finished.";
 }, lifetime);
@@ -114,7 +114,7 @@ rpl::duplicate(
 // Last use of dataStream, so we move it.
 std::move(
     dataStream
-) | rpl::start_with_next_error_done(
+) | rpl::on_next_error_done(
     [=]\(QString &&value) { /* handle next value */ },
     [=]\(Error &&error) { /* handle error */ },
     [=] { /* handle done */ },
@@ -169,7 +169,7 @@ You can combine multiple producers into one:
     // The lambda receives unpacked arguments, not the tuple itself.
     std::move(
         combined
-    ) | rpl::start_with_next([=]\(int count, const QString &text) {
+    ) | rpl::on_next([=]\(int count, const QString &text) {
         // No need for std::get<0>(latest), etc.
         qDebug() << "Combined: Count=" << count << ", Text=" << text;
     }, lifetime);
@@ -181,7 +181,7 @@ You can combine multiple producers into one:
         return count > 0 && !text.isEmpty();
     }) | rpl::map([=]\(int count, const QString &text) {
         return text.repeated(count);
-    }) | rpl::start_with_next([=]\(const QString &result) {
+    }) | rpl::on_next([=]\(const QString &result) {
         qDebug() << "Mapped & Filtered: " << result;
     }, lifetime);
     ```
@@ -197,7 +197,7 @@ You can combine multiple producers into one:
     // Starting the merged producer consumes it.
     std::move(
         merged
-    ) | rpl::start_with_next([=]\(QString &&value) {
+    ) | rpl::on_next([=]\(QString &&value) {
         // Receives values from either sourceA or sourceB as they arrive.
         qDebug() << "Merged value: " << value;
     }, lifetime);

.github/workflows/linux.yml

@@ -71,6 +71,7 @@ jobs:
           poetry install
           DOCKERFILE=$(DEBUG= LTO= poetry run gen_dockerfile)
           echo "$DOCKERFILE" > Dockerfile
+          rm -rf __pycache__
 
       - name: Free up some disk space.
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be

.github/workflows/mac.yml

@@ -74,6 +74,15 @@ jobs:
 
           sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 
+      - name: Free up some disk space.
+        uses: hugoalh/disk-space-optimizer-ghaction@271735125a1b35180620eae7e45c2e9d470c31b0
+        with:
+          general_include: ".+"
+          homebrew_prune: "True"
+          homebrew_clean: "True"
+          npm_prune: "True"
+          npm_clean: "True"
+
       - name: ThirdParty cache.
         id: cache-third-party
         uses: actions/cache@v4
@@ -95,9 +104,7 @@ jobs:
           ./$REPO_NAME/Telegram/build/prepare/mac.sh skip-release silent
 
       - name: Free up some disk space.
-        run: |
-          cd Libraries
-          find . -iname "*.dir" -exec rm -rf {} || true \;
+        run: find Libraries -iwholename "*.dir/*" -delete
 
       - name: Telegram Desktop build.
         if: env.ONLY_CACHE == 'false'

.github/workflows/mac_packaged.yml

@@ -85,7 +85,7 @@ jobs:
           echo "MACOSX_DEPLOYMENT_TARGET=$(grep 'set(QT_SUPPORTED_MIN_MACOS_VERSION' /opt/homebrew/Cellar/qtbase/*/lib/cmake/Qt6/Qt6ConfigExtras.cmake | sed -E 's/^.*"(.*)"\)$/\1/')" >> $GITHUB_ENV
           echo "LibrariesPath=`pwd`" >> $GITHUB_ENV
 
-          curl -o tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
+          echo "WEBRTC=`curl -sSL https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master | jq -r .object.sha`" >> $GITHUB_ENV
 
       - name: RNNoise.
         run: |
@@ -103,7 +103,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ env.LibrariesPath }}/tg_owt
-          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_owt-version.json') }}
+          key: ${{ runner.OS }}-webrtc-${{ env.CACHE_KEY }}-${{ env.WEBRTC }}
       - name: WebRTC.
         if: steps.cache-webrtc.outputs.cache-hit != 'true'
         run: |

.github/workflows/snap.yml

@@ -61,16 +61,11 @@ jobs:
           sudo lxd waitready
 
       - name: Free up some disk space.
-        uses: endersonmenezes/free-disk-space@6c4664f43348c8c7011b53488d5ca65e9fc5cd1a
+        uses: samueldr/more-space-action@97048bd0df83fb05b5257887bdbaffc848887673
         with:
-          remove_android: true
-          remove_dotnet: true
-          remove_haskell: true
-          remove_tool_cache: true
-          remove_swap: true
-          remove_packages: "azure-cli google-cloud-cli microsoft-edge-stable google-chrome-stable firefox postgresql* temurin-* *llvm* mysql* dotnet-sdk-*"
-          remove_packages_one_command: true
-          remove_folders: "/usr/share/swift /usr/share/miniconda /usr/share/az* /usr/share/glade* /usr/local/lib/node_modules /usr/local/share/chromium /usr/local/share/powershell"
+          enable-remove-default-apt-patterns: false
+          enable-lvm-span: true
+          lvm-span-mountpoint: /var/snap/lxd/common/lxd/storage-pools/default/containers
 
       - name: Telegram Desktop snap build.
         run: sudo -u $USER snap run snapcraft --verbosity=debug

Telegram/CMakeLists.txt

@@ -337,6 +337,8 @@ PRIVATE
     boxes/star_gift_auction_box.h
     boxes/star_gift_box.cpp
     boxes/star_gift_box.h
+    boxes/star_gift_preview_box.cpp
+    boxes/star_gift_preview_box.h
     boxes/star_gift_resale_box.cpp
     boxes/star_gift_resale_box.h
     boxes/sticker_set_box.cpp
@@ -405,6 +407,8 @@ PRIVATE
     calls/calls_instance.h
     calls/calls_panel.cpp
     calls/calls_panel.h
+    calls/calls_panel_background.cpp
+    calls/calls_panel_background.h
     calls/calls_signal_bars.cpp
     calls/calls_signal_bars.h
     calls/calls_top_bar.cpp
@@ -523,6 +527,8 @@ PRIVATE
     data/components/gift_auctions.h
     data/components/location_pickers.cpp
     data/components/location_pickers.h
+    data/components/passkeys.cpp
+    data/components/passkeys.h
     data/components/promo_suggestions.cpp
     data/components/promo_suggestions.h
     data/components/recent_peers.cpp
@@ -918,6 +924,8 @@ PRIVATE
     history/view/history_view_pinned_tracker.h
     history/view/history_view_quick_action.cpp
     history/view/history_view_quick_action.h
+    history/view/history_view_reaction_preview.cpp
+    history/view/history_view_reaction_preview.h
     history/view/history_view_reply.cpp
     history/view/history_view_reply.h
     history/view/history_view_requests_bar.cpp
@@ -1401,6 +1409,7 @@ PRIVATE
     platform/linux/specific_linux.h
     platform/linux/tray_linux.cpp
     platform/linux/tray_linux.h
+    platform/linux/webauthn_linux.cpp
     platform/mac/file_utilities_mac.mm
     platform/mac/file_utilities_mac.h
     platform/mac/launcher_mac.mm
@@ -1420,6 +1429,7 @@ PRIVATE
     platform/mac/specific_mac_p.h
     platform/mac/tray_mac.mm
     platform/mac/tray_mac.h
+    platform/mac/webauthn_mac.mm
     platform/mac/window_title_mac.mm
     platform/mac/touchbar/items/mac_formatter_item.h
     platform/mac/touchbar/items/mac_formatter_item.mm
@@ -1454,6 +1464,7 @@ PRIVATE
     platform/win/specific_win.h
     platform/win/tray_win.cpp
     platform/win/tray_win.h
+    platform/win/webauthn_win.cpp
     platform/win/windows_app_user_model_id.cpp
     platform/win/windows_app_user_model_id.h
     platform/win/windows_dlls.cpp
@@ -1472,6 +1483,7 @@ PRIVATE
     platform/platform_overlay_widget.h
     platform/platform_specific.h
     platform/platform_tray.h
+    platform/platform_webauthn.h
     platform/platform_window_title.h
     profile/profile_back_button.cpp
     profile/profile_back_button.h
@@ -1557,6 +1569,8 @@ PRIVATE
     settings/settings_notifications.h
     settings/settings_notifications_type.cpp
     settings/settings_notifications_type.h
+    settings/settings_passkeys.cpp
+    settings/settings_passkeys.h
     settings/settings_power_saving.cpp
     settings/settings_power_saving.h
     settings/settings_premium.cpp
@@ -1900,15 +1914,17 @@ elseif (APPLE)
         COMMAND cp ${CMAKE_BINARY_DIR}/lib_spellcheck.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
     )
     if (NOT build_macstore AND NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
-        if (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
-            set(crashpad_dir_part ".${DESKTOP_APP_MAC_ARCH}")
+        if (DESKTOP_APP_USE_PACKAGED)
+            find_program(CRASHPAD_HANDLER crashpad_handler REQUIRED)
+        elseif (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
+            set(CRASHPAD_HANDLER "${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>.${DESKTOP_APP_MAC_ARCH}/crashpad_handler")
         else()
-            set(crashpad_dir_part "")
+            set(CRASHPAD_HANDLER "${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>/crashpad_handler")
         endif()
         add_custom_command(TARGET Telegram
         PRE_LINK
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Helpers
-            COMMAND cp ${libs_loc}/crashpad/out/$<IF:$<CONFIG:Debug>,Debug,Release>${crashpad_dir_part}/crashpad_handler $<TARGET_FILE_DIR:Telegram>/../Helpers/
+            COMMAND cp ${CRASHPAD_HANDLER} $<TARGET_FILE_DIR:Telegram>/../Helpers/
         )
     endif()
 else()
@@ -1928,8 +1944,9 @@ if (build_macstore)
     set(bundle_identifier "org.telegram.desktop")
     set(bundle_entitlements "Telegram Lite.entitlements")
     set(output_name "Telegram Lite")
-    set_target_properties(Telegram PROPERTIES
-        XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS ${libs_loc}/breakpad/src/client/mac/build/Release
+    target_link_options(Telegram
+    PRIVATE
+        -F${libs_loc}/breakpad/src/client/mac/build/Release
     )
     target_link_frameworks(Telegram PRIVATE Breakpad)
     add_custom_command(TARGET Telegram
@@ -2117,7 +2134,7 @@ if (NOT DESKTOP_APP_DISABLE_AUTOUPDATE AND NOT build_macstore AND NOT build_wins
         endif()
     elseif (APPLE)
         add_custom_command(TARGET Updater
-        PRE_LINK
+        POST_BUILD
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
             COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
         )

Telegram/Resources/langs/lang.strings

@@ -22,7 +22,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_menu_my_stories" = "My Stories";
 "lng_menu_my_groups" = "My Groups";
 "lng_menu_my_channels" = "My Channels";
-"lng_open_menu" = "Open navigation menu";
+"lng_main_menu" = "Main menu";
+"lng_filter_unread_chats#one" = "{text} ({count} unread chat)";
+"lng_filter_unread_chats#other" = "{text} ({count} unread chats)";
 
 "lng_disable_notifications_from_tray" = "Disable notifications";
 "lng_enable_notifications_from_tray" = "Enable notifications";
@@ -378,6 +380,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_intro_qr_step2" = "Go to Settings > Devices > Link Desktop Device";
 "lng_intro_qr_step3" = "Scan this image to Log In";
 "lng_intro_qr_skip" = "Or log in using your phone number";
+"lng_intro_qr_phone" = "Log in using phone number";
+"lng_intro_qr_passkey" = "Log in using passkey";
 
 "lng_intro_fragment_title" = "Enter code";
 "lng_intro_fragment_about" = "Get the code for {phone_number} in the Anonymous Numbers section on Fragment.";
@@ -793,6 +797,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_channel_label" = "Personal channel";
 "lng_settings_channel_add" = "Add";
 "lng_settings_channel_remove" = "Remove";
+"lng_settings_channel_menu_remove" = "Remove Personal Channel";
 "lng_settings_channel_no_yet" = "You don't have any public channels yet.";
 "lng_settings_channel_start" = "Start a Channel";
 "lng_settings_channel_saved" = "Your personal channel was updated.";
@@ -1252,6 +1257,28 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_restart_now" = "Restart";
 "lng_settings_restart_later" = "Later";
 
+"lng_settings_passkeys_title" = "Passkeys";
+"lng_settings_passkeys_about" = "Manage your passkey, stored safely in the cloud service you choose.";
+"lng_settings_passkeys_button" = "Add Passkey";
+"lng_settings_passkeys_button_about" = "Your passkey is stored securely in your password manager. {link}";
+"lng_settings_passkeys_delete_sure_title" = "Delete Passkey";
+"lng_settings_passkeys_delete_sure_about" = "Once deleted, this passkey can't be used to log in.";
+"lng_settings_passkeys_delete_sure_about2" = "Don't forget to remove it from your password manager too.";
+"lng_settings_passkeys_none_title" = "Protect your account";
+"lng_settings_passkeys_none_about" = "Log in safely and keep your account secure.";
+"lng_settings_passkeys_none_info1_title" = "Create a Passkey";
+"lng_settings_passkeys_none_info1_about" = "Make a passkey to sign in easily and safely.";
+"lng_settings_passkeys_none_info2_title" = "Log in with face recognition";
+"lng_settings_passkeys_none_info2_about" = "Use your face, fingerprint, or screen lock to sign in.";
+"lng_settings_passkeys_none_info3_title" = "Store Passkey securely";
+"lng_settings_passkeys_none_info3_about" = "Your passkey is stored safely in the cloud service you choose.";
+"lng_settings_passkeys_none_button" = "Create Passkey";
+"lng_settings_passkeys_none_button_unsupported" = "Unsupported";
+"lng_settings_passkeys_created" = "Created {date}";
+"lng_settings_passkeys_last_used" = "Last used {date}";
+"lng_settings_passkeys_unsigned_error" = "Passkeys are not available in unsigned builds. Please use an official signed version of Telegram Desktop.";
+"lng_settings_passkey_unknown" = "Passkey";
+
 "lng_settings_quick_dialog_action_title" = "Chat list quick action";
 "lng_settings_quick_dialog_action_about" = "Choose the action you want to perform when you middle-click or swipe left in the chat list.";
 "lng_settings_quick_dialog_action_both" = "Swipe left and Middle-click";
@@ -2268,8 +2295,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_proximity_distance_km#other" = "{count} km";
 "lng_action_webview_data_done" = "Data from the \"{text}\" button was transferred to the bot.";
 "lng_action_gift_received" = "{user} sent you a gift for {cost}";
+"lng_action_gift_received_sold" = "{user} sold you a gift for {cost}";
 "lng_action_gift_unique_received" = "{user} sent you a unique collectible item";
 "lng_action_gift_sent" = "You sent a gift for {cost}";
+"lng_action_gift_sent_sold" = "You sold a gift for {cost}";
 "lng_action_gift_unique_sent" = "You sent a unique collectible item";
 "lng_action_gift_upgraded" = "{user} turned the gift from you into a unique collectible";
 "lng_action_gift_upgraded_channel" = "{user} turned this gift to {channel} into a unique collectible";
@@ -2325,6 +2354,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_gift_premium_about" = "Subscription for exclusive Telegram features.";
 "lng_action_gift_refunded" = "This gift was downgraded because a request to refund the payment related to this gift was made, and the money was returned.";
 "lng_action_gift_got_ton" = "Use TON to suggest posts to channels.";
+"lng_action_gift_offer" = "{user} offered you {cost} for {name}.";
+"lng_action_gift_offer_you" = "You offered {cost} for {name}.";
+"lng_action_gift_offer_state_expires" = "This offer expires in {time}.";
+"lng_action_gift_offer_time_large" = "{hours} h";
+"lng_action_gift_offer_time_medium" = "{hours} h {minutes} m";
+"lng_action_gift_offer_time_small" = "{minutes} m";
+"lng_action_gift_offer_state_accepted" = "This offer was accepted.";
+"lng_action_gift_offer_state_rejected" = "This offer was rejected.";
+"lng_action_gift_offer_state_expired" = "This offer has expired.";
+"lng_action_gift_offer_sold" = "{user} sold {name} for {cost}.";
+"lng_action_gift_offer_sold_you" = "You sold {name} for {cost}.";
+"lng_action_gift_offer_decline" = "Reject";
+"lng_action_gift_offer_accept" = "Accept";
+"lng_action_gift_offer_expired" = "The offer from {user} to buy your {name} for {cost} has expired.";
+"lng_action_gift_offer_expired_your" = "Your offer to buy {name} for {cost} has expired.";
+"lng_action_gift_offer_declined" = "{user} rejected your offer to buy {name} for {cost}.";
+"lng_action_gift_offer_declined_you" = "You rejected {user}'s offer to buy your {name} for {cost}.";
 "lng_action_suggested_photo_me" = "You suggested this photo for {user}'s Telegram profile.";
 "lng_action_suggested_photo" = "{user} suggests this photo for your Telegram profile.";
 "lng_action_suggested_photo_button" = "View Photo";
@@ -2808,6 +2854,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_summary_about_todo_lists" = "Plan, assign, and complete tasks - seamlessly and efficiently.";
 "lng_premium_summary_subtitle_peer_colors" = "Name and Profile Colors";
 "lng_premium_summary_about_peer_colors" = "Choose a color and logo for your profile and replies to your messages.";
+"lng_premium_summary_subtitle_gifts" = "Telegram Gifts";
+"lng_premium_summary_about_gifts" = "Gifts are collectible items you can trade or showcase on your profile.";
 "lng_premium_summary_bottom_subtitle" = "About Telegram Premium";
 "lng_premium_summary_bottom_about" = "While the free version of Telegram already gives its users more than any other messaging application, **Telegram Premium** pushes its capabilities even further.\n\n**Telegram Premium** is a paid option, because most Premium Features require additional expenses from Telegram to third parties such as data center providers and server manufacturers. Contributions from **Telegram Premium** users allow us to cover such costs and also help Telegram stay free for everyone.";
 "lng_premium_summary_button" = "Subscribe for {cost} per month";
@@ -3096,6 +3144,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_small_balance_for_message" = "Buy **Stars** to send messages to {user}.";
 "lng_credits_small_balance_for_messages" = "Buy **Stars** to send messages.";
 "lng_credits_small_balance_for_suggest" = "Buy **Stars** to suggest post to {channel}.";
+"lng_credits_small_balance_for_offer" = "Buy **Stars** to offer for this gift.";
 "lng_credits_small_balance_for_search" = "Buy **Stars** to search through public posts.";
 "lng_credits_small_balance_fallback" = "Buy **Stars** to unlock content and services on Telegram.";
 "lng_credits_purchase_blocked" = "Sorry, you can't purchase this item with Telegram Stars.";
@@ -3692,6 +3741,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_stars_premium" = "premium";
 "lng_gift_stars_auction" = "auction";
 "lng_gift_stars_auction_join" = "Join";
+"lng_gift_stars_auction_view" = "View";
+"lng_gift_stars_auction_soon" = "soon";
+"lng_gift_stars_auction_upgraded" = "upgraded";
 "lng_gift_stars_your_left#one" = "{count} left";
 "lng_gift_stars_your_left#other" = "{count} left";
 "lng_gift_stars_your_finished" = "none left";
@@ -3860,6 +3912,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_upgrade_tradable_about" = "Sell or auction your gift on third-party NFT marketplaces.";
 "lng_gift_upgrade_tradable_about_user" = "{name} will be able to sell the gift on Telegram and NFT marketplaces.";
 "lng_gift_upgrade_tradable_about_channel" = "Admins of {name} will be able to sell the gift on Telegram and NFT marketplaces.";
+"lng_gift_upgrade_wearable_title" = "Wearable";
+"lng_gift_upgrade_wearable_about" = "Display gifts on your page and set them as profile covers or statuses.";
 "lng_gift_upgrade_button" = "Upgrade for {price}";
 "lng_gift_upgrade_decreases" = "Price decreases in {time}";
 "lng_gift_upgrade_see_table" = "See how this price will decrease {arrow}";
@@ -3912,6 +3966,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_transfer_unlist" = "Unlist";
 "lng_gift_transfer_locked_title" = "Action Locked";
 "lng_gift_transfer_locked_text" = "Transfer this gift to your Telegram account on Fragment to unlock this action.";
+"lng_gift_offer_button" = "Offer to Buy";
+"lng_gift_offer_title" = "Offer to Buy";
+"lng_gift_offer_stars_about" = "Choose how many Stars you'd like to offer for {name}.";
+"lng_gift_offer_ton_about" = "Choose how many TON you'd like to offer for {name}.";
+"lng_gift_offer_duration" = "Offer Duration";
+"lng_gift_offer_duration_about" = "Choose how long {user} can accept your offer. When the time expires, the amount will be refunded.";
+"lng_gift_offer_cost_button" = "Offer {cost}";
+"lng_gift_offer_reject_title" = "Reject Offer";
+"lng_gift_offer_confirm_reject" = "Are you sure you want to reject the offer from {user}?";
+"lng_gift_offer_confirm_accept" = "Do you want to sell {name} to {user} for {cost}?";
+"lng_gift_offer_you_get" = "You will receive {cost} after fees.";
+"lng_gift_offer_higher" = "The price you are offered is {percent} higher than the average price for {name}.";
+"lng_gift_offer_lower" = "The price you are offered is {percent} lower than the average price for {name}.";
+"lng_gift_offer_sell_for" = "Sell for {price}";
+"lng_gift_offer_confirm_title" = "Confirm Offer";
+"lng_gift_offer_confirm_text" = "Do you want to offer {cost} to {user} for {name}?";
+"lng_gift_offer_table_offer" = "Offer";
+"lng_gift_offer_table_fee" = "Fee";
+"lng_gift_offer_table_duration" = "Duration";
 "lng_gift_sell_unlist_title" = "Unlist {name}";
 "lng_gift_sell_unlist_sure" = "Are you sure you want to unlist your gift?";
 "lng_gift_sell_title" = "Price in Stars";
@@ -3939,6 +4012,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_wear_badge_title" = "Radiant Badge";
 "lng_gift_wear_badge_about" = "The glittering icon of this item will be displayed next to your name.";
 "lng_gift_wear_badge_about_channel" = "The glittering icon of this item will be displayed next to channel's name.";
+"lng_gift_wear_design_title" = "Unique Profile Design";
+"lng_gift_wear_design_about" = "Your profile page will get the color and the symbol of this item.";
+"lng_gift_wear_design_about_channel" = "Your channel page will get the color and the symbol of this item.";
 "lng_gift_wear_proof_title" = "Proof of Ownership";
 "lng_gift_wear_proof_about" = "Clicking the icon of this item next to your name will show its info and owner.";
 "lng_gift_wear_proof_about_channel" = "Clicking the icon of this item next to channel's name will show its info and owner.";
@@ -4018,6 +4094,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_auction_text_link" = "Learn more {arrow}";
 "lng_auction_text_ended" = "Auction ended.";
 "lng_auction_start_label" = "Started";
+"lng_auction_starts_label" = "Starts";
+"lng_auction_rounds_label" = "Rounds";
+"lng_auction_rounds_exact" = "Round {n}";
+"lng_auction_rounds_range" = "Rounds {n}-{last}";
+"lng_auction_rounds_seconds#one" = "{count} second each";
+"lng_auction_rounds_seconds#other" = "{count} seconds each";
+"lng_auction_rounds_minutes#one" = "{count} minute each";
+"lng_auction_rounds_minutes#other" = "{count} minutes each";
+"lng_auction_rounds_hours#one" = "{count} hour each";
+"lng_auction_rounds_hours#other" = "{count} hours each";
+"lng_auction_rounds_extended" = "{duration} + {increase} for late bids in top {n}";
 "lng_auction_end_label" = "Ends";
 "lng_auction_round_label" = "Current Round";
 "lng_auction_round_value" = "{n} of {amount}";
@@ -4032,10 +4119,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_auction_join_time_left" = "{time} left";
 "lng_auction_join_time_medium" = "{hours} h {minutes} m";
 "lng_auction_join_time_small" = "{minutes} m";
+"lng_auction_join_starts_in" = "starts in {time}";
+"lng_auction_join_early_bid" = "Place an Early Bid";
 "lng_auction_menu_about" = "About";
 "lng_auction_menu_copy_link" = "Copy Link";
 "lng_auction_menu_share" = "Share";
 "lng_auction_bid_title" = "Place a Bid";
+"lng_auction_bid_title_early" = "Place an Early Bid";
 "lng_auction_bid_subtitle#one" = "Top {count} bidder will win";
 "lng_auction_bid_subtitle#other" = "Top {count} bidders will win";
 "lng_auction_bid_your" = "your bid";
@@ -4047,6 +4137,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_auction_bid_until" = "until next round";
 "lng_auction_bid_left#one" = "left";
 "lng_auction_bid_left#other" = "left";
+"lng_auction_bid_before_start" = "before start";
 "lng_auction_bid_your_title" = "Your bid will be";
 "lng_auction_bid_your_outbid" = "You've been outbid";
 "lng_auction_bid_your_winning" = "You're winning";
@@ -4083,13 +4174,34 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_auction_bought_title#other" = "{count} Items Bought";
 "lng_auction_bought_date" = "Date";
 "lng_auction_bought_bid" = "Accepted Bid";
-"lng_auction_bought_round" = "Round #{n}";
+"lng_auction_bought_in_round" = "{name} in round {n}";
 "lng_auction_change_title" = "Change Recipient";
 "lng_auction_change_button" = "Change";
 "lng_auction_change_already" = "You've already placed a bid on this gift for {name}.";
 "lng_auction_change_to" = "Do you want to raise your bid and change the recipient to {name}?";
 "lng_auction_change_already_me" = "You've already placed a bid on this gift for yourself.";
 "lng_auction_change_to_me" =  "Do you want to raise your bid and change the recipient to yourself?";
+"lng_auction_preview_name" = "Upcoming Auction";
+"lng_auction_preview_learn_gifts" = "Learn more about Telegram Gifts {arrow}";
+"lng_auction_preview_variants#one" = "View {emoji} {count} Variant {arrow}";
+"lng_auction_preview_variants#other" = "View {emoji} {count} Variants {arrow}";
+"lng_auction_preview_random" = "Random Traits";
+"lng_auction_preview_selected" = "Selected Traits";
+"lng_auction_preview_randomize" = "Randomize Traits";
+"lng_auction_preview_model" = "model";
+"lng_auction_preview_models#one" = "This collectible features **{count}** unique model.";
+"lng_auction_preview_models#other" = "This collectible features **{count}** unique models.";
+"lng_auction_preview_models_button" = "Models";
+"lng_auction_preview_backdrop" = "backdrop";
+"lng_auction_preview_backdrops#one" = "This collectible features **{count}** unique backdrop.";
+"lng_auction_preview_backdrops#other" = "This collectible features **{count}** unique backdrops.";
+"lng_auction_preview_backdrops_button" = "Backdrops";
+"lng_auction_preview_symbol" = "symbol";
+"lng_auction_preview_symbols#one" = "This collectible features **{count}** unique symbol.";
+"lng_auction_preview_symbols#other" = "This collectible features **{count}** unique symbols.";
+"lng_auction_preview_symbols_button" = "Symbols";
+"lng_auction_preview_wear" = "More about wearing gifts {arrow}";
+"lng_auction_preview_free_upgrade" = "You can upgrade your gift for free, sell it on the market, or set it as your profile cover.";
 
 "lng_accounts_limit_title" = "Limit Reached";
 "lng_accounts_limit1#one" = "You have reached the limit of **{count}** connected account.";
@@ -5067,6 +5179,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_edit_channel_status_about" = "Choose a status that will be shown next to the channel's name.";
 "lng_edit_channel_status_group" = "Set Group Emoji Status";
 "lng_edit_channel_status_about_group" = "Choose a status that will be shown next to the group's name.";
+"lng_edit_channel_personal_channel" = "Set as Personal Channel";
 "lng_edit_self_title" = "Edit your name";
 "lng_confirm_contact_data" = "New Contact";
 "lng_add_contact" = "Create";

Telegram/Resources/qrc/telegram/animations.qrc

@@ -50,6 +50,7 @@
     <file alias="rtmp.tgs">../../animations/rtmp.tgs</file>
     <file alias="show_or_premium_lastseen.tgs">../../animations/show_or_premium_lastseen.tgs</file>
     <file alias="show_or_premium_readtime.tgs">../../animations/show_or_premium_readtime.tgs</file>
+    <file alias="passkeys.tgs">../../animations/passkeys.tgs</file>
 
     <file alias="profile_muting.tgs">../../animations/profile/profile_muting.tgs</file>
     <file alias="profile_unmuting.tgs">../../animations/profile/profile_unmuting.tgs</file>

Telegram/Resources/uwp/AppX/AppxManifest.xml

@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="6.3.4.0" />
+    Version="6.3.9.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

Telegram/Resources/winrc/Telegram.rc

@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,3,4,0
- PRODUCTVERSION 6,3,4,0
+ FILEVERSION 6,3,9,0
+ PRODUCTVERSION 6,3,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "6.3.4.0"
+            VALUE "FileVersion", "6.3.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.3.4.0"
+            VALUE "ProductVersion", "6.3.9.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/Resources/winrc/Updater.rc

@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,3,4,0
- PRODUCTVERSION 6,3,4,0
+ FILEVERSION 6,3,9,0
+ PRODUCTVERSION 6,3,9,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "6.3.4.0"
+            VALUE "FileVersion", "6.3.9.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.3.4.0"
+            VALUE "ProductVersion", "6.3.9.0"
         END
     END
     BLOCK "VarFileInfo"

Telegram/SourceFiles/api/api_authorizations.cpp

@@ -100,7 +100,7 @@ Authorizations::Authorizations(not_null<ApiWrap*> api)
 	_unreviewed = api->session().settings().unreviewed();
 	crl::on_main(&api->session(), [=] { removeExpiredUnreviewed(); });
 	Core::App().settings().deviceModelChanges(
-	) | rpl::start_with_next([=](const QString &model) {
+	) | rpl::on_next([=](const QString &model) {
 		auto changed = false;
 		for (auto &entry : _list) {
 			if (!entry.hash) {

Telegram/SourceFiles/api/api_blocked_peers.cpp

@@ -204,7 +204,7 @@ auto BlockedPeers::slice() -> rpl::producer<BlockedPeers::Slice> {
 	}
 	return _slice
 		? _changes.events_starting_with_copy(*_slice)
-		: (_changes.events() | rpl::type_erased());
+		: (_changes.events() | rpl::type_erased);
 }
 
 void BlockedPeers::request(int offset, Fn<void(BlockedPeers::Slice)> done) {

Telegram/SourceFiles/api/api_bot.cpp

@@ -218,7 +218,7 @@ void SendBotCallbackDataWithPassword(
 			session,
 			tr::lng_bots_password_confirm_check_about(
 				tr::now,
-				Ui::Text::WithEntities));
+				tr::marked));
 		if (box) {
 			show->showBox(std::move(box), Ui::LayerOption::CloseOther);
 		} else {
@@ -227,7 +227,7 @@ void SendBotCallbackDataWithPassword(
 			api->cloudPassword().state(
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=](const Core::CloudPasswordState &state) mutable {
+			) | rpl::on_next([=](const Core::CloudPasswordState &state) mutable {
 				if (lifetime) {
 					base::take(lifetime)->destroy();
 				}
@@ -400,7 +400,7 @@ void ActivateBotCommand(ClickHandlerContext context, int row, int column) {
 			}
 		}
 		const auto replyTo = FullReplyTo();
-		const auto suggest = SuggestPostOptions();
+		const auto suggest = SuggestOptions();
 		Window::PeerMenuCreatePoll(
 			controller,
 			item->history()->peer,

Telegram/SourceFiles/api/api_chat_filters.cpp

@@ -116,24 +116,24 @@ private:
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (type == Type::AddingChats)
 		? tr::lng_filters_by_link_more_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (type == Type::AllAdded)
 		? tr::lng_filters_by_link_already_about(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: tr::lng_filters_by_link_remove_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void InitFilterLinkHeader(
@@ -174,13 +174,13 @@ void InitFilterLinkHeader(
 	box->setAddedTopScrollSkip(max);
 	std::move(
 		header.wheelEvents
-	) | rpl::start_with_next([=](not_null<QWheelEvent*> e) {
+	) | rpl::on_next([=](not_null<QWheelEvent*> e) {
 		box->sendScrollViewportEvent(e);
 	}, widget->lifetime());
 
 	std::move(
 		header.closeRequests
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, widget->lifetime());
 
@@ -193,7 +193,7 @@ void InitFilterLinkHeader(
 	box->scrolls(
 	) | rpl::filter([=] {
 		return !state->processing;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->processing = true;
 		const auto guard = gsl::finally([&] { state->processing = false; });
 
@@ -470,7 +470,7 @@ void ToggleChatsController::adjust(
 void ToggleChatsController::setRealContentHeight(rpl::producer<int> value) {
 	std::move(
 		value
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto desired = _desiredHeight.current();
 		if (height <= computeListSt().item.height) {
 			return;
@@ -547,7 +547,7 @@ void ShowImportToast(
 		? tr::lng_filters_added_title
 		: tr::lng_filters_updated_title;
 	auto text = Ui::Text::Wrapped(
-		phrase(tr::now, lt_folder, title.text, Ui::Text::WithEntities),
+		phrase(tr::now, lt_folder, title.text, tr::marked),
 		EntityType::Bold);
 	if (added > 0) {
 		const auto phrase = created
@@ -644,7 +644,7 @@ void ProcessFilterInvite(
 
 		const auto button = owned.data();
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::filterInviteBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -662,7 +662,7 @@ void ProcessFilterInvite(
 		const auto state = box->lifetime().make_state<State>();
 
 		raw->selectedValue(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
 			button->setClickedCallback([=] {
 				if (peers.empty()) {
@@ -777,7 +777,7 @@ void CheckFilterInvite(
 		if (notLoaded) {
 			const auto lifetime = std::make_shared<rpl::lifetime>();
 			owner.chatsFilters().changed(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				lifetime->destroy();
 				ProcessFilterInvite(
 					weak,
@@ -873,7 +873,7 @@ void ProcessFilterRemove(
 
 		const auto button = owned.data();
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding = st::filterInviteBox.buttonPadding;
 			button->resizeToWidth(width
 				- padding.left()
@@ -886,7 +886,7 @@ void ProcessFilterRemove(
 		HandleEnterInBox(box);
 
 		raw->selectedValue(
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				base::flat_set<not_null<PeerData*>> &&peers) {
 			button->setClickedCallback([=] {
 				done(peers | ranges::to_vector);

Telegram/SourceFiles/api/api_chat_invite.cpp

@@ -159,7 +159,7 @@ void ConfirmSubscriptionBox(
 	state->frame.setDevicePixelRatio(style::DevicePixelRatio());
 	const auto options = Images::Option::RoundCircle;
 	userpic->paintRequest(
-	) | rpl::start_with_next([=, small = Data::PhotoSize::Small] {
+	) | rpl::on_next([=, small = Data::PhotoSize::Small] {
 		state->frame.fill(Qt::transparent);
 		{
 			auto p = QPainter(&state->frame);
@@ -194,7 +194,7 @@ void ConfirmSubscriptionBox(
 		state->photoMedia->wanted(Data::PhotoSize::Small, Data::FileOrigin());
 		if (!state->photoMedia->image(Data::PhotoSize::Small)) {
 			session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				userpic->update();
 			}, userpic->lifetime());
 		}
@@ -224,13 +224,13 @@ void ConfirmSubscriptionBox(
 			box,
 			tr::lng_channel_invite_subscription_about(
 				lt_channel,
-				rpl::single(Ui::Text::Bold(name)),
+				rpl::single(tr::bold(name)),
 				lt_price,
 				tr::lng_credits_summary_options_credits(
 					lt_count,
 					rpl::single(amount) | tr::to_count(),
-					Ui::Text::Bold),
-				Ui::Text::WithEntities),
+					tr::bold),
+				tr::marked),
 			st::inviteLinkSubscribeBoxAbout),
 		style::al_top);
 	Ui::AddSkip(content);
@@ -243,9 +243,9 @@ void ConfirmSubscriptionBox(
 					tr::lng_paid_react_agree_link(),
 					tr::lng_group_invite_subscription_about_url()
 				) | rpl::map([](const QString &text, const QString &url) {
-					return Ui::Text::Link(text, url);
+					return tr::link(text, url);
 				}),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			st::inviteLinkSubscribeBoxTerms),
 		style::al_top);
 
@@ -260,7 +260,7 @@ void ConfirmSubscriptionBox(
 		rpl::combine(
 			balance->sizeValue(),
 			content->sizeValue()
-		) | rpl::start_with_next([=](const QSize &, const QSize &) {
+		) | rpl::on_next([=](const QSize &, const QSize &) {
 			balance->moveToRight(
 				st::creditsHistoryRightSkip * 2,
 				st::creditsHistoryRightSkip);
@@ -408,7 +408,7 @@ void CheckChatInvite(
 				box->boxClosing(
 				) | rpl::filter([=] {
 					return !invitePeekChannel->amIn();
-				}) | rpl::start_with_next([=] {
+				}) | rpl::on_next([=] {
 					if (const auto strong = weak.get()) {
 						strong->clearSectionStack(Window::SectionShow(
 							Window::SectionShow::Way::ClearStack,
@@ -527,7 +527,7 @@ ConfirmInviteBox::ConfirmInviteBox(
 		_photo->wanted(Data::PhotoSize::Small, Data::FileOrigin());
 		if (!_photo->image(Data::PhotoSize::Small)) {
 			_session->downloaderTaskFinished(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				update();
 			}, lifetime());
 		}

Telegram/SourceFiles/api/api_cloud_password.cpp

@@ -68,7 +68,7 @@ void CloudPassword::clearUnconfirmedPassword() {
 rpl::producer<Core::CloudPasswordState> CloudPassword::state() const {
 	return _state
 		? _stateChanges.events_starting_with_copy(*_state)
-		: (_stateChanges.events() | rpl::type_erased());
+		: (_stateChanges.events() | rpl::type_erased);
 }
 
 auto CloudPassword::stateCurrent() const

Telegram/SourceFiles/api/api_common.cpp

@@ -14,7 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Api {
 
-MTPSuggestedPost SuggestToMTP(SuggestPostOptions suggest) {
+MTPSuggestedPost SuggestToMTP(SuggestOptions suggest) {
 	using Flag = MTPDsuggestedPost::Flag;
 	return suggest.exists
 		? MTP_suggestedPost(

Telegram/SourceFiles/api/api_common.h

@@ -19,7 +19,7 @@ namespace Api {
 
 inline constexpr auto kScheduledUntilOnlineTimestamp = TimeId(0x7FFFFFFE);
 
-[[nodiscard]] MTPSuggestedPost SuggestToMTP(SuggestPostOptions suggest);
+[[nodiscard]] MTPSuggestedPost SuggestToMTP(SuggestOptions suggest);
 
 struct SendOptions {
 	uint64 price = 0;
@@ -34,7 +34,7 @@ struct SendOptions {
 	bool invertCaption = false;
 	bool hideViaBot = false;
 	crl::time ttlSeconds = 0;
-	SuggestPostOptions suggest;
+	SuggestOptions suggest;
 
 	friend inline bool operator==(
 		const SendOptions &,

Telegram/SourceFiles/api/api_confirm_phone.cpp

@@ -95,7 +95,7 @@ void ConfirmPhone::resolve(
 				codeHandles->fire_copy(code);
 			});
 			box->resendRequests(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				_api.request(MTPauth_ResendCode(
 					MTP_flags(0),
 					MTP_string(phone),
@@ -110,7 +110,7 @@ void ConfirmPhone::resolve(
 			rpl::merge(
 				codeHandles->events(),
 				box->checkRequests()
-			) | rpl::start_with_next([=](const QString &code) {
+			) | rpl::on_next([=](const QString &code) {
 				if (_checkRequestId) {
 					return;
 				}
@@ -142,7 +142,7 @@ void ConfirmPhone::resolve(
 				}).handleFloodErrors().send();
 			}, box->lifetime());
 			box->boxClosing(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				controller->session().account().setHandleLoginCode(nullptr);
 			}, box->lifetime());
 

Telegram/SourceFiles/api/api_earn.cpp

@@ -69,7 +69,7 @@ void HandleWithdrawalButton(
 		state->lifetime = session->api().cloudPassword().state(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=](const Core::CloudPasswordState &pass) {
+		) | rpl::on_next([=](const Core::CloudPasswordState &pass) {
 			state->loading = false;
 
 			auto fields = PasscodeBox::CloudFields::From(pass);

Telegram/SourceFiles/api/api_global_privacy.cpp

@@ -68,7 +68,7 @@ void GlobalPrivacy::reload(Fn<void()> callback) {
 	}).send();
 
 	_session->appConfig().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_showArchiveAndMute = _session->appConfig().get<bool>(
 			u"autoarchive_setting_available"_q,
 			false);

Telegram/SourceFiles/api/api_messages_search_merged.cpp

@@ -36,7 +36,7 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 	};
 
 	_apiSearch.messagesFounds(
-	) | rpl::start_with_next([=](const FoundMessages &data) {
+	) | rpl::on_next([=](const FoundMessages &data) {
 		if (data.nextToken == _concatedFound.nextToken) {
 			addFound(data);
 			checkFull(data);
@@ -50,7 +50,7 @@ MessagesSearchMerged::MessagesSearchMerged(not_null<History*> history)
 
 	if (_migratedSearch) {
 		_migratedSearch->messagesFounds(
-		) | rpl::start_with_next([=](const FoundMessages &data) {
+		) | rpl::on_next([=](const FoundMessages &data) {
 			if (_isFull) {
 				addFound(data);
 			}

Telegram/SourceFiles/api/api_peer_photo.cpp

@@ -153,7 +153,7 @@ PeerPhoto::PeerPhoto(not_null<ApiWrap*> api)
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
 		_session->uploader().photoReady(
-		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 			ready(data.fullId, data.info.file, std::nullopt);
 		}, _session->lifetime());
 	});

Telegram/SourceFiles/api/api_premium.cpp

@@ -95,7 +95,7 @@ Premium::Premium(not_null<ApiWrap*> api)
 		// only queued, because it is not constructed yet.
 		Data::AmPremiumValue(
 			_session
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			reload();
 			if (_session->premium()) {
 				reloadCloudSet();
@@ -848,8 +848,22 @@ std::optional<Data::StarGift> FromTL(
 		const auto releasedBy = releasedById
 			? session->data().peer(releasedById).get()
 			: nullptr;
+		const auto background = [&] {
+			if (!data.vbackground()) {
+				return std::shared_ptr<Data::StarGiftBackground>();
+			}
+			const auto &fields = data.vbackground()->data();
+			using namespace Ui;
+			return std::make_shared<Data::StarGiftBackground>(
+				Data::StarGiftBackground{
+					.center = ColorFromSerialized(fields.vcenter_color()),
+					.edge = ColorFromSerialized(fields.vedge_color()),
+					.text = ColorFromSerialized(fields.vtext_color()),
+				});
+		};
 		return std::optional<Data::StarGift>(Data::StarGift{
 			.id = uint64(data.vid().v),
+			.background = background(),
 			.stars = int64(data.vstars().v),
 			.starsConverted = int64(data.vconvert_stars().v),
 			.starsToUpgrade = int64(data.vupgrade_stars().value_or_empty()),
@@ -860,10 +874,12 @@ std::optional<Data::StarGift> FromTL(
 			.resellCount = int(data.vavailability_resale().value_or_empty()),
 			.auctionSlug = qs(data.vauction_slug().value_or_empty()),
 			.auctionGiftsPerRound = data.vgifts_per_round().value_or_empty(),
+			.auctionStartDate = data.vauction_start_date().value_or_empty(),
 			.limitedLeft = remaining.value_or_empty(),
 			.limitedCount = total.value_or_empty(),
 			.perUserTotal = data.vper_user_total().value_or_empty(),
 			.perUserRemains = data.vper_user_remains().value_or_empty(),
+			.upgradeVariants = data.vupgrade_variants().value_or_empty(),
 			.firstSaleDate = data.vfirst_sale_date().value_or_empty(),
 			.lastSaleDate = data.vlast_sale_date().value_or_empty(),
 			.lockedUntilDate = data.vlocked_until_date().value_or_empty(),
@@ -930,6 +946,7 @@ std::optional<Data::StarGift> FromTL(
 				.themeUser = themeUser,
 				.nanoTonForResale = FindTonForResale(data.vresell_amount()),
 				.starsForResale = FindStarsForResale(data.vresell_amount()),
+				.starsMinOffer = data.voffer_min_stars().value_or(-1),
 				.number = data.vnum().v,
 				.onlyAcceptTon = data.is_resale_ton_only(),
 				.canBeTheme = data.is_theme_available(),
@@ -942,6 +959,8 @@ std::optional<Data::StarGift> FromTL(
 								data.vvalue_currency().value_or_empty()),
 							.valuePrice = int64(
 								data.vvalue_amount().value_or_empty()),
+							.valuePriceUsd = int64(
+								data.vvalue_usd_amount().value_or_empty()),
 						})
 					: nullptr),
 				.peerColor = colorCollectible,
@@ -963,7 +982,7 @@ std::optional<Data::StarGift> FromTL(
 				unique->originalDetails = FromTL(session, data);
 			});
 		}
-		return std::make_optional(result);
+		return std::make_optional(std::move(result));
 	});
 }
 
@@ -1009,6 +1028,7 @@ std::optional<Data::SavedStarGift> FromTL(
 			? peerFromMTP(*data.vfrom_id())
 			: PeerId()),
 		.date = data.vdate().v,
+		.giftNum = data.vgift_num().value_or_empty(),
 		.upgradeSeparate = data.is_upgrade_separate(),
 		.upgradable = data.is_can_upgrade(),
 		.anonymous = data.is_name_hidden(),

Telegram/SourceFiles/api/api_ringtones.cpp

@@ -66,7 +66,7 @@ Ringtones::Ringtones(not_null<ApiWrap*> api)
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
 		_session->uploader().documentReady(
-		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+		) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 			ready(data.fullId, data.info.file);
 		}, _session->lifetime());
 	});

Telegram/SourceFiles/api/api_suggest_post.cpp

@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "base/unixtime.h"
+#include "boxes/transfer_gift_box.h"
 #include "chat_helpers/message_field.h"
 #include "core/click_handler_types.h"
 #include "data/components/credits.h"
@@ -44,7 +45,7 @@ void SendApproval(
 		not_null<HistoryItem*> item,
 		TimeId scheduleDate = 0) {
 	using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag;
-	const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
 	if (!suggestion
 		|| suggestion->accepted
 		|| suggestion->rejected
@@ -56,7 +57,7 @@ void SendApproval(
 	const auto session = &show->session();
 	const auto finish = [=] {
 		if (const auto item = session->data().message(id)) {
-			const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+			const auto suggestion = item->Get<HistoryMessageSuggestion>();
 			if (suggestion) {
 				suggestion->requestId = 0;
 			}
@@ -83,7 +84,7 @@ void ConfirmApproval(
 		not_null<HistoryItem*> item,
 		TimeId scheduleDate = 0,
 		Fn<void()> accepted = nullptr) {
-	const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
 	if (!suggestion
 		|| suggestion->accepted
 		|| suggestion->rejected
@@ -153,13 +154,13 @@ void ConfirmApproval(
 			? tr::lng_suggest_accept_text(
 				tr::now,
 				lt_from,
-				Ui::Text::Bold(item->from()->shortName()),
-				Ui::Text::WithEntities)
+				tr::bold(item->from()->shortName()),
+				tr::marked)
 			: tr::lng_suggest_accept_text_to(
 				tr::now,
 				lt_channel,
-				Ui::Text::Bold(channelName),
-				Ui::Text::WithEntities);
+				tr::bold(channelName),
+				tr::marked);
 		if (price) {
 			text.append("\n\n").append(admin
 				? (scheduleDate
@@ -170,12 +171,12 @@ void ConfirmApproval(
 							lt_count_decimal,
 							amount.value(),
 							lt_channel,
-							Ui::Text::Bold(channelName),
+							tr::bold(channelName),
 							lt_percent,
 							TextWithEntities{ commission },
 							lt_date,
-							Ui::Text::Bold(date),
-							Ui::Text::RichLangValue)
+							tr::bold(date),
+							tr::rich)
 					: (amount.stars()
 						? tr::lng_suggest_accept_receive_now_stars
 						: tr::lng_suggest_accept_receive_now_ton)(
@@ -183,10 +184,10 @@ void ConfirmApproval(
 							lt_count_decimal,
 							amount.value(),
 							lt_channel,
-							Ui::Text::Bold(channelName),
+							tr::bold(channelName),
 							lt_percent,
 							TextWithEntities{ commission },
-							Ui::Text::RichLangValue))
+							tr::rich))
 				: (scheduleDate
 					? (amount.stars()
 						? tr::lng_suggest_accept_pay_stars
@@ -195,25 +196,25 @@ void ConfirmApproval(
 							lt_count_decimal,
 							amount.value(),
 							lt_date,
-							Ui::Text::Bold(date),
-							Ui::Text::RichLangValue)
+							tr::bold(date),
+							tr::rich)
 					: (amount.stars()
 						? tr::lng_suggest_accept_pay_now_stars
 						: tr::lng_suggest_accept_pay_now_ton)(
 							tr::now,
 							lt_count_decimal,
 							amount.value(),
-							Ui::Text::RichLangValue)));
+							tr::rich)));
 			if (admin) {
 				text.append(' ').append(
 					tr::lng_suggest_accept_receive_if(
 						tr::now,
-						Ui::Text::RichLangValue));
+						tr::rich));
 				if (price.stars()) {
 					text.append("\n\n").append(
 						tr::lng_suggest_options_stars_warning(
 							tr::now,
-							Ui::Text::RichLangValue));
+							tr::rich));
 				}
 			}
 		}
@@ -244,7 +245,7 @@ void SendDecline(
 		not_null<HistoryItem*> item,
 		const QString &comment) {
 	using Flag = MTPmessages_ToggleSuggestedPostApproval::Flag;
-	const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
 	if (!suggestion
 		|| suggestion->accepted
 		|| suggestion->rejected
@@ -256,7 +257,7 @@ void SendDecline(
 	const auto session = &show->session();
 	const auto finish = [=] {
 		if (const auto item = session->data().message(id)) {
-			const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+			const auto suggestion = item->Get<HistoryMessageSuggestion>();
 			if (suggestion) {
 				suggestion->requestId = 0;
 			}
@@ -320,12 +321,12 @@ void RequestDeclineComment(
 			.text = (admin
 				? tr::lng_suggest_decline_text(
 					lt_from,
-					rpl::single(Ui::Text::Bold(item->from()->shortName())),
-					Ui::Text::WithEntities)
+					rpl::single(tr::bold(item->from()->shortName())),
+					tr::marked)
 				: tr::lng_suggest_decline_text_to(
 					lt_channel,
-					rpl::single(Ui::Text::Bold(channelName)),
-					Ui::Text::WithEntities)),
+					rpl::single(tr::bold(channelName)),
+					tr::marked)),
 			.confirmed = [=](Fn<void()> close) { (*callback)(); close(); },
 			.confirmText = tr::lng_suggest_action_decline(),
 			.confirmStyle = &st::attentionBoxButton,
@@ -350,7 +351,7 @@ void RequestDeclineComment(
 			}
 		};
 		reason->submits(
-		) | rpl::start_with_next([=](Qt::KeyboardModifiers modifiers) {
+		) | rpl::on_next([=](Qt::KeyboardModifiers modifiers) {
 			if (!(modifiers & Qt::ShiftModifier)) {
 				(*callback)();
 			}
@@ -365,10 +366,10 @@ void SendSuggest(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<HistoryItem*> item,
 		std::shared_ptr<SendSuggestState> state,
-		Fn<void(SuggestPostOptions&)> modify,
+		Fn<void(SuggestOptions&)> modify,
 		Fn<void()> done = nullptr,
 		int starsApproved = 0) {
-	const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
 	const auto id = item->fullId();
 	const auto withPaymentApproved = [=](int stars) {
 		if (const auto item = show->session().data().message(id)) {
@@ -416,7 +417,7 @@ void SendSuggest(
 void SuggestApprovalDate(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<HistoryItem*> item) {
-	const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
 	if (!suggestion) {
 		return;
 	}
@@ -437,7 +438,7 @@ void SuggestApprovalDate(
 			show,
 			item,
 			state,
-			[=](SuggestPostOptions &options) { options.date = result; },
+			[=](SuggestOptions &options) { options.date = result; },
 			close);
 	};
 	using namespace HistoryView;
@@ -454,12 +455,12 @@ void SuggestApprovalDate(
 void SuggestOfferForMessage(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<HistoryItem*> item,
-		SuggestPostOptions values,
+		SuggestOptions values,
 		HistoryView::SuggestMode mode) {
 	const auto id = item->fullId();
 	const auto state = std::make_shared<SendSuggestState>();
 	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
-	const auto done = [=](SuggestPostOptions result) {
+	const auto done = [=](SuggestOptions result) {
 		const auto item = show->session().data().message(id);
 		if (!item) {
 			return;
@@ -473,7 +474,7 @@ void SuggestOfferForMessage(
 			show,
 			item,
 			state,
-			[=](SuggestPostOptions &options) { options = result; },
+			[=](SuggestOptions &options) { options = result; },
 			close);
 	};
 	using namespace HistoryView;
@@ -490,7 +491,7 @@ void SuggestOfferForMessage(
 void SuggestApprovalPrice(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<HistoryItem*> item) {
-	const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+	const auto suggestion = item->Get<HistoryMessageSuggestion>();
 	if (!suggestion) {
 		return;
 	}
@@ -504,6 +505,20 @@ void SuggestApprovalPrice(
 	}, SuggestMode::Change);
 }
 
+void ConfirmGiftSaleAccept(
+		not_null<Window::SessionController*> window,
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageSuggestion*> suggestion) {
+	ShowGiftSaleAcceptBox(window, item, suggestion);
+}
+
+void ConfirmGiftSaleDecline(
+		not_null<Window::SessionController*> window,
+		not_null<HistoryItem*> item,
+		not_null<HistoryMessageSuggestion*> suggestion) {
+	ShowGiftSaleRejectBox(window, item, suggestion);
+}
+
 } // namespace
 
 std::shared_ptr<ClickHandler> AcceptClickHandler(
@@ -521,9 +536,11 @@ std::shared_ptr<ClickHandler> AcceptClickHandler(
 			return;
 		}
 		const auto show = controller->uiShow();
-		const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+		const auto suggestion = item->Get<HistoryMessageSuggestion>();
 		if (!suggestion) {
 			return;
+		} else if (suggestion->gift) {
+			ConfirmGiftSaleAccept(controller, item, suggestion);
 		} else if (!suggestion->date) {
 			RequestApprovalDate(show, item);
 		} else {
@@ -546,7 +563,12 @@ std::shared_ptr<ClickHandler> DeclineClickHandler(
 		if (!item) {
 			return;
 		}
-		RequestDeclineComment(controller->uiShow(), item);
+		const auto suggestion = item->Get<HistoryMessageSuggestion>();
+		if (suggestion && suggestion->gift) {
+			ConfirmGiftSaleDecline(controller, item, suggestion);
+		} else {
+			RequestDeclineComment(controller->uiShow(), item);
+		}
 	});
 }
 
@@ -573,7 +595,7 @@ std::shared_ptr<ClickHandler> SuggestChangesClickHandler(
 				if (!item) {
 					return;
 				}
-				const auto suggestion = item->Get<HistoryMessageSuggestedPost>();
+				const auto suggestion = item->Get<HistoryMessageSuggestion>();
 				if (!suggestion) {
 					return;
 				}
@@ -594,7 +616,7 @@ std::shared_ptr<ClickHandler> SuggestChangesClickHandler(
 						.messageId = FullMsgId(history->peer->id, item->id),
 						.monoforumPeerId = monoforumPeerId,
 					},
-					SuggestPostOptions{
+					SuggestOptions{
 						.exists = uint32(1),
 						.priceWhole = uint32(suggestion->price.whole()),
 						.priceNano = uint32(suggestion->price.nano()),

Telegram/SourceFiles/api/api_toggling_media.cpp

@@ -24,7 +24,7 @@ void ToggleExistingMedia(
 		Data::FileOrigin origin,
 		ToggleRequestCallback toggleRequest,
 		DoneCallback &&done) {
-	const auto api = &document->owner().session().api();
+	const auto api = &document->session().api();
 
 	auto performRequest = [=](const auto &repeatRequest) -> void {
 		const auto usedFileReference = document->fileReference();

Telegram/SourceFiles/api/api_updates.cpp

@@ -246,12 +246,12 @@ Updates::Updates(not_null<Main::Session*> session)
 	_ptsWaiter.setRequesting(true);
 
 	session->account().mtpUpdates(
-	) | rpl::start_with_next([=](const MTPUpdates &updates) {
+	) | rpl::on_next([=](const MTPUpdates &updates) {
 		mtpUpdateReceived(updates);
 	}, _lifetime);
 
 	session->account().mtpNewSessionCreated(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		mtpNewSessionCreated();
 	}, _lifetime);
 
@@ -265,7 +265,7 @@ Updates::Updates(not_null<Main::Session*> session)
 		Data::PeerUpdate::Flag::FullInfo
 	) | rpl::filter([](const Data::PeerUpdate &update) {
 		return update.peer->isChat() || update.peer->isMegagroup();
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peer = update.peer;
 		if (const auto list = _pendingSpeakingCallParticipants.take(peer)) {
 			if (const auto call = peer->groupCall()) {
@@ -766,7 +766,7 @@ void Updates::addActiveChat(rpl::producer<PeerData*> chat) {
 	const auto key = _activeChats.empty() ? 0 : _activeChats.back().first + 1;
 	std::move(
 		chat
-	) | rpl::start_with_next_done([=](PeerData *peer) {
+	) | rpl::on_next_done([=](PeerData *peer) {
 		auto &active = _activeChats[key];
 		const auto was = active.peer;
 		if (was != peer) {

Telegram/SourceFiles/api/api_user_names.cpp

@@ -251,7 +251,7 @@ void Usernames::requestToCache(not_null<PeerData*> peer) {
 	const auto lifetime = std::make_shared<rpl::lifetime>();
 	*lifetime = loadUsernames(
 		peer
-	) | rpl::start_with_next([=, id = peer->id](Data::Usernames usernames) {
+	) | rpl::on_next([=, id = peer->id](Data::Usernames usernames) {
 		_tinyCache = std::make_pair(id, std::move(usernames));
 		lifetime->destroy();
 	});

Telegram/SourceFiles/api/api_who_reacted.cpp

@@ -174,7 +174,7 @@ struct State {
 	}
 	session->changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		const auto i = context->cachedRead.find(update.item);
 		if (i != end(context->cachedRead)) {
 			session->api().request(i->second.requestId).cancel();
@@ -192,7 +192,7 @@ struct State {
 		session
 	) | rpl::skip(1) | rpl::filter(
 		rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[item, cache] : context->cachedRead) {
 			if (cache.data.current().state == Ui::WhoReadState::MyHidden) {
 				cache.data = Peers{ .state = Ui::WhoReadState::Unknown };
@@ -202,7 +202,7 @@ struct State {
 	session->api().globalPrivacy().hideReadTime(
 	) | rpl::skip(1) | rpl::filter(
 		!rpl::mappers::_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &[item, cache] : context->cachedRead) {
 			if (cache.data.current().state == Ui::WhoReadState::MyHidden) {
 				cache.data = Peers{ .state = Ui::WhoReadState::Unknown };
@@ -590,7 +590,7 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		}
 		std::move(
 			idsWithReactions
-		) | rpl::start_with_next([=](PeersWithReactions &&peers) {
+		) | rpl::on_next([=](PeersWithReactions &&peers) {
 			if (peers.state == WhoReadState::Unknown) {
 				state->userpics.clear();
 				consumer.put_next(Ui::WhoReadContent{
@@ -624,7 +624,7 @@ rpl::producer<Ui::WhoReadContent> WhoReacted(
 		item->history()->session().downloaderTaskFinished(
 		) | rpl::filter([=] {
 			return state->someUserpicsNotLoaded && !state->scheduled;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &userpic : state->userpics) {
 				if (userpic.peer->userpicUniqueKey(userpic.view)
 					!= userpic.uniqueKey) {

Telegram/SourceFiles/apiwrap.cpp

@@ -199,7 +199,7 @@ ApiWrap::ApiWrap(not_null<Main::Session*> session)
 		_session->data().chatsFilters().changed(
 		) | rpl::filter([=] {
 			return _session->data().chatsFilters().archiveNeeded();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			requestMoreDialogsIfNeeded();
 		}, _session->lifetime());
 
@@ -248,7 +248,7 @@ void ApiWrap::setupSupportMode() {
 	}
 
 	_session->settings().supportChatsTimeSliceValue(
-	) | rpl::start_with_next([=](int seconds) {
+	) | rpl::on_next([=](int seconds) {
 		_dialogsLoadTill = seconds ? std::max(base::unixtime::now() - seconds, 0) : 0;
 		refreshDialogsLoadBlocked();
 	}, _session->lifetime());
@@ -487,7 +487,7 @@ void ApiWrap::sendMessageFail(
 				PeerFloodErrorText(&session(), PeerFloodType::Send)),
 			Ui::LayerOption::CloseOther);
 	} else if (show && error == u"USER_BANNED_IN_CHANNEL"_q) {
-		const auto link = Ui::Text::Link(
+		const auto link = tr::link(
 			tr::lng_cant_more_info(tr::now),
 			session().createInternalLinkFull(u"spambot"_q));
 		show->showBox(
@@ -496,7 +496,7 @@ void ApiWrap::sendMessageFail(
 					tr::now,
 					lt_more_info,
 					link,
-					Ui::Text::WithEntities)),
+					tr::marked)),
 			Ui::LayerOption::CloseOther);
 	} else if (error.startsWith(u"SLOWMODE_WAIT_"_q)) {
 		const auto chop = u"SLOWMODE_WAIT_"_q.size();
@@ -1902,7 +1902,7 @@ void ApiWrap::updateNotifySettingsDelayed(
 	}
 	if (_updateNotifyTopics.emplace(topic).second) {
 		topic->destroyed(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_updateNotifyTopics.remove(topic);
 		}, _updateNotifyQueueLifetime);
 		_updateNotifyTimer.callOnce(kNotifySettingSaveTimeout);
@@ -3483,6 +3483,9 @@ void ApiWrap::forwardMessages(
 		flags |= MessageFlag::ShortcutMessage;
 		sendFlags |= SendFlag::f_quick_reply_shortcut;
 	}
+	if (action.options.effectId) {
+		sendFlags |= SendFlag::f_effect;
+	}
 	if (draft.options != Data::ForwardOptions::PreserveInfo) {
 		sendFlags |= SendFlag::f_drop_author;
 	}
@@ -3548,6 +3551,7 @@ void ApiWrap::forwardMessages(
 				MTP_int(action.options.scheduleRepeatPeriod),
 				(sendAs ? sendAs->input : MTP_inputPeerEmpty()),
 				Data::ShortcutIdToMTP(_session, action.options.shortcutId),
+				MTP_long(action.options.effectId),
 				MTPint(), // video_timestamp
 				MTP_long(starsPaid),
 				Api::SuggestToMTP(action.options.suggest)
@@ -4772,7 +4776,7 @@ rpl::producer<bool> ApiWrap::contactSignupSilent() const {
 	return _contactSignupSilent
 		? _contactSignupSilentChanges.events_starting_with_copy(
 			*_contactSignupSilent)
-		: (_contactSignupSilentChanges.events() | rpl::type_erased());
+		: (_contactSignupSilentChanges.events() | rpl::type_erased);
 }
 
 std::optional<bool> ApiWrap::contactSignupSilentCurrent() const {

Telegram/SourceFiles/boxes/about_box.cpp

@@ -36,29 +36,28 @@ namespace {
 rpl::producer<TextWithEntities> Text1() {
 	return tr::lng_about_text1(
 		lt_api_link,
-		tr::lng_about_text1_api(
-		) | Ui::Text::ToLink("https://core.telegram.org/api"),
-		Ui::Text::WithEntities);
+		tr::lng_about_text1_api(tr::url(u"https://core.telegram.org/api"_q)),
+		tr::marked);
 }
 
 rpl::producer<TextWithEntities> Text2() {
 	return tr::lng_about_text2(
 		lt_gpl_link,
-		rpl::single(Ui::Text::Link(
+		rpl::single(tr::link(
 			"GNU GPL",
 			"https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE")),
 		lt_github_link,
-		rpl::single(Ui::Text::Link(
+		rpl::single(tr::link(
 			"GitHub",
 			"https://github.com/telegramdesktop/tdesktop")),
-		Ui::Text::WithEntities);
+		tr::marked);
 }
 
 rpl::producer<TextWithEntities> Text3() {
 	return tr::lng_about_text3(
 		lt_faq_link,
-		tr::lng_about_text3_faq() | Ui::Text::ToLink(telegramFaqLink()),
-		Ui::Text::WithEntities);
+		tr::lng_about_text3_faq(tr::url(telegramFaqLink())),
+		tr::marked);
 }
 
 } // namespace
@@ -186,7 +185,7 @@ void ArchiveHintBox(
 		owned->setNaturalWidth(rect.width());
 		const auto widget = box->addRow(std::move(owned), style::al_top);
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setPen(Qt::NoPen);
@@ -217,11 +216,11 @@ void ArchiveHintBox(
 						lt_emoji,
 						rpl::single(
 							Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
-						Ui::Text::RichLangValue
+						tr::rich
 					) | rpl::map([](TextWithEntities text) {
-						return Ui::Text::Link(std::move(text), 1);
+						return tr::link(std::move(text), 1);
 					}),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				st::channelEarnHistoryRecipientLabel));
 		label->resizeToWidth(box->width()
 			- rect::m::sum::h(st::boxRowPadding));
@@ -263,13 +262,13 @@ void ArchiveHintBox(
 			const auto left = Ui::CreateChild<Ui::RpWidget>(
 				box->verticalLayout().get());
 			left->paintRequest(
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				auto p = Painter(left);
 				icon.paint(p, 0, 0, left->width());
 			}, left->lifetime());
 			left->resize(icon.size());
 			top->geometryValue(
-			) | rpl::start_with_next([=](const QRect &g) {
+			) | rpl::on_next([=](const QRect &g) {
 				left->moveToLeft(
 					(g.left() - left->width()) / 2,
 					g.top() + st::channelEarnHistoryThreeSkip);

Telegram/SourceFiles/boxes/about_sponsored_box.cpp

@@ -42,7 +42,7 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 		rpl::combine(
 			row->sizeValue(),
 			button->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &rowSize,
 				const QSize &buttonSize) {
 			button->moveToLeft(
@@ -61,9 +61,9 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 			tr::lng_sponsored_info_description1_link(),
 			tr::lng_sponsored_info_description1_url()
 		) | rpl::map([](const QString &text, const QString &url) {
-			return Ui::Text::Link(text, url);
+			return tr::link(text, url);
 		}),
-		Ui::Text::RichLangValue);
+		tr::rich);
 	box->addRow(object_ptr<FlatLabel>(box, std::move(text1), stLabel));
 
 	box->addSkip(st::sponsoredUrlButtonSkip);

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -160,7 +160,7 @@ void MustBePublicFailed(
 TextWithEntities PeerFloodErrorText(
 		not_null<Main::Session*> session,
 		PeerFloodType type) {
-	const auto link = Ui::Text::Link(
+	const auto link = tr::link(
 		tr::lng_cant_more_info(tr::now),
 		session->createInternalLinkFull(u"spambot"_q));
 	return ((type == PeerFloodType::InviteGroup)
@@ -169,7 +169,7 @@ TextWithEntities PeerFloodErrorText(
 			tr::now,
 			lt_more_info,
 			link,
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void ShowAddParticipantsError(
@@ -324,9 +324,9 @@ void AddContactBox::prepare() {
 
 	const auto submitted = [=] { submit(); };
 	_first->submits(
-	) | rpl::start_with_next(submitted, _first->lifetime());
+	) | rpl::on_next(submitted, _first->lifetime());
 	_last->submits(
-	) | rpl::start_with_next(submitted, _last->lifetime());
+	) | rpl::on_next(submitted, _last->lifetime());
 	connect(_phone, &Ui::PhoneInput::submitted, [=] { submit(); });
 
 	setDimensions(
@@ -598,13 +598,13 @@ void GroupInfoBox::prepare() {
 			Core::App().settings().sendSubmitWay());
 
 		_description->heightChanges(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			descriptionResized();
 		}, _description->lifetime());
 		_description->submits(
-		) | rpl::start_with_next([=] { submit(); }, _description->lifetime());
+		) | rpl::on_next([=] { submit(); }, _description->lifetime());
 		_description->cancelled(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			closeBox();
 		}, _description->lifetime());
 
@@ -614,7 +614,7 @@ void GroupInfoBox::prepare() {
 			&_navigation->session());
 	}
 	_title->submits(
-	) | rpl::start_with_next([=] { submitName(); }, _title->lifetime());
+	) | rpl::on_next([=] { submitName(); }, _title->lifetime());
 
 	addButton(
 		((_type != Type::Group || _canAddBot)
@@ -920,7 +920,7 @@ void GroupInfoBox::checkInviteLink() {
 		_createdChannel->session().changes().peerUpdates(
 			_createdChannel,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::take(1) | rpl::start_with_next([=] {
+		) | rpl::take(1) | rpl::on_next([=] {
 			checkInviteLink();
 		}, lifetime());
 	}
@@ -1063,11 +1063,11 @@ void SetupChannelBox::prepare() {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		Data::PeerUpdate::Flag::InviteLinks
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rtlupdate(_invitationLink);
 	}, lifetime());
 
-	boxClosing() | rpl::start_with_next([=] {
+	boxClosing() | rpl::on_next([=] {
 		if (!_mustBePublic) {
 			AddParticipantsBoxController::Start(_navigation, _channel);
 		}
@@ -1495,7 +1495,7 @@ void SetupChannelBox::showRevokePublicLinkBoxForEdit() {
 		Box(PublicLinksLimitBox, navigation, callback));
 	const auto session = &navigation->session();
 	revoker->boxClosing(
-	) | rpl::start_with_next(crl::guard(session, [=] {
+	) | rpl::on_next(crl::guard(session, [=] {
 		base::call_delayed(200, session, [=] {
 			if (*revoked) {
 				return;
@@ -1563,19 +1563,19 @@ void EditNameBox::prepare() {
 	_last->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 
 	_first->submits(
-	) | rpl::start_with_next([=] { submit(); }, _first->lifetime());
+	) | rpl::on_next([=] { submit(); }, _first->lifetime());
 	_last->submits(
-	) | rpl::start_with_next([=] { submit(); }, _last->lifetime());
+	) | rpl::on_next([=] { submit(); }, _last->lifetime());
 
 	_first->customTab(true);
 	_last->customTab(true);
 
 	_first->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_last->setFocus();
 	}, _first->lifetime());
 	_last->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_first->setFocus();
 	}, _last->lifetime());
 }

Telegram/SourceFiles/boxes/auto_download_box.cpp

@@ -116,7 +116,7 @@ void AutoDownloadBox::setupContent() {
 		))->toggleOn(
 			rpl::single(value > 0)
 		)->toggledChanges(
-		) | rpl::start_with_next([=](bool enabled) {
+		) | rpl::on_next([=](bool enabled) {
 			(*values)[type] = enabled ? 1 : 0;
 		}, content->lifetime());
 		values->emplace(type, value);

Telegram/SourceFiles/boxes/auto_lock_box.cpp

@@ -102,7 +102,7 @@ void AutoLockBox::prepare() {
 	};
 
 	timeInput->focuses(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		group->setValue(kCustom);
 	}, lifetime());
 
@@ -119,7 +119,7 @@ void AutoLockBox::prepare() {
 			[=] { return group->current() == kCustom; }
 		),
 		timeInput->submitRequests()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto result = collect()) {
 			durationChanged(result);
 		} else {

Telegram/SourceFiles/boxes/background_box.cpp

@@ -211,12 +211,12 @@ void BackgroundBox::prepare() {
 	setInnerTopSkip(st::lineWidth);
 
 	_inner->chooseEvents(
-	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
+	) | rpl::on_next([=](const Data::WallPaper &paper) {
 		chosen(paper);
 	}, _inner->lifetime());
 
 	_inner->removeRequests(
-	) | rpl::start_with_next([=](const Data::WallPaper &paper) {
+	) | rpl::on_next([=](const Data::WallPaper &paper) {
 		removePaper(paper);
 	}, _inner->lifetime());
 }
@@ -396,30 +396,30 @@ BackgroundBox::Inner::Inner(
 			+ st::backgroundPadding));
 
 	Window::Theme::IsNightModeValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updatePapers();
 	}, lifetime());
 	requestPapers();
 
 	_session->downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_check->invalidateCache();
 	}, lifetime());
 
 	if (forChannel()) {
 		_session->data().cloudThemes().chatThemesUpdated(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			updatePapers();
 		}, lifetime());
 	} else {
 		using Update = Window::Theme::BackgroundUpdate;
 		Window::Theme::Background()->updates(
-		) | rpl::start_with_next([=](const Update &update) {
+		) | rpl::on_next([=](const Update &update) {
 			if (update.type == Update::Type::New) {
 				sortPapers();
 				requestPapers();

Telegram/SourceFiles/boxes/background_preview_box.cpp

@@ -225,18 +225,18 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	}
 	generateBackground();
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	_appNightMode.changes(
-	) | rpl::start_with_next([=](bool night) {
+	) | rpl::on_next([=](bool night) {
 		_boxDarkMode = night;
 		update();
 	}, lifetime());
 
 	_boxDarkMode.changes(
-	) | rpl::start_with_next([=](bool dark) {
+	) | rpl::on_next([=](bool dark) {
 		applyDarkMode(dark);
 	}, lifetime());
 
@@ -373,7 +373,7 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 	_dimmingContent->resize(inner->size());
 
 	_dimmingContent->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(_dimmingContent);
 		const auto palette = (dark ? _darkPalette : _lightPalette).get();
 		p.fillRect(clip, equals ? st::boxBg : palette->boxBg());
@@ -386,13 +386,13 @@ void BackgroundPreviewBox::createDimmingSlider(bool dark) {
 			heightValue(),
 			_dimmingWrap->heightValue(),
 			rpl::mappers::_1 - rpl::mappers::_2
-		) | rpl::start_with_next([=](int top) {
+		) | rpl::on_next([=](int top) {
 			_dimmingWrap->move(0, top);
 		}, _dimmingWrap->lifetime());
 
 		_dimmingWrap->toggle(dark, anim::type::instant);
 		_dimmingHeight = _dimmingWrap->heightValue();
-		_dimmingHeight.changes() | rpl::start_with_next([=] {
+		_dimmingHeight.changes() | rpl::on_next([=] {
 			update();
 		}, _dimmingWrap->lifetime());
 	}
@@ -554,7 +554,7 @@ void BackgroundPreviewBox::recreateBlurCheckbox() {
 		sizeValue(),
 		_blur->sizeValue(),
 		_dimmingHeight.value()
-	) | rpl::start_with_next([=](QSize outer, QSize inner, int dimming) {
+	) | rpl::on_next([=](QSize outer, QSize inner, int dimming) {
 		const auto bottom = st::historyPaddingBottom;
 		_blur->move(
 			(outer.width() - inner.width()) / 2,
@@ -562,7 +562,7 @@ void BackgroundPreviewBox::recreateBlurCheckbox() {
 	}, _blur->lifetime());
 
 	_blur->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		checkBlurAnimationStart();
 		update();
 	}, _blur->lifetime());
@@ -607,7 +607,7 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 		document->size);
 
 	session->uploader().documentProgress(
-	) | rpl::start_with_next([=](const FullMsgId &fullId) {
+	) | rpl::on_next([=](const FullMsgId &fullId) {
 		if (fullId != _uploadId) {
 			return;
 		}
@@ -619,7 +619,7 @@ void BackgroundPreviewBox::uploadForPeer(bool both) {
 	}, _uploadLifetime);
 
 	session->uploader().documentReady(
-	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
+	) | rpl::on_next([=](const Storage::UploadedMedia &data) {
 		if (data.fullId != _uploadId) {
 			return;
 		}
@@ -742,13 +742,13 @@ void BackgroundPreviewBox::applyForPeer() {
 		object_ptr<Ui::RpWidget>(this));
 	const auto overlay = _forBothOverlay->entity();
 
-	sizeValue() | rpl::start_with_next([=](QSize size) {
+	sizeValue() | rpl::on_next([=](QSize size) {
 		_forBothOverlay->setGeometry({ QPoint(), size });
 		overlay->setGeometry({ QPoint(), size });
 	}, _forBothOverlay->lifetime());
 
 	overlay->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(overlay);
 		p.drawImage(0, 0, bg);
 		p.fillRect(clip, QColor(0, 0, 0, 64));
@@ -787,7 +787,7 @@ void BackgroundPreviewBox::applyForPeer() {
 		const auto raw = _forBothOverlay.release();
 		raw->shownValue() | rpl::filter(
 			!rpl::mappers::_1
-		) | rpl::take(1) | rpl::start_with_next(crl::guard(raw, [=] {
+		) | rpl::take(1) | rpl::on_next(crl::guard(raw, [=] {
 			delete raw;
 		}), raw->lifetime());
 		raw->toggle(false, anim::type::normal);
@@ -797,7 +797,7 @@ void BackgroundPreviewBox::applyForPeer() {
 	cancel->setTextTransform(RoundButton::TextTransform::NoTransform);
 
 	overlay->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto padding = st::backgroundConfirmPadding;
 		const auto width = size.width()
 			- padding.left()
@@ -1063,7 +1063,7 @@ void BackgroundPreviewBox::updateServiceBg(const std::vector<QColor> &bg) {
 	}
 
 	_serviceBgLifetime = _paletteServiceBg.value(
-	) | rpl::start_with_next([=](QColor color) {
+	) | rpl::on_next([=](QColor color) {
 		_serviceBg = Ui::ThemeAdjustedColor(
 			color,
 			QColor(red / count, green / count, blue / count));

Telegram/SourceFiles/boxes/choose_filter_box.cpp

@@ -22,7 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/filter_icons.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
-#include "ui/text/text_utilities.h" // Ui::Text::Bold
+#include "ui/text/text_utilities.h" // tr::bold
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/menu/menu_action.h"
@@ -99,7 +99,8 @@ protected:
 			p.drawImage(
 				width()
 					- size.width()
-					- st::menuWithIcons.itemPadding.right(),
+					- st::menuWithIcons.itemPadding.right()
+					- st::popupMenuWithIcons.shadow.extend.right(),
 				(height() - size.height()) / 2,
 				_icon);
 		}
@@ -178,10 +179,10 @@ void ChangeFilterById(
 						: tr::lng_filters_toast_remove)(
 							tr::now,
 							lt_chat,
-							Ui::Text::Bold(chat),
+							tr::bold(chat),
 							lt_folder,
 							Ui::Text::Wrapped(name.text, EntityType::Bold),
-							Ui::Text::WithEntities),
+							tr::marked),
 					.textContext = Core::TextContext({
 						.session = &history->session(),
 						.customEmojiLoopLimit = isStatic ? -1 : 0,
@@ -344,7 +345,7 @@ void FillChooseFilterMenu(
 	}
 
 	history->owner().chatsFilters().changed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		menu->hideMenu();
 	}, menu->lifetime());
 }

Telegram/SourceFiles/boxes/connection_box.cpp

@@ -485,7 +485,7 @@ void ProxyRow::updateFields(View &&view) {
 		TextWithEntities()
 			.append(_view.type)
 			.append(' ')
-			.append(Ui::Text::Link(endpoint, QString())),
+			.append(tr::link(endpoint, QString())),
 		Ui::ItemTextDefaultOptions());
 
 	const auto state = _view.state;
@@ -754,7 +754,7 @@ ProxiesBox::ProxiesBox(
 , _settings(settings)
 , _initialWrap(this) {
 	_controller->views(
-	) | rpl::start_with_next([=](View &&view) {
+	) | rpl::on_next([=](View &&view) {
 		applyView(std::move(view));
 	}, lifetime());
 }
@@ -796,12 +796,14 @@ void ProxiesBox::setupTopButton() {
 			.handler = [=] { AddProxyFromClipboard(_controller, uiShow()); },
 			.icon = &st::menuIconImportTheme,
 		});
-		addAction({
-			.text = tr::lng_group_invite_context_delete_all(tr::now),
-			.handler = [=] { _controller->deleteItems(); },
-			.icon = &st::menuIconDeleteAttention,
-			.isAttention = true,
-		});
+		if (!_rows.empty()) {
+			addAction({
+				.text = tr::lng_group_invite_context_delete_all(tr::now),
+				.handler = [=] { _controller->deleteItems(); },
+				.icon = &st::menuIconDeleteAttention,
+				.isAttention = true,
+			});
+		}
 		(*menu)->popup(QCursor::pos());
 		return true;
 	});
@@ -881,17 +883,17 @@ void ProxiesBox::setupContent() {
 		refreshProxyForCalls();
 	});
 	_tryIPv6->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		_controller->setTryIPv6(checked);
 	}, _tryIPv6->lifetime());
 
 	_controller->proxySettingsValue(
-	) | rpl::start_with_next([=](ProxyData::Settings value) {
+	) | rpl::on_next([=](ProxyData::Settings value) {
 		_proxySettings->setValue(value);
 	}, inner->lifetime());
 
 	_proxyForCalls->entity()->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		_controller->setProxyForCalls(checked);
 	}, _proxyForCalls->lifetime());
 
@@ -928,7 +930,7 @@ void ProxiesBox::setupContent() {
 				+ 3 * rowHeight()),
 			st::boxMaxListHeight);
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, inner->lifetime());
 }
@@ -1003,7 +1005,7 @@ void ProxiesBox::createNoRowsLabel() {
 		tr::lng_proxy_description(tr::now),
 		st::proxyEmptyListLabel);
 	_noRows->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		label->resizeToWidth(width);
 		label->moveToLeft(0, 0);
 	}, label->lifetime());
@@ -1011,29 +1013,29 @@ void ProxiesBox::createNoRowsLabel() {
 
 void ProxiesBox::setupButtons(int id, not_null<ProxyRow*> button) {
 	button->deleteClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->deleteItem(id);
 	}, button->lifetime());
 
 	button->restoreClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->restoreItem(id);
 	}, button->lifetime());
 
 	button->editClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		getDelegate()->show(_controller->editItemBox(id));
 	}, button->lifetime());
 
 	rpl::merge(
 		button->shareClicks() | rpl::map_to(false),
 		button->showQrClicks() | rpl::map_to(true)
-	) | rpl::start_with_next([=](bool qr) {
+	) | rpl::on_next([=](bool qr) {
 		_controller->shareItem(id, qr);
 	}, button->lifetime());
 
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_controller->applyItem(id);
 	}, button->lifetime());
 }
@@ -1069,7 +1071,7 @@ void ProxyBox::prepare() {
 		});
 	});
 	_port.data()->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress
 			&& (static_cast<QKeyEvent*>(e.get())->key() == Qt::Key_Backspace)
 			&& _port->cursorPosition() == 0) {
@@ -1179,7 +1181,7 @@ void ProxyBox::setupSocketAddress(const ProxyData &data) {
 		data.port ? QString::number(data.port) : QString(),
 		65535);
 	address->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_port->moveToRight(0, 0);
 		_host->resize(
 			width - _port->width() - st::proxyEditSkip,
@@ -1211,11 +1213,11 @@ void ProxyBox::setupCredentials(const ProxyData &data) {
 		(data.type == Type::Mtproto) ? QString() : data.password);
 	_password->move(0, 0);
 	_password->heightValue(
-	) | rpl::start_with_next([=, wrap = passwordWrap.data()](int height) {
+	) | rpl::on_next([=, wrap = passwordWrap.data()](int height) {
 		wrap->resize(wrap->width(), height);
 	}, _password->lifetime());
 	passwordWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_password->resize(width, _password->height());
 	}, _password->lifetime());
 	credentials->add(std::move(passwordWrap), st::proxyEditInputPadding);
@@ -1237,11 +1239,11 @@ void ProxyBox::setupMtprotoCredentials(const ProxyData &data) {
 		(data.type == Type::Mtproto) ? data.password : QString());
 	_secret->move(0, 0);
 	_secret->heightValue(
-	) | rpl::start_with_next([=, wrap = secretWrap.data()](int height) {
+	) | rpl::on_next([=, wrap = secretWrap.data()](int height) {
 		wrap->resize(wrap->width(), height);
 	}, _secret->lifetime());
 	secretWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		_secret->resize(width, _secret->height());
 	}, _secret->lifetime());
 	mtproto->add(std::move(secretWrap), st::proxyEditInputPadding);
@@ -1303,7 +1305,7 @@ ProxiesBoxController::ProxiesBoxController(not_null<Main::Account*> account)
 	}) | ranges::to_vector;
 
 	_settings.connectionTypeChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_proxySettingsChanges.fire_copy(_settings.settings());
 		const auto i = findByProxy(_settings.selected());
 		if (i != end(_list)) {

Telegram/SourceFiles/boxes/create_poll_box.cpp

@@ -198,7 +198,7 @@ not_null<Ui::FlatLabel*> CreateWarningLabel(
 		st::createPollWarning);
 	result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			const auto length = field->getLastText().size();
 			const auto value = valueLimit - length;
@@ -251,17 +251,17 @@ Options::Option::Option(
 	_wrap->hide(anim::type::instant);
 
 	_content->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFieldGeometry();
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_content->resize(_content->width(), height);
 	}, _field->lifetime());
 
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(_field, [=] {
 			if (_hasCorrect) {
 				_correct->toggle(isGood(), anim::type::normal);
@@ -293,7 +293,7 @@ void Options::Option::createShadow() {
 	_shadow.reset(Ui::CreateChild<Ui::PlainShadow>(field().get()));
 	_shadow->show();
 	field()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		_shadow->setGeometry(
 			left,
@@ -322,7 +322,7 @@ void Options::Option::createRemove() {
 	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
 
 	field->changes(
-	) | rpl::start_with_next([field, toggle] {
+	) | rpl::on_next([field, toggle] {
 		// Don't capture 'this'! Because Option is a value type.
 		*toggle = !field->getLastText().isEmpty();
 	}, field->lifetime());
@@ -331,13 +331,13 @@ void Options::Option::createRemove() {
 		toggle->value(),
 		_removeAlways->value(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		remove->toggle(shown, anim::type::normal);
 	}, remove->lifetime());
 #endif
 
 	field->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		remove->moveToRight(
 			st::createPollOptionRemovePosition.x(),
 			st::createPollOptionRemovePosition.y(),
@@ -359,7 +359,7 @@ void Options::Option::createWarning() {
 	rpl::combine(
 		field->sizeValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QSize size, QSize label) {
+	) | rpl::on_next([=](QSize size, QSize label) {
 		warning->moveToLeft(
 			(size.width()
 				- label.width()
@@ -431,7 +431,7 @@ void Options::Option::enableChooseCorrect(
 		button->entity()->height());
 	button->hide(anim::type::instant);
 	_content->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		button->moveToLeft(
 			left,
@@ -688,19 +688,19 @@ void Options::addEmptyOption() {
 			QPoint(
 				-st::createPollOptionFieldPremium.textMargins.right(),
 				st::createPollOptionEmojiPositionSkip));
-		emojiToggle->shownValue() | rpl::start_with_next([=](bool shown) {
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				return;
 			}
 			_emojiPanelLifetime.destroy();
 			emojiPanel->selector()->emojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 				if (field->hasFocus()) {
 					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 				}
 			}, _emojiPanelLifetime);
 			emojiPanel->selector()->customEmojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 				if (field->hasFocus()) {
 					Data::InsertCustomEmoji(field, data.document);
 				}
@@ -708,24 +708,24 @@ void Options::addEmptyOption() {
 		}, emojiToggle->lifetime());
 	}
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (_list[index]->isGood() && index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
 		}
 	}, field->lifetime());
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			validateState();
 		}));
 	}, field->lifetime());
 	field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		_scrollToWidget.fire_copy(field);
 	}, field->lifetime());
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
@@ -753,7 +753,7 @@ void Options::addEmptyOption() {
 	});
 
 	_list.back()->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			Expects(!_list.empty());
 
@@ -891,13 +891,13 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 			emojiPanel,
 			st::createPollOptionFieldPremiumEmojiPosition);
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			if (question->hasFocus()) {
 				Ui::InsertEmojiAtCursor(question->textCursor(), data.emoji);
 			}
 		}, emojiToggle->lifetime());
 		emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 			if (question->hasFocus()) {
 				Data::InsertCustomEmoji(question, data.document);
 			}
@@ -912,7 +912,7 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
 	rpl::combine(
 		question->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(container->width()
 				- label.width()
@@ -978,7 +978,7 @@ not_null<Ui::InputField*> CreatePollBox::setupSolution(
 	rpl::combine(
 		solution->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(inner->width()
 				- label.width()
@@ -1048,7 +1048,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 			st::createPollLimitPadding));
 
 	question->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		options->focusFirst();
 	}, question->lifetime());
 
@@ -1088,7 +1088,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		rpl::single(quiz->checked()) | rpl::then(quiz->checkedChanges()));
 
 	options->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (quiz->checked()) {
 			solution->setFocus();
 		} else {
@@ -1097,7 +1097,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 	}, question->lifetime());
 
 	solution->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		question->setFocus();
 	}, solution->lifetime());
 
@@ -1109,14 +1109,14 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::MouseButtonPress)
 				&& quiz->checked();
-		}) | rpl::start_with_next([show = uiShow()] {
+		}) | rpl::on_next([show = uiShow()] {
 			show->showToast(tr::lng_polls_create_one_answer(tr::now));
 		}, multiple->lifetime());
 	}
 
 	using namespace rpl::mappers;
 	quiz->checkedChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		if (multiple) {
 			if (checked && multiple->checked()) {
 				multiple->setChecked(false);
@@ -1132,7 +1132,7 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		return !text.isEmpty() && (text.size() <= kQuestionLimit);
 	};
 	question->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isValidQuestion()) {
 			options->focusFirst();
 		}
@@ -1216,12 +1216,12 @@ object_ptr<Ui::RpWidget> CreatePollBox::setupContent() {
 		crl::guard(this, send));
 
 	options->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 
 	options->backspaceInFront(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		FocusAtEnd(question);
 	}, lifetime());
 

Telegram/SourceFiles/boxes/delete_messages_box.cpp

@@ -99,7 +99,7 @@ void DeleteMessagesBox::prepare() {
 					lt_date,
 					TextWithEntities{
 						langDayOfMonthFull(_wipeHistoryFirstToDelete) },
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_sure_delete_by_date_many(
 					tr::now,
 					lt_days,
@@ -108,8 +108,8 @@ void DeleteMessagesBox::prepare() {
 						lt_count,
 						_wipeHistoryFirstToDelete.daysTo(
 							_wipeHistoryLastToDelete) + 1,
-						Ui::Text::WithEntities),
-					Ui::Text::RichLangValue);
+						tr::marked),
+					tr::rich);
 			deleteStyle = &st::attentionBoxButton;
 		} else if (_wipeHistoryJustClear) {
 			const auto isChannel = peer->isChannel() && !peer->isMegagroup();
@@ -130,7 +130,7 @@ void DeleteMessagesBox::prepare() {
 					tr::now,
 					lt_group,
 					peer->name());
-			details = Ui::Text::RichLangValue(details.text);
+			details = tr::rich(details.text);
 			deleteStyle = &st::attentionBoxButton;
 		} else {
 			details.text = peer->isSelf()
@@ -148,7 +148,7 @@ void DeleteMessagesBox::prepare() {
 				: peer->isMegagroup()
 				? tr::lng_sure_leave_group(tr::now)
 				: tr::lng_sure_leave_channel(tr::now);
-			details = Ui::Text::RichLangValue(details.text);
+			details = tr::rich(details.text);
 			if (!peer->isUser()) {
 				*deleteText = tr::lng_box_leave();
 			}
@@ -164,7 +164,7 @@ void DeleteMessagesBox::prepare() {
 			appendDetails(std::move(revoke->description));
 			if (!peer->isUser() && !_wipeHistoryJustClear) {
 				_revoke->checkedValue(
-				) | rpl::start_with_next([=](bool revokeForAll) {
+				) | rpl::on_next([=](bool revokeForAll) {
 					*deleteText = revokeForAll
 						? tr::lng_box_delete()
 						: tr::lng_box_leave();
@@ -201,8 +201,8 @@ void DeleteMessagesBox::prepare() {
 				tr::lng_delete_all_from_user(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(_moderateFrom->name()),
-					Ui::Text::WithEntities),
+					tr::bold(_moderateFrom->name()),
+					tr::marked),
 				false,
 				st::defaultBoxCheckbox);
 
@@ -251,13 +251,13 @@ void DeleteMessagesBox::prepare() {
 						st::defaultBoxCheckbox));
 				_revokeRemember->hide(anim::type::instant);
 				_revoke->checkedValue(
-				) | rpl::start_with_next([=](bool checked) {
+				) | rpl::on_next([=](bool checked) {
 					_revokeRemember->toggle(
 						checked != revokeByDefault,
 						anim::type::normal);
 				}, _revokeRemember->lifetime());
 				_revokeRemember->heightValue(
-				) | rpl::start_with_next([=](int h) {
+				) | rpl::on_next([=](int h) {
 					setDimensions(st::boxWidth, _fullHeight + h);
 				}, lifetime());
 				appendDetails(std::move(revoke->description));
@@ -320,7 +320,7 @@ void DeleteMessagesBox::prepare() {
 	rpl::combine(
 		widthValue(),
 		_text->naturalWidthValue()
-	) | rpl::start_with_next([=](int full, int) {
+	) | rpl::on_next([=](int full, int) {
 		_text->resizeToNaturalWidth(full - padding.left() - padding.right());
 
 		auto fullHeight = st::boxPadding.top()
@@ -396,7 +396,7 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 				tr::now,
 				lt_user,
 				{ user->firstName },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		} else {
 			result.checkbox.text = tr::lng_delete_for_everyone_check(tr::now);
 		}
@@ -429,7 +429,7 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 				tr::now,
 				lt_user,
 				{ user->firstName },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		} else {
 			result.checkbox.text = tr::lng_delete_for_everyone_check(tr::now);
 		}
@@ -441,27 +441,27 @@ auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
 				result.description = tr::lng_selected_unsend_about_user_one(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(user->shortName()),
-					Ui::Text::WithEntities);
+					tr::bold(user->shortName()),
+					tr::marked);
 			} else {
 				result.description = tr::lng_selected_unsend_about_user(
 					tr::now,
 					lt_count,
 					canRevokeOutgoingCount,
 					lt_user,
-					Ui::Text::Bold(user->shortName()),
-					Ui::Text::WithEntities);
+					tr::bold(user->shortName()),
+					tr::marked);
 			}
 		} else if (canRevokeOutgoingCount == 1) {
 			result.description = tr::lng_selected_unsend_about_group_one(
 				tr::now,
-				Ui::Text::WithEntities);
+				tr::marked);
 		} else {
 			result.description = tr::lng_selected_unsend_about_group(
 				tr::now,
 				lt_count,
 				canRevokeOutgoingCount,
-				Ui::Text::WithEntities);
+				tr::marked);
 		}
 		return result;
 	}
@@ -557,7 +557,7 @@ void DeleteMessagesBox::deleteAndClear() {
 				? tr::lng_suggest_warn_text_ton
 				: tr::lng_suggest_warn_text_stars)(
 					tr::now,
-					Ui::Text::RichLangValue),
+					tr::rich),
 			.confirmed = callback,
 			.confirmText = tr::lng_suggest_warn_delete_anyway(tr::now),
 			.confirmStyle = &st::attentionBoxButton,

Telegram/SourceFiles/boxes/dictionaries_manager.cpp

@@ -143,7 +143,7 @@ auto AddButtonWithLoader(
 
 	std::move(
 		query
-	) | rpl::start_with_next([=](auto string) {
+	) | rpl::on_next([=](auto string) {
 		wrap->toggle(
 			ranges::any_of(indexList, [&](const QString &s) {
 				return s.startsWith(string, Qt::CaseInsensitive);
@@ -198,7 +198,7 @@ auto AddButtonWithLoader(
 	};
 
 	Spellchecker::GlobalLoaderChanged(
-	) | rpl::start_with_next([=](int langId) {
+	) | rpl::on_next([=](int langId) {
 		if (!langId && rawGlobalLoaderPtr()) {
 			setGlobalLoaderPtr(nullptr);
 		} else if (langId == id) {
@@ -215,14 +215,14 @@ auto AddButtonWithLoader(
 	rpl::combine(
 		button->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		label->moveToLeft(
 			st::settingsUpdateStatePosition.x(),
 			st::settingsUpdateStatePosition.y());
 	}, label->lifetime());
 
 	buttonState->value(
-	) | rpl::start_with_next([=](const DictState &state) {
+	) | rpl::on_next([=](const DictState &state) {
 		const auto isToggledSet = v::is<Active>(state);
 		const auto toggled = isToggledSet ? 1. : 0.;
 		const auto over = !button->isDisabled()
@@ -279,7 +279,7 @@ auto AddButtonWithLoader(
 	});
 
 	button->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		const auto &state = buttonState->current();
 		if (toggled && (v::is<Available>(state) || v::is<Failed>(state))) {
 			const auto weak = base::make_weak(button);
@@ -353,7 +353,7 @@ void Inner::setupContent(
 			ranges::contains(enabledDictionaries, id),
 			queryStream->events());
 		row->toggledValue(
-		) | rpl::start_with_next([=](auto enabled) {
+		) | rpl::on_next([=](auto enabled) {
 			if (enabled) {
 				_enabledRows.push_back(id);
 			} else {
@@ -420,7 +420,7 @@ void ManageDictionariesBox::prepare() {
 	});
 	addButton(tr::lng_close(), [=] { closeBox(); });
 
-	boxClosing() | rpl::start_with_next([=] {
+	boxClosing() | rpl::on_next([=] {
 		Core::App().settings().setDictionariesEnabled(
 			FilterEnabledDict(initialEnabledRows));
 		Core::App().saveSettingsDelayed();
@@ -434,7 +434,7 @@ void ManageDictionariesBox::prepare() {
 		inner->heightValue(),
 		multiSelect->heightValue(),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		using std::min;
 		accumulate_max(*max, height);
 		setDimensions(st::boxWidth, min(*max, st::boxMaxListHeight), true);

Telegram/SourceFiles/boxes/edit_caption_box.cpp

@@ -232,7 +232,7 @@ EditCaptionBox::EditCaptionBox(
 	not_null<Window::SessionController*> controller,
 	not_null<HistoryItem*> item,
 	TextWithTags &&text,
-	SuggestPostOptions suggest,
+	SuggestOptions suggest,
 	bool spoilered,
 	bool invertCaption,
 	Ui::PreparedList &&list,
@@ -262,7 +262,7 @@ EditCaptionBox::EditCaptionBox(
 
 	_controller->session().data().itemRemoved(
 		_historyItem->fullId()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, lifetime());
 }
@@ -273,7 +273,7 @@ void EditCaptionBox::StartMediaReplace(
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		TextWithTags text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved) {
@@ -304,7 +304,7 @@ void EditCaptionBox::StartMediaReplace(
 		FullMsgId itemId,
 		Ui::PreparedList &&list,
 		TextWithTags text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved) {
@@ -353,7 +353,7 @@ void EditCaptionBox::StartPhotoEdit(
 		std::shared_ptr<Data::PhotoMedia> media,
 		FullMsgId itemId,
 		TextWithTags text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved) {
@@ -490,7 +490,7 @@ void EditCaptionBox::rebuildPreview() {
 		const auto withCheckbox = _isPhoto && CanBeCompressed(_albumType);
 		if (media && (!withCheckbox || !_asFile)) {
 			media->spoileredChanges(
-			) | rpl::start_with_next([=](bool spoilered) {
+			) | rpl::on_next([=](bool spoilered) {
 				_mediaEditManager.apply({ .type = spoilered
 					? SendMenu::ActionType::SpoilerOn
 					: SendMenu::ActionType::SpoilerOff
@@ -512,7 +512,7 @@ void EditCaptionBox::rebuildPreview() {
 		_footerHeight.value(),
 		rpl::single(st::boxPhotoPadding.top()),
 		rpl::mappers::_1 + rpl::mappers::_2 + rpl::mappers::_3
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(
 			st::boxWideWidth,
 			std::min(st::sendMediaPreviewHeightMax, height),
@@ -525,11 +525,11 @@ void EditCaptionBox::rebuildPreview() {
 	_content->modifyRequests(
 	) | rpl::start_to_stream(_photoEditorOpens, _content->lifetime());
 
-	_content->editCoverRequests() | rpl::start_with_next([=] {
+	_content->editCoverRequests() | rpl::on_next([=] {
 		setupEditCoverHandler();
 	}, _content->lifetime());
 
-	_content->clearCoverRequests() | rpl::start_with_next([=] {
+	_content->clearCoverRequests() | rpl::on_next([=] {
 		setupClearCoverHandler();
 	}, _content->lifetime());
 
@@ -566,13 +566,13 @@ void EditCaptionBox::setupField() {
 	_field->setMaxHeight(st::defaultComposeFiles.caption.heightMax);
 
 	_field->submits(
-	) | rpl::start_with_next([=] { save(); }, _field->lifetime());
+	) | rpl::on_next([=] { save(); }, _field->lifetime());
 	_field->cancelled(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		closeBox();
 	}, _field->lifetime());
 	_field->heightChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		captionResized();
 	}, _field->lifetime());
 	_field->setMimeDataHook([=](
@@ -656,7 +656,7 @@ void EditCaptionBox::setInitialText() {
 		}
 	});
 	_field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_checkChangedTimer.callOnce(kChangesDebounceTimeout);
 		setCloseByOutsideClick(false);
 	}, _field->lifetime());
@@ -696,7 +696,7 @@ void EditCaptionBox::setupControls() {
 		}),
 		anim::type::instant
 	)->entity()->checkedChanges(
-	) | rpl::start_with_next([&](bool checked) {
+	) | rpl::on_next([&](bool checked) {
 		applyChanges();
 		_asFile = !checked;
 		rebuildPreview();
@@ -707,7 +707,7 @@ void EditCaptionBox::setupControls() {
 
 void EditCaptionBox::setupEditEventHandler() {
 	_editMediaClicks.events(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		ChooseReplacement(_controller, _albumType, crl::guard(this, [=](
 				Ui::PreparedList &&list) {
 			setPreparedList(std::move(list));
@@ -718,7 +718,7 @@ void EditCaptionBox::setupEditEventHandler() {
 void EditCaptionBox::setupPhotoEditorEventHandler() {
 	const auto openedOnce = lifetime().make_state<bool>(false);
 	_photoEditorOpens.events(
-	) | rpl::start_with_next([=, controller = _controller] {
+	) | rpl::on_next([=, controller = _controller] {
 		if (_preparedList.files.empty()
 			&& (!_photoMedia
 				|| !_photoMedia->image(Data::PhotoSize::Large))) {
@@ -880,11 +880,11 @@ void EditCaptionBox::setupEmojiPanel() {
 	_emojiPanel->hide();
 	_emojiPanel->selector()->setCurrentPeer(_historyItem->history()->peer);
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_field->textCursor(), data.emoji);
 	}, lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji

Telegram/SourceFiles/boxes/edit_caption_box.h

@@ -39,7 +39,7 @@ public:
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item,
 		TextWithTags &&text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Ui::PreparedList &&list,
@@ -50,7 +50,7 @@ public:
 		not_null<Window::SessionController*> controller,
 		FullMsgId itemId,
 		TextWithTags text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved);
@@ -59,7 +59,7 @@ public:
 		FullMsgId itemId,
 		Ui::PreparedList &&list,
 		TextWithTags text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved);
@@ -68,7 +68,7 @@ public:
 		std::shared_ptr<Data::PhotoMedia> media,
 		FullMsgId itemId,
 		TextWithTags text,
-		SuggestPostOptions suggest,
+		SuggestOptions suggest,
 		bool spoilered,
 		bool invertCaption,
 		Fn<void()> saved);
@@ -117,7 +117,7 @@ private:
 
 	const not_null<Window::SessionController*> _controller;
 	const not_null<HistoryItem*> _historyItem;
-	const SuggestPostOptions _suggest;
+	const SuggestOptions _suggest;
 	const bool _isAllowedEditMedia;
 	const Ui::AlbumType _albumType;
 

Telegram/SourceFiles/boxes/edit_privacy_box.cpp

@@ -111,11 +111,11 @@ void CreateRadiobuttonLock(
 	lock->resize(st::defaultRadio.diameter, st::defaultRadio.diameter);
 
 	widget->sizeValue(
-	) | rpl::start_with_next([=, &st](QSize size) {
+	) | rpl::on_next([=, &st](QSize size) {
 		lock->move(st.checkPosition);
 	}, lock->lifetime());
 
-	lock->paintRequest() | rpl::start_with_next([=] {
+	lock->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(lock);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto &icon = st::messagePrivacyLock;
@@ -138,7 +138,7 @@ void AddPremiumRequiredRow(
 	const auto row = Ui::CreateChild<Ui::AbstractButton>(widget.get());
 
 	widget->sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		row->resize(s);
 	}, row->lifetime());
 	row->setClickedCallback(std::move(clickedCallback));
@@ -147,7 +147,7 @@ void AddPremiumRequiredRow(
 
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=](bool premium) {
+	) | rpl::on_next([=](bool premium) {
 		row->setVisible(!premium);
 		if (!premium) {
 			setDefaultOption();
@@ -382,7 +382,7 @@ auto PrivacyExceptionsBoxController::prepareSpecialRowList(
 		tr::lng_edit_privacy_users_and_groups()));
 
 	controller->specialChanges(
-	) | rpl::start_with_next([=](bool chosen) {
+	) | rpl::on_next([=](bool chosen) {
 		if (type == SpecialRowType::Premiums) {
 			_selected.premiums = chosen;
 		} else {
@@ -391,7 +391,7 @@ auto PrivacyExceptionsBoxController::prepareSpecialRowList(
 	}, lifetime);
 
 	controller->rowSelectionChanges(
-	) | rpl::start_with_next([=](RowSelectionChange update) {
+	) | rpl::on_next([=](RowSelectionChange update) {
 		this->delegate()->peerListSetForeignRowChecked(
 			update.row,
 			update.checked,
@@ -543,7 +543,7 @@ auto PrivacyExceptionsBoxController::createRow(not_null<History*> history)
 		updateByValue(value);
 		valueFinished(value);
 	};
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		min->setTextColorOverride(st::windowSubTextFg->c);
 		max->setTextColorOverride(st::windowSubTextFg->c);
 	}, raw->lifetime());
@@ -559,7 +559,7 @@ auto PrivacyExceptionsBoxController::createRow(not_null<History*> history)
 		state->indexMin);
 	slider->resize(slider->width(), sliderStyle->seekSize.height());
 
-	raw->widthValue() | rpl::start_with_next([=](int width) {
+	raw->widthValue() | rpl::on_next([=](int width) {
 		labels->resizeToWidth(width);
 		updateByIndex();
 	}, slider->lifetime());
@@ -907,7 +907,7 @@ void EditPrivacyBox::setupContent() {
 	const auto never = addExceptionLink(Exception::Never);
 	addLabel(
 		content,
-		_controller->exceptionsDescription() | Ui::Text::ToWithEntities(),
+		_controller->exceptionsDescription() | rpl::map(tr::marked),
 		st::defaultVerticalListSkip);
 
 	auto below = _controller->setupBelowWidget(
@@ -939,7 +939,7 @@ void EditPrivacyBox::setupContent() {
 		+ st::settingsButtonNoIcon.padding.bottom();
 
 	widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		content->resizeToWidth(width);
 	}, content->lifetime());
 
@@ -947,7 +947,7 @@ void EditPrivacyBox::setupContent() {
 	) | rpl::map([=](int height) {
 		return height - always->height() - never->height() + 2 * linkHeight;
 	}) | rpl::distinct_until_changed(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWideWidth, height);
 	}, content->lifetime());
 }
@@ -1076,7 +1076,7 @@ void EditMessagesPrivacyBox(
 				key
 			) | rpl::take(
 				1
-			) | rpl::start_with_next([=](const Api::UserPrivacy::Rule &value) {
+			) | rpl::on_next([=](const Api::UserPrivacy::Rule &value) {
 				EditNoPaidMessagesExceptions(controller, value);
 			});
 		});
@@ -1092,15 +1092,15 @@ void EditMessagesPrivacyBox(
 	using WeakToast = base::weak_ptr<Ui::Toast::Instance>;
 	const auto toast = std::make_shared<WeakToast>();
 	const auto showToast = [=] {
-		auto link = Ui::Text::Link(
-			Ui::Text::Semibold(
+		auto link = tr::link(
+			tr::semibold(
 				tr::lng_messages_privacy_premium_link(tr::now)));
 		(*toast) = controller->showToast({
 			.text = tr::lng_messages_privacy_premium(
 				tr::now,
 				lt_link,
 				link,
-				Ui::Text::WithEntities),
+				tr::marked),
 			.filter = crl::guard(&controller->session(), [=](
 					const ClickHandlerPtr &,
 					Qt::MouseButton button) {
@@ -1233,7 +1233,7 @@ rpl::producer<int> SetupChargeSlider(
 
 	const auto details = container->add(
 		object_ptr<Ui::VerticalLayout>(container));
-	state->stars.value() | rpl::start_with_next([=](int stars) {
+	state->stars.value() | rpl::on_next([=](int stars) {
 		while (details->count()) {
 			delete details->widgetAt(0);
 		}
@@ -1277,7 +1277,7 @@ void EditDirectMessagesPriceBox(
 		.lottieMargins = st::settingsFilterIconPadding,
 		.showFinished = box->showFinishes(),
 		.about = tr::lng_manage_monoforum_about(
-			Ui::Text::RichLangValue
+			tr::rich
 		),
 		.aboutMargins = st::settingsFilterDividerLabelPadding,
 	});
@@ -1313,7 +1313,7 @@ void EditDirectMessagesPriceBox(
 		savedValue,
 		channel->session().appConfig().paidMessageChannelStarsDefault(),
 		true
-	) | rpl::start_with_next([=](int stars) {
+	) | rpl::on_next([=](int stars) {
 		*result = stars;
 	}, box->lifetime());
 
@@ -1358,7 +1358,7 @@ void EditDirectMessagesPriceBox(
 			label->take(),
 			st::inviteLinkFieldPadding);
 
-		label->clicks() | rpl::start_with_next(copyLink, label->lifetime());
+		label->clicks() | rpl::on_next(copyLink, label->lifetime());
 
 		Ui::AddSkip(inner);
 

Telegram/SourceFiles/boxes/edit_todo_list_box.cpp

@@ -227,7 +227,7 @@ not_null<Ui::FlatLabel*> CreateWarningLabel(
 		st::createPollWarning);
 	result->setAttribute(Qt::WA_TransparentForMouseEvents);
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			const auto length = field->getLastText().size();
 			const auto value = valueLimit - length;
@@ -310,12 +310,12 @@ Tasks::Task::Task(
 	_wrap->hide(anim::type::instant);
 
 	_content->widthValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		updateFieldGeometry();
 	}, _field->lifetime());
 
 	_field->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		_content->resize(_content->width(), height);
 	}, _field->lifetime());
 
@@ -340,7 +340,7 @@ void Tasks::Task::createShadow() {
 	_shadow.reset(Ui::CreateChild<Ui::PlainShadow>(field().get()));
 	_shadow->show();
 	field()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto left = st::createPollFieldPadding.left();
 		_shadow->setGeometry(
 			left,
@@ -369,7 +369,7 @@ void Tasks::Task::createRemove() {
 	_removeAlways = lifetime.make_state<rpl::variable<bool>>(false);
 
 	field->changes(
-	) | rpl::start_with_next([field, toggle] {
+	) | rpl::on_next([field, toggle] {
 		// Don't capture 'this'! Because Option is a value type.
 		*toggle = !field->getLastText().isEmpty();
 	}, field->lifetime());
@@ -378,13 +378,13 @@ void Tasks::Task::createRemove() {
 		toggle->value(),
 		_removeAlways->value(),
 		_1 || _2
-	) | rpl::start_with_next([=](bool shown) {
+	) | rpl::on_next([=](bool shown) {
 		remove->toggle(shown, anim::type::normal);
 	}, remove->lifetime());
 #endif
 
 	field->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		remove->moveToRight(
 			st::createPollOptionRemovePosition.x(),
 			st::createPollOptionRemovePosition.y(),
@@ -406,7 +406,7 @@ void Tasks::Task::createWarning() {
 	rpl::combine(
 		field->sizeValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QSize size, QSize label) {
+	) | rpl::on_next([=](QSize size, QSize label) {
 		warning->moveToLeft(
 			(size.width()
 				- label.width()
@@ -717,19 +717,19 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 			QPoint(
 				-st::createPollOptionFieldPremium.textMargins.right(),
 				st::createPollOptionEmojiPositionSkip));
-		emojiToggle->shownValue() | rpl::start_with_next([=](bool shown) {
+		emojiToggle->shownValue() | rpl::on_next([=](bool shown) {
 			if (!shown) {
 				return;
 			}
 			_emojiPanelLifetime.destroy();
 			emojiPanel->selector()->emojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+			) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 				if (field->hasFocus()) {
 					Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 				}
 			}, _emojiPanelLifetime);
 			emojiPanel->selector()->customEmojiChosen(
-			) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+			) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 				if (field->hasFocus()) {
 					Data::InsertCustomEmoji(field, data.document);
 				}
@@ -741,14 +741,14 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 		TextUtilities::ConvertEntitiesToTextTags(text.entities)
 	});
 	field->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (_list[index]->isGood() && index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
 		}
 	}, field->lifetime());
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto list = ParsePastedList(field->getLastText());
 		if (!list.empty()) {
 			field->setText(list.front());
@@ -762,11 +762,11 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 		}));
 	}, field->lifetime());
 	field->focusedChanges(
-	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+	) | rpl::filter(rpl::mappers::_1) | rpl::on_next([=] {
 		_scrollToWidget.fire_copy(field);
 	}, field->lifetime());
 	field->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto index = findField(field);
 		if (index + 1 < _list.size()) {
 			_list[index + 1]->setFocus();
@@ -794,7 +794,7 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 	});
 
 	task->removeClicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		Ui::PostponeCall(crl::guard(field, [=] {
 			Expects(!_list.empty());
 
@@ -895,7 +895,7 @@ EditTodoListBox::EditTodoListBox(
 , _titleLimit(controller->session().appConfig().todoListTitleLimit()) {
 	_controller->session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.item == item) {
 			closeBox();
 		}
@@ -946,13 +946,13 @@ not_null<Ui::InputField*> EditTodoListBox::setupTitle(
 			_emojiPanel.get(),
 			st::createPollOptionFieldPremiumEmojiPosition);
 		_emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			if (title->hasFocus()) {
 				Ui::InsertEmojiAtCursor(title->textCursor(), data.emoji);
 			}
 		}, emojiToggle->lifetime());
 		_emojiPanel->selector()->customEmojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+		) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 			if (title->hasFocus()) {
 				Data::InsertCustomEmoji(title, data.document);
 			}
@@ -976,7 +976,7 @@ not_null<Ui::InputField*> EditTodoListBox::setupTitle(
 	rpl::combine(
 		title->geometryValue(),
 		warning->sizeValue()
-	) | rpl::start_with_next([=](QRect geometry, QSize label) {
+	) | rpl::on_next([=](QRect geometry, QSize label) {
 		warning->moveToLeft(
 			(container->width()
 				- label.width()
@@ -1044,7 +1044,7 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 			st::createPollLimitPadding));
 
 	title->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		tasks->focusFirst();
 	}, title->lifetime());
 
@@ -1067,7 +1067,7 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 		st::createPollCheckboxMargin);
 
 	tasks->tabbed(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		title->setFocus();
 	}, title->lifetime());
 
@@ -1076,7 +1076,7 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 		return !text.isEmpty() && (text.size() <= _titleLimit);
 	};
 	title->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (isValidTitle()) {
 			tasks->focusFirst();
 		}
@@ -1146,12 +1146,12 @@ object_ptr<Ui::RpWidget> EditTodoListBox::setupContent() {
 		crl::guard(this, send));
 
 	tasks->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 
 	tasks->backspaceInFront(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		FocusAtEnd(title);
 	}, lifetime());
 
@@ -1201,7 +1201,7 @@ AddTodoListTasksBox::AddTodoListTasksBox(
 , _item(item) {
 	_controller->session().changes().messageUpdates(
 		Data::MessageUpdate::Flag::Destroyed
-	) | rpl::start_with_next([=](const Data::MessageUpdate &update) {
+	) | rpl::on_next([=](const Data::MessageUpdate &update) {
 		if (update.item == item) {
 			closeBox();
 		}
@@ -1266,7 +1266,7 @@ object_ptr<Ui::RpWidget> AddTodoListTasksBox::setupContent() {
 	};
 
 	tasks->scrollToWidget(
-	) | rpl::start_with_next([=](not_null<QWidget*> widget) {
+	) | rpl::on_next([=](not_null<QWidget*> widget) {
 		scrollToWidget(widget);
 	}, lifetime());
 

Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp

@@ -94,7 +94,7 @@ not_null<FilterChatsPreview*> SetupChatsPreview(
 		(rules.*peers)()));
 
 	preview->flagRemoved(
-	) | rpl::start_with_next([=](Flag flag) {
+	) | rpl::on_next([=](Flag flag) {
 		const auto rules = data->current();
 		auto computed = Data::ChatFilter(
 			rules.id(),
@@ -110,7 +110,7 @@ not_null<FilterChatsPreview*> SetupChatsPreview(
 	}, preview->lifetime());
 
 	preview->peerRemoved(
-	) | rpl::start_with_next([=](not_null<History*> history) {
+	) | rpl::on_next([=](not_null<History*> history) {
 		const auto rules = data->current();
 		auto always = rules.always();
 		auto pinned = rules.pinned();
@@ -220,13 +220,13 @@ void CreateIconSelector(
 	data->value(
 	) | rpl::map([=](const Data::ChatFilter &filter) {
 		return Ui::ComputeFilterIcon(filter);
-	}) | rpl::start_with_next([=](Ui::FilterIcon icon) {
+	}) | rpl::on_next([=](Ui::FilterIcon icon) {
 		*type = icon;
 		toggle->update();
 	}, toggle->lifetime());
 
 	input->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		const auto left = geometry.x() + geometry.width() - toggle->width();
 		const auto position = st::windowFilterIconTogglePosition;
 		toggle->move(
@@ -235,7 +235,7 @@ void CreateIconSelector(
 	}, toggle->lifetime());
 
 	toggle->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(toggle);
 		const auto icons = Ui::LookupFilterIcon(*type);
 		icons.normal->paintInCenter(
@@ -253,7 +253,7 @@ void CreateIconSelector(
 	panel->chosen(
 	) | rpl::filter([=](Ui::FilterIcon icon) {
 		return icon != Ui::ComputeFilterIcon(data->current());
-	}) | rpl::start_with_next([=](Ui::FilterIcon icon) {
+	}) | rpl::on_next([=](Ui::FilterIcon icon) {
 		panel->hideAnimated();
 		const auto rules = data->current();
 		*data = Data::ChatFilter(
@@ -382,7 +382,7 @@ void EditFilterBox(
 	});
 	state->hasLinks.value() | rpl::filter(
 		_1
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->chatlist = true;
 	}, box->lifetime());
 
@@ -391,7 +391,7 @@ void EditFilterBox(
 	owner->chatsFilters().isChatlistChanged(
 	) | rpl::filter([=](FilterId id) {
 		return (id == data->current().id());
-	}) | rpl::start_with_next([=](FilterId id) {
+	}) | rpl::on_next([=](FilterId id) {
 		const auto filters = &owner->chatsFilters();
 		const auto &list = filters->list();
 		const auto i = ranges::find(list, id, &Data::ChatFilter::id);
@@ -414,7 +414,7 @@ void EditFilterBox(
 	const auto session = &window->session();
 	Data::AmPremiumValue(
 		session
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		box->closeBox();
 	}, box->lifetime());
 
@@ -458,7 +458,7 @@ void EditFilterBox(
 	staticTitle->setClickedCallback([=] {
 		state->staticTitle = !state->staticTitle.current();
 	});
-	state->staticTitle.value() | rpl::start_with_next([=](bool value) {
+	state->staticTitle.value() | rpl::on_next([=](bool value) {
 		staticTitle->setText(value
 			? tr::lng_filters_enable_animations(tr::now)
 			: tr::lng_filters_disable_animations(tr::now));
@@ -480,7 +480,7 @@ void EditFilterBox(
 	rpl::combine(
 		staticTitle->widthValue(),
 		name->widthValue()
-	) | rpl::start_with_next([=](int inner, int outer) {
+	) | rpl::on_next([=](int inner, int outer) {
 		staticTitle->moveToRight(
 			st::windowFilterStaticTitlePosition.x(),
 			st::windowFilterStaticTitlePosition.y(),
@@ -488,7 +488,7 @@ void EditFilterBox(
 	}, staticTitle->lifetime());
 
 	state->creating.value(
-	) | rpl::filter(!_1) | rpl::start_with_next([=] {
+	) | rpl::filter(!_1) | rpl::on_next([=] {
 		nameEditing->custom = true;
 	}, box->lifetime());
 
@@ -508,11 +508,11 @@ void EditFilterBox(
 	state->emojiPanel->hide();
 	state->emojiPanel->selector()->setCurrentPeer(window->session().user());
 	state->emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(name->textCursor(), data.emoji);
 	}, name->lifetime());
 	state->emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
@@ -534,7 +534,7 @@ void EditFilterBox(
 	emojiButton->show();
 
 	name->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!nameEditing->settingDefault) {
 			nameEditing->custom = true;
 		}
@@ -558,7 +558,7 @@ void EditFilterBox(
 	};
 
 	state->title.value(
-	) | rpl::start_with_next([=](const TextWithEntities &value) {
+	) | rpl::on_next([=](const TextWithEntities &value) {
 		staticTitle->setVisible(!value.entities.isEmpty());
 	}, staticTitle->lifetime());
 
@@ -666,7 +666,7 @@ void EditFilterBox(
 		rpl::combine(
 			title->sizeValue(),
 			titleWrap->widthValue()
-		) | rpl::start_with_next([=](const QSize &s, int w) {
+		) | rpl::on_next([=](const QSize &s, int w) {
 			const auto h = st::normalFont->height;
 			const auto left = padding.left()
 				+ s.width()
@@ -687,7 +687,7 @@ void EditFilterBox(
 		const auto tag = preview->lifetime().make_state<TagState>();
 		tag->context.textContext = Core::TextContext({ .session = session });
 		const auto shift = st::settingsFilterTagPreviewSkip / 2;
-		preview->paintRequest() | rpl::start_with_next([=] {
+		preview->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(preview);
 			p.setOpacity(tag->alpha);
 			const auto size = tag->frame.size() / style::DevicePixelRatio();
@@ -725,7 +725,7 @@ void EditFilterBox(
 			return value;
 		};
 		state->title.changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			tag->context.color = palette(state->colorIndex.current())->c;
 			tag->frame = Ui::ChatsFilterTag(
 				upperTitle(),
@@ -785,7 +785,7 @@ void EditFilterBox(
 				});
 			}
 		}
-		line->sizeValue() | rpl::start_with_next([=](const QSize &size) {
+		line->sizeValue() | rpl::on_next([=](const QSize &size) {
 			const auto totalWidth = buttons.size() * side;
 			const auto spacing = (size.width() - totalWidth)
 				/ (buttons.size() - 1);
@@ -799,7 +799,7 @@ void EditFilterBox(
 			const auto last = buttons.back();
 			const auto icon = Ui::CreateChild<Ui::RpWidget>(last);
 			icon->resize(side, side);
-			icon->paintRequest() | rpl::start_with_next([=] {
+			icon->paintRequest() | rpl::on_next([=] {
 				auto p = QPainter(icon);
 				(session->premium()
 					? st::windowFilterSmallRemove.icon
@@ -853,7 +853,7 @@ void EditFilterBox(
 			tr::lng_filters_link_has(),
 			tr::lng_filters_link()));
 
-	state->hasLinks.changes() | rpl::start_with_next([=] {
+	state->hasLinks.changes() | rpl::on_next([=] {
 		content->resizeToWidth(content->widthNoMargins());
 	}, content->lifetime());
 
@@ -886,7 +886,7 @@ void EditFilterBox(
 		addLink->clicks()
 	) | rpl::filter(
 		(rpl::mappers::_1 == Qt::LeftButton)
-	) | rpl::start_with_next([=](Qt::MouseButton button) {
+	) | rpl::on_next([=](Qt::MouseButton button) {
 		const auto result = collect();
 		if (!result || !GoodForExportFilterLink(window, *result)) {
 			return;

Telegram/SourceFiles/boxes/filters/edit_filter_chats_list.cpp

@@ -384,7 +384,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 
 	const auto raw = result.data();
 	raw->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(raw);
 		p.fillRect(clip, st::searchedBarBg);
 	}, raw->lifetime());
@@ -394,7 +394,7 @@ object_ptr<Ui::RpWidget> CreatePeerListSectionSubtitle(
 		std::move(text),
 		st::windowFilterChatsSectionSubtitle);
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto padding = st::windowFilterChatsSectionSubtitlePadding;
 		const auto available = width - padding.left() - padding.right();
 		label->resizeToNaturalWidth(available);
@@ -533,12 +533,12 @@ object_ptr<Ui::RpWidget> EditFilterChatsListController::prepareTypesList() {
 		tr::lng_filters_edit_chats()));
 
 	controller->selectedChanges(
-	) | rpl::start_with_next([=](Flags selected) {
+	) | rpl::on_next([=](Flags selected) {
 		_selected = selected;
 	}, _lifetime);
 
 	controller->rowSelectionChanges(
-	) | rpl::start_with_next([=](RowSelectionChange update) {
+	) | rpl::on_next([=](RowSelectionChange update) {
 		this->delegate()->peerListSetForeignRowChecked(
 			update.row,
 			update.checked,

Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp

@@ -531,7 +531,7 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 		},
 		st::settingsFilterIconPadding);
 	_showFinished.events(
-	) | rpl::start_with_next([animate = std::move(icon.animate)] {
+	) | rpl::on_next([animate = std::move(icon.animate)] {
 		animate(anim::repeat::once);
 	}, verticalLayout->lifetime());
 	verticalLayout->add(std::move(icon.widget));
@@ -541,13 +541,13 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 		object_ptr<Ui::FlatLabel>(
 			verticalLayout,
 			(_data.url.isEmpty()
-				? tr::lng_filters_link_no_about(Ui::Text::WithEntities)
+				? tr::lng_filters_link_no_about(tr::marked)
 				: tr::lng_filters_link_share_about(
 					lt_folder,
 					rpl::single(Ui::Text::Wrapped(
 						_filterTitle.text,
 						EntityType::Bold)),
-					Ui::Text::WithEntities)),
+					tr::marked)),
 			st::settingsFilterDividerLabel,
 			st::defaultPopupMenu,
 			Core::TextContext({
@@ -558,7 +558,7 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 		style::al_top)->setTryMakeSimilarLines(true);
 
 	verticalLayout->geometryValue(
-	) | rpl::start_with_next([=](const QRect &r) {
+	) | rpl::on_next([=](const QRect &r) {
 		divider->setGeometry(r);
 	}, divider->lifetime());
 }
@@ -647,7 +647,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	AddCopyShareLinkButtons(container, copyLink, shareLink);
 
@@ -785,7 +785,7 @@ void LinkController::setupAboveWidget() {
 		[=](bool select) { toggleAllSelected(select); });
 
 	// Fix label cutting on text change from smaller to longer.
-	_selected.changes() | rpl::start_with_next([=] {
+	_selected.changes() | rpl::on_next([=] {
 		container->resizeToWidth(container->widthNoMargins());
 	}, container->lifetime());
 
@@ -825,7 +825,7 @@ LinksController::LinksController(
 , _currentFilter(std::move(currentFilter))
 , _rows(std::move(content)) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &image : _icons) {
 			image = QImage();
 		}
@@ -834,7 +834,7 @@ LinksController::LinksController(
 
 void LinksController::prepare() {
 	_rows.value(
-	) | rpl::start_with_next([=](const std::vector<InviteLinkData> &rows) {
+	) | rpl::on_next([=](const std::vector<InviteLinkData> &rows) {
 		rebuild(rows);
 	}, _lifetime);
 }
@@ -1078,7 +1078,7 @@ object_ptr<Ui::BoxContent> ShowLinkBox(
 
 		const auto saving = std::make_shared<bool>(false);
 		raw->hasChangesValue(
-		) | rpl::start_with_next([=](bool has) {
+		) | rpl::on_next([=](bool has) {
 			box->setCloseByOutsideClick(!has);
 			box->setCloseByEscape(!has);
 			box->clearButtons();
@@ -1182,7 +1182,7 @@ void AddFilterSubtitleWithToggles(
 	const auto canSelect = link->lifetime().make_state<rpl::variable<bool>>(
 		std::move(selectedCount) | rpl::map(_1 < selectableCount));
 	canSelect->value(
-	) | rpl::start_with_next([=](bool can) {
+	) | rpl::on_next([=](bool can) {
 		link->setText(can
 			? tr::lng_filters_by_link_select(tr::now)
 			: tr::lng_filters_by_link_deselect(tr::now));
@@ -1195,7 +1195,7 @@ void AddFilterSubtitleWithToggles(
 		container->widthValue(),
 		title->topValue(),
 		link->widthValue()
-	) | rpl::start_with_next([=](int outer, int y, int width) {
+	) | rpl::on_next([=](int outer, int y, int width) {
 		link->move(outer - st::boxRowPadding.right() - width, y);
 	}, link->lifetime());
 }

Telegram/SourceFiles/boxes/gift_credits_box.cpp

@@ -69,9 +69,9 @@ void GiftCreditsBox(
 		auto link = tr::lng_credits_box_history_entry_gift_about_link(
 			lt_emoji,
 			rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
-			Ui::Text::RichLangValue
+			tr::rich
 		) | rpl::map([](TextWithEntities text) {
-			return Ui::Text::Link(
+			return tr::link(
 				std::move(text),
 				u"internal:stars_examples"_q);
 		});
@@ -83,7 +83,7 @@ void GiftCreditsBox(
 					rpl::single(TextWithEntities{ peer->shortName() }),
 					lt_link,
 					std::move(link),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				st::creditsBoxAbout),
 			st::boxRowPadding,
 			style::al_top);

Telegram/SourceFiles/boxes/gift_premium_box.cpp

@@ -83,9 +83,12 @@ namespace {
 
 constexpr auto kTooltipDuration = 3 * crl::time(1000);
 constexpr auto kHorizontalBar = QChar(0x2015);
+constexpr auto kSpinnerRows = 6;
+constexpr auto kSpinDuration = crl::time(120);
 
 using Ui::AddTableRow;
 using Ui::TableRowTooltipData;
+using SpinnerState = Data::GiftUpgradeSpinner::State;
 
 [[nodiscard]] QString CreateMessageLink(
 		not_null<Main::Session*> session,
@@ -151,7 +154,7 @@ using Ui::TableRowTooltipData;
 	auto result = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = result.data();
 
-	raw->paintRequest() | rpl::start_with_next([=] {
+	raw->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		const auto &icon = st::giveawayGiftCodeLinkCopy;
 		const auto left = (raw->width() - icon.width()) / 2;
@@ -232,10 +235,10 @@ using Ui::TableRowTooltipData;
 		tr::lng_gift_value_minimum_price_tooltip(
 			tr::now,
 			lt_amount,
-			Ui::Text::Bold(text.text),
+			tr::bold(text.text),
 			lt_gift,
-			Ui::Text::Bold(unique->title),
-			Ui::Text::WithEntities));
+			tr::bold(unique->title),
+			tr::marked));
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeAveragePriceValue(
@@ -251,10 +254,10 @@ using Ui::TableRowTooltipData;
 		tr::lng_gift_value_average_price_tooltip(
 			tr::now,
 			lt_amount,
-			Ui::Text::Bold(text.text),
+			tr::bold(text.text),
 			lt_gift,
-			Ui::Text::Bold(unique->title),
-			Ui::Text::WithEntities));
+			tr::bold(unique->title),
+			tr::marked));
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeAttributeValue(
@@ -276,10 +279,179 @@ using Ui::TableRowTooltipData;
 	return MakeValueWithSmallButton(table, label, std::move(text), handler);
 }
 
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeAttributeValue(
+		not_null<Ui::TableLayout*> table,
+		const Data::UniqueGiftAttribute &attribute,
+		Fn<void(not_null<Ui::RpWidget*>, int)> showTooltip,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
+		std::vector<Data::UniqueGiftAttribute> spinning,
+		SpinnerState finishedState) {
+	if (!spinner) {
+		return MakeAttributeValue(table, attribute, showTooltip);
+	}
+	auto result = object_ptr<Ui::RpWidget>(table);
+	const auto raw = result.get();
+
+	struct Row {
+		Data::UniqueGiftAttribute attribute;
+		object_ptr<Ui::RpWidget> widget;
+		QImage frame;
+	};
+	struct State {
+		int wasIndex = 0;
+		int nowIndex = 0;
+		std::vector<Row> rows;
+		Ui::Animations::Simple animation;
+		QImage fading;
+		Fn<void()> repaint;
+		bool finished = false;
+	};
+	const auto state = raw->lifetime().make_state<State>();
+	state->repaint = [=] { raw->update(); };
+
+	const auto margin = st::giveawayGiftCodeValueMargin;
+	const auto startWithin = [=] {
+		Expects(!state->rows.empty());
+
+		state->wasIndex = state->nowIndex;
+		state->nowIndex = (state->nowIndex + 1) % state->rows.size();
+		state->animation.start(state->repaint, 0., 1., kSpinDuration);
+	};
+	const auto startToTarget = [=] {
+		if (state->nowIndex != 0) {
+			state->wasIndex = state->nowIndex;
+			state->nowIndex = 0;
+			state->animation.start(
+				state->repaint,
+				0.,
+				1.,
+				kSpinDuration * 3,
+				anim::easeOutCubic);
+		}
+	};
+
+	const auto add = [&](const Data::UniqueGiftAttribute &value) {
+		if (state->rows.size() >= kSpinnerRows) {
+			return false;
+		}
+		const auto already = ranges::contains(
+			state->rows,
+			value,
+			&Row::attribute);
+		if (!already) {
+			state->rows.push_back(Row{
+				.attribute = value,
+				.widget = MakeAttributeValue(table, value, showTooltip),
+			});
+			const auto widget = state->rows.back().widget.get();
+			widget->setParent(raw);
+			widget->hide();
+		}
+		return true;
+	};
+	add(attribute);
+	for (const auto &item : spinning) {
+		if (!add(item)) {
+			break;
+		}
+	}
+
+	raw->widthValue() | rpl::on_next([=](int width) {
+		auto height = 0;
+		const auto inner = width - margin.left() - margin.right();
+		if (inner > 0) {
+			for (const auto &row : state->rows) {
+				row.widget->resizeToWidth(inner);
+				row.widget->move(margin.left(), margin.top());
+				height = std::max(height, row.widget->height());
+			}
+		}
+		raw->resize(width, margin.top() + height + margin.bottom());
+		crl::on_main(raw, [=] {
+			for (const auto &row : state->rows) {
+				Ui::SendPendingMoveResizeEvents(row.widget.get());
+			}
+		});
+	}, raw->lifetime());
+
+	style::PaletteChanged() | rpl::on_next([=] {
+		for (auto &row : state->rows) {
+			row.frame = QImage();
+		}
+		state->fading = QImage();
+	}, raw->lifetime());
+
+	raw->paintOn([=](QPainter &p) {
+		if (state->finished) {
+			return;
+		}
+		auto progress = state->animation.value(1.);
+		if (progress >= 1.) {
+			const auto ending = (spinner->state.current() >= finishedState);
+			if (ending) {
+				startToTarget();
+			} else {
+				startWithin();
+			}
+			progress = state->animation.value(1.);
+			if (ending && progress >= 1.) {
+				state->rows.front().widget->show();
+				state->finished = true;
+				return;
+			}
+		}
+		const auto ratio = style::DevicePixelRatio();
+		const auto h = raw->height();
+		if (state->fading.height() != h * ratio) {
+			state->fading = QImage(
+				QSize(1, h) * ratio,
+				QImage::Format_ARGB32_Premultiplied);
+			state->fading.setDevicePixelRatio(ratio);
+			state->fading.fill(Qt::transparent);
+			auto q = QPainter(&state->fading);
+			auto brush = QLinearGradient(0, 0, 0, margin.top());
+			brush.setStops({
+				{ 0., anim::with_alpha(st::boxBg->c, 1.) },
+				{ 1., anim::with_alpha(st::boxBg->c, 0.) },
+			});
+			q.fillRect(0, 0, 1, margin.top(), brush);
+			brush.setStart(0, h);
+			brush.setFinalStop(0, h - margin.bottom());
+			q.fillRect(0, h - margin.bottom(), 1, margin.bottom(), brush);
+		}
+		auto &was = state->rows[state->wasIndex];
+		auto &now = state->rows[state->nowIndex];
+		const auto validate = [&](Row &row) {
+			const auto size = row.widget->size();
+			if (row.frame.size() != size * ratio) {
+				row.frame = Ui::GrabWidgetToImage(row.widget.get());
+			}
+		};
+		validate(was);
+		validate(now);
+		const auto t = progress * (margin.top() + was.widget->height());
+		const auto b = progress * (now.widget->height() + margin.bottom());
+		p.drawImage(
+			margin.left(),
+			margin.top() - int(base::SafeRound(t)),
+			was.frame);
+		p.drawImage(
+			margin.left(),
+			raw->height() - int(base::SafeRound(b)),
+			now.frame);
+		p.drawImage(raw->rect(), state->fading);
+	});
+
+	startWithin();
+
+	return result;
+}
+
 void AddUniqueGiftPropertyRows(
 		not_null<Ui::RpWidget*> container,
 		not_null<Ui::TableLayout*> table,
-		not_null<Data::UniqueGift*> unique) {
+		not_null<Data::UniqueGift*> unique,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner) {
 	const auto tooltip = std::make_shared<TableRowTooltipData>(
 		TableRowTooltipData{ .parent = container });
 	const auto showTooltip = [=](
@@ -294,20 +466,57 @@ void AddUniqueGiftPropertyRows(
 		showTooltip(widget, tr::lng_gift_unique_rarity(
 			lt_percent,
 			rpl::single(TextWithEntities{ percent }),
-			Ui::Text::WithEntities));
+			tr::marked));
 	};
+	const auto empty = std::vector<Data::UniqueGiftAttribute>();
+	const auto extract = [&](const auto &list) {
+		auto result = empty;
+		result.reserve(list.size());
+		for (const auto &item : list) {
+			result.push_back(item);
+		}
+		return result;
+	};
+	const auto attributes = spinner ? &spinner->attributes : nullptr;
+	const auto models = spinner ? extract(attributes->models) : empty;
+	const auto patterns = spinner ? extract(attributes->patterns) : empty;
+	const auto backdrops = spinner ? extract(attributes->backdrops) : empty;
+	const auto margin = spinner
+		? style::margins()
+		: st::giveawayGiftCodeValueMargin;
 	AddTableRow(
 		table,
 		tr::lng_gift_unique_model(),
-		MakeAttributeValue(table, unique->model, showRarity));
-	AddTableRow(
-		table,
-		tr::lng_gift_unique_backdrop(),
-		MakeAttributeValue(table, unique->backdrop, showRarity));
+		MakeAttributeValue(
+			table,
+			unique->model,
+			showRarity,
+			spinner,
+			models,
+			SpinnerState::FinishedModel),
+		margin);
 	AddTableRow(
 		table,
 		tr::lng_gift_unique_symbol(),
-		MakeAttributeValue(table, unique->pattern, showRarity));
+		MakeAttributeValue(
+			table,
+			unique->pattern,
+			showRarity,
+			spinner,
+			patterns,
+			SpinnerState::FinishedPattern),
+		margin);
+	AddTableRow(
+		table,
+		tr::lng_gift_unique_backdrop(),
+		MakeAttributeValue(
+			table,
+			unique->backdrop,
+			showRarity,
+			spinner,
+			backdrops,
+			SpinnerState::FinishedBackdrop),
+		margin);
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeStarGiftStarsValue(
@@ -371,6 +580,7 @@ void AddUniqueGiftPropertyRows(
 	const auto handler = [=](not_null<Ui::RpWidget*> button) {
 		if (value->initialPriceStars) {
 			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
+			return;
 		} else if (*loading) {
 			return;
 		}
@@ -436,15 +646,15 @@ void AddTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_to(),
-			tr::lng_gift_link_label_to_unclaimed(Ui::Text::WithEntities));
+			tr::lng_gift_link_label_to_unclaimed(tr::marked));
 	}
 	AddTableRow(
 		table,
 		tr::lng_gift_link_label_gift(),
 		tr::lng_gift_link_gift_premium(
 			lt_duration,
-			GiftDurationValue(current.days) | Ui::Text::ToWithEntities(),
-			Ui::Text::WithEntities));
+			GiftDurationValue(current.days) | rpl::map(tr::marked),
+			tr::marked));
 	if (!skipReason && current.from) {
 		const auto reason = AddTableRow(
 			table,
@@ -452,15 +662,14 @@ void AddTable(
 			(current.giveawayId
 				? ((current.to
 					? tr::lng_gift_link_reason_giveaway
-					: tr::lng_gift_link_reason_unclaimed)(
-						) | Ui::Text::ToLink())
+					: tr::lng_gift_link_reason_unclaimed)(tr::link))
 				: current.giveaway
 				? ((current.to
 					? tr::lng_gift_link_reason_giveaway
 					: tr::lng_gift_link_reason_unclaimed)(
-						Ui::Text::WithEntities
-					) | rpl::type_erased())
-				: tr::lng_gift_link_reason_chosen(Ui::Text::WithEntities)));
+						tr::marked
+					) | rpl::type_erased)
+				: tr::lng_gift_link_reason_chosen(tr::marked)));
 		reason->setClickHandlerFilter([=](const auto &...) {
 			if (const auto window = show->resolveWindow()) {
 				window->showPeerHistory(
@@ -475,7 +684,7 @@ void AddTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(
+			rpl::single(tr::marked(
 				langDateTime(base::unixtime::parse(current.date)))));
 	}
 }
@@ -516,11 +725,11 @@ void ShowAlreadyPremiumToast(
 		.text = tr::lng_gift_link_already_about(
 			tr::now,
 			lt_date,
-			Ui::Text::Bold(langDateTime(base::unixtime::parse(date))),
+			tr::bold(langDateTime(base::unixtime::parse(date))),
 			lt_link,
-			Ui::Text::Link(
-				Ui::Text::Bold(tr::lng_gift_link_already_link(tr::now))),
-			Ui::Text::WithEntities),
+			tr::link(
+				tr::bold(tr::lng_gift_link_already_link(tr::now))),
+			tr::marked),
 		.filter = crl::guard(navigation, shareLink),
 		.duration = 6 * crl::time(1000),
 	});
@@ -579,8 +788,8 @@ void GiftCodeBox(
 					tr::lng_gift_link_title()),
 				.about = rpl::conditional(
 					state->used.value(),
-					tr::lng_gift_link_used_about(Ui::Text::RichLangValue),
-					tr::lng_gift_link_about(Ui::Text::RichLangValue)),
+					tr::lng_gift_link_used_about(tr::rich),
+					tr::lng_gift_link_about(tr::rich)),
 				.light = true,
 			}));
 
@@ -605,7 +814,7 @@ void GiftCodeBox(
 
 	auto shareLink = tr::lng_gift_link_also_send_link(
 	) | rpl::map([](const QString &text) {
-		return Ui::Text::Link(text);
+		return tr::link(text);
 	});
 	auto richDate = [](const Api::GiftCode &data) {
 		return TextWithEntities{
@@ -620,11 +829,11 @@ void GiftCodeBox(
 				tr::lng_gift_link_used_footer(
 					lt_date,
 					state->data.value() | rpl::map(richDate),
-					Ui::Text::WithEntities),
+					tr::marked),
 				tr::lng_gift_link_also_send(
 					lt_link,
 					std::move(shareLink),
-					Ui::Text::WithEntities)),
+					tr::marked)),
 			st::giveawayGiftCodeFooter),
 		st::giveawayGiftCodeFooterMargin,
 		style::al_top);
@@ -640,7 +849,7 @@ void GiftCodeBox(
 		box->closeBox();
 	});
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
@@ -706,8 +915,8 @@ void GiftCodePendingBox(
 					.title = tr::lng_gift_link_title(),
 					.about = tr::lng_gift_link_pending_about(
 						lt_user,
-						rpl::single(Ui::Text::Link(resultToName)),
-						Ui::Text::RichLangValue),
+						rpl::single(tr::link(resultToName)),
+						tr::rich),
 					.light = true,
 				}));
 
@@ -727,7 +936,7 @@ void GiftCodePendingBox(
 			spoiler->update();
 		})->start();
 		linkLabel->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			spoiler->setGeometry(Rect(s));
 		}, spoiler->lifetime());
 		const auto spoilerCached = Ui::SpoilerMessCached(
@@ -735,7 +944,7 @@ void GiftCodePendingBox(
 			st::giveawayGiftCodeLink.textFg->c);
 		const auto textHeight = st::giveawayGiftCodeLink.style.font->height;
 		spoiler->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(spoiler);
 			const auto rect = spoiler->rect();
 			const auto r = rect
@@ -769,7 +978,7 @@ void GiftCodePendingBox(
 	const auto closeCallback = [=] { box->closeBox(); };
 	close->setClickedCallback(closeCallback);
 	box->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
@@ -830,20 +1039,20 @@ void GiveawayInfoBox(
 			lt_cup,
 			rpl::single(
 				TextWithEntities{ QString::fromUtf8("\xf0\x9f\x8f\x86") }),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (info.credits)
 		? tr::lng_prizes_you_won_credits(
 			lt_amount,
 			tr::lng_prizes_you_won_credits_amount(
 				lt_count,
 				rpl::single(float64(info.credits)),
-				Ui::Text::Bold),
+				tr::bold),
 			lt_cup,
 			rpl::single(
 				TextWithEntities{ QString::fromUtf8("\xf0\x9f\x8f\x86") }),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (info.state == State::Finished)
-		? tr::lng_prizes_you_didnt(Ui::Text::WithEntities)
+		? tr::lng_prizes_you_didnt(tr::marked)
 		: (rpl::producer<TextWithEntities>)(nullptr);
 
 	if (resultText) {
@@ -862,7 +1071,7 @@ void GiveawayInfoBox(
 				std::move(label),
 				QMargins(0, skip, 0, skip)),
 			style::al_justify);
-		result->paintRequest() | rpl::start_with_next([=] {
+		result->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(result);
 			p.setPen(Qt::NoPen);
 			p.setBrush(st::boxDividerBg);
@@ -895,14 +1104,14 @@ void GiveawayInfoBox(
 					: tr::lng_prizes_credits_admins)(
 						tr::now,
 						lt_channel,
-						Ui::Text::Bold(first),
+						tr::bold(first),
 						lt_amount,
 						tr::lng_prizes_credits_admins_amount(
 							tr::now,
 							lt_count_decimal,
 							float64(credits),
-							Ui::Text::Bold),
-						Ui::Text::RichLangValue)
+							tr::bold),
+						tr::rich)
 				: (group
 					? tr::lng_prizes_admins_group
 					: tr::lng_prizes_admins)(
@@ -910,11 +1119,11 @@ void GiveawayInfoBox(
 						lt_count,
 						quantity,
 						lt_channel,
-						Ui::Text::Bold(first),
+						tr::bold(first),
 						lt_duration,
 						TextWithEntities{ GiftDuration(months * 30) },
-						Ui::Text::RichLangValue),
-			Ui::Text::RichLangValue));
+						tr::rich),
+			tr::rich));
 	const auto many = start
 		? (start->channels.size() > 1)
 		: (results->additionalPeersCount > 0);
@@ -934,8 +1143,8 @@ void GiveawayInfoBox(
 				lt_count,
 				count,
 				lt_channel,
-				Ui::Text::Bold(first),
-				Ui::Text::RichLangValue)
+				tr::bold(first),
+				tr::rich)
 		: (many
 			? tr::lng_prizes_winners_new_of_many
 			: tr::lng_prizes_winners_new_of_one)(
@@ -943,11 +1152,11 @@ void GiveawayInfoBox(
 				lt_count,
 				count,
 				lt_channel,
-				Ui::Text::Bold(first),
+				tr::bold(first),
 				lt_start_date,
-				Ui::Text::Bold(
+				tr::bold(
 					langDateTime(base::unixtime::parse(info.startDate))),
-				Ui::Text::RichLangValue);
+				tr::rich);
 	const auto additionalPrize = results
 		? results->additionalPrize
 		: start->additionalPrize;
@@ -959,10 +1168,10 @@ void GiveawayInfoBox(
 				lt_count,
 				count,
 				lt_channel,
-				Ui::Text::Bold(first),
+				tr::bold(first),
 				lt_prize,
 				TextWithEntities{ additionalPrize },
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	const auto untilDate = start
 		? start->untilDate
@@ -972,17 +1181,17 @@ void GiveawayInfoBox(
 		: tr::lng_prizes_how_when_finish)(
 			tr::now,
 			lt_date,
-			Ui::Text::Bold(langDayOfMonthFull(
+			tr::bold(langDayOfMonthFull(
 				base::unixtime::parse(untilDate).date())),
 			lt_winners,
 			winners,
-			Ui::Text::RichLangValue));
+			tr::rich));
 	if (info.activatedCount > 0) {
 		text.append(' ').append(tr::lng_prizes_end_activated(
 			tr::now,
 			lt_count,
 			info.activatedCount,
-			Ui::Text::RichLangValue));
+			tr::rich));
 	}
 	if (!info.giftCode.isEmpty()
 		|| info.state == State::Finished
@@ -996,8 +1205,8 @@ void GiveawayInfoBox(
 				: tr::lng_prizes_how_no_admin)(
 					tr::now,
 					lt_channel,
-					Ui::Text::Bold(channel->name()),
-					Ui::Text::RichLangValue));
+					tr::bold(channel->name()),
+					tr::rich));
 		} else if (info.tooEarlyDate) {
 			const auto channel = controller->session().data().channel(
 				info.adminChannelId);
@@ -1006,33 +1215,33 @@ void GiveawayInfoBox(
 				: tr::lng_prizes_how_no_joined)(
 					tr::now,
 					lt_date,
-					Ui::Text::Bold(
+					tr::bold(
 						langDateTime(
 							base::unixtime::parse(info.tooEarlyDate))),
-					Ui::Text::RichLangValue));
+					tr::rich));
 		} else if (!info.disallowedCountry.isEmpty()) {
 			text.append("\n\n").append(tr::lng_prizes_how_no_country(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 		} else if (info.participating) {
 			text.append("\n\n").append((many
 				? tr::lng_prizes_how_yes_joined_many
 				: tr::lng_prizes_how_yes_joined_one)(
 					tr::now,
 					lt_channel,
-					Ui::Text::Bold(first),
-					Ui::Text::RichLangValue));
+					tr::bold(first),
+					tr::rich));
 		} else {
 			text.append("\n\n").append((many
 				? tr::lng_prizes_how_participate_many
 				: tr::lng_prizes_how_participate_one)(
 					tr::now,
 					lt_channel,
-					Ui::Text::Bold(first),
+					tr::bold(first),
 					lt_date,
-					Ui::Text::Bold(langDayOfMonthFull(
+					tr::bold(langDayOfMonthFull(
 						base::unixtime::parse(untilDate).date())),
-					Ui::Text::RichLangValue));
+					tr::rich));
 		}
 	}
 	const auto padding = st::boxPadding;
@@ -1059,7 +1268,7 @@ void GiveawayInfoBox(
 		const auto bg = wrap->lifetime().make_state<Ui::RoundRect>(
 			st::boxRadius,
 			st::attentionBoxButton.textBgOver);
-		wrap->paintRequest() | rpl::start_with_next([=] {
+		wrap->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(wrap);
 			bg->paint(p, wrap->rect());
 		}, wrap->lifetime());
@@ -1141,7 +1350,7 @@ struct AddedUniqueDetails {
 	const auto icon = Ui::CreateChild<Ui::IconButton>(
 		raw,
 		st::giveawayGiftMessageRemove);
-	raw->widthValue() | rpl::start_with_next([=](int outer) {
+	raw->widthValue() | rpl::on_next([=](int outer) {
 		label->resizeToWidth(outer - icon->width());
 		const auto height = std::max(label->height(), icon->height());
 
@@ -1170,7 +1379,7 @@ struct AddedUniqueDetails {
 					rpl::single(
 						Ui::Text::IconEmoji(&st::starIconEmoji).append(
 							Lang::FormatCountDecimal(removeCost))),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				.title = tr::lng_gift_unique_info_remove_title(),
 			});
 			box->addRow(
@@ -1203,8 +1412,9 @@ void AddStarGiftTable(
 		not_null<Ui::VerticalLayout*> container,
 		Settings::CreditsEntryBoxStyleOverrides st,
 		const Data::CreditsHistoryEntry &entry,
+		std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
 		Fn<void()> convertToStars,
-		Fn<void()> startUpgrade,
+		bool canStartUpgrade,
 		Fn<void(Fn<void()> removed)> removeDetails) {
 	const auto table = container->add(
 		object_ptr<Ui::TableLayout>(
@@ -1249,8 +1459,8 @@ void AddStarGiftTable(
 			const auto show = [&](const auto &phrase) {
 				showTooltip(badge, phrase(
 					lt_name,
-					rpl::single(Ui::Text::Bold(UniqueGiftName(*unique))),
-					Ui::Text::WithEntities));
+					rpl::single(tr::bold(UniqueGiftName(*unique))),
+					tr::marked));
 			};
 			if (!*was || *was == id) {
 				*was = id;
@@ -1299,8 +1509,8 @@ void AddStarGiftTable(
 				const auto show = [&](const auto &phrase) {
 					showTooltip(badge, phrase(
 						lt_name,
-						rpl::single(Ui::Text::Bold(UniqueGiftName(*unique))),
-						Ui::Text::WithEntities));
+						rpl::single(tr::bold(UniqueGiftName(*unique))),
+						tr::marked));
 				};
 				if (!*was || *was == id) {
 					*was = id;
@@ -1371,24 +1581,24 @@ void AddStarGiftTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_first_sale(),
-			rpl::single(Ui::Text::WithEntities(
+			rpl::single(tr::marked(
 				langDateTime(entry.firstSaleDate))));
 	}
 	if (!unique && !entry.lastSaleDate.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_last_sale(),
-			rpl::single(Ui::Text::WithEntities(
+			rpl::single(tr::marked(
 				langDateTime(entry.lastSaleDate))));
 	}
 	if (!unique && !entry.date.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+			rpl::single(tr::marked(langDateTime(entry.date))));
 	}
 	if (unique) {
-		AddUniqueGiftPropertyRows(container, table, unique);
+		AddUniqueGiftPropertyRows(container, table, unique, spinner);
 	} else {
 		AddTableRow(
 			table,
@@ -1415,7 +1625,7 @@ void AddStarGiftTable(
 				? tr::lng_gift_availability_none(
 					lt_amount,
 					std::move(amount),
-					Ui::Text::WithEntities)
+					tr::marked)
 				: (unique
 					? tr::lng_gift_unique_availability
 					: tr::lng_gift_availability_left)(
@@ -1423,13 +1633,13 @@ void AddStarGiftTable(
 						rpl::single(count * 1.),
 						lt_amount,
 						std::move(amount),
-						Ui::Text::WithEntities)));
+						tr::marked)));
 	}
-	if (!unique && !entry.soldOutInfo && startUpgrade) {
+	if (!unique && !entry.soldOutInfo && canStartUpgrade) {
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_status(),
-			tr::lng_gift_unique_status_non(Ui::Text::WithEntities));
+			tr::lng_gift_unique_status_non(tr::marked));
 	}
 	if (unique) {
 		if (unique->value) {
@@ -1451,37 +1661,37 @@ void AddStarGiftTable(
 				? (original.message.empty()
 					? tr::lng_gift_unique_info_sender(
 						lt_from,
-						rpl::single(Ui::Text::Link(from->name(), 2)),
+						rpl::single(tr::link(from->name(), 2)),
 						lt_recipient,
-						rpl::single(Ui::Text::Link(to->name(), 1)),
+						rpl::single(tr::link(to->name(), 1)),
 						lt_date,
 						rpl::single(dateText),
-						Ui::Text::WithEntities)
+						tr::marked)
 					: tr::lng_gift_unique_info_sender_comment(
 						lt_from,
-						rpl::single(Ui::Text::Link(from->name(), 2)),
+						rpl::single(tr::link(from->name(), 2)),
 						lt_recipient,
-						rpl::single(Ui::Text::Link(to->name(), 1)),
+						rpl::single(tr::link(to->name(), 1)),
 						lt_date,
 						rpl::single(dateText),
 						lt_text,
 						rpl::single(original.message),
-						Ui::Text::WithEntities))
+						tr::marked))
 				: (original.message.empty()
 					? tr::lng_gift_unique_info_reciever(
 						lt_recipient,
-						rpl::single(Ui::Text::Link(to->name(), 1)),
+						rpl::single(tr::link(to->name(), 1)),
 						lt_date,
 						rpl::single(dateText),
-						Ui::Text::WithEntities)
+						tr::marked)
 					: tr::lng_gift_unique_info_reciever_comment(
 						lt_recipient,
-						rpl::single(Ui::Text::Link(to->name(), 1)),
+						rpl::single(tr::link(to->name(), 1)),
 						lt_date,
 						rpl::single(dateText),
 						lt_text,
 						rpl::single(original.message),
-						Ui::Text::WithEntities));
+						tr::marked));
 			const auto tmp = std::make_shared<Ui::RpWidget*>(nullptr);
 			auto made = MakeUniqueDetails(
 				show,
@@ -1535,7 +1745,7 @@ void AddTransferGiftTable(
 			container,
 			st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
-	AddUniqueGiftPropertyRows(container, table, unique.get());
+	AddUniqueGiftPropertyRows(container, table, unique.get(), nullptr);
 	if (const auto value = unique->value.get()) {
 		AddTableRow(
 			table,
@@ -1584,7 +1794,7 @@ void AddCreditsHistoryEntryTable(
 				table,
 				tr::lng_gift_link_label_reason(),
 				tr::lng_credits_box_history_entry_reason_star_ref(
-					Ui::Text::WithEntities));
+					tr::marked));
 		}
 	}
 	if (starrefRecipientId && entry.starrefAmount && !entry.giftResale) {
@@ -1650,7 +1860,7 @@ void AddCreditsHistoryEntryTable(
 				entry.bareMsgId);
 			auto label = object_ptr<Ui::FlatLabel>(
 				table,
-				rpl::single(Ui::Text::Link(link)),
+				rpl::single(tr::link(link)),
 				table->st().defaultValue);
 			label->setClickHandlerFilter([=](const auto &...) {
 				if (const auto window = show->resolveWindow()) {
@@ -1672,13 +1882,13 @@ void AddCreditsHistoryEntryTable(
 			table,
 			tr::lng_credits_box_history_entry_via(),
 			tr::lng_credits_box_history_entry_app_store(
-				Ui::Text::RichLangValue));
+				tr::rich));
 	} else if (entry.peerType == Type::PlayMarket) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_via(),
 			tr::lng_credits_box_history_entry_play_market(
-				Ui::Text::RichLangValue));
+				tr::rich));
 	} else if (entry.peerType == Type::Fragment) {
 		AddTableRow(
 			table,
@@ -1688,18 +1898,18 @@ void AddCreditsHistoryEntryTable(
 			((entry.gift && entry.credits.stars())
 				? tr::lng_credits_box_history_entry_anonymous
 				: tr::lng_credits_box_history_entry_fragment)(
-					Ui::Text::RichLangValue));
+					tr::rich));
 	} else if (entry.peerType == Type::Ads) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_via(),
-			tr::lng_credits_box_history_entry_ads(Ui::Text::RichLangValue));
+			tr::lng_credits_box_history_entry_ads(tr::rich));
 	} else if (entry.peerType == Type::PremiumBot) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_via(),
 			tr::lng_credits_box_history_entry_via_premium_bot(
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	if (entry.bareGiveawayMsgId) {
 		AddTableRow(
@@ -1715,7 +1925,7 @@ void AddCreditsHistoryEntryTable(
 			tr::lng_gift_stars_title(
 				lt_count,
 				rpl::single(entry.credits.value()),
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	{
 		const auto link = CreateMessageLink(
@@ -1728,7 +1938,7 @@ void AddCreditsHistoryEntryTable(
 				tr::lng_gift_link_label_reason(),
 				tr::lng_gift_link_reason_giveaway(
 				) | rpl::map([link](const QString &text) {
-					return Ui::Text::Link(text, link);
+					return tr::link(text, link);
 				}));
 		}
 	}
@@ -1737,7 +1947,7 @@ void AddCreditsHistoryEntryTable(
 			table,
 			tr::lng_gift_link_label_reason(),
 			tr::lng_credits_box_history_entry_subscription(
-				Ui::Text::WithEntities));
+				tr::marked));
 	}
 	if (entry.paidMessagesAmount) {
 		auto value = Ui::Text::IconEmoji(&st::starIconEmojiColored);
@@ -1756,7 +1966,7 @@ void AddCreditsHistoryEntryTable(
 			tr::lng_months(
 				lt_count,
 				rpl::single(1. * months),
-				Ui::Text::WithEntities));
+				tr::marked));
 	}
 	if (!entry.id.isEmpty()) {
 		auto label = MakeMaybeMultilineTokenValue(table, entry.id, st);
@@ -1777,27 +1987,27 @@ void AddCreditsHistoryEntryTable(
 			table,
 			tr::lng_credits_box_history_entry_floodskip_row(),
 			rpl::single(
-				Ui::Text::WithEntities(
+				tr::marked(
 					Lang::FormatCountDecimal(entry.floodSkip))));
 	}
 	if (!entry.date.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+			rpl::single(tr::marked(langDateTime(entry.date))));
 	}
 	if (!entry.successDate.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_success_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
+			rpl::single(tr::marked(langDateTime(entry.date))));
 	}
 	if (!entry.successLink.isEmpty()) {
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_success_url(),
 			rpl::single(
-				Ui::Text::Link(entry.successLink, entry.successLink)));
+				tr::link(entry.successLink, entry.successLink)));
 	}
 	if (entry.limitedCount > 0 && entry.limitedLeft >= 0) {
 		AddTableRow(
@@ -1810,7 +2020,7 @@ void AddCreditsHistoryEntryTable(
 				rpl::single(TextWithEntities{
 					Lang::FormatCountDecimal(entry.limitedCount)
 				}),
-				Ui::Text::WithEntities));
+				tr::marked));
 	}
 }
 
@@ -1844,7 +2054,7 @@ void AddSubscriptionEntryTable(
 		AddTableRow(
 			table,
 			tr::lng_credits_subscription_row_to(),
-			rpl::single(Ui::Text::WithEntities(s.title)));
+			rpl::single(tr::marked(s.title)));
 	}
 	if (!s.until.isNull()) {
 		if (s.subscription.period > 0) {
@@ -1854,7 +2064,7 @@ void AddSubscriptionEntryTable(
 					table,
 					tr::lng_group_invite_joined_row_date(),
 					rpl::single(
-						Ui::Text::WithEntities(langDateTime(subscribed))));
+						tr::marked(langDateTime(subscribed))));
 			}
 		}
 		AddTableRow(
@@ -1864,7 +2074,7 @@ void AddSubscriptionEntryTable(
 				: s.cancelled
 				? tr::lng_credits_subscription_row_next_off()
 				: tr::lng_credits_subscription_row_next_on(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(s.until))));
+			rpl::single(tr::marked(langDateTime(s.until))));
 	}
 }
 
@@ -1888,7 +2098,7 @@ void AddSubscriberEntryTable(
 		AddTableRow(
 			table,
 			tr::lng_group_invite_joined_row_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(d))));
+			rpl::single(tr::marked(langDateTime(d))));
 	}
 }
 
@@ -1919,7 +2129,7 @@ void AddCreditsBoostTable(
 			tr::lng_gift_stars_title(
 				lt_count,
 				rpl::single(float64(b.credits)),
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	{
 		const auto link = CreateMessageLink(
@@ -1932,7 +2142,7 @@ void AddCreditsBoostTable(
 				tr::lng_gift_link_label_reason(),
 				tr::lng_gift_link_reason_giveaway(
 				) | rpl::map([link](const QString &text) {
-					return Ui::Text::Link(text, link);
+					return tr::link(text, link);
 				}));
 		}
 	}
@@ -1940,13 +2150,13 @@ void AddCreditsBoostTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_link_label_date(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(b.date))));
+			rpl::single(tr::marked(langDateTime(b.date))));
 	}
 	if (!b.expiresAt.isNull()) {
 		AddTableRow(
 			table,
 			tr::lng_gift_until(),
-			rpl::single(Ui::Text::WithEntities(langDateTime(b.expiresAt))));
+			rpl::single(tr::marked(langDateTime(b.expiresAt))));
 	}
 }
 
@@ -2008,7 +2218,7 @@ void AddUniqueGiftValueTable(
 				value->initialSalePrice,
 				value->currency,
 				true)),
-			Ui::Text::WithEntities),
+			tr::marked),
 		helper.context());
 	if (value->lastSaleDate) {
 		AddTableRow(

Telegram/SourceFiles/boxes/gift_premium_box.h

@@ -24,6 +24,7 @@ struct GiveawayStart;
 struct GiveawayResults;
 struct SubscriptionEntry;
 struct UniqueGift;
+struct GiftUpgradeSpinner;
 } // namespace Data
 
 namespace Main {
@@ -77,8 +78,9 @@ void AddStarGiftTable(
 	not_null<Ui::VerticalLayout*> container,
 	Settings::CreditsEntryBoxStyleOverrides st,
 	const Data::CreditsHistoryEntry &entry,
+	std::shared_ptr<Data::GiftUpgradeSpinner> spinner,
 	Fn<void()> convertToStars,
-	Fn<void()> startUpgrade,
+	bool canStartUpgrade,
 	Fn<void(Fn<void()> removed)> removeDetails);
 void AddTransferGiftTable(
 	std::shared_ptr<ChatHelpers::Show> show,

Telegram/SourceFiles/boxes/language_box.cpp

@@ -908,7 +908,7 @@ void Content::setupContent(
 			inner,
 			st::defaultBox.margin.top()));
 
-		rows->isEmpty() | rpl::start_with_next([=](bool empty) {
+		rows->isEmpty() | rpl::on_next([=](bool empty) {
 			wrap->toggle(!empty, anim::type::instant);
 		}, rows->lifetime());
 
@@ -931,7 +931,7 @@ void Content::setupContent(
 		tr::lng_languages_none(),
 		st::membersAbout);
 	empty->entity()->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		label->move(
 			(size.width() - label->width()) / 2,
 			(size.height() - label->height()) / 2);
@@ -951,7 +951,7 @@ void Content::setupContent(
 			main->isEmpty(),
 			other->isEmpty(),
 			_1 || _2
-		) | rpl::start_with_next([=](bool empty) {
+		) | rpl::on_next([=](bool empty) {
 			divider->toggle(!empty, anim::type::instant);
 		}, divider->lifetime());
 
@@ -959,7 +959,7 @@ void Content::setupContent(
 			a->hasSelection(
 			) | rpl::filter(
 				_1
-			) | rpl::start_with_next([=] {
+			) | rpl::on_next([=] {
 				b->setSelected(-1);
 			}, a->lifetime());
 		};
@@ -1048,7 +1048,7 @@ void Content::setupContent(
 	};
 	_activations = [=] {
 		if (!main && !other) {
-			return rpl::never<Language>() | rpl::type_erased();
+			return rpl::never<Language>() | rpl::type_erased;
 		} else if (!main) {
 			return other->activations();
 		} else if (!other) {
@@ -1057,7 +1057,7 @@ void Content::setupContent(
 		return rpl::merge(
 			main->activations(),
 			other->activations()
-		) | rpl::type_erased();
+		) | rpl::type_erased;
 	};
 	_changeChosen = [=](const QString &chosen) {
 		if (main) {
@@ -1134,12 +1134,12 @@ void LanguageBox::prepare() {
 		inner->heightValue(),
 		topContainer->heightValue(),
 		_1 + _2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		accumulate_max(*max, height);
 		setDimensions(st::boxWidth, qMin(*max, st::boxMaxListHeight));
 	}, inner->lifetime());
 	topContainer->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setInnerTopSkip(height);
 	}, inner->lifetime());
 
@@ -1154,7 +1154,7 @@ void LanguageBox::prepare() {
 	});
 
 	inner->activations(
-	) | rpl::start_with_next([=](const Language &language) {
+	) | rpl::on_next([=](const Language &language) {
 		// "#custom" is applied each time it's passed to switchToLanguage().
 		// So we check that the language really has changed.
 		const auto currentId = [] {
@@ -1190,7 +1190,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 	translateEnabled->toggledValue(
 	) | rpl::filter([](bool checked) {
 		return (checked != Core::App().settings().translateButtonEnabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setTranslateButtonEnabled(checked);
 		Core::App().saveSettingsDelayed();
 	}, translateEnabled->lifetime());
@@ -1207,7 +1207,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 			rpl::duplicate(premium),
 			_1 && _2),
 		_translateChatTurnOff.events()));
-	std::move(premium) | rpl::start_with_next([=](bool value) {
+	std::move(premium) | rpl::on_next([=](bool value) {
 		translateChat->setToggleLocked(!value);
 	}, translateChat->lifetime());
 
@@ -1222,7 +1222,7 @@ void LanguageBox::setupTop(not_null<Ui::VerticalLayout*> container) {
 		}
 		return premium
 			&& (checked != Core::App().settings().translateChatEnabled());
-	}) | rpl::start_with_next([=](bool checked) {
+	}) | rpl::on_next([=](bool checked) {
 		Core::App().settings().setTranslateChatEnabled(checked);
 		Core::App().saveSettingsDelayed();
 	}, translateChat->lifetime());
@@ -1300,7 +1300,7 @@ base::binary_guard LanguageBox::Show(Window::SessionController *controller) {
 		manager.languageListChanged(
 		) | rpl::take(
 			1
-		) | rpl::start_with_next([=]() mutable {
+		) | rpl::on_next([=]() mutable {
 			const auto show = guard->alive();
 			if (lifetime) {
 				base::take(lifetime)->destroy();

Telegram/SourceFiles/boxes/local_storage_box.cpp

@@ -288,7 +288,7 @@ void LocalStorageBox::Show(not_null<Window::SessionController*> controller) {
 	rpl::combine(
 		controller->session().data().cache().statsOnMain(),
 		controller->session().data().cacheBigFile().statsOnMain()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			Database::Stats &&stats,
 			Database::Stats &&statsBig) {
 		weak->update(std::move(stats), std::move(statsBig));
@@ -379,7 +379,7 @@ void LocalStorageBox::setupControls() {
 		const auto shown = (data.count && data.totalSize) || !tag;
 		result->toggle(shown, anim::type::instant);
 		result->entity()->clearRequests(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			clearByTag(tag);
 		}, result->lifetime());
 		_rows.emplace(tag, result);
@@ -431,7 +431,7 @@ void LocalStorageBox::setupControls() {
 	);
 	container->resizeToWidth(st::boxWidth);
 	container->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(st::boxWidth, height);
 	}, container->lifetime());
 }

Telegram/SourceFiles/boxes/max_invite_box.cpp

@@ -77,7 +77,7 @@ void MaxInviteBox::prepare() {
 	_channel->session().changes().peerUpdates(
 		_channel,
 		Data::PeerUpdate::Flag::InviteLinks
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rtlupdate(_invitationLink);
 	}, lifetime());
 }

Telegram/SourceFiles/boxes/moderate_messages_box.cpp

@@ -118,7 +118,7 @@ ModerateOptions CalculateModerateOptions(const HistoryItemsList &items) {
 			const auto peer = from[state->index];
 			const auto peerId = peer->id;
 			state->apiLifetime = search->messagesFounds(
-			) | rpl::start_with_next([=](const Api::FoundMessages &found) {
+			) | rpl::on_next([=](const Api::FoundMessages &found) {
 				state->messagesCounts[peerId] = found.total;
 				state->index++;
 				repeat(repeat);
@@ -201,7 +201,7 @@ void CreateModerateMessagesBox(
 			not_null<Ui::Checkbox*> checkbox,
 			not_null<Controller*> controller,
 			Request request) {
-		confirms->events() | rpl::start_with_next([=] {
+		confirms->events() | rpl::on_next([=] {
 			if (checkbox->checked() && controller->collectRequests) {
 				sequentiallyRequest(request, controller->collectRequests());
 			}
@@ -297,12 +297,12 @@ void CreateModerateMessagesBox(
 				!(isSingle)
 					? tr::lng_delete_all_from_users(
 						tr::now,
-						Ui::Text::WithEntities)
+						tr::marked)
 					: tr::lng_delete_all_from_user(
 						tr::now,
 						lt_user,
-						Ui::Text::Bold(firstItem->from()->name()),
-						Ui::Text::WithEntities),
+						tr::bold(firstItem->from()->name()),
+						tr::marked),
 				false,
 				st::defaultBoxCheckbox),
 			st::boxRowPadding + buttonPadding);
@@ -354,7 +354,7 @@ void CreateModerateMessagesBox(
 					}
 					return float64(result);
 				})
-			) | rpl::start_with_next([=](const QString &text) {
+			) | rpl::on_next([=](const QString &text) {
 				title->setText(text);
 				title->resizeToWidth(inner->width()
 					- rect::m::sum::h(st::boxRowPadding));
@@ -386,7 +386,7 @@ void CreateModerateMessagesBox(
 				rpl::conditional(
 					(ownedWrap
 						? ownedWrap->toggledValue()
-						: rpl::single(false) | rpl::type_erased()),
+						: rpl::single(false) | rpl::type_erased),
 					tr::lng_restrict_user(
 						lt_count,
 						rpl::single(participants.size()) | tr::to_count()),
@@ -432,7 +432,7 @@ void CreateModerateMessagesBox(
 				}
 				wrap->toggle(!wrap->toggled(), anim::type::normal);
 				{
-					inner->heightValue() | rpl::start_with_next([=] {
+					inner->heightValue() | rpl::on_next([=] {
 						if (!wrap->animating()) {
 							scrollLifetime->destroy();
 							Ui::PostponeCall(crl::guard(box, [=] {
@@ -456,10 +456,10 @@ void CreateModerateMessagesBox(
 					: tr::lng_restrict_users_full)(
 						lt_emoji,
 						rpl::single(toggled ? emojiUp : emojiDown),
-						Ui::Text::WithEntities);
+						tr::marked);
 			}) | rpl::flatten_latest(
-			) | rpl::start_with_next([=](const TextWithEntities &text) {
-				raw->setMarkedText(Ui::Text::Link(text, u"internal:"_q));
+			) | rpl::on_next([=](const TextWithEntities &text) {
+				raw->setMarkedText(tr::link(text, u"internal:"_q));
 			}, label->lifetime());
 
 			Ui::AddSkip(inner);
@@ -509,7 +509,7 @@ void CreateModerateMessagesBox(
 				disabledMessages,
 				{ .isForum = peer->isForum() });
 			computeRestrictions = getRestrictions;
-			std::move(changes) | rpl::start_with_next([=] {
+			std::move(changes) | rpl::on_next([=] {
 				ban->setChecked(true);
 			}, ban->lifetime());
 			Ui::AddSkip(container);
@@ -519,7 +519,7 @@ void CreateModerateMessagesBox(
 		}
 
 		// Handle confirmation manually.
-		confirms->events() | rpl::start_with_next([=] {
+		confirms->events() | rpl::on_next([=] {
 			if (ban->checked() && controller->collectRequests) {
 				const auto kick = !wrap || !wrap->toggled();
 				const auto restrictions = computeRestrictions
@@ -622,12 +622,12 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 		Ui::CreateChild<Ui::FlatLabel>(
 			container,
 			peer->isSelf()
-				? tr::lng_saved_messages() | Ui::Text::ToBold()
+				? tr::lng_saved_messages(tr::bold)
 				: maybeUser
-				? tr::lng_profile_delete_conversation() | Ui::Text::ToBold()
+				? tr::lng_profile_delete_conversation(tr::bold)
 				: rpl::single(
-					userpicPeer->name()
-				) | Ui::Text::ToBold() | rpl::type_erased(),
+					tr::bold(userpicPeer->name())
+				) | rpl::type_erased,
 			box->getDelegate()->style().title));
 
 	Ui::AddSkip(container);
@@ -661,10 +661,10 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 						tr::now,
 						lt_user,
 						TextWithEntities{ maybeUser->firstName },
-						Ui::Text::RichLangValue)
+						tr::rich)
 					: tr::lng_delete_for_everyone_check(
 						tr::now,
-						Ui::Text::WithEntities),
+						tr::marked),
 				false,
 				st::defaultBoxCheckbox));
 	}();
@@ -678,7 +678,7 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 		return box->addRow(
 			object_ptr<Ui::Checkbox>(
 				container,
-				tr::lng_profile_block_bot(tr::now, Ui::Text::WithEntities),
+				tr::lng_profile_block_bot(tr::now, tr::marked),
 				false,
 				st::defaultBoxCheckbox));
 	}();
@@ -712,7 +712,7 @@ void DeleteChatBox(not_null<Ui::GenericBox*> box, not_null<PeerData*> peer) {
 					? tr::lng_filters_checkbox_remove_channel
 					: tr::lng_filters_checkbox_remove_group)(
 						tr::now,
-						Ui::Text::WithEntities),
+						tr::marked),
 				false,
 				st::defaultBoxCheckbox));
 	}();
@@ -794,7 +794,7 @@ void DeleteSublistBox(
 		userpic,
 		Ui::CreateChild<Ui::FlatLabel>(
 			container,
-			tr::lng_profile_delete_conversation() | Ui::Text::ToBold(),
+			tr::lng_profile_delete_conversation(tr::bold),
 			box->getDelegate()->style().title));
 
 	Ui::AddSkip(container);

Telegram/SourceFiles/boxes/passcode_box.cpp

@@ -47,7 +47,7 @@ void SetCloudPassword(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session) {
 	session->api().cloudPassword().state(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		using namespace Settings;
 		const auto weak = base::make_weak(box);
 		if (CheckEditCloudPassword(session)) {
@@ -73,17 +73,17 @@ void TransferPasswordError(
 	auto text = std::move(about).append('\n').append('\n').append(
 		tr::lng_rights_transfer_check_password(
 			tr::now,
-			Ui::Text::RichLangValue)
+			tr::rich)
 	).append('\n').append('\n').append(
 		tr::lng_rights_transfer_check_session(
 			tr::now,
-			Ui::Text::RichLangValue)
+			tr::rich)
 	);
 	if (error == PasswordErrorType::Later) {
 		text.append('\n').append('\n').append(
 			tr::lng_rights_transfer_check_later(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 	}
 	box->addRow(object_ptr<Ui::FlatLabel>(
 		box,
@@ -120,7 +120,7 @@ void StartPendingReset(
 	};
 
 	session->api().cloudPassword().resetPassword(
-	) | rpl::start_with_next_error_done([=](
+	) | rpl::on_next_error_done([=](
 			Api::CloudPassword::ResetRetryDate retryDate) {
 		constexpr auto kMinute = 60;
 		constexpr auto kHour = 3600;
@@ -309,11 +309,11 @@ void PasscodeBox::prepare() {
 	connect(_newPasscode, &Ui::MaskedInputField::changed, [=] { newChanged(); });
 	connect(_reenterPasscode, &Ui::MaskedInputField::changed, [=] { newChanged(); });
 	_passwordHint->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		newChanged();
 	}, _passwordHint->lifetime());
 	_recoverEmail->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!_emailError.isEmpty()) {
 			_emailError = QString();
 			update();
@@ -325,9 +325,9 @@ void PasscodeBox::prepare() {
 	connect(_newPasscode, &Ui::MaskedInputField::submitted, fieldSubmit);
 	connect(_reenterPasscode, &Ui::MaskedInputField::submitted, fieldSubmit);
 	_passwordHint->submits(
-	) | rpl::start_with_next(fieldSubmit, _passwordHint->lifetime());
+	) | rpl::on_next(fieldSubmit, _passwordHint->lifetime());
 	_recoverEmail->submits(
-	) | rpl::start_with_next(fieldSubmit, _recoverEmail->lifetime());
+	) | rpl::on_next(fieldSubmit, _recoverEmail->lifetime());
 
 	_recover->addClickHandler([=] { recoverByEmail(); });
 
@@ -607,7 +607,7 @@ void PasscodeBox::validateEmail(
 	box->boxClosing(
 	) | rpl::filter([=] {
 		return !*set;
-	}) | start_with_next([=, weak = base::make_weak(this)] {
+	}) | on_next([=, weak = base::make_weak(this)] {
 		if (weak) {
 			weak->_clearUnconfirmedPassword.fire({});
 		}
@@ -1117,7 +1117,7 @@ void PasscodeBox::recover() {
 	) | rpl::start_to_stream(_newPasswordSet, lifetime());
 
 	box->recoveryExpired(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		recoverExpired();
 	}, lifetime());
 
@@ -1152,7 +1152,7 @@ RecoverBox::RecoverBox(
 	tr::lng_signin_recover_hint(
 		lt_recover_email,
 		rpl::single(Ui::Text::WrapEmailPattern(pattern)),
-		Ui::Text::WithEntities),
+		tr::marked),
 	st::termsContent,
 	st::defaultPopupMenu)
 , _closeParent(std::move(closeParent)) {
@@ -1207,11 +1207,11 @@ void RecoverBox::prepare() {
 	updateHeight();
 
 	_recoverCode->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		codeChanged();
 	}, _recoverCode->lifetime());
 	_recoverCode->submits(
-	) | rpl::start_with_next([=] { submit(); }, _recoverCode->lifetime());
+	) | rpl::on_next([=] { submit(); }, _recoverCode->lifetime());
 }
 
 void RecoverBox::paintEvent(QPaintEvent *e) {
@@ -1342,7 +1342,7 @@ void RecoverBox::proceedToChange(const QString &code) {
 	auto box = Box<PasscodeBox>(_session, fields);
 
 	box->boxClosing(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto weak = base::make_weak(this);
 		if (const auto onstack = _closeParent) {
 			onstack();
@@ -1353,7 +1353,7 @@ void RecoverBox::proceedToChange(const QString &code) {
 	}, lifetime());
 
 	box->newPasswordSet(
-	) | rpl::start_with_next([=](QByteArray &&password) {
+	) | rpl::on_next([=](QByteArray &&password) {
 		_newPasswordSet.fire(std::move(password));
 	}, lifetime());
 

Telegram/SourceFiles/boxes/peer_list_box.cpp

@@ -113,7 +113,7 @@ void PeerListBox::createMultiSelect() {
 		tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { updateScrollSkips(); },
 		lifetime());
 	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
@@ -191,7 +191,7 @@ void PeerListBox::prepare() {
 	_controller->setDelegate(this);
 
 	_controller->boxHeightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		setDimensions(_controller->contentWidth(), height);
 	}, lifetime());
 
@@ -203,7 +203,7 @@ void PeerListBox::prepare() {
 	}
 
 	content()->scrollToRequests(
-	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+	) | rpl::on_next([this](Ui::ScrollToRequest request) {
 		scrollToY(request.ymin, request.ymax);
 	}, lifetime());
 
@@ -1002,14 +1002,14 @@ PeerListContent::PeerListContent(
 , _controller(controller)
 , _rowHeight(_st.item.height) {
 	_controller->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		update();
 	}, lifetime());
 
 	using UpdateFlag = Data::PeerUpdate::Flag;
 	_controller->session().changes().peerUpdates(
 		UpdateFlag::Name | UpdateFlag::Photo | UpdateFlag::EmojiStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		if (update.flags & UpdateFlag::Name) {
 			handleNameChanged(update.peer);
 		}
@@ -1019,7 +1019,7 @@ PeerListContent::PeerListContent(
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		invalidatePixmapsCache();
 	}, lifetime());
 
@@ -1387,10 +1387,10 @@ void PeerListContent::initDecorateWidget(Ui::RpWidget *widget) {
 		widget->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter) && widget->isVisible();
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			mouseLeftGeometry();
 		}, widget->lifetime());
-		widget->heightValue() | rpl::skip(1) | rpl::start_with_next([=] {
+		widget->heightValue() | rpl::skip(1) | rpl::on_next([=] {
 			resizeToWidth(width());
 		}, widget->lifetime());
 	}

Telegram/SourceFiles/boxes/peer_list_controllers.cpp

@@ -117,7 +117,7 @@ object_ptr<Ui::BoxContent> PrepareContactsBox(
 		});
 		raw->setSortMode(Mode::Online);
 
-		raw->wheelClicks() | rpl::start_with_next([=](not_null<PeerData*> p) {
+		raw->wheelClicks() | rpl::on_next([=](not_null<PeerData*> p) {
 			sessionController->showInNewWindow(p);
 		}, box->lifetime());
 	};
@@ -385,7 +385,7 @@ void TrackMessageMoneyRestrictionsChanges(
 	rpl::merge(
 		Data::AmPremiumValue(session) | rpl::to_empty,
 		session->api().premium().someMessageMoneyRestrictionsResolved()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto st = &controller->computeListSt().item;
 		const auto delegate = controller->delegate();
 		const auto process = [&](not_null<PeerListRow*> raw) {
@@ -431,18 +431,18 @@ void ChatsListBoxController::prepare() {
 		session().data().chatsListLoadedEvents(
 		) | rpl::filter([=](Data::Folder *folder) {
 			return !folder;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			checkForEmptyRows();
 		}, lifetime());
 	}
 
 	session().data().chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 
 	session().data().contactsLoaded().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 }
@@ -586,14 +586,14 @@ void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
 	_delegate = delegate;
 
 	_unreadBrush = PeerListStoriesGradient(_controller->computeListSt());
-	style::PaletteChanged() | rpl::start_with_next([=] {
+	style::PaletteChanged() | rpl::on_next([=] {
 		_unreadBrush = PeerListStoriesGradient(_controller->computeListSt());
 		updateColors();
 	}, _lifetime);
 
 	_session->changes().peerUpdates(
 		Data::PeerUpdate::Flag::StoriesState
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto id = update.peer->id.value;
 		if (const auto row = _delegate->peerListFindRow(id)) {
 			process(row);
@@ -601,7 +601,7 @@ void PeerListStories::prepare(not_null<PeerListDelegate*> delegate) {
 	}, _lifetime);
 
 	const auto stories = &_session->data().stories();
-	stories->sourceChanged() | rpl::start_with_next([=](PeerId id) {
+	stories->sourceChanged() | rpl::on_next([=](PeerId id) {
 		const auto source = stories->source(id);
 		const auto info = source
 			? source->info()
@@ -662,7 +662,7 @@ void ContactsBoxController::prepare() {
 	}
 
 	session().data().contactsLoaded().value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		rebuildRows();
 	}, lifetime());
 }
@@ -724,7 +724,7 @@ void ContactsBoxController::setSortMode(SortMode mode) {
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return !_sortByOnlineTimer.isActive()
 				&& delegate()->peerListFindRow(update.peer->id.value);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			_sortByOnlineTimer.callOnce(kSortByOnlineThrottle);
 		}, _sortByOnlineLifetime);
 	} else {
@@ -788,11 +788,11 @@ RecipientMoneyRestrictionError WriteMoneyRestrictionError(
 			lt_user,
 			TextWithEntities{ user->shortName() },
 			lt_link,
-			Ui::Text::Link(
-				Ui::Text::Bold(
+			tr::link(
+				tr::bold(
 					tr::lng_send_non_premium_message_toast_link(
 						tr::now))),
-			Ui::Text::RichLangValue),
+			tr::rich),
 	};
 }
 
@@ -874,7 +874,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 				});
 
 				forum->destroyed(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					box->closeBox();
 				}, box->lifetime());
 			});
@@ -913,7 +913,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 				});
 
 				monoforum->destroyed(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					box->closeBox();
 				}, box->lifetime());
 			});
@@ -1098,12 +1098,12 @@ ChooseTopicBoxController::ChooseTopicBoxController(
 	setStyleOverrides(&st::chooseTopicList);
 
 	_forum->chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	_forum->topicDestroyed(
-	) | rpl::start_with_next([=](not_null<Data::ForumTopic*> topic) {
+	) | rpl::on_next([=](not_null<Data::ForumTopic*> topic) {
 		const auto id = PeerListRowId(topic->rootId().bare);
 		if (const auto row = delegate()->peerListFindRow(id)) {
 			delegate()->peerListRemoveRow(row);
@@ -1133,7 +1133,7 @@ void ChooseTopicBoxController::prepare() {
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto topic = update.entry->asTopic()) {
 			if (topic->forum() == _forum) {
 				const auto id = topic->rootId().bare;
@@ -1200,12 +1200,12 @@ ChooseSublistBoxController::ChooseSublistBoxController(
 	setStyleOverrides(&st::chooseTopicList);
 
 	_monoforum->chatsListChanges(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshRows();
 	}, lifetime());
 
 	_monoforum->sublistDestroyed(
-	) | rpl::start_with_next([=](not_null<Data::SavedSublist*> sublist) {
+	) | rpl::on_next([=](not_null<Data::SavedSublist*> sublist) {
 		const auto id = sublist->sublistPeer()->id.value;
 		if (const auto row = delegate()->peerListFindRow(id)) {
 			delegate()->peerListRemoveRow(row);
@@ -1235,7 +1235,7 @@ void ChooseSublistBoxController::prepare() {
 
 	session().changes().entryUpdates(
 		Data::EntryUpdate::Flag::Repaint
-	) | rpl::start_with_next([=](const Data::EntryUpdate &update) {
+	) | rpl::on_next([=](const Data::EntryUpdate &update) {
 		if (const auto sublist = update.entry->asSublist()) {
 			if (sublist->parent() == _monoforum) {
 				const auto id = sublist->sublistPeer()->id.value;

Telegram/SourceFiles/boxes/peer_list_widgets.cpp

@@ -25,7 +25,7 @@ PeerListWidgets::PeerListWidgets(
 , _controller(controller)
 , _st(controller->computeListSt()) {
 	_content = base::make_unique_q<Ui::VerticalLayout>(this);
-	parent->sizeValue() | rpl::start_with_next([this](const QSize &size) {
+	parent->sizeValue() | rpl::on_next([this](const QSize &size) {
 		_content->resizeToWidth(size.width());
 		resize(size.width(), _content->height());
 	}, lifetime());
@@ -129,7 +129,7 @@ void PeerListWidgets::appendRow(std::unique_ptr<PeerListRow> row) {
 					st.button.ripple,
 					st.button.textBgOver)));
 		widget->resize(widget->width(), st.height);
-		widget->paintRequest() | rpl::start_with_next([=, this] {
+		widget->paintRequest() | rpl::on_next([=, this] {
 			auto p = Painter(widget);
 			const auto selected = widget->isOver() || widget->isDown();
 			paintRow(p, crl::now(), selected, raw);

Telegram/SourceFiles/boxes/peer_lists_box.cpp

@@ -90,7 +90,7 @@ void PeerListsBox::createMultiSelect() {
 		tr::lng_participant_filter());
 	_select.create(this, std::move(entity));
 	_select->heightValue(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[this] { updateScrollSkips(); },
 		lifetime());
 	_select->entity()->setSubmittedCallback([=](Qt::KeyboardModifiers) {
@@ -158,7 +158,7 @@ void PeerListsBox::prepare() {
 		list.controller->setDelegate(list.delegate.get());
 
 		content->scrollToRequests(
-		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+		) | rpl::on_next([=](Ui::ScrollToRequest request) {
 			const auto skip = content->y();
 			scrollToY(
 				skip + request.ymin,
@@ -168,7 +168,7 @@ void PeerListsBox::prepare() {
 		content->selectedIndexValue(
 		) | rpl::filter([=](int index) {
 			return (index >= 0);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			for (const auto &list : _lists) {
 				if (list.content && list.content != content) {
 					list.content->clearSelection();

Telegram/SourceFiles/boxes/peers/add_bot_to_chat_box.cpp

@@ -65,7 +65,7 @@ Controller::Controller(
 , _callback(std::move(callback)) {
 	std::move(
 		add
-	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
+	) | rpl::on_next([=](not_null<PeerData*> peer) {
 		if (_prepared) {
 			addRow(peer);
 		} else {
@@ -359,7 +359,7 @@ object_ptr<Ui::RpWidget> AddBotToGroupBoxController::prepareAdminnedChats() {
 		delegate->setContent(content);
 		controller->setDelegate(delegate);
 
-		items.events() | rpl::take(1) | rpl::start_with_next([=] {
+		items.events() | rpl::take(1) | rpl::on_next([=] {
 			wrap->show(anim::type::instant);
 		}, inner->lifetime());
 	};
@@ -373,7 +373,7 @@ object_ptr<Ui::RpWidget> AddBotToGroupBoxController::prepareAdminnedChats() {
 	rpl::merge(
 		_groups.events(),
 		_channels.events()
-	) | rpl::take(1) | rpl::start_with_next([=] {
+	) | rpl::take(1) | rpl::on_next([=] {
 		container->add(CreatePeerListSectionSubtitle(
 			container,
 			tr::lng_bot_groups()));
@@ -403,7 +403,7 @@ void AddBotToGroupBoxController::prepareViewHook() {
 	session().data().chatsListLoadedEvents(
 	) | rpl::filter([=](Data::Folder *folder) {
 		return !folder;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		updateLabels();
 	}, lifetime());
 }

Telegram/SourceFiles/boxes/peers/add_participants_box.cpp

@@ -29,7 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/show_or_premium_box.h"
 #include "ui/effects/premium_graphics.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue
+#include "ui/text/text_utilities.h" // tr::rich
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
@@ -191,17 +191,17 @@ void FillUpgradeToPremiumCover(
 	for (auto i = 0; i != names; ++i) {
 		const auto name = userpicUsers[i]->shortName();
 		if (text.empty()) {
-			text = Ui::Text::Bold(name);
+			text = tr::bold(name);
 		} else if (i == names - 1 && !remaining) {
 			text = tr::lng_invite_upgrade_users_few(
 				tr::now,
 				lt_users,
 				text,
 				lt_last,
-				Ui::Text::Bold(name),
-				Ui::Text::RichLangValue);
+				tr::bold(name),
+				tr::rich);
 		} else {
-			text.append(", ").append(Ui::Text::Bold(name));
+			text.append(", ").append(tr::bold(name));
 		}
 	}
 	if (remaining > 0) {
@@ -211,7 +211,7 @@ void FillUpgradeToPremiumCover(
 			remaining,
 			lt_users,
 			text,
-			Ui::Text::RichLangValue);
+			tr::rich);
 	}
 	const auto inviteOnly = !forbidden.premiumAllowsInvite.empty()
 		&& (forbidden.premiumAllowsWrite.size() != forbidden.users.size());
@@ -227,7 +227,7 @@ void FillUpgradeToPremiumCover(
 				int(userpicUsers.size()),
 				lt_users,
 				text,
-				Ui::Text::RichLangValue);
+				tr::rich);
 	container->add(
 		object_ptr<Ui::FlatLabel>(
 			container,
@@ -273,7 +273,7 @@ void SimpleForbiddenBox(
 
 	Data::AmPremiumValue(
 		&peer->session()
-	) | rpl::skip(1) | rpl::start_with_next([=] {
+	) | rpl::skip(1) | rpl::on_next([=] {
 		box->closeBox();
 	}, box->lifetime());
 }
@@ -474,11 +474,11 @@ void InviteForbiddenController::setSimpleCover() {
 		? phraseCounted(
 			lt_count,
 			rpl::single<float64>(count),
-			Ui::Text::RichLangValue)
+			tr::rich)
 		: phraseNamed(
 			lt_user,
 			rpl::single(TextWithEntities{ _users.front()->name() }),
-			Ui::Text::RichLangValue);
+			tr::rich);
 	delegate()->peerListSetAboveWidget(object_ptr<Ui::PaddingWrap<>>(
 		(QWidget*)nullptr,
 		object_ptr<Ui::FlatLabel>(
@@ -530,18 +530,18 @@ void InviteForbiddenController::setComplexCover() {
 				? tr::lng_invite_upgrade_via_channel_about
 				: tr::lng_invite_upgrade_via_group_about)(
 					tr::now,
-					Ui::Text::WithEntities)
+					tr::marked)
 			: (_forbidden.users.size() == 1
 				? tr::lng_via_link_cant_one(
 					tr::now,
 					lt_user,
 					TextWithEntities{ _forbidden.users.front()->shortName() },
-					Ui::Text::RichLangValue)
+					tr::rich)
 				: tr::lng_via_link_cant_many(
 					tr::now,
 					lt_count,
 					int(_forbidden.users.size()),
-					Ui::Text::RichLangValue));
+					tr::rich));
 		container->add(
 			object_ptr<Ui::FlatLabel>(
 				container,
@@ -555,7 +555,7 @@ void InviteForbiddenController::setComplexCover() {
 
 void InviteForbiddenController::prepare() {
 	session().api().premium().someMessageMoneyRestrictionsResolved(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto stars = 0;
 		const auto process = [&](not_null<PeerListRow*> raw) {
 			const auto row = static_cast<ForbiddenRow*>(raw.get());
@@ -667,7 +667,7 @@ void InviteForbiddenController::send(
 	if (!waiting.empty()) {
 		session().changes().peerUpdates(
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+		) | rpl::on_next([=](const Data::PeerUpdate &update) {
 			if (waiting.contains(update.peer)) {
 				withPaymentApproved(alreadyApproved);
 			}
@@ -677,7 +677,7 @@ void InviteForbiddenController::send(
 			session().credits().loadedValue(
 			) | rpl::filter(
 				rpl::mappers::_1
-			) | rpl::take(1) | rpl::start_with_next([=] {
+			) | rpl::take(1) | rpl::on_next([=] {
 				withPaymentApproved(alreadyApproved);
 			}, _paymentCheckLifetime);
 		}
@@ -721,12 +721,12 @@ void InviteForbiddenController::send(
 				tr::now,
 				lt_user,
 				TextWithEntities{ list.front()->name() },
-				Ui::Text::RichLangValue)
+				tr::rich)
 			: tr::lng_via_link_shared_many(
 				tr::now,
 				lt_count,
 				int(list.size()),
-				Ui::Text::RichLangValue);
+				tr::rich);
 		close();
 		show->showToast(std::move(text));
 		return true;
@@ -750,7 +750,7 @@ void InviteForbiddenController::send(
 		_peer->session().changes().peerUpdates(
 			_peer,
 			Data::PeerUpdate::Flag::FullInfo
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			sendForFull();
 		}, lifetime());
 	}
@@ -926,7 +926,7 @@ void AddParticipantsBoxController::addInviteLinkButton() {
 		st::inviteViaLinkIcon,
 		QPoint());
 	button->entity()->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		icon->moveToLeft(
 			st::inviteViaLinkIconPosition.x(),
 			(height - st::inviteViaLinkIcon.height()) / 2);
@@ -938,7 +938,7 @@ void AddParticipantsBoxController::addInviteLinkButton() {
 	button->entity()->events(
 	) | rpl::filter([=](not_null<QEvent*> e) {
 		return (e->type() == QEvent::Enter);
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		delegate()->peerListMouseLeftGeometry();
 	}, button->lifetime());
 	delegate()->peerListSetAboveWidget(std::move(button));
@@ -989,14 +989,14 @@ void AddParticipantsBoxController::inviteSelectedUsers(
 				{ users.front()->name()},
 				lt_group,
 				{ _peer->name()},
-				Ui::Text::RichLangValue)
+				tr::rich)
 			: tr::lng_participant_invite_sure_many(
 				tr::now,
 				lt_count,
 				int(users.size()),
 				lt_group,
 				{ _peer->name() },
-				Ui::Text::RichLangValue);
+				tr::rich);
 		Ui::ConfirmBox(box, {
 			.text = std::move(text),
 			.confirmed = crl::guard(weak, [=](Fn<void()> &&close) {
@@ -1062,7 +1062,7 @@ void AddParticipantsBoxController::Start(
 			[=] { box->closeBox(); });
 		if (justCreated) {
 			const auto weak = base::make_weak(parent);
-			box->boxClosing() | rpl::start_with_next([=] {
+			box->boxClosing() | rpl::on_next([=] {
 				auto params = Window::SectionShow();
 				params.activation = anim::activation::background;
 				if (const auto strong = weak.get()) {
@@ -1145,7 +1145,7 @@ bool ChatInviteForbidden(
 		) | rpl::map(
 			rpl::mappers::_1 > 0
 		) | rpl::distinct_until_changed(
-		) | rpl::start_with_next([=](bool has) {
+		) | rpl::on_next([=](bool has) {
 			box->clearButtons();
 			if (has) {
 				const auto send = box->addButton(tr::lng_via_link_send(), [=] {
@@ -1165,7 +1165,7 @@ bool ChatInviteForbidden(
 
 		Data::AmPremiumValue(
 			&peer->session()
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	};
@@ -1272,7 +1272,7 @@ void AddSpecialBoxController::prepareChatRows(not_null<ChatData*> chat) {
 	chat->session().changes().peerUpdates(
 		chat,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_additional.fillFromPeer();
 		if (update.flags & UpdateFlag::Members) {
 			rebuildChatRows(chat);

Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp

@@ -97,6 +97,7 @@ using RightsMap = std::vector<std::pair<ChatAdminRight, tr::phrase<>>>;
 		{ Flag::ManageCall, tr::lng_request_channel_manage_livestreams },
 		{ Flag::ManageDirect, tr::lng_request_channel_manage_direct },
 		{ Flag::AddAdmins, tr::lng_request_channel_add_admins },
+		{ Flag::BanUsers, tr::lng_request_group_ban_users },
 	};
 }
 
@@ -201,10 +202,10 @@ object_ptr<Ui::BoxContent> MakeConfirmBox(
 	auto text = tr::lng_request_peer_confirm(
 		tr::now,
 		lt_chat,
-		Ui::Text::Bold(name),
+		tr::bold(name),
 		lt_bot,
-		Ui::Text::Bold(botName),
-		Ui::Text::WithEntities);
+		tr::bold(botName),
+		tr::marked);
 	if (!peer->isUser()) {
 		const auto rights = peer->isBroadcast()
 			? BroadcastRightsText(query.botRights)
@@ -214,12 +215,12 @@ object_ptr<Ui::BoxContent> MakeConfirmBox(
 				tr::lng_request_peer_confirm_rights(
 					tr::now,
 					lt_bot,
-					Ui::Text::Bold(botName),
+					tr::bold(botName),
 					lt_chat,
-					Ui::Text::Bold(name),
+					tr::bold(name),
 					lt_rights,
 					TextWithEntities{ rights },
-					Ui::Text::WithEntities));
+					tr::marked));
 		} else if (!peer->isBroadcast() && query.isBotParticipant) {
 			const auto common = bot->session().api().botCommonGroups(bot);
 			if (!common || !ranges::contains(*common, peer)) {
@@ -227,10 +228,10 @@ object_ptr<Ui::BoxContent> MakeConfirmBox(
 					tr::lng_request_peer_confirm_add(
 						tr::now,
 						lt_bot,
-						Ui::Text::Bold(botName),
+						tr::bold(botName),
 						lt_chat,
-						Ui::Text::Bold(name),
-						Ui::Text::WithEntities));
+						tr::bold(name),
+						tr::marked));
 			}
 		}
 	}
@@ -372,7 +373,7 @@ void ChoosePeerBoxController::prepareRestrictions() {
 			st,
 			QPoint());
 		button->heightValue(
-		) | rpl::start_with_next([=](int height) {
+		) | rpl::on_next([=](int height) {
 			icon->moveToLeft(
 				st::choosePeerCreateIconLeft,
 				(height - st::inviteViaLinkIcon.height()) / 2);
@@ -386,7 +387,7 @@ void ChoosePeerBoxController::prepareRestrictions() {
 		button->events(
 		) | rpl::filter([=](not_null<QEvent*> e) {
 			return (e->type() == QEvent::Enter);
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			delegate()->peerListMouseLeftGeometry();
 		}, button->lifetime());
 		return button;
@@ -521,7 +522,7 @@ void ShowChoosePeerBox(
 		query,
 		std::move(callback));
 	auto initBox = [=, ptr = controller.get()](not_null<PeerListBox*> box) {
-		ptr->selectedCountValue() | rpl::start_with_next([=](int count) {
+		ptr->selectedCountValue() | rpl::on_next([=](int count) {
 			box->clearButtons();
 			if (limit > 1) {
 				box->setAdditionalTitle(rpl::single(u"%1 / %2"_q.arg(count).arg(limit)));

Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp

@@ -348,8 +348,8 @@ void Controller::initNameFields(
 			_save();
 		}
 	};
-	first->submits() | rpl::start_with_next(submit, first->lifetime());
-	last->submits() | rpl::start_with_next(submit, last->lifetime());
+	first->submits() | rpl::on_next(submit, first->lifetime());
+	last->submits() | rpl::on_next(submit, last->lifetime());
 	first->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 	first->setMaxLength(Ui::EditPeer::kMaxUserFirstLastName);
 }
@@ -418,11 +418,11 @@ void Controller::setupNotesField() {
 	_emojiPanel->hide();
 	_emojiPanel->selector()->setCurrentPeer(_window->session().user());
 	_emojiPanel->selector()->emojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+	) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 		Ui::InsertEmojiAtCursor(_notesField->textCursor(), data.emoji);
 	}, _notesField->lifetime());
 	_emojiPanel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto info = data.document->sticker();
 		if (info
 			&& info->setType == Data::StickersType::Emoji
@@ -464,7 +464,7 @@ void Controller::setupNotesField() {
 			rpl::combine(
 				limitState->charsLimitation->geometryValue(),
 				_notesField->geometryValue()
-			) | rpl::start_with_next([=](QRect limit, QRect field) {
+			) | rpl::on_next([=](QRect limit, QRect field) {
 				limitState->charsLimitation->setVisible(
 					(w->mapToGlobal(limit.bottomLeft()).y() - border)
 						< w->mapToGlobal(field.bottomLeft()).y());
@@ -474,7 +474,7 @@ void Controller::setupNotesField() {
 		limitState->charsLimitation->setLeft(remove);
 	};
 
-	_notesField->changes() | rpl::start_with_next([=] {
+	_notesField->changes() | rpl::on_next([=] {
 		checkCharsLimitation();
 	}, _notesField->lifetime());
 
@@ -496,7 +496,7 @@ void Controller::setupPhotoButtons() {
 		})) | rpl::map([=](const QString &text) {
 			return text.isEmpty() ? Ui::kQEllipsis : text;
 		})
-		: rpl::single(_user->shortName()) | rpl::type_erased();
+		: rpl::single(_user->shortName()) | rpl::type_erased;
 	const auto inner = _box->verticalLayout();
 	Ui::AddSkip(inner);
 
@@ -558,7 +558,7 @@ void Controller::setupPhotoButtons() {
 
 	_suggestIconWidget = Ui::CreateChild<Ui::RpWidget>(suggestButton);
 	_suggestIconWidget->resize(iconPlaceholder);
-	_suggestIconWidget->paintRequest() | rpl::start_with_next([=] {
+	_suggestIconWidget->paintRequest() | rpl::on_next([=] {
 		if (_suggestIcon && _suggestIcon->valid()) {
 			auto p = QPainter(_suggestIconWidget);
 			const auto frame = _suggestIcon->frame(st::lightButtonFg->c);
@@ -566,7 +566,7 @@ void Controller::setupPhotoButtons() {
 		}
 	}, _suggestIconWidget->lifetime());
 
-	suggestButton->sizeValue() | rpl::start_with_next([=](QSize size) {
+	suggestButton->sizeValue() | rpl::on_next([=](QSize size) {
 		_suggestIconWidget->move(
 			st::settingsButtonLight.iconLeft - iconPlaceholder.width() / 4,
 			(size.height() - _suggestIconWidget->height()) / 2);
@@ -590,7 +590,7 @@ void Controller::setupPhotoButtons() {
 
 	_cameraIconWidget = Ui::CreateChild<Ui::RpWidget>(setButton);
 	_cameraIconWidget->resize(iconPlaceholder);
-	_cameraIconWidget->paintRequest() | rpl::start_with_next([=] {
+	_cameraIconWidget->paintRequest() | rpl::on_next([=] {
 		if (_cameraIcon && _cameraIcon->valid()) {
 			auto p = QPainter(_cameraIconWidget);
 			const auto frame = _cameraIcon->frame(st::lightButtonFg->c);
@@ -598,7 +598,7 @@ void Controller::setupPhotoButtons() {
 		}
 	}, _cameraIconWidget->lifetime());
 
-	setButton->sizeValue() | rpl::start_with_next([=](QSize size) {
+	setButton->sizeValue() | rpl::on_next([=](QSize size) {
 		_cameraIconWidget->move(
 			st::settingsButtonLight.iconLeft - iconPlaceholder.width() / 4,
 			(size.height() - _cameraIconWidget->height()) / 2);
@@ -635,7 +635,7 @@ void Controller::setupPhotoButtons() {
 	userpicButton->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 	resetButton->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		userpicButton->move(
 			st::settingsButtonLight.iconLeft,
 			(size.height() - userpicButton->height()) / 2);
@@ -751,13 +751,13 @@ void Controller::showPhotoMenu(bool suggest) {
 							? tr::lng_profile_suggest_sure(
 								tr::now,
 								lt_user,
-								Ui::Text::Bold(_user->shortName()),
-								Ui::Text::WithEntities)
+								tr::bold(_user->shortName()),
+								tr::marked)
 							: tr::lng_profile_set_personal_sure(
 								tr::now,
 								lt_user,
-								Ui::Text::Bold(_user->shortName()),
-								Ui::Text::WithEntities)),
+								tr::bold(_user->shortName()),
+								tr::marked)),
 						.confirm = (suggest
 							? tr::lng_profile_suggest_button(tr::now)
 							: tr::lng_profile_set_photo_button(tr::now)),
@@ -798,13 +798,13 @@ void Controller::choosePhotoFile(bool suggest) {
 				? tr::lng_profile_suggest_sure(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(_user->shortName()),
-					Ui::Text::WithEntities)
+					tr::bold(_user->shortName()),
+					tr::marked)
 				: tr::lng_profile_set_personal_sure(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(_user->shortName()),
-					Ui::Text::WithEntities)),
+					tr::bold(_user->shortName()),
+					tr::marked)),
 			.confirm = (suggest
 				? tr::lng_profile_suggest_button(tr::now)
 				: tr::lng_profile_set_photo_button(tr::now)),

Telegram/SourceFiles/boxes/peers/edit_discussion_link_box.cpp

@@ -16,7 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue
+#include "ui/text/text_utilities.h" // tr::rich
 #include "boxes/peer_list_box.h"
 #include "ui/boxes/confirm_box.h"
 #include "boxes/add_contact_box.h"
@@ -81,7 +81,7 @@ Controller::Controller(
 		Data::PeerUpdate::Flag::FullInfo
 	) | rpl::filter([=](const Data::PeerUpdate &update) {
 		return (update.peer == _waitForFull);
-	}) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	}) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		choose(std::exchange(_waitForFull, nullptr));
 	}, lifetime());
 }
@@ -146,10 +146,10 @@ void Controller::choose(not_null<ChannelData*> chat) {
 	auto text = tr::lng_manage_discussion_group_sure(
 		tr::now,
 		lt_group,
-		Ui::Text::Bold(chat->name()),
+		tr::bold(chat->name()),
 		lt_channel,
-		Ui::Text::Bold(_channel->name()),
-		Ui::Text::WithEntities);
+		tr::bold(_channel->name()),
+		tr::marked);
 	if (!_channel->isPublic()) {
 		text.append(
 			"\n\n" + tr::lng_manage_linked_channel_private(tr::now));
@@ -161,7 +161,7 @@ void Controller::choose(not_null<ChannelData*> chat) {
 			text.append("\n\n");
 			text.append(tr::lng_manage_discussion_group_warning(
 				tr::now,
-				Ui::Text::RichLangValue));
+				tr::rich));
 		}
 	}
 	const auto sure = [=](Fn<void()> &&close) {
@@ -180,10 +180,10 @@ void Controller::choose(not_null<ChatData*> chat) {
 	auto text = tr::lng_manage_discussion_group_sure(
 		tr::now,
 		lt_group,
-		Ui::Text::Bold(chat->name()),
+		tr::bold(chat->name()),
 		lt_channel,
-		Ui::Text::Bold(_channel->name()),
-		Ui::Text::WithEntities);
+		tr::bold(_channel->name()),
+		tr::marked);
 	if (!_channel->isPublic()) {
 		text.append("\n\n" + tr::lng_manage_linked_channel_private(tr::now));
 	}
@@ -191,7 +191,7 @@ void Controller::choose(not_null<ChatData*> chat) {
 	text.append("\n\n");
 	text.append(tr::lng_manage_discussion_group_warning(
 		tr::now,
-		Ui::Text::RichLangValue));
+		tr::rich));
 	const auto sure = [=](Fn<void()> &&close) {
 		close();
 		const auto done = [=](not_null<ChannelData*> chat) {
@@ -213,15 +213,15 @@ void Controller::choose(not_null<ChatData*> chat) {
 	if (!channel->isBroadcast()) {
 		return tr::lng_manage_linked_channel_about(
 			lt_channel,
-			rpl::single(Ui::Text::Bold(chat->name())),
-			Ui::Text::WithEntities);
+			rpl::single(tr::bold(chat->name())),
+			tr::marked);
 	} else if (chat != nullptr) {
 		return tr::lng_manage_discussion_group_about_chosen(
 			lt_group,
-			rpl::single(Ui::Text::Bold(chat->name())),
-			Ui::Text::WithEntities);
+			rpl::single(tr::bold(chat->name())),
+			tr::marked);
 	}
-	return tr::lng_manage_discussion_group_about(Ui::Text::WithEntities);
+	return tr::lng_manage_discussion_group_about(tr::marked);
 }
 
 [[nodiscard]] object_ptr<Ui::BoxContent> EditDiscussionLinkBox(
@@ -361,5 +361,5 @@ void ShowForumForDiscussionError(
 	navigation->showToast(
 		tr::lng_forum_topics_no_discussion(
 			tr::now,
-			Ui::Text::RichLangValue));
+			tr::rich));
 }

Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp

@@ -73,7 +73,7 @@ DefaultIconEmoji::DefaultIconEmoji(
 	Fn<void()> repaint,
 	Data::CustomEmojiSizeTag tag)
 : _tag(tag) {
-	std::move(value) | rpl::start_with_next([=](DefaultIcon value) {
+	std::move(value) | rpl::on_next([=](DefaultIcon value) {
 		_icon = value;
 		_image = QImage();
 		if (repaint) {
@@ -164,7 +164,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	std::move(
 		iconId
-	) | rpl::start_with_next([=](DocumentId id) {
+	) | rpl::on_next([=](DocumentId id) {
 		const auto owner = &controller->session().data();
 		state->icon = id
 			? owner->customEmojiManager().create(
@@ -177,7 +177,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	std::move(
 		defaultIcon
-	) | rpl::start_with_next([=](DefaultIcon icon) {
+	) | rpl::on_next([=](DefaultIcon icon) {
 		state->defaultIcon = Data::ForumTopicIconFrame(
 			icon.colorId,
 			icon.title,
@@ -189,7 +189,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 	result->paintRequest(
 	) | rpl::filter([=] {
 		return !paintIconFrame(result);
-	}) | rpl::start_with_next([=](QRect clip) {
+	}) | rpl::on_next([=](QRect clip) {
 		auto args = Ui::Text::CustomEmoji::Context{
 			.textColor = st::windowFg->c,
 			.now = crl::now(),
@@ -222,7 +222,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	rpl::single(rpl::empty) | rpl::then(
 		style::PaletteChanged()
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->frame = Data::ForumTopicGeneralIconFrame(
 			st::largeForumTopicIcon.size,
 			st::windowSubTextFg->c);
@@ -231,7 +231,7 @@ bool DefaultIconEmoji::readyInDefaultState() {
 
 	result->resize(size, size);
 	result->paintRequest(
-	) | rpl::start_with_next([=](QRect clip) {
+	) | rpl::on_next([=](QRect clip) {
 		auto p = QPainter(result);
 		const auto skip = (size - st::largeForumTopicIcon.size) / 2;
 		p.drawImage(skip, skip, state->frame);
@@ -300,7 +300,7 @@ struct IconSelector {
 
 	icons->requestDefaultIfUnknown();
 	icons->defaultUpdates(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		selector->provideRecent(DocumentListToRecent(recent()));
 	}, selector->lifetime());
 
@@ -312,14 +312,14 @@ struct IconSelector {
 	rpl::combine(
 		rpl::duplicate(coverHeight),
 		selector->widthValue()
-	) | rpl::start_with_next([=](int top, int width) {
+	) | rpl::on_next([=](int top, int width) {
 		shadow->setGeometry(0, top, width, st::lineWidth);
 	}, shadow->lifetime());
 
 	selector->refreshEmoji();
 
 	selector->scrollToRequests(
-	) | rpl::start_with_next([=](int y) {
+	) | rpl::on_next([=](int y) {
 		box->scrollToY(y);
 		shadow->update();
 	}, selector->lifetime());
@@ -328,7 +328,7 @@ struct IconSelector {
 		box->heightValue(),
 		std::move(coverHeight),
 		rpl::mappers::_1 - rpl::mappers::_2
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		selector->setMinimalHeight(selector->width(), height);
 	}, body->lifetime());
 
@@ -345,7 +345,7 @@ struct IconSelector {
 	};
 
 	selector->customChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		const auto owner = &controller->session().data();
 		const auto document = data.document;
 		const auto id = document->id;
@@ -465,14 +465,14 @@ void EditForumTopicBox(
 			paintIconFrame);
 
 	title->geometryValue(
-	) | rpl::start_with_next([=](QRect geometry) {
+	) | rpl::on_next([=](QRect geometry) {
 		icon->move(
 			st::editTopicIconPosition.x(),
 			st::editTopicIconPosition.y());
 	}, icon->lifetime());
 
 	state->iconId.value(
-	) | rpl::start_with_next([=](DocumentId iconId) {
+	) | rpl::on_next([=](DocumentId iconId) {
 		icon->setAttribute(
 			Qt::WA_TransparentForMouseEvents,
 			created || (iconId != 0));
@@ -486,13 +486,13 @@ void EditForumTopicBox(
 		};
 	});
 	title->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->defaultIcon = DefaultIcon{
 			title->getLastText().trimmed(),
 			state->defaultIcon.current().colorId,
 		};
 	}, title->lifetime());
-	title->submits() | rpl::start_with_next([box] {
+	title->submits() | rpl::on_next([box] {
 		box->triggerButton(0);
 	}, title->lifetime());
 
@@ -515,7 +515,7 @@ void EditForumTopicBox(
 		state->paintIconFrame = std::move(selector.paintIconFrame);
 		std::move(
 			selector.iconIdValue
-		) | rpl::start_with_next([=](DocumentId iconId) {
+		) | rpl::on_next([=](DocumentId iconId) {
 			state->iconId = (iconId != kDefaultIconId) ? iconId : 0;
 		}, box->lifetime());
 	}

Telegram/SourceFiles/boxes/peers/edit_members_visible.cpp

@@ -62,7 +62,7 @@ namespace {
 	Ui::AddDividerText(container, tr::lng_profile_hide_participants_about());
 
 	button->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		megagroup->session().api().request(
 			MTPchannels_ToggleParticipantsHidden(
 				megagroup->inputChannel,

Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp

@@ -94,7 +94,7 @@ EditParticipantBox::Inner::Inner(
 , _hasAdminRights(hasAdminRights)
 , _rows(this) {
 	_rows->heightValue(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		resizeToWidth(width());
 	}, lifetime());
 
@@ -246,7 +246,8 @@ ChatAdminRightsInfo EditAdminBox::defaultRights() const {
 			| Flag::DeleteStories
 			| Flag::InviteByLinkOrAdd
 			| Flag::ManageCall
-			| Flag::ManageDirect) };
+			| Flag::ManageDirect
+			| Flag::BanUsers) };
 }
 
 void EditAdminBox::prepare() {
@@ -281,7 +282,7 @@ void EditAdminBox::prepare() {
 					true)),
 			st::rightsToggleMargin + (st::rightsDividerMargin / 2));
 		_addAsAdmin->checkedChanges(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			_adminControlsWrap->toggle(checked, anim::type::normal);
 			refreshButtons();
 		}, _addAsAdmin->lifetime());
@@ -300,11 +301,11 @@ void EditAdminBox::prepare() {
 			tr::lng_rights_about_by(
 				lt_user,
 				rpl::single(_by
-					? Ui::Text::Link(_by->name(), 1)
+					? tr::link(_by->name(), 1)
 					: TextWithEntities{ QString::fromUtf8("\U0001F47B") }),
 				lt_date,
 				rpl::single(TextWithEntities{ langDateTimeFull(parsed) }),
-				Ui::Text::WithEntities));
+				tr::marked));
 		if (_by) {
 			label->setLink(1, _by->createOpenLink());
 		}
@@ -464,8 +465,8 @@ void EditAdminBox::prepare() {
 					phrase(
 						tr::now,
 						lt_group,
-						Ui::Text::Bold(peer()->name()),
-						Ui::Text::WithEntities),
+						tr::bold(peer()->name()),
+						tr::marked),
 					crl::guard(this, [=] { finishAddAdmin(); })
 				}));
 			} else {
@@ -529,7 +530,7 @@ not_null<Ui::InputField*> EditAdminBox::addRankInput(
 	result->setMaxLength(kAdminRoleLimit);
 	result->setInstantReplaces(Ui::InstantReplaces::TextOnly());
 	result->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto text = result->getLastText();
 		const auto removed = TextUtilities::RemoveEmoji(text);
 		if (removed != text) {
@@ -610,10 +611,10 @@ void EditAdminBox::transferOwnership() {
 				.text = tr::lng_rights_transfer_about(
 					tr::now,
 					lt_group,
-					Ui::Text::Bold(peer()->name()),
+					tr::bold(peer()->name()),
 					lt_user,
-					Ui::Text::Bold(user()->shortName()),
-					Ui::Text::RichLangValue),
+					tr::bold(user()->shortName()),
+					tr::rich),
 				.confirmed = callback,
 				.confirmText = tr::lng_rights_transfer_sure(),
 			}));
@@ -626,8 +627,8 @@ bool EditAdminBox::handleTransferPasswordError(const QString &error) {
 	auto about = tr::lng_rights_transfer_check_about(
 		tr::now,
 		lt_user,
-		Ui::Text::Bold(user()->shortName()),
-		Ui::Text::WithEntities);
+		tr::bold(user()->shortName()),
+		tr::marked);
 	if (auto box = PrePasswordErrorBox(error, session, std::move(about))) {
 		getDelegate()->show(std::move(box));
 		return true;
@@ -653,7 +654,7 @@ void EditAdminBox::requestTransferPassword(not_null<ChannelData*> channel) {
 	peer()->session().api().cloudPassword().state(
 	) | rpl::take(
 		1
-	) | rpl::start_with_next([=](const Core::CloudPasswordState &state) {
+	) | rpl::on_next([=](const Core::CloudPasswordState &state) {
 		auto fields = PasscodeBox::CloudFields::From(state);
 		fields.customTitle = tr::lng_rights_transfer_password_title();
 		fields.customDescription
@@ -836,11 +837,11 @@ void EditRestrictedBox::prepare() {
 				: tr::lng_rights_chat_restricted_by)(
 					lt_user,
 					rpl::single(_by
-						? Ui::Text::Link(_by->name(), 1)
+						? tr::link(_by->name(), 1)
 						: TextWithEntities{ QString::fromUtf8("\U0001F47B") }),
 					lt_date,
 					rpl::single(TextWithEntities{ langDateTimeFull(parsed) }),
-					Ui::Text::WithEntities));
+					tr::marked));
 		if (_by) {
 			label->setLink(1, _by->createOpenLink());
 		}

Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp

@@ -296,7 +296,7 @@ void SubscribeToMigration(
 				return (channel != nullptr);
 			}) | rpl::take(
 				1
-			) | rpl::start_with_next([=](not_null<ChannelData*> channel) {
+			) | rpl::on_next([=](not_null<ChannelData*> channel) {
 				const auto onstack = base::duplicate(migrate);
 				onstack(channel);
 			}, lifetime);
@@ -812,7 +812,7 @@ ParticipantsOnlineSorter::ParticipantsOnlineSorter(
 , _sortByOnlineTimer([=] { sort(); }) {
 	peer->session().changes().peerUpdates(
 		Data::PeerUpdate::Flag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		const auto peerId = update.peer->id;
 		if (const auto row = _delegate->peerListFindRow(peerId.value)) {
 			row->refreshStatus();
@@ -910,7 +910,7 @@ void ParticipantsBoxController::setupListChangeViewers() {
 
 	channel->owner().megagroupParticipantAdded(
 		channel
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (delegate()->peerListFullRowsCount() > 0) {
 			if (delegate()->peerListRowAt(0)->peer() == user) {
 				return;
@@ -935,7 +935,7 @@ void ParticipantsBoxController::setupListChangeViewers() {
 
 	channel->owner().megagroupParticipantRemoved(
 		channel
-	) | rpl::start_with_next([=](not_null<UserData*> user) {
+	) | rpl::on_next([=](not_null<UserData*> user) {
 		if (const auto row = delegate()->peerListFindRow(user->id.value)) {
 			delegate()->peerListRemoveRow(row);
 		}
@@ -1127,13 +1127,13 @@ auto ParticipantsBoxController::saveState() const
 		chat->session().changes().peerUpdates(
 			chat,
 			Data::PeerUpdate::Flag::Members
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			weak->controllerState = nullptr;
 		}, my->lifetime);
 	} else if (const auto channel = _peer->asMegagroup()) {
 		channel->owner().megagroupParticipantAdded(
 			channel
-		) | rpl::start_with_next([=](not_null<UserData*> user) {
+		) | rpl::on_next([=](not_null<UserData*> user) {
 			if (!weak->list.empty()) {
 				if (weak->list[0] == user) {
 					return;
@@ -1150,7 +1150,7 @@ auto ParticipantsBoxController::saveState() const
 
 		channel->owner().megagroupParticipantRemoved(
 			channel
-		) | rpl::start_with_next([=](not_null<UserData*> user) {
+		) | rpl::on_next([=](not_null<UserData*> user) {
 			weak->list.erase(std::remove(
 				weak->list.begin(),
 				weak->list.end(),
@@ -1257,7 +1257,7 @@ void ParticipantsBoxController::prepare() {
 		auto visible = _peer->isMegagroup()
 			? Info::Profile::CanViewParticipantsValue(_peer->asMegagroup())
 			: rpl::single(true);
-		std::move(visible) | rpl::start_with_next([=](bool visible) {
+		std::move(visible) | rpl::on_next([=](bool visible) {
 			if (!visible) {
 				_onlineCountValue = 0;
 				_onlineSorter = nullptr;
@@ -1275,7 +1275,7 @@ void ParticipantsBoxController::prepare() {
 	}
 
 	_peer->session().changes().chatAdminChanges(
-	) | rpl::start_with_next([=](const Data::ChatAdminChange &update) {
+	) | rpl::on_next([=](const Data::ChatAdminChange &update) {
 		if (update.peer != _peer) {
 			return;
 		}
@@ -1347,7 +1347,7 @@ void ParticipantsBoxController::prepareChatRows(not_null<ChatData*> chat) {
 	chat->session().changes().peerUpdates(
 		chat,
 		UpdateFlag::Members | UpdateFlag::Admins
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
+	) | rpl::on_next([=](const Data::PeerUpdate &update) {
 		_additional.fillFromPeer();
 		if ((update.flags & UpdateFlag::Members)
 			|| (_role == Role::Admins)) {
@@ -1686,11 +1686,11 @@ base::unique_qptr<Ui::PopupMenu> ParticipantsBoxController::rowContextMenu(
 			auto text = phrase(
 				tr::now,
 				lt_user,
-				Ui::Text::Bold(by->name()),
+				tr::bold(by->name()),
 				lt_date,
-				Ui::Text::Bold(
+				tr::bold(
 					langDateTimeFull(base::unixtime::parse(since))),
-				Ui::Text::WithEntities);
+				tr::marked);
 			auto button = base::make_unique_q<Ui::Menu::MultilineAction>(
 				result->menu(),
 				result->st().menu,
@@ -2201,7 +2201,7 @@ void ParticipantsBoxController::subscribeToCreatorChange(
 		return (change.diff & ChannelDataFlag::Creator);
 	}) | rpl::filter([=] {
 		return (isCreator != channel->amCreator());
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		if (channel->isBroadcast()) {
 			fullListRefresh();
 			return;

Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp

@@ -117,13 +117,7 @@ base::unique_qptr<Ui::RpWidget> CreateEmptyPlaceholder(
 			tr::lng_gift_stars_tabs_my_empty_next(
 				lt_emoji,
 				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
-				TextWithEntities::Simple
-			) | rpl::map([](TextWithEntities t) {
-				return Ui::Text::Wrapped(
-					std::move(t),
-					EntityType::Url,
-					u"internal:"_q);
-			}),
+				tr::link),
 			st::giftBoxGiftEmptyLabel)
 		: nullptr;
 	if (emptyNextLabel) {
@@ -148,7 +142,7 @@ base::unique_qptr<Ui::RpWidget> CreateEmptyPlaceholder(
 	container->resize(width, totalHeight);
 
 	container->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		const auto totalContentHeight = iconWidget->height()
 			+ st::normalFont->height + emptyLabel->height()
 			+ (emptyNextLabel
@@ -319,17 +313,17 @@ PreviewWrap::PreviewWrap(
 	_style->apply(_theme.get());
 
 	_fake->setName(peer->name(), QString());
-	std::move(colorIndexValue) | rpl::start_with_next([=](uint8 index) {
+	std::move(colorIndexValue) | rpl::on_next([=](uint8 index) {
 		if (index != kUnsetColorIndex) {
 			_fake->changeColorIndex(index);
 			update();
 		}
 	}, lifetime());
-	std::move(backgroundEmojiId) | rpl::start_with_next([=](DocumentId id) {
+	std::move(backgroundEmojiId) | rpl::on_next([=](DocumentId id) {
 		_fake->changeBackgroundEmojiId(id);
 		update();
 	}, lifetime());
-	std::move(colorCollectible) | rpl::start_with_next([=](
+	std::move(colorCollectible) | rpl::on_next([=](
 			std::optional<Ui::ColorCollectible> &&collectible) {
 		if (collectible) {
 			_fake->changeColorCollectible(std::move(*collectible));
@@ -341,7 +335,7 @@ PreviewWrap::PreviewWrap(
 
 	const auto session = &_history->session();
 	session->data().viewRepaintRequest(
-	) | rpl::start_with_next([=](not_null<const Element*> view) {
+	) | rpl::on_next([=](not_null<const Element*> view) {
 		if (view == _element.get()) {
 			update();
 		}
@@ -397,7 +391,7 @@ void PreviewWrap::initElements() {
 	widthValue(
 	) | rpl::filter([=](int width) {
 		return width > st::msgMinWidth;
-	}) | rpl::start_with_next([=](int width) {
+	}) | rpl::on_next([=](int width) {
 		const auto height = _position.y()
 			+ _element->resizeGetHeight(width)
 			+ st::msgMargin.top();
@@ -442,7 +436,7 @@ void LevelBadge::updateText() {
 			tr::now,
 			lt_count,
 			_level,
-			Ui::Text::WithEntities));
+			tr::marked));
 	} else {
 		text.append(QString::number(_level));
 	}
@@ -755,11 +749,11 @@ void Apply(
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](EmojiStatusPanel::CustomChosen chosen) {
+	) | rpl::on_next([=](EmojiStatusPanel::CustomChosen chosen) {
 		emojiIdChosen(chosen.id.documentId);
 	}, raw->lifetime());
 
-	std::move(colorIndexValue) | rpl::start_with_next([=](uint8 index) {
+	std::move(colorIndexValue) | rpl::on_next([=](uint8 index) {
 		state->index = index;
 		if (state->emoji) {
 			right->update();
@@ -768,7 +762,7 @@ void Apply(
 
 	const auto session = &show->session();
 	const auto added = st::lineWidth * 2;
-	std::move(emojiIdValue) | rpl::start_with_next([=](DocumentId emojiId) {
+	std::move(emojiIdValue) | rpl::on_next([=](DocumentId emojiId) {
 		state->emojiId = emojiId;
 		state->emoji = emojiId
 			? session->data().customEmojiManager().create(
@@ -784,14 +778,14 @@ void Apply(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->panel.paintBadgeFrame(right)) {
 			return;
 		}
@@ -899,12 +893,12 @@ void Apply(
 	};
 	const auto state = right->lifetime().make_state<State>();
 	state->panel.someCustomChosen(
-	) | rpl::start_with_next([=](EmojiStatusPanel::CustomChosen chosen) {
+	) | rpl::on_next([=](EmojiStatusPanel::CustomChosen chosen) {
 		statusIdChosen({ chosen.id }, chosen.until);
 	}, raw->lifetime());
 
 	const auto session = &show->session();
-	std::move(statusIdValue) | rpl::start_with_next([=](EmojiStatusId id) {
+	std::move(statusIdValue) | rpl::on_next([=](EmojiStatusId id) {
 		state->statusId = id;
 		state->emoji = id
 			? session->data().customEmojiManager().create(
@@ -920,14 +914,14 @@ void Apply(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
 	}, right->lifetime());
 
 	right->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (state->panel.paintBadgeFrame(right)) {
 			return;
 		}
@@ -1013,7 +1007,7 @@ void Apply(
 	rpl::combine(
 		raw->sizeValue(),
 		right->widthValue()
-	) | rpl::start_with_next([=](QSize outer, int width) {
+	) | rpl::on_next([=](QSize outer, int width) {
 		right->resize(width, outer.height());
 		const auto skip = st::settingsButton.padding.right();
 		right->moveToRight(skip - button.added, 0, outer.width());
@@ -1022,7 +1016,7 @@ void Apply(
 	right->paintRequest(
 	) | rpl::filter([=] {
 		return state->icon != nullptr;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto p = QPainter(right);
 		const auto x = button.added;
 		const auto y = (right->height() - button.emojiWidth) / 2;
@@ -1082,7 +1076,7 @@ void Apply(
 			return wrapLoaded(sets->find(id));
 		}));
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](DocumentData *icon) {
+	) | rpl::on_next([=](DocumentData *icon) {
 		if (state->icon != icon) {
 			state->icon = icon;
 			state->custom = nullptr;
@@ -1117,7 +1111,7 @@ Fn<void()> AddColorGiftTabs(
 	GiftsStars(
 		session,
 		session->user()
-	) | rpl::start_with_next([=](const std::vector<GiftTypeStars> &list) {
+	) | rpl::on_next([=](const std::vector<GiftTypeStars> &list) {
 		auto filtered = std::vector<Data::StarGift>();
 		for (const auto &gift : list) {
 			if ((profile || gift.info.peerColorAvailable) && gift.resale) {
@@ -1128,11 +1122,11 @@ Fn<void()> AddColorGiftTabs(
 	}, container->lifetime());
 
 	state->list.value(
-	) | rpl::start_with_next([=](const std::vector<Data::StarGift> &list) {
+	) | rpl::on_next([=](const std::vector<Data::StarGift> &list) {
 		auto tabs = std::vector<Ui::SubTabs::Tab>();
 		tabs.push_back({
 			.id = u"my"_q,
-			.text = tr::lng_gift_stars_tabs_my(tr::now, Ui::Text::WithEntities),
+			.text = tr::lng_gift_stars_tabs_my(tr::now, tr::marked),
 		});
 		for (const auto &gift : list) {
 			auto text = TextWithEntities();
@@ -1158,7 +1152,7 @@ Fn<void()> AddColorGiftTabs(
 					context));
 
 			state->tabs->activated(
-			) | rpl::start_with_next([=](const QString &id) {
+			) | rpl::on_next([=](const QString &id) {
 				state->tabs->setActiveTab(id);
 				chosen(id.toULongLong());
 			}, state->tabs->lifetime());
@@ -1234,7 +1228,7 @@ void AddGiftSelector(
 				shownGiftId,
 				{},
 				state->current->offset
-			) | rpl::start_with_next([=](Data::ResaleGiftsDescriptor slice) {
+			) | rpl::on_next([=](Data::ResaleGiftsDescriptor slice) {
 				auto &entry = state->lists[shownGiftId];
 				entry.loading.destroy();
 				entry.offset = slice.offset;
@@ -1260,7 +1254,7 @@ void AddGiftSelector(
 				session,
 				Data::MyUniqueType::OwnedAndHosted,
 				state->current->offset
-			) | rpl::start_with_next([=](Data::MyGiftsDescriptor slice) {
+			) | rpl::on_next([=](Data::MyGiftsDescriptor slice) {
 				auto &entry = state->lists[shownGiftId];
 				entry.loading.destroy();
 				entry.offset = slice.offset;
@@ -1399,7 +1393,7 @@ void AddGiftSelector(
 		};
 
 		state->selected.value(
-		) | rpl::combine_previous() | rpl::start_with_next([=](
+		) | rpl::combine_previous() | rpl::on_next([=](
 				uint64 wasCollectibleId,
 				uint64 nowCollectibleId) {
 			if (wasCollectibleId) {
@@ -1415,7 +1409,7 @@ void AddGiftSelector(
 		}, raw->lifetime());
 
 		state->selectedGiftId.value(
-		) | rpl::combine_previous() | rpl::start_with_next([=](
+		) | rpl::combine_previous() | rpl::on_next([=](
 				uint64 wasGiftId,
 				uint64 nowGiftId) {
 			if (wasGiftId) {
@@ -1471,7 +1465,7 @@ void AddGiftSelector(
 	};
 
 	state->showingGiftId.value(
-	) | rpl::start_with_next([=](uint64 showingId) {
+	) | rpl::on_next([=](uint64 showingId) {
 		state->current = &state->lists[showingId];
 		state->buttons.clear();
 		if (state->emptyPlaceholder) {
@@ -1485,7 +1479,7 @@ void AddGiftSelector(
 
 	state->visibleRange = raw->visibleRange();
 	state->visibleRange.value(
-	) | rpl::start_with_next(state->rebuild, raw->lifetime());
+	) | rpl::on_next(state->rebuild, raw->lifetime());
 }
 
 Fn<void(int)> CreateTabsWidget(
@@ -1550,7 +1544,7 @@ Fn<void(int)> CreateTabsWidget(
 
 	const auto penWidth = st::lineWidth * 2;
 
-	tabsContainer->paintRequest() | rpl::start_with_next([=] {
+	tabsContainer->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(tabsContainer);
 		auto hq = PainterHighQualityEnabler(p);
 		const auto r = tabsContainer->rect();
@@ -1645,14 +1639,14 @@ void CreateBoostLevelContainer(
 	};
 	const auto state = boostLevelContainer->lifetime().make_state<State>();
 
-	boostLevelContainer->paintRequest() | rpl::start_with_next([=] {
+	boostLevelContainer->paintRequest() | rpl::on_next([=] {
 		auto p = QPainter(boostLevelContainer);
 		const auto bg = state->currentColor.value_or(st::boxDividerBg->c);
 		p.fillRect(boostLevelContainer->rect(), bg);
 		p.fillRect(boostLevelContainer->rect(), st::shadowFg);
 	}, boostLevelContainer->lifetime());
 
-	std::move(colorProducer) | rpl::start_with_next([=](
+	std::move(colorProducer) | rpl::on_next([=](
 			std::optional<QColor> color) {
 		const auto colorChanged = (state->currentColor != color)
 			|| !state->label;
@@ -1674,11 +1668,11 @@ void CreateBoostLevelContainer(
 						using namespace Ui::Text;
 						return Link(std::move(t), u"internal:"_q);
 					}),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				style);
 			state->label->show();
 			boostLevelContainer->sizeValue(
-			) | rpl::start_with_next([=](QSize s) {
+			) | rpl::on_next([=](QSize s) {
 				state->label->moveToLeft(
 					(s.width() - state->label->width()) / 2,
 					(s.height() - state->label->height()) / 2);
@@ -1713,7 +1707,7 @@ void AddLevelBadge(
 	rpl::combine(
 		button->sizeValue(),
 		std::move(text)
-	) | rpl::start_with_next([=](const QSize &s, const QString &) {
+	) | rpl::on_next([=](const QSize &s, const QString &) {
 		if (s.isNull()) {
 			return;
 		}
@@ -1777,7 +1771,7 @@ void EditPeerColorSection(
 			state->preview->setPatternEmojiId(
 				state->profileEmojiId.current());
 		}
-		state->statusId.value() | rpl::start_with_next([=](EmojiStatusId id) {
+		state->statusId.value() | rpl::on_next([=](EmojiStatusId id) {
 			state->preview->setLocalEmojiStatusId(std::move(id));
 		}, state->preview->lifetime());
 		const auto peerColors = &peer->session().api().peerColors();
@@ -1841,7 +1835,7 @@ void EditPeerColorSection(
 			true));
 
 		state->profileIndex.value(
-		) | rpl::start_with_next([=](uint8 index) {
+		) | rpl::on_next([=](uint8 index) {
 			selector->updateSelection(index);
 		}, selector->lifetime());
 
@@ -2132,7 +2126,7 @@ void EditPeerColorSection(
 		}));
 	});
 	state->collectible.value(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto buy = state->buyCollectible.get();
 		while (!button->children().isEmpty()) {
 			delete button->children().first();
@@ -2156,13 +2150,13 @@ void EditPeerColorSection(
 				tr::lng_gift_buy_resale_button(
 					lt_cost,
 					rpl::single(Data::FormatGiftResaleTon(*buy)),
-					Ui::Text::WithEntities),
+					tr::marked),
 				tr::lng_gift_buy_resale_equals(
 					lt_cost,
 					rpl::single(Ui::Text::IconEmoji(
 						&st::starIconEmojiSmall
 					).append(Lang::FormatCountDecimal(buy->starsForResale))),
-					Ui::Text::WithEntities),
+					tr::marked),
 				st::resaleButtonTitle,
 				st::resaleButtonSubtitle);
 		} else {
@@ -2170,7 +2164,7 @@ void EditPeerColorSection(
 				lt_cost,
 				rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji).append(
 					Lang::FormatCountDecimal(buy->starsForResale))),
-				Ui::Text::WithEntities));
+				tr::marked));
 		}
 	}, button->lifetime());
 }
@@ -2288,11 +2282,11 @@ void EditPeerProfileColorSection(
 			tr::lng_settings_color_profile_about_link(
 				lt_emoji,
 				rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
-				Ui::Text::RichLangValue
+				tr::rich
 			) | rpl::map([=](TextWithEntities t) {
-				return Ui::Text::Link(std::move(t), u"internal:"_q);
+				return tr::link(std::move(t), u"internal:"_q);
 			}),
-			Ui::Text::RichLangValue));
+			tr::rich));
 	Ui::AddSkip(container, st::settingsColorSampleSkip);
 	about->setClickHandlerFilter([=](auto...) {
 		aboutCallback();
@@ -2300,7 +2294,7 @@ void EditPeerProfileColorSection(
 	});
 
 	state->index.value(
-	) | rpl::start_with_next([=](uint8 index) {
+	) | rpl::on_next([=](uint8 index) {
 		if (state->selector) {
 			state->selector->updateSelection(index);
 		}
@@ -2392,7 +2386,7 @@ void EditPeerProfileColorSection(
 		}));
 	});
 	state->wearable.value(
-	) | rpl::start_with_next([=](EmojiStatusId id) {
+	) | rpl::on_next([=](EmojiStatusId id) {
 		const auto buy = state->buyCollectible.get();
 		while (!button->children().isEmpty()) {
 			delete button->children().first();
@@ -2418,13 +2412,13 @@ void EditPeerProfileColorSection(
 				tr::lng_gift_buy_resale_button(
 					lt_cost,
 					rpl::single(Data::FormatGiftResaleTon(*buy)),
-					Ui::Text::WithEntities),
+					tr::marked),
 				tr::lng_gift_buy_resale_equals(
 					lt_cost,
 					rpl::single(Ui::Text::IconEmoji(
 						&st::starIconEmojiSmall
 					).append(Lang::FormatCountDecimal(buy->starsForResale))),
-					Ui::Text::WithEntities),
+					tr::marked),
 				st::resaleButtonTitle,
 				st::resaleButtonSubtitle);
 		} else {
@@ -2432,7 +2426,7 @@ void EditPeerProfileColorSection(
 				lt_cost,
 				rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji).append(
 					Lang::FormatCountDecimal(buy->starsForResale))),
-				Ui::Text::WithEntities));
+				tr::marked));
 		}
 	}, button->lifetime());
 }
@@ -2475,7 +2469,7 @@ void EditPeerColorBox(
 		buttonContainer->widthValue(),
 		profileButton->sizeValue(),
 		nameButton->sizeValue()
-	) | rpl::start_with_next([=](int w, QSize, QSize) {
+	) | rpl::on_next([=](int w, QSize, QSize) {
 		profileButton->resizeToWidth(w);
 		nameButton->resizeToWidth(w);
 	}, buttonContainer->lifetime());
@@ -2608,7 +2602,7 @@ void SetupPeerColorSample(
 		rpl::duplicate(colorIndexValue),
 		rpl::duplicate(colorProfileIndexValue),
 		rpl::duplicate(emojiStatusIdValue)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			int width,
 			const QString &buttonText,
 			int colorIndex,
@@ -2674,7 +2668,7 @@ void SetupPeerColorSample(
 		rpl::duplicate(colorIndexValue),
 		rpl::duplicate(colorProfileIndexValue),
 		rpl::duplicate(emojiStatusIdValue)
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QSize outer,
 			QSize inner,
 			int colorIndex,
@@ -2752,7 +2746,7 @@ void AddPeerColorButton(
 		rpl::combine(
 			rpl::duplicate(label),
 			button->widthValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QString &text,
 				int width) {
 			const auto space = st.style.font->spacew;

Telegram/SourceFiles/boxes/peers/edit_peer_history_visibility_box.cpp

@@ -29,7 +29,7 @@ void EditPeerHistoryVisibilityBox(
 			HistoryVisibility v) {
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(inner.get());
 		inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			button->resize(s);
 		}, button->lifetime());
 		button->setClickedCallback([=] { historyVisibility->setValue(v); });

Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp

@@ -155,7 +155,7 @@ not_null<Ui::SettingsButton*> AddButtonWithText(
 	return AddButtonWithText(
 		parent,
 		std::move(text),
-		std::move(label) | Ui::Text::ToWithEntities(),
+		std::move(label) | rpl::map(tr::marked),
 		std::move(callback),
 		std::move(descriptor));
 }
@@ -610,11 +610,11 @@ object_ptr<Ui::RpWidget> Controller::createPhotoAndTitleEdit() {
 		container,
 		createTitleEdit());
 	photoWrap->heightValue(
-	) | rpl::start_with_next([container](int height) {
+	) | rpl::on_next([container](int height) {
 		container->resize(container->width(), height);
 	}, photoWrap->lifetime());
 	container->widthValue(
-	) | rpl::start_with_next([titleEdit](int width) {
+	) | rpl::on_next([titleEdit](int width) {
 		const auto left = st::editPeerPhotoMargins.left()
 			+ st::defaultUserpicButton.size.width();
 		titleEdit->resizeToWidth(width - left);
@@ -669,7 +669,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		&_peer->session());
 
 	result->entity()->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submitTitle();
 	}, result->entity()->lifetime());
 
@@ -699,7 +699,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 		emojiPanel->hide();
 		emojiPanel->selector()->setCurrentPeer(_peer);
 		emojiPanel->selector()->emojiChosen(
-		) | rpl::start_with_next([=](ChatHelpers::EmojiChosen data) {
+		) | rpl::on_next([=](ChatHelpers::EmojiChosen data) {
 			Ui::InsertEmojiAtCursor(field->textCursor(), data.emoji);
 			field->setFocus();
 		}, field->lifetime());
@@ -733,7 +733,7 @@ object_ptr<Ui::RpWidget> Controller::createTitleEdit() {
 			});
 		}());
 
-		field->widthValue() | rpl::start_with_next([=](int width) {
+		field->widthValue() | rpl::on_next([=](int width) {
 			const auto &p = st::editPeerTitleEmojiPosition;
 			emojiToggle->moveToRight(p.x(), p.y(), width);
 			updateEmojiPanelGeometry();
@@ -779,7 +779,7 @@ object_ptr<Ui::RpWidget> Controller::createDescriptionEdit() {
 		&_peer->session());
 
 	result->entity()->submits(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		submitDescription();
 	}, result->entity()->lifetime());
 
@@ -893,7 +893,7 @@ void Controller::showEditPeerTypeBox(
 			_typeDataSavedValue,
 			error));
 	box->boxClosing(
-	) | rpl::start_with_next([peer = _peer] {
+	) | rpl::on_next([peer = _peer] {
 		peer->session().api().usernames().requestToCache(peer);
 	}, box->lifetime());
 }
@@ -1069,13 +1069,13 @@ void Controller::fillDiscussionLinkButton() {
 		? _discussionLinkUpdates.events(
 		) | rpl::map([](ChannelData *chat) {
 			return chat ? chat->name() : QString();
-		}) | rpl::type_erased()
+		}) | rpl::type_erased
 		: rpl::combine(
 			tr::lng_manage_discussion_group_add(),
 			_discussionLinkUpdates.events()
 		) | rpl::map([=](const QString &add, ChannelData *chat) {
 			return chat ? chat->name() : add;
-		}) | rpl::type_erased();
+		}) | rpl::type_erased;
 	AddButtonWithText(
 		_controls.buttonsLayout,
 		std::move(text),
@@ -1098,9 +1098,9 @@ void Controller::fillDirectMessagesButton() {
 	auto label = _starsPerDirectMessageSavedValue->value(
 	) | rpl::map([](int starsPerMessage) {
 		return (starsPerMessage < 0)
-			? tr::lng_manage_monoforum_off(Ui::Text::WithEntities)
+			? tr::lng_manage_monoforum_off(tr::marked)
 			: !starsPerMessage
-			? tr::lng_manage_monoforum_free(Ui::Text::WithEntities)
+			? tr::lng_manage_monoforum_free(tr::marked)
 			: rpl::single(Ui::Text::IconEmoji(
 				&st::starIconEmojiColored
 			).append(' ').append(
@@ -1164,7 +1164,7 @@ void Controller::fillForumButton() {
 						tr::now,
 						lt_count,
 						EnableForumMinMembers(_peer),
-						Ui::Text::RichLangValue));
+						tr::rich));
 			}
 		} else {
 			_navigation->uiShow()->show(Box(
@@ -1242,12 +1242,12 @@ void Controller::fillAutoTranslateButton() {
 		.data = Ui::AskBoostAutotranslate{ .requiredLevel = requiredLevel },
 	};
 
-	state->isLocked.value() | rpl::start_with_next([=](bool locked) {
+	state->isLocked.value() | rpl::on_next([=](bool locked) {
 		autotranslate->setToggleLocked(locked);
 	}, autotranslate->lifetime());
 
 	autotranslate->toggledChanges(
-	) | rpl::start_with_next([=](bool value) {
+	) | rpl::on_next([=](bool value) {
 		if (!state->isLocked.current()) {
 			_autotranslateSavedValue = value;
 		} else if (value) {
@@ -1269,7 +1269,7 @@ void Controller::fillAutoTranslateButton() {
 	}, autotranslate->lifetime());
 
 	autotranslate->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_autotranslateSavedValue = toggled;
 	}, _controls.buttonsLayout->lifetime());
 }
@@ -1306,12 +1306,12 @@ void Controller::fillSignaturesButton() {
 	profiles->entity()->toggleOn(rpl::single(
 		channel->addsSignature() && channel->signatureProfiles()
 	))->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_signatureProfilesSavedValue = toggled;
 	}, profiles->entity()->lifetime());
 
 	signs->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		_signaturesSavedValue = toggled;
 		if (!toggled) {
 			_signatureProfilesSavedValue = false;
@@ -1323,8 +1323,8 @@ void Controller::fillSignaturesButton() {
 		_controls.buttonsLayout,
 		rpl::conditional(
 			signs->toggledValue(),
-			tr::lng_edit_sign_profiles_about(Ui::Text::WithEntities),
-			tr::lng_edit_sign_messages_about(Ui::Text::WithEntities)));
+			tr::lng_edit_sign_profiles_about(tr::marked),
+			tr::lng_edit_sign_messages_about(tr::marked)));
 	Ui::AddSkip(_controls.buttonsLayout);
 }
 
@@ -1412,11 +1412,11 @@ void Controller::fillManageSection() {
 				container,
 				tr::lng_manage_peer_bot_about(
 					lt_bot,
-					rpl::single(Ui::Text::Link(
+					rpl::single(tr::link(
 						'@' + kBotManagerUsername.utf16(),
 						_peer->session().createInternalLinkFull(
 							kBotManagerUsername.utf16()))),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				st::boxDividerLabel),
 			st::defaultBoxDividerLabelPadding));
 		fillBotVerifyAccounts();
@@ -1782,7 +1782,7 @@ void Controller::fillPendingRequestsButton() {
 		{ &st::menuIconInvite });
 	std::move(
 		pendingRequestsCount
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		wrap->toggle(count > 0, anim::type::instant);
 	}, wrap->lifetime());
 }
@@ -1878,7 +1878,7 @@ void Controller::fillBotCurrencyButton() {
 		const auto currencyLoad
 			= button->lifetime().make_state<Api::EarnStatistics>(_peer);
 		currencyLoad->request(
-		) | rpl::start_with_error_done([=](const QString &error) {
+		) | rpl::on_error_done([=](const QString &error) {
 		}, [=] {
 			const auto balance = currencyLoad->data().currentBalance;
 			if (balance) {
@@ -1891,13 +1891,13 @@ void Controller::fillBotCurrencyButton() {
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		icon->resize(st::menuIconLinks.size());
 		const auto image = Ui::Earn::MenuIconCurrency(icon->size());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->moveToLeft(
 				button->st().iconLeft,
 				(size.height() - icon->height()) / 2);
@@ -1947,13 +1947,13 @@ void Controller::fillBotCreditsButton() {
 		const auto icon = Ui::CreateChild<Ui::RpWidget>(button);
 		const auto image = Ui::Earn::MenuIconCredits();
 		icon->resize(image.size() / style::DevicePixelRatio());
-		icon->paintRequest() | rpl::start_with_next([=] {
+		icon->paintRequest() | rpl::on_next([=] {
 			auto p = QPainter(icon);
 			p.drawImage(0, 0, image);
 		}, icon->lifetime());
 
 		button->sizeValue(
-		) | rpl::start_with_next([=](const QSize &size) {
+		) | rpl::on_next([=](const QSize &size) {
 			icon->moveToLeft(
 				button->st().iconLeft,
 				(size.height() - icon->height()) / 2);
@@ -2302,7 +2302,7 @@ void Controller::saveUsernamesOrder() {
 		_peer->session().api().usernames().reorder(
 			_peer,
 			newUsernames
-		) | rpl::start_with_done([=] {
+		) | rpl::on_done([=] {
 			channel->setUsernames(ranges::views::all(
 				newUsernames
 			) | ranges::views::transform([&](QString username) {
@@ -2875,7 +2875,7 @@ void EditPeerInfoBox::prepare() {
 		this,
 		_peer);
 	_focusRequests.events(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[=] { controller->setFocus(); },
 		lifetime());
 	auto content = controller->createContent();
@@ -2895,7 +2895,7 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 	return CreateButton(
 		parent,
 		std::move(text),
-		std::move(count) | Ui::Text::ToWithEntities(),
+		std::move(count) | rpl::map(tr::marked),
 		std::move(callback),
 		st,
 		std::move(descriptor));
@@ -2939,7 +2939,7 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 		rpl::duplicate(text),
 		std::move(labelText),
 		button->widthValue()
-	) | rpl::start_with_next([&st, label](
+	) | rpl::on_next([&st, label](
 			const QString &text,
 			const TextWithEntities &labelText,
 			int width) {
@@ -2961,7 +2961,7 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
 			std::move(text),
 			label->widthValue(),
 			button->widthValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QString &text,
 				int labelWidth,
 				int width) {

Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp

@@ -379,11 +379,11 @@ void QrBox(
 	const auto button = Ui::CreateChild<Ui::AbstractButton>(container);
 	button->resize(size, size);
 	button->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		QPainter(button).drawImage(QRect(0, 0, size, size), qr);
 	}, button->lifetime());
 	container->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		button->move((width - size) / 2, st::inviteLinkQrSkip);
 	}, button->lifetime());
 	button->setClickedCallback(copyCallback);
@@ -506,7 +506,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	const auto reactivateWrap = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
@@ -566,7 +566,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	Ui::AddSkip(container);
 
 	dataValue(
-	) | rpl::start_with_next([=](const LinkData &data) {
+	) | rpl::on_next([=](const LinkData &data) {
 		const auto now = base::unixtime::now();
 		const auto expired = IsExpiredLink(data, now);
 		reactivateWrap->toggle(
@@ -641,7 +641,7 @@ not_null<Ui::SlideWrap<>*> Controller::addRequestedListBlock(
 	controller->setDelegate(delegate);
 
 	controller->processed(
-	) | rpl::start_with_next([=](Processed processed) {
+	) | rpl::on_next([=](Processed processed) {
 		updateWithProcessed(processed);
 	}, lifetime());
 
@@ -739,14 +739,14 @@ void Controller::setupAboveJoinedWidget() {
 					TextWithEntities{ .text = QString(QChar(0x00D7)) },
 					lt_total,
 					{ QString::number(current.usage) },
-					Ui::Text::WithEntities)
+					tr::marked)
 				: tr::lng_group_invite_subscription_info_title_none(
 					tr::now,
 					lt_emoji,
 					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
-					Ui::Text::WithEntities),
+					tr::marked),
 			kMarkupTextOptions,
 			_emojiHelper.context([=] { widget->update(); }));
 		auto &lifetime = widget->lifetime();
@@ -755,7 +755,7 @@ void Controller::setupAboveJoinedWidget() {
 		const auto currency = u"USD"_q;
 		const auto allCredits = current.subscription.credits * current.usage;
 		widget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = Painter(widget);
 			p.setBrush(Qt::NoBrush);
 			p.setPen(st.nameFg);
@@ -864,7 +864,7 @@ void Controller::setupAboveJoinedWidget() {
 		std::move(remainingText),
 		st::inviteLinkTitleRight);
 	dataValue(
-	) | rpl::start_with_next([=](const LinkData &data) {
+	) | rpl::on_next([=](const LinkData &data) {
 		remaining->setTextColorOverride(
 			(data.usageLimit && (data.usageLimit <= data.usage)
 				? std::make_optional(st::boxTextFgError->c)
@@ -882,7 +882,7 @@ void Controller::setupAboveJoinedWidget() {
 		listTitle->positionValue(),
 		remaining->widthValue(),
 		listHeader->widthValue()
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			QPoint position,
 			int width,
 			int outerWidth) {
@@ -997,7 +997,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				_creditsEmoji,
 				lt_cost,
 				{ QString::number(data.subscription.credits) },
-				Ui::Text::WithEntities),
+				tr::marked),
 			_emojiHelper.context());
 		const auto subtitle2 = box->addRow(
 			object_ptr<Ui::FlatLabel>(
@@ -1006,7 +1006,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 			style::al_top);
 		session->credits().rateValue(
 			channel
-		) | rpl::start_with_next([=, currency = u"USD"_q](float64 rate) {
+		) | rpl::on_next([=, currency = u"USD"_q](float64 rate) {
 			subtitle2->setText(
 				tr::lng_credits_subscriber_subtitle(
 					tr::now,
@@ -1030,10 +1030,9 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				box,
 				tr::lng_credits_box_out_about(
 					lt_link,
-					tr::lng_payments_terms_link(
-					) | Ui::Text::ToLink(
-						tr::lng_credits_box_out_about_link(tr::now)),
-					Ui::Text::WithEntities),
+					tr::lng_payments_terms_link(tr::url(
+						tr::lng_credits_box_out_about_link(tr::now))),
+					tr::marked),
 				st::creditsBoxAboutDivider),
 			style::al_top);
 
@@ -1103,8 +1102,8 @@ void Controller::processRequest(
 				: tr::lng_group_requests_was_added)(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(user->name()),
-					Ui::Text::WithEntities));
+					tr::bold(user->name()),
+					tr::marked));
 		}
 	});
 	const auto fail = crl::guard(this, [=] {
@@ -1169,7 +1168,7 @@ void SingleRowController::prepare() {
 	if (_status) {
 		std::move(
 			_status
-		) | rpl::start_with_next([=](const QString &status) {
+		) | rpl::on_next([=](const QString &status) {
 			raw->setCustomStatus(status);
 			delegate()->peerListUpdateRow(raw);
 		}, _lifetime);
@@ -1178,7 +1177,7 @@ void SingleRowController::prepare() {
 	delegate()->peerListRefreshRows();
 
 	if (topic) {
-		topic->destroyed() | rpl::start_with_next([=] {
+		topic->destroyed() | rpl::on_next([=] {
 			while (delegate()->peerListFullRowsCount()) {
 				delegate()->peerListRemoveRow(delegate()->peerListRowAt(0));
 			}
@@ -1275,7 +1274,7 @@ void AddPermanentLinkBlock(
 	} else {
 		rpl::duplicate(
 			fromList
-		) | rpl::start_with_next([=](const Api::InviteLink &link) {
+		) | rpl::on_next([=](const Api::InviteLink &link) {
 			*currentLinkFields = link;
 		}, container->lifetime());
 
@@ -1351,7 +1350,7 @@ void AddPermanentLinkBlock(
 		st::inviteLinkFieldPadding);
 
 	label->clicks(
-	) | rpl::start_with_next(copyLink, label->lifetime());
+	) | rpl::on_next(copyLink, label->lifetime());
 
 	AddCopyShareLinkButtons(container, copyLink, shareLink);
 
@@ -1388,7 +1387,7 @@ void AddPermanentLinkBlock(
 			data.link,
 			data.usage);
 	}) | rpl::flatten_latest(
-	) | rpl::start_with_next([=](const Api::JoinedByLinkSlice &slice) {
+	) | rpl::on_next([=](const Api::JoinedByLinkSlice &slice) {
 		auto list = std::vector<HistoryView::UserpicInRow>();
 		list.reserve(slice.users.size());
 		for (const auto &item : slice.users) {
@@ -1410,7 +1409,7 @@ void AddPermanentLinkBlock(
 	peer->session().downloaderTaskFinished(
 	) | rpl::filter([=] {
 		return !state->allUserpicsLoaded;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		auto pushing = false;
 		state->allUserpicsLoaded = true;
 		for (const auto &element : state->list) {
@@ -1701,7 +1700,7 @@ object_ptr<Ui::BoxContent> ShowInviteLinkBox(
 		not_null<Ui::BoxContent*> box) {
 		rpl::duplicate(
 			data
-		) | rpl::start_with_next([=](const LinkData &link) {
+		) | rpl::on_next([=](const LinkData &link) {
 			if (ClosingLinkBox(link, revoked)) {
 				box->closeBox();
 				return;

Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp

@@ -441,7 +441,7 @@ LinksController::LinksController(
 , _count(count)
 , _updateExpiringTimer([=] { expiringProgressTimer(); }) {
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		for (auto &image : _icons) {
 			image = QImage();
 		}
@@ -450,7 +450,7 @@ LinksController::LinksController(
 	peer->session().api().inviteLinks().updates(
 		peer,
 		admin
-	) | rpl::start_with_next([=](const Api::InviteLinkUpdate &update) {
+	) | rpl::on_next([=](const Api::InviteLinkUpdate &update) {
 		const auto now = base::unixtime::now();
 		if (!update.now || update.now->revoked != _revoked) {
 			if (removeRow(update.was)) {
@@ -472,7 +472,7 @@ LinksController::LinksController(
 		peer->session().api().inviteLinks().allRevokedDestroyed(
 			peer,
 			admin
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_requesting = false;
 			_allLoaded = true;
 			while (delegate()->peerListFullRowsCount()) {
@@ -961,7 +961,7 @@ void ManageInviteLinksBox(
 	*countValue = controller->fullCountValue();
 
 	controller->permanentFound(
-	) | rpl::start_with_next([=](InviteLinkData &&data) {
+	) | rpl::on_next([=](InviteLinkData &&data) {
 		permanentFromList->fire(std::move(data));
 	}, container->lifetime());
 
@@ -1013,7 +1013,7 @@ void ManageInviteLinksBox(
 	rpl::combine(
 		revokedHeader->topValue(),
 		container->widthValue()
-	) | rpl::start_with_next([=](int top, int outerWidth) {
+	) | rpl::on_next([=](int top, int outerWidth) {
 		deleteAll->moveToRight(
 			st::inviteLinkRevokedTitlePadding.left(),
 			top + st::inviteLinkRevokedTitlePadding.top(),
@@ -1027,7 +1027,7 @@ void ManageInviteLinksBox(
 		list->heightValue(),
 		admins->heightValue(),
 		revoked->heightValue()
-	) | rpl::start_with_next([=](int list, int admins, int revoked) {
+	) | rpl::on_next([=](int list, int admins, int revoked) {
 		if (otherHeader) {
 			otherHeader->toggle(list > 0, anim::type::instant);
 		}
@@ -1058,7 +1058,7 @@ object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
 	icon->resize(size, size);
 
 	raw->heightValue(
-	) | rpl::start_with_next([=](int height) {
+	) | rpl::on_next([=](int height) {
 		const auto &st = st::inviteLinkList.item;
 		icon->move(
 			st.photoPosition.x() + (st.photoSize - size) / 2,
@@ -1066,7 +1066,7 @@ object_ptr<Ui::SettingsButton> MakeCreateLinkButton(
 	}, icon->lifetime());
 
 	icon->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(icon);
 		p.setPen(Qt::NoPen);
 		p.setBrush(st::windowBgActive);

Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp

@@ -174,6 +174,7 @@ constexpr auto kDefaultChargeStars = 10;
 		{ Flag::ManageCall, tr::lng_rights_channel_manage_calls(tr::now) },
 		{ Flag::ManageDirect, tr::lng_rights_channel_manage_direct(tr::now) },
 		{ Flag::AddAdmins, tr::lng_rights_add_admins(tr::now) },
+		{ Flag::BanUsers, tr::lng_rights_group_ban(tr::now) },
 	};
 	return {
 		{ std::nullopt, std::move(first) },
@@ -406,14 +407,14 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	{
 		const auto separator = Ui::CreateChild<Ui::RpWidget>(container.get());
 		separator->paintRequest(
-		) | rpl::start_with_next([=, bg = st.textBgOver] {
+		) | rpl::on_next([=, bg = st.textBgOver] {
 			auto p = QPainter(separator);
 			p.fillRect(separator->rect(), bg);
 		}, separator->lifetime());
 		const auto separatorHeight = 2 * st.toggle.border
 			+ st.toggle.diameter;
 		button->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
+		) | rpl::on_next([=](const QRect &r) {
 			const auto w = st::rightsButtonToggleWidth;
 			toggleButton->setGeometry(
 				r.x() + r.width() - w,
@@ -430,12 +431,12 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		const auto checkWidget = Ui::CreateChild<Ui::RpWidget>(toggleButton);
 		checkWidget->resize(checkView->getSize());
 		checkWidget->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(checkWidget);
 			checkView->paint(p, 0, 0, checkWidget->width());
 		}, checkWidget->lifetime());
 		toggleButton->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
+		) | rpl::on_next([=](const QSize &s) {
 			checkWidget->moveToRight(
 				st.toggleSkip,
 				(s.height() - checkWidget->height()) / 2);
@@ -443,7 +444,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	}
 	state->anyChanges.events_starting_with(
 		rpl::empty_value()
-	) | rpl::map(countChecked) | rpl::start_with_next([=](int count) {
+	) | rpl::map(countChecked) | rpl::on_next([=](int count) {
 		checkView->setChecked(count > 0, anim::type::normal);
 	}, toggleButton->lifetime());
 	checkView->setLocked(locked.has_value());
@@ -458,7 +459,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 				rpl::empty_value()
 			) | rpl::map(countChecked)
 		) | rpl::map([=](const QString &t, int checked) {
-			auto count = Ui::Text::Bold("  "
+			auto count = tr::bold("  "
 				+ QString::number(checked)
 				+ '/'
 				+ QString::number(totalInnerChecks));
@@ -470,7 +471,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		const auto &icon = st::permissionsExpandIcon;
 		arrow->resize(icon.size());
 		arrow->paintRequest(
-		) | rpl::start_with_next([=, &icon] {
+		) | rpl::on_next([=, &icon] {
 			auto p = QPainter(arrow);
 			const auto center = QPointF(
 				icon.width() / 2.,
@@ -488,7 +489,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 		}, arrow->lifetime());
 	}
 	button->sizeValue(
-	) | rpl::start_with_next([=, &st](const QSize &s) {
+	) | rpl::on_next([=, &st](const QSize &s) {
 		const auto labelLeft = st.padding.left();
 		const auto labelRight = s.width() - toggleButton->width();
 
@@ -503,7 +504,7 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 			(s.height() - arrow->height()) / 2);
 	}, button->lifetime());
 	wrap->toggledValue(
-	) | rpl::skip(1) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::skip(1) | rpl::on_next([=](bool toggled) {
 		state->animation.start(
 			[=] { arrow->update(); },
 			toggled ? 0. : 1.,
@@ -520,14 +521,14 @@ not_null<Ui::RpWidget*> AddInnerToggle(
 	};
 
 	button->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!handleLocked()) {
 			wrap->toggle(!wrap->toggled(), anim::type::normal);
 		}
 	}, button->lifetime());
 
 	toggleButton->clicks(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (!handleLocked()) {
 			const auto checked = !checkView->checked();
 			for (const auto &innerCheck : state->innerChecks) {
@@ -562,7 +563,7 @@ template <typename Flags>
 		});
 
 		state->forceDisabled.value(
-		) | rpl::start_with_next([=](bool disabled) {
+		) | rpl::on_next([=](bool disabled) {
 			if (disabled) {
 				for (const auto &[flags, checkView] : state->checkViews) {
 					checkView->setChecked(false, anim::type::normal);
@@ -628,7 +629,7 @@ template <typename Flags>
 				rpl::combine(
 					verticalLayout->widthValue(),
 					checkbox->geometryValue()
-				) | rpl::start_with_next([=](int w, const QRect &r) {
+				) | rpl::on_next([=](int w, const QRect &r) {
 					button->setGeometry(0, r.y(), w, r.height());
 				}, button->lifetime());
 				checkbox->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -658,12 +659,12 @@ template <typename Flags>
 					[=] { toggle->update(); });
 				toggle->resize(checkView->getSize());
 				toggle->paintRequest(
-				) | rpl::start_with_next([=] {
+				) | rpl::on_next([=] {
 					auto p = QPainter(toggle);
 					checkView->paint(p, 0, 0, toggle->width());
 				}, toggle->lifetime());
 				button->sizeValue(
-				) | rpl::start_with_next([=](const QSize &s) {
+				) | rpl::on_next([=](const QSize &s) {
 					toggle->moveToRight(
 						st.toggleSkip,
 						(s.height() - toggle->height()) / 2);
@@ -679,7 +680,7 @@ template <typename Flags>
 		}();
 		state->checkViews.emplace(flags, checkView);
 		checkView->checkedChanges(
-		) | rpl::start_with_next([=](bool checked) {
+		) | rpl::on_next([=](bool checked) {
 			if (checked && state->forceDisabled.current()) {
 				if (!state->toast) {
 					state->toast = Ui::Toast::Show(container, {
@@ -741,7 +742,7 @@ template <typename Flags>
 				{ nestedWithLabel.nested.front().icon });
 			container->add(std::move(wrap));
 			container->widthValue(
-			) | rpl::start_with_next([=](int w) {
+			) | rpl::on_next([=](int w) {
 				raw->resizeToWidth(w);
 			}, raw->lifetime());
 		}
@@ -779,7 +780,7 @@ void AddSlowmodeLabels(
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
+		) | rpl::on_next([=](int outer, int inner) {
 			const auto skip = st::localStorageLimitMargin;
 			const auto size = st::localStorageLimitSlider.seekSize;
 			const auto available = outer
@@ -902,7 +903,7 @@ void AddBoostsUnrestrictLabels(not_null<Ui::VerticalLayout*> container) {
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
+		) | rpl::on_next([=](int outer, int inner) {
 			const auto skip = st::localStorageLimitMargin;
 			const auto size = st::localStorageLimitSlider.seekSize;
 			const auto available = outer
@@ -947,7 +948,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 		tr::lng_rights_boosts_no_restrict(),
 		st::defaultSettingsButton
 	))->toggleOn(rpl::duplicate(enabled))->toggledValue(
-	) | rpl::start_with_next([=](bool toggled) {
+	) | rpl::on_next([=](bool toggled) {
 		if (toggled && !boostsUnrestrict->current()) {
 			*boostsUnrestrict = 1;
 		} else if (!toggled && boostsUnrestrict->current()) {
@@ -1294,7 +1295,7 @@ Fn<void()> AboutGigagroupCallback(
 				object_ptr<Ui::FlatLabel>(
 					box,
 					tr::lng_gigagroup_warning(
-					) | Ui::Text::ToRichLangValue(),
+					) | rpl::map(tr::rich),
 					st::infoAboutGigagroup));
 			box->addButton(tr::lng_gigagroup_convert_sure(), convertSure);
 			box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });

Telegram/SourceFiles/boxes/peers/edit_peer_reactions.cpp

@@ -159,6 +159,23 @@ bool MaybeDisabledEmoji::readyInDefaultState() {
 	return { Data::ReactionId{ like }, Data::ReactionId{ dislike } };
 }
 
+[[nodiscard]] std::vector<Data::ReactionId> CollectAvailableReactions(
+		not_null<Main::Session*> session) {
+	const auto &all = session->data().reactions().list(
+		Data::Reactions::Type::Active);
+	if (all.empty()) {
+		return DefaultSelected();
+	}
+	auto result = std::vector<Data::ReactionId>();
+	result.reserve(all.size());
+	for (const auto &reaction : all) {
+		if (!reaction.id.paid()) {
+			result.push_back(reaction.id);
+		}
+	}
+	return result;
+}
+
 [[nodiscard]] bool RemoveNonCustomEmojiFragment(
 		not_null<QTextDocument*> document,
 		UniqueCustomEmojiContext &context) {
@@ -235,7 +252,7 @@ void SetupOnlyCustomEmojiField(
 	const auto state = field->lifetime().make_state<State>();
 
 	field->changes(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		state->pending = true;
 		if (state->processing) {
 			return;
@@ -420,7 +437,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	applyFromState();
 	std::move(
 		args.paid
-	) | rpl::start_with_next([=](bool paid) {
+	) | rpl::on_next([=](bool paid) {
 		const auto id = Data::ReactionId::Paid();
 		if (paid && !ranges::contains(state->reactions, id)) {
 			state->reactions.insert(begin(state->reactions), id);
@@ -440,14 +457,17 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 	using SelectorState = ReactionsSelectorState;
 	std::move(
 		args.stateValue
-	) | rpl::start_with_next([=](SelectorState value) {
+	) | rpl::on_next([=](SelectorState value) {
 		switch (value) {
 		case SelectorState::Active:
 			state->overlay = nullptr;
 			state->focusLifetime.destroy();
 			if (raw->empty()) {
 				raw->setTextWithTags(
-					ComposeEmojiList(reactions, DefaultSelected()));
+					ComposeEmojiList(
+						reactions,
+						CollectAvailableReactions(
+							&args.controller->session())));
 			}
 			raw->setDisabled(false);
 			raw->setFocusFast();
@@ -455,10 +475,10 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		case SelectorState::Disabled:
 			state->overlay = std::make_unique<Ui::RpWidget>(parent);
 			state->overlay->show();
-			raw->geometryValue() | rpl::start_with_next([=](QRect rect) {
+			raw->geometryValue() | rpl::on_next([=](QRect rect) {
 				state->overlay->setGeometry(rect);
 			}, state->overlay->lifetime());
-			state->overlay->paintRequest() | rpl::start_with_next([=](QRect clip) {
+			state->overlay->paintRequest() | rpl::on_next([=](QRect clip) {
 				auto color = st::boxBg->c;
 				color.setAlphaF(0.5);
 				QPainter(state->overlay.get()).fillRect(
@@ -472,7 +492,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 			}
 			raw->setDisabled(true);
 			raw->focusedChanges(
-			) | rpl::start_with_next([=](bool focused) {
+			) | rpl::on_next([=](bool focused) {
 				if (focused) {
 					raw->parentWidget()->setFocus();
 				}
@@ -503,7 +523,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		st::emojiPanMinHeight);
 	panel->hide();
 	panel->selector()->customEmojiChosen(
-	) | rpl::start_with_next([=](ChatHelpers::FileChosen data) {
+	) | rpl::on_next([=](ChatHelpers::FileChosen data) {
 		Data::InsertCustomEmoji(raw, data.document);
 	}, panel->lifetime());
 
@@ -540,7 +560,7 @@ object_ptr<Ui::RpWidget> AddReactionsSelector(
 		panel->toggleAnimated();
 	});
 
-	raw->geometryValue() | rpl::start_with_next([=](QRect geometry) {
+	raw->geometryValue() | rpl::on_next([=](QRect geometry) {
 		toggle->move(
 			geometry.x() + geometry.width() - toggle->width(),
 			geometry.y() + geometry.height() - toggle->height());
@@ -572,9 +592,8 @@ void AddReactionsText(
 			inner,
 			tr::lng_manage_peer_reactions_own(
 				lt_link,
-				tr::lng_manage_peer_reactions_own_link(
-				) | Ui::Text::ToLink(),
-				Ui::Text::WithEntities),
+				tr::lng_manage_peer_reactions_own_link(tr::link),
+				tr::marked),
 			st::boxDividerLabel));
 	const auto weak = base::make_weak(navigation);
 	label->setClickHandlerFilter([=](const auto &...) {
@@ -595,11 +614,11 @@ void AddReactionsText(
 			count->value() | tr::to_count(),
 			lt_same_count,
 			std::move(countString),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		tr::lng_manage_peer_reactions_boost(
 			lt_link,
-			tr::lng_manage_peer_reactions_boost_link() | Ui::Text::ToLink(),
-			Ui::Text::RichLangValue)
+			tr::lng_manage_peer_reactions_boost_link(tr::link),
+			tr::rich)
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		a.append(' ').append(std::move(b));
 		return std::move(a);
@@ -669,7 +688,7 @@ void EditAllowedReactionsBox(
 	if (enabled) {
 		enabled->toggleOn(rpl::single(optionInitial != Option::None));
 		enabled->toggledValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			state->selectorState = value
 				? SelectorState::Active
 				: SelectorState::Disabled;
@@ -759,7 +778,12 @@ void EditAllowedReactionsBox(
 				tr::lng_manage_peer_reactions_limit(tr::now));
 		}
 	};
-	changed(selected.empty() ? DefaultSelected() : std::move(selected), {});
+	changed(
+		selected.empty()
+			? CollectAvailableReactions(
+				&args.navigation->parentController()->session())
+			: std::move(selected),
+		{});
 	Ui::AddSubsectionTitle(
 		reactions,
 		enabled
@@ -836,7 +860,7 @@ void EditAllowedReactionsBox(
 			left->sizeValue(),
 			center->sizeValue(),
 			right->sizeValue()
-		) | rpl::start_with_next([=](
+		) | rpl::on_next([=](
 				const QSize &s,
 				const QSize &leftSize,
 				const QSize &centerSize,
@@ -901,7 +925,7 @@ void EditAllowedReactionsBox(
 			st::manageGroupNoIconButton.button));
 		paid->toggleOn(state->paidEnabled.value());
 		paid->toggledValue(
-		) | rpl::start_with_next([=](bool value) {
+		) | rpl::on_next([=](bool value) {
 			state->paidEnabled = value;
 		}, paid->lifetime());
 		Ui::AddSkip(inner);
@@ -911,11 +935,11 @@ void EditAllowedReactionsBox(
 			tr::lng_manage_peer_reactions_paid_about(
 				lt_link,
 				tr::lng_manage_peer_reactions_paid_link([=](QString text) {
-					return Ui::Text::Link(
+					return tr::link(
 						text,
 						u"https://telegram.org/tos/stars"_q);
 				}),
-				Ui::Text::WithEntities));
+				tr::marked));
 	}
 	const auto collect = [=] {
 		auto result = AllowedReactions();

Telegram/SourceFiles/boxes/peers/edit_peer_requests_box.cpp

@@ -436,8 +436,8 @@ void RequestsBoxController::processRequest(
 				: tr::lng_group_requests_was_added)(
 					tr::now,
 					lt_user,
-					Ui::Text::Bold(user->name()),
-					Ui::Text::WithEntities));
+					tr::bold(user->name()),
+					tr::marked));
 		}
 	});
 	const auto fail = crl::guard(this, remove);

Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp

@@ -234,7 +234,7 @@ void Controller::createContent() {
 				_controls.joinToWrite->toggleOn(
 					rpl::single(_dataSavedValue->joinToWrite)
 				)->toggledValue(
-				) | rpl::start_with_next([=](bool toggled) {
+				) | rpl::on_next([=](bool toggled) {
 					_dataSavedValue->joinToWrite = toggled;
 				}, wrap->lifetime());
 			} else {
@@ -261,7 +261,7 @@ void Controller::createContent() {
 			_controls.requestToJoin->toggleOn(
 				rpl::single(_dataSavedValue->requestToJoin)
 			)->toggledValue(
-			) | rpl::start_with_next([=](bool toggled) {
+			) | rpl::on_next([=](bool toggled) {
 				_dataSavedValue->requestToJoin = toggled;
 			}, wrap->lifetime());
 
@@ -287,7 +287,7 @@ void Controller::createContent() {
 		_controls.noForwards->toggleOn(
 			rpl::single(_dataSavedValue->noForwards)
 		)->toggledValue(
-		) | rpl::start_with_next([=](bool toggled) {
+		) | rpl::on_next([=](bool toggled) {
 			_dataSavedValue->noForwards = toggled;
 		}, _wrap->lifetime());
 		Ui::AddSkip(_wrap.get());
@@ -441,11 +441,11 @@ object_ptr<Ui::RpWidget> Controller::createUsernameEdit() {
 			username,
 			_peer->session().createInternalLink(QString())));
 	_controls.usernameInput->heightValue(
-	) | rpl::start_with_next([placeholder](int height) {
+	) | rpl::on_next([placeholder](int height) {
 		placeholder->resize(placeholder->width(), height);
 	}, placeholder->lifetime());
 	placeholder->widthValue(
-	) | rpl::start_with_next([this](int width) {
+	) | rpl::on_next([this](int width) {
 		_controls.usernameInput->resize(
 			width,
 			_controls.usernameInput->height());
@@ -739,11 +739,11 @@ void EditPeerTypeBox::prepare() {
 		_useLocationPhrases,
 		_dataSavedValue);
 	controller->scrollToRequests(
-	) | rpl::start_with_next([=, raw = content.data()](int y) {
+	) | rpl::on_next([=, raw = content.data()](int y) {
 		scrollToY(raw->y() + y);
 	}, lifetime());
 	_focusRequests.events(
-	) | rpl::start_with_next(
+	) | rpl::on_next(
 		[=] {
 			controller->setFocusUsername();
 			if (_usernameError.has_value()) {

Telegram/SourceFiles/boxes/peers/edit_peer_usernames_list.cpp

@@ -20,7 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/show.h"
 #include "ui/painter.h"
-#include "ui/text/text_utilities.h" // Ui::Text::RichLangValue.
+#include "ui/text/text_utilities.h" // tr::rich.
 #include "ui/toast/toast.h"
 #include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
@@ -131,7 +131,7 @@ UsernamesList::Row::Row(
 
 	_rightAction->setVisible(data.active);
 	sizeValue(
-	) | rpl::start_with_next([=](const QSize &s) {
+	) | rpl::on_next([=](const QSize &s) {
 		_rightAction->moveToLeft(
 			s.width() - _rightAction->width() - st::inviteLinkThreeDotsSkip,
 			(s.height() - _rightAction->height()) / 2);
@@ -219,7 +219,7 @@ UsernamesList::UsernamesList(
 		peer->session().changes().peerFlagsValue(
 			peer,
 			Data::PeerUpdate::Flag::Usernames)
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		load();
 	}, lifetime());
 }
@@ -227,7 +227,7 @@ UsernamesList::UsernamesList(
 void UsernamesList::load() {
 	_loadLifetime = _peer->session().api().usernames().loadUsernames(
 		_peer
-	) | rpl::start_with_next([=](const Data::Usernames &usernames) {
+	) | rpl::on_next([=](const Data::Usernames &usernames) {
 		if (usernames.empty()) {
 			_container = nullptr;
 			resize(0, 0);
@@ -320,13 +320,13 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 					_toggleLifetime = api.usernames().reorder(
 						_peer,
 						order()
-					) | rpl::start_with_done([=] {
+					) | rpl::on_done([=] {
 						auto &api = _peer->session().api();
 						_toggleLifetime = api.usernames().toggle(
 							_peer,
 							username.username,
 							!username.active
-						) | rpl::start_with_error_done([=](
+						) | rpl::on_error_done([=](
 								Api::Usernames::Error error) {
 							if (error == Api::Usernames::Error::TooMuch) {
 								constexpr auto kMaxUsernames = 10.;
@@ -335,7 +335,7 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 										tr::lng_usernames_activate_error(
 											lt_count,
 											rpl::single(kMaxUsernames),
-											Ui::Text::RichLangValue)));
+											tr::rich)));
 							}
 							if (error == Api::Usernames::Error::Flood) {
 								_show->showToast(
@@ -378,7 +378,7 @@ void UsernamesList::rebuild(const Data::Usernames &usernames) {
 	_reorder->start();
 
 	_reorder->updates(
-	) | rpl::start_with_next([=](Ui::VerticalLayoutReorder::Single data) {
+	) | rpl::on_next([=](Ui::VerticalLayoutReorder::Single data) {
 		using State = Ui::VerticalLayoutReorder::State;
 		if (data.state == State::Started) {
 			++_reordering;

Telegram/SourceFiles/boxes/peers/peer_short_info_box.cpp

@@ -115,18 +115,18 @@ PeerShortInfoCover::PeerShortInfoCover(
 
 	std::move(
 		userpic
-	) | rpl::start_with_next([=](PeerShortInfoUserpic &&value) {
+	) | rpl::on_next([=](PeerShortInfoUserpic &&value) {
 		applyUserpic(std::move(value));
 		applyAdditionalStatus(value.additionalStatus);
 	}, lifetime());
 
 	style::PaletteChanged(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		refreshBarImages();
 	}, lifetime());
 
 	_widget->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(_widget.get());
 		paint(p);
 	}, lifetime());
@@ -478,7 +478,7 @@ void PeerShortInfoCover::applyUserpic(PeerShortInfoUserpic &&value) {
 		_videoStartPosition = value.videoStartPosition;
 		_videoInstance->lockPlayer();
 		_videoInstance->player().updates(
-		) | rpl::start_with_next_error([=](Update &&update) {
+		) | rpl::on_next_error([=](Update &&update) {
 			handleStreamingUpdate(std::move(update));
 		}, [=](Error &&error) {
 			handleStreamingError(std::move(error));
@@ -685,7 +685,7 @@ PeerShortInfoBox::PeerShortInfoBox(
 	_rows->add(_cover.takeOwned());
 
 	_scroll->scrolls(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		_cover.setScrollTop(_scroll->scrollTop());
 	}, _cover.lifetime());
 }
@@ -720,7 +720,7 @@ void PeerShortInfoBox::prepare() {
 
 	_topRoundBackground->resize(st::shortInfoWidth, st::boxRadius);
 	_topRoundBackground->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		if (const auto use = fillRoundedTopHeight()) {
 			const auto width = _topRoundBackground->width();
 			const auto top = _topRoundBackground->height() - use;
@@ -751,7 +751,7 @@ void PeerShortInfoBox::prepareRows() {
 			const style::FlatLabel &textSt) {
 		auto line = CreateTextWithLabel(
 			_rows,
-			rpl::duplicate(label) | Ui::Text::ToWithEntities(),
+			rpl::duplicate(label) | rpl::map(tr::marked),
 			rpl::duplicate(text),
 			_st.label,
 			textSt,
@@ -763,7 +763,7 @@ void PeerShortInfoBox::prepareRows() {
 		rpl::combine(
 			std::move(label),
 			std::move(text)
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			_rows->resizeToWidth(st::shortInfoWidth);
 		}, _rows->lifetime());
 
@@ -801,7 +801,7 @@ void PeerShortInfoBox::prepareRows() {
 		tr::lng_context_copy_link(tr::now));
 	addInfoOneLine(
 		tr::lng_info_mobile_label(),
-		phoneValue() | Ui::Text::ToWithEntities(),
+		phoneValue() | rpl::map(tr::marked),
 		tr::lng_profile_copy_phone(tr::now));
 	auto label = _fields.current().isBio
 		? tr::lng_info_bio_label()
@@ -809,11 +809,11 @@ void PeerShortInfoBox::prepareRows() {
 	addInfoLine(std::move(label), aboutValue(), _st.labeled);
 	addInfoOneLine(
 		tr::lng_info_username_label(),
-		usernameValue() | Ui::Text::ToWithEntities(),
+		usernameValue() | rpl::map(tr::marked),
 		tr::lng_context_copy_mention(tr::now));
 	addInfoOneLine(
 		birthdayLabel(),
-		birthdayValue() | Ui::Text::ToWithEntities(),
+		birthdayValue() | rpl::map(tr::marked),
 		tr::lng_mediaview_copy(tr::now));
 	addInfoLine(
 		tr::lng_info_notes_label(),
@@ -881,14 +881,14 @@ rpl::producer<QString> PeerShortInfoBox::nameValue() const {
 rpl::producer<TextWithEntities> PeerShortInfoBox::channelValue() const {
 	return _fields.value(
 	) | rpl::map([](const PeerShortInfoFields &fields) {
-		return Ui::Text::Link(fields.channelName, fields.channelLink);
+		return tr::link(fields.channelName, fields.channelLink);
 	}) | rpl::distinct_until_changed();
 }
 
 rpl::producer<TextWithEntities> PeerShortInfoBox::linkValue() const {
 	return _fields.value(
 	) | rpl::map([](const PeerShortInfoFields &fields) {
-		return Ui::Text::Link(fields.link, fields.link);
+		return tr::link(fields.link, fields.link);
 	}) | rpl::distinct_until_changed();
 }
 

Telegram/SourceFiles/boxes/peers/prepare_short_info_box.cpp

@@ -410,13 +410,13 @@ bool ProcessCurrent(
 			UpdateFlag::Photo | UpdateFlag::FullInfo
 		) | rpl::filter([=](const Data::PeerUpdate &update) {
 			return (update.flags & UpdateFlag::Photo) || state->waitingFull;
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			push();
 		}, lifetime);
 
 		rpl::duplicate(
 			slices
-		) | rpl::start_with_next([=](UserPhotosSlice &&slice) {
+		) | rpl::on_next([=](UserPhotosSlice &&slice) {
 			state->userSlice = std::move(slice);
 			push();
 		}, lifetime);
@@ -424,7 +424,7 @@ bool ProcessCurrent(
 		moveRequests->events(
 		) | rpl::filter([=] {
 			return (state->current.count > 1);
-		}) | rpl::start_with_next([=](int shift) {
+		}) | rpl::on_next([=](int shift) {
 			state->current.index = std::clamp(
 				((state->current.index + shift + state->current.count)
 					% state->current.count),
@@ -439,7 +439,7 @@ bool ProcessCurrent(
 				&& (state->photoView
 					? (!!state->photoView->image(Data::PhotoSize::Large))
 					: (!Ui::PeerUserpicLoading(state->userpicView)));
-		}) | rpl::start_with_next([=] {
+		}) | rpl::on_next([=] {
 			push();
 		}, lifetime);
 
@@ -472,16 +472,16 @@ object_ptr<Ui::BoxContent> PrepareShortInfoBox(
 
 	if (menuFiller) {
 		result->fillMenuRequests(
-		) | rpl::start_with_next([=](Ui::Menu::MenuCallback callback) {
+		) | rpl::on_next([=](Ui::Menu::MenuCallback callback) {
 			menuFiller(std::move(callback));
 		}, result->lifetime());
 	}
 
 	result->openRequests(
-	) | rpl::start_with_next(open, result->lifetime());
+	) | rpl::on_next(open, result->lifetime());
 
 	result->moveRequests(
-	) | rpl::start_with_next(userpic.move, result->lifetime());
+	) | rpl::on_next(userpic.move, result->lifetime());
 
 	return result;
 }
@@ -556,7 +556,7 @@ PreparedShortInfoUserpic PrepareShortInfoFallbackUserpic(
 			1,
 			1,
 			1))
-		: (rpl::never<UserPhotosSlice>() | rpl::type_erased());
+		: (rpl::never<UserPhotosSlice>() | rpl::type_erased);
 	auto process = [=](not_null<UserpicState*> state) {
 		if (photoId) {
 			ProcessFullPhoto(peer, state, peer->owner().photo(*photoId));

Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp

@@ -217,13 +217,13 @@ void Controller::prepare() {
 			above.data(),
 			tr::lng_boost_reassign_text(
 				lt_channel,
-				rpl::single(Ui::Text::Bold(_to->name())),
+				rpl::single(tr::bold(_to->name())),
 				lt_gift,
 				tr::lng_boost_reassign_gift(
 					lt_count,
 					rpl::single(1. * BoostsForGift(session)),
-					Ui::Text::RichLangValue),
-				Ui::Text::RichLangValue),
+					tr::rich),
+				tr::rich),
 			st::boostReassignText),
 		st::boxRowPadding,
 		style::al_top);
@@ -278,7 +278,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				tr::now,
 				lt_count,
 				BoostsForGift(&session()),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			.adaptive = true,
 		});
 		return;
@@ -331,14 +331,14 @@ object_ptr<Ui::BoxContent> ReassignBoostFloodBox(int seconds, bool group) {
 			? tr::lng_boost_error_flood_text_group
 			: tr::lng_boost_error_flood_text)(
 				lt_left,
-				rpl::single(Ui::Text::Bold((days > 1)
+				rpl::single(tr::bold((days > 1)
 					? tr::lng_days(tr::now, lt_count, days)
 					: (hours > 1)
 					? tr::lng_hours(tr::now, lt_count, hours)
 					: (minutes > 1)
 					? tr::lng_minutes(tr::now, lt_count, minutes)
 					: tr::lng_seconds(tr::now, lt_count, seconds))),
-				Ui::Text::RichLangValue),
+				tr::rich),
 		.title = tr::lng_boost_error_flood_title(),
 	});
 }
@@ -362,10 +362,10 @@ object_ptr<Ui::BoxContent> ReassignBoostSingleBox(
 		Ui::ConfirmBox(box, {
 			.text = tr::lng_boost_now_instead(
 				lt_channel,
-				rpl::single(Ui::Text::Bold(peer->name())),
+				rpl::single(tr::bold(peer->name())),
 				lt_other,
-				rpl::single(Ui::Text::Bold(to->name())),
-				Ui::Text::WithEntities),
+				rpl::single(tr::bold(to->name())),
+				tr::marked),
 			.confirmed = confirmed,
 			.confirmText = tr::lng_boost_now_replace(),
 			.labelPadding = st::boxRowPadding,
@@ -382,7 +382,7 @@ object_ptr<Ui::BoxContent> ReassignBoostSingleBox(
 
 	result->boxClosing() | rpl::filter([=] {
 		return !*reassigned;
-	}) | rpl::start_with_next(cancel, result->lifetime());
+	}) | rpl::on_next(cancel, result->lifetime());
 
 	return result;
 }
@@ -551,7 +551,7 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 	const auto raw = controller.get();
 	auto initBox = [=](not_null<Ui::BoxContent*> box) {
 		raw->selectedValue(
-		) | rpl::start_with_next([=](std::vector<int> slots) {
+		) | rpl::on_next([=](std::vector<int> slots) {
 			box->clearButtons();
 			if (!slots.empty()) {
 				const auto sources = SourcesCount(to, from, slots);
@@ -567,7 +567,7 @@ object_ptr<Ui::BoxContent> ReassignBoostsBox(
 
 		box->boxClosing() | rpl::filter([=] {
 			return !*reassigned;
-		}) | rpl::start_with_next(cancel, box->lifetime());
+		}) | rpl::on_next(cancel, box->lifetime());
 	};
 	return Box<PeerListBox>(std::move(controller), std::move(initBox));
 }
@@ -597,7 +597,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	const auto state = raw->lifetime().make_state<State>();
 	std::move(
 		from
-	) | rpl::start_with_next([=](
+	) | rpl::on_next([=](
 			const std::vector<not_null<PeerData*>> &list) {
 		auto was = base::take(state->from);
 		auto buttons = base::take(state->buttons);
@@ -628,7 +628,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	rpl::combine(
 		raw->widthValue(),
 		state->count.value()
-	) | rpl::start_with_next([=](int width, int count) {
+	) | rpl::on_next([=](int width, int count) {
 		const auto skip = st::boostReplaceUserpicsSkip;
 		const auto left = width - 2 * right->width() - skip;
 		const auto shift = std::min(
@@ -651,7 +651,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsTransfer(
 	overlay->paintRequest(
 	) | rpl::filter([=] {
 		return !state->buttons.empty();
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
@@ -737,7 +737,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	const auto state = raw->lifetime().make_state<State>();
 	std::move(
 		peers
-	) | rpl::start_with_next([=, &st](
+	) | rpl::on_next([=, &st](
 			const std::vector<not_null<PeerData*>> &list) {
 		auto was = base::take(state->from);
 		auto buttons = base::take(state->buttons);
@@ -774,7 +774,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	rpl::combine(
 		raw->widthValue(),
 		state->count.value()
-	) | rpl::start_with_next([=, &st](int width, int count) {
+	) | rpl::on_next([=, &st](int width, int count) {
 		const auto single = st.button.size.width();
 		const auto left = width - single;
 		const auto used = std::min(count, int(state->buttons.size()));
@@ -793,7 +793,7 @@ object_ptr<Ui::RpWidget> CreateUserpicsWithMoreBadge(
 	overlay->paintRequest(
 	) | rpl::filter([=] {
 		return !state->buttons.empty();
-	}) | rpl::start_with_next([=, &st] {
+	}) | rpl::on_next([=, &st] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {
@@ -986,7 +986,7 @@ object_ptr<Ui::RpWidget> CreateGiftTransfer(
 	overlay->update();
 
 	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto skip = st::boostReplaceUserpicsSkip;
 		const auto total = right->width() + skip + right->width();
 		auto x = (width - total) / 2;
@@ -997,7 +997,7 @@ object_ptr<Ui::RpWidget> CreateGiftTransfer(
 	}, raw->lifetime());
 
 	overlay->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		const auto outerw = overlay->width();
 		const auto ratio = style::DevicePixelRatio();
 		if (state->layer.size() != QSize(outerw, full) * ratio) {

Telegram/SourceFiles/boxes/peers/toggle_topics_box.cpp

@@ -83,7 +83,7 @@ LayoutButton::LayoutButton(
 		group->setValue(type);
 		iconAnimate(anim::repeat::once);
 	});
-	group->value() | rpl::start_with_next([=](LayoutType value) {
+	group->value() | rpl::on_next([=](LayoutType value) {
 		const auto active = (value == type);
 		_text.setTextColorOverride(active
 			? st::windowFgActive->c
@@ -99,7 +99,7 @@ LayoutButton::LayoutButton(
 		}, _active ? 0. : 1., _active ? 0. : 1., st::fadeWrapDuration);
 	}, lifetime());
 
-	_text.paintRequest() | rpl::start_with_next([=](QRect clip) {
+	_text.paintRequest() | rpl::on_next([=](QRect clip) {
 		if (_active) {
 			auto p = QPainter(&_text);
 			auto hq = PainterHighQualityEnabler(p);
@@ -154,7 +154,7 @@ void ToggleTopicsBox(
 		.lottieMargins = st::settingsFilterIconPadding,
 		.showFinished = box->showFinishes(),
 		.about = tr::lng_edit_topics_about(
-			Ui::Text::RichLangValue
+			tr::rich
 		),
 		.aboutMargins = st::settingsFilterDividerLabelPadding,
 	});
@@ -197,7 +197,7 @@ void ToggleTopicsBox(
 		group);
 
 	buttons->resize(container->width(), tabsButton->height());
-	buttons->widthValue() | rpl::start_with_next([=](int outer) {
+	buttons->widthValue() | rpl::on_next([=](int outer) {
 		const auto skip = st::boxRowPadding.left() - st::boxRadius;
 		tabsButton->moveToLeft(skip, 0, outer);
 		listButton->moveToRight(skip, 0, outer);
@@ -205,11 +205,11 @@ void ToggleTopicsBox(
 
 	Ui::AddDividerText(
 		layout,
-		tr::lng_edit_topics_layout_about(Ui::Text::RichLangValue));
+		tr::lng_edit_topics_layout_about(tr::rich));
 
 	layoutWrap->toggle(enabled, anim::type::instant);
 	toggle->toggledChanges(
-	) | rpl::start_with_next([=](bool checked) {
+	) | rpl::on_next([=](bool checked) {
 		layoutWrap->toggle(checked, anim::type::normal);
 	}, layoutWrap->lifetime());
 

Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp

@@ -138,8 +138,8 @@ void Controller::confirmAdd(not_null<PeerData*> peer) {
 						.text = PeerVerifyPhrases(peer).sent(
 							tr::now,
 							lt_name,
-							Ui::Text::Bold(peer->shortName()),
-							Ui::Text::WithEntities),
+							tr::bold(peer->shortName()),
+							tr::marked),
 						.duration = kSetupVerificationToastDuration,
 					});
 				} else {
@@ -153,8 +153,8 @@ void Controller::confirmAdd(not_null<PeerData*> peer) {
 		Ui::ConfirmBox(box, {
 			.text = phrases.text(
 				lt_name,
-				rpl::single(Ui::Text::Bold(peer->shortName())),
-				Ui::Text::WithEntities),
+				rpl::single(tr::bold(peer->shortName())),
+				tr::marked),
 			.confirmed = send,
 			.confirmText = phrases.submit(),
 			.title = phrases.title(),
@@ -183,7 +183,7 @@ void Controller::confirmAdd(not_null<PeerData*> peer) {
 
 		Ui::AddSkip(box->verticalLayout());
 
-		field->changes() | rpl::start_with_next([=] {
+		field->changes() | rpl::on_next([=] {
 			state->description = field->getLastText();
 		}, field->lifetime());
 

Telegram/SourceFiles/boxes/premium_limits_box.cpp

@@ -517,13 +517,13 @@ void SimplePinsLimitBox(
 		tr::lng_filter_pin_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_pin_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -556,13 +556,13 @@ void ChannelsLimitBox(
 		tr::lng_channels_limit1(
 			lt_count,
 			rpl::single(current),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
-			? tr::lng_channels_limit2_final(Ui::Text::RichLangValue)
+			? tr::lng_channels_limit2_final(tr::rich)
 			: tr::lng_channels_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return a.append(QChar(' ')).append(std::move(b));
 	});
@@ -596,12 +596,12 @@ void ChannelsLimitBox(
 
 	using namespace rpl::mappers;
 	controller->countValue(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 
 	delegate->selectedCountChanges(
-	) | rpl::start_with_next([=](int count) {
+	) | rpl::on_next([=](int count) {
 		const auto leave = [=](const base::flat_set<PeerListRowId> &ids) {
 			for (const auto rowId : ids) {
 				const auto id = peerToChannel(PeerId(rowId));
@@ -646,13 +646,13 @@ void PublicLinksLimitBox(
 		tr::lng_links_limit1(
 			lt_count,
 			rpl::single(current),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
-			? tr::lng_links_limit2_final(Ui::Text::RichLangValue)
+			? tr::lng_links_limit2_final(tr::rich)
 			: tr::lng_links_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return a.append(QChar(' ')).append(std::move(b));
 	});
@@ -687,7 +687,7 @@ void PublicLinksLimitBox(
 
 	using namespace rpl::mappers;
 	controller->countValue(
-	) | rpl::filter(_1 > 0) | rpl::start_with_next([=] {
+	) | rpl::filter(_1 > 0) | rpl::on_next([=] {
 		delete placeholder;
 	}, placeholder->lifetime());
 }
@@ -714,13 +714,13 @@ void FilterChatsLimitBox(
 			: tr::lng_filter_chats_exlude_limit1)(
 				lt_count,
 				rpl::single(premium ? premiumLimit : defaultLimit),
-				Ui::Text::RichLangValue),
+				tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_chats_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -752,13 +752,13 @@ void FilterLinksLimitBox(
 		tr::lng_filter_links_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_links_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -801,13 +801,13 @@ void FiltersLimitBox(
 		tr::lng_filters_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filters_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -840,13 +840,13 @@ void ShareableFiltersLimitBox(
 		tr::lng_filter_shared_limit1(
 			lt_count,
 			rpl::single(premium ? premiumLimit : defaultLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((premium || !premiumPossible)
 			? rpl::single(TextWithEntities())
 			: tr::lng_filter_shared_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -929,7 +929,7 @@ void ForumPinsLimitBox(
 	auto text = tr::lng_forum_pin_limit(
 		lt_count,
 		rpl::single(current),
-		Ui::Text::RichLangValue);
+		tr::rich);
 	SimpleLimitBox(
 		box,
 		nullptr,
@@ -962,13 +962,13 @@ void CaptionLimitBox(
 		tr::lng_caption_limit1(
 			lt_count,
 			rpl::single(currentLimit),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		(!premiumPossible
 			? rpl::single(TextWithEntities())
 			: tr::lng_caption_limit2(
 				lt_count,
 				rpl::single(premiumLimit),
-				Ui::Text::RichLangValue))
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -1035,14 +1035,14 @@ void FileSizeLimitBox(
 	auto text = rpl::combine(
 		tr::lng_file_size_limit1(
 			lt_size,
-			rpl::single(Ui::Text::Bold(gb(showLimit))),
-			Ui::Text::RichLangValue),
+			rpl::single(tr::bold(gb(showLimit))),
+			tr::rich),
 		(!premiumPossible
 			? rpl::single(TextWithEntities())
 			: tr::lng_file_size_limit2(
 				lt_size,
-				rpl::single(Ui::Text::Bold(gb(premiumGb))),
-				Ui::Text::RichLangValue))
+				rpl::single(tr::bold(gb(premiumGb))),
+				tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return a.append(QChar(' ')).append(std::move(b));
 	});
@@ -1090,10 +1090,10 @@ void AccountsLimitBox(
 		tr::lng_accounts_limit1(
 			lt_count,
 			rpl::single<float64>(current),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		((!premiumPossible || current > premiumLimit)
 			? rpl::single(TextWithEntities())
-			: tr::lng_accounts_limit2(Ui::Text::RichLangValue))
+			: tr::lng_accounts_limit2(tr::rich))
 	) | rpl::map([](TextWithEntities &&a, TextWithEntities &&b) {
 		return b.text.isEmpty()
 			? a
@@ -1162,7 +1162,7 @@ void AccountsLimitBox(
 			return;
 		}
 		*switchingLifetime = session->domain().activeSessionChanges(
-		) | rpl::start_with_next([=](Main::Session *session) mutable {
+		) | rpl::on_next([=](Main::Session *session) mutable {
 			if (session) {
 				Settings::ShowPremium(session, ref);
 			}

Telegram/SourceFiles/boxes/premium_preview_box.cpp

@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_streaming.h"
 #include "data/data_peer_values.h"
 #include "data/data_premium_limits.h"
+#include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "main/main_domain.h" // kMaxAccounts
@@ -43,7 +44,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "api/api_premium.h"
 #include "apiwrap.h"
+#include "styles/style_credits.h" // upgradeGiftSubtext
+#include "styles/style_info.h" // infoStarsUnderstood
 #include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
 
@@ -137,6 +141,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_premium_summary_subtitle_todo_lists();
 	case PremiumFeature::PeerColors:
 		return tr::lng_premium_summary_subtitle_peer_colors();
+	case PremiumFeature::Gifts:
+		return tr::lng_premium_summary_subtitle_gifts();
 
 	case PremiumFeature::BusinessLocation:
 		return tr::lng_business_subtitle_location();
@@ -206,6 +212,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		return tr::lng_premium_summary_about_todo_lists();
 	case PremiumFeature::PeerColors:
 		return tr::lng_premium_summary_about_peer_colors();
+	case PremiumFeature::Gifts:
+		return tr::lng_premium_summary_about_gifts();
 
 	case PremiumFeature::BusinessLocation:
 		return tr::lng_business_about_location();
@@ -237,7 +245,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	const auto raw = result.data();
 
 	raw->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(raw);
 		p.drawImage(0, 0, back);
 	}, raw->lifetime());
@@ -261,7 +269,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(
 			QPoint(
 				(size.width() - effectSize.width()) / 2,
@@ -315,8 +323,8 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 			result->update();
 		};
 		auto &lifetime = result->lifetime();
-		state->lottie->updates() | rpl::start_with_next(update, lifetime);
-		state->effect->updates() | rpl::start_with_next(update, lifetime);
+		state->lottie->updates() | rpl::on_next(update, lifetime);
+		state->effect->updates() | rpl::on_next(update, lifetime);
 	};
 	createLottieIfReady();
 	if (!state->lottie || !state->effect) {
@@ -333,7 +341,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		rpl::never<>());
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		createLottieIfReady();
 
 		auto p = QPainter(result);
@@ -391,7 +399,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -417,7 +425,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 		outer->show();
 
 		result->sizeValue(
-		) | rpl::start_with_next([=](QSize size) {
+		) | rpl::on_next([=](QSize size) {
 			outer->resize(size);
 		}, outer->lifetime());
 
@@ -487,7 +495,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	result->shownValue(
 	) | rpl::filter([=](bool shown) {
 		return shown && state->toggleTimerPending;
-	}) | rpl::start_with_next([=] {
+	}) | rpl::on_next([=] {
 		state->toggleTimerPending = false;
 		state->toggleTimer.callOnce(kToggleStickerTimeout);
 	}, result->lifetime());
@@ -507,7 +515,7 @@ void PreloadSticker(const std::shared_ptr<Data::DocumentMedia> &media) {
 	fill();
 	if (state->medias.empty()) {
 		premium->stickersUpdated(
-		) | rpl::take(1) | rpl::start_with_next(fill, lifetime);
+		) | rpl::take(1) | rpl::on_next(fill, lifetime);
 	}
 
 	return result;
@@ -548,6 +556,7 @@ struct VideoPreviewDocument {
 		case PremiumFeature::Effects: return "effects";
 		case PremiumFeature::TodoLists: return "todo";
 		case PremiumFeature::PeerColors: return "peer_colors";
+		case PremiumFeature::Gifts: return "gifts";
 
 		case PremiumFeature::BusinessLocation: return "business_location";
 		case PremiumFeature::BusinessHours: return "business_hours";
@@ -628,7 +637,7 @@ struct VideoPreviewDocument {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(parent->rect());
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -698,7 +707,7 @@ struct VideoPreviewDocument {
 		}
 	};
 	state->instance.player().updates(
-	) | rpl::start_with_next_error([=](Media::Streaming::Update &&update) {
+	) | rpl::on_next_error([=](Media::Streaming::Update &&update) {
 		if (v::is<Media::Streaming::Information>(update.data)
 			|| v::is<Media::Streaming::UpdateVideo>(update.data)) {
 			if (!state->readyInvoked && readyCallback) {
@@ -718,7 +727,7 @@ struct VideoPreviewDocument {
 	});
 
 	result->paintRequest(
-	) | rpl::start_with_next([=] {
+	) | rpl::on_next([=] {
 		auto p = QPainter(result);
 		const auto paintFrame = [&](QColor color, float64 thickness) {
 			auto hq = PainterHighQualityEnabler(p);
@@ -790,7 +799,7 @@ struct VideoPreviewDocument {
 	result->show();
 
 	parent->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
+	) | rpl::on_next([=](QSize size) {
 		result->setGeometry(QRect(QPoint(), size));
 	}, result->lifetime());
 	auto &lifetime = result->lifetime();
@@ -816,7 +825,7 @@ struct VideoPreviewDocument {
 	create();
 	if (!state->single) {
 		session->api().premium().videosUpdated(
-		) | rpl::take(1) | rpl::start_with_next(create, lifetime);
+		) | rpl::take(1) | rpl::on_next(create, lifetime);
 	}
 
 	return result;
@@ -865,7 +874,7 @@ struct VideoPreviewDocument {
 		const auto section = order[i];
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(raw);
 		parent->widthValue(
-		) | rpl::start_with_next([=](int outer) {
+		) | rpl::on_next([=](int outer) {
 			const auto full = width * count;
 			const auto left = (outer - full) / 2 + (i * width);
 			button->setGeometry(left, 0, width, height);
@@ -874,7 +883,7 @@ struct VideoPreviewDocument {
 			*selected = section;
 		});
 		button->paintRequest(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			auto p = QPainter(button);
 			auto hq = PainterHighQualityEnabler(p);
 			p.setBrush((selected->current() == section)
@@ -887,13 +896,52 @@ struct VideoPreviewDocument {
 				button->rect().marginsRemoved(st::premiumDotPadding));
 		}, button->lifetime());
 		selected->changes(
-		) | rpl::start_with_next([=] {
+		) | rpl::on_next([=] {
 			button->update();
 		}, button->lifetime());
 	}
 	return result;
 }
 
+void AddGiftsInfoRows(not_null<Ui::VerticalLayout*> container) {
+	const auto infoRow = [&](
+			rpl::producer<QString> title,
+			rpl::producer<QString> text,
+			not_null<const style::icon*> icon) {
+		auto raw = container->add(
+			object_ptr<Ui::VerticalLayout>(container));
+		raw->add(
+			object_ptr<Ui::FlatLabel>(
+				raw,
+				std::move(title) | rpl::map(tr::bold),
+				st::defaultFlatLabel),
+			st::settingsPremiumRowTitlePadding);
+		raw->add(
+			object_ptr<Ui::FlatLabel>(
+				raw,
+				std::move(text),
+				st::upgradeGiftSubtext),
+			st::settingsPremiumRowAboutPadding);
+		object_ptr<Info::Profile::FloatingIcon>(
+			raw,
+			*icon,
+			st::starrefInfoIconPosition);
+	};
+
+	infoRow(
+		tr::lng_gift_upgrade_unique_title(),
+		tr::lng_gift_upgrade_unique_about(),
+		&st::menuIconUnique);
+	infoRow(
+		tr::lng_gift_upgrade_tradable_title(),
+		tr::lng_gift_upgrade_tradable_about(),
+		&st::menuIconTradable);
+	infoRow(
+		tr::lng_gift_upgrade_wearable_title(),
+		tr::lng_gift_upgrade_wearable_about(),
+		&st::menuIconNftWear);
+}
+
 void PreviewBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -956,22 +1004,32 @@ void PreviewBox(
 		st::settingsPremiumTopBarClose);
 	close->setClickedCallback([=] { box->closeBox(); });
 
-	const auto left = Ui::CreateChild<Ui::IconButton>(
+	const auto gifts = (state->selected.current() == PremiumFeature::Gifts);
+
+	const auto left = gifts ? nullptr : Ui::CreateChild<Ui::IconButton>(
 		buttonsParent,
 		st::settingsPremiumMoveLeft);
-	left->setClickedCallback([=] { move(-1); });
+	if (left) {
+		left->setClickedCallback([=] { move(-1); });
+	}
 
-	const auto right = Ui::CreateChild<Ui::IconButton>(
+	const auto right = gifts ? nullptr : Ui::CreateChild<Ui::IconButton>(
 		buttonsParent,
 		st::settingsPremiumMoveRight);
-	right->setClickedCallback([=] { move(1); });
+	if (right) {
+		right->setClickedCallback([=] { move(1); });
+	}
 
 	buttonsParent->widthValue(
-	) | rpl::start_with_next([=](int width) {
+	) | rpl::on_next([=](int width) {
 		const auto outerHeight = st::premiumPreviewHeight;
 		close->moveToRight(0, 0, width);
-		left->moveToLeft(0, (outerHeight - left->height()) / 2, width);
-		right->moveToRight(0, (outerHeight - right->height()) / 2, width);
+		if (left) {
+			left->moveToLeft(0, (outerHeight - left->height()) / 2, width);
+		}
+		if (right) {
+			right->moveToRight(0, (outerHeight - right->height()) / 2, width);
+		}
 	}, close->lifetime());
 
 	state->preload = [=] {
@@ -1014,7 +1072,7 @@ void PreviewBox(
 
 	state->selected.value(
 	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](PremiumFeature was, PremiumFeature now) {
+	) | rpl::on_next([=](PremiumFeature was, PremiumFeature now) {
 		const auto animationCallback = [=] {
 			if (!state->animation.animating()) {
 				for (const auto &hiding : base::take(state->hiding)) {
@@ -1099,16 +1157,30 @@ void PreviewBox(
 		st::premiumPreviewAboutPadding,
 		style::al_top
 	)->setTryMakeSimilarLines(true);
-	box->addRow(
-		CreateSwitch(box->verticalLayout(), &state->selected, state->order),
-		st::premiumDotsMargin);
+
+	if (gifts) {
+		box->setStyle(st::giftBox);
+		AddGiftsInfoRows(box->verticalLayout());
+	} else {
+		box->addRow(
+			CreateSwitch(box->verticalLayout(), &state->selected, state->order),
+			st::premiumDotsMargin);
+	}
 	const auto showFinished = [=] {
 		state->showFinished = true;
 		if (base::take(state->preloadScheduled)) {
 			state->preload();
 		}
 	};
-	if ((descriptor.fromSettings && show->session().premium())
+	if (gifts) {
+		box->setShowFinishedCallback(showFinished);
+		box->addButton(
+			rpl::single(QString()),
+			[=] { box->closeBox(); }
+		)->setText(rpl::single(Ui::Text::IconEmoji(
+			&st::infoStarsUnderstood
+		).append(' ').append(tr::lng_auction_about_understood(tr::now))));
+	} else if ((descriptor.fromSettings && show->session().premium())
 		|| descriptor.hideSubscriptionButton) {
 		box->setShowFinishedCallback(showFinished);
 		box->addButton(tr::lng_close(), [=] { box->closeBox(); });
@@ -1163,13 +1235,13 @@ void PreviewBox(
 	if (descriptor.fromSettings) {
 		Data::AmPremiumValue(
 			&show->session()
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}
 
 	box->events(
-	) | rpl::start_with_next([=](not_null<QEvent*> e) {
+	) | rpl::on_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::KeyPress) {
 			const auto key = static_cast<QKeyEvent*>(e.get())->key();
 			if (key == Qt::Key_Left) {
@@ -1181,7 +1253,7 @@ void PreviewBox(
 	}, box->lifetime());
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
-		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+		box->boxClosing() | rpl::on_next(hidden, box->lifetime());
 	}
 }
 
@@ -1227,13 +1299,13 @@ void DecorateListPromoBox(
 	if (!descriptor.hideSubscriptionButton) {
 		Data::AmPremiumValue(
 			session
-		) | rpl::skip(1) | rpl::start_with_next([=] {
+		) | rpl::skip(1) | rpl::on_next([=] {
 			box->closeBox();
 		}, box->lifetime());
 	}
 
 	if (const auto &hidden = descriptor.hiddenCallback) {
-		box->boxClosing() | rpl::start_with_next(hidden, box->lifetime());
+		box->boxClosing() | rpl::on_next(hidden, box->lifetime());
 	}
 
 	if (session->premium() || descriptor.hideSubscriptionButton) {
@@ -1253,7 +1325,7 @@ void DecorateListPromoBox(
 
 		box->setStyle(st::premiumPreviewDoubledLimitsBox);
 		box->widthValue(
-		) | rpl::start_with_next([=](int width) {
+		) | rpl::on_next([=](int width) {
 			const auto &padding
 				= st::premiumPreviewDoubledLimitsBox.buttonPadding;
 			button->resizeToWidth(width
@@ -1401,7 +1473,7 @@ void PremiumUnavailableBox(not_null<Ui::GenericBox*> box) {
 	Ui::ConfirmBox(box, {
 		.text = tr::lng_premium_unavailable(
 			tr::now,
-			Ui::Text::RichLangValue),
+			tr::rich),
 		.inform = true,
 	});
 }
@@ -1420,7 +1492,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_channels(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.channelsDefault(),
 			premium,
 		});
@@ -1432,7 +1504,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_pins(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.dialogsPinnedDefault(),
 			premium,
 		});
@@ -1444,7 +1516,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_links(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.channelsPublicDefault(),
 			premium,
 		});
@@ -1456,7 +1528,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_gifs(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.gifsDefault(),
 			premium,
 		});
@@ -1468,7 +1540,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_stickers(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.stickersFavedDefault(),
 			premium,
 		});
@@ -1478,7 +1550,7 @@ void DoubledLimitsPreviewBox(
 		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_bio(),
 			tr::lng_premium_double_limits_about_bio(
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.aboutLengthDefault(),
 			premium,
 		});
@@ -1488,7 +1560,7 @@ void DoubledLimitsPreviewBox(
 		entries.push_back({
 			tr::lng_premium_double_limits_subtitle_captions(),
 			tr::lng_premium_double_limits_about_captions(
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.captionLengthDefault(),
 			premium,
 		});
@@ -1500,7 +1572,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_folders(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.dialogFiltersDefault(),
 			premium,
 		});
@@ -1512,7 +1584,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_folder_chats(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.dialogFiltersChatsDefault(),
 			premium,
 		});
@@ -1526,7 +1598,7 @@ void DoubledLimitsPreviewBox(
 		tr::lng_premium_double_limits_about_accounts(
 			lt_count,
 			rpl::single(float64(Main::Domain::kPremiumMaxAccounts)),
-			Ui::Text::RichLangValue),
+			tr::rich),
 		Main::Domain::kMaxAccounts,
 		Main::Domain::kPremiumMaxAccounts,
 		till,
@@ -1538,7 +1610,7 @@ void DoubledLimitsPreviewBox(
 			tr::lng_premium_double_limits_about_similar_channels(
 				lt_count,
 				rpl::single(float64(premium)),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			limits.similarChannelsDefault(),
 			premium,
 		});
@@ -1692,7 +1764,7 @@ object_ptr<Ui::GradientButton> CreateUnlockButton(
 	rpl::combine(
 		result->widthValue(),
 		label->widthValue()
-	) | rpl::start_with_next([=](int outer, int width) {
+	) | rpl::on_next([=](int outer, int width) {
 		label->moveToLeft(
 			(outer - width) / 2,
 			st::premiumPreviewBox.button.textTop,

Telegram/SourceFiles/boxes/premium_preview_box.h

@@ -74,6 +74,7 @@ enum class PremiumFeature {
 	FilterTags,
 	TodoLists,
 	PeerColors,
+	Gifts,
 
 	// Business features.
 	BusinessLocation,