From 78a72b42b0a972a22985fd1776ef0d3462257e8c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 5 Jul 2025 20:11:10 +0000
Subject: [PATCH 001/341] Don't stage unused boost-regex shared library in snap

---
 snap/snapcraft.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 16da44ab9c..f7faf8e5ad 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -103,7 +103,6 @@ parts:
       - zlib1g-dev
     stage-packages:
       - libavif16
-      - libboost-regex1.83.0
       - libgeoclue-2-0
       - libgeocode-glib-2-0
       - libglib2.0-0t64

From 7cab32f71ba0f1dbe04d5887acdb57430ed584dd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 25 Jan 2023 20:00:22 +0400
Subject: [PATCH 002/341] Switch snap to the gnome extension

---
 snap/snapcraft.yaml | 214 ++------------------------------------------
 1 file changed, 6 insertions(+), 208 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f7faf8e5ad..ab34a7f2f6 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -9,73 +9,24 @@ compression: lzo
 apps:
   telegram-desktop:
     command: usr/bin/telegram-desktop
-    command-chain:
-      - bin/desktop-launch
     common-id: org.telegram.desktop
     desktop: usr/share/applications/org.telegram.desktop.desktop
     autostart: telegram-desktop_telegram-desktop.desktop
+    extensions: [gnome]
     plugs:
-      - alsa
       - audio-playback
       - audio-record
       - camera
-      - desktop
-      - desktop-legacy
-      - gsettings
       - hardware-observe
       - home
       - network
       - network-bind
       - network-status
-      - opengl
       - removable-media
       - unity7
-      - wayland
-      - x11
     slots:
       - mpris
 
-hooks:
-  configure:
-    command-chain:
-      - bin/hooks-configure-desktop
-    plugs:
-      - desktop
-
-plugs:
-  desktop:
-    mount-host-font-cache: false
-  # Support for common GTK themes
-  # https://forum.snapcraft.io/t/how-to-use-the-system-gtk-theme-via-the-gtk-common-themes-snap/6235
-  gtk-3-themes:
-    interface: content
-    target: $SNAP/data-dir/themes
-    default-provider: gtk-common-themes
-  icon-themes:
-    interface: content
-    target: $SNAP/data-dir/icons
-    default-provider: gtk-common-themes
-  sound-themes:
-    interface: content
-    target: $SNAP/data-dir/sounds
-    default-provider: gtk-common-themes
-
-layout:
-  /usr/share/alsa:
-    bind: $SNAP/usr/share/alsa
-  /usr/share/pipewire:
-    bind: $SNAP/usr/share/pipewire
-  /usr/share/X11:
-    bind: $SNAP/usr/share/X11
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pipewire-0.3
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/spa-0.2
-  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1:
-    bind: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/webkit2gtk-4.1
-
 parts:
   telegram:
     plugin: cmake
@@ -87,40 +38,24 @@ parts:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
       - clang
-      - libtool-bin
-      - python3
       - libavif-dev
       - libboost-regex-dev
-      - libgirepository1.0-dev
-      - libglib2.0-dev
       - libheif-dev
       - libopenal-dev
       - libssl-dev
-      - libxcb1-dev
       - libxcb-keysyms1-dev
       - libxcb-record0-dev
       - libxcb-screensaver0-dev
-      - zlib1g-dev
     stage-packages:
       - libavif16
       - libgeoclue-2-0
-      - libgeocode-glib-2-0
-      - libglib2.0-0t64
-      - libheif1
       - libopenal1
-      - libssl3t64
-      - libwebkit2gtk-4.1-0
-      - libxcb1
-      - libxcb-keysyms1
       - libxcb-record0
       - libxcb-screensaver0
-      - zlib1g
-      - glib-networking
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
     override-pull: |
@@ -172,41 +107,6 @@ parts:
       rm -rf patches
     stage: [-./*]
 
-  desktop-qt:
-    source: https://github.com/desktop-app/snapcraft-desktop-helpers.git
-    source-depth: 1
-    source-subdir: qt
-    plugin: make
-    make-parameters: ["FLAVOR=qt5"]
-    build-environment:
-      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-    build-packages:
-      - build-essential
-      - dpkg-dev
-      - gtk-update-icon-cache
-      - libglib2.0-bin
-      - libgtk-3-0t64
-    stage-packages:
-      - libc-bin
-      - libgdk-pixbuf-2.0-0
-      - libnvidia-egl-wayland1
-      - libxkbcommon0
-      - locales-all
-      - shared-mime-info
-      - xdg-user-dirs
-    override-prime: |
-      craftctl default
-      update-mime-database usr/share/mime
-      glib-compile-schemas usr/share/glib-2.0/schemas
-      for theme in usr/share/icons/*; do
-        if [ -f "$theme/index.theme" ] && [ ! -f "$theme/icon-theme.cache" ]; then
-          update-icon-caches "$theme"
-        fi
-      done
-      GTK_PATH=$PWD/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0 /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgtk-3-0t64/gtk-query-immodules-3.0 > usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gtk-3.0/3.0.0/immodules/immodules.cache
-    after:
-      - telegram
-
   ada:
     source: https://github.com/ada-url/ada.git
     source-depth: 1
@@ -242,8 +142,6 @@ parts:
       - libavutil58
       - libswresample4
       - libswscale7
-      - va-driver-all
-      - vdpau-driver-all
     override-build: |
       craftctl default
       mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
@@ -258,6 +156,8 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+    build-packages:
+      - libhwy-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -274,9 +174,9 @@ parts:
       - -DJPEGXL_ENABLE_SJPEG=OFF
       - -DJPEGXL_ENABLE_OPENEXR=OFF
       - -DJPEGXL_ENABLE_SKCMS=OFF
-    stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libbrotli*
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libhwy*
+      - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+      - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+      - -DJPEGXL_FORCE_SYSTEM_HWY=ON
     prime:
       - -./usr/bin
       - -./usr/include
@@ -293,10 +193,6 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - zlib1g-dev
-    stage-packages:
-      - zlib1g
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -325,93 +221,30 @@ parts:
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
-      - libdbus-1-dev
-      - libegl-dev
-      - libfontconfig1-dev
-      - libfreetype-dev
-      - libglib2.0-dev
-      - libglx-dev
-      - libgtk-3-dev
-      - libharfbuzz-dev
-      - libice-dev
-      - libicu-dev
-      - liblcms2-dev
-      - libopengl-dev
-      - libpcre2-dev
-      - libpng-dev
-      - libsm-dev
       - libssl-dev
-      - libvulkan-dev
-      - libwayland-dev
-      - libx11-dev
-      - libx11-xcb-dev
-      - libxcb1-dev
       - libxcb-cursor-dev
       - libxcb-glx0-dev
       - libxcb-icccm4-dev
       - libxcb-image0-dev
       - libxcb-keysyms1-dev
       - libxcb-randr0-dev
-      - libxcb-render0-dev
       - libxcb-render-util0-dev
       - libxcb-shape0-dev
-      - libxcb-shm0-dev
       - libxcb-sync-dev
       - libxcb-util-dev
       - libxcb-xfixes0-dev
       - libxcb-xkb-dev
-      - libxkbcommon-dev
       - libxkbcommon-x11-dev
-      - zlib1g-dev
     stage-packages:
-      - libdbus-1-3
-      - libegl1
-      - libfontconfig1
-      - libfreetype6
-      - libglib2.0-0t64
-      - libglx0
-      - libgtk-3-0t64
-      - libharfbuzz0b
-      - libice6
-      - libicu74
-      - liblcms2-2
-      - libopengl0
-      - libpcre2-16-0
-      - libpng16-16t64
-      - libsm6
-      - libssl3t64
-      - libvulkan1
-      - libwayland-client0
-      - libwayland-cursor0
-      - libwayland-egl1
-      - libwayland-server0
-      - libx11-6
-      - libx11-xcb1
-      - libxcb1
       - libxcb-cursor0
       - libxcb-glx0
-      - libxcb-icccm4
-      - libxcb-image0
-      - libxcb-keysyms1
       - libxcb-randr0
-      - libxcb-render0
-      - libxcb-render-util0
-      - libxcb-shape0
-      - libxcb-shm0
       - libxcb-sync1
-      - libxcb-util1
       - libxcb-xfixes0
-      - libxcb-xkb1
-      - libxkbcommon0
-      - libxkbcommon-x11-0
-      - zlib1g
-      - mesa-vulkan-drivers
-      - xkb-data
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
       - -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
       - -DINPUT_openssl=linked
     override-pull: |
@@ -479,10 +312,6 @@ parts:
     build-packages:
       - gperf
       - libssl-dev
-      - zlib1g-dev
-    stage-packages:
-      - libssl3t64
-      - zlib1g
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -503,48 +332,17 @@ parts:
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     build-packages:
-      - libdrm-dev
-      - libegl-dev
-      - libgbm-dev
-      - libgl-dev
-      - libglib2.0-dev
       - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
       - libssl-dev
       - libvpx-dev
-      - libx11-dev
-      - libxcomposite-dev
-      - libxdamage-dev
-      - libxext-dev
-      - libxfixes-dev
-      - libxrender-dev
-      - libxrandr-dev
-      - libxtst-dev
     stage-packages:
-      - libdrm2
-      - libegl1
-      - libgbm1
-      - libgl1
-      - libglib2.0-0t64
       - libopenh264-7
-      - libopus0
-      - libssl3t64
-      - libvpx9
-      - libx11-6
-      - libxcomposite1
-      - libxdamage1
-      - libxext6
-      - libxfixes3
-      - libxrender1
-      - libxrandr2
-      - libxtst6
-      - pipewire
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr
     prime:
       - -./usr/include
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake

From 3d6783597fdfc2f7a13045a026d550275cf133af Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 20 Feb 2025 05:24:42 +0400
Subject: [PATCH 003/341] Optimize geoclue dependency in snap

It depends on entire daemon and brings unneeded dependencies that make the package way bigger
---
 snap/snapcraft.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ab34a7f2f6..374ea77a75 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -48,7 +48,6 @@ parts:
       - libxcb-screensaver0-dev
     stage-packages:
       - libavif16
-      - libgeoclue-2-0
       - libopenal1
       - libxcb-record0
       - libxcb-screensaver0
@@ -88,6 +87,7 @@ parts:
     after:
       - ada
       - ffmpeg
+      - geoclue
       - libjxl
       - protobuf
       - qt
@@ -149,6 +149,13 @@ parts:
       mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
       rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
 
+  geoclue:
+    plugin: nil
+    stage-packages:
+      - libgeoclue-2-0
+    stage:
+      - ./usr/lib/x86_64-linux-gnu/libgeoclue-2.so*
+
   libjxl:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1

From ef2e9406c74a7d509f10371de680d4da8633b872 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Jul 2025 12:10:33 +0000
Subject: [PATCH 004/341] Move packages to a separate snap part

---
 snap/snapcraft.yaml | 97 ++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 374ea77a75..292c175cd5 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -36,21 +36,6 @@ parts:
     build-environment:
       - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - clang
-      - libavif-dev
-      - libboost-regex-dev
-      - libheif-dev
-      - libopenal-dev
-      - libssl-dev
-      - libxcb-keysyms1-dev
-      - libxcb-record0-dev
-      - libxcb-screensaver0-dev
-    stage-packages:
-      - libavif16
-      - libopenal1
-      - libxcb-record0
-      - libxcb-screensaver0
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -95,6 +80,48 @@ parts:
       - tde2e
       - webrtc
 
+  pkgs:
+    plugin: nil
+    build-packages:
+      - clang
+      - gperf
+      - libavif-dev
+      - libboost-regex-dev
+      - libheif-dev
+      - libhwy-dev
+      - libopenal-dev
+      - libopenh264-dev
+      - libopus-dev
+      - libpipewire-0.3-dev
+      - libssl-dev
+      - libvpx-dev
+      - libxcb-cursor-dev
+      - libxcb-glx0-dev
+      - libxcb-icccm4-dev
+      - libxcb-image0-dev
+      - libxcb-keysyms1-dev
+      - libxcb-randr0-dev
+      - libxcb-record0-dev
+      - libxcb-render-util0-dev
+      - libxcb-screensaver0-dev
+      - libxcb-shape0-dev
+      - libxcb-sync-dev
+      - libxcb-util-dev
+      - libxcb-xfixes0-dev
+      - libxcb-xkb-dev
+      - libxkbcommon-x11-dev
+    stage-packages:
+      - libavif16
+      - libopenal1
+      - libopenh264-7
+      - libxcb-cursor0
+      - libxcb-glx0
+      - libxcb-randr0
+      - libxcb-record0
+      - libxcb-screensaver0
+      - libxcb-sync1
+      - libxcb-xfixes0
+
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
@@ -163,8 +190,6 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - libhwy-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -212,6 +237,8 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
+    after:
+      - pkgs
 
   qt:
     source: https://github.com/qt/qt5.git
@@ -227,27 +254,6 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - libssl-dev
-      - libxcb-cursor-dev
-      - libxcb-glx0-dev
-      - libxcb-icccm4-dev
-      - libxcb-image0-dev
-      - libxcb-keysyms1-dev
-      - libxcb-randr0-dev
-      - libxcb-render-util0-dev
-      - libxcb-shape0-dev
-      - libxcb-sync-dev
-      - libxcb-util-dev
-      - libxcb-xfixes0-dev
-      - libxcb-xkb-dev
-      - libxkbcommon-x11-dev
-    stage-packages:
-      - libxcb-cursor0
-      - libxcb-glx0
-      - libxcb-randr0
-      - libxcb-sync1
-      - libxcb-xfixes0
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -281,6 +287,7 @@ parts:
     after:
       - libjxl
       - patches
+      - pkgs
 
   rnnoise:
     source: https://gitlab.xiph.org/xiph/rnnoise.git
@@ -316,9 +323,6 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - gperf
-      - libssl-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -330,6 +334,8 @@ parts:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
+    after:
+      - pkgs
 
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
@@ -338,14 +344,6 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
-    build-packages:
-      - libopenh264-dev
-      - libopus-dev
-      - libpipewire-0.3-dev
-      - libssl-dev
-      - libvpx-dev
-    stage-packages:
-      - libopenh264-7
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -357,3 +355,4 @@ parts:
     after:
       - ffmpeg
       - libjxl
+      - pkgs

From 60f91bff505b21e0b77d0adfe2671d7efb698aa3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Jul 2025 12:12:47 +0000
Subject: [PATCH 005/341] Stop priming static libs completely in snap

---
 snap/snapcraft.yaml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 292c175cd5..7d71a90f63 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -148,10 +148,7 @@ parts:
       - -DADA_TESTING=OFF
       - -DADA_TOOLS=OFF
       - -DADA_INCLUDE_URL_PATTERN=OFF
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
+    prime: [-./*]
 
   ffmpeg:
     plugin: nil
@@ -329,11 +326,7 @@ parts:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
       - -DTD_E2E_ONLY=ON
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
+    prime: [-./*]
     after:
       - pkgs
 
@@ -348,10 +341,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
+    prime: [-./*]
     after:
       - ffmpeg
       - libjxl

From ba1274ff3ada908b257fce61c697baffa040a1af Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 4 Jul 2025 12:21:42 +0000
Subject: [PATCH 006/341] Build all deps statically in snap for lesser package
 size

---
 snap/snapcraft.yaml | 57 ++++++++++++++-------------------------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7d71a90f63..9132fb7eec 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -35,7 +35,7 @@ parts:
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
       - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -191,6 +191,7 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DBUILD_SHARED_LIBS=OFF
       - -DBUILD_TESTING=OFF
       - -DJPEGXL_ENABLE_DEVTOOLS=OFF
       - -DJPEGXL_ENABLE_TOOLS=OFF
@@ -206,14 +207,13 @@ parts:
       - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
       - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
       - -DJPEGXL_FORCE_SYSTEM_HWY=ON
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/share
+    override-build: |
+      craftctl default
+      cp lib/libjpegli-static.a "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
+      ar rcs "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a lib/CMakeFiles/jpegli-libjpeg-obj.dir/jpegli/libjpeg_wrapper.cc.o
+    stage:
+      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so*
+    prime: [-./*]
 
   protobuf:
     source: https://github.com/protocolbuffers/protobuf.git
@@ -226,14 +226,8 @@ parts:
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - -DBUILD_SHARED_LIBS=ON
       - -Dprotobuf_BUILD_TESTS=OFF
-    prime:
-      - -./usr/bin
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
+    prime: [-./*]
     after:
       - pkgs
 
@@ -250,12 +244,15 @@ parts:
       - qtwayland
     plugin: cmake
     build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - -DBUILD_SHARED_LIBS=OFF
+      - -DQT_QPA_PLATFORMS="wayland;xcb"
+      - -DFEATURE_eglfs=OFF
       - -DINPUT_openssl=linked
     override-pull: |
       craftctl default
@@ -265,22 +262,7 @@ parts:
       cd ../qtwayland
       find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply
       cd ..
-    prime:
-      - -./usr/bin
-      - -./usr/doc
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/cmake
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.a
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/libexec
-      - -./usr/metatypes
-      - -./usr/mkspecs
-      - -./usr/modules
-      - -./usr/sbom
-      - -./**/objects-*
+    prime: [-./*]
     after:
       - libjxl
       - patches
@@ -296,15 +278,10 @@ parts:
     autotools-configure-parameters:
       - --prefix=/usr
       - --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
-      - --disable-static
+      - --disable-shared
       - --disable-examples
       - --disable-doc
-    prime:
-      - -./usr/include
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/pkgconfig
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.so
-      - -./usr/share
+    prime: [-./*]
 
   systemd:
     plugin: nil

From 90edb0903d9944827ec7f71071cebcc465073f83 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 6 Jul 2025 00:54:00 +0000
Subject: [PATCH 007/341] Use only jpegli from self-built libjxl in snap

---
 snap/snapcraft.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 9132fb7eec..90ac781f16 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -73,7 +73,7 @@ parts:
       - ada
       - ffmpeg
       - geoclue
-      - libjxl
+      - jpegli
       - protobuf
       - qt
       - rnnoise
@@ -89,6 +89,7 @@ parts:
       - libboost-regex-dev
       - libheif-dev
       - libhwy-dev
+      - libjxl-dev
       - libopenal-dev
       - libopenh264-dev
       - libopus-dev
@@ -180,7 +181,7 @@ parts:
     stage:
       - ./usr/lib/x86_64-linux-gnu/libgeoclue-2.so*
 
-  libjxl:
+  jpegli:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
     source-tag: v0.11.1
@@ -212,7 +213,10 @@ parts:
       cp lib/libjpegli-static.a "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
       ar rcs "$CRAFT_PART_INSTALL"/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a lib/CMakeFiles/jpegli-libjpeg-obj.dir/jpegli/libjpeg_wrapper.cc.o
     stage:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.so*
+      - ./usr/include/jconfig.h
+      - ./usr/include/jmorecfg.h
+      - ./usr/include/jpeglib.h
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
     prime: [-./*]
 
   protobuf:
@@ -264,7 +268,7 @@ parts:
       cd ..
     prime: [-./*]
     after:
-      - libjxl
+      - jpegli
       - patches
       - pkgs
 
@@ -321,5 +325,5 @@ parts:
     prime: [-./*]
     after:
       - ffmpeg
-      - libjxl
+      - jpegli
       - pkgs

From a6a8363527d5853612e56b18841aed71f9ddb44a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 20 Feb 2025 03:15:54 +0400
Subject: [PATCH 008/341] Self-build ffmpeg in snap for lesser package size

---
 snap/snapcraft.yaml | 184 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 162 insertions(+), 22 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 90ac781f16..8073f1adf5 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -39,7 +39,7 @@ parts:
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_INSTALL_PREFIX=/
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
     override-pull: |
@@ -85,8 +85,10 @@ parts:
     build-packages:
       - clang
       - gperf
+      - nasm
       - libavif-dev
       - libboost-regex-dev
+      - libdav1d-dev
       - libheif-dev
       - libhwy-dev
       - libjxl-dev
@@ -95,6 +97,7 @@ parts:
       - libopus-dev
       - libpipewire-0.3-dev
       - libssl-dev
+      - libvdpau-dev
       - libvpx-dev
       - libxcb-cursor-dev
       - libxcb-glx0-dev
@@ -111,6 +114,7 @@ parts:
       - libxcb-xfixes0-dev
       - libxcb-xkb-dev
       - libxkbcommon-x11-dev
+      - libxv-dev
     stage-packages:
       - libavif16
       - libopenal1
@@ -152,27 +156,153 @@ parts:
     prime: [-./*]
 
   ffmpeg:
-    plugin: nil
-    build-packages:
-      - libavcodec-dev
-      - libavfilter-dev
-      - libavformat-dev
-      - libavutil-dev
-      - libswresample-dev
-      - libswscale-dev
-    stage-packages:
-      - libavcodec60
-      - libavfilter9
-      - libavformat60
-      - libavutil58
-      - libswresample4
-      - libswscale7
-    override-build: |
-      craftctl default
-      mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
-      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/blas"
-      mv "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack/"* "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR"
-      rmdir "$CRAFT_PART_INSTALL/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/lapack"
+    source: https://github.com/FFmpeg/FFmpeg.git
+    source-depth: 1
+    source-branch: n6.1.1
+    plugin: autotools
+    build-environment:
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+    autotools-configure-parameters:
+      - --prefix=/usr
+      - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+      - --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
+      - --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
+      - --disable-debug
+      - --disable-programs
+      - --disable-doc
+      - --disable-network
+      - --disable-autodetect
+      - --disable-everything
+      - --enable-libdav1d
+      - --enable-libopenh264
+      - --enable-libopus
+      - --enable-libvpx
+      - --enable-vaapi
+      - --enable-vdpau
+      - --enable-xlib
+      - --enable-libdrm
+      - --enable-ffnvcodec
+      - --enable-nvdec
+      - --enable-cuvid
+      - --enable-protocol=file
+      - --enable-hwaccel=av1_vaapi
+      - --enable-hwaccel=av1_nvdec
+      - --enable-hwaccel=h264_vaapi
+      - --enable-hwaccel=h264_vdpau
+      - --enable-hwaccel=h264_nvdec
+      - --enable-hwaccel=hevc_vaapi
+      - --enable-hwaccel=hevc_vdpau
+      - --enable-hwaccel=hevc_nvdec
+      - --enable-hwaccel=mpeg2_vaapi
+      - --enable-hwaccel=mpeg2_vdpau
+      - --enable-hwaccel=mpeg2_nvdec
+      - --enable-hwaccel=mpeg4_vaapi
+      - --enable-hwaccel=mpeg4_vdpau
+      - --enable-hwaccel=mpeg4_nvdec
+      - --enable-hwaccel=vp8_vaapi
+      - --enable-hwaccel=vp8_nvdec
+      - --enable-decoder=aac
+      - --enable-decoder=aac_fixed
+      - --enable-decoder=aac_latm
+      - --enable-decoder=aasc
+      - --enable-decoder=ac3
+      - --enable-decoder=alac
+      - --enable-decoder=av1
+      - --enable-decoder=av1_cuvid
+      - --enable-decoder=eac3
+      - --enable-decoder=flac
+      - --enable-decoder=gif
+      - --enable-decoder=h264
+      - --enable-decoder=hevc
+      - --enable-decoder=libdav1d
+      - --enable-decoder=libvpx_vp8
+      - --enable-decoder=libvpx_vp9
+      - --enable-decoder=mp1
+      - --enable-decoder=mp1float
+      - --enable-decoder=mp2
+      - --enable-decoder=mp2float
+      - --enable-decoder=mp3
+      - --enable-decoder=mp3adu
+      - --enable-decoder=mp3adufloat
+      - --enable-decoder=mp3float
+      - --enable-decoder=mp3on4
+      - --enable-decoder=mp3on4float
+      - --enable-decoder=mpeg4
+      - --enable-decoder=msmpeg4v2
+      - --enable-decoder=msmpeg4v3
+      - --enable-decoder=opus
+      - --enable-decoder=pcm_alaw
+      - --enable-decoder=pcm_f32be
+      - --enable-decoder=pcm_f32le
+      - --enable-decoder=pcm_f64be
+      - --enable-decoder=pcm_f64le
+      - --enable-decoder=pcm_lxf
+      - --enable-decoder=pcm_mulaw
+      - --enable-decoder=pcm_s16be
+      - --enable-decoder=pcm_s16be_planar
+      - --enable-decoder=pcm_s16le
+      - --enable-decoder=pcm_s16le_planar
+      - --enable-decoder=pcm_s24be
+      - --enable-decoder=pcm_s24daud
+      - --enable-decoder=pcm_s24le
+      - --enable-decoder=pcm_s24le_planar
+      - --enable-decoder=pcm_s32be
+      - --enable-decoder=pcm_s32le
+      - --enable-decoder=pcm_s32le_planar
+      - --enable-decoder=pcm_s64be
+      - --enable-decoder=pcm_s64le
+      - --enable-decoder=pcm_s8
+      - --enable-decoder=pcm_s8_planar
+      - --enable-decoder=pcm_u16be
+      - --enable-decoder=pcm_u16le
+      - --enable-decoder=pcm_u24be
+      - --enable-decoder=pcm_u24le
+      - --enable-decoder=pcm_u32be
+      - --enable-decoder=pcm_u32le
+      - --enable-decoder=pcm_u8
+      - --enable-decoder=pcm_zork
+      - --enable-decoder=vorbis
+      - --enable-decoder=vp8
+      - --enable-decoder=wavpack
+      - --enable-decoder=wmalossless
+      - --enable-decoder=wmapro
+      - --enable-decoder=wmav1
+      - --enable-decoder=wmav2
+      - --enable-decoder=wmavoice
+      - --enable-encoder=aac
+      - --enable-encoder=libopenh264
+      - --enable-encoder=libopus
+      - --enable-encoder=pcm_s16le
+      - --enable-filter=atempo
+      - --enable-parser=aac
+      - --enable-parser=aac_latm
+      - --enable-parser=flac
+      - --enable-parser=gif
+      - --enable-parser=h264
+      - --enable-parser=hevc
+      - --enable-parser=mpeg4video
+      - --enable-parser=mpegaudio
+      - --enable-parser=opus
+      - --enable-parser=vorbis
+      - --enable-demuxer=aac
+      - --enable-demuxer=flac
+      - --enable-demuxer=gif
+      - --enable-demuxer=h264
+      - --enable-demuxer=hevc
+      - --enable-demuxer=matroska
+      - --enable-demuxer=m4v
+      - --enable-demuxer=mov
+      - --enable-demuxer=mp3
+      - --enable-demuxer=ogg
+      - --enable-demuxer=wav
+      - --enable-muxer=mp4
+      - --enable-muxer=ogg
+      - --enable-muxer=opus
+      - --enable-muxer=wav
+    prime: [-./*]
+    after:
+      - nv-codec-headers
+      - pkgs
 
   geoclue:
     plugin: nil
@@ -219,6 +349,16 @@ parts:
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
     prime: [-./*]
 
+  nv-codec-headers:
+    source: https://github.com/FFmpeg/nv-codec-headers.git
+    source-depth: 1
+    source-branch: n12.1.14.0
+    plugin: make
+    make-parameters:
+      - PREFIX=/usr
+      - LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
+    prime: [-./*]
+
   protobuf:
     source: https://github.com/protocolbuffers/protobuf.git
     source-depth: 1

From 18ab93a9f6e6ce2cde3127106af6baff6db02224 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 5 Jul 2025 13:26:21 +0000
Subject: [PATCH 009/341] Self-build openal in snap for lesser package size

---
 snap/snapcraft.yaml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8073f1adf5..d7117127a1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -74,6 +74,7 @@ parts:
       - ffmpeg
       - geoclue
       - jpegli
+      - openal
       - protobuf
       - qt
       - rnnoise
@@ -92,7 +93,6 @@ parts:
       - libheif-dev
       - libhwy-dev
       - libjxl-dev
-      - libopenal-dev
       - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
@@ -117,7 +117,6 @@ parts:
       - libxv-dev
     stage-packages:
       - libavif16
-      - libopenal1
       - libopenh264-7
       - libxcb-cursor0
       - libxcb-glx0
@@ -348,6 +347,29 @@ parts:
       - ./usr/include/jpeglib.h
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
     prime: [-./*]
+    after:
+      - pkgs
+
+  openal:
+    source: https://github.com/kcat/openal-soft.git
+    source-depth: 1
+    source-tag: 1.24.3
+    plugin: cmake
+    build-environment:
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DLIBTYPE=STATIC
+      - -DALSOFT_DLOPEN=OFF
+      - -DALSOFT_EXAMPLES=OFF
+      - -DALSOFT_UTILS=OFF
+      - -DALSOFT_INSTALL_CONFIG=OFF
+      - -DALSOFT_BACKEND_PIPEWIRE=OFF
+    prime: [-./*]
+    after:
+      - pkgs
 
   nv-codec-headers:
     source: https://github.com/FFmpeg/nv-codec-headers.git

From 918985449bd396fb87a560f90312d665dc457df0 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 5 Jul 2025 13:41:07 +0000
Subject: [PATCH 010/341] Self-build avif in snap for lesser package size

---
 snap/snapcraft.yaml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d7117127a1..e978294f39 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -35,7 +35,7 @@ parts:
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
       - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-ldav1d,-lhwy,-pop-state -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -71,6 +71,7 @@ parts:
       done
     after:
       - ada
+      - avif
       - ffmpeg
       - geoclue
       - jpegli
@@ -87,7 +88,6 @@ parts:
       - clang
       - gperf
       - nasm
-      - libavif-dev
       - libboost-regex-dev
       - libdav1d-dev
       - libheif-dev
@@ -116,7 +116,6 @@ parts:
       - libxkbcommon-x11-dev
       - libxv-dev
     stage-packages:
-      - libavif16
       - libopenh264-7
       - libxcb-cursor0
       - libxcb-glx0
@@ -154,6 +153,24 @@ parts:
       - -DADA_INCLUDE_URL_PATTERN=OFF
     prime: [-./*]
 
+  avif:
+    source: https://github.com/AOMediaCodec/libavif.git
+    source-depth: 1
+    source-tag: v1.3.0
+    plugin: cmake
+    build-environment:
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
+    cmake-generator: Ninja
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DBUILD_SHARED_LIBS=OFF
+      - -DAVIF_CODEC_DAV1D=SYSTEM
+      - -DAVIF_LIBYUV=OFF
+    prime: [-./*]
+    after:
+      - pkgs
+
   ffmpeg:
     source: https://github.com/FFmpeg/FFmpeg.git
     source-depth: 1

From ea89a9f70608a5e205cf6558734674b54273db48 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 15 Jul 2025 21:07:09 +0000
Subject: [PATCH 011/341] Free more disk space in snap action

---
 .github/workflows/snap.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 6e70726588..ffdc0eabba 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -61,7 +61,16 @@ jobs:
           sudo lxd waitready
 
       - name: Free up some disk space.
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
+        uses: endersonmenezes/free-disk-space@4cae28d0d8e716a770938d92630f23db5184f61f
+        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"
 
       - name: Telegram Desktop snap build.
         run: sudo -u $USER snap run snapcraft --verbosity=debug

From 669f46d6a152e97379798621d2e1df4d850d7a5f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 17 Jul 2025 18:03:12 +0000
Subject: [PATCH 012/341] Try to fix snap build on armhf

---
 snap/snapcraft.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index e978294f39..847eaf956d 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -315,6 +315,9 @@ parts:
       - --enable-muxer=ogg
       - --enable-muxer=opus
       - --enable-muxer=wav
+    override-pull: |
+      craftctl default
+      sed -i 's/disable ffnvcodec cuvid nvdec nvenc/:/g' configure
     prime: [-./*]
     after:
       - nv-codec-headers

From 4c20e79d1fb70349bce5f40e75e103e5503062c6 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 17 Jul 2025 18:37:41 +0000
Subject: [PATCH 013/341] Update rnnoise to 0.2 in snap

---
 snap/snapcraft.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 847eaf956d..81829a95e0 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -88,6 +88,7 @@ parts:
       - clang
       - gperf
       - nasm
+      - wget
       - libboost-regex-dev
       - libdav1d-dev
       - libheif-dev
@@ -455,9 +456,9 @@ parts:
       - pkgs
 
   rnnoise:
-    source: https://gitlab.xiph.org/xiph/rnnoise.git
+    source: https://github.com/xiph/rnnoise.git
     source-depth: 1
-    source-commit: 7f449bf8bd3b933891d12c30112268c4090e4d59
+    source-tag: v0.2
     plugin: autotools
     build-environment:
       - CFLAGS: -O2 -s
@@ -467,7 +468,12 @@ parts:
       - --disable-shared
       - --disable-examples
       - --disable-doc
+    override-pull: |
+      craftctl default
+      sed -i 's/os_support.h/common.h/g;s/OPUS_CLEAR/RNN_CLEAR/g' src/vec{,_neon}.h
     prime: [-./*]
+    after:
+      - pkgs
 
   systemd:
     plugin: nil

From 1c35a91d13b8097e654b35dd4ac23768ef715bcf Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 17 Jul 2025 23:04:12 +0000
Subject: [PATCH 014/341] Remove -s where unneeded in snap

This has no sense with static libraries
---
 snap/snapcraft.yaml | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 81829a95e0..afc1a67576 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -143,8 +143,6 @@ parts:
     source-depth: 1
     source-tag: v3.2.4
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -159,8 +157,6 @@ parts:
     source-depth: 1
     source-tag: v1.3.0
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -177,8 +173,6 @@ parts:
     source-depth: 1
     source-branch: n6.1.1
     plugin: autotools
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     autotools-configure-parameters:
       - --prefix=/usr
       - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
@@ -336,8 +330,6 @@ parts:
     source-depth: 1
     source-tag: v0.11.1
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -376,8 +368,6 @@ parts:
     source-depth: 1
     source-tag: 1.24.3
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -407,8 +397,6 @@ parts:
     source-depth: 1
     source-tag: v30.2
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -431,7 +419,7 @@ parts:
       - qtwayland
     plugin: cmake
     build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -460,8 +448,6 @@ parts:
     source-depth: 1
     source-tag: v0.2
     plugin: autotools
-    build-environment:
-      - CFLAGS: -O2 -s
     autotools-configure-parameters:
       - --prefix=/usr
       - --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
@@ -487,8 +473,6 @@ parts:
     source-depth: 1
     source-commit: 51743dfd01dff6179e2d8f7095729caa4e2222e9
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -504,8 +488,6 @@ parts:
     source-depth: 1
     source-commit: 62321fd7128ab2650b459d4195781af8185e46b5
     plugin: cmake
-    build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release

From e070af31638acf77ac651cc56a5fd98eecf4d572 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 20 Jul 2025 14:24:32 +0000
Subject: [PATCH 015/341] Limit malloc_trim to once per second

---
 .../platform/linux/integration_linux.cpp            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index f36bfb6326..1a5e3b6903 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -176,7 +176,18 @@ LinuxIntegration::LinuxIntegration()
 	QObject::connect(
 		QCoreApplication::eventDispatcher(),
 		&QAbstractEventDispatcher::aboutToBlock,
-		[] { malloc_trim(0); });
+		[] {
+			static auto timer = [] {
+				QElapsedTimer timer;
+				timer.start();
+				return timer;
+			}();
+
+			if (timer.hasExpired(1000)) {
+				malloc_trim(0);
+				timer.start();
+			}
+		});
 #endif // __GLIBC__
 }
 

From 4c049d0d756585d7f5ce994f18cc1275fad130c3 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 22 Jul 2025 07:57:10 +0000
Subject: [PATCH 016/341] Use Windows SDK version specified in build
 instruction

---
 .github/workflows/win.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 8964ebac77..8d7a603b71 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -4,6 +4,7 @@ on:
   push:
     paths-ignore:
       - 'docs/**'
+      - '!docs/building-win*.md'
       - '**.md'
       - 'changelog.txt'
       - 'LEGAL'
@@ -22,6 +23,7 @@ on:
   pull_request:
     paths-ignore:
       - 'docs/**'
+      - '!docs/building-win*.md'
       - '**.md'
       - 'changelog.txt'
       - 'LEGAL'
@@ -69,26 +71,34 @@ jobs:
         shell: bash
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
-      - uses: ilammy/msvc-dev-cmd@v1.13.0
-        name: Native Tools Command Prompt.
-        with:
-          arch: ${{ matrix.arch }}
-
       - name: Clone.
         uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}
 
-      - name: Set up environment paths.
+      - name: First set up.
         shell: bash
         run: |
-          echo "CACHE_KEY=$(sha256sum $TBUILD/$REPO_NAME/$PREPARE_PATH | awk '{ print $1 }')" >> $GITHUB_ENV
+          DOCPATH=$TBUILD/$REPO_NAME/docs/building-win.md
+          [ "${{ matrix.arch }}" != Win32 ] && DOCPATH=$TBUILD/$REPO_NAME/docs/building-win-${{ matrix.arch }}.md
+          SDK="$(grep "SDK version" $DOCPATH | sed -r 's/.*\*\*(.*)\*\* SDK version.*/\1/')"
+          echo "SDK=$SDK" >> $GITHUB_ENV
+
+          echo "$(sha256sum $TBUILD/$REPO_NAME/$PREPARE_PATH | awk '{ print $1 }')" >> CACHE_KEY.txt
+          echo "$SDK" >> CACHE_KEY.txt
+          echo "CACHE_KEY=$(sha256sum CACHE_KEY.txt | awk '{ print $1 }')" >> $GITHUB_ENV
 
           echo "Configurate git for cherry-picks."
           git config --global user.email "you@example.com"
           git config --global user.name "Sample"
 
+      - uses: ilammy/msvc-dev-cmd@v1.13.0
+        name: Native Tools Command Prompt.
+        with:
+          arch: ${{ matrix.arch }}
+          sdk: ${{ env.SDK }}
+
       - name: NuGet sources.
         run: |
           nuget sources Disable -Name "Microsoft Visual Studio Offline Packages"

From 3882690ee1d528655919286516245a2961a0c6a8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 10:54:06 +0300
Subject: [PATCH 017/341] Removed transcribe button from voice and round
 messages in admin log.

---
 .../SourceFiles/history/view/media/history_view_document.cpp     | 1 +
 Telegram/SourceFiles/history/view/media/history_view_gif.cpp     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index bfaddd394a..2f0030cdec 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -420,6 +420,7 @@ QSize Document::countOptimalSize() {
 		const auto transcribes = &session->api().transcribes();
 		if (_parent->data()->media()->ttlSeconds()
 			|| _realParent->isScheduled()
+			|| _realParent->isAdminLogEntry()
 			|| (!session->premium()
 				&& !transcribes->freeFor(_realParent)
 				&& !transcribes->trialsSupport())
diff --git a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
index ad561899ef..9e45c231da 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_gif.cpp
@@ -2200,6 +2200,7 @@ void Gif::ensureTranscribeButton() const {
 	if (_data->isVideoMessage()
 		&& !_parent->data()->media()->ttlSeconds()
 		&& !_parent->data()->isScheduled()
+		&& !_parent->data()->isAdminLogEntry()
 		&& (_data->session().premium()
 			|| _data->session().api().transcribes().trialsSupport())) {
 		if (!_transcribe) {

From e6387738ce6f8b91938e59c1f6c2254f80838637 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 13:00:07 +0300
Subject: [PATCH 018/341] Slightly improved style of top bar suggestions.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  1 +
 .../dialogs/dialogs_top_bar_suggestion.cpp    | 56 ++++++++++++-------
 .../ui/dialogs_top_bar_suggestion_content.cpp | 17 ++++--
 .../ui/dialogs_top_bar_suggestion_content.h   |  2 +-
 4 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index b3e2eceea0..219e7a14c9 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -825,6 +825,7 @@ dialogsSponsoredButton: DialogRightButton(dialogRowOpenBot) {
 	margin: margins(0px, 9px, 10px, 0px);
 }
 
+dialogsTopBarLeftPadding: 18px;
 dialogsTopBarSuggestionTitleStyle: TextStyle(defaultTextStyle) {
 	font: font(semibold 12px);
 }
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
index b4f028eb12..90b31e5d67 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
@@ -80,6 +80,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 		struct State {
 			TopBarSuggestionContent *content = nullptr;
 			Ui::SlideWrap<Ui::RpWidget> *wrap = nullptr;
+			rpl::variable<int> leftPadding;
 			rpl::variable<Toggle> desiredWrapToggle;
 			rpl::variable<bool> outerWrapToggle;
 			rpl::lifetime birthdayLifetime;
@@ -92,6 +93,8 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 
 		const auto state = lifetime.make_state<State>();
 		state->outerWrapToggle = rpl::duplicate(outerWrapToggleValue);
+		state->leftPadding = rpl::variable<int>(
+			rpl::single(st::dialogsTopBarLeftPadding));
 		const auto ensureWrap = [=] {
 			if (!state->content) {
 				state->content = Ui::CreateChild<TopBarSuggestionContent>(
@@ -112,6 +115,15 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			}
 		};
 
+		const auto setLeftPaddingRelativeTo = [=](
+				not_null<TopBarSuggestionContent*> content,
+				not_null<Ui::RpWidget*> relativeTo) {
+			content->setLeftPadding(state->leftPadding.value(
+				) | rpl::map([w = relativeTo->width()](int padding) {
+					return w + padding * 2;
+				}));
+		};
+
 		const auto processCurrentSuggestion = [=](auto repeat) -> void {
 			state->birthdayLifetime.destroy();
 			state->premiumLifetime.destroy();
@@ -126,7 +138,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			const auto promo = &session->promoSuggestions();
 			if (const auto custom = promo->custom()) {
 				content->setRightIcon(RightIcon::Close);
-				content->setLeftPadding(0);
+				content->setLeftPadding(state->leftPadding.value());
 				content->setClickedCallback([=] {
 					const auto controller = FindSessionController(parent);
 					UrlClickHandler::Open(
@@ -150,7 +162,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			} else if (session->premiumCanBuy()
 				&& promo->current(kSugPremiumGrace.utf8())) {
 				content->setRightIcon(RightIcon::Close);
-				content->setLeftPadding(0);
+				content->setLeftPadding(state->leftPadding.value());
 				content->setClickedCallback([=] {
 					const auto controller = FindSessionController(parent);
 					UrlClickHandler::Open(
@@ -187,7 +199,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 						return;
 					}
 					content->setRightIcon(RightIcon::Close);
-					content->setLeftPadding(0);
+					content->setLeftPadding(state->leftPadding.value());
 					content->setClickedCallback([=] {
 						const auto controller = FindSessionController(parent);
 						controller->uiShow()->show(Box(
@@ -298,8 +310,6 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 							tr::now,
 							TextWithEntities::Simple);
 					content->setContent(std::move(title), std::move(text));
-					const auto leftPadding
-						= st::defaultDialogRow.padding.left();
 					state->giftsLifetime.destroy();
 					if (!isSingle) {
 						struct UserViews {
@@ -348,11 +358,16 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 									s->inRow,
 									st,
 									3);
-								content->setLeftPadding(leftPadding
-									+ (users.size() * st.size - st.shift));
+								const auto v = int(users.size() * st.size
+									- st.shift);
+								content->setLeftPadding(
+									state->leftPadding.value(
+									) | rpl::map([v](int padding) {
+										return padding * 2 + v;
+									}));
 							}
 							p.drawImage(
-								leftPadding,
+								state->leftPadding.current(),
 								(widget->height()
 									- (s->userpics.height()
 										/ style::DevicePixelRatio())) / 2,
@@ -368,15 +383,17 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 									st::uploadUserpicButton));
 						const auto fake = ptr->get();
 						fake->setAttribute(Qt::WA_TransparentForMouseEvents);
-						content->sizeValue() | rpl::filter_size(
-						) | rpl::start_with_next([=](const QSize &s) {
+						rpl::combine(
+							state->leftPadding.value(),
+							content->sizeValue() | rpl::filter_size()
+						) | rpl::start_with_next([=](int p, const QSize &s) {
 							fake->raise();
 							fake->show();
 							fake->moveToLeft(
-								leftPadding,
+								p,
 								(s.height() - fake->height()) / 2);
 						}, fake->lifetime());
-						content->setLeftPadding(fake->width() + leftPadding);
+						setLeftPaddingRelativeTo(content, fake);
 					}
 
 					state->desiredWrapToggle.force_assign(
@@ -386,7 +403,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			} else if (promo->current(kSugSetBirthday.utf8())
 				&& !Data::IsBirthdayToday(session->user()->birthday())) {
 				content->setRightIcon(RightIcon::Close);
-				content->setLeftPadding(0);
+				content->setLeftPadding(state->leftPadding.value());
 				content->setClickedCallback([=] {
 					const auto controller = FindSessionController(parent);
 					Core::App().openInternalUrl(
@@ -461,7 +478,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				};
 				if (isPremiumAnnual || isPremiumRestore || isPremiumUpgrade) {
 					content->setRightIcon(RightIcon::Arrow);
-					content->setLeftPadding(0);
+					content->setLeftPadding(state->leftPadding.value());
 					const auto api = &session->api().premium();
 					api->statusTextValue() | rpl::start_with_next([=] {
 						for (const auto &o : api->subscriptionOptions()) {
@@ -485,16 +502,17 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 					&controller->window(),
 					Ui::UserpicButton::Role::ChoosePhoto,
 					st::uploadUserpicButton);
-				const auto leftPadding = st::defaultDialogRow.padding.left();
-				content->sizeValue() | rpl::filter_size(
-				) | rpl::start_with_next([=](const QSize &s) {
+				rpl::combine(
+					state->leftPadding.value(),
+					content->sizeValue() | rpl::filter_size()
+				) | rpl::start_with_next([=](int padding, const QSize &s) {
 					upload->raise();
 					upload->show();
 					upload->moveToLeft(
-						leftPadding,
+						padding,
 						(s.height() - upload->height()) / 2);
 				}, content->lifetime());
-				content->setLeftPadding(upload->width() + leftPadding);
+				setLeftPaddingRelativeTo(content, upload);
 				upload->chosenImages() | rpl::start_with_next([=](
 						Ui::UserpicButton::ChosenImage &&chosen) {
 					if (chosen.type == Ui::UserpicButton::ChosenType::Set) {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
index 40d70b2bc2..d6db29a927 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
@@ -66,9 +66,14 @@ void TopBarSuggestionContent::draw(QPainter &p) {
 
 	const auto r = Ui::RpWidget::rect();
 	p.fillRect(r, st::historyPinnedBg);
+	p.fillRect(
+		r.x(),
+		r.y() + r.height() - st::lineWidth,
+		r.width(),
+		st::lineWidth,
+		st::shadowFg);
 	Ui::RippleButton::paintRipple(p, 0, 0);
-	const auto leftPadding = st::defaultDialogRow.padding.left()
-		+ _leftPadding;
+	const auto leftPadding = _leftPadding;
 	const auto rightPadding = 0;
 	const auto topPadding = st::msgReplyPadding.top();
 	const auto availableWidthNoPhoto = r.width()
@@ -189,9 +194,11 @@ void TopBarSuggestionContent::setHideCallback(Fn<void()> hideCallback) {
 	_rightHide->setClickedCallback(std::move(hideCallback));
 }
 
-void TopBarSuggestionContent::setLeftPadding(int value) {
-	_leftPadding = value;
-	update();
+void TopBarSuggestionContent::setLeftPadding(rpl::producer<int> value) {
+	std::move(value) | rpl::start_with_next([=](int padding) {
+		_leftPadding = padding;
+		update();
+	}, lifetime());
 }
 
 const style::TextStyle & TopBarSuggestionContent::contentTitleSt() const {
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
index 8297e37074..50923025e3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
@@ -39,7 +39,7 @@ public:
 
 	void setHideCallback(Fn<void()>);
 	void setRightIcon(RightIcon);
-	void setLeftPadding(int);
+	void setLeftPadding(rpl::producer<int>);
 
 	[[nodiscard]] const style::TextStyle &contentTitleSt() const;
 

From c90c53c878d4b3e8b2188b1e668d43747c409cba Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 12:43:24 +0300
Subject: [PATCH 019/341] Aligned first tab of slider in dialogs widget to main
 menu button.

---
 Telegram/SourceFiles/dialogs/dialogs.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 219e7a14c9..40af906830 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -731,7 +731,7 @@ dialogsTabsScroll: ScrollArea(defaultScrollArea) {
 	barHidden: true;
 }
 dialogsSearchTabs: SettingsSlider(defaultSettingsSlider) {
-	padding: 8px;
+	padding: 9px;
 	height: 33px;
 	barTop: 30px;
 	barSkip: 0px;

From 9149792846be18fd3658403bebf92673716440a7 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 13:00:56 +0300
Subject: [PATCH 020/341] Aligned collapsed rows for folders to main menu
 button.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index 924b7c0f4d..81b5a20269 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -1245,7 +1245,8 @@ void PaintCollapsedRow(
 			+ st::dialogsUnreadFont->ascent;
 		const auto left = context.narrow
 			? ((context.width - st::semiboldFont->width(text)) / 2)
-			: context.st->padding.left();
+			: st::dialogsTopBarLeftPadding;
+			// : context.st->padding.left();
 		p.drawText(left, textBaseline, text);
 	} else {
 		folder->paintUserpic(

From 2a15faf12e9b2affac2a284c56c47da9596d27a0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 15:55:01 +0300
Subject: [PATCH 021/341] Fixed incorrect display of no-chats label in dialogs
 while search mode.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 0961fe2850..2cbe2d23f0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -4083,7 +4083,7 @@ void InnerWidget::refreshEmpty() {
 		_empty->setVisible(_state == WidgetState::Default);
 		if (_emptyList) {
 			_emptyList->setVisible(_state == WidgetState::Default);
-			_empty->setVisible(!_emptyList->isVisible());
+			_empty->setVisible(false);
 		}
 		if (_emptyButton) {
 			_emptyButton->setVisible(_state == WidgetState::Default);

From 15706a7af825aa85b3eb499dc9667418f6b67a8e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 16:02:36 +0300
Subject: [PATCH 022/341] Fixed ability to use PageDown/PageUp in section for
 pinned messages.

---
 .../SourceFiles/history/view/history_view_pinned_section.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
index 446d957617..3330001bc7 100644
--- a/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_pinned_section.cpp
@@ -176,6 +176,11 @@ PinnedWidget::PinnedWidget(
 		onScroll();
 	}, lifetime());
 
+	_inner->scrollKeyEvents(
+	) | rpl::start_with_next([=](not_null<QKeyEvent*> e) {
+		_scroll->keyPressEvent(e);
+	}, lifetime());
+
 	setupClearButton();
 	setupTranslateBar();
 	Window::SetupSwipeBackSection(this, _scroll.get(), _inner);

From 133effef0e9fa11d4e72b95dd2bd95ffc932d0ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 22 Jul 2025 16:36:35 +0300
Subject: [PATCH 023/341] Added sound notification when recording of group call
 is started.

---
 Telegram/Resources/qrc/telegram/sounds.qrc      |   1 +
 .../sounds/group_call_recording_start.mp3       | Bin 0 -> 17616 bytes
 Telegram/SourceFiles/calls/calls_instance.cpp   |   2 ++
 .../calls/group/calls_group_call.cpp            |   4 ++++
 .../SourceFiles/calls/group/calls_group_call.h  |   2 ++
 .../calls/group/calls_group_panel.cpp           |   1 +
 6 files changed, 10 insertions(+)
 create mode 100644 Telegram/Resources/sounds/group_call_recording_start.mp3

diff --git a/Telegram/Resources/qrc/telegram/sounds.qrc b/Telegram/Resources/qrc/telegram/sounds.qrc
index d9f7cf8b5a..1ffc48b052 100644
--- a/Telegram/Resources/qrc/telegram/sounds.qrc
+++ b/Telegram/Resources/qrc/telegram/sounds.qrc
@@ -10,5 +10,6 @@
     <file alias="group_call_connect.mp3">../../sounds/group_call_connect.mp3</file>
     <file alias="group_call_end.mp3">../../sounds/group_call_end.mp3</file>
     <file alias="group_call_allowed.mp3">../../sounds/group_call_allowed.mp3</file>
+    <file alias="group_call_recording_start.mp3">../../sounds/group_call_recording_start.mp3</file>
   </qresource>
 </RCC>
diff --git a/Telegram/Resources/sounds/group_call_recording_start.mp3 b/Telegram/Resources/sounds/group_call_recording_start.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..0060e82c3737b9fefb3d3cc59a240cfdcf458f54
GIT binary patch
literal 17616
zcmdS>WmuF^*9Ht<6AVL2cRRG;(1;*Iw{&-RNeUuEN(xev(%s$N0*cZpB8`9w2!b##
zKKFM&&(H7I`{UimF~@aH?6uZj`&{RaYp=mvr$B-KKgGb&&HnBu_wHT~06=ycz{Vyg
zXJlk&XXoP+6O)lqQ&ZE`H8*!~@bK_>{yZckDk>^5F+Dvux45{ts;Z%(y}hrmZ)9X*
zVtRUdZf<F5ZEbUNb9;M#|LEw)j~~B&ot>SZpI=;DUS3^YUtizc+}>g^ce*T9rPSmE
zcpr&AgAD%HLO~`392Eh8&i>gUMmNau-!J~Zdc|B9-T5CZ0awx(M*=GOj?{<&4x&GS
z4|UGaT=qyd;q*QzfQCbt-T1*DBY}B4S0ZMr01p)G1re`9I+_T3BP_O;sc|E$Y8#e&
zBcuK{@HTIV=sn~_bKs<m2zyipYm`9pA?ZZ#xo8^zD4#ydvS1>*FKkoN7XlCLT;1$L
zhrJTbAAU8ak}Ib$xXmh|0D=dON72=Ju-ps#mJt0h9`c6|)OXvsOLeb|FH%Hy6QIU?
zj6}hD-4<tDFB>EHX{1?wFP=S#B~CRu%2g{;o^Vz&wk7#aOm|-{GR+~ndw2pF^vkq4
z$<xwRXx(}%Q+n>t2lW6e#rMPu>Z`1N&5I<};1f-WWH?b^r#nr|RK{>xv#qkyuaRa%
zKFx6D0K8QE&B(R;#Bk==N59gCqJLbvT7re2!?<mKwow9fTk0x4uf-x+V_%UB*)~_i
z4j0KLr_JXw$W_(E?<LF+efl-B?)YGibpIW9&p~lZ{LZYEJWUr@J#}g8aqiH~!Ql_y
z1w2P9qvcH9$y+;^%17!(UxPw<F5B*3rwo4U1M+KPA-j~Pf0Ug+H63=+Ts-z!=FLeF
zp=qu;KH>ds(et4?;9JzJq)C6XZRu{7^DmD3I}S$8S(bni2~Rxi8|Hco3PHp4%_iL>
zHh|8<^4t+|fSNT#KBx)};V3H|ZO#Kc|12F}WLXPs#_bWjVO47=oX#Wf*Q-&imu8hA
z2Cw09ZEmC@3s_pFM;_ug;l1!N!V&ukJCD#?kv({0Vj=#RsA1&geJtj)kBppO`f~F5
zK&kRoLsh#pq!e@sb-{I#{vq=o*`2V4x~+KUnB%I>&;-dP@`z`izHjv8ZN)waE0$pg
z&itOetuHAYba5K3qqTeaGXt(AT=D6r52>-+yN??};=U_1_=+tdjO(8p<zxLsv{i(4
z&r}W@6l`uDVlbGCX#i$X#5Ht4vRij!DwJ#LkhX8uAN@RR7V;Pm8fuX3AvxmzbQga3
zSO-)lxtyZ-t?FC<M&c_FU3j1L>$hH6mt79(9wpLq-mj194}Vj=UnG8mPr1Uj|G<aV
z?Z|(6KDNj|(dDC#Ow90xbP)xj{trU*p=CKk>8T>}9PizsYtAe?_Ca;8>ENUfzT=`7
zBSF>ALfKWW4);bf_U{cxD>3w}+qnld-d%5IABYY!jkXk9+pj9sJ}S(`ToeHS)|&Dc
z{WzRFhVu;0hI_o<z?_nk9;x`CC)z~(RCSLb2GSQ?n|apn-}?6`FB|Rfht&<33;Xc7
z8jw~T$(8$V<b4WVni?=;--N^-Y&C}upch=avxhCqnkK(jyffwLHZr+=(hwDh<5SV{
zthpDn(;Cs4UG0>X<|HKCFO(o;-0ZSiGAG2g?@@AOv{Jn7Y+Sr;EW%@NPp>U2`E!)_
z#AKqWna4iCYc#{}&f70ijnjTLzf-PO9pt{xsV2OCS9^_@+))fPBXF&VBT^KxmtOyV
zsAN+mS(H9J+%inuGPQD$P(y>pO+E(9v`6)sJAK0n**6Wmi7n^R(4|k>e^G)P&;3^E
zt*F4qy*&_}my@VY(j$C`G*mBEAZ_lAM3pk{)>qzIyV;=1-UfRov$OGBM;B!t;+Pqu
z^<Qi6Y?oADbL#80T4%o2y2u)7u4ru3X;i<dpcT-oFZrMyA>wDR`&{kiTblV+wRlr)
zdzE-+q1w4oL-!-=1pXs4JrI_(!t2PeyfSYw8e$S_$^HLQKQF)T|N8|D0H|fJ#TiaV
z2>4WQOBKcXuu#s=BwcwXi4Ai-1SN#Z?pkQfM5UoCE3XJVx0i_wL&V)2D+eC2@5HY)
z`|Dsct8ASj+Z6qOBuwGd^cXBv@>Dw=WiI($T+DSq+<<AN*ATWSytfArd85XT%^RE*
zKgIb>g~%MSrh^P<@IGk^^$w|8BwyjC*U@wqsXzX#bQ+p`Ua(hD8sw_nq#;Z|jIGn}
z!}6S6KFP8cX``v#!BNoCyHFh-6>h42@Lm;;1^~Dm`<2e1CZMBd%kU^xri27e5wwP0
zsvKzgs<MWj$RLVSmDMSI_U^5(HfI>Qi?X_2Q$<#<v7~Q}iOPnh$v6<@IG3uxZ8Y&!
zOMf<^eN&vSu;AhLPoAywn%>$u=jz?$pYM#nnnq`N7(nb9o&;B!!&dP0j%b8e@}4}K
z#b%#>aj}cpu#lQmJd2PhvI;D#v%5~QZM18i^SdzM(=D&m$|r68-F7#cJ<Okz-${Y>
z|LL3ZM0u+B63I-S7sjY`C8ewymr%l;4av4TA~Tz6u$%v0=f1wE+7|I}D8$2`pjD1B
z7Qx=0LTD<9sX8k*=?5^2P}E{>sYX8AZ(FdEW@1K9f-zU|L!J<ItsG^gR8?NkKygi~
zZg9Elvke{;+9#cP_MCD806_jW`F)zMs?6ksDd_|%_#yo<YC;ZJPyrPSX<k*q)nQOZ
z{p)vc{40&|pXZ7O3J*|WD?IA0KNnd}TctgXf6#-CdKs@NW~h5;)Kv0fN#8RH5|NgN
zjE&Cr30!%J%+I#ctA0vZc<6q~!?WLD@4iGP_(4YlNG4Bd+#YJ)X9}MroBk^2WY{;J
z`f?b`35N7eHb5(J?-9KH#ZUB{YxNbc@Kw|PCdxe}r1nuLBlD<@*0^`(Y>lQ6@AmgH
zk6vqfd#Q5cOY=JFQp|M|lo61%w$ON-ne-zDPwB!-&5S(Sk>CB9%79AMuG)NVy031;
z(xLxWlZH?Ep_NW|4n+zEvza+|R3Za{rZcIm*J|YHbYs@L1L?#bNjrQW6G}^(Jwgc~
z_VQ<&bd7RSwJK3PIO(~%ifc~G4Z0Q~Ktb@qF?cW(`ii`OI*Kmx`2K~N9jk1&Vn}~w
zc^BRsh0}$Kt+wCxuU7%B76*@17e08Id$pM=Sq%Pc3-IDz_`b}WxmLcqD1)`e`6*j3
z`$^L5ZSUJ~jjy#OdMwmAx#ywdSF@S3@12xt4s~+?kNBz>T(_DCpf5hBtlW35<hJQm
zd$m$ZSRMdKln8hsaX=6-pwDM7+eijzBRPSB&7rm3n@RtWu+-&O7999U4$E?-%t2@P
z-k6zVroH0>+u8^TNBQdD<E@uN%dz;GefMpP;)HWy4{qm@ONz)QOP&)D+dYeV8HU)U
zx|;qn<x+?KK#U-=o>wH)xU!Y=aY@WhzUEvnp6`{4OQfiewxwpWDnzI%W0$}2a2FjX
zS4)2Mc2aFm!}QZ~(;!oV1A^5g157HJa2gr@75%qQNoSxhrA-6>`{Yw@H>!u)Nb>`f
zO^BRm*foith>@c-@_jKqPqq8?`JZ3;8c@-I3C^h0zaH-egm33ZGoG!L!kO3emo=3H
zPUhw(Tuc}S$158XLbQc#_U{|zu+-Tse|HLXq(_Q~zgYZvN=~ZY2u+zDX*~YEqsMg*
zCtlvCy(a$rDnfg`8DIe&{o^+<e)z26WL9U)kEH$bQ7=uidvEN8-Hs{;968y_7w@Of
zX(Ius<=7KX$ZzL8J4*|I2$Hu+h;qaG&4QCst5sI9#~<+{^PDQMZGXL%6TNq|+{@ei
zO2}%qVE!I;2vH6StSQ>?2*GHt7yp#a$w!y*nTA%`V;BhwX$rN<)w|-zuCU}7Lj`}V
z<j<HDS%1t;Pl*<oO?<vU0uoJK5KCPnkKU9<TxdC#!!Rw0`LOGV3r@@}8jO18{_T`N
zB&`256fde}8#Mgxmm=aP-8)tczcN7$6~R}Q6_t~T)=QKVwnVOvntA3#&S3LjkLcI*
zlFZH85`Oag4F}Z;IR5yBK6y`)t=>CmJ@ILJ{g|WU!PkMu97GF-pP|5IPlhfu(F?JZ
z0K2c`q$?&;O_PJwm=w`W3So%JUOjZL4q)LEq)Abyzx2ETz)}(oDJ^th>CLaPhRiWm
z9tPN&djuE0_7>Z^Cd9JE_9awpc)adR4nD>Doyq6UzR%NW1_}Lwih_o)A|E`RUb!-4
ztvMA?@Uvgnk(p=PJlDaTRH@0v>{r?X^a&-eu3|Bm+isAqSBp=6HQUp?B%02LH93Bm
zG9CRnfQaSoPoS_KPDn<9Pu~+KOA?x=Tp{_xWlO3}M4x#~Zc)*~=)s%TI<l78n<wyX
zrR=RNJ^pU5jP0(HA(Z7SRA7+6QtWDX_O?V-V7J$1c@kwkIY$Wd<Hvqt&0<MUTE$pF
zJu=5?h#i?CysE64nAzqMwO4<<OU4Rfw7tkQ_>8qY&!748{kkR<JT;#)JO)s|9qncs
zt<Sjt>Exp;Cj`pEljzt1odQhX(9pbKgg$P#l+lgnNfALxFOF|0QoxGhKMrb~YOJjX
zRo|YkHpgF%>HOn2`lul>Bekr^Nc1bt_D0XjEsZ&Q;p39TQ1_A&wWDr-x(5@^)ndM^
ze)P5<rJ#;}ykyedR?ijG?ltPye+KA?$8(gEEzW7qZ){I67*qT3@IdQ3J`QrS<$>xv
zDBNQ!sa7qbJo#H?<YS8fs4Cn1vUFJBG&uwf9({^G+Kmt%e`f_qBDL(`ZV$x!UiA$(
z2GZ0cO3JPgL-yjkUX9%+y;VM}^l(t5+u@p0YWAPs-x5q@aMf;ZtI^LI8!}sdUoT0a
z7svM<<E6ZWz03511e1|CcwDFLofpQNYg(tfh)mqK=f%96yfl6mc)ahw#;!;KY_><m
zh;j}pT`E<Pok<CbA(U2NEo|yuXEP&z9V}>#1Q=J%^C0E{u|yw64V<i0FPBVC3-E%i
zQS*tkh){VYmJ+SzKnkVp&rHx?X@|B8zvmxfDbDvaSm01T53IQ+dD4+|-IJE2pvl7g
z&E~U^t%hliR{@_Ay^cnQ`E7ki;JP_x&ql2FYbT;D51R@S<`}L8Np}z9M5Ex8H-gmn
z)$Qs_wo0mPb0a}fZTKlPQXFYL0zT%x0=$(Hf$g7l8$W1&RhKW>d4>gEE;^>$weIUK
zK#dd%5HPupyjAkPcZ6$B;b4CA?eE6ZH!)vs`LLd`uS|Y1=xGh?<GzRu7>G{j+VnpP
zh-GcTP{s3^8!zWxSwH#nLva#;kE(;8EHDYW{`4(M6a^tC$wb@5g^NfisFZ;c_?g%b
z8=E?k&fK3wAfiYA@I#6}6lXp~+nMy^l~Q}5&(XlWZF^yNH`@Wn5<9isLc_>8P#4|v
z_f0cY?<vn?QcKIvjecYN{k(@lnOIfad3_%DPR=>9C7VJOf7bgD7AhYoV5%O6!I#IK
z7%jXN(qs))ypx`8WvW)QRxZ@q<~35107nAtBhAfStLZ{{V?{|qx^7=QKkMJkcFC}{
zZYjuF&}h!^{Q7pSpB0vQR1(s=n}RnZMKy^(7%n(i)Iyc}kmEAMtuWho79r~h_g-~-
zdJJ-IX`qaTo!lp2W#Lh3hq&(?*Oc~vD!lZUTS-uvDZ6tUZ3tLA<7qtjQrFMk)USYz
zK$oqtGus9~ZNlE>r-fK%$yE0ztp(2mr?alUXkx>elFf5CN~aG_kB^*A9Q3D&L#Vdl
z67F}u39u=qfJY@lwZT!*!}>S8&&->{%HK`uYO!nDkmhOPw}CtrdrGxUNg>6B_x0o(
zXaqH$zi2wtZti`_DreU!K#7WQU{a!OcGT9Ih>`k?!R*KMv-+vI%5=LZ&~{wiEq@66
z(t^V_-$eozTo$7D<R3aXSp6V~gfek~0Vt!}iSzGOqT>fx@7G0vIR8Eqa-49@g*1EK
z2@Po?^Bw*r*^cv*U4f(573D~pZO(0DQQKUH$Y0Cx4`y%{X*BnXAOGcLaWhfFHmteG
zc1i?o9`fs7RP^77uZ)~JtgL56F&s+JtR(B$5)fM{8k8>*M#ZKqS8#n1M69>NTyy~d
zCuD!6SQQGW;s9~Tf8!%|)DW$q+Dz5!#Pt1guRu>;qH=*d{K$pcu-Q%>b+r+x-BeG#
zyN8mltHV8QZZBgKdK%fGU@M3e^uwmB(K~Vr;AS*wO5-eX9d8)yz6lo0kUL#tXr6Na
z*7YP1>+Q7;Yj-By{M3S20OloYjQU<m9~*5(>OCHz71^vWTJCGLN=AFMk*X0c6;;0v
zIdeODE-<IzurIR|{(V%?Nmw7cpNU<yO84&=l64B|59Oaoe__}#f+IBv=h}yBBl#&j
z0#&5@cWnjEjWgvx_%_6lsU>u>B}W#4yz4TQNJms-V668k(-&tYiL_X3hIFdlSW>PO
zYB$W%q<bK)J}|ZO%fyoks7~Jq?7-i#<nQy4^EmLZIuwK$`)cVuEOPoD_N6*QU*L%k
z+(P84grU2`Z7dQFvIZpv@jaDECMWXZ`zk$NP_XB@vHKc_=HAR|WGHPN$pZ;Hr_et$
z1y1qfNxxJxJQA5Aelz7?V!xo?E@rFLU^xyMQco_nhGHAEaw_0qHNCNIEW9?Oo}Si)
zzRg5yyt58SR9Veja&2@lD}Go|N;>`1C)ixmXX+sZ{huP3`V}o23Z8_Z6Z^$ERI4bU
z@8j6i6cdN<LI!BZ9T_H7V}MW@9P+{eWRRB=#9k}wqYVLZF%8W}Rd-{=aDnVXZ0aIE
z=yi^LLiTV^a+J~OynXCs%u&pS+o6OH<G`Q!Q_RJe>o(0d$R`433k6Dwp5k~`PFk#3
zksZTFnLShIYU(BmAAcUcQ1JNh(hu_y<9}4b%`ykY=VtiJ#u*$322Vbuj6YZ-XeN()
z0G0vlek<Yk{fwZMb9@{B6of^EddutKdkoI;_BMR8+^koRW#0CV^#V}rmklupNpM*v
z`#6hxHt6z?-#DN{j;d3gwJsLfoEgc_cjigr$@$$~4+li=m&7j=NN_qVUv+-|?fz4V
zn}IqR@%<=_D6b>ABn-_=J1ruW;r#Rsw>QP1lkS3#*zBHIQDWg<UY1az(zB9fJN@4&
z47nTT(`67U07M<)uS|8!$s7-try>QG>~aid=}A%((ZuL7@Ngjyl8SWykhJhMPqa;S
z9joo(%$&>gO}n?=-xhOi@-125@(}l>^}3L@8~!ozrWs#0(S@+syXD5Vi^!cHyAj5L
zhk<R*g?35j2}*_c&BR}pdBx(?*uJonao<GfoTbj@zJ;zklfE4%l{|63eG(YRzn}Su
zg6GEzSpcvggzmtlWNox+<RwD{Edrn=AT+*__n<fBWA9*v82X_c6;dKwO1u}<%0@gd
zl@}9srPS@FptrvEyxKwDY{@XA!3@i{eDP(q`P~UQGS!Z{s+n(heIuxkdoREIVUp4M
zLUa2oWF)1#o8h2ih%INuxGNxNbdHDNCr{wXE-Ay-(?ORyra_C}JN3PWD(nc7vv4GW
z0J*3ms%|9`rH7m)fPk@996e#TC}kiVZ|bz66%@KST`StK!G7ea^9`o*oJltP7D5Jd
zEYX0b;OxCIE*SerKU>d``+i40XE@Xk+x0L&wx`uK$nmJsMVq?KrF}WIv^s@NPt$r6
z)-3@ZH+Ial{5AJt_M@|Y6enL?3r|ahs5?U)m(Ex=szn|E2rWpUFzkLYo0jq&DJeD!
zH%Olaj%&`sKYk;^A4-%{&02}Md^euq6{v1TY)LHW*6lgKbARU!KaU)@-&6q{a^XZ_
zZEQ?73}iDFPI4MqYpG5pBWEId3QkR?#RK;r@{oiHcz8T8dpFhf;53pzc9_4sy}~9x
ziv*@Hn)cA}jpEU9H$u5@ay%tQ^?6+AcC{l@!MP%<Ayelko0+*MMHL_UwwYM1o85v}
zG7+Y?c@6Raiot>g27~oCSl@1yh=*ian8E%vWsRrWX3lf~T7qt@P{zumQpmqpUvz4y
zdU-e^AFaQA(ERZC>PHv-(e1JOEW|?k!8O)%LJ$5#^0l)G>V!Tw8Yb&)l8whH9+(Zz
z>5ZU1X&%yftX}&VGWS-YfR<43Z1s7U%ken<vdfq2ljT5X2K6$b^{(f)Jx^RQBR!Se
zWZ9YmE*Q8a%Oo5eCrR_c;J4ZewW=5t=vxNpBH7NQocEBBpfs!;G#uqgHeqChyQ4_U
zPMA(*RrFQd-ah6_sc!%~s#kAh^?^N&O&YX8va?;l@uzY9)KUCEY`X7<pEs^aaSS3|
ziRYzV0QIcNIbN>j_1Bde)1l=#l4s9b`<{?m(HOqZ_CKq~l=IbMqKKWtLLh`P0&iFw
zy=A-z&`f=%+@zWlZ;fpsvUoqT&hh|_sF)X7F83;YnWiU3B;+EO#2%$S899bH*g+}i
zT$Zn|(2cD^(#xR`)~BDO^o?p-AN=rfGFQHm4SLnN1aRig+e)yGfOk_YXR_kGVIPMc
zc6xkI{q*+Bun!*OEf0)~c;(#lM$u5R4-N*AAz2zZC;57u!l-|=@Pnrv?t6x$9n?$H
zEP9ej5<)_Ug^8^6Ihx{HI9R?@%oi_?+jGA>{*tQFaNr&ZG3Zve_IFQ;H!i3)d$%K2
z>Hd%3xZ;M|WG87~E~2wJ{)FA(Q&WPJ*X?Lqnzw*8ej&4L+a%-NoU3zc?cBn*E|Exs
zR4MJzd(|qh>-!xKny>Zidb=w9;Le>RrO!H*K3ue!e|&E5h4KGcH}=WdtT56XN9?|L
zVDLs~-ZUW*=n-1coXUW&KJrqR3IsCP1M>?i_|Wen-bjU$e4sM2PQMpIU2fv!ndsqD
zM!@B9Ij^^Yvu~{CyOV`@%|Aa5A|pvOx(PnnE09QXos4ll_e2pGlAS&@e%3Q`qIx*N
zs9FAJH8lC?xVl1gf!sN|eLF$2;+5{JglJFU#;w?Dt+Z47V`IDd)kUWIP`Q-ifeEZo
zgt<m#SO^e8H;UT3=~(;@0+yuuM$vh{4x2~xCgD<_lvNdpV(spwz<#)|wDHq@FNPYY
zq(%->`d`G8<doTjo)W(>br!6w7_DlGj<2n9=NEar*27|z%XlcZFc#WyxWcI6peQ14
zBwf@tb)ruvGxf83Wx?>3%gG7#!hGiEV@3;K5W~ZuF{rt32qYTaZz(#8M%;R;nxeU>
zhr`fldWWVlm?8llAh$fP6^@-qjrBd$e7|8&ee%6RC`b1t{h{m&O+Sd<%RcH2cCqL<
z3@m0@BFrEm>wY6~zCgTiV$;m;mPr5OB`TlT{>TIO3?iT7m7cl*->&)7n(0goFV_yq
zso3qN@QZmoN!BPuN_UNFB7>ehE&z<C;fD<%&yi33Pr>LZGC|_VJZ3S9Gd3Ffd$ptp
zsQ$=5{E*=f8Oo_-tvuIA9Lw-}zLP-gO3wR_-+1YYr;fzS#8jV_&8=4xoWnk0LE@Bz
zGhzb=c%SM|BI>MRae-IX!4Gp+NXOdZE3{a%UU008@G*3ZJaO#3m5=%I=i@B<Py*Ft
zJ@dylUSt2(%@aw{54WyWRtr6~oi}|(<vgI8DjnnVBL4ckcf%+M5l9LhWuD&7rxc;6
zkq!r;5TI$L2UaJx;x3AUnMQ8xi)1XJ;E-!Qk&y9ZyFMx*aaHmM^_*#?6K+e4(Qt#c
zG&($|ZUWv~9T#je1IoerT7vDjVskIc<BwI9#~n0x+<8OUw#)UOb&ar!U5<YnKM6xN
z^g6tF)lzb9cKgvL+~H-4sF6$TG)GI2l(Q-Xz^4LFT2dv{jT0K*i_-!WLyKe`Vz<v?
zQ$eZDXwB!w_{@mOB*5s|D_g7T{vVQ76Wv0aLG-)Pi(iSEiPX`hFbThNqsgm4b)Wn6
z+^j1shTRi7AyJZIXC>7po12+J=dp*ud}ME*O**Ud_^~H;n0E11m#Up>n(aA9y~^w$
z?pbn*r#x}s<<J4efzhh{P^P$w#OaYU%J{nJuTvnGN4&G?^5GPZFbWFd@59+wa1G<|
z^+Xi?2?bLpnkTr=SW|lL+xg~;DX3Y`d<(A7)C&`@?EYNh;3MM}628julgD?ecV>*T
zN%SSMgrMWI@rlsN%EA3rtAJ%XV}-0?QYABAUikuWxONh6`Y@BBtZ8rl3>gghX-2w&
zf7fV``X7GaaYMzj6Ipls6QaNw=BLiB{*@f*{)D)Ih<=A)cR-LSPT<WcK8%N^)QZ6M
zjF}!ArspPCg=9SC!nW5IVR?2lwDR&eY?ph|{$()3uM#KWc$4)<rkKm#uS#D=UiUml
zowXjzZ>|+j;AR~Mbm}G3qzJ6nv4Tym+i#XzXj~^mxNnvhb=MvW6z@>^{@%HGf8pXT
zejRCGSpT70f9hV_AAgLYRV&RsejO@8Al-wV{(dCQA~Vg8jjvG<1L1noDEw-CTUyN$
zDl6Z};*b(wo~LI6@a_Z1cP+?S^aan7RhjDNclR;49Ut%lN>t1`&O(zpSvrpN)|?%y
zRfDdcKkSaNGTuGeaYaf`Om4QMy=&;}VIcBBeG@mM8ASA6VQSwVU4=EsO9hAa!7RW~
zd5DyeHAT}769{I(0>PRJ$kV6c7Dqu?Q2oW+5BrGt`uiEFG9SEx?RlAH==RlEKd(Li
zj*_|@$xI^1_m4^c;puRUC)`vuJE=s!x$-9=gUg6*r$XL?kw(>!-6)#%v+?|R!G%|u
z&-clgr;+Ei{NlaSZyFQ_yqNdO2*6<3zPTrplp#aX;OM8H+48lMhf#cNK$+NsbTBf5
z2fzJ0X!=ug-|A%Q>UF2{uIkYnXC{qdZaxvC6$6bym)N!g2mdCpvz+#!x&K>(Ipj`M
z!EqrulsJh@OKrwbKvxH^Le4vb%(49GizQtq)iI;lRF!msElM&DS<{ywHH|WVYHU)4
z9Gw1a(H}n^{KF3}{@`oTN!m&mtAJgcfB3ogVi)PoT3<j#S4?oXe#9%b&b#g>{xogE
zq#KHj((SOAjuDS&vEEfkuX^O?#-}-|<s`CC7Oqayd6=21Bf+lRk%Bt`KkPp<_-ws0
zyQfnUohMW+?^bF(99hn<Gkb=wPQ^GdVl|8K>wJk!b&1EqLLpH!mSs9#GDFS=WIQ@m
zv{2_{FWoV+H}}#Fg#0bUUO5NTEnwdY{}uG9Wx))8ld|j)s87O^^`2Q+5X<TK^iYs0
z*tw8iy25i_2<)WS5`Ee+r8W<UCK6w?U7pS2Zno7XIFFw?e1(^jiw!EI^p_g79>^$<
z(&C@Pz#IG)2;z~)`%#uiLV1t{mr(@7`H25s0X^8eIx+?g?wW*zSRkKd&3sSDerCxN
z2$$m*%OZI5DCr;#%a1si+PEG$(ic_RCYn)DG0RS#YpBafuMe@1aW<XxpTgGcEXn+=
z{9N1mNV(Ohy!cf@SL`P3dXhrg2#tZp9jWw%_bqb9P0d{nGqK`#g%5yYg|olcU%!;a
zDt6%8Bx(+@9<;GPGJ-|wle3Zz$Vw`>n``-&y;&?luP^gU+n#%!#-E4&br3+s)w%{h
zruvmYL4ZlVmN}p2tOzvfZxZ6!nrAxfzFx0)U7@+nCH|0qMKb@+pnB(mxz()WZa1N`
zG7c+Jb{bA((bwSkI?{pZnMFE~!{^{;%DE3W`)ll>UB#gYiDW<bv9i+$pPJ)gIW&79
zWB228t(e)4&%g5_Oi_b;JgPHQE)HQOoC5A2=?Kmm+1yIVL8nwjQ)^vqLn;zj&XQFW
zwI&KxLdG}Fe7`@MX2F<WKGb@>NJlaYi~0T?Jwj3Ysm`bnz(yunbM^9pEM}-tu}F5%
zz}Qg!?^1Bz7!C(+m1YpbBrMb)pLOC~C!cWGEgDUNFEAWLc=@8tP|{*BnkWwb{<oQ(
z@eGkZ|K(y5tm#F9-cwQBQG6sfRlWH1^_W5MX-s}!bO@nPz4@;5K$O(<G*58N>&L}P
zeENR38jq~wVO(@r=|~9G2v=^iL$(z%y$qX*9|%F;J;Cf;Rov4Ef>Scix?n>$bUg-{
z_;ULhMX1V6p9Hrmma3Ci)O=krd0?X9N|qe(LB-zwp{bsPc;=TcZSz4onFj<O%cWwb
zVAdqDdgGktMn0Z3xsO#*f+S4%24sA6lwwlUBKSNIaTq~f!L;{YevufCh{`+Zqp0?{
zEl_{G?VI%k$&Ihe+~<P_dbLK2mNKEWG*Z;=&vb6wgpyxrPxc=RXznj_P&<}>dcmz;
zVNX@_L_%UH-tL9f+pDHo8oCu2bBKUKrto{P((mBA6A^R3K^DLP<V{lmU@9Fcd~vgl
zK^+kQcxC_spB8nz^J>C}y|F0&*T1CrgPXErS>vuKzv2vmKzCjOoo0kvMu%kw)i%MD
zcy**4VBn84NjT&%I0hnrO_%>h)+2QKNkULKU&6<2T4c09|4#CC4qk+hm~4cZ_bgfH
zPpg~vfpfDR8!tKaeZH48Rv)*1@2TwgqHUOJvmlm>!QA9@s4*G>W-LTtGEfo_j<lDx
zhSd2oQ7Xyn6Li;|)#u<)$}WLf(<S<-Ew8IvbbDR$hko(8Yu-9V&>ODcIioT_$Am(6
zlk}fdKW_bb>u1B~D(=rtS^9sfW+4BW<IX6Y!l`v?`72%vR<dhiSHy@QCe3!1#9$U3
z6478uN?9l+RTXiLRc>|)kU%=v&+@3i_!Db1E{sL`fh?L#<r{v##;C25w0leA(kQha
zeI=iYd(i9FfCnsmZzDP?Ut7LwxN!;;VBz{2Pat???zw=U?43M|eRlvuDD>cy@2+N`
zXgkw<GZCGg5fzLNg*fB%pqUNOM8e!AHllgJ0x95@F3O(~;ZFwc&ChnWd*eF@PYIkF
z8r%IzHISDQywT1+Zuyxvy1F>qHo#GTDH3oj*gA6l%6shu%s4MYmXN%5)cn_Nv`pvS
zsfT<!W$vk8x2D4<P$$zE8Y>PYO*W80tI94l+y6iOA14#Tt4zD{+{hnm>3*O(FVPJ#
zi(3z0NJ5$|{ktw7tXSVXT&dj<)@`X2%LXwZF_Kcx9rd7HhDP`t9-ZZ#MCX5Aq!6s5
zNeZHm`RIDkI~cdIjhk5h?de3E6%Xfm#SGQe<>*B||2^8tP^a-@gP9#MmA@FZ_2b)t
zr;HBME{dT{pfDgY75VOIGXCAJTqGz@i<pk?(u-faB2!Nh^q#Lm#=mR&NaW#XnE_S%
z$A5!X>bce163l3A(Bkd(*O*^B{SHL5;?&;~_hvp6wQS8jR9Bw)!uK;M)jl<-1h4yp
zgue-3b3~vkT|IblhkpC3HS@)36r2i%G$7}*agreY{K&<M4~0X5lL`@YM$UStJVK>d
zhJiytsrUm-5}#e)MC3Xq`CdO&CECLfIz_K~-wfUF7pzApAN=4G_mBDW0`}<3(khjw
zQ5x^C0rB@Q-qeESJZyAzHr`LgW-GW&*_^~a&mgN+=4LU*oFA~8Rsv1+F$-5hVA9Wd
z5MrGXpi~lesXp>95^ae^^KP8Xj>o$UJ03`>;*5gGP50XgRm!j7|DgKfwES-Ix+(zE
zAj?y;HdJ*r{O#ozf*pY<?sW2Xo6@GM5x+y%74=5fc)_+N&B^DCjki9<b_dg7S_Kpb
zemVtI>UD)F)gYulH7*?q@?RBhzxSDlI36w&ns*-+N$?U@>c_Z@$nZC)Ji&8gG>&+&
zyI2W(6Xj83)!r9G+@B>>OvPQHcr5r!WD0vC*VO&+A3yNo52o{u->qK^tnD5N_^ETL
zA%{8K9gFinr`Zr3iMRRoxL3vVY4@^w=9Sw3lhs3%K5pN1SagEQ!1Bcak@!G=-&$|f
zLWsv~0t7DSA2bxQj}3|k)nk|TW4BOp1UI|!J_F&Jt0;V#dQjQ(Y>PeY!yQF*{fR|<
zsy$6U6b%V*`*C;?^ks9dCuk(&qU%ryGi8#JlYEvOUund|`qNDn=+o%SqgVCSgbt%<
z)u_SWd(}Jt-VP2y6jNlv^OhYGwG^tSnypOdx$fOVeM@<&!AS3u8a759BZSmNloz?V
z<&b?6wQ{rju9(qG>cgy^zg{L7m18c!Y)RB+bMfTL+em312_OJ8n$3a%`)(hr#g^sU
zjv(l@t3DOe_wvL#d-8QA8sk4&bTfSe!32_IAHMbT7P-mUm-E+rIsRF>dJ;EVNa-w#
zIqpvA3J&bb<tr<nZ~859xZ#9QwVnvRX>!RMiC!i4cWuR*U%(t<FqodJC&K_+juoJ&
zP1o1QF<2kBSsnL<SZ5U<LdnY_EztUz?KYk|T~klqsuKJ2OLGaiU4q>YJ&vu9%|Pgn
zEq@mAqPj=8Z-c|SE^zt$10#R-aQ|WbvgT!O&USNpR9A??1e+X=Hev40-||Jxi1H~v
z?s#rsVLLA4_mEpnu#wI6&$oQvG+VXrT~$_TwvHOk8lW}xIwB6s#ZXW04!29QK!B(N
zms92yzRFx`r|XLmt*w&%6(18*mZ2{%|E#Lxl7iiMzt29ABj}ODjDsooROVmsJuYdE
zbuzz*aTaU#BD~!HRBMj)xqLgrSfSU^)B>RNrXjKz+EFpEw&;U#T54E`L-VG=E<Bx1
zhccCxuf}pyM4(t`DysaqbDkpy;`NnZ%@J+$r5|iw8iHyD64n@|BvMabD1pvCInOhF
zb0Pas8}*|!LHUdDdKZ&oTMt&u7yaPc@16&BWh{8W7?cTLFv+2Rk^vo4*f?_3|C!UJ
z?s*Icn=nPX^Py;H;Q9$9D;T+Y#Ma17@3$7q)Y98sofXiVIb-)bzN@v}YQ6QR7iB=n
zk?NuGXv4-lDb|+Ygk%7b;uvUz5U?H0QNecHSJ1(g=L*SVs>6p=28sr)!%|*rTq`Oe
z%XM%G@1JElq-y<(FDm?jD;}jRQ-@3E;S5qgbzVZ7UWB{jwq-MgEy11tMQLNJXEnW3
z>10nKgDH<T{!TTQnreINYbnc)jdi*u?ch3nGPj5pK~0)ckY`)z(#!+eRu&#)tm#{n
zjA2lQF>*#EQ#oLHNFOQY1<eO<S(8;(S#O{!>iozN-0V>fL#>^!l*i?aIlUFSQup1+
zJ95A68m4}C-EV-ryWpM>>RG)U778}ceev<u!%z?%TR?5X_GkC*;N_9pI2-^2=sr>;
z2vP_}9rC3HXp{AQ5pV+!%*$p3KdNcy!-2QFj_DfNqHJ4QvZQgaO`lp0SlzKs5N^0a
zIB`a%%P^tz^c;{v*c9$BZ`(1W)_&W`!TOVdQ-<z2!&!6;CE~c7`1E5-M50c6EDN(+
z)IL!_s3jVk9E{4-O6RPO4kc2L8B(U14l%hD3-U_cIUFRoOb96!8y)>zu+OiMpk%4O
z@7w%2^eRrhKm7d!Tj}KU-@nscVja(aZHyZQSyPA5OgHxiIXze&Kcb_y(w3yl)H{j0
z3&Fc-icreF2B=vD*=I3?OxeNq{`w<@{0DLw_kjW-fSz?6&(|zx4q*`%maERHxN#Wi
zuGPNm9_^fmnzHL7`#D`zcK^i}6MT^6!TYSc__D$JbKj3!oWP=)?Zh$SYY>HP{P()<
z8EW@Qy;e?SW1Q2`be2ePrn%%g`F_R8`Zq)^DHFB)K`dDSfrtZIf!M+zU4n!EqZaO<
zg{L)<=wmohd;A9=Oo^FET6uuU0w?^Jx=sZ@q40NXtXy-X-3T2ckUdV~sU*tN&}+~7
zYUd-D`7$1Z<4pG>3g*Kyr#;#0nz8%xc9V@Uoug7Tp;@VkASYQSGA8gTpfQF_bRNV{
z>;ZUKiHe<rCS7ypZK9v^vqoVZ6K`L|O+Li)-J>jOb>h{B=Le`ib=xF<;RHtZGW_1c
z+m|?ATP%G_YkKv%zMkXS{L1WE@=*eF?}IEiUa{}5roEhIJLUlk&J<;^HLzh(5hjOr
zBA4T#3Va-b@XJ*EL#9ENr^C<gYI?XNd8%^CFzhX~GC4F+NtlI=R%NY}e68s-e_`KI
zd3z%E3i(oP>6xFO{So%<q*T|%+{E4j_cW{FiV@Hu-M5eW7hll0FjL;Ktj^~ehQmwx
zUYrjJ6dT$8#aF?<@eA3NE%-9`mo7sh7~3ln0S=o9N)+)64bOA(ynfiXz0BLMHS1Gn
zSk-gVS&)4iEVd8lCsu~PA0VVQ?`kRB_491Bsh22^>w8z#>%p@*^s4QbT}S-7`J~Z}
z8PzXgmI(SaRIeiF!HNdR2N8u59g*_7`JirqP3w>ssou6V#m5X3Ta)a0_?+>)&s9+#
zwQ{9=n62FE-w>yG%9)MhI)J$;FxW0i#jIyEVrCnyvHhjjSR1u@kB?k+h+hWbI$Hv4
zi5t*FkOq`z5=nX1r^6|Q17+6wxoCId!r4&oSRy<Oq8w@*lTi3@0xkKIK)@E7NqbIn
zT4p*_PCkNQ`fKIC(dM!$KKh)H?344$Qk~EB_l>Z4D1;8b>Wf9kA_yAuOX}u3oea5}
z0Gw3=;0F^e71=ACM6beh|H$VB4wedOo-fM-qpp+6AYpHtd>xc*#g2m-`r2XNqbXV|
zr77Q>mzi<u*;?Y0yyW`A1Ea4tc~h$Y{Zj`Iw-IkuuO4ko$|bj9bqh^25v0rsVH!Ed
zV@w3#Lq|ddBh+&XZ@a&>4$DxZJ@fW@aV;iIOV{pw^(FQhM~afOJ$X0(uYW1<lV9_W
z(VF^i=p+7U``z{LSv|vD|4MmK*sQG<b?-9WqCT|I5qVOGd;8`#blG_X;T(9sUSpWg
z?6!KpqB3a0%@^GIC&OK*_FdBu{Q=C!<;%MdI_oyNbKb#sEO0w<yUWY>xC#Y(mfnYg
z_SXXoN`0R+>d2jfq!~CSowO<M<Gz0E?@3~{|0p@+wKm=iqxX`~XSF1D5qvIkd7D##
zEYFae3-I3U7E@L7Y1R0ZTnv_(_-6&qnlmlaPl@0aB0v)zMU&2h4a&~Sq51`5p0Klx
zqVg!i)+dl8DeJ7?S~Ief$x|=MY&om^KsEN%k#(Kt;C>h$;#2<CD&Cw`rk```BQx2k
z^<5sa(Wi$F8u=4dhx#S;U6^xBsS+o}`9CtloVoayq;LwnX+XolmZ)%#H64d(Z;wbK
zuw|3qFMUNWgEZ4HM_o<@our4he`cc_a(;4=CC}kdl992?&wz}S0?J0qlWhe<tKFo(
z5`6h9a`XBm{wh2$c|6v{FN?g|v6$Z&0HI<taX?{r7d~^vWI_vjzAfS%3FR9(SCSC@
zH*K-%#5RO-Jk87XZEVeroi(*Ny-n~M(ROddiDlofaWylZTT4D3<FDuIUk3$89>yK~
z<4?}Gf!(|DarwEC{&ogwASW*&Q6r7J%S68~h0WCL>+Fv6tZ$@W5nq2q*<3M!Gw=bb
zG9nN-ynk48k}l*s*8p!rl;cifhipSW`5qxHR7Y5_RiaMKHzmsXaw7Z1URv|?x+is3
z<fdAKwB}VR_Uspm8M)ry_Ga3DP6wY{`&LSJeWL{cG>8UdW#Pa;dTN%JBk%~M;SmZ6
zae+eMa5bSf4i!(R`IwDBp;nAxVqou0jl)Bw@aL+$%bj|yH-4c8n9(ogD|Iu{J1>q;
zcTGxAJksJSU5!)gfnO5T&Dp7kVfq-1z}>X(Y^<eZj@gSW69w2mP(*@|*>s{(Xu)t8
z1)<h>iO|^5hg7KmXPw&14UgvfG)u}sj?KN%`j~hV>f~iP_Xm<fpTm=_qN39*g$cK9
z9A`vqSF0bD%##x$e&F5a{tpNgE|>-M(4fRb01(8Ugn`kcLAr6AA(wsPuzmnYJaR3O
z^a^KEEc;wmNQwLr`Op6p@MQW2V_C~wm&y?t3O+2wxMPiM$J@4+)@g|N)x54r#eMhX
z=&wO@6aM<0A4d#M^}1C~bsmHUJYyJ@Op&L4`t5+`%vP4GqJ!U<M*<@BKXzdLMuChD
z`oIw>l;VATKjt&)#+lln*k$)0`+g(&i;E8Y*e+{ggJ1x0{#>g#XLY6|SeX2Ulw&s{
z)<Qdcc^43%)FJP9P9K!H`|vL<)>0vW75P*{k;tO1!l~x9y~i^LbPk^rwGXc>b37!A
zCKO$su)<PI_)sxo%~8qevm<LMCri?2#neEFUU%n59fpVYE!?+$t+|+6)t3L*hq*ae
zqvUspLWKbljSRn&IU%P|HVC3w;V~DTY`TO5u|*jci+RDtL@$4VaL1S{s$FV7^qB5*
zg!J^U@MPqO=&IG^oU>o?q>Kq>fjHWfAoxFWk90dz0RZ>01pt2(`*vf%1Mv;=cY4}}
zd4RkovYs|YpP6@BASfHvt;xYx>WR7bhLRH`y`xdm?yxkF{`N@33!fYNhcm)$Kf>ac
z0HL;8*A=w2L6)=pHr{!*xRS%uQ}EBo>CI+8dhGx#@l`JL!+Ga_6fa=%fO2mO5V?EW
zo=5s2HtKMRobtMzs<b>aAmzy!76(yRkZ>#cjS3oP<}%5i^RRNluB7bzV-a8n$d{Qt
z+RkvAGs#|Vl?$Q(G^J1<13mgZF2iY&zMIdS#EM{AR%fnBM8=jE!q1kdsEdx10>5hY
zlxb<77E<W5d}v(rQtVXd99O9fH723!2h|sNd<~Tf30#tC6?r5XwkNy5nH#b`99^Aj
z*Lzf%`={a7)E4_1+xiGr%Rb5`iLk7EEIj{4X8;f|f&-5yim~IE7=;-SE12tWC>%th
zOQqPEVQ8Rg4gcn)#0xKSWUjHX?WZ8H;T$hs1T^i^tIV)7i^nV)EN$bbCZPesFSd8B
zbsj#SPt?`<r6pu1y!j*t9nMS~$M6+%<5u|}huxMnrhx&1=V~h97GI;YuG#kRBN@yZ
zL{}@cNt7(VF2^^4$UT|7vo1f-hbo1AI<*+>jCQy_(cn~boM~OhVDvHO{{+p|mYfT!
zai-m6d4Ns#Ql9LOS!h107PfOI4Mm$C%cw?fznzm)T($N%c#wR~+#HYj4ir<IwNvU~
zi<HOK`M3y-VE!ZMZa&%yP+>`e4M|PVMA50GJJvXPh32pB-|O0SSU-~TNTk;Y_$U@T
zMcp?B@1)cB#1C2{02sV1H|8*yrT?_)CXnT|&M<()T?PTzw$b;;(ZjHz1)3CbBJz>q
z+_=Gicq70f5vLfP$t3nbg~6{poC~qxrYtU=GWpoCMUL&v*>k#TQ{x?-7Gq$;;&$tg
z*DjO<h3HTAeuJ;zJB1jG`+qc@v746h+A?dv0L0xv`KadY_aH)A@Rq$s15M{_^Y@9W
z>Mp^{_gX|zL66rK{ywZEc%5fef0ez*bf^_}^e@fmKP90Rlr80lrgB=6$_>G~c1*nK
zQ2n9j*Vtm-khhPhDCW<nUHwKa?3evXZVMLt-&!~2-vBsPr{>}}b1;}*ov#gGd0bAL
z8>c@*9j?s!!?CZCC7DLNfzivE+<h{hxAPU)AhEXC;lI^ye=0n}C*cC_G9%s54j=-d
zl=pbJle<6png00)Cxk?tQqeg^mguq7IL$L_L-?67{ZreBjrVwn@)p!=1VgTIN=wyN
zZk3lOcD6h}4b<3qRuOWqgkCIP^-XiAmk0G-+SkH=+IXuqsWF>uRtExV`T!sm#qFT+
z#QH@>1i143V?MipiP%q#Rxj9D9&~frAdTJ}85vkL%D{qPn*TKwgP8`H=$dexcN+1z
zKw?@i2u>*8D77UNJ+<ms(!@808qioOrMx&gnLEE9c$E_DTxWc%_jY&^OT+lTB5n$J
z7GtRBrorgrJgtusWu&AU949K+*+0X72n)V@kKJE}NT?~aSk(Mrwsbp!2>x$9%n5+N
zS_JNJR7eEa6fm*1klp(q|KN}aQjBW18yfIPKbP=4dW4;5%3S@m*kTD6ao!r8jho*%
zx-J4%td-SsL+bRI^8K{0Owf6HVs~O0amor$NS^&)4FR7uRUE<ho{Xaa8o+E40Lbb`
zUZaSRReJ-#$XlXd{5qxr@`qh%cC^ORqd&f=NO3pvb=5hddD`GjxV>TF>On4Mi2NyO
z#?sdsQ&RUZ{Aoltc+X}=EnHbT(w=90kT^u8diXm3ufAL2XDC24{H+G-=Y_p4b_kfd
zqAXwdXj(Tjs`C9nK7`xP*xb;9)$q*E6uWExf2(0`V*p?g*A)eTxDx6^rpKcm?vUeG
zW3OvkVW%1Ad6lPv37GD-g%yo4*EUenXuf$$CFdkkQQpmc3D0;=`66TX>MpsBj90eA
zErP3VA2u%$pAt=j|4)7y0FHXpa+fIRkmXGdOaJxM>W2fE<O7|g=dTUo6A!8}k<?Dg
z5dM{-_-QHL@}_sdjR#qM={DADP~zh;@sd?0p;k^!Y=u|I#P}fh@n0E)UAl4Jew}}{
zR{l>%5dcG~sL%v!s5+CN54NvaVzG(e_Yf~NgU(8QNbWHX)LfUW7M;xjz#g6{8UX2u
zejEYIKdz*5K#0u5xz7>0Vb>=|J4M3NTJ^7T(5))AcF<4%+Dj4r=88heIf2t(e3O&M
zI*t?$H)d3I4MXSQ*)+FsZ2kQv|9_EtcoVDcga%~fvNQm|G)06D99K)jH_d0=8|j*S
zZ;w4f<-L93*!s&*lGrN9%C!V(xV7cM|9R@_IQDC>1#_v74>h4*SE&bBkZkAUu>@z5
zgzA@rnM5dJUU(+A1>fEbUF1A_GqOuR>Uu|6|0%84Y+N7Er~=qdpK>9uh5`PZN8du_
zGB;xmPlHCt?DuT^V&;PnaN`tLevvF5A6x*$eD6B|fKpZgE?j$KJ2n{n?s>g86c_ZS
zidgB;#Zgoiw0M_cNCFqsr?26MZA?dPHMf>ERpq;muHaX>VSjVe`L4(2q*bD_E~@=s
zD=_CT>i{V7unqtynOgvyj8d*0L)<%_m!YO!H&s+JlX=M*DcnOez86c>ruC86l#AJw
z@&8x(_Ugo|#yAs%$g9r-aL|W|@QJ2DRNgmP83G!ptN}F{Hg{5V(UGMAJI?(E#2=m2
zK11~Yh53s0Q)2qr;Qv}sz}?LiNOR8Sx&X4%xyp+g=Lne`Q8_YdsZi`*8GTTFDwAo8
zBzkv2?<e?v$l3P4$}yPSD<=TNN$GkAj*i4-2bu>KqJ7-r=3b+F>~Dncna~D5XUAOY
zK#4%aRTSgSE}9M^Qe#)Hhun}VKF(_7)<*m*R`DC8>^4NNe9Ub2WsJ%HQq*0#4In&+
z0)P*Lw~3J}a9kI}!K+`N&)VbL?<XQkyJDXziuz_LCG!8b4R;%;F`PmKNE3i`IuL+x
zHL7g&e<R_tHOcZCm;dw){B<RS9p?-UR8(XQ_u=Wbm9y4Fu&dVFS6X!Wb}_WMKC&FN
z`Tm$t`(+0J;<@+!u9y7^c8L&5m}@~OHiYPqP}$)Tii%EZ+!TTX0dG8Ji>KPMu)(&e
zPvOXpxTox&O{Is#6Zvy>FV_|TiYD%00zBfy0Yg8!F#GhKQl(N#oF-#JU7~=ryte@z
zi}-Y-Q6^@M(^k&`p(_Vt4S-@<8@SQ;$H!#!bv&N?nrLld^EM-IMi*e?ZnfnEru5=7
z{+duY-96tyK;aN%0j_c$l?D~H<@ieo9t0f6`2a0pVWIqrRRcQ(A3^GA)CU6Smo@-E
zh@b0iO7@paqLG|4vfLB(^(c@;@l|3U!#jJ1sqd3;vuCLHhWk(s*0)ZgvU$UF@dKl}
z;WE$L8UPdz$_=ec@|En0aF)X#b4>=t4nz9<)5}3c)ITl@!G?gwIN8t=C<`Gh*2Fy4
za4;~O>jy<tJ;~)-)nHta2ErlU1pUOPd!0clZugj^(Id2pVc){1&R^v&K#^2=UVYG0
zNj<WBCU_s=|FjFtWP+>Av>^bel6pi%2NnTOa&m^DCz*^wiUmOks6Q;(;o<+H_HK3*
z#GA(l6arMwLadIinj`;%g>H)4k5Om<#f_2zPra16`|x(`@ak1T_~U#yfCk7!w!-c@
z2f0B6KmePQf9=8v+Yp1Opa3F#EDIb101Ub#JT^3liAg`Ca11~|7XbX-f3o*5w<%Y_
zcQ;qRDtDsF@6vby01CUy@%dM(kW47u|G7KCjIF$kc}oNNpLciiNg_Ay{t5vAh~R{M
zII2*vI~WRKM*%3N$AHZw0Ec2^Zkk)da{r&b4q{-8hG=>(EueF%K4VwAhx4)k2Brh-
zV54sSdbx_hh9Atn^yQkY_<|cTAool5e^}3OQUYi`&jZO~ko$qv60r5Dz`&pi+^Eaq
z0nz^R=d^P6s+1`w7l|@3LS1*o@YnpQ5y$^8RA6)joBLn&(~hY}WADs?IAjgTd^Nrg
zbqps3faU|27XY1;&t$@^l>jl{fq`>RAO*XpLFOCteVEMPA;BPAA)p}f3Fv-C4yH>E
w90@@8iyvU<V4-A3HpqPI{tpZcnZU>bx}O(lC@6e@oA4QcOp^v+6jEY70BO8~lK=n!

literal 0
HcmV?d00001

diff --git a/Telegram/SourceFiles/calls/calls_instance.cpp b/Telegram/SourceFiles/calls/calls_instance.cpp
index d79a317018..a04db8bdb7 100644
--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -164,6 +164,8 @@ void Instance::Delegate::groupCallPlaySound(GroupCallSound sound) {
 		case GroupCallSound::Ended: return "group_call_end";
 		case GroupCallSound::AllowedToSpeak: return "group_call_allowed";
 		case GroupCallSound::Connecting: return "group_call_connect";
+		case GroupCallSound::RecordingStarted:
+			return "group_call_recording_start";
 		}
 		Unexpected("GroupCallSound in Instance::groupCallPlaySound.");
 	}());
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 8663c534c3..6714d32fac 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -2685,6 +2685,10 @@ void GroupCall::emitShareScreenError(Error error) {
 	_errors.fire_copy(error);
 }
 
+void GroupCall::playSoundRecordingStarted() const {
+	_delegate->groupCallPlaySound(Delegate::GroupCallSound::RecordingStarted);
+}
+
 void GroupCall::setupOutgoingVideo() {
 	using Webrtc::VideoState;
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.h b/Telegram/SourceFiles/calls/group/calls_group_call.h
index e727173cd3..a78d3ab258 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.h
@@ -205,6 +205,7 @@ public:
 			Connecting,
 			AllowedToSpeak,
 			Ended,
+			RecordingStarted,
 		};
 		virtual void groupCallPlaySound(GroupCallSound sound) = 0;
 		virtual auto groupCallGetVideoCapture(const QString &deviceId)
@@ -283,6 +284,7 @@ public:
 		const QString &title,
 		bool video,
 		bool videoPortrait);
+	void playSoundRecordingStarted() const;
 	[[nodiscard]] bool recordingStoppedByMe() const {
 		return _recordingStoppedByMe;
 	}
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 3a40c36f49..f3d2c524ed 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -1175,6 +1175,7 @@ void Panel::subscribeToChanges(not_null<Data::GroupCall*> real) {
 		const auto isVideo = real->recordVideo();
 		if (recorded) {
 			*startedAsVideo = isVideo;
+			_call->playSoundRecordingStarted();
 		}
 		validateRecordingMark(recorded);
 		uiShow()->showToast((recorded

From 9b490c95525968105ce2827f0a3e930cd5d84481 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Jul 2025 12:30:20 +0400
Subject: [PATCH 024/341] Fix unrelated stories on top.

---
 Telegram/SourceFiles/data/data_stories.cpp | 36 +++++++++++++++++-----
 Telegram/SourceFiles/data/data_stories.h   |  6 +++-
 Telegram/SourceFiles/data/data_user.cpp    | 12 ++++++++
 Telegram/SourceFiles/data/data_user.h      |  4 +++
 4 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 4c9f11d787..03732644eb 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -234,7 +234,7 @@ void Stories::apply(not_null<PeerData*> peer, const MTPPeerStories *data) {
 		_sourceChanged.fire_copy(peer->id);
 		updatePeerStoriesState(peer);
 	} else {
-		parseAndApply(*data);
+		parseAndApply(*data, ParseSource::DirectRequest);
 	}
 }
 
@@ -272,7 +272,7 @@ void Stories::requestPeerStories(
 		const auto &data = result.data();
 		_owner->processUsers(data.vusers());
 		_owner->processChats(data.vchats());
-		parseAndApply(data.vstories());
+		parseAndApply(data.vstories(), ParseSource::DirectRequest);
 		finish();
 	}).fail([=] {
 		applyDeletedFromSources(peer->id, StorySourcesList::NotHidden);
@@ -366,7 +366,9 @@ void Stories::clearArchive(not_null<PeerData*> peer) {
 	_archiveChanged.fire_copy(peerId);
 }
 
-void Stories::parseAndApply(const MTPPeerStories &stories) {
+void Stories::parseAndApply(
+		const MTPPeerStories &stories,
+		ParseSource source) {
 	const auto &data = stories.data();
 	const auto peerId = peerFromMTP(data.vpeer());
 	const auto already = _readTill.find(peerId);
@@ -420,9 +422,25 @@ void Stories::parseAndApply(const MTPPeerStories &stories) {
 		}
 		sort(list);
 	};
-	if (result.peer->isSelf()
-		|| (result.peer->isChannel() && result.peer->asChannel()->amIn())
-		|| result.peer->isUser()) {
+	const auto appendToStrip = [](not_null<PeerData*> peer, ParseSource source) {
+		if (peer->isSelf()) {
+			return true;
+		} else if (const auto channel = peer->asChannel()) {
+			return channel->amIn();
+		} else if (const auto user = peer->asUser()) {
+			return (source == ParseSource::MyStrip)
+				|| user->storiesCorrespondent()
+				|| user->isServiceUser()
+				|| user->isContact()
+				|| user->isBot();
+		}
+		return false;
+	};
+	if (appendToStrip(result.peer, source)) {
+		if (source == ParseSource::MyStrip
+			&& !appendToStrip(result.peer, ParseSource::DirectRequest)) {
+			result.peer->asUser()->setStoriesCorrespondent(true);
+		}
 		const auto hidden = result.peer->hasStoriesHidden();
 		using List = StorySourcesList;
 		add(hidden ? List::Hidden : List::NotHidden);
@@ -617,7 +635,7 @@ void Stories::loadMore(StorySourcesList list) {
 			_sourcesStates[index] = qs(data.vstate());
 			_sourcesLoaded[index] = !data.is_has_more();
 			for (const auto &single : data.vpeer_stories().v) {
-				parseAndApply(single);
+				parseAndApply(single, ParseSource::MyStrip);
 			}
 		}, [](const MTPDstories_allStoriesNotModified &) {
 		});
@@ -1191,7 +1209,9 @@ void Stories::toggleHidden(
 		&& !peer->asUser()->isServiceUser();
 	const auto justRemove = (byHints || peer->isServiceUser()) && hidden;
 	if (peer->hasStoriesHidden() != hidden) {
-		if (!justRemove) {
+		if (byHints && hidden) {
+			peer->asUser()->setStoriesCorrespondent(false);
+		} else if (!justRemove) {
 			peer->setStoriesHidden(hidden);
 		}
 		session().api().request(MTPstories_TogglePeerStoriesHidden(
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 4e6b0ce88d..2c0da0750c 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -267,8 +267,12 @@ private:
 		int chat = 0;
 		int viewer = 0;
 	};
+	enum class ParseSource : uchar {
+		MyStrip,
+		DirectRequest,
+	};
 
-	void parseAndApply(const MTPPeerStories &stories);
+	void parseAndApply(const MTPPeerStories &stories, ParseSource source);
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
 		const MTPDstoryItem &data,
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index b3e979708c..308b1bb609 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -543,6 +543,18 @@ int UserData::starsPerMessage() const {
 	return _starsPerMessage;
 }
 
+void UserData::setStoriesCorrespondent(bool is) {
+	if (is) {
+		_flags.add(UserDataFlag::StoriesCorrespondent);
+	} else {
+		_flags.remove(UserDataFlag::StoriesCorrespondent);
+	}
+}
+
+bool UserData::storiesCorrespondent() const {
+	return (_flags.current() & UserDataFlag::StoriesCorrespondent);
+}
+
 void UserData::setStarsPerMessage(int stars) {
 	if (_starsPerMessage != stars) {
 		_starsPerMessage = stars;
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index a47340132f..b8c87b67b3 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -121,6 +121,7 @@ enum class UserDataFlag : uint32 {
 	HasStarsPerMessage = (1 << 23),
 	MessageMoneyRestrictionsKnown = (1 << 24),
 	ReadDatesPrivate = (1 << 25),
+	StoriesCorrespondent = (1 << 26),
 };
 inline constexpr bool is_flag_type(UserDataFlag) { return true; };
 using UserDataFlags = base::flags<UserDataFlag>;
@@ -188,6 +189,9 @@ public:
 	[[nodiscard]] bool canSendIgnoreMoneyRestrictions() const;
 	[[nodiscard]] bool readDatesPrivate() const;
 
+	void setStoriesCorrespondent(bool is);
+	[[nodiscard]] bool storiesCorrespondent() const;
+
 	void setStarsPerMessage(int stars);
 	[[nodiscard]] int starsPerMessage() const;
 

From 9b990728f64f142f7ca3ce8e45c147c1680f0733 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Jul 2025 10:04:13 +0400
Subject: [PATCH 025/341] Update API scheme to layer 210.

---
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  1 +
 .../components/recent_shared_media_gifts.cpp  |  1 +
 .../peer_gifts/info_peer_gifts_widget.cpp     |  2 ++
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 24 ++++++++++++++-----
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 5ba5079c4f..0398ffbc91 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -1114,6 +1114,7 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 			MTPpayments_GetSavedStarGifts(
 			MTP_flags(Flag::f_exclude_limited | Flag::f_exclude_unlimited),
 			user->input,
+			MTP_int(0), // collection_id
 			MTP_string(offset),
 			MTP_int(kMyGiftsPerPage)
 		)).done([=](const MTPpayments_SavedStarGifts &result) {
diff --git a/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp b/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp
index 87bccbd272..3d2442b2d4 100644
--- a/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp
+++ b/Telegram/SourceFiles/data/components/recent_shared_media_gifts.cpp
@@ -49,6 +49,7 @@ void RecentSharedMediaGifts::request(
 		MTPpayments_GetSavedStarGifts(
 			MTP_flags(0),
 			peer->input,
+			MTP_int(0), // collection_id
 			MTP_string(QString()),
 			MTP_int(kMaxGifts)
 	)).done([=](const MTPpayments_SavedStarGifts &result) {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 8fd731a9e5..68a79563f6 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -348,6 +348,7 @@ void InnerWidget::loadMore() {
 	}
 	using Flag = MTPpayments_GetSavedStarGifts::Flag;
 	const auto filter = _filter.current();
+	const auto collectionId = 0;
 	_loadMoreRequestId = _api.request(MTPpayments_GetSavedStarGifts(
 		MTP_flags((filter.sortByValue ? Flag::f_sort_by_value : Flag())
 			| (filter.skipLimited ? Flag::f_exclude_limited : Flag())
@@ -356,6 +357,7 @@ void InnerWidget::loadMore() {
 			| (filter.skipSaved ? Flag::f_exclude_saved : Flag())
 			| (filter.skipUnsaved ? Flag::f_exclude_unsaved : Flag())),
 		_peer->input,
+		MTP_int(collectionId),
 		MTP_string(_reloading ? QString() : _offset),
 		MTP_int(kPerPage)
 	)).done([=](const MTPpayments_SavedStarGifts &result) {
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index c6e4c22b2c..6f84162365 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -248,7 +248,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#99e78045 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings = UserFull;
+userFull#29de80be flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -1890,8 +1890,8 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
-starGift#7f853c12 flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer = StarGift;
-starGiftUnique#f63778ae flags:# id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_stars:flags.4?long released_by:flags.5?Peer = StarGift;
+starGift#bcff5b flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int = StarGift;
+starGiftUnique#f63778ae flags:# require_premium:flags.6?true id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_stars:flags.4?long released_by:flags.5?Peer = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
 payments.starGifts#2ed82995 hash:int gifts:Vector<StarGift> chats:Vector<Chat> users:Vector<User> = payments.StarGifts;
@@ -1940,7 +1940,7 @@ payments.uniqueStarGift#caa2f60b gift:StarGift users:Vector<User> = payments.Uni
 
 messages.webPagePreview#b53e8b21 media:MessageMedia users:Vector<User> = messages.WebPagePreview;
 
-savedStarGift#dfda0499 flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int = SavedStarGift;
+savedStarGift#1ea646df flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int collection_id:flags.15?Vector<int> = SavedStarGift;
 
 payments.savedStarGifts#95f389b1 flags:# count:int chat_notifications_enabled:flags.1?Bool gifts:Vector<SavedStarGift> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.SavedStarGifts;
 
@@ -1989,6 +1989,13 @@ todoCompletion#4cc120b7 id:int completed_by:long date:int = TodoCompletion;
 
 suggestedPost#e8e37e5 flags:# accepted:flags.1?true rejected:flags.2?true price:flags.3?StarsAmount schedule_date:flags.0?int = SuggestedPost;
 
+starsRating#1b0e4f07 flags:# level:int current_level_stars:long stars:long next_level_stars:flags.0?long = StarsRating;
+
+starGiftCollection#9d6b13b0 flags:# collection_id:int title:string icon:flags.0?Document gifts_count:int hash:long = StarGiftCollection;
+
+payments.starGiftCollectionsNotModified#a0ba4f17 = payments.StarGiftCollections;
+payments.starGiftCollections#8a2932f3 collections:Vector<StarGiftCollection> = payments.StarGiftCollections;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2590,7 +2597,7 @@ payments.getStarGiftUpgradePreview#9c9abcb1 gift_id:long = payments.StarGiftUpgr
 payments.upgradeStarGift#aed6e4f5 flags:# keep_original_details:flags.0?true stargift:InputSavedStarGift = Updates;
 payments.transferStarGift#7f18176a stargift:InputSavedStarGift to_id:InputPeer = Updates;
 payments.getUniqueStarGift#a1974d72 slug:string = payments.UniqueStarGift;
-payments.getSavedStarGifts#23830de9 flags:# exclude_unsaved:flags.0?true exclude_saved:flags.1?true exclude_unlimited:flags.2?true exclude_limited:flags.3?true exclude_unique:flags.4?true sort_by_value:flags.5?true peer:InputPeer offset:string limit:int = payments.SavedStarGifts;
+payments.getSavedStarGifts#a319e569 flags:# exclude_unsaved:flags.0?true exclude_saved:flags.1?true exclude_unlimited:flags.2?true exclude_limited:flags.3?true exclude_unique:flags.4?true sort_by_value:flags.5?true peer:InputPeer collection_id:flags.6?int offset:string limit:int = payments.SavedStarGifts;
 payments.getSavedStarGift#b455a106 stargift:Vector<InputSavedStarGift> = payments.SavedStarGifts;
 payments.getStarGiftWithdrawalUrl#d06e93a8 stargift:InputSavedStarGift password:InputCheckPasswordSRP = payments.StarGiftWithdrawalUrl;
 payments.toggleChatStarGiftNotifications#60eaefa1 flags:# enabled:flags.0?true peer:InputPeer = Bool;
@@ -2598,6 +2605,11 @@ payments.toggleStarGiftsPinnedToTop#1513e7b0 peer:InputPeer stargift:Vector<Inpu
 payments.canPurchaseStore#4fdc5ea7 purpose:InputStorePaymentPurpose = Bool;
 payments.getResaleStarGifts#7a5fa236 flags:# sort_by_price:flags.1?true sort_by_num:flags.2?true attributes_hash:flags.0?long gift_id:long attributes:flags.3?Vector<StarGiftAttributeId> offset:string limit:int = payments.ResaleStarGifts;
 payments.updateStarGiftPrice#3baea4e1 stargift:InputSavedStarGift resell_stars:long = Updates;
+payments.createStarGiftCollection#1f4a0e87 peer:InputPeer title:string stargift:Vector<InputSavedStarGift> = StarGiftCollection;
+payments.updateStarGiftCollection#4fddbee7 flags:# peer:InputPeer collection_id:int title:flags.0?string delete_stargift:flags.1?Vector<InputSavedStarGift> add_stargift:flags.2?Vector<InputSavedStarGift> order:flags.3?Vector<InputSavedStarGift> = StarGiftCollection;
+payments.reorderStarGiftCollections#c32af4cc peer:InputPeer order:Vector<int> = Bool;
+payments.deleteStarGiftCollection#ad5648e8 peer:InputPeer collection_id:int = Bool;
+payments.getStarGiftCollections#981b91dd peer:InputPeer hash:long = payments.StarGiftCollections;
 
 stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true emojis:flags.5?true text_color:flags.6?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
 stickers.removeStickerFromSet#f7760f51 sticker:InputDocument = messages.StickerSet;
@@ -2720,4 +2732,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 209
+// LAYER 210

From fee892f9a239c254a88158610a259ff41c0e4e7f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Jul 2025 10:49:42 +0400
Subject: [PATCH 026/341] Call completionHandler if open panel was cancelled.

---
 Telegram/lib_webview | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 04c45d069f..f0fddc6f74 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 04c45d069fc0088740b9637bc5da414ee82be198
+Subproject commit f0fddc6f7486a16c9941347817704fa520c82471

From ccb8c43961cfecbf69c439ae89af656a4be682b3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Jul 2025 16:47:41 +0400
Subject: [PATCH 027/341] Support age verification for sensitive media.

---
 .../icons/settings/filled_verify_age.svg      |  12 +
 Telegram/Resources/langs/cloud_lang.strings   |   3 +
 Telegram/Resources/langs/lang.strings         |   7 +
 .../SourceFiles/api/api_sensitive_content.cpp |  24 +-
 .../SourceFiles/api/api_sensitive_content.h   |   4 +
 Telegram/SourceFiles/data/data_session.cpp    |   3 +
 .../view/media/history_view_media_common.cpp  | 336 +++++++++++++++---
 .../inline_bots/bot_attach_web_view.cpp       |   8 +
 .../inline_bots/bot_attach_web_view.h         |  14 +-
 Telegram/SourceFiles/lang/lang_tag.cpp        |  13 +-
 Telegram/SourceFiles/lang/lang_tag.h          |   1 +
 Telegram/SourceFiles/main/main_app_config.cpp |  16 +
 Telegram/SourceFiles/main/main_app_config.h   |   5 +
 Telegram/SourceFiles/settings/settings.style  |  15 +
 .../ui/chat/attach/attach_bot_webview.cpp     |  10 +
 .../ui/chat/attach/attach_bot_webview.h       |   1 +
 16 files changed, 416 insertions(+), 56 deletions(-)
 create mode 100644 Telegram/Resources/icons/settings/filled_verify_age.svg

diff --git a/Telegram/Resources/icons/settings/filled_verify_age.svg b/Telegram/Resources/icons/settings/filled_verify_age.svg
new file mode 100644
index 0000000000..2b13be56ca
--- /dev/null
+++ b/Telegram/Resources/icons/settings/filled_verify_age.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Filled / filled_verify_age</title>
+    <g id="Filled-/-filled_verify_age" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M36,34.9473684 C33.5842105,34.9473684 31.5592105,34.1302632 29.925,32.4960526 C28.2907895,30.8618421 27.4736842,28.8368421 27.4736842,26.4210526 C27.4736842,24.0526316 28.2907895,22.0394737 29.925,20.3815789 C31.5592105,18.7236842 33.5842105,17.8947368 36,17.8947368 C38.3684211,17.8947368 40.3815789,18.7236842 42.0394737,20.3815789 C43.6973684,22.0394737 44.5263158,24.0526316 44.5263158,26.4210526 C44.5263158,28.8368421 43.6973684,30.8618421 42.0394737,32.4960526 C40.3815789,34.1302632 38.3684211,34.9473684 36,34.9473684 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.9473684,49.6842105 L18.9473684,47.1263158 C18.9473684,46.1315789 19.1960526,45.1960526 19.6934211,44.3197368 C20.1907895,43.4434211 20.8657895,42.7447368 21.7184211,42.2236842 C23.8973684,40.9447368 26.1828947,39.9736842 28.575,39.3105263 C30.9671053,38.6473684 33.4421053,38.3157895 36,38.3157895 C38.5578947,38.3157895 41.0328947,38.6473684 43.425,39.3105263 C45.8171053,39.9736842 48.1026316,40.9447368 50.2815789,42.2236842 C51.1342105,42.7447368 51.8092105,43.4434211 52.3065789,44.3197368 C52.8039474,45.1960526 53.0526316,46.1315789 53.0526316,47.1263158 L53.0526316,49.6842105 C53.0526316,50.4894737 52.7802632,51.1644737 52.2355263,51.7092105 C51.6907895,52.2539474 51.0157895,52.5263158 50.2105263,52.5263158 L21.7894737,52.5263158 C20.9842105,52.5263158 20.3092105,52.2539474 19.7644737,51.7092105 C19.2197368,51.1644737 18.9473684,50.4894737 18.9473684,49.6842105 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M11.6842105,66 C10.1210526,66 8.78289474,65.4434211 7.66973684,64.3302632 C6.55657895,63.2171053 6,61.8789474 6,60.3157895 L6,51.7894737 C6,50.9842105 6.27236842,50.3092105 6.81710526,49.7644737 C7.36184211,49.2197368 8.03684211,48.9473684 8.84210526,48.9473684 C9.64736842,48.9473684 10.3223684,49.2197368 10.8671053,49.7644737 C11.4118421,50.3092105 11.6842105,50.9842105 11.6842105,51.7894737 L11.6842105,60.3157895 L20.2105263,60.3157895 C21.0157895,60.3157895 21.6907895,60.5881579 22.2355263,61.1328947 C22.7802632,61.6776316 23.0526316,62.3526316 23.0526316,63.1578947 C23.0526316,63.9631579 22.7802632,64.6381579 22.2355263,65.1828947 C21.6907895,65.7276316 21.0157895,66 20.2105263,66 L11.6842105,66 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M6,20.2105263 L6,11.6842105 C6,10.1210526 6.55657895,8.78289474 7.66973684,7.66973684 C8.78289474,6.55657895 10.1210526,6 11.6842105,6 L20.2105263,6 C21.0157895,6 21.6907895,6.27236842 22.2355263,6.81710526 C22.7802632,7.36184211 23.0526316,8.03684211 23.0526316,8.84210526 C23.0526316,9.64736842 22.7802632,10.3223684 22.2355263,10.8671053 C21.6907895,11.4118421 21.0157895,11.6842105 20.2105263,11.6842105 L11.6842105,11.6842105 L11.6842105,20.2105263 C11.6842105,21.0157895 11.4118421,21.6907895 10.8671053,22.2355263 C10.3223684,22.7802632 9.64736842,23.0526316 8.84210526,23.0526316 C8.03684211,23.0526316 7.36184211,22.7802632 6.81710526,22.2355263 C6.27236842,21.6907895 6,21.0157895 6,20.2105263 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M60.3157895,66 L51.7894737,66 C50.9842105,66 50.3092105,65.7276316 49.7644737,65.1828947 C49.2197368,64.6381579 48.9473684,63.9631579 48.9473684,63.1578947 C48.9473684,62.3526316 49.2197368,61.6776316 49.7644737,61.1328947 C50.3092105,60.5881579 50.9842105,60.3157895 51.7894737,60.3157895 L60.3157895,60.3157895 L60.3157895,51.7894737 C60.3157895,50.9842105 60.5881579,50.3092105 61.1328947,49.7644737 C61.6776316,49.2197368 62.3526316,48.9473684 63.1578947,48.9473684 C63.9631579,48.9473684 64.6381579,49.2197368 65.1828947,49.7644737 C65.7276316,50.3092105 66,50.9842105 66,51.7894737 L66,60.3157895 C66,61.8789474 65.4434211,63.2171053 64.3302632,64.3302632 C63.2171053,65.4434211 61.8789474,66 60.3157895,66 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M60.3157895,20.2105263 L60.3157895,11.6842105 L51.7894737,11.6842105 C50.9842105,11.6842105 50.3092105,11.4118421 49.7644737,10.8671053 C49.2197368,10.3223684 48.9473684,9.64736842 48.9473684,8.84210526 C48.9473684,8.03684211 49.2197368,7.36184211 49.7644737,6.81710526 C50.3092105,6.27236842 50.9842105,6 51.7894737,6 L60.3157895,6 C61.8789474,6 63.2171053,6.55657895 64.3302632,7.66973684 C65.4434211,8.78289474 66,10.1210526 66,11.6842105 L66,20.2105263 C66,21.0157895 65.7276316,21.6907895 65.1828947,22.2355263 C64.6381579,22.7802632 63.9631579,23.0526316 63.1578947,23.0526316 C62.3526316,23.0526316 61.6776316,22.7802632 61.1328947,22.2355263 C60.5881579,21.6907895 60.3157895,21.0157895 60.3157895,20.2105263 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/langs/cloud_lang.strings b/Telegram/Resources/langs/cloud_lang.strings
index c7e33531c0..3776c023a4 100644
--- a/Telegram/Resources/langs/cloud_lang.strings
+++ b/Telegram/Resources/langs/cloud_lang.strings
@@ -13,6 +13,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "cloud_lng_topup_purpose_subs" = "Buy **Stars** to keep your channel subscriptions.";
 
+"cloud_lng_age_verify_about_gb#one" = "To access such content, you must confirm that you are at least **{count}** year old as required by UK law.";
+"cloud_lng_age_verify_about_gb#other" = "To access such content, you must confirm that you are at least **{count}** years old as required by UK law.";
+
 "cloud_lng_passport_in_ar" = "Arabic";
 "cloud_lng_passport_in_az" = "Azerbaijani";
 "cloud_lng_passport_in_bg" = "Bulgarian";
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index cfeb51a1eb..0b988fb211 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -6756,6 +6756,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_frozen_text3" = "Appeal via {link} before {date}, or your account will be deleted.";
 "lng_frozen_appeal_button" = "Submit an Appeal";
 
+"lng_age_verify_title" = "Age Verification";
+"lng_age_verify_mobile" = "Please open this media in the official Telegram app for Android or iOS to verify your age.";
+"lng_age_verify_here" = "This is a one-time process using your phone's camera. Your selfie will not be stored by Telegram.";
+"lng_age_verify_button" = "Verify My Age";
+"lng_age_verify_sorry_title" = "Age Check Failed";
+"lng_age_verify_sorry_text" = "Sorry, you can't view 18+ content.";
+
 "lng_context_bank_card_copy" = "Copy Card Number";
 "lng_context_bank_card_copied" = "Card number copied to clipboard.";
 
diff --git a/Telegram/SourceFiles/api/api_sensitive_content.cpp b/Telegram/SourceFiles/api/api_sensitive_content.cpp
index 31f83f5eba..e1e25950e8 100644
--- a/Telegram/SourceFiles/api/api_sensitive_content.cpp
+++ b/Telegram/SourceFiles/api/api_sensitive_content.cpp
@@ -25,7 +25,7 @@ SensitiveContent::SensitiveContent(not_null<ApiWrap*> api)
 }
 
 void SensitiveContent::preload() {
-	if (!_loaded) {
+	if (!_loaded && !_loadRequestId) {
 		reload();
 	}
 }
@@ -37,7 +37,6 @@ void SensitiveContent::reload(bool force) {
 		}
 		return;
 	}
-	_loaded = true;
 	_loadRequestId = _api.request(MTPaccount_GetContentSettings(
 	)).done([=](const MTPaccount_ContentSettings &result) {
 		_loadRequestId = 0;
@@ -50,6 +49,10 @@ void SensitiveContent::reload(bool force) {
 			_enabled = enabled;
 			_canChange = canChange;
 		}
+		if (!_loaded) {
+			_loaded = true;
+			_loadedChanged.fire({});
+		}
 		if (base::take(_appConfigReloadForce) || changed) {
 			_appConfigReloadTimer.callOnce(kRefreshAppConfigTimeout);
 		}
@@ -61,6 +64,19 @@ void SensitiveContent::reload(bool force) {
 	}).send();
 }
 
+bool SensitiveContent::loaded() const {
+	return _loaded;
+}
+
+rpl::producer<bool> SensitiveContent::loadedValue() const {
+	if (_loaded) {
+		return rpl::single(true);
+	}
+	return rpl::single(false) | rpl::then(
+		_loadedChanged.events() | rpl::map_to(true)
+	);
+}
+
 bool SensitiveContent::enabledCurrent() const {
 	return _enabled.current();
 }
@@ -69,6 +85,10 @@ rpl::producer<bool> SensitiveContent::enabled() const {
 	return _enabled.value();
 }
 
+bool SensitiveContent::canChangeCurrent() const {
+	return _canChange.current();
+}
+
 rpl::producer<bool> SensitiveContent::canChange() const {
 	return _canChange.value();
 }
diff --git a/Telegram/SourceFiles/api/api_sensitive_content.h b/Telegram/SourceFiles/api/api_sensitive_content.h
index 576bf275f3..e35f8cbf46 100644
--- a/Telegram/SourceFiles/api/api_sensitive_content.h
+++ b/Telegram/SourceFiles/api/api_sensitive_content.h
@@ -26,12 +26,16 @@ public:
 	void reload(bool force = false);
 	void update(bool enabled);
 
+	[[nodiscard]] bool loaded() const;
+	[[nodiscard]] rpl::producer<bool> loadedValue() const;
 	[[nodiscard]] bool enabledCurrent() const;
 	[[nodiscard]] rpl::producer<bool> enabled() const;
+	[[nodiscard]] bool canChangeCurrent() const;
 	[[nodiscard]] rpl::producer<bool> canChange() const;
 
 private:
 	const not_null<Main::Session*> _session;
+	rpl::event_stream<> _loadedChanged;
 	MTP::Sender _api;
 	mtpRequestId _loadRequestId = 0;
 	mtpRequestId _saveRequestId = 0;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index ec2569bf55..f3c306a350 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1399,6 +1399,9 @@ UserData *Session::userByPhone(const QString &phone) const {
 
 PeerData *Session::peerByUsername(const QString &username) const {
 	const auto uname = username.trimmed();
+	if (uname.isEmpty()) {
+		return nullptr;
+	}
 	for (const auto &[peerId, peer] : _peers) {
 		if (peer->isLoaded()
 			&& !peer->username().compare(uname, Qt::CaseInsensitive)) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index b899d9fc98..b1e9eeb3ad 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_sensitive_content.h"
 #include "api/api_views.h"
 #include "apiwrap.h"
+#include "inline_bots/bot_attach_web_view.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
@@ -18,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/checkbox.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/painter.h"
+#include "core/application.h"
 #include "core/click_handler_types.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
@@ -34,18 +36,77 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item.h"
 #include "history/history.h"
 #include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "mainwindow.h"
 #include "media/streaming/media_streaming_utility.h"
 #include "payments/payments_checkout_process.h"
 #include "payments/payments_non_panel_process.h"
+#include "settings/settings_common.h"
+#include "webrtc/webrtc_environment.h"
+#include "webview/webview_interface.h"
 #include "window/window_session_controller.h"
 #include "styles/style_chat.h"
+#include "styles/style_layers.h"
+#include "styles/style_settings.h"
 
 namespace HistoryView {
 namespace {
 
 constexpr auto kMediaUnlockedTooltipDuration = 5 * crl::time(1000);
+const auto kVerifyAgeAboutPrefix = "cloud_lng_age_verify_about_";
+
+rpl::producer<TextWithEntities> AgeVerifyAbout(
+		not_null<Main::Session*> session) {
+	const auto appConfig = &session->appConfig();
+	return rpl::single(
+		rpl::empty
+	) | rpl::then(
+		Lang::Updated()
+	) | rpl::map([=] {
+		const auto country = appConfig->ageVerifyCountry().toLower();
+		const auto age = appConfig->ageVerifyMinAge();
+		const auto [shift, string] = Lang::Plural(
+			Lang::kPluralKeyBaseForCloudValue,
+			age,
+			lt_count);
+		const auto postfixes = {
+			"#zero",
+			"#one",
+			"#two",
+			"#few",
+			"#many",
+			"#other"
+		};
+		Assert(shift >= 0 && shift < postfixes.size());
+		const auto postfix = *(begin(postfixes) + shift);
+		return Ui::Text::RichLangValue(u"To access such content, you must confirm that you are at least **{count}** years old as required by UK law."_q.replace(u"{count}"_q, string));
+		return Ui::Text::RichLangValue(Lang::GetNonDefaultValue(
+			kVerifyAgeAboutPrefix + country.toUtf8() + postfix AssertIsDebug(test_this)
+		).replace(u"{count}"_q, string));
+	});
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> AgeVerifyIcon(
+		not_null<QWidget*> parent) {
+	const auto padding = st::settingsAgeVerifyIconPadding;
+	const auto full = st::settingsAgeVerifyIcon.size().grownBy(padding);
+	auto result = object_ptr<Ui::RpWidget>(parent);
+	const auto raw = result.data();
+	raw->resize(full);
+	raw->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(raw);
+		const auto x = (raw->width() - full.width()) / 2;
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::windowBgActive);
+		p.setPen(Qt::NoPen);
+		const auto inner = QRect(QPoint(x, 0), full);
+		p.drawEllipse(inner);
+		st::settingsAgeVerifyIcon.paintInCenter(p, inner);
+	}, raw->lifetime());
+	return result;
+}
 
 } // namespace
 
@@ -278,61 +339,246 @@ ClickHandlerPtr MakePaidMediaLink(not_null<HistoryItem*> item) {
 	});
 }
 
+void ShowAgeVerification(
+		std::shared_ptr<Ui::Show> show,
+		not_null<UserData*> bot,
+		Fn<void()> reveal) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setNoContentMargin(true);
+		box->setStyle(st::settingsAgeVerifyBox);
+		box->setWidth(st::boxWideWidth);
+
+		box->addRow(AgeVerifyIcon(box), st::settingsAgeVerifyIconMargin);
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_age_verify_title(),
+				st::settingsAgeVerifyTitle),
+			st::boxRowPadding + st::settingsAgeVerifyMargin);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				AgeVerifyAbout(&bot->session()),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_age_verify_here(Ui::Text::RichLangValue),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin);
+
+		const auto weak = QPointer<Ui::GenericBox>(box);
+		const auto done = crl::guard(&bot->session(), [=](int age) {
+			const auto min = bot->session().appConfig().ageVerifyMinAge();
+			if (age >= min) {
+				reveal();
+				bot->session().api().sensitiveContent().update(true);
+			} else {
+				show->showToast({
+					.title = tr::lng_age_verify_sorry_title(tr::now),
+					.text = tr::lng_age_verify_sorry_text(tr::now),
+					.duration = Ui::Toast::kDefaultDuration * 3,
+				});
+			}
+			if (const auto strong = weak.data()) {
+				strong->closeBox();
+			}
+		});
+		const auto button = box->addButton(tr::lng_age_verify_button(), [=] {
+			bot->session().attachWebView().open({
+				.bot = bot,
+				.context = { .maySkipConfirmation = true },
+				.source = InlineBots::WebViewSourceAgeVerification{
+					.done = done,
+				},
+			});
+		});
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			const auto &padding = st::settingsAgeVerifyBox.buttonPadding;
+			button->resizeToWidth(width
+				- padding.left()
+				- padding.right());
+			button->moveToLeft(padding.left(), padding.top());
+		}, button->lifetime());
+	}));
+}
+
+void ShowAgeVerificationMobile(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_age_verify_title());
+		box->setWidth(st::boxWideWidth);
+
+		const auto size = st::settingsCloudPasswordIconSize;
+		auto icon = Settings::CreateLottieIcon(
+			box->verticalLayout(),
+			{
+				.name = u"phone"_q,
+				.sizeOverride = { size, size },
+			},
+			st::peerAppearanceIconPadding);
+
+		box->showFinishes(
+		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+			animate(anim::repeat::once);
+		}, box->lifetime());
+
+		box->addRow(std::move(icon.widget));
+
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				AgeVerifyAbout(session),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin);
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_age_verify_mobile(Ui::Text::RichLangValue),
+				st::settingsAgeVerifyText),
+			st::boxRowPadding + st::settingsAgeVerifyMargin);
+
+		box->addButton(tr::lng_box_ok(), [=] {
+			box->closeBox();
+		});
+	}));
+}
+
+void ShowAgeVerificationRequired(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		Fn<void()> reveal) {
+	struct State {
+		Fn<void()> check;
+		rpl::lifetime lifetime;
+		std::optional<PeerData*> bot;
+	};
+	const auto state = std::make_shared<State>();
+	const auto username = session->appConfig().ageVerifyBotUsername();
+	const auto bot = session->data().peerByUsername(username);
+	if (username.isEmpty() || bot) {
+		state->bot = bot;
+	} else {
+		session->api().request(MTPcontacts_ResolveUsername(
+			MTP_flags(0),
+			MTP_string(username),
+			MTPstring()
+		)).done([=](const MTPcontacts_ResolvedPeer &result) {
+			const auto &data = result.data();
+			session->data().processUsers(data.vusers());
+			session->data().processChats(data.vchats());
+			const auto botId = peerFromMTP(data.vpeer());
+			state->bot = session->data().peerLoaded(botId);
+			state->check();
+		}).fail([=] {
+			state->bot = nullptr;
+			state->check();
+		}).send();
+	}
+	state->check = [=] {
+		const auto sensitive = &session->api().sensitiveContent();
+		const auto ready = sensitive->loaded();
+		if (!ready) {
+			state->lifetime = sensitive->loadedValue(
+			) | rpl::filter(
+				rpl::mappers::_1
+			) | rpl::take(1) | rpl::start_with_next(state->check);
+			return;
+		} else if (!state->bot.has_value()) {
+			return;
+		}
+		const auto has = Core::App().mediaDevices().recordAvailability();
+		const auto available = Webview::Availability();
+		const auto bot = (*state->bot)->asUser();
+		if (available.error == Webview::Available::Error::None
+			&& has == Webrtc::RecordAvailability::VideoAndAudio
+			&& sensitive->canChangeCurrent()
+			&& bot
+			&& bot->isBot()
+			&& bot->botInfo->hasMainApp) {
+			ShowAgeVerification(show, bot, reveal);
+		} else {
+			ShowAgeVerificationMobile(show, session);
+		}
+		state->lifetime.destroy();
+		state->check = nullptr;
+	};
+	state->check();
+}
+
+void ShowSensitiveConfirm(
+		std::shared_ptr<Ui::Show> show,
+		not_null<Main::Session*> session,
+		Fn<void()> reveal) {
+	show->show(Box([=](not_null<Ui::GenericBox*> box) {
+		struct State {
+			rpl::variable<bool> canChange;
+			Ui::Checkbox *checkbox = nullptr;
+		};
+		const auto state = box->lifetime().make_state<State>();
+		const auto sensitive = &session->api().sensitiveContent();
+		state->canChange = sensitive->canChange();
+		const auto done = [=](Fn<void()> close) {
+			if (state->canChange.current()
+				&& state->checkbox->checked()) {
+				show->showToast({
+					.text = tr::lng_sensitive_toast(
+						tr::now,
+						Ui::Text::RichLangValue),
+					.adaptive = true,
+					.duration = 5 * crl::time(1000),
+				});
+				sensitive->update(true);
+			} else {
+				reveal();
+			}
+			close();
+		};
+		Ui::ConfirmBox(box, {
+			.text = tr::lng_sensitive_text(Ui::Text::RichLangValue),
+			.confirmed = done,
+			.confirmText = tr::lng_sensitive_view(),
+			.title = tr::lng_sensitive_title(),
+		});
+		const auto skip = st::defaultCheckbox.margin.bottom();
+		const auto wrap = box->addRow(
+			object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
+				box,
+				object_ptr<Ui::Checkbox>(
+					box,
+					tr::lng_sensitive_always(tr::now),
+					false)),
+			st::boxRowPadding + QMargins(0, 0, 0, skip));
+		wrap->toggleOn(state->canChange.value());
+		wrap->finishAnimating();
+		state->checkbox = wrap->entity();
+	}));
+}
+
 ClickHandlerPtr MakeSensitiveMediaLink(
 		ClickHandlerPtr reveal,
 		not_null<HistoryItem*> item) {
 	const auto session = &item->history()->session();
+	session->api().sensitiveContent().preload();
+
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
+		const auto plain = [reveal, context] {
+			reveal->onClick(context);
+		};
 		const auto my = context.other.value<ClickHandlerContext>();
 		const auto controller = my.sessionWindow.get();
 		const auto show = controller ? controller->uiShow() : my.show;
 		if (!show) {
-			reveal->onClick(context);
-			return;
+			plain();
+		} else if (session->appConfig().ageVerifyNeeded()) {
+			ShowAgeVerificationRequired(show, session, plain);
+		} else {
+			ShowSensitiveConfirm(show, session, plain);
 		}
-		show->show(Box([=](not_null<Ui::GenericBox*> box) {
-			struct State {
-				rpl::variable<bool> canChange;
-				Ui::Checkbox *checkbox = nullptr;
-			};
-			const auto state = box->lifetime().make_state<State>();
-			const auto sensitive = &session->api().sensitiveContent();
-			state->canChange = sensitive->canChange();
-			const auto done = [=](Fn<void()> close) {
-				if (state->canChange.current()
-					&& state->checkbox->checked()) {
-					show->showToast({
-						.text = tr::lng_sensitive_toast(
-							tr::now,
-							Ui::Text::RichLangValue),
-						.adaptive = true,
-						.duration = 5 * crl::time(1000),
-					});
-					sensitive->update(true);
-				} else {
-					reveal->onClick(context);
-				}
-				close();
-			};
-			Ui::ConfirmBox(box, {
-				.text = tr::lng_sensitive_text(Ui::Text::RichLangValue),
-				.confirmed = done,
-				.confirmText = tr::lng_sensitive_view(),
-				.title = tr::lng_sensitive_title(),
-			});
-			const auto skip = st::defaultCheckbox.margin.bottom();
-			const auto wrap = box->addRow(
-				object_ptr<Ui::SlideWrap<Ui::Checkbox>>(
-					box,
-					object_ptr<Ui::Checkbox>(
-						box,
-						tr::lng_sensitive_always(tr::now),
-						false)),
-				st::boxRowPadding + QMargins(0, 0, 0, skip));
-			wrap->toggleOn(state->canChange.value());
-			wrap->finishAnimating();
-			state->checkbox = wrap->entity();
-		}));
 	});
 }
 
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 70901ecd7f..36e907923f 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -931,6 +931,8 @@ void WebViewInstance::resolve() {
 				requestMain();
 			});
 		}
+	}, [&](WebViewSourceAgeVerification) {
+		requestMain();
 	});
 }
 
@@ -1997,6 +1999,12 @@ void WebViewInstance::botDownloadFile(
 	}).send();
 }
 
+void WebViewInstance::botVerifyAge(int age) {
+	if (v::is<WebViewSourceAgeVerification>(_source)) {
+		v::get<WebViewSourceAgeVerification>(_source).done(age);
+	}
+}
+
 void WebViewInstance::botOpenPrivacyPolicy() {
 	const auto bot = _bot;
 	const auto weak = _context.controller;
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index 442cc3fc78..e7fe7f281e 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -163,6 +163,16 @@ struct WebViewSourceBotProfile {
 		WebViewSourceBotProfile) = default;
 };
 
+struct WebViewSourceAgeVerification {
+	Fn<void(int)> done;
+
+	friend inline bool operator==(
+			WebViewSourceAgeVerification,
+			WebViewSourceAgeVerification) {
+		return true;
+	}
+};
+
 struct WebViewSource : std::variant<
 	WebViewSourceButton,
 	WebViewSourceSwitch,
@@ -173,7 +183,8 @@ struct WebViewSource : std::variant<
 	WebViewSourceAttachMenu,
 	WebViewSourceBotMenu,
 	WebViewSourceGame,
-	WebViewSourceBotProfile> {
+	WebViewSourceBotProfile,
+	WebViewSourceAgeVerification> {
 	using variant::variant;
 };
 
@@ -291,6 +302,7 @@ private:
 		Ui::BotWebView::SetEmojiStatusRequest request) override;
 	void botDownloadFile(
 		Ui::BotWebView::DownloadFileRequest request) override;
+	void botVerifyAge(int age) override;
 	void botOpenPrivacyPolicy() override;
 	void botClose() override;
 
diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp
index 02620f2e1d..5136a67a5e 100644
--- a/Telegram/SourceFiles/lang/lang_tag.cpp
+++ b/Telegram/SourceFiles/lang/lang_tag.cpp
@@ -1004,14 +1004,11 @@ PluralResult Plural(
 	const auto t = f;
 
 	const auto useNonDefaultPlural = (ChoosePlural != ChoosePluralDefault)
-		&& Lang::details::IsNonDefaultPlural(keyBase);
-	const auto shift = (useNonDefaultPlural ? ChoosePlural : ChoosePluralDefault)(
-		(integer ? i : -1),
-		i,
-		v,
-		w,
-		f,
-		t);
+		&& (keyBase == kPluralKeyBaseForCloudValue
+			|| Lang::details::IsNonDefaultPlural(keyBase));
+	const auto shift = (useNonDefaultPlural
+		? ChoosePlural
+		: ChoosePluralDefault)((integer ? i : -1), i, v, w, f, t);
 	if (integer) {
 		const auto round = qRound(value);
 		if (type == lt_count_short) {
diff --git a/Telegram/SourceFiles/lang/lang_tag.h b/Telegram/SourceFiles/lang/lang_tag.h
index 40f3ef9972..3d0f231186 100644
--- a/Telegram/SourceFiles/lang/lang_tag.h
+++ b/Telegram/SourceFiles/lang/lang_tag.h
@@ -38,6 +38,7 @@ struct PluralResult {
 	int keyShift = 0;
 	QString replacement;
 };
+inline constexpr auto kPluralKeyBaseForCloudValue = ushort(-1);
 PluralResult Plural(
 	ushort keyBase,
 	float64 value,
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index b65c104555..ea8561669e 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -208,6 +208,22 @@ TimeId AppConfig::suggestedPostAgeMin() const {
 	return get<int>(u"stars_suggested_post_age_min"_q, 86400);
 }
 
+bool AppConfig::ageVerifyNeeded() const {
+	return get<bool>(u"need_age_video_verification"_q, false);
+}
+
+QString AppConfig::ageVerifyCountry() const {
+	return get<QString>(u"verify_age_country"_q, QString());
+}
+
+int AppConfig::ageVerifyMinAge() const {
+	return get<int>(u"verify_age_min"_q, 18);
+}
+
+QString AppConfig::ageVerifyBotUsername() const {
+	return get<QString>(u"verify_age_bot_username"_q, QString());
+}
+
 void AppConfig::refresh(bool force) {
 	if (_requestId || !_api) {
 		if (force) {
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index a2ea65f426..c5ba22ee40 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -102,6 +102,11 @@ public:
 	[[nodiscard]] int suggestedPostDelayMax() const;
 	[[nodiscard]] TimeId suggestedPostAgeMin() const;
 
+	[[nodiscard]] bool ageVerifyNeeded() const;
+	[[nodiscard]] QString ageVerifyCountry() const;
+	[[nodiscard]] int ageVerifyMinAge() const;
+	[[nodiscard]] QString ageVerifyBotUsername() const;
+
 	void refresh(bool force = false);
 
 private:
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index b153dbe371..70dded5edc 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -705,3 +705,18 @@ settingsCreditsButton: SettingsButton(settingsButton) {
 }
 settingsButtonIconGift: icon {{ "settings/gift", menuIconColor }};
 settingsButtonIconEarn: icon {{ "settings/earn", menuIconColor }};
+
+settingsAgeVerifyBox: Box(filterInviteBox) {
+	buttonPadding: margins(24px, 24px, 24px, 24px);
+}
+settingsAgeVerifyText: FlatLabel(defaultFlatLabel) {
+	minWidth: 200px;
+	align: align(top);
+}
+settingsAgeVerifyMargin: margins(0px, 6px, 0px, 6px);
+settingsAgeVerifyTitle: FlatLabel(boxTitle) {
+	align: align(top);
+}
+settingsAgeVerifyIcon: icon {{ "settings/filled_verify_age-48x48", windowFgActive }};
+settingsAgeVerifyIconPadding: margins(16px, 16px, 16px, 16px);
+settingsAgeVerifyIconMargin: margins(0px, 24px, 0px, 14px);
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 526dceceed..525bc4eb05 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -1011,6 +1011,16 @@ bool Panel::createWebview(const Webview::ThemeParams &params) {
 			secureStorageFailed(arguments);
 		} else if (command == "web_app_secure_storage_clear") {
 			secureStorageFailed(arguments);
+		} else if (command == "web_app_verify_age") {
+			const auto passed = arguments["passed"];
+			const auto detected = arguments["age"];
+			const auto valid = passed.isBool()
+				&& passed.toBool()
+				&& detected.isDouble();
+			const auto age = valid
+				? int(std::floor(detected.toDouble()))
+				: 0;
+			_delegate->botVerifyAge(age);
 		} else if (command == "share_score") {
 			_delegate->botHandleMenuButton(MenuButton::ShareGame);
 		}
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
index 72edb0b391..63b11fc624 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.h
@@ -105,6 +105,7 @@ public:
 	virtual void botDownloadFile(DownloadFileRequest request) = 0;
 	virtual void botSendPreparedMessage(
 		SendPreparedMessageRequest request) = 0;
+	virtual void botVerifyAge(int age) = 0;
 	virtual void botOpenPrivacyPolicy() = 0;
 	virtual void botClose() = 0;
 };

From 427487c5988f4726de6e5720f5dc19ec47efe61e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Jul 2025 17:03:36 +0400
Subject: [PATCH 028/341] Verify age in sensitive toggle settings.

---
 .../view/media/history_view_media_common.cpp  | 12 +++++++++++
 .../view/media/history_view_media_common.h    | 13 ++++++++++++
 .../settings/settings_privacy_security.cpp    | 21 +++++++++++++++----
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index b1e9eeb3ad..ef939886d6 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -403,6 +403,18 @@ void ShowAgeVerification(
 				- padding.right());
 			button->moveToLeft(padding.left(), padding.top());
 		}, button->lifetime());
+
+		const auto close = Ui::CreateChild<Ui::IconButton>(
+			box.get(),
+			st::boxTitleClose);
+		close->setClickedCallback([=] {
+			box->closeBox();
+		});
+		box->widthValue(
+		) | rpl::start_with_next([=](int width) {
+			close->moveToRight(0, 0);
+		}, box->lifetime());
+		crl::on_main(close, [=] { close->raise(); });
 	}));
 }
 
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.h b/Telegram/SourceFiles/history/view/media/history_view_media_common.h
index 03646372f5..be8fdba808 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.h
@@ -19,10 +19,18 @@ namespace Data {
 class Media;
 } // namespace Data
 
+namespace Main {
+class Session;
+} // namespace Main
+
 namespace Media::Streaming {
 struct ExpandDecision;
 } // namespace Media::Streaming
 
+namespace Ui {
+class Show;
+} // namespace Ui
+
 namespace HistoryView {
 
 class Media;
@@ -75,6 +83,11 @@ void PaintInterpolatedIcon(
 	int newWidth,
 	int maxWidth);
 
+void ShowAgeVerificationRequired(
+	std::shared_ptr<Ui::Show> show,
+	not_null<Main::Session*> session,
+	Fn<void()> reveal);
+
 [[nodiscard]] ClickHandlerPtr MakePaidMediaLink(
 	not_null<HistoryItem*> item);
 [[nodiscard]] ClickHandlerPtr MakeSensitiveMediaLink(
diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index 4c1910297e..fcc1d3fd5c 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/self_destruction_box.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "history/view/media/history_view_media_common.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
@@ -971,7 +972,9 @@ void SetupSensitiveContent(
 	Ui::AddSkip(inner);
 	Ui::AddSubsectionTitle(inner, tr::lng_settings_sensitive_title());
 
+	const auto show = controller->uiShow();
 	const auto session = &controller->session();
+	const auto disable = inner->lifetime().make_state<rpl::event_stream<>>();
 
 	std::move(
 		updateTrigger
@@ -982,13 +985,23 @@ void SetupSensitiveContent(
 		inner,
 		tr::lng_settings_sensitive_disable_filtering(),
 		st::settingsButtonNoIcon
-	))->toggleOn(
-		session->api().sensitiveContent().enabled()
-	)->toggledChanges(
+	))->toggleOn(rpl::merge(
+		session->api().sensitiveContent().enabled(),
+		disable->events() | rpl::map_to(false)
+	))->toggledChanges(
 	) | rpl::filter([=](bool toggled) {
 		return toggled != session->api().sensitiveContent().enabledCurrent();
 	}) | rpl::start_with_next([=](bool toggled) {
-		session->api().sensitiveContent().update(toggled);
+		if (toggled && session->appConfig().ageVerifyNeeded()) {
+			disable->fire({});
+
+			HistoryView::ShowAgeVerificationRequired(
+				show,
+				session,
+				[] {});
+		} else {
+			session->api().sensitiveContent().update(toggled);
+		}
 	}, container->lifetime());
 
 	Ui::AddSkip(inner);

From 62aec345071565bd37db0c2f62caf8a93e9990b5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Jul 2025 12:05:44 +0400
Subject: [PATCH 029/341] Fix crash in official verify age bot open.

---
 .../SourceFiles/history/view/media/history_view_media_common.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index ef939886d6..0e6ead19c7 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -389,6 +389,7 @@ void ShowAgeVerification(
 		const auto button = box->addButton(tr::lng_age_verify_button(), [=] {
 			bot->session().attachWebView().open({
 				.bot = bot,
+				.parentShow = box->uiShow(),
 				.context = { .maySkipConfirmation = true },
 				.source = InlineBots::WebViewSourceAgeVerification{
 					.done = done,

From 4b85c9e2df4bdcf0f40534c2eddb3e6ad8a2133d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Jul 2025 12:06:00 +0400
Subject: [PATCH 030/341] Add spoilers to shared GIFs.

---
 .../info/media/info_media_provider.cpp        |  11 ++
 .../SourceFiles/overview/overview_layout.cpp  | 154 ++++++++++++++++--
 .../SourceFiles/overview/overview_layout.h    |  18 +-
 3 files changed, 164 insertions(+), 19 deletions(-)

diff --git a/Telegram/SourceFiles/info/media/info_media_provider.cpp b/Telegram/SourceFiles/info/media/info_media_provider.cpp
index 88f47bc755..14553f7958 100644
--- a/Telegram/SourceFiles/info/media/info_media_provider.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_provider.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_list_section.h"
 #include "info/info_controller.h"
 #include "layout/layout_selection.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "lang/lang_keys.h"
 #include "history/history.h"
@@ -59,6 +60,16 @@ Provider::Provider(not_null<AbstractController*> controller)
 			layout.second.item->invalidateCache();
 		}
 	}, _lifetime);
+
+	_controller->session().appConfig().ignoredRestrictionReasonsChanges(
+	) | rpl::start_with_next([=](std::vector<QString> &&changed) {
+		const auto sensitive = Data::UnavailableReason::Sensitive();
+		if (ranges::contains(changed, sensitive.reason)) {
+			for (auto &[id, layout] : _layouts) {
+				layout.item->maybeClearSensitiveSpoiler();
+			}
+		}
+	}, _lifetime);
 }
 
 Type Provider::type() {
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index af3317ca02..c80ffec3e5 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_components.h"
 #include "history/history_item_helpers.h"
 #include "history/view/history_view_cursor_state.h"
+#include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_document.h" // DrawThumbnailAsSongCover
 #include "base/unixtime.h"
 #include "ui/effects/round_checkbox.h"
@@ -98,6 +99,27 @@ constexpr auto kStoryRatio = 1.46;
 	}
 }
 
+void PaintSensitiveTag(Painter &p, QRect r) {
+	auto text = Ui::Text::String();
+	text.setText(
+		st::semiboldTextStyle,
+		tr::lng_sensitive_tag(tr::now));
+	const auto width = text.maxWidth();
+	const auto inner = QRect(0, 0, width, text.minHeight());
+	const auto outer = style::centerrect(r, inner.marginsAdded(st::paidTagPadding));
+	const auto size = outer.size();
+	const auto radius = std::min(size.width(), size.height()) / 2;
+	auto hq = PainterHighQualityEnabler(p);
+
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::radialBg);
+	p.drawRoundedRect(outer, radius, radius);
+	p.setPen(st::radialFg);
+	text.draw(p, {
+		.position = outer.marginsRemoved(st::paidTagPadding).topLeft(),
+	});
+}
+
 } // namespace
 
 class Checkbox {
@@ -327,18 +349,21 @@ Photo::Photo(
 	MediaOptions options)
 : ItemBase(delegate, parent)
 , _data(photo)
-, _link(std::make_shared<PhotoOpenClickHandler>(
-	photo,
-	crl::guard(this, [=](FullMsgId id) {
-		clearSpoiler();
-		delegate->openPhoto(photo, id);
-	}),
-	parent->fullId()))
-, _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
-	delegate->repaintItem(this);
-}) : nullptr)
+, _spoiler((options.spoiler || parent->isMediaSensitive())
+	? std::make_unique<Ui::SpoilerAnimation>([=] {
+		delegate->repaintItem(this);
+	})
+	: nullptr)
+, _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0)
 , _pinned(options.pinned)
-, _story(options.story) {
+, _story(options.story)
+, _link(_sensitiveSpoiler
+	? HistoryView::MakeSensitiveMediaLink(
+		std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+			maybeClearSensitiveSpoiler();
+		})),
+		parent)
+	: makeOpenPhotoHandler()) {
 	if (_data->inlineThumbnailBytes().isEmpty()
 		&& (_data->hasExact(Data::PhotoSize::Small)
 			|| _data->hasExact(Data::PhotoSize::Thumbnail))) {
@@ -348,6 +373,16 @@ Photo::Photo(
 
 Photo::~Photo() = default;
 
+ClickHandlerPtr Photo::makeOpenPhotoHandler() {
+	return std::make_shared<PhotoOpenClickHandler>(
+		_data,
+		crl::guard(this, [=](FullMsgId id) {
+			clearSpoiler();
+			delegate()->openPhoto(_data, id);
+		}),
+		parent()->fullId());
+}
+
 void Photo::initDimensions() {
 	_maxw = 2 * st::overviewPhotoMinSize;
 	_minh = _story ? qRound(_maxw * kStoryRatio) : _maxw;
@@ -401,6 +436,10 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			QRect(0, 0, _width, _height),
 			Ui::DefaultImageSpoiler().frame(
 				_spoiler->index(context->ms, paused)));
+
+		if (_sensitiveSpoiler) {
+			PaintSensitiveTag(p, QRect(0, 0, _width, _height));
+		}
 	}
 
 	if (selected) {
@@ -453,11 +492,19 @@ void Photo::ensureDataMediaCreated() const {
 void Photo::clearSpoiler() {
 	if (_spoiler) {
 		_spoiler = nullptr;
+		_sensitiveSpoiler = false;
 		_pix = QPixmap();
 		delegate()->repaintItem(this);
 	}
 }
 
+void Photo::maybeClearSensitiveSpoiler() {
+	if (_sensitiveSpoiler) {
+		clearSpoiler();
+		_link = makeOpenPhotoHandler();
+	}
+}
+
 void Photo::itemDataChanged() {
 	const auto pinned = parent()->isPinned();
 	if (_pinned != pinned) {
@@ -488,12 +535,23 @@ Video::Video(
 , _data(video)
 , _videoCover(LookupVideoCover(video, parent))
 , _duration(Ui::FormatDurationText(_data->duration() / 1000))
-, _spoiler(options.spoiler ? std::make_unique<Ui::SpoilerAnimation>([=] {
-	delegate->repaintItem(this);
-}) : nullptr)
+, _spoiler((options.spoiler || parent->isMediaSensitive())
+	? std::make_unique<Ui::SpoilerAnimation>([=] {
+		delegate->repaintItem(this);
+	})
+	: nullptr)
+, _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0)
 , _pinned(options.pinned)
 , _story(options.story) {
 	setDocumentLinks(_data);
+	if (_sensitiveSpoiler) {
+		_openl = HistoryView::MakeSensitiveMediaLink(
+			std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+				clearSpoiler();
+				setDocumentLinks(_data);
+			})),
+			parent);
+	}
 	if (!_videoCover) {
 		_data->loadThumbnail(parent->fullId());
 	} else if (_videoCover->inlineThumbnailBytes().isEmpty()
@@ -574,6 +632,10 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			QRect(0, 0, _width, _height),
 			Ui::DefaultImageSpoiler().frame(
 				_spoiler->index(context->ms, paused)));
+
+		if (_sensitiveSpoiler) {
+			PaintSensitiveTag(p, QRect(0, 0, _width, _height));
+		}
 	}
 
 	if (selected) {
@@ -660,11 +722,19 @@ void Video::ensureDataMediaCreated() const {
 void Video::clearSpoiler() {
 	if (_spoiler) {
 		_spoiler = nullptr;
+		_sensitiveSpoiler = false;
 		_pix = QPixmap();
 		delegate()->repaintItem(this);
 	}
 }
 
+void Video::maybeClearSensitiveSpoiler() {
+	if (_sensitiveSpoiler) {
+		clearSpoiler();
+		setDocumentLinks(_data);
+	}
+}
+
 void Video::itemDataChanged() {
 	const auto pinned = parent()->isPinned();
 	if (_pinned != pinned) {
@@ -700,7 +770,9 @@ TextState Video::getState(
 		StateRequest request) const {
 	if (hasPoint(point)) {
 		ensureDataMediaCreated();
-		const auto link = (_data->loading() || _data->uploading())
+		const auto link = _sensitiveSpoiler
+			? _openl
+			: (_data->loading() || _data->uploading())
 			? _cancell
 			: (dataLoaded() || _dataMedia->canBePlayed(parent()))
 			? _openl
@@ -2036,8 +2108,22 @@ Gif::Gif(
 	not_null<HistoryItem*> parent,
 	not_null<DocumentData*> gif)
 : RadialProgressItem(delegate, parent)
-, _data(gif) {
+, _data(gif)
+, _spoiler(parent->isMediaSensitive()
+	? std::make_unique<Ui::SpoilerAnimation>([=] {
+		delegate->repaintItem(this);
+	})
+	: nullptr)
+, _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0) {
 	setDocumentLinks(_data, true);
+	if (_sensitiveSpoiler) {
+		_openl = HistoryView::MakeSensitiveMediaLink(
+			std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
+				clearSpoiler();
+				setDocumentLinks(_data, true);
+			})),
+			parent);
+	}
 	_data->loadThumbnail(parent->fullId());
 }
 
@@ -2140,6 +2226,23 @@ void Gif::clipCallback(Media::Clip::Notification notification) {
 	}
 }
 
+void Gif::clearSpoiler() {
+	if (_spoiler) {
+		_spoiler = nullptr;
+		_sensitiveSpoiler = false;
+		_thumb = QImage();
+		_thumbGood = false;
+		delegate()->repaintItem(this);
+	}
+}
+
+void Gif::maybeClearSensitiveSpoiler() {
+	if (_sensitiveSpoiler) {
+		clearSpoiler();
+		setDocumentLinks(_data);
+	}
+}
+
 void Gif::validateThumbnail(
 		Image *image,
 		QSize size,
@@ -2165,7 +2268,9 @@ void Gif::prepareThumbnail(QSize size, QSize frame) {
 	Assert(document != nullptr);
 
 	ensureDataMediaCreated();
-	validateThumbnail(_dataMedia->thumbnail(), size, frame, true);
+	if (!_spoiler) {
+		validateThumbnail(_dataMedia->thumbnail(), size, frame, true);
+	}
 	validateThumbnail(_dataMedia->thumbnailInline(), size, frame, false);
 }
 
@@ -2194,7 +2299,7 @@ void Gif::paint(
 		});
 	}
 
-	const auto animating = (_gif && _gif->started());
+	const auto animating = !_spoiler && (_gif && _gif->started());
 	if (displayLoading) {
 		ensureRadial();
 		if (!_radial->animating()) {
@@ -2224,6 +2329,19 @@ void Gif::paint(
 		}
 	}
 
+	if (_spoiler) {
+		const auto paused = context->paused || On(PowerSaving::kChatSpoiler);
+		Ui::FillSpoilerRect(
+			p,
+			r,
+			Ui::DefaultImageSpoiler().frame(
+				_spoiler->index(context->ms, paused)));
+
+		if (_sensitiveSpoiler) {
+			PaintSensitiveTag(p, r);
+		}
+	}
+
 	const auto selected = (selection == FullSelection);
 
 	if (radial
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index ff0273d1d6..5edf2a6ac4 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -76,6 +76,9 @@ public:
 	virtual void clearHeavyPart() {
 	}
 
+	virtual void maybeClearSensitiveSpoiler() {
+	}
+
 protected:
 	[[nodiscard]] not_null<HistoryItem*> parent() const {
 		return _parent;
@@ -210,21 +213,26 @@ public:
 	void itemDataChanged() override;
 	void clearHeavyPart() override;
 
+	void maybeClearSensitiveSpoiler() override;
+
 private:
 	void ensureDataMediaCreated() const;
 	void setPixFrom(not_null<Image*> image);
+	[[nodiscard]] ClickHandlerPtr makeOpenPhotoHandler();
 	void clearSpoiler();
 
 	const not_null<PhotoData*> _data;
 	mutable std::shared_ptr<Data::PhotoMedia> _dataMedia;
-	ClickHandlerPtr _link;
 	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
 	QPixmap _pix;
 	bool _goodLoaded = false;
+	bool _sensitiveSpoiler = false;
 	bool _pinned = false;
 	bool _story = false;
 
+	ClickHandlerPtr _link;
+
 };
 
 class Gif final : public RadialProgressItem {
@@ -249,6 +257,9 @@ public:
 	void clearHeavyPart() override;
 	void setPosition(int32 position) override;
 
+	void clearSpoiler() override;
+	void maybeClearSensitiveSpoiler() override;
+
 protected:
 	float64 dataProgress() const override;
 	bool dataFinished() const override;
@@ -279,9 +290,11 @@ private:
 	const not_null<DocumentData*> _data;
 	mutable std::shared_ptr<Data::DocumentMedia> _dataMedia;
 	StatusText _status;
+	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
 	QImage _thumb;
 	bool _thumbGood = false;
+	bool _sensitiveSpoiler = false;
 
 };
 
@@ -305,6 +318,8 @@ public:
 	void clearHeavyPart() override;
 	void clearSpoiler() override;
 
+	void maybeClearSensitiveSpoiler() override;
+
 protected:
 	float64 dataProgress() const override;
 	bool dataFinished() const override;
@@ -326,6 +341,7 @@ private:
 
 	QPixmap _pix;
 	bool _pixBlurred = true;
+	bool _sensitiveSpoiler = false;
 	bool _pinned = false;
 	bool _story = false;
 

From 321c7120dfd1cb88ff5f959618d8157a10023a8f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Jul 2025 15:33:41 +0400
Subject: [PATCH 031/341] Censor 18+ marked stickers as well.

---
 .../view/media/history_view_media_common.cpp  |  4 +-
 .../view/media/history_view_sticker.cpp       | 58 +++++++++++++++++--
 .../history/view/media/history_view_sticker.h |  5 ++
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index 0e6ead19c7..431a45e7a3 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -580,7 +580,9 @@ ClickHandlerPtr MakeSensitiveMediaLink(
 
 	return std::make_shared<LambdaClickHandler>([=](ClickContext context) {
 		const auto plain = [reveal, context] {
-			reveal->onClick(context);
+			if (const auto raw = reveal.get()) {
+				raw->onClick(context);
+			}
 		};
 		const auto my = context.other.value<ClickHandlerContext>();
 		const auto controller = my.sessionWindow.get();
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 3299a8735b..90bfe44ecf 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_sticker_player.h"
+#include "lang/lang_keys.h"
 #include "ui/image/image.h"
 #include "ui/chat/chat_style.h"
 #include "ui/effects/path_shift_gradient.h"
@@ -33,6 +34,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "chat_helpers/stickers_lottie.h"
 #include "styles/style_chat.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_menu_icons.h"
 
 namespace HistoryView {
 namespace {
@@ -86,7 +89,8 @@ Sticker::Sticker(
 , _data(data)
 , _replacements(replacements)
 , _cachingTag(ChatHelpers::StickerLottieSize::MessageHistory)
-, _skipPremiumEffect(skipPremiumEffect) {
+, _skipPremiumEffect(skipPremiumEffect)
+, _sensitiveBlurred(parent->data()->isMediaSensitive()) {
 	if ((_dataMedia = _data->activeMediaView())) {
 		dataMediaCreated();
 	} else {
@@ -172,7 +176,7 @@ bool Sticker::readyToDrawAnimationFrame() {
 		return true;
 	}
 	const auto sticker = _data->sticker();
-	if (!sticker) {
+	if (!sticker || _sensitiveBlurred) {
 		return false;
 	}
 
@@ -234,6 +238,43 @@ void Sticker::draw(
 		|| !paintPixmap(p, context, r)) {
 		paintPath(p, context, r);
 	}
+	if (_sensitiveBlurred) {
+		paintSensitiveTag(p, context, r);
+	}
+}
+
+void Sticker::paintSensitiveTag(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &r) {
+	auto text = Ui::Text::String();
+	auto iconSkip = 0;
+	text.setText(
+		st::semiboldTextStyle,
+		tr::lng_sensitive_tag(tr::now));
+	iconSkip = st::mediaMenuIconStealth.width() * 1.4;
+	const auto width = iconSkip + text.maxWidth();
+	const auto inner = QRect(0, 0, width, text.minHeight());
+	const auto outer = style::centerrect(
+		r,
+		inner.marginsAdded(st::paidTagPadding));
+	const auto size = outer.size();
+	const auto real = outer.marginsRemoved(st::paidTagPadding);
+	const auto radius = std::min(size.width(), size.height()) / 2;
+	p.setPen(Qt::NoPen);
+	p.setBrush(context.st->msgServiceBg());
+	p.drawRoundedRect(outer, radius, radius);
+	p.setPen(context.st->msgServiceFg());
+	if (iconSkip) {
+		st::mediaMenuIconStealth.paint(
+			p,
+			real.x(),
+			(outer.y()
+				+ (size.height() - st::mediaMenuIconStealth.height()) / 2),
+			outer.width(),
+			context.st->msgServiceFg()->c);
+	}
+	text.draw(p, real.x() + iconSkip, real.y(), width);
 }
 
 ClickHandlerPtr Sticker::link() {
@@ -403,8 +444,13 @@ QPixmap Sticker::paintedPixmap(const PaintContext &context) const {
 		: context.selected()
 		? &context.st->msgStickerOverlay()
 		: nullptr;
-	const auto good = _dataMedia->goodThumbnail();
-	if (const auto image = _dataMedia->getStickerLarge()) {
+	const auto good = _sensitiveBlurred
+		? nullptr
+		: _dataMedia->goodThumbnail();
+	const auto image = _sensitiveBlurred
+		? nullptr
+		: _dataMedia->getStickerLarge();
+	if (image) {
 		return image->pix(useSize, { .colored = colored });
 	//
 	// Inline thumbnails can't have alpha channel.
@@ -445,7 +491,9 @@ void Sticker::refreshLink() {
 		return;
 	}
 	const auto sticker = _data->sticker();
-	if (emojiSticker()) {
+	if (_sensitiveBlurred) {
+		_link = MakeSensitiveMediaLink(nullptr, _parent->data());
+	} else if (emojiSticker()) {
 		const auto weak = base::make_weak(this);
 		_link = std::make_shared<LambdaClickHandler>([weak] {
 			if (const auto that = weak.get()) {
diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.h b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
index 629d330311..c975a5c1d0 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.h
@@ -111,6 +111,10 @@ private:
 	void paintPath(Painter &p, const PaintContext &context, const QRect &r);
 	[[nodiscard]] QPixmap paintedPixmap(const PaintContext &context) const;
 	[[nodiscard]] bool mirrorHorizontal() const;
+	void paintSensitiveTag(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &r);
 
 	void ensureDataMediaCreated() const;
 	void dataMediaCreated() const;
@@ -145,6 +149,7 @@ private:
 	bool _webpagePart : 1 = false;
 	bool _playingOnce : 1 = false;
 	bool _stopOnLastFrame : 1 = false;
+	bool _sensitiveBlurred : 1 = false;
 
 };
 

From b754ad52482a56904962e9cd13eff8dd8a3e5715 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Jul 2025 10:07:39 +0400
Subject: [PATCH 032/341] Use base::weak_qptr / base::make_weak.

---
 Telegram/SourceFiles/api/api_bot.cpp          |  2 +-
 .../api/api_chat_filters_remove_manager.cpp   |  2 +-
 .../api/api_chat_filters_remove_manager.h     |  2 +-
 Telegram/SourceFiles/api/api_chat_invite.cpp  |  6 +-
 .../SourceFiles/api/api_confirm_phone.cpp     |  2 +-
 Telegram/SourceFiles/api/api_earn.cpp         |  2 +-
 Telegram/SourceFiles/api/api_suggest_post.cpp | 20 +++----
 Telegram/SourceFiles/api/api_who_reacted.cpp  |  8 +--
 Telegram/SourceFiles/boxes/abstract_box.h     |  4 +-
 .../SourceFiles/boxes/add_contact_box.cpp     | 18 +++---
 Telegram/SourceFiles/boxes/add_contact_box.h  |  2 +-
 Telegram/SourceFiles/boxes/background_box.cpp |  4 +-
 .../boxes/background_preview_box.cpp          |  6 +-
 .../SourceFiles/boxes/delete_messages_box.cpp |  8 +--
 .../boxes/dictionaries_manager.cpp            |  2 +-
 .../SourceFiles/boxes/edit_caption_box.cpp    |  2 +-
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  4 +-
 .../boxes/filters/edit_filter_links.cpp       |  2 +-
 Telegram/SourceFiles/boxes/passcode_box.cpp   | 28 +++++-----
 Telegram/SourceFiles/boxes/passcode_box.h     |  4 +-
 .../boxes/peer_list_controllers.cpp           |  4 +-
 .../boxes/peers/add_participants_box.cpp      | 10 ++--
 .../boxes/peers/add_participants_box.h        |  6 +-
 .../boxes/peers/choose_peer_box.cpp           |  8 +--
 .../boxes/peers/edit_contact_box.cpp          |  4 +-
 .../boxes/peers/edit_forum_topic_box.cpp      |  6 +-
 .../boxes/peers/edit_participant_box.cpp      | 12 ++--
 .../boxes/peers/edit_participant_box.h        |  4 +-
 .../boxes/peers/edit_participants_box.cpp     |  4 +-
 .../boxes/peers/edit_participants_box.h       |  4 +-
 .../boxes/peers/edit_peer_info_box.cpp        |  6 +-
 .../boxes/peers/edit_peer_invite_link.cpp     | 12 ++--
 .../boxes/peers/verify_peers_box.cpp          |  8 +--
 .../SourceFiles/boxes/phone_banned_box.cpp    |  2 +-
 .../SourceFiles/boxes/pin_messages_box.cpp    |  8 +--
 .../boxes/self_destruction_box.cpp            |  2 +-
 .../SourceFiles/boxes/send_credits_box.cpp    |  4 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  8 +--
 Telegram/SourceFiles/boxes/share_box.cpp      | 12 ++--
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 12 ++--
 .../SourceFiles/boxes/sticker_set_box.cpp     | 16 +++---
 Telegram/SourceFiles/boxes/sticker_set_box.h  |  2 +-
 Telegram/SourceFiles/boxes/stickers_box.cpp   |  2 +-
 .../SourceFiles/boxes/transfer_gift_box.cpp   | 18 +++---
 Telegram/SourceFiles/boxes/translate_box.cpp  |  4 +-
 Telegram/SourceFiles/boxes/url_auth_box.cpp   |  4 +-
 .../calls/calls_box_controller.cpp            |  4 +-
 .../calls/calls_emoji_fingerprint.cpp         |  4 +-
 .../calls/group/calls_choose_join_as.cpp      |  2 +-
 .../calls/group/calls_choose_join_as.h        |  2 +-
 .../calls/group/calls_group_common.cpp        |  8 +--
 .../group/calls_group_invite_controller.cpp   |  8 +--
 .../calls/group/calls_group_members.cpp       |  6 +-
 .../calls/group/calls_group_panel.cpp         | 12 ++--
 .../calls/group/calls_group_rtmp.cpp          |  4 +-
 .../calls/group/calls_group_rtmp.h            |  2 +-
 .../calls/group/calls_group_settings.cpp      |  4 +-
 .../ui/desktop_capture_choose_source.cpp      |  8 +--
 .../chat_helpers/emoji_sets_manager.cpp       |  2 +-
 .../chat_helpers/emoji_suggestions_widget.cpp |  2 +-
 .../chat_helpers/message_field.cpp            | 20 +++----
 .../chat_helpers/stickers_list_widget.cpp     |  4 +-
 .../chat_helpers/tabbed_selector.cpp          |  4 +-
 Telegram/SourceFiles/core/application.cpp     |  4 +-
 Telegram/SourceFiles/core/application.h       |  2 +-
 .../SourceFiles/core/phone_click_handler.cpp  |  2 +-
 .../data/data_document_resolver.cpp           |  2 +-
 Telegram/SourceFiles/data/data_session.h      |  2 +-
 .../dialogs/dialogs_inner_widget.cpp          |  4 +-
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  2 +-
 .../dialogs/ui/dialogs_suggestions.cpp        |  2 +-
 .../editor/editor_layer_widget.cpp            |  4 +-
 Telegram/SourceFiles/editor/photo_editor.cpp  |  4 +-
 .../SourceFiles/export/export_api_wrap.cpp    |  4 +-
 Telegram/SourceFiles/export/export_api_wrap.h |  4 +-
 .../view/export_view_panel_controller.cpp     |  6 +-
 .../view/export_view_panel_controller.h       |  4 +-
 .../export/view/export_view_progress.cpp      | 15 ++---
 .../export/view/export_view_settings.cpp      | 16 +++---
 .../admin_log/history_admin_log_inner.cpp     | 10 ++--
 .../history/history_inner_widget.cpp          |  2 +-
 .../history/history_item_helpers.cpp          |  2 +-
 .../SourceFiles/history/history_widget.cpp    | 10 ++--
 .../controls/history_view_compose_search.cpp  |  8 +--
 .../controls/history_view_draft_options.cpp   | 12 ++--
 .../controls/history_view_forward_panel.cpp   |  4 +-
 .../controls/history_view_suggest_options.cpp | 10 ++--
 .../history_view_voice_record_bar.cpp         |  2 +-
 .../view/history_view_chat_preview.cpp        |  4 +-
 .../view/history_view_chat_section.cpp        |  6 +-
 .../view/history_view_contact_status.cpp      |  4 +-
 .../view/history_view_context_menu.cpp        | 22 ++++----
 .../history/view/history_view_list_widget.cpp | 16 +++---
 .../view/history_view_scheduled_section.cpp   |  4 +-
 .../view/history_view_top_bar_widget.cpp      |  4 +-
 .../view/history_view_translate_bar.cpp       |  6 +-
 .../bot/starref/info_bot_starref_common.cpp   |  4 +-
 .../starref/info_bot_starref_join_widget.cpp  |  4 +-
 .../starref/info_bot_starref_setup_widget.cpp |  6 +-
 .../boosts/create_giveaway_box.cpp            |  4 +-
 .../boosts/info_boosts_inner_widget.cpp       |  2 +-
 .../earn/info_channel_earn_list.cpp           |  4 +-
 Telegram/SourceFiles/info/info_top_bar.cpp    |  6 +-
 .../SourceFiles/info/info_wrap_widget.cpp     |  2 +-
 .../info/media/info_media_list_widget.cpp     | 10 ++--
 .../info/media/info_media_list_widget.h       |  4 +-
 .../peer_gifts/info_peer_gifts_common.cpp     |  4 +-
 .../info/profile/info_profile_actions.cpp     |  4 +-
 .../info_profile_emoji_status_panel.cpp       |  2 +-
 .../info/settings/info_settings_widget.h      |  4 +-
 .../inline_bots/bot_attach_web_view.cpp       | 14 ++---
 .../intro/intro_password_check.cpp            |  2 +-
 Telegram/SourceFiles/intro/intro_widget.cpp   |  4 +-
 Telegram/SourceFiles/iv/iv_controller.cpp     |  2 +-
 Telegram/SourceFiles/iv/iv_instance.cpp       |  4 +-
 Telegram/SourceFiles/iv/iv_pch.h              |  2 +-
 Telegram/SourceFiles/mainwindow.cpp           |  4 +-
 .../media/stories/media_stories_header.cpp    |  4 +-
 .../media/view/media_view_overlay_widget.cpp  |  6 +-
 .../SourceFiles/media/view/media_view_pip.cpp |  6 +-
 .../menu/menu_item_download_files.cpp         |  8 +--
 Telegram/SourceFiles/menu/menu_send.cpp       | 16 +++---
 .../mtproto/mtproto_concurrent_sender.cpp     |  4 +-
 .../mtproto/mtproto_concurrent_sender.h       |  5 +-
 .../passport/passport_form_view_controller.h  |  4 +-
 .../passport/passport_panel_controller.cpp    |  8 +--
 .../passport/passport_panel_controller.h      |  2 +-
 .../passport/ui/passport_details_row.cpp      |  2 +-
 .../payments/payments_checkout_process.cpp    |  8 +--
 .../payments/payments_checkout_process.h      |  2 +-
 .../payments/payments_reaction_process.cpp    |  6 +-
 .../payments/ui/payments_reaction_box.cpp     |  4 +-
 .../business/settings_away_message.cpp        |  4 +-
 .../settings/business/settings_greeting.cpp   |  4 +-
 .../business/settings_quick_replies.cpp       |  4 +-
 .../business/settings_shortcut_messages.cpp   |  4 +-
 .../business/settings_working_hours.cpp       | 12 ++--
 .../settings_cloud_password_common.cpp        |  2 +-
 .../settings_cloud_password_common.h          |  2 +-
 .../settings_cloud_password_input.cpp         |  4 +-
 ...ngs_cloud_password_login_email_confirm.cpp |  4 +-
 .../settings_cloud_password_manage.cpp        |  4 +-
 .../settings/settings_active_sessions.cpp     | 10 ++--
 .../settings/settings_blocked_peers.cpp       |  4 +-
 .../settings/settings_blocked_peers.h         |  2 +-
 .../settings/settings_business.cpp            | 12 ++--
 .../SourceFiles/settings/settings_calls.cpp   |  2 +-
 .../SourceFiles/settings/settings_common.h    |  4 +-
 .../SourceFiles/settings/settings_credits.cpp | 10 ++--
 .../settings/settings_credits_graphics.cpp    | 24 ++++----
 .../SourceFiles/settings/settings_folders.cpp |  6 +-
 .../settings/settings_local_passcode.cpp      |  4 +-
 .../SourceFiles/settings/settings_main.cpp    |  2 +-
 .../settings/settings_notifications_type.cpp  |  2 +-
 .../SourceFiles/settings/settings_premium.cpp | 12 ++--
 .../settings/settings_shortcuts.cpp           |  2 +-
 .../settings/settings_websites.cpp            | 12 ++--
 Telegram/SourceFiles/stdafx.h                 |  1 -
 .../support/support_autocomplete.cpp          |  2 +-
 .../SourceFiles/ui/boxes/choose_date_time.cpp |  2 +-
 .../SourceFiles/ui/boxes/choose_font_box.cpp  |  4 +-
 Telegram/SourceFiles/ui/boxes/choose_time.cpp | 20 +++----
 Telegram/SourceFiles/ui/boxes/confirm_box.cpp |  2 +-
 .../SourceFiles/ui/boxes/edit_invite_link.cpp |  2 +-
 Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp |  2 +-
 .../ui/boxes/single_choice_box.cpp            |  2 +-
 .../SourceFiles/ui/chat/choose_send_as.cpp    |  2 +-
 .../ui/controls/subsection_tabs_slider.cpp    |  2 +-
 Telegram/SourceFiles/ui/countryinput.cpp      |  2 +-
 .../ui/effects/scroll_content_shadow.cpp      |  6 +-
 Telegram/SourceFiles/ui/ui_pch.h              |  2 +-
 .../ui/widgets/chat_filters_tabs_strip.cpp    |  2 +-
 .../SourceFiles/window/section_widget.cpp     |  2 +-
 .../window/themes/window_theme_editor.cpp     |  2 +-
 .../window/themes/window_theme_editor_block.h |  4 +-
 .../window/window_chat_preview.cpp            |  4 +-
 .../SourceFiles/window/window_controller.cpp  |  2 +-
 .../SourceFiles/window/window_controller.h    |  6 +-
 .../window/window_filters_menu.cpp            |  2 +-
 .../window/window_lock_widgets.cpp            |  4 +-
 .../SourceFiles/window/window_main_menu.cpp   |  4 +-
 .../window/window_main_menu_helpers.cpp       |  2 +-
 .../SourceFiles/window/window_peer_menu.cpp   | 56 +++++++++----------
 .../SourceFiles/window/window_peer_menu.h     | 18 +++---
 .../window/window_session_controller.cpp      |  6 +-
 .../window/window_session_controller.h        |  2 +-
 Telegram/lib_base                             |  2 +-
 Telegram/lib_spellcheck                       |  2 +-
 Telegram/lib_ui                               |  2 +-
 189 files changed, 556 insertions(+), 555 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_bot.cpp b/Telegram/SourceFiles/api/api_bot.cpp
index b86ce1a70c..05c0d46928 100644
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -245,7 +245,7 @@ void SendBotCallbackDataWithPassword(
 				fields.customSubmitButton = tr::lng_passcode_submit();
 				fields.customCheckCallback = [=](
 						const Core::CloudPasswordResult &result,
-						QPointer<PasscodeBox> box) {
+						base::weak_qptr<PasscodeBox> box) {
 					if (const auto button = getButton()) {
 						if (button->requestId) {
 							return;
diff --git a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
index fe96accd61..ffd3fb0f79 100644
--- a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
+++ b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.cpp
@@ -57,7 +57,7 @@ void RemoveChatFilter(
 RemoveComplexChatFilter::RemoveComplexChatFilter() = default;
 
 void RemoveComplexChatFilter::request(
-		QPointer<Ui::RpWidget> widget,
+		base::weak_qptr<Ui::RpWidget> widget,
 		base::weak_ptr<Window::SessionController> weak,
 		FilterId id) {
 	const auto session = &weak->session();
diff --git a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h
index ce92b2df3c..6bd6ce7fa3 100644
--- a/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h
+++ b/Telegram/SourceFiles/api/api_chat_filters_remove_manager.h
@@ -22,7 +22,7 @@ public:
 	RemoveComplexChatFilter();
 
 	void request(
-		QPointer<Ui::RpWidget> widget,
+		base::weak_qptr<Ui::RpWidget> widget,
 		base::weak_ptr<Window::SessionController> weak,
 		FilterId id);
 
diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index b67e148677..0d5880fcb5 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -272,7 +272,7 @@ void ConfirmSubscriptionBox(
 		}, balance->lifetime());
 	}
 
-	const auto sendCredits = [=, weak = Ui::MakeWeak(box)] {
+	const auto sendCredits = [=, weak = base::make_weak(box)] {
 		const auto show = box->uiShow();
 		const auto buttonWidth = state->saveButton
 			? state->saveButton->width()
@@ -280,7 +280,7 @@ void ConfirmSubscriptionBox(
 		const auto finish = [=] {
 			state->api = std::nullopt;
 			state->loading.force_assign(false);
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		};
@@ -294,7 +294,7 @@ void ConfirmSubscriptionBox(
 			}, [](const MTPDpayments_paymentVerificationNeeded &data) {
 			});
 			const auto refill = session->data().activeCreditsSubsRebuilder();
-			const auto strong = weak.data();
+			const auto strong = weak.get();
 			if (!strong) {
 				return;
 			}
diff --git a/Telegram/SourceFiles/api/api_confirm_phone.cpp b/Telegram/SourceFiles/api/api_confirm_phone.cpp
index a3b41fefc9..7379681138 100644
--- a/Telegram/SourceFiles/api/api_confirm_phone.cpp
+++ b/Telegram/SourceFiles/api/api_confirm_phone.cpp
@@ -87,7 +87,7 @@ void ConfirmPhone::resolve(
 				sentCodeLength,
 				fragmentUrl,
 				timeout);
-			const auto boxWeak = Ui::MakeWeak(box.data());
+			const auto boxWeak = base::make_weak(box.data());
 			using LoginCode = rpl::event_stream<QString>;
 			const auto codeHandles = box->lifetime().make_state<LoginCode>();
 			controller->session().account().setHandleLoginCode([=](
diff --git a/Telegram/SourceFiles/api/api_earn.cpp b/Telegram/SourceFiles/api/api_earn.cpp
index 9df407aad2..3b8272fc4e 100644
--- a/Telegram/SourceFiles/api/api_earn.cpp
+++ b/Telegram/SourceFiles/api/api_earn.cpp
@@ -82,7 +82,7 @@ void HandleWithdrawalButton(
 			fields.customSubmitButton = tr::lng_passcode_submit();
 			fields.customCheckCallback = crl::guard(button, [=](
 					const Core::CloudPasswordResult &result,
-					QPointer<PasscodeBox> box) {
+					base::weak_qptr<PasscodeBox> box) {
 				const auto done = [=](const QString &result) {
 					if (!result.isEmpty()) {
 						UrlClickHandler::Open(result);
diff --git a/Telegram/SourceFiles/api/api_suggest_post.cpp b/Telegram/SourceFiles/api/api_suggest_post.cpp
index 7af4fbc84d..05d0304452 100644
--- a/Telegram/SourceFiles/api/api_suggest_post.cpp
+++ b/Telegram/SourceFiles/api/api_suggest_post.cpp
@@ -223,7 +223,7 @@ void ConfirmApproval(
 			.confirmText = tr::lng_suggest_accept_send(),
 			.title = tr::lng_suggest_accept_title(),
 		});
-		*callback = [=, weak = Ui::MakeWeak(box)] {
+		*callback = [=, weak = base::make_weak(box)] {
 			if (const auto onstack = accepted) {
 				onstack();
 			}
@@ -232,7 +232,7 @@ void ConfirmApproval(
 				return;
 			}
 			SendApproval(show, item, scheduleDate);
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		};
@@ -283,9 +283,9 @@ void RequestApprovalDate(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<HistoryItem*> item) {
 	const auto id = item->fullId();
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto close = [=] {
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	};
@@ -339,13 +339,13 @@ void RequestDeclineComment(
 		box->setFocusCallback([=] {
 			reason->setFocusFast();
 		});
-		*callback = [=, weak = Ui::MakeWeak(box)] {
+		*callback = [=, weak = base::make_weak(box)] {
 			const auto item = show->session().data().message(id);
 			if (!item) {
 				return;
 			}
 			SendDecline(show, item, reason->getLastText().trimmed());
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		};
@@ -422,14 +422,14 @@ void SuggestApprovalDate(
 	}
 	const auto id = item->fullId();
 	const auto state = std::make_shared<SendSuggestState>();
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto done = [=](TimeId result) {
 		const auto item = show->session().data().message(id);
 		if (!item) {
 			return;
 		}
 		const auto close = [=] {
-			if (const auto strong = weak->data()) {
+			if (const auto strong = weak->get()) {
 				strong->closeBox();
 			}
 		};
@@ -458,14 +458,14 @@ void SuggestOfferForMessage(
 		HistoryView::SuggestMode mode) {
 	const auto id = item->fullId();
 	const auto state = std::make_shared<SendSuggestState>();
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto done = [=](SuggestPostOptions result) {
 		const auto item = show->session().data().message(id);
 		if (!item) {
 			return;
 		}
 		const auto close = [=] {
-			if (const auto strong = weak->data()) {
+			if (const auto strong = weak->get()) {
 				strong->closeBox();
 			}
 		};
diff --git a/Telegram/SourceFiles/api/api_who_reacted.cpp b/Telegram/SourceFiles/api/api_who_reacted.cpp
index 84ab9b0c2c..b3070fba0d 100644
--- a/Telegram/SourceFiles/api/api_who_reacted.cpp
+++ b/Telegram/SourceFiles/api/api_who_reacted.cpp
@@ -240,13 +240,13 @@ struct State {
 [[nodiscard]] rpl::producer<Peers> WhoReadIds(
 		not_null<HistoryItem*> item,
 		not_null<QWidget*> context) {
-	auto weak = QPointer<QWidget>(context.get());
+	auto weak = base::make_weak(context);
 	const auto session = &item->history()->session();
 	return [=](auto consumer) {
 		if (!weak) {
 			return rpl::lifetime();
 		}
-		const auto context = PreparedContextAt(weak.data(), session);
+		const auto context = PreparedContextAt(weak.get(), session);
 		auto &entry = context->cacheRead(item);
 		if (entry.requestId) {
 		} else if (const auto user = item->history()->peer->asUser()) {
@@ -325,13 +325,13 @@ struct State {
 		not_null<HistoryItem*> item,
 		const ReactionId &reaction,
 		not_null<QWidget*> context) {
-	auto weak = QPointer<QWidget>(context.get());
+	auto weak = base::make_weak(context);
 	const auto session = &item->history()->session();
 	return [=](auto consumer) {
 		if (!weak) {
 			return rpl::lifetime();
 		}
-		const auto context = PreparedContextAt(weak.data(), session);
+		const auto context = PreparedContextAt(weak.get(), session);
 		auto &entry = context->cacheReacted(item, reaction);
 		if (!entry.requestId) {
 			using Flag = MTPmessages_GetMessageReactionsList::Flag;
diff --git a/Telegram/SourceFiles/boxes/abstract_box.h b/Telegram/SourceFiles/boxes/abstract_box.h
index d48e93108f..119875a293 100644
--- a/Telegram/SourceFiles/boxes/abstract_box.h
+++ b/Telegram/SourceFiles/boxes/abstract_box.h
@@ -37,11 +37,11 @@ void showBox(
 } // namespace internal
 
 template <typename BoxType>
-QPointer<BoxType> show(
+base::weak_qptr<BoxType> show(
 		object_ptr<BoxType> content,
 		Ui::LayerOptions options = Ui::LayerOption::CloseOther,
 		anim::type animated = anim::type::normal) {
-	auto result = QPointer<BoxType>(content.data());
+	auto result = base::weak_qptr<BoxType>(content.data());
 	internal::showBox(std::move(content), options, animated);
 	return result;
 }
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
index 792eff79b4..6e9bc23955 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@@ -194,16 +194,16 @@ void ShowAddParticipantsError(
 			&& channel->canAddAdmins()) {
 			const auto makeAdmin = [=](Fn<void()> close) {
 				const auto user = forbidden.users.front();
-				const auto weak = std::make_shared<QPointer<EditAdminBox>>();
+				const auto weak = std::make_shared<base::weak_qptr<EditAdminBox>>();
 				const auto done = [=](auto&&...) {
-					if (const auto strong = weak->data()) {
+					if (const auto strong = weak->get()) {
 						strong->uiShow()->showToast(
 							tr::lng_box_done(tr::now));
 						strong->closeBox();
 					}
 				};
 				const auto fail = [=] {
-					if (const auto strong = weak->data()) {
+					if (const auto strong = weak->get()) {
 						strong->closeBox();
 					}
 				};
@@ -446,7 +446,7 @@ void AddContactBox::save() {
 		firstName = lastName;
 		lastName = QString();
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto session = _session;
 	_sentName = firstName;
 	_contactId = base::RandomValue<uint64>();
@@ -716,7 +716,7 @@ TimeId GroupInfoBox::ttlPeriod() const {
 }
 
 void GroupInfoBox::createGroup(
-		QPointer<Ui::BoxContent> selectUsersBox,
+		base::weak_qptr<Ui::BoxContent> selectUsersBox,
 		const QString &title,
 		const std::vector<not_null<PeerData*>> &users) {
 	if (_creationRequestId) {
@@ -750,8 +750,8 @@ void GroupInfoBox::createGroup(
 		_creationRequestId = 0;
 		const auto controller = _navigation->parentController();
 		if (type == u"NO_CHAT_TITLE"_q) {
-			const auto weak = Ui::MakeWeak(this);
-			if (const auto strong = selectUsersBox.data()) {
+			const auto weak = base::make_weak(this);
+			if (const auto strong = selectUsersBox.get()) {
 				strong->closeBox();
 			}
 			if (weak) {
@@ -792,10 +792,10 @@ void GroupInfoBox::submit() {
 	} else if (_canAddBot) {
 		createGroup(nullptr, title, { not_null<PeerData*>(_canAddBot) });
 	} else {
-		auto initBox = [title, weak = Ui::MakeWeak(this)](
+		auto initBox = [title, weak = base::make_weak(this)](
 				not_null<PeerListBox*> box) {
 			auto create = [box, title, weak] {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->createGroup(
 						box.get(),
 						title,
diff --git a/Telegram/SourceFiles/boxes/add_contact_box.h b/Telegram/SourceFiles/boxes/add_contact_box.h
index 9bc7de6520..4032653564 100644
--- a/Telegram/SourceFiles/boxes/add_contact_box.h
+++ b/Telegram/SourceFiles/boxes/add_contact_box.h
@@ -129,7 +129,7 @@ protected:
 private:
 	void createChannel(const QString &title, const QString &description);
 	void createGroup(
-		QPointer<Ui::BoxContent> selectUsersBox,
+		base::weak_qptr<Ui::BoxContent> selectUsersBox,
 		const QString &title,
 		const std::vector<not_null<PeerData*>> &users);
 	void submitName();
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index 59729b7fed..f2e2f647b3 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -345,7 +345,7 @@ void BackgroundBox::resetForPeer() {
 		api->applyUpdates(result);
 	}).send();
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_forPeer->setWallPaper({});
 	if (weak) {
 		_controller->finishChatThemeEdit(_forPeer);
@@ -358,7 +358,7 @@ bool BackgroundBox::forChannel() const {
 
 void BackgroundBox::removePaper(const Data::WallPaper &paper) {
 	const auto session = &_controller->session();
-	const auto remove = [=, weak = Ui::MakeWeak(this)](Fn<void()> &&close) {
+	const auto remove = [=, weak = base::make_weak(this)](Fn<void()> &&close) {
 		close();
 		if (weak) {
 			weak->_inner->removePaper(paper);
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 0faa677720..0fc02e2efc 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -241,12 +241,12 @@ BackgroundPreviewBox::BackgroundPreviewBox(
 	}, lifetime());
 
 	const auto prepare = [=](bool dark, auto pointer) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		crl::async([=] {
 			auto result = std::make_unique<style::palette>();
 			Window::Theme::PreparePaletteCallback(dark, {})(*result);
 			crl::on_main([=, result = std::move(result)]() mutable {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->*pointer = std::move(result);
 					strong->paletteReady();
 				}
@@ -685,7 +685,7 @@ void BackgroundPreviewBox::checkLevelForChannel() {
 
 	const auto show = _controller->uiShow();
 	_forPeerLevelCheck = true;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	CheckBoostLevel(show, _forPeer, [=](int level) {
 		if (!weak) {
 			return std::optional<Ui::AskBoostReason>();
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 5c4b266cd4..503720fc27 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -522,10 +522,10 @@ void DeleteMessagesBox::deleteAndClear() {
 		? PaidPostType::None
 		: paidPostType();
 	if (warnPaidType != PaidPostType::None) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto callback = [=](Fn<void()> close) {
 			close();
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->_confirmedDeletePaidSuggestedPosts = true;
 				strong->deleteAndClear();
 			}
@@ -559,11 +559,11 @@ void DeleteMessagesBox::deleteAndClear() {
 	const auto invokeCallbackAndClose = [&] {
 		// deleteMessages can initiate closing of the current section,
 		// which will cause this box to be destroyed.
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		if (const auto callback = _deleteConfirmedCallback) {
 			callback();
 		}
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
diff --git a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
index 72cfd29c0d..8881449fcb 100644
--- a/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
+++ b/Telegram/SourceFiles/boxes/dictionaries_manager.cpp
@@ -282,7 +282,7 @@ auto AddButtonWithLoader(
 	) | rpl::start_with_next([=](bool toggled) {
 		const auto &state = buttonState->current();
 		if (toggled && (v::is<Available>(state) || v::is<Failed>(state))) {
-			const auto weak = Ui::MakeWeak(button);
+			const auto weak = base::make_weak(button);
 			setLocalLoader(base::make_unique_q<Loader>(
 				QCoreApplication::instance(),
 				session,
diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
index cb27997d66..3e48724b7f 100644
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -1075,7 +1075,7 @@ void EditCaptionBox::save() {
 }
 
 void EditCaptionBox::closeAfterSave() {
-	const auto weak = MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	if (_saved) {
 		_saved();
 	}
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 86816ba15b..2d6f1e2448 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -1313,9 +1313,9 @@ void EditDirectMessagesPriceBox(
 	}, box->lifetime());
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		callback(toggle->toggled() ? *result : std::optional<int>());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index 90dd083bd1..acd6da5641 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -582,7 +582,7 @@ void LinkController::addLinkBlock(not_null<Ui::VerticalLayout*> container) {
 	using namespace Settings;
 
 	const auto link = _data.url;
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		CopyInviteLink(delegate()->peerListUiShow(), link);
 	});
diff --git a/Telegram/SourceFiles/boxes/passcode_box.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
index 96d5f2d332..a235dc2d7a 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -49,7 +49,7 @@ void SetCloudPassword(
 	session->api().cloudPassword().state(
 	) | rpl::start_with_next([=] {
 		using namespace Settings;
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		if (CheckEditCloudPassword(session)) {
 			box->getDelegate()->show(
 				EditCloudPasswordBox(session));
@@ -103,11 +103,11 @@ void StartPendingReset(
 		not_null<Main::Session*> session,
 		not_null<Ui::BoxContent*> context,
 		Fn<void()> close) {
-	const auto weak = Ui::MakeWeak(context.get());
+	const auto weak = base::make_weak(context.get());
 	auto lifetime = std::make_shared<rpl::lifetime>();
 
 	auto finish = [=](const QString &message) mutable {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			if (!message.isEmpty()) {
 				strong->getDelegate()->show(Ui::MakeInformBox(message));
 			}
@@ -136,7 +136,7 @@ void StartPendingReset(
 			: hours
 			? tr::lng_hours(tr::now, lt_count, hours)
 			: tr::lng_minutes(tr::now, lt_count, minutes);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->getDelegate()->show(Ui::MakeInformBox(
 				tr::lng_cloud_password_reset_later(
 					tr::now,
@@ -447,7 +447,7 @@ void PasscodeBox::recoverPasswordDone(
 		_replacedBy->closeBox();
 	}
 	_setRequest = 0;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_newAuthorization.fire_copy(result);
 	if (weak) {
 		_newPasswordSet.fire_copy(newPasswordBytes);
@@ -466,7 +466,7 @@ void PasscodeBox::setPasswordDone(const QByteArray &newPasswordBytes) {
 		_replacedBy->closeBox();
 	}
 	_setRequest = 0;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_newPasswordSet.fire_copy(newPasswordBytes);
 	if (weak) {
 		auto text = _reenterPasscode->isHidden()
@@ -567,9 +567,9 @@ void PasscodeBox::validateEmail(
 			} else if (error.type() == u"CODE_INVALID"_q) {
 				errors->fire(tr::lng_signin_wrong_code(tr::now));
 			} else if (error.type() == u"EMAIL_HASH_EXPIRED"_q) {
-				const auto weak = Ui::MakeWeak(this);
+				const auto weak = base::make_weak(this);
 				_clearUnconfirmedPassword.fire({});
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->getDelegate()->show(
 						Ui::MakeInformBox(
 							Lang::Hard::EmailConfirmationExpired()),
@@ -607,7 +607,7 @@ void PasscodeBox::validateEmail(
 	box->boxClosing(
 	) | rpl::filter([=] {
 		return !*set;
-	}) | start_with_next([=, weak = Ui::MakeWeak(this)] {
+	}) | start_with_next([=, weak = base::make_weak(this)] {
 		if (weak) {
 			weak->_clearUnconfirmedPassword.fire({});
 		}
@@ -710,7 +710,7 @@ void PasscodeBox::save(bool force) {
 		}
 	} else {
 		closeReplacedBy();
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		cSetPasscodeBadTries(0);
 		_session->domain().local().setPasscode(pwd.toUtf8());
 		Core::App().localPasscodeChanged();
@@ -742,7 +742,7 @@ void PasscodeBox::submitOnlyCheckCloudPassword(const QString &oldPassword) {
 void PasscodeBox::sendOnlyCheckCloudPassword(const QString &oldPassword) {
 	checkPassword(oldPassword, [=](const Core::CloudPasswordResult &check) {
 		if (const auto onstack = _cloudFields.customCheckCallback) {
-			onstack(check, Ui::MakeWeak(this));
+			onstack(check, base::make_weak(this));
 		} else {
 			Assert(_cloudFields.turningOff);
 			sendClearCloudPassword(check);
@@ -1105,7 +1105,7 @@ void PasscodeBox::recover() {
 		return;
 	}
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto box = getDelegate()->show(Box<RecoverBox>(
 		&_api.instance(),
 		_session,
@@ -1343,7 +1343,7 @@ void RecoverBox::proceedToChange(const QString &code) {
 
 	box->boxClosing(
 	) | rpl::start_with_next([=] {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		if (const auto onstack = _closeParent) {
 			onstack();
 		}
@@ -1399,7 +1399,7 @@ RecoveryEmailValidation ConfirmRecoveryEmail(
 	const auto errors = std::make_shared<rpl::event_stream<QString>>();
 	const auto resent = std::make_shared<rpl::event_stream<QString>>();
 	const auto requestId = std::make_shared<mtpRequestId>(0);
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto reloads = std::make_shared<rpl::event_stream<>>();
 	const auto cancels = std::make_shared<rpl::event_stream<>>();
 
diff --git a/Telegram/SourceFiles/boxes/passcode_box.h b/Telegram/SourceFiles/boxes/passcode_box.h
index 09f3335617..5ab6413fc2 100644
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@@ -53,7 +53,7 @@ public:
 		// Check cloud password for some action.
 		using CustomCheck = Fn<void(
 			const Core::CloudPasswordResult &,
-			QPointer<PasscodeBox>)>;
+			base::weak_qptr<PasscodeBox>)>;
 		CustomCheck customCheckCallback;
 		rpl::producer<QString> customTitle;
 		std::optional<QString> customDescription;
@@ -158,7 +158,7 @@ private:
 
 	QString _pattern;
 
-	QPointer<Ui::BoxContent> _replacedBy;
+	base::weak_qptr<Ui::BoxContent> _replacedBy;
 	bool _turningOff = false;
 	bool _cloudPwd = false;
 	CloudFields _cloudFields;
diff --git a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
index 37ab361a8f..0f0a8e0da3 100644
--- a/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_controllers.cpp
@@ -831,7 +831,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 	auto guard = base::make_weak(this);
 	const auto peer = row->peer();
 	if (const auto forum = peer->forum()) {
-		const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		auto callback = [=](not_null<Data::ForumTopic*> topic) {
 			const auto exists = guard.get();
 			if (!exists) {
@@ -870,7 +870,7 @@ void ChooseRecipientBoxController::rowClicked(not_null<PeerListRow*> row) {
 		delegate()->peerListUiShow()->showBox(std::move(owned));
 		return;
 	} else if (const auto monoforum = peer->monoforum()) {
-		const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		auto callback = [=](not_null<Data::SavedSublist*> sublist) {
 			const auto exists = guard.get();
 			if (!exists) {
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index ab05d9bccb..75ccf927d9 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -898,9 +898,9 @@ bool AddParticipantsBoxController::needsInviteLinkButton() {
 	return _peer->asChat()->canHaveInviteLink();
 }
 
-QPointer<Ui::BoxContent> AddParticipantsBoxController::showBox(
+base::weak_qptr<Ui::BoxContent> AddParticipantsBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	delegate()->peerListUiShow()->showBox(std::move(box));
 	return weak;
 }
@@ -976,7 +976,7 @@ void AddParticipantsBoxController::inviteSelectedUsers(
 			tr::lng_participant_invite_history(),
 			true,
 			st::defaultBoxCheckbox);
-		const auto weak = Ui::MakeWeak(checkbox.data());
+		const auto weak = base::make_weak(checkbox.data());
 
 		auto text = (users.size() == 1)
 			? tr::lng_participant_invite_sure(
@@ -1205,9 +1205,9 @@ void AddSpecialBoxController::migrate(
 	_additional.migrate(chat, channel);
 }
 
-QPointer<Ui::BoxContent> AddSpecialBoxController::showBox(
+base::weak_qptr<Ui::BoxContent> AddSpecialBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	delegate()->peerListUiShow()->showBox(std::move(box));
 	return weak;
 }
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.h b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
index 24d5e1031d..dc06e8040f 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.h
@@ -56,7 +56,7 @@ private:
 		base::flat_set<not_null<UserData*>> &&alreadyIn,
 		bool justCreated);
 
-	QPointer<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
+	base::weak_qptr<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
 
 	void addInviteLinkButton();
 	void inviteSelectedUsers(
@@ -147,7 +147,7 @@ private:
 	void subscribeToMigration();
 	void migrate(not_null<ChatData*> chat, not_null<ChannelData*> channel);
 
-	QPointer<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
+	base::weak_qptr<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
 
 	not_null<PeerData*> _peer;
 	MTP::Sender _api;
@@ -158,7 +158,7 @@ private:
 	ParticipantsAdditionalData _additional;
 	std::unique_ptr<ParticipantsOnlineSorter> _onlineSorter;
 	Ui::BoxPointer _editBox;
-	QPointer<Ui::BoxContent> _editParticipantBox;
+	base::weak_qptr<Ui::BoxContent> _editParticipantBox;
 	AdminDoneCallback _adminDoneCallback;
 	BannedDoneCallback _bannedDoneCallback;
 
diff --git a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
index 7257a3c3f8..ca10840712 100644
--- a/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/choose_peer_box.cpp
@@ -246,10 +246,10 @@ object_ptr<Ui::BoxContent> CreatePeerByQueryBox(
 		not_null<UserData*> bot,
 		RequestPeerQuery query,
 		Fn<void(std::vector<not_null<PeerData*>>)> done) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto callback = [=](not_null<PeerData*> peer) {
 		done({ peer });
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	};
@@ -506,11 +506,11 @@ void ShowChoosePeerBox(
 		});
 		return;
 	}
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto callback = [=, done = std::move(chosen)](
 			std::vector<not_null<PeerData*>> peers) {
 		done(std::move(peers));
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	};
diff --git a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
index 4bc2848c78..cc378e6095 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
@@ -37,7 +37,7 @@ QString UserPhone(not_null<UserData*> user) {
 }
 
 void SendRequest(
-		QPointer<Ui::GenericBox> box,
+		base::weak_qptr<Ui::GenericBox> box,
 		not_null<UserData*> user,
 		bool sharePhone,
 		const QString &first,
@@ -219,7 +219,7 @@ void Controller::initNameFields(
 			}
 		};
 		SendRequest(
-			Ui::MakeWeak(_box),
+			base::make_weak(_box),
 			user,
 			_sharePhone && _sharePhone->checked(),
 			firstValue,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index 45ad6b1931..f1de1444ad 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -554,7 +554,7 @@ void EditForumTopicBox(
 		} else {
 			using Flag = MTPchannels_EditForumTopic::Flag;
 			const auto api = &forum->session().api();
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box);
 			state->requestId = api->request(MTPchannels_EditForumTopic(
 				MTP_flags(Flag::f_title
 					| (topic->isGeneral() ? Flag() : Flag::f_icon_emoji_id)),
@@ -566,11 +566,11 @@ void EditForumTopicBox(
 				MTPBool() // hidden
 			)).done([=](const MTPUpdates &result) {
 				api->applyUpdates(result);
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 			}).fail([=](const MTP::Error &error) {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					if (error.type() == u"TOPIC_NOT_MODIFIED") {
 						strong->closeBox();
 					} else {
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
index 50c3254a37..84c47cd928 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.cpp
@@ -450,9 +450,9 @@ void EditAdminBox::prepare() {
 			if (!_saveCallback) {
 				return;
 			} else if (_addAsAdmin && !_addAsAdmin->checked()) {
-				const auto weak = Ui::MakeWeak(this);
+				const auto weak = base::make_weak(this);
 				AddBotToGroup(show, user(), peer(), _addingBot->token);
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 				return;
@@ -661,7 +661,7 @@ void EditAdminBox::requestTransferPassword(not_null<ChannelData*> channel) {
 		fields.customSubmitButton = tr::lng_passcode_submit();
 		fields.customCheckCallback = crl::guard(this, [=](
 				const Core::CloudPasswordResult &result,
-				QPointer<PasscodeBox> box) {
+				base::weak_qptr<PasscodeBox> box) {
 			sendTransferRequestFrom(box, channel, result);
 		});
 		getDelegate()->show(Box<PasscodeBox>(&channel->session(), fields));
@@ -669,13 +669,13 @@ void EditAdminBox::requestTransferPassword(not_null<ChannelData*> channel) {
 }
 
 void EditAdminBox::sendTransferRequestFrom(
-		QPointer<PasscodeBox> box,
+		base::weak_qptr<PasscodeBox> box,
 		not_null<ChannelData*> channel,
 		const Core::CloudPasswordResult &result) {
 	if (_transferRequestId) {
 		return;
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto user = this->user();
 	const auto api = &channel->session().api();
 	_transferRequestId = api->request(MTPchannels_EditCreator(
@@ -726,7 +726,7 @@ void EditAdminBox::sendTransferRequestFrom(
 				|| type.startsWith(u"PASSWORD_TOO_FRESH_"_q)
 				|| type.startsWith(u"SESSION_TOO_FRESH_"_q);
 		}();
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		getDelegate()->show(Ui::MakeInformBox(problem));
 		if (box) {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
index 1e5c9fd8ae..b67efcd140 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participant_box.h
@@ -104,7 +104,7 @@ private:
 	bool handleTransferPasswordError(const QString &error);
 	void requestTransferPassword(not_null<ChannelData*> channel);
 	void sendTransferRequestFrom(
-		QPointer<PasscodeBox> box,
+		base::weak_qptr<PasscodeBox> box,
 		not_null<ChannelData*> channel,
 		const Core::CloudPasswordResult &result);
 	bool canSave() const {
@@ -124,7 +124,7 @@ private:
 		ChatAdminRightsInfo,
 		const QString &rank)> _saveCallback;
 
-	QPointer<Ui::BoxContent> _confirmBox;
+	base::weak_qptr<Ui::BoxContent> _confirmBox;
 	Ui::Checkbox *_addAsAdmin = nullptr;
 	Ui::SlideWrap<Ui::VerticalLayout> *_adminControlsWrap = nullptr;
 	Ui::InputField *_rank = nullptr;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
index 03fbc87c68..15a5f1aee1 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.cpp
@@ -1324,9 +1324,9 @@ void ParticipantsBoxController::rebuild() {
 	refreshRows();
 }
 
-QPointer<Ui::BoxContent> ParticipantsBoxController::showBox(
+base::weak_qptr<Ui::BoxContent> ParticipantsBoxController::showBox(
 		object_ptr<Ui::BoxContent> box) const {
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	delegate()->peerListUiShow()->showBox(std::move(box));
 	return weak;
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
index b993c740c5..6e14120302 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
+++ b/Telegram/SourceFiles/boxes/peers/edit_participants_box.h
@@ -240,7 +240,7 @@ private:
 		Role role,
 		not_null<ParticipantsAdditionalData*> additional);
 
-	QPointer<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
+	base::weak_qptr<Ui::BoxContent> showBox(object_ptr<Ui::BoxContent> box) const;
 
 	void prepareChatRows(not_null<ChatData*> chat);
 	void rebuildChatRows(not_null<ChatData*> chat);
@@ -304,7 +304,7 @@ private:
 	rpl::variable<int> _fullCountValue;
 	Ui::BoxPointer _editBox;
 	Ui::BoxPointer _addBox;
-	QPointer<Ui::BoxContent> _editParticipantBox;
+	base::weak_qptr<Ui::BoxContent> _editParticipantBox;
 
 	std::unique_ptr<PeerListStories> _stories;
 
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 9d01c2560a..8f5f4221dd 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -906,7 +906,7 @@ void Controller::showEditDiscussionLinkBox() {
 		return;
 	}
 
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto channel = _peer->asChannel();
 	const auto callback = [=](ChannelData *result) {
 		if (*box) {
@@ -1252,12 +1252,12 @@ void Controller::fillAutoTranslateButton() {
 			_autotranslateSavedValue = value;
 		} else if (value) {
 			state->toggled.fire(false);
-			auto weak = Ui::MakeWeak(autotranslate);
+			auto weak = base::make_weak(autotranslate);
 			CheckBoostLevel(
 				_navigation->uiShow(),
 				_peer,
 				[=](int level) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						state->isLocked = (level < requiredLevel);
 					}
 					return (level < requiredLevel)
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index aba3714395..17fb1537fb 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -424,7 +424,7 @@ void Controller::addHeaderBlock(not_null<Ui::VerticalLayout*> container) {
 	const auto revoked = current.revoked;
 	const auto link = current.link;
 	const auto admin = current.admin;
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		CopyInviteLink(delegate()->peerListUiShow(), link);
 	});
@@ -1290,7 +1290,7 @@ void AddPermanentLinkBlock(
 			return LinkData{ link.link, link.usage };
 		});
 	}
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto copyLink = crl::guard(weak, [=] {
 		if (const auto current = value->current(); !current.link.isEmpty()) {
 			CopyInviteLink(show, current.link);
@@ -1471,7 +1471,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		const QString &link,
 		const QString &copied) {
 	const auto sending = std::make_shared<bool>();
-	const auto box = std::make_shared<QPointer<ShareBox>>();
+	const auto box = std::make_shared<base::weak_qptr<ShareBox>>();
 
 	const auto showToast = [=](const QString &text) {
 		if (*box) {
@@ -1551,7 +1551,7 @@ object_ptr<Ui::BoxContent> ShareInviteLinkBox(
 		.filterCallback = std::move(filterCallback),
 		.moneyRestrictionError = ShareMessageMoneyRestrictionError(),
 	});
-	*box = Ui::MakeWeak(object.data());
+	*box = base::make_weak(object.data());
 	return object;
 }
 
@@ -1573,7 +1573,7 @@ object_ptr<Ui::BoxContent> EditLinkBox(
 	constexpr auto kPeriod = 3600 * 24 * 30;
 	constexpr auto kTestModePeriod = 300;
 	const auto creating = data.link.isEmpty();
-	const auto box = std::make_shared<QPointer<Ui::GenericBox>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 	using Fields = Ui::InviteLinkFields;
 	const auto done = [=](Fields result) {
 		const auto finish = [=](Api::InviteLink finished) {
@@ -1645,7 +1645,7 @@ object_ptr<Ui::BoxContent> EditLinkBox(
 				done);
 		}
 	});
-	*box = Ui::MakeWeak(object.data());
+	*box = base::make_weak(object.data());
 	return object;
 }
 
diff --git a/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp b/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
index b368f5dc39..f3e71b6f5e 100644
--- a/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/verify_peers_box.cpp
@@ -127,11 +127,11 @@ void Controller::confirmAdd(not_null<PeerData*> peer) {
 				return;
 			}
 			state->sent = true;
-			const auto weak = Ui::MakeWeak(box);
+			const auto weak = base::make_weak(box);
 			const auto description = modify ? state->description : QString();
 			Setup(bot, peer, description, [=](QString error) {
 				if (error.isEmpty()) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 					show->showToast({
@@ -204,10 +204,10 @@ void Controller::confirmRemove(not_null<PeerData*> peer) {
 				return;
 			}
 			*sent = true;
-			const auto weak = Ui::MakeWeak(box);
+			const auto weak = base::make_weak(box);
 			Remove(bot, peer, [=](QString error) {
 				if (error.isEmpty()) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 					show->showToast(tr::lng_bot_verify_remove_done(tr::now));
diff --git a/Telegram/SourceFiles/boxes/phone_banned_box.cpp b/Telegram/SourceFiles/boxes/phone_banned_box.cpp
index b29388e96c..c1e9fb512d 100644
--- a/Telegram/SourceFiles/boxes/phone_banned_box.cpp
+++ b/Telegram/SourceFiles/boxes/phone_banned_box.cpp
@@ -49,7 +49,7 @@ Locale: ") + ::Platform::SystemLanguage();
 void ShowPhoneBannedError(
 		not_null<Window::Controller*> controller,
 		const QString &phone) {
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto close = [=] {
 		if (*box) {
 			(*box)->closeBox();
diff --git a/Telegram/SourceFiles/boxes/pin_messages_box.cpp b/Telegram/SourceFiles/boxes/pin_messages_box.cpp
index 9ba027e20c..9f0a84fccb 100644
--- a/Telegram/SourceFiles/boxes/pin_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/pin_messages_box.cpp
@@ -50,8 +50,8 @@ void PinMessageBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<HistoryItem*> item) {
 	struct State {
-		QPointer<Ui::Checkbox> pinForPeer;
-		QPointer<Ui::Checkbox> notify;
+		base::weak_qptr<Ui::Checkbox> pinForPeer;
+		base::weak_qptr<Ui::Checkbox> notify;
 		mtpRequestId requestId = 0;
 	};
 
@@ -81,7 +81,7 @@ void PinMessageBox(
 				false,
 				st::urlAuthCheckbox);
 			object->setAllowTextLines();
-			state->pinForPeer = Ui::MakeWeak(object.data());
+			state->pinForPeer = base::make_weak(object.data());
 			return object;
 		} else if (!pinningOld
 			&& (peer->isChat() || peer->isMegagroup())
@@ -92,7 +92,7 @@ void PinMessageBox(
 				true,
 				st::urlAuthCheckbox);
 			object->setAllowTextLines();
-			state->notify = Ui::MakeWeak(object.data());
+			state->notify = base::make_weak(object.data());
 			return object;
 		}
 		return { nullptr };
diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.cpp b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
index c4a070c16e..f65cd54b17 100644
--- a/Telegram/SourceFiles/boxes/self_destruction_box.cpp
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
@@ -56,7 +56,7 @@ void AddDeleteAccount(
 			fields.customSubmitButton = tr::lng_theme_delete();
 			fields.customCheckCallback = [=](
 					const Core::CloudPasswordResult &result,
-					QPointer<PasscodeBox> box) {
+					base::weak_qptr<PasscodeBox> box) {
 				session->api().request(MTPaccount_DeleteAccount(
 					MTP_flags(MTPaccount_DeleteAccount::Flag::f_password),
 					MTP_string("Manual"),
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 9e33609715..8f355b1aa6 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -397,7 +397,7 @@ void SendCreditsBox(
 			return;
 		}
 		const auto show = box->uiShow();
-		const auto weak = MakeWeak(box.get());
+		const auto weak = base::make_weak(box.get());
 		state->confirmButtonBusy = true;
 		session->api().request(
 			MTPpayments_SendStarsForm(
@@ -422,7 +422,7 @@ void SendCreditsBox(
 				auto error = ::Ui::MakeInformBox(
 					tr::lng_payments_precheckout_stars_failed(tr::now));
 				error->boxClosing() | rpl::start_with_next([=] {
-					if (const auto paybox = weak.data()) {
+					if (const auto paybox = weak.get()) {
 						paybox->closeBox();
 					}
 				}, error->lifetime());
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index 1ef95d7c89..b16040eeae 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -175,9 +175,9 @@ void EditPriceBox(
 			field->showError();
 			return;
 		}
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		apply(now);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
@@ -597,7 +597,7 @@ void SendFilesBox::enqueueNextPrepare() {
 	}
 	auto file = std::move(_list.filesToProcess.front());
 	_list.filesToProcess.pop_front();
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_preparing = true;
 	const auto sideLimit = PhotoSideLimit(); // Get on main thread.
 	crl::async([weak, sideLimit, file = std::move(file)]() mutable {
@@ -803,7 +803,7 @@ void SendFilesBox::toggleSpoilers(bool enabled) {
 }
 
 void SendFilesBox::changePrice() {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto session = &_show->session();
 	const auto now = _price.current();
 	_show->show(Box(EditPriceBox, session, now, [=](uint64 price) {
diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index dac3fe5d97..5f9e018a28 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -677,7 +677,7 @@ void ShareBox::submit(Api::SendOptions options) {
 	_submitLifetime.destroy();
 
 	auto threads = _inner->selected();
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto field = _comment->entity();
 	auto comment = field->getTextWithAppliedMarkdown();
 	const auto checkPaid = [=] {
@@ -1371,8 +1371,8 @@ void ShareBox::Inner::changeCheckState(Chat *chat) {
 }
 
 void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
-	const auto guard = Ui::MakeWeak(this);
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto guard = base::make_weak(this);
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [=](not_null<Data::ForumTopic*> topic) {
 		if (const auto strong = *weak) {
 			strong->closeBox();
@@ -1419,8 +1419,8 @@ void ShareBox::Inner::chooseForumTopic(not_null<Data::Forum*> forum) {
 
 void ShareBox::Inner::chooseMonoforumSublist(
 		not_null<Data::SavedMessages*> monoforum) {
-	const auto guard = Ui::MakeWeak(this);
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto guard = base::make_weak(this);
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [=](not_null<Data::SavedSublist*> sublist) {
 		if (const auto strong = *weak) {
 			strong->closeBox();
@@ -1953,7 +1953,7 @@ void FastShareLink(
 		std::shared_ptr<Main::SessionShow> show,
 		const QString &url,
 		ShareBoxStyleOverrides st) {
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto sending = std::make_shared<bool>();
 	auto copyCallback = [=] {
 		QGuiApplication::clipboard()->setText(url);
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 0398ffbc91..c63319b912 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2516,7 +2516,7 @@ void SendGiftBox(
 		if (!state->messageAllowed.current()) {
 			details.text = {};
 		}
-		const auto weak = MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		const auto done = [=](Payments::CheckoutResult result) {
 			if (result == Payments::CheckoutResult::Paid) {
 				if (details.byStars
@@ -2527,7 +2527,7 @@ void SendGiftBox(
 				window->showPeerHistory(peer);
 				ShowSentToast(window, details.descriptor, details);
 			}
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		};
@@ -4337,12 +4337,12 @@ void ShowUniqueGiftWearBox(
 					return;
 				}
 				*checking = true;
-				const auto weak = Ui::MakeWeak(box);
+				const auto weak = base::make_weak(box);
 				CheckBoostLevel(show, peer, [=](int level) {
 					const auto limits = Data::LevelLimits(&peer->session());
 					const auto wanted = limits.channelEmojiStatusLevelMin();
 					if (level >= wanted) {
-						if (const auto strong = weak.data()) {
+						if (const auto strong = weak.get()) {
 							strong->closeBox();
 						}
 						emojiStatuses->set(peer, id);
@@ -4835,13 +4835,13 @@ void UpgradeBox(
 		}
 		state->sent = true;
 		const auto keepDetails = state->preserveDetails;
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		const auto done = [=](Payments::CheckoutResult result) {
 			if (result != Payments::CheckoutResult::Paid) {
 				state->sent = false;
 			} else {
 				controller->showPeerHistory(args.peer);
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 			}
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 3c7380f914..2079fc7108 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -494,7 +494,7 @@ StickerSetBox::StickerSetBox(
 : StickerSetBox(parent, std::move(show), set->identifier(), set->type()) {
 }
 
-QPointer<Ui::BoxContent> StickerSetBox::Show(
+base::weak_qptr<Ui::BoxContent> StickerSetBox::Show(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document) {
 	if (const auto sticker = document->sticker()) {
@@ -503,7 +503,7 @@ QPointer<Ui::BoxContent> StickerSetBox::Show(
 				show,
 				sticker->set,
 				sticker->setType);
-			const auto result = QPointer<Ui::BoxContent>(box.data());
+			const auto result = base::make_weak(box.data());
 			show->showBox(std::move(box));
 			return result;
 		}
@@ -1485,7 +1485,7 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 		int index) {
 	Expects(index >= 0 || index < _pack.size());
 	const auto document = _pack[index];
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto show = _show;
 
 	const auto container = box->verticalLayout();
@@ -1510,7 +1510,7 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 	sticker->paintRequest(
 	) | rpl::start_with_next([=] {
 		auto p = Painter(sticker);
-		if ([[maybe_unused]] const auto strong = weak.data()) {
+		if ([[maybe_unused]] const auto strong = weak.get()) {
 			const auto paused = On(PowerSaving::kStickersPanel)
 				|| show->paused(ChatHelpers::PauseReason::Layer);
 			paintSticker(p, index, QPoint(), paused, crl::now());
@@ -1551,7 +1551,7 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 		if (state->requestId.current()) {
 			return;
 		}
-		const auto weakBox = Ui::MakeWeak(box);
+		const auto weakBox = base::make_weak(box);
 		const auto buttonWidth = state->saveButton
 			? state->saveButton->width()
 			: 0;
@@ -1564,14 +1564,14 @@ void StickerSetBox::Inner::fillDeleteStickerBox(
 					Data::StickersType::Stickers);
 			}, [](const auto &) {
 			});
-			if ([[maybe_unused]] const auto strong = weak.data()) {
+			if ([[maybe_unused]] const auto strong = weak.get()) {
 				applySet(result);
 			}
-			if (const auto strongBox = weakBox.data()) {
+			if (const auto strongBox = weakBox.get()) {
 				strongBox->closeBox();
 			}
 		}).fail([=](const MTP::Error &error) {
-			if (const auto strongBox = weakBox.data()) {
+			if (const auto strongBox = weakBox.get()) {
 				strongBox->uiShow()->showToast(error.type());
 			}
 		}).send();
diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
index 07e0168e2b..85fbc2a404 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@@ -70,7 +70,7 @@ public:
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<Data::StickersSet*> set);
 
-	static QPointer<Ui::BoxContent> Show(
+	static base::weak_qptr<Ui::BoxContent> Show(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<DocumentData*> document);
 
diff --git a/Telegram/SourceFiles/boxes/stickers_box.cpp b/Telegram/SourceFiles/boxes/stickers_box.cpp
index 778db60af9..65d3c400bb 100644
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@@ -2058,7 +2058,7 @@ void StickersBox::Inner::checkGroupLevel(Fn<void()> done) {
 	}
 	_checkingGroupLevel = true;
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	CheckBoostLevel(_show, peer, [=](int level) {
 		if (!weak) {
 			return std::optional<Ui::AskBoostReason>();
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index d94c9d01e7..438beff1e0 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -90,8 +90,8 @@ void ConfirmExportBox(
 			Ui::Text::WithEntities),
 		st::boxLabel));
 	box->addButton(tr::lng_gift_transfer_confirm_button(), [=] {
-		confirmed([weak = Ui::MakeWeak(box)] {
-			if (const auto strong = weak.data()) {
+		confirmed([weak = base::make_weak(box)] {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
@@ -143,7 +143,7 @@ void ExportOnBlockchain(
 			fields.customSubmitButton = tr::lng_passcode_submit();
 			fields.customCheckCallback = crl::guard(parent, [=](
 					const Core::CloudPasswordResult &result,
-					QPointer<PasscodeBox> box) {
+					base::weak_qptr<PasscodeBox> box) {
 				using ExportUrl = MTPpayments_StarGiftWithdrawalUrl;
 				session->api().request(
 					MTPpayments_GetStarGiftWithdrawalUrl(
@@ -180,7 +180,7 @@ void ExportOnBlockchain(
 	const auto state = std::make_shared<State>();
 	const auto activate = [=] {
 		const auto now = base::unixtime::now();
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		const auto left = (when > now) ? (when - now) : 0;
 		const auto hours = left ? std::max((left + 1800) / 3600, 1) : 0;
 		if (!hours) {
@@ -193,7 +193,7 @@ void ExportOnBlockchain(
 					state->exporting = false;
 					close();
 				}, [=] {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 					close();
@@ -572,11 +572,11 @@ void ShowTransferToBox(
 				return;
 			}
 			state->sent = true;
-			const auto weak = Ui::MakeWeak(box);
+			const auto weak = base::make_weak(box);
 			const auto done = [=](Payments::CheckoutResult result) {
 				if (result == Payments::CheckoutResult::Cancelled) {
 					closeParentBox();
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 				} else if (result != Payments::CheckoutResult::Paid) {
@@ -586,7 +586,7 @@ void ShowTransferToBox(
 						controller->showPeerHistory(peer);
 					}
 					closeParentBox();
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 				}
@@ -674,7 +674,7 @@ void ShowBuyResaleGiftBox(
 				return;
 			}
 			state->sent = true;
-			const auto weak = Ui::MakeWeak(box);
+			const auto weak = base::make_weak(box);
 			const auto done = [=](Payments::CheckoutResult result) {
 				if (result == Payments::CheckoutResult::Cancelled) {
 					closeParentBox();
diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index b79a417eec..8e29782b5b 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -307,7 +307,7 @@ object_ptr<BoxContent> EditSkipTranslationLanguages() {
 	auto title = tr::lng_translate_settings_choose();
 	const auto selected = std::make_shared<std::vector<LanguageId>>(
 		Core::App().settings().skipTranslationLanguages());
-	const auto weak = std::make_shared<QPointer<BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<BoxContent>>();
 	const auto check = [=](LanguageId id) {
 		const auto already = ranges::contains(*selected, id);
 		if (already) {
@@ -316,7 +316,7 @@ object_ptr<BoxContent> EditSkipTranslationLanguages() {
 			selected->push_back(id);
 		}
 		if (already && selected->empty()) {
-			if (const auto strong = weak->data()) {
+			if (const auto strong = weak->get()) {
 				strong->showToast(
 					tr::lng_translate_settings_one(tr::now),
 					kSkipAtLeastOneDuration);
diff --git a/Telegram/SourceFiles/boxes/url_auth_box.cpp b/Telegram/SourceFiles/boxes/url_auth_box.cpp
index 3dc29d9222..3047bbb771 100644
--- a/Telegram/SourceFiles/boxes/url_auth_box.cpp
+++ b/Telegram/SourceFiles/boxes/url_auth_box.cpp
@@ -134,7 +134,7 @@ void UrlAuthBox::Request(
 	const auto bot = request.is_request_write_access()
 		? session->data().processUser(request.vbot()).get()
 		: nullptr;
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto finishWithUrl = [=](const QString &url) {
 		if (*box) {
 			(*box)->closeBox();
@@ -185,7 +185,7 @@ void UrlAuthBox::Request(
 	const auto bot = request.is_request_write_access()
 		? session->data().processUser(request.vbot()).get()
 		: nullptr;
-	const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto finishWithUrl = [=](const QString &url) {
 		if (*box) {
 			(*box)->closeBox();
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index 372aa37c53..a68484c217 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -711,7 +711,7 @@ std::unique_ptr<PeerListRow> BoxController::createRow(
 void ClearCallsBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<::Window::SessionController*> window) {
-	const auto weak = Ui::MakeWeak(box);
+	const auto weak = base::make_weak(box);
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
@@ -754,7 +754,7 @@ void ClearCallsBox(
 					self(revoke, self);
 				} else {
 					api->session().data().destroyAllCallItems();
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 				}
diff --git a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
index 164f754c3d..7432c4a6b3 100644
--- a/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
+++ b/Telegram/SourceFiles/calls/calls_emoji_fingerprint.cpp
@@ -604,9 +604,9 @@ void SetupFingerprintTooltip(not_null<Ui::RpWidget*> widget) {
 				st::confcallFingerprintTooltipLabel),
 			st::confcallFingerprintTooltip);
 		const auto raw = state->tooltip.get();
-		const auto weak = QPointer<QWidget>(raw);
+		const auto weak = base::make_weak(raw);
 		const auto destroy = [=] {
-			delete weak.data();
+			delete weak.get();
 		};
 		raw->setAttribute(Qt::WA_TransparentForMouseEvents);
 		raw->setHiddenCallback(destroy);
diff --git a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
index a3f57de101..137417a9e0 100644
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
@@ -393,7 +393,7 @@ void ChooseJoinAsProcess::finish(JoinInfo info) {
 	const auto box = _request->box;
 	_request = nullptr;
 	done(std::move(info));
-	if (const auto strong = box.data()) {
+	if (const auto strong = box.get()) {
 		strong->closeBox();
 	}
 }
diff --git a/Telegram/SourceFiles/calls/group/calls_choose_join_as.h b/Telegram/SourceFiles/calls/group/calls_choose_join_as.h
index eb899b5568..673546ffa1 100644
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.h
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.h
@@ -51,7 +51,7 @@ private:
 		std::shared_ptr<Ui::Show> show;
 		Fn<void(JoinInfo)> done;
 		base::has_weak_ptr guard;
-		QPointer<Ui::BoxContent> box;
+		base::weak_qptr<Ui::BoxContent> box;
 		rpl::lifetime lifetime;
 		Context context = Context();
 		mtpRequestId id = 0;
diff --git a/Telegram/SourceFiles/calls/group/calls_group_common.cpp b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
index fab26cc837..066d140861 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_common.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
@@ -213,8 +213,8 @@ void ConferenceCallJoinConfirm(
 		)->setTryMakeSimilarLines(true);
 	}
 	const auto joinAndClose = [=] {
-		join([weak = Ui::MakeWeak(box)] {
-			if (const auto strong = weak.data()) {
+		join([weak = base::make_weak(box)] {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
@@ -275,7 +275,7 @@ void ShowConferenceCallLinkBox(
 				}
 				state->resetting = true;
 				using Flag = MTPphone_ToggleGroupCallSettings::Flag;
-				const auto weak = Ui::MakeWeak(box);
+				const auto weak = base::make_weak(box);
 				call->session().api().request(
 					MTPphone_ToggleGroupCallSettings(
 						MTP_flags(Flag::f_reset_invite_hash),
@@ -284,7 +284,7 @@ void ShowConferenceCallLinkBox(
 				).done([=](const MTPUpdates &result) {
 					call->session().api().applyUpdates(result);
 					ShowConferenceCallLinkBox(show, call, args);
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->closeBox();
 					}
 					show->showToast({
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index cd04eb32fa..6994aff627 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -943,7 +943,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 			: (nonMembers.size() < users.size())
 			? tr::lng_group_call_add_to_group_some(tr::now, lt_group, name)
 			: tr::lng_group_call_add_to_group_all(tr::now, lt_group, name);
-		const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+		const auto shared = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 		const auto finishWithConfirm = [=] {
 			if (*shared) {
 				(*shared)->closeBox();
@@ -983,7 +983,7 @@ object_ptr<Ui::BoxContent> PrepareInviteBox(
 				return !controller->hasRowFor(user);
 			}) | ranges::to_vector;
 
-			const auto finish = [box = Ui::MakeWeak(box)]() {
+			const auto finish = [box = base::make_weak(box)]() {
 				if (box) {
 					box->closeBox();
 				}
@@ -1098,14 +1098,14 @@ object_ptr<Ui::BoxContent> PrepareInviteToEmptyBox(
 		}, box->lifetime());
 
 		const auto join = [=] {
-			const auto weak = Ui::MakeWeak(box);
+			const auto weak = base::make_weak(box);
 			auto selected = raw->requests(box->collectSelectedRows());
 			Core::App().calls().startOrJoinConferenceCall({
 				.call = call,
 				.joinMessageId = inviteMsgId,
 				.invite = std::move(selected),
 			});
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		};
diff --git a/Telegram/SourceFiles/calls/group/calls_group_members.cpp b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
index d5ce0e5791..67a82ccb7d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -1346,16 +1346,16 @@ base::unique_qptr<Ui::PopupMenu> Members::Controller::createRowContextMenu(
 			: addVolumeItem
 			? st::groupCallPopupMenuWithVolume
 			: st::groupCallPopupMenu));
-	const auto weakMenu = Ui::MakeWeak(result.get());
+	const auto weakMenu = base::make_weak(result.get());
 	const auto withActiveWindow = [=](auto callback) {
 		if (const auto window = Core::App().activePrimaryWindow()) {
-			if (const auto menu = weakMenu.data()) {
+			if (const auto menu = weakMenu.get()) {
 				menu->discardParentReActivate();
 
 				// We must hide PopupMenu before we activate the MainWindow,
 				// otherwise we set focus in field inside MainWindow and then
 				// PopupMenu::hide activates back the group call panel :(
-				delete weakMenu;
+				delete weakMenu.get();
 			}
 			window->invokeForSessionController(
 				account,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index f3d2c524ed..ce9c69b195 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -407,7 +407,7 @@ void Panel::startScheduledNow() {
 	} else if (now + kStartNoConfirmation >= date) {
 		_call->startScheduledNow();
 	} else {
-		const auto box = std::make_shared<QPointer<Ui::GenericBox>>();
+		const auto box = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 		const auto done = [=] {
 			if (*box) {
 				(*box)->closeBox();
@@ -1377,7 +1377,7 @@ void Panel::chooseShareScreenSource() {
 		tr::now,
 		lt_user,
 		screencastFromPeer->shortName());
-	const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+	const auto shared = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 	const auto done = [=] {
 		if (*shared) {
 			base::take(*shared)->closeBox();
@@ -2072,9 +2072,9 @@ void Panel::showNiceTooltip(
 			? st::groupCallStickedTooltip
 			: st::groupCallNiceTooltip));
 	const auto tooltip = _niceTooltip.data();
-	const auto weak = QPointer<QWidget>(tooltip);
+	const auto weak = base::make_weak(tooltip);
 	const auto destroy = [=] {
-		delete weak.data();
+		delete weak.get();
 	};
 	if (type != NiceTooltipType::Sticked) {
 		tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -2098,9 +2098,9 @@ void Panel::updateTooltipGeometry() {
 		return;
 	}
 	const auto geometry = _niceTooltipControl->geometry();
-	const auto weak = QPointer<QWidget>(_niceTooltip);
+	const auto weak = base::make_weak(_niceTooltip);
 	const auto countPosition = [=](QSize size) {
-		const auto strong = weak.data();
+		const auto strong = weak.get();
 		const auto wide = (_mode.current() == PanelMode::Wide);
 		const auto top = geometry.y()
 			- (wide ? st::groupCallNiceTooltipTop : 0)
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
index db94f72cb0..9c35ed529d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.cpp
@@ -133,7 +133,7 @@ void StartRtmpProcess::start(
 void StartRtmpProcess::close() {
 	if (_request) {
 		_request->peer->session().api().request(_request->id).cancel();
-		if (const auto strong = _request->box.data()) {
+		if (const auto strong = _request->box.get()) {
 			strong->closeBox();
 		}
 		_request = nullptr;
@@ -199,7 +199,7 @@ void StartRtmpProcess::createBox() {
 	) | rpl::start_with_next([=] {
 		_request = nullptr;
 	}, _request->lifetime);
-	_request->box = Ui::MakeWeak(object.data());
+	_request->box = base::make_weak(object.data());
 	_request->show->showBox(std::move(object));
 }
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_rtmp.h b/Telegram/SourceFiles/calls/group/calls_group_rtmp.h
index eb5d4b5fa6..c3cadab12d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_rtmp.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_rtmp.h
@@ -64,7 +64,7 @@ private:
 		std::shared_ptr<Ui::Show> show;
 		Fn<void(JoinInfo)> done;
 		base::has_weak_ptr guard;
-		QPointer<Ui::BoxContent> box;
+		base::weak_qptr<Ui::BoxContent> box;
 		rpl::lifetime lifetime;
 		mtpRequestId id = 0;
 	};
diff --git a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
index 0adbb8e3e9..cb70c06e6d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
@@ -110,7 +110,7 @@ object_ptr<ShareBox> ShareInviteLinkBox(
 		const QString &linkListener,
 		std::shared_ptr<Ui::Show> show) {
 	const auto sending = std::make_shared<bool>();
-	const auto box = std::make_shared<QPointer<ShareBox>>();
+	const auto box = std::make_shared<base::weak_qptr<ShareBox>>();
 
 	auto bottom = linkSpeaker.isEmpty()
 		? nullptr
@@ -220,7 +220,7 @@ void SettingsBox(
 	using namespace Settings;
 
 	const auto weakCall = base::make_weak(call);
-	const auto weakBox = Ui::MakeWeak(box);
+	const auto weakBox = base::make_weak(box);
 
 	struct State {
 		std::unique_ptr<Webrtc::DeviceResolver> deviceId;
diff --git a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
index a122f09a24..40712391b8 100644
--- a/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/desktop_capture_choose_source.cpp
@@ -351,18 +351,18 @@ void ChooseSourceProcess::setupPanel() {
 		if (_selectedId.isEmpty()) {
 			return;
 		}
-		const auto weak = MakeWeak(_window.get());
+		const auto weak = base::make_weak(_window.get());
 		_delegate->chooseSourceAccepted(
 			_selectedId,
 			!_withAudio->isHidden() && _withAudio->checked());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->close();
 		}
 	});
 	_finish->setClickedCallback([=] {
-		const auto weak = MakeWeak(_window.get());
+		const auto weak = base::make_weak(_window.get());
 		_delegate->chooseSourceStop();
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->close();
 		}
 	});
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
index 2f88f8202d..38b54e3518 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_sets_manager.cpp
@@ -173,7 +173,7 @@ Loader::Loader(
 
 void Loader::unpack(const QString &path) {
 	const auto folder = internal::SetDataPath(id());
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	crl::async([=] {
 		if (UnpackSet(path, folder)) {
 			QFile(path).remove();
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index 87fd388861..16f3a8f73a 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -984,7 +984,7 @@ void SuggestionsController::replaceCurrent(
 	const auto position = cursor.position();
 	const auto suggestion = getEmojiQuery();
 	if (v::is<EmojiPtr>(suggestion)) {
-		const auto weak = Ui::MakeWeak(_container.get());
+		const auto weak = base::make_weak(_container.get());
 		const auto count = std::max(_emojiQueryLength, 1);
 		for (auto i = 0; i != count; ++i) {
 			const auto start = position - count + i;
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 200ad997e8..8f5172c567 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -202,7 +202,7 @@ void EditLinkBox(
 			url->showError();
 			return;
 		}
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		callback(linkText, linkUrl);
 		if (weak) {
 			box->closeBox();
@@ -304,9 +304,9 @@ void EditCodeLanguageBox(
 		const auto name = field->getLastText().trimmed();
 		const auto check = QRegularExpression("^[a-zA-Z0-9\\+\\-]*$");
 		if (check.match(name).hasMatch()) {
-			auto weak = Ui::MakeWeak(box);
+			auto weak = base::make_weak(box);
 			save(name);
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		} else {
@@ -401,7 +401,7 @@ Fn<bool(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field,
 		const style::InputField *fieldStyle) {
-	const auto weak = Ui::MakeWeak(field);
+	const auto weak = base::make_weak(field);
 	return [=](
 			EditLinkSelection selection,
 			TextWithTags text,
@@ -412,7 +412,7 @@ Fn<bool(
 				&& !TextUtilities::IsMentionLink(link);
 		}
 		auto callback = [=](const TextWithTags &text, const QString &link) {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->commitMarkdownLinkEdit(selection, text, link);
 			}
 		};
@@ -484,7 +484,7 @@ void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
 	EditLinkAction action)> FactcheckEditLinkCallback(
 		std::shared_ptr<Main::SessionShow> show,
 		not_null<Ui::InputField*> field) {
-	const auto weak = Ui::MakeWeak(field);
+	const auto weak = base::make_weak(field);
 	return [=](
 			EditLinkSelection selection,
 			TextWithTags text,
@@ -503,7 +503,7 @@ void InitMessageFieldHandlers(MessageFieldHandlersArgs &&args) {
 			return IsGoodFactcheckUrl(link);
 		}
 		auto callback = [=](const TextWithTags &text, const QString &link) {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->commitMarkdownLinkEdit(selection, text, link);
 			}
 		};
@@ -696,9 +696,9 @@ void InitMessageFieldFade(
 		bottomFade->move(
 			0,
 			size.height() - st::historyComposeFieldFadeHeight);
-	}, [t = Ui::MakeWeak(topFade), b = Ui::MakeWeak(bottomFade)] {
-		Ui::DestroyChild(t.data());
-		Ui::DestroyChild(b.data());
+	}, [t = base::make_weak(topFade), b = base::make_weak(bottomFade)] {
+		Ui::DestroyChild(t.get());
+		Ui::DestroyChild(b.get());
 	}, topFade->lifetime());
 
 	const auto descent = field->st().style.font->descent;
diff --git a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
index fed2bbd128..ecf20568ee 100644
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@@ -1736,8 +1736,8 @@ void StickersListWidget::showStickerSetBox(
 			base::timer_once(kTimeout),
 			document->owner().stickers().updated(
 				Data::StickersType::Stickers)
-		) | rpl::start_with_next([=, weak = Ui::MakeWeak(this)] {
-			if (weak.data()) {
+		) | rpl::start_with_next([=, weak = base::make_weak(this)] {
+			if (weak.get()) {
 				showStickerSetBox(document, setId);
 			}
 			lifetime->destroy();
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
index 04d49849d2..68437e450e 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_selector.cpp
@@ -1471,13 +1471,13 @@ void TabbedSelector::Inner::disableScroll(bool disabled) {
 
 void TabbedSelector::Inner::checkHideWithBox(
 		object_ptr<Ui::BoxContent> box) {
-	const auto raw = QPointer<Ui::BoxContent>(box.data());
+	const auto raw = base::make_weak(box.data());
 	_show->showBox(std::move(box));
 	if (!raw) {
 		return;
 	}
 	_preventHideWithBox = true;
-	connect(raw, &QObject::destroyed, this, [=] {
+	connect(raw.get(), &QObject::destroyed, this, [=] {
 		_preventHideWithBox = false;
 		_checkForHide.fire({});
 	});
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 53e01dd106..51fa20fcc6 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -902,7 +902,7 @@ void Application::forceLogOut(
 	box->setCloseByEscape(false);
 	box->setCloseByOutsideClick(false);
 	const auto weak = base::make_weak(account);
-	connect(box, &QObject::destroyed, [=] {
+	connect(box.get(), &QObject::destroyed, [=] {
 		crl::on_main(weak, [=] {
 			account->forcedLogOut();
 		});
@@ -1669,7 +1669,7 @@ void Application::registerLeaveSubscription(not_null<QWidget*> widget) {
 				if (e->type() == QEvent::Leave) {
 					if (const auto taken = _leaveFilters.take(window)) {
 						for (const auto &weak : taken->registered) {
-							if (const auto widget = weak.data()) {
+							if (const auto widget = weak.get()) {
 								QEvent ev(QEvent::Leave);
 								QCoreApplication::sendEvent(widget, &ev);
 							}
diff --git a/Telegram/SourceFiles/core/application.h b/Telegram/SourceFiles/core/application.h
index bfb330d351..24bec04def 100644
--- a/Telegram/SourceFiles/core/application.h
+++ b/Telegram/SourceFiles/core/application.h
@@ -437,7 +437,7 @@ private:
 	const std::unique_ptr<Lang::CloudManager> _langCloudManager;
 	const std::unique_ptr<ChatHelpers::EmojiKeywords> _emojiKeywords;
 	std::unique_ptr<Lang::Translator> _translator;
-	QPointer<Ui::BoxContent> _badProxyDisableBox;
+	base::weak_qptr<Ui::BoxContent> _badProxyDisableBox;
 
 	const std::unique_ptr<Tray> _tray;
 
diff --git a/Telegram/SourceFiles/core/phone_click_handler.cpp b/Telegram/SourceFiles/core/phone_click_handler.cpp
index ec34b8f8be..167aec1653 100644
--- a/Telegram/SourceFiles/core/phone_click_handler.cpp
+++ b/Telegram/SourceFiles/core/phone_click_handler.cpp
@@ -340,7 +340,7 @@ void PhoneClickHandler::onClick(ClickContext context) const {
 	if (Trim(phone) != Trim(controller->session().user()->phone())) {
 		menu->addAction(
 			tr::lng_info_add_as_contact(tr::now),
-			[=, raw = Ui::MakeWeak(resolvePhoneAction.get())] {
+			[=, raw = base::make_weak(resolvePhoneAction.get())] {
 				controller->show(
 					Box<AddContactBox>(
 						&controller->session(),
diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index 13b30f0bd2..eea69ed577 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -57,7 +57,7 @@ void ConfirmDontWarnBox(
 		std::move(check),
 		false,
 		st::defaultBoxCheckbox);
-	const auto weak = Ui::MakeWeak(checkbox.data());
+	const auto weak = base::make_weak(checkbox.data());
 	auto confirmed = crl::guard(weak, [=, callback = std::move(callback)] {
 		const auto checked = weak->checked();
 		box->closeBox();
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 701eaf08db..cfcf028718 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -1008,7 +1008,7 @@ private:
 	Storage::DatabasePointer _bigFileCache;
 
 	TimeId _exportAvailableAt = 0;
-	QPointer<Ui::BoxContent> _exportSuggestion;
+	base::weak_qptr<Ui::BoxContent> _exportSuggestion;
 
 	rpl::variable<bool> _contactsLoaded = false;
 	rpl::variable<int> _groupFreeTranscribeLevel;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 2cbe2d23f0..4ec8f4455c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1966,9 +1966,9 @@ void InnerWidget::mousePressEvent(QMouseEvent *e) {
 		});
 	} else if (_pressed) {
 		auto row = _pressed;
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto updateCallback = [weak, row] {
-			const auto strong = weak.data();
+			const auto strong = weak.get();
 			if (!strong || !strong->_pinnedShiftAnimation.animating()) {
 				row->entry()->updateChatListEntry();
 			}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index ffcd9dce43..c45a82a2b6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1010,7 +1010,7 @@ void Widget::setGeometryWithTopMoved(
 	_topDelta = topDelta;
 	bool willBeResized = (size() != newGeometry.size());
 	if (geometry() != newGeometry) {
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		setGeometry(newGeometry);
 		if (!weak) {
 			return;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index ae4a4768cd..a66fe7488b 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1452,7 +1452,7 @@ void Suggestions::setupChats() {
 
 	_topPeers->showMenuRequests(
 	) | rpl::start_with_next([=](const ShowTopPeerMenuRequest &request) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto owner = &_controller->session().data();
 		const auto peer = owner->peer(PeerId(request.id));
 		const auto removeOne = [=] {
diff --git a/Telegram/SourceFiles/editor/editor_layer_widget.cpp b/Telegram/SourceFiles/editor/editor_layer_widget.cpp
index baa149d5a1..fc2096fa37 100644
--- a/Telegram/SourceFiles/editor/editor_layer_widget.cpp
+++ b/Telegram/SourceFiles/editor/editor_layer_widget.cpp
@@ -157,12 +157,12 @@ void LayerWidget::checkCacheBackground() {
 
 void LayerWidget::cacheBackground() {
 	_backgroundCaching = true;
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto night = IsNightMode();
 	crl::async([weak, night, image = renderBackground()]() mutable {
 		auto result = ProcessBackground(image, night);
 		crl::on_main([weak, night, result = std::move(result)]() mutable {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->backgroundReady(std::move(result), night);
 			}
 		});
diff --git a/Telegram/SourceFiles/editor/photo_editor.cpp b/Telegram/SourceFiles/editor/photo_editor.cpp
index 801e122582..0ec6de90b4 100644
--- a/Telegram/SourceFiles/editor/photo_editor.cpp
+++ b/Telegram/SourceFiles/editor/photo_editor.cpp
@@ -228,12 +228,12 @@ void InitEditorLayer(
 		layer->closeLayer();
 	}, editor->lifetime());
 
-	const auto weak = Ui::MakeWeak(layer.get());
+	const auto weak = base::make_weak(layer.get());
 	editor->doneRequests(
 	) | rpl::start_with_next([=, done = std::move(doneCallback)](
 			const PhotoModifications &mods) {
 		done(mods);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeLayer();
 		}
 	}, editor->lifetime());
diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index bbc19fb5ea..fbb5b258eb 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -404,7 +404,9 @@ auto ApiWrap::fileRequest(const Data::FileLocation &location, int64 offset) {
 	}).toDC(MTP::ShiftDcId(location.dcId, MTP::kExportMediaDcShift)));
 }
 
-ApiWrap::ApiWrap(QPointer<MTP::Instance> weak, Fn<void(FnMut<void()>)> runner)
+ApiWrap::ApiWrap(
+	base::weak_qptr<MTP::Instance> weak,
+	Fn<void(FnMut<void()>)> runner)
 : _mtp(weak, std::move(runner))
 , _fileCache(std::make_unique<LoadedFileCache>(kLocationCacheSize)) {
 }
diff --git a/Telegram/SourceFiles/export/export_api_wrap.h b/Telegram/SourceFiles/export/export_api_wrap.h
index 6073243152..de76417bc7 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.h
+++ b/Telegram/SourceFiles/export/export_api_wrap.h
@@ -40,7 +40,9 @@ struct Settings;
 
 class ApiWrap {
 public:
-	ApiWrap(QPointer<MTP::Instance> weak, Fn<void(FnMut<void()>)> runner);
+	ApiWrap(
+		base::weak_qptr<MTP::Instance> weak,
+		Fn<void(FnMut<void()>)> runner);
 
 	rpl::producer<MTP::Error> errors() const;
 	rpl::producer<Output::Result> ioErrors() const;
diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
index 4aef9c36e6..d65be8f077 100644
--- a/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.cpp
@@ -96,11 +96,11 @@ Environment PrepareEnvironment(not_null<Main::Session*> session) {
 	return result;
 }
 
-QPointer<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session) {
+base::weak_qptr<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session) {
 	ClearSuggestStart(session);
 	return Ui::show(
 		Box<SuggestBox>(session),
-		Ui::LayerOption::KeepOther).data();
+		Ui::LayerOption::KeepOther).get();
 }
 
 void ClearSuggestStart(not_null<Main::Session*> session) {
@@ -277,7 +277,7 @@ void PanelController::showCriticalError(const QString &text) {
 
 void PanelController::showError(const QString &text) {
 	auto box = Ui::MakeInformBox(text);
-	const auto weak = Ui::MakeWeak(box.data());
+	const auto weak = base::make_weak(box.data());
 	const auto hidden = _panel->isHidden();
 	_panel->showBox(
 		std::move(box),
diff --git a/Telegram/SourceFiles/export/view/export_view_panel_controller.h b/Telegram/SourceFiles/export/view/export_view_panel_controller.h
index 70c72f8a69..b820202c3d 100644
--- a/Telegram/SourceFiles/export/view/export_view_panel_controller.h
+++ b/Telegram/SourceFiles/export/view/export_view_panel_controller.h
@@ -24,7 +24,7 @@ class Session;
 namespace Export {
 namespace View {
 
-QPointer<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session);
+base::weak_qptr<Ui::BoxContent> SuggestStart(not_null<Main::Session*> session);
 void ClearSuggestStart(not_null<Main::Session*> session);
 bool IsDefaultPath(not_null<Main::Session*> session, const QString &path);
 void ResolveSettings(not_null<Main::Session*> session, Settings &settings);
@@ -79,7 +79,7 @@ private:
 	base::unique_qptr<Ui::SeparatePanel> _panel;
 
 	State _state;
-	QPointer<Ui::BoxContent> _confirmStopBox;
+	base::weak_qptr<Ui::BoxContent> _confirmStopBox;
 	rpl::event_stream<rpl::producer<>> _panelCloseEvents;
 	bool _stopRequested = false;
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/export/view/export_view_progress.cpp b/Telegram/SourceFiles/export/view/export_view_progress.cpp
index dabda8280d..c7d28c7d47 100644
--- a/Telegram/SourceFiles/export/view/export_view_progress.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_progress.cpp
@@ -51,8 +51,8 @@ private:
 	void hideCurrentInstance();
 	void setInstanceProgress(Instance &instance, float64 progress);
 	void toggleInstance(Instance &data, bool shown);
-	void instanceOpacityCallback(QPointer<Ui::FlatLabel> label);
-	void removeOldInstance(QPointer<Ui::FlatLabel> label);
+	void instanceOpacityCallback(base::weak_qptr<Ui::FlatLabel> label);
+	void removeOldInstance(base::weak_qptr<Ui::FlatLabel> label);
 	void paintInstance(QPainter &p, const Instance &data);
 
 	void updateControlsGeometry(int newWidth);
@@ -146,7 +146,7 @@ void ProgressWidget::Row::toggleInstance(Instance &instance, bool shown) {
 	if (instance.hiding != shown) {
 		return;
 	}
-	const auto label = Ui::MakeWeak(instance.label->entity());
+	const auto label = base::make_weak(instance.label->entity());
 	instance.opacity.start(
 		[=] { instanceOpacityCallback(label); },
 		shown ? 0. : 1.,
@@ -158,10 +158,10 @@ void ProgressWidget::Row::toggleInstance(Instance &instance, bool shown) {
 }
 
 void ProgressWidget::Row::instanceOpacityCallback(
-		QPointer<Ui::FlatLabel> label) {
+		base::weak_qptr<Ui::FlatLabel> label) {
 	update();
 	const auto i = ranges::find(_old, label, [](const Instance &instance) {
-		return Ui::MakeWeak(instance.label->entity());
+		return base::make_weak(instance.label->entity());
 	});
 	if (i != end(_old) && i->hiding && !i->opacity.animating()) {
 		crl::on_main(this, [=] {
@@ -170,9 +170,10 @@ void ProgressWidget::Row::instanceOpacityCallback(
 	}
 }
 
-void ProgressWidget::Row::removeOldInstance(QPointer<Ui::FlatLabel> label) {
+void ProgressWidget::Row::removeOldInstance(
+		base::weak_qptr<Ui::FlatLabel> label) {
 	const auto i = ranges::find(_old, label, [](const Instance &instance) {
-		return Ui::MakeWeak(instance.label->entity());
+		return base::make_weak(instance.label->entity());
 	});
 	if (i != end(_old)) {
 		_old.erase(i);
diff --git a/Telegram/SourceFiles/export/view/export_view_settings.cpp b/Telegram/SourceFiles/export/view/export_view_settings.cpp
index bc25b60394..e610471279 100644
--- a/Telegram/SourceFiles/export/view/export_view_settings.cpp
+++ b/Telegram/SourceFiles/export/view/export_view_settings.cpp
@@ -320,20 +320,20 @@ void SettingsWidget::addLocationLabel(
 }
 
 void SettingsWidget::chooseFormat() {
-	const auto shared = std::make_shared<QPointer<Ui::GenericBox>>();
+	const auto shared = std::make_shared<base::weak_qptr<Ui::GenericBox>>();
 	const auto callback = [=](Format format) {
 		changeData([&](Settings &data) {
 			data.format = format;
 		});
-		if (const auto weak = shared->data()) {
-			weak->closeBox();
+		if (const auto strong = shared->get()) {
+			strong->closeBox();
 		}
 	};
 	auto box = Box(
 		ChooseFormatBox,
 		readData().format,
 		callback);
-	*shared = Ui::MakeWeak(box.data());
+	*shared = base::make_weak(box.data());
 	_showBoxCallback(std::move(box));
 }
 
@@ -602,18 +602,18 @@ void SettingsWidget::editDateLimit(
 		? base::unixtime::parse(min).date()
 		: QDate::currentDate();
 	const auto month = highlighted;
-	const auto shared = std::make_shared<QPointer<Ui::CalendarBox>>();
+	const auto shared = std::make_shared<base::weak_qptr<Ui::CalendarBox>>();
 	const auto finalize = [=](not_null<Ui::CalendarBox*> box) {
 		box->addLeftButton(std::move(resetLabel), crl::guard(this, [=] {
 			done(0);
-			if (const auto weak = shared->data()) {
+			if (const auto weak = shared->get()) {
 				weak->closeBox();
 			}
 		}));
 	};
 	const auto callback = crl::guard(this, [=](const QDate &date) {
 		done(base::unixtime::serialize(date.startOfDay()));
-		if (const auto weak = shared->data()) {
+		if (const auto weak = shared->get()) {
 			weak->closeBox();
 		}
 	});
@@ -630,7 +630,7 @@ void SettingsWidget::editDateLimit(
 			? base::unixtime::parse(max).date()
 			: QDate::currentDate()),
 	});
-	*shared = Ui::MakeWeak(box.data());
+	*shared = base::make_weak(box.data());
 	_showBoxCallback(std::move(box));
 }
 
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index 0d917654d4..c47e562fae 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1530,7 +1530,7 @@ void InnerWidget::suggestRestrictParticipant(
 				UserData *by,
 				TimeId since) {
 			auto weak = QPointer<InnerWidget>(this);
-			auto weakBox = std::make_shared<QPointer<Ui::BoxContent>>();
+			auto weakBox = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 			auto box = Box<EditRestrictedBox>(
 				_channel,
 				user,
@@ -1560,7 +1560,7 @@ void InnerWidget::suggestRestrictParticipant(
 					tr::now,
 					lt_user,
 					participant->name());
-			auto weakBox = std::make_shared<QPointer<Ui::BoxContent>>();
+			auto weakBox = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 			const auto sure = crl::guard(this, [=] {
 				restrictParticipant(
 					participant,
@@ -1810,10 +1810,8 @@ void InnerWidget::mouseActionFinish(const QPoint &screenPos, Qt::MouseButton but
 		ActivateClickHandler(window(), activated, {
 			button,
 			QVariant::fromValue(ClickHandlerContext{
-				.elementDelegate = [weak = Ui::MakeWeak(this)] {
-					return weak
-						? (ElementDelegate*)weak
-						: nullptr;
+				.elementDelegate = [weak = base::make_weak(this)] {
+					return (ElementDelegate*)weak.get();
 				},
 				.sessionWindow = base::make_weak(_controller),
 			})
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index e897e65f26..bdfe45ca02 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -1671,7 +1671,7 @@ void HistoryInner::touchEvent(QTouchEvent *e) {
 		_touchInProgress = false;
 		const auto notMoved = (_touchPos - _touchStart).manhattanLength()
 			< QApplication::startDragDistance();
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		if (_touchSelect) {
 			if (notMoved || _touchMaybeSelecting.current()) {
 				mouseActionFinish(_touchPos, Qt::RightButton);
diff --git a/Telegram/SourceFiles/history/history_item_helpers.cpp b/Telegram/SourceFiles/history/history_item_helpers.cpp
index 57bddb387e..762419f53a 100644
--- a/Telegram/SourceFiles/history/history_item_helpers.cpp
+++ b/Telegram/SourceFiles/history/history_item_helpers.cpp
@@ -356,7 +356,7 @@ void ShowSendPaidConfirm(
 	const auto messages = details.messages;
 	const auto stars = details.stars;
 	show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-		const auto trust = std::make_shared<QPointer<Ui::Checkbox>>();
+		const auto trust = std::make_shared<base::weak_qptr<Ui::Checkbox>>();
 		const auto proceed = [=](Fn<void()> close) {
 			if (singlePeer && (*trust)->checked()) {
 				const auto session = &singlePeer->session();
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 9ab254a5e5..7d9f5765a4 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -1024,7 +1024,7 @@ void HistoryWidget::setGeometryWithTopMoved(
 	_topDelta = topDelta;
 	bool willBeResized = (size() != newGeometry.size());
 	if (geometry() != newGeometry) {
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		setGeometry(newGeometry);
 		if (!weak) {
 			return;
@@ -4494,7 +4494,7 @@ void HistoryWidget::saveEditMessage(Api::SendOptions options) {
 		}
 	}
 
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto history = _history;
 
 	const auto done = [=](mtpRequestId requestId) {
@@ -5603,7 +5603,7 @@ bool HistoryWidget::searchInChatEmbedded(
 	if (!peer || Window::SeparateId(peer) != controller()->windowId()) {
 		return false;
 	} else if (_peer != peer) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		controller()->showPeerHistory(peer);
 		if (!weak) {
 			return false;
@@ -9054,9 +9054,9 @@ void HistoryWidget::forwardSelected() {
 	if (!_list) {
 		return;
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	Window::ShowForwardMessagesBox(controller(), getSelectedItems(), [=] {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->clearSelected();
 		}
 	});
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
index 98064d0204..478ccdba89 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
@@ -256,9 +256,9 @@ List CreateList(
 	}, list.container->lifetime());
 
 	list.container->paintRequest(
-	) | rpl::start_with_next([weak = Ui::MakeWeak(list.container.get())](
+	) | rpl::start_with_next([weak = base::make_weak(list.container.get())](
 			const QRect &r) {
-		auto p = QPainter(weak);
+		auto p = QPainter(weak.get());
 		p.fillRect(r, st::dialogsBg);
 	}, list.container->lifetime());
 
@@ -937,7 +937,7 @@ ComposeSearch::Inner::Inner(
 	_apiSearch.newFounds(
 	) | rpl::start_with_next([=] {
 		const auto &apiData = _apiSearch.messages();
-		const auto weak = Ui::MakeWeak(_bottomBar.get());
+		const auto weak = base::make_weak(_bottomBar.get());
 		_bottomBar->setTotal(apiData.total);
 		if (weak) {
 			// Activating the first search result may switch the chat.
@@ -970,7 +970,7 @@ ComposeSearch::Inner::Inner(
 		_pendingJump.data = {};
 		const auto item = _history->owner().message(messages[index]);
 		if (item) {
-			const auto weak = Ui::MakeWeak(_topBar.get());
+			const auto weak = base::make_weak(_topBar.get());
 			_activations.fire_copy({ item, _apiSearch.request().query });
 			if (weak) {
 				hideList();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index 15125a480b..253073f8dc 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -819,7 +819,7 @@ void DraftOptionsBox(
 			FullReplyTo result,
 			Data::WebPageDraft webpage,
 			std::optional<Data::ForwardOptions> options) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		auto forward = Data::ForwardDraft();
 		if (options) {
 			forward.options = *options;
@@ -828,7 +828,7 @@ void DraftOptionsBox(
 			}
 		}
 		done(std::move(result), std::move(webpage), std::move(forward));
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
@@ -847,7 +847,7 @@ void DraftOptionsBox(
 			});
 		}
 
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		Settings::AddButtonWithIcon(
 			bottom,
 			tr::lng_reply_show_in_chat(),
@@ -855,7 +855,7 @@ void DraftOptionsBox(
 			{ &st::menuIconShowInChat }
 		)->setClickedCallback([=] {
 			highlight(resolveReply());
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
@@ -1402,10 +1402,10 @@ void ShowReplyToChatBox(
 	};
 	auto callback = [=, chosen = std::move(chosen)](
 			Controller::Chosen thread) mutable {
-		const auto weak = Ui::MakeWeak(state->box);
+		const auto weak = base::make_weak(state->box);
 		if (!chosen(thread)) {
 			return;
-		} else if (const auto strong = weak.data()) {
+		} else if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index de53aeb673..8a8b30fff8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -434,11 +434,11 @@ void EditWebPageOptions(
 		});
 
 		box->addButton(tr::lng_settings_save(), [=] {
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			auto result = state->result.current();
 			result.manual = true;
 			done(result);
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index f599f8a63b..0784d82782 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -484,13 +484,13 @@ void ChooseSuggestPriceBox(
 		st::settingsButtonNoIcon);
 
 	time->setClickedCallback([=] {
-		const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
-		const auto parentWeak = Ui::MakeWeak(box);
+		const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
+		const auto parentWeak = base::make_weak(box);
 		const auto done = [=](TimeId result) {
 			if (parentWeak) {
 				state->date = result;
 			}
-			if (const auto strong = weak->data()) {
+			if (const auto strong = weak->get()) {
 				strong->closeBox();
 			}
 		};
@@ -793,12 +793,12 @@ void SuggestOptions::paintLines(QPainter &p, int x, int y, int outerWidth) {
 }
 
 void SuggestOptions::edit() {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	const auto apply = [=](SuggestPostOptions values) {
 		_values = values;
 		updateTexts();
 		_updates.fire({});
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	};
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 2f4cc7192c..8df2628252 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -2082,7 +2082,7 @@ void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
 		}
 	} else if (type == StopType::Send) {
 		if (_videoRecorder) {
-			const auto weak = Ui::MakeWeak(this);
+			const auto weak = base::make_weak(this);
 			_videoRecorder->hide([=](Ui::RoundVideoResult data) {
 				crl::on_main([=, data = std::move(data)]() mutable {
 					if (weak) {
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
index 5e9d3eecdd..353a9acec4 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_preview.cpp
@@ -941,9 +941,9 @@ ChatPreview MakeChatPreview(
 	result.actions = action->actions();
 	menu->addAction(std::move(action));
 	if (const auto topic = thread->asTopic()) {
-		const auto weak = Ui::MakeWeak(menu);
+		const auto weak = base::make_weak(menu);
 		topic->destroyed() | rpl::start_with_next([weak] {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				LOG(("Preview hidden for a destroyed topic."));
 				strong->hideMenu(true);
 			}
diff --git a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
index 4f8595266a..fc4cf0fc3c 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
@@ -2315,9 +2315,9 @@ bool ChatWidget::preventsClose(Fn<void()> &&continueCallback) const {
 	} else if (!_newTopicDiscarded
 		&& _topic
 		&& _topic->creating()) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		auto sure = [=](Fn<void()> &&close) {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->_newTopicDiscarded = true;
 			}
 			close();
@@ -2602,7 +2602,7 @@ void ChatWidget::subscribeToSublist() {
 void ChatWidget::unreadCountUpdated() {
 	if (_sublist && _sublist->unreadMark()) {
 		crl::on_main(this, [=] {
-			const auto guard = Ui::MakeWeak(this);
+			const auto guard = base::make_weak(this);
 			controller()->showPeerHistory(_sublist->owningHistory());
 			if (guard) {
 				closeCurrent();
diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
index 99c135f6f3..b0a48e1bdb 100644
--- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp
@@ -947,8 +947,8 @@ void BusinessBotStatus::Bar::showMenu() {
 		this,
 		st::popupMenuExpandedSeparator);
 	_menu->setDestroyedCallback([
-		weak = Ui::MakeWeak(this),
-		weakButton = Ui::MakeWeak(_settings.data()),
+		weak = base::make_weak(this),
+		weakButton = base::make_weak(_settings.data()),
 		menu = _menu.get()] {
 		if (weak && weak->_menu == menu) {
 			if (weakButton) {
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 3acc55e811..84e258e2fb 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -287,9 +287,9 @@ void AddDocumentActions(
 			item->history()->peer,
 			document);
 		if (notAutoplayedGif) {
-			const auto weak = Ui::MakeWeak(list.get());
+			const auto weak = base::make_weak(list.get());
 			menu->addAction(tr::lng_context_open_gif(tr::now), [=] {
-				if (const auto strong = weak.data()) {
+				if (const auto strong = weak.get()) {
 					OpenGif(strong, contextId);
 				}
 			}, &st::menuIconShowInChat);
@@ -390,9 +390,9 @@ bool AddForwardSelectedAction(
 	}
 
 	menu->addAction(tr::lng_context_forward_selected(tr::now), [=] {
-		const auto weak = Ui::MakeWeak(list);
+		const auto weak = base::make_weak(list);
 		const auto callback = [=] {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->cancelSelection();
 			}
 		};
@@ -471,7 +471,7 @@ bool AddSendNowSelectedAction(
 	const auto history = *histories.begin();
 
 	menu->addAction(tr::lng_context_send_now_selected(tr::now), [=] {
-		const auto weak = Ui::MakeWeak(list);
+		const auto weak = base::make_weak(list);
 		const auto callback = [=] {
 			request.navigation->showBackFromStack();
 		};
@@ -1149,9 +1149,9 @@ void EditTagBox(
 			field->showError();
 			return;
 		}
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		controller->session().data().reactions().renameTag(id, text);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	};
@@ -1629,10 +1629,10 @@ void AddWhoReactedAction(
 		not_null<HistoryItem*> item,
 		not_null<Window::SessionController*> controller) {
 	const auto whoReadIds = std::make_shared<Api::WhoReadList>();
-	const auto weak = Ui::MakeWeak(menu.get());
+	const auto weak = base::make_weak(menu.get());
 	const auto user = item->history()->peer;
 	const auto showOrPremium = [=] {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->hideMenu();
 		}
 		const auto type = Ui::ShowOrPremium::ReadTime;
@@ -1647,14 +1647,14 @@ void AddWhoReactedAction(
 	};
 	const auto itemId = item->fullId();
 	const auto participantChosen = [=](Ui::WhoReadParticipant who) {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->hideMenu();
 		}
 		ShowWhoReadInfo(controller, itemId, who);
 	};
 	const auto showAllChosen = [=, itemId = item->fullId()]{
 		// Pressing on an item that has a submenu doesn't hide it :(
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->hideMenu();
 		}
 		if (const auto item = controller->session().data().message(itemId)) {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 6077d1a1f6..6a46231354 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -3123,7 +3123,7 @@ void ListWidget::touchEvent(QTouchEvent *e) {
 			return;
 		}
 		_touchInProgress = false;
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		const auto notMoved = (_touchPos - _touchStart).manhattanLength()
 			< QApplication::startDragDistance();
 		if (_touchSelect) {
@@ -3625,10 +3625,8 @@ void ListWidget::mouseActionFinish(
 ClickHandlerContext ListWidget::prepareClickHandlerContext(FullMsgId id) {
 	return {
 		.itemId = id,
-		.elementDelegate = [weak = Ui::MakeWeak(this)] {
-			return weak
-				? (ElementDelegate*)weak
-				: nullptr;
+		.elementDelegate = [weak = base::make_weak(this)] {
+			return (ElementDelegate*)weak.get();
 		},
 		.sessionWindow = base::make_weak(controller()),
 	};
@@ -4347,9 +4345,9 @@ void ConfirmForwardSelectedItems(not_null<ListWidget*> widget) {
 		}
 	}
 	auto ids = widget->getSelectedIds();
-	const auto weak = Ui::MakeWeak(widget);
+	const auto weak = base::make_weak(widget);
 	Window::ShowForwardMessagesBox(widget->controller(), std::move(ids), [=] {
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->cancelSelection();
 		}
 	});
@@ -4378,8 +4376,8 @@ void ConfirmSendNowSelectedItems(not_null<ListWidget*> widget) {
 	if (!history) {
 		return;
 	}
-	const auto clearSelection = [weak = Ui::MakeWeak(widget)] {
-		if (const auto strong = weak.data()) {
+	const auto clearSelection = [weak = base::make_weak(widget)] {
+		if (const auto strong = weak.get()) {
 			strong->cancelSelection();
 		}
 	};
diff --git a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
index a6ac266d36..27c8d2f975 100644
--- a/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp
@@ -1340,9 +1340,9 @@ void ScheduledWidget::showProcessingVideoTooltip() {
 			st::defaultImportantTooltipLabel),
 		st::defaultImportantTooltip);
 	const auto tooltip = _processingVideoTooltip.get();
-	const auto weak = QPointer<QWidget>(tooltip);
+	const auto weak = base::make_weak(tooltip);
 	const auto destroy = [=] {
-		delete weak.data();
+		delete weak.get();
 	};
 	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
 	tooltip->setHiddenCallback([=] {
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 97edfbdc52..a5ed7ee279 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -336,8 +336,8 @@ bool TopBarWidget::createMenu(not_null<Ui::IconButton*> button) {
 		this,
 		st::popupMenuExpandedSeparator);
 	_menu->setDestroyedCallback([
-			weak = Ui::MakeWeak(this),
-			weakButton = Ui::MakeWeak(button),
+			weak = base::make_weak(this),
+			weakButton = base::make_weak(button),
 			menu = _menu.get()] {
 		if (weak && weak->_menu == menu) {
 			if (weakButton) {
diff --git a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
index 11e9cc8d7a..c263c5f9ee 100644
--- a/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_translate_bar.cpp
@@ -409,8 +409,8 @@ base::unique_qptr<Ui::PopupMenu> TranslateBar::createMenu(
 		st::popupMenuExpandedSeparator);
 	result->setDestroyedCallback([
 		this,
-		weak = Ui::MakeWeak(&_wrap),
-		weakButton = Ui::MakeWeak(button),
+		weak = base::make_weak(&_wrap),
+		weakButton = base::make_weak(button),
 		menu = result.get()
 	] {
 		if (weak && _menu == menu) {
@@ -430,7 +430,7 @@ void TranslateBar::showMenu(base::unique_qptr<Ui::PopupMenu> menu) {
 	_menu = std::move(menu);
 	_menu->setForcedOrigin(Ui::PanelAnimation::Origin::TopRight);
 
-	const auto guard = Ui::MakeWeak(&_wrap);
+	const auto guard = base::make_weak(&_wrap);
 	const auto now = _history->translatedTo();
 	const auto to = now ? now : Ui::ChooseTranslateTo(_history);
 	const auto weak = base::make_weak(_controller);
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
index 89dcda70a3..5e3b7d5ece 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -549,7 +549,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 
 		struct State {
 			rpl::variable<not_null<PeerData*>> recipient;
-			QPointer<Ui::GenericBox> weak;
+			base::weak_qptr<Ui::GenericBox> weak;
 			bool sent = false;
 		};
 		const auto state = std::make_shared<State>(State{
@@ -709,7 +709,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 					}
 				}
 				show->show(StarRefLinkBox(info, recipient));
-				if (const auto strong = state->weak.data()) {
+				if (const auto strong = state->weak.get()) {
 					strong->closeBox();
 				}
 			}, [=](const QString &error) {
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
index 515b275923..0343af54bf 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_join_widget.cpp
@@ -1105,7 +1105,7 @@ std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer) {
 object_ptr<Ui::BoxContent> ProgramsListBox(
 		not_null<Window::SessionController*> window,
 		not_null<PeerData*> peer) {
-	const auto weak = std::make_shared<QPointer<PeerListBox>>();
+	const auto weak = std::make_shared<base::weak_qptr<PeerListBox>>();
 	const auto initBox = [=](not_null<PeerListBox*> box) {
 		*weak = box;
 		box->addButton(tr::lng_close(), [=] {
@@ -1118,7 +1118,7 @@ object_ptr<Ui::BoxContent> ProgramsListBox(
 		peer,
 		JoinType::Existing);
 	controller->addForBotRequests() | rpl::start_with_next([=] {
-		if (const auto strong = weak->data()) {
+		if (const auto strong = weak->get()) {
 			strong->closeBox();
 		}
 	}, controller->lifetime());
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
index 5d1772c93a..46183eb688 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_setup_widget.cpp
@@ -738,7 +738,7 @@ void InnerWidget::setupEnd() {
 		tr::lng_star_ref_end(),
 		st::settingsAttentionButton));
 	end->setClickedCallback([=] {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto window = _controller->parentController();
 		const auto sent = std::make_shared<bool>();
 		window->show(ConfirmEndBox([=] {
@@ -751,7 +751,7 @@ void InnerWidget::setupEnd() {
 				*sent = false;
 				if (!success) {
 					return;
-				} else if ([[maybe_unused]] const auto strong = weak.data()) {
+				} else if ([[maybe_unused]] const auto strong = weak.get()) {
 					_controller->showBackFromStack();
 					window->showToast({
 						.title = tr::lng_star_ref_ended_title(tr::now),
@@ -1013,7 +1013,7 @@ std::unique_ptr<Ui::RpWidget> Widget::setupBottom() {
 			st::boxDividerLabel),
 		QMargins(margins.left(), 0, margins.right(), 0));
 	save->setClickedCallback([=] {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto user = _state->user;
 		const auto program = _state->program;
 		const auto show = controller()->uiShow();
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index 09f5cdeb60..cc1c092bc3 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -1459,11 +1459,11 @@ void CreateGiveawayBox(
 			}
 			state->confirmButtonBusy = true;
 			const auto show = box->uiShow();
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			const auto done = [=](Payments::CheckoutResult result) {
 				const auto isPaid = result == Payments::CheckoutResult::Paid;
 				if (result == Payments::CheckoutResult::Pending || isPaid) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->window()->setFocus();
 						strong->closeBox();
 					}
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
index 0f35e31de0..de6862e8bc 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/info_boosts_inner_widget.cpp
@@ -174,7 +174,7 @@ void FillShareLink(
 		std::shared_ptr<Ui::Show> show,
 		const QString &link,
 		not_null<PeerData*> peer) {
-	const auto weak = Ui::MakeWeak(content);
+	const auto weak = base::make_weak(content);
 	const auto copyLink = crl::guard(weak, [=] {
 		QGuiApplication::clipboard()->setText(link);
 		show->showToast(tr::lng_channel_public_link_copied(tr::now));
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 1563bef9dd..4e6ef02378 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -1470,10 +1470,10 @@ void InnerWidget::fill() {
 					[] {});
 			}
 			if (!isLocked) {
-				const auto weak = Ui::MakeWeak(this);
+				const auto weak = base::make_weak(this);
 				const auto show = _controller->uiShow();
 				const auto failed = [=](const QString &e) {
-					if (weak.data()) {
+					if (weak.get()) {
 						toggled->fire(false);
 						show->showToast(e);
 					}
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index a6dd089a25..8e731fc914 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -53,7 +53,7 @@ void TopBar::registerUpdateControlCallback(
 		QObject *guard,
 		Callback &&callback) {
 	_updateControlCallbacks[guard] =[
-		weak = Ui::MakeWeak(guard),
+		weak = base::make_weak(guard),
 		callback = std::forward<Callback>(callback)
 	](anim::type animated) {
 		if (!weak) {
@@ -579,8 +579,8 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 			}
 		}, _storiesLifetime);
 
-		_storiesLifetime.add([weak = QPointer<QWidget>(label)] {
-			delete weak.data();
+		_storiesLifetime.add([weak = base::make_weak(label)] {
+			delete weak.get();
 		});
 	} else {
 		_storiesCount = 0;
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 56bc9bf193..20a99a2c58 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -979,7 +979,7 @@ object_ptr<Ui::RpWidget> WrapWidget::createTopBarSurrogate(
 		Assert(_topBar != nullptr);
 
 		auto result = object_ptr<Ui::AbstractButton>(parent);
-		result->addClickHandler([weak = Ui::MakeWeak(this)]{
+		result->addClickHandler([weak = base::make_weak(this)]{
 			if (weak) {
 				weak->_controller->showBackFromStack();
 			}
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index d4d99d138a..f6b382b1e4 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1224,8 +1224,8 @@ void ListWidget::forwardItems(MessageIdsList &&items) {
 					{ id.peer, StoryIdFromMsgId(id.msg) }));
 		}
 	} else {
-		auto callback = [weak = Ui::MakeWeak(this)] {
-			if (const auto strong = weak.data()) {
+		auto callback = [weak = base::make_weak(this)] {
+			if (const auto strong = weak.get()) {
 				strong->clearSelected();
 			}
 		};
@@ -1373,7 +1373,7 @@ void ListWidget::deleteItems(SelectedItems &&items, Fn<void()> confirmed) {
 				: tr::lng_downloads_delete_in_cloud(tr::now));
 		const auto deleteSure = [=] {
 			Ui::PostponeCall(this, [=] {
-				if (const auto box = _actionBoxWeak.data()) {
+				if (const auto box = _actionBoxWeak.get()) {
 					box->closeBox();
 				}
 			});
@@ -1433,10 +1433,10 @@ void ListWidget::deleteItems(SelectedItems &&items, Fn<void()> confirmed) {
 	}
 }
 
-void ListWidget::setActionBoxWeak(QPointer<Ui::BoxContent> box) {
+void ListWidget::setActionBoxWeak(base::weak_qptr<Ui::BoxContent> box) {
 	if ((_actionBoxWeak = box)) {
 		_actionBoxWeakLifetime = _actionBoxWeak->alive(
-		) | rpl::start_with_done([weak = Ui::MakeWeak(this)]{
+		) | rpl::start_with_done([weak = base::make_weak(this)]{
 			if (weak) {
 				weak->_checkForHide.fire({});
 			}
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index 4f4a78e966..fa40321c47 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -272,7 +272,7 @@ private:
 	void checkMoveToOtherViewer();
 	void clearHeavyItems();
 
-	void setActionBoxWeak(QPointer<Ui::BoxContent> box);
+	void setActionBoxWeak(base::weak_qptr<Ui::BoxContent> box);
 
 	const not_null<AbstractController*> _controller;
 	const std::unique_ptr<ListProvider> _provider;
@@ -307,7 +307,7 @@ private:
 
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 	rpl::event_stream<> _checkForHide;
-	QPointer<Ui::BoxContent> _actionBoxWeak;
+	base::weak_qptr<Ui::BoxContent> _actionBoxWeak;
 	rpl::lifetime _actionBoxWeakLifetime;
 
 	QPoint _trippleClickPoint;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 51c83a2f77..33e28a9227 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -1015,9 +1015,9 @@ void SelectGiftToUnpin(
 			}
 			Assert(index < int(pinned.size()));
 			const auto &entry = pinned[index];
-			const auto weak = Ui::MakeWeak(box);
+			const auto weak = base::make_weak(box);
 			chosen(::Settings::EntryToSavedStarGiftId(session, entry));
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index e07ba2d1c2..26823bb83b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -885,13 +885,13 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 		state->balance = balance;
 	}
 	{
-		const auto weak = Ui::MakeWeak(wrap);
+		const auto weak = base::make_weak(wrap);
 		const auto currencyLoadLifetime
 			= std::make_shared<rpl::lifetime>();
 		const auto currencyLoad
 			= currencyLoadLifetime->make_state<Api::EarnStatistics>(user);
 		const auto done = [=](CreditsAmount balance) {
-			if ([[maybe_unused]] const auto strong = weak.data()) {
+			if ([[maybe_unused]] const auto strong = weak.get()) {
 				state->balance = balance;
 				currencyLoadLifetime->destroy();
 			}
diff --git a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
index ecf24b2796..de39c8ed1b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
@@ -269,7 +269,7 @@ void EmojiStatusPanel::create(const Descriptor &descriptor) {
 			_panel->hideAnimated();
 		}, _panel->lifetime());
 	} else {
-		const auto weak = Ui::MakeWeak(_panel.get());
+		const auto weak = base::make_weak(_panel.get());
 		const auto accept = [=](Chosen chosen) {
 			Expects(chosen.until != Selector::kPickCustomTimeId);
 
diff --git a/Telegram/SourceFiles/info/settings/info_settings_widget.h b/Telegram/SourceFiles/info/settings/info_settings_widget.h
index e1aef6b78e..b08a4281f8 100644
--- a/Telegram/SourceFiles/info/settings/info_settings_widget.h
+++ b/Telegram/SourceFiles/info/settings/info_settings_widget.h
@@ -104,8 +104,8 @@ private:
 		rpl::event_stream<> backButtonEnables;
 	} _flexibleScroll;
 	not_null<::Settings::AbstractSection*> _inner;
-	QPointer<Ui::RpWidget> _pinnedToTop;
-	QPointer<Ui::RpWidget> _pinnedToBottom;
+	base::weak_qptr<Ui::RpWidget> _pinnedToTop;
+	base::weak_qptr<Ui::RpWidget> _pinnedToBottom;
 
 	rpl::event_stream<std::vector<Type>> _removesFromStack;
 
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 36e907923f..8e1af089b1 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -219,7 +219,7 @@ void ShowChooseBox(
 		PeerTypes types,
 		Fn<void(not_null<Data::Thread*>)> callback,
 		rpl::producer<QString> titleOverride = nullptr) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto done = [=](not_null<Data::Thread*> thread) mutable {
 		if (const auto strong = *weak) {
 			strong->closeBox();
@@ -1816,8 +1816,8 @@ void WebViewInstance::botSendPreparedMessage(
 			.viaBotId = peerToUser(bot->id),
 		});
 		struct State {
-			QPointer<Ui::BoxContent> preview;
-			QPointer<Ui::BoxContent> choose;
+			base::weak_qptr<Ui::BoxContent> preview;
+			base::weak_qptr<Ui::BoxContent> choose;
 			rpl::event_stream<not_null<Data::Thread*>> recipient;
 			Fn<void(Api::SendOptions)> send;
 			SendPaymentHelper sendPayment;
@@ -1837,10 +1837,10 @@ void WebViewInstance::botSendPreparedMessage(
 			const auto weak1 = state->preview;
 			const auto weak2 = state->choose;
 			const auto close = [=] {
-				if (const auto strong = weak1.data()) {
+				if (const auto strong = weak1.get()) {
 					strong->closeBox();
 				}
-				if (const auto strong = weak2.data()) {
+				if (const auto strong = weak2.get()) {
 					strong->closeBox();
 				}
 			};
@@ -1850,9 +1850,9 @@ void WebViewInstance::botSendPreparedMessage(
 				}
 				if (success) {
 					*failed = -1;
-					if (const auto strong2 = weak2.data()) {
+					if (const auto strong2 = weak2.get()) {
 						strong2->showToast({ tr::lng_share_done(tr::now) });
-					} else if (const auto strong1 = weak1.data()) {
+					} else if (const auto strong1 = weak1.get()) {
 						strong1->showToast({ tr::lng_share_done(tr::now) });
 					}
 					base::call_delayed(Ui::Toast::kDefaultDuration, close);
diff --git a/Telegram/SourceFiles/intro/intro_password_check.cpp b/Telegram/SourceFiles/intro/intro_password_check.cpp
index 3555c95ef8..748e304fe1 100644
--- a/Telegram/SourceFiles/intro/intro_password_check.cpp
+++ b/Telegram/SourceFiles/intro/intro_password_check.cpp
@@ -230,7 +230,7 @@ void PasswordCheckWidget::codeSubmitDone(
 	fields.mtp.curRequest = {};
 	fields.hasPassword = false;
 	auto box = Box<PasscodeBox>(&api().instance(), nullptr, fields);
-	const auto boxShared = std::make_shared<QPointer<PasscodeBox>>();
+	const auto boxShared = std::make_shared<base::weak_qptr<PasscodeBox>>();
 
 	box->newAuthorization(
 	) | rpl::start_with_next([=](const MTPauth_Authorization &result) {
diff --git a/Telegram/SourceFiles/intro/intro_widget.cpp b/Telegram/SourceFiles/intro/intro_widget.cpp
index ca65b02214..296991f514 100644
--- a/Telegram/SourceFiles/intro/intro_widget.cpp
+++ b/Telegram/SourceFiles/intro/intro_widget.cpp
@@ -403,7 +403,7 @@ void Widget::historyMove(StackAction action, Animate animate) {
 }
 
 void Widget::hideAndDestroy(object_ptr<Ui::FadeWrap<Ui::RpWidget>> widget) {
-	const auto weak = Ui::MakeWeak(widget.data());
+	const auto weak = base::make_weak(widget.data());
 	widget->hide(anim::type::normal);
 	widget->shownValue(
 	) | rpl::start_with_next([=](bool shown) {
@@ -625,7 +625,7 @@ void Widget::showTerms(Fn<void()> callback) {
 	if (getData()->termsLock.text.text.isEmpty()) {
 		return;
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto box = Ui::show(callback
 		? Box<Window::TermsBox>(
 			getData()->termsLock,
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 87befe5bfd..2b436d842c 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -1096,7 +1096,7 @@ void Controller::showMenu() {
 	}
 	_menu->setDestroyedCallback(crl::guard(_window.get(), [
 			this,
-			weakButton = Ui::MakeWeak(_menuToggle.data()),
+			weakButton = base::make_weak(_menuToggle.data()),
 			menu = _menu.get()] {
 		if (_menu == menu && weakButton) {
 			weakButton->setForceRippled(false);
diff --git a/Telegram/SourceFiles/iv/iv_instance.cpp b/Telegram/SourceFiles/iv/iv_instance.cpp
index 09a7e2e383..dec3f36cf9 100644
--- a/Telegram/SourceFiles/iv/iv_instance.cpp
+++ b/Telegram/SourceFiles/iv/iv_instance.cpp
@@ -315,11 +315,11 @@ ShareBoxResult Shown::shareBox(ShareBoxDescriptor &&descriptor) {
 	};
 	const auto state = wrap->lifetime().make_state<State>();
 
-	const auto weak = QPointer<Ui::RpWidget>(wrap);
+	const auto weak = base::make_weak(wrap);
 	const auto lookup = crl::guard(weak, [state] { return state->stack; });
 	const auto layer = Ui::CreateChild<Ui::LayerStackWidget>(
 		wrap.get(),
-		[=] { return std::make_shared<Show>(weak.data(), lookup); });
+		[=] { return std::make_shared<Show>(weak.get(), lookup); });
 	state->stack = layer;
 	const auto show = layer->showFactory()();
 
diff --git a/Telegram/SourceFiles/iv/iv_pch.h b/Telegram/SourceFiles/iv/iv_pch.h
index 4ad8da65a9..15ad9d2fe7 100644
--- a/Telegram/SourceFiles/iv/iv_pch.h
+++ b/Telegram/SourceFiles/iv/iv_pch.h
@@ -22,9 +22,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/flat_map.h"
 #include "base/flat_set.h"
+#include "base/weak_qptr.h"
 
 #include "ui/qt_object_factory.h"
-#include "ui/qt_weak_factory.h"
 
 #include "scheme.h"
 #include "logs.h"
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index e7ed0c618d..773c4fb3a6 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -259,7 +259,7 @@ void MainWindow::setupMain(
 	const auto animated = _intro
 		|| (_passcodeLock && !Core::App().passcodeLocked());
 	const auto weakAnimatedLayer = (_main && _layer && !_passcodeLock)
-		? Ui::MakeWeak(_layer.get())
+		? base::make_weak(_layer.get())
 		: nullptr;
 	if (weakAnimatedLayer) {
 		Assert(!animated);
@@ -288,7 +288,7 @@ void MainWindow::setupMain(
 		Core::App().checkStartUrl();
 	}
 	fixOrder();
-	if (const auto strong = weakAnimatedLayer.data()) {
+	if (const auto strong = weakAnimatedLayer.get()) {
 		strong->hideAllAnimatedRun();
 	}
 }
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index a77c700b25..316000a4fb 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -741,9 +741,9 @@ void Header::toggleTooltip(Tooltip type, bool show) {
 			st::storiesInfoTooltipLabel),
 		st::storiesInfoTooltip);
 	const auto tooltip = _tooltip.get();
-	const auto weak = QPointer<QWidget>(tooltip);
+	const auto weak = base::make_weak(tooltip);
 	const auto destroy = [=] {
-		delete weak.data();
+		delete weak.get();
 	};
 	tooltip->setAttribute(Qt::WA_TransparentForMouseEvents);
 	tooltip->setHiddenCallback(destroy);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 9333efdc91..5ff6a060a3 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -3381,7 +3381,7 @@ void OverlayWidget::refreshCaption() {
 			: Ui::ItemTextDefaultOptions()),
 		context);
 	if (_caption.hasSpoilers()) {
-		const auto weak = Ui::MakeWeak(widget());
+		const auto weak = base::make_weak(widget());
 		_caption.setSpoilerLinkFilter([=](const ClickContext &context) {
 			return (weak != nullptr);
 		});
@@ -4286,7 +4286,7 @@ void OverlayWidget::initThemePreview() {
 	const auto weakSession = base::make_weak(&_document->session());
 	const auto path = _document->location().name();
 	const auto id = _themePreviewId = base::RandomValue<uint64>();
-	const auto weak = Ui::MakeWeak(_widget);
+	const auto weak = base::make_weak(_widget);
 	crl::async([=, data = std::move(current)]() mutable {
 		auto preview = GeneratePreview(
 			bytes,
@@ -6448,7 +6448,7 @@ bool OverlayWidget::handleTouchEvent(not_null<QTouchEvent*> e) {
 		if (!_touchPress) {
 			break;
 		}
-		auto weak = Ui::MakeWeak(_widget);
+		auto weak = base::make_weak(_widget);
 		if (!_touchMove) {
 			const auto button = _touchRightButton
 				? Qt::RightButton
diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
index 7c8f958889..42600dbb3e 100644
--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
@@ -1009,7 +1009,7 @@ void Pip::handleLeave() {
 }
 
 void Pip::handleMouseMove(QPoint position) {
-	const auto weak = Ui::MakeWeak(_panel.widget());
+	const auto weak = base::make_weak(_panel.widget());
 	const auto guard = gsl::finally([&] {
 		if (weak) {
 			_panel.handleMouseMove(position);
@@ -1087,7 +1087,7 @@ Pip::OverState Pip::ResolveShownOver(OverState state) {
 }
 
 void Pip::handleMousePress(QPoint position, Qt::MouseButton button) {
-	const auto weak = Ui::MakeWeak(_panel.widget());
+	const auto weak = base::make_weak(_panel.widget());
 	const auto guard = gsl::finally([&] {
 		if (weak) {
 			_panel.handleMousePress(position, button);
@@ -1105,7 +1105,7 @@ void Pip::handleMousePress(QPoint position, Qt::MouseButton button) {
 }
 
 void Pip::handleMouseRelease(QPoint position, Qt::MouseButton button) {
-	const auto weak = Ui::MakeWeak(_panel.widget());
+	const auto weak = base::make_weak(_panel.widget());
 	const auto guard = gsl::finally([&] {
 		if (weak) {
 			_panel.handleMouseRelease(position, button);
diff --git a/Telegram/SourceFiles/menu/menu_item_download_files.cpp b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
index 01a990b11b..540f2ebb71 100644
--- a/Telegram/SourceFiles/menu/menu_item_download_files.cpp
+++ b/Telegram/SourceFiles/menu/menu_item_download_files.cpp
@@ -226,8 +226,8 @@ void AddDownloadFilesAction(
 			return;
 		}
 	}
-	const auto done = [weak = Ui::MakeWeak(list)] {
-		if (const auto strong = weak.data()) {
+	const auto done = [weak = base::make_weak(list)] {
+		if (const auto strong = weak.get()) {
 			strong->cancelSelection();
 		}
 	};
@@ -253,8 +253,8 @@ void AddDownloadFilesAction(
 			return;
 		}
 	}
-	const auto done = [weak = Ui::MakeWeak(list)] {
-		if (const auto strong = weak.data()) {
+	const auto done = [weak = base::make_weak(list)] {
+		if (const auto strong = weak.get()) {
 			strong->clearSelected();
 		}
 	};
diff --git a/Telegram/SourceFiles/menu/menu_send.cpp b/Telegram/SourceFiles/menu/menu_send.cpp
index 4125ac0891..86518f725f 100644
--- a/Telegram/SourceFiles/menu/menu_send.cpp
+++ b/Telegram/SourceFiles/menu/menu_send.cpp
@@ -589,7 +589,7 @@ void EffectPreview::toggle(bool shown) {
 Fn<void(Action, Details)> DefaultCallback(
 		std::shared_ptr<ChatHelpers::Show> show,
 		Fn<void(Api::SendOptions)> send) {
-	const auto guard = Ui::MakeWeak(show->toastParent());
+	const auto guard = base::make_weak(show->toastParent());
 	return [=](Action action, Details details) {
 		if (action.type == ActionType::Send) {
 			send(action.options);
@@ -601,9 +601,9 @@ Fn<void(Action, Details)> DefaultCallback(
 			details,
 			send,
 			action.options);
-		const auto weak = Ui::MakeWeak(box.data());
+		const auto weak = base::make_weak(box.data());
 		show->showBox(std::move(box));
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->setCloseByOutsideClick(false);
 		}
 	};
@@ -618,7 +618,7 @@ FillMenuResult AttachSendMenuEffect(
 	Expects(show != nullptr);
 
 	using namespace HistoryView::Reactions;
-	const auto effect = std::make_shared<QPointer<EffectPreview>>();
+	const auto effect = std::make_shared<base::weak_qptr<EffectPreview>>();
 	const auto position = desiredPositionOverride.value_or(QCursor::pos());
 	const auto selector = (show && details.effectAllowed)
 		? AttachSelectorToMenu(
@@ -645,13 +645,13 @@ FillMenuResult AttachSendMenuEffect(
 		const auto &effects = reactions.list(Data::Reactions::Type::Effects);
 		const auto i = ranges::find(effects, chosen.id, &Data::Reaction::id);
 		if (i != end(effects)) {
-			if (const auto strong = effect->data()) {
+			if (const auto strong = effect->get()) {
 				strong->hideAnimated();
 			}
-			const auto weak = Ui::MakeWeak(menu);
+			const auto weak = base::make_weak(menu);
 			const auto done = [=] {
-				delete effect->data();
-				if (const auto strong = weak.data()) {
+				delete effect->get();
+				if (const auto strong = weak.get()) {
 					strong->hideMenu(true);
 				}
 			};
diff --git a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp
index 5bb4d5d205..89ad7d9625 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.cpp
@@ -76,7 +76,7 @@ auto ConcurrentSender::with_instance(Method &&method)
 		weak = _weak,
 		method = std::forward<Method>(method)
 	]() mutable {
-		if (const auto instance = weak.data()) {
+		if (const auto instance = weak.get()) {
 			std::move(method)(instance);
 		}
 	});
@@ -136,7 +136,7 @@ mtpRequestId ConcurrentSender::RequestBuilder::send() {
 }
 
 ConcurrentSender::ConcurrentSender(
-	QPointer<Instance> weak,
+	base::weak_qptr<Instance> weak,
 	Fn<void(FnMut<void()>)> runner)
 : _weak(weak)
 , _runner(runner) {
diff --git a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h
index 47daaf7a6c..f96d0fe3ac 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h
+++ b/Telegram/SourceFiles/mtproto/mtproto_concurrent_sender.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/bytes.h"
 #include "base/weak_ptr.h"
+#include "base/weak_qptr.h"
 #include "base/flat_map.h"
 #include "mtproto/core_types.h"
 #include "mtproto/details/mtproto_serialized_request.h"
@@ -83,7 +84,7 @@ class ConcurrentSender : public base::has_weak_ptr {
 
 public:
 	ConcurrentSender(
-		QPointer<Instance> weak,
+		base::weak_qptr<Instance> weak,
 		Fn<void(FnMut<void()>)> runner);
 
 	template <typename Request>
@@ -184,7 +185,7 @@ private:
 	void senderRequestCancelAll();
 	void senderRequestDetach(mtpRequestId requestId);
 
-	const QPointer<Instance> _weak;
+	const base::weak_qptr<Instance> _weak;
 	const Fn<void(FnMut<void()>)> _runner;
 	base::flat_map<mtpRequestId, Handlers> _requests;
 
diff --git a/Telegram/SourceFiles/passport/passport_form_view_controller.h b/Telegram/SourceFiles/passport/passport_form_view_controller.h
index b2a22fbdbc..590d7c2109 100644
--- a/Telegram/SourceFiles/passport/passport_form_view_controller.h
+++ b/Telegram/SourceFiles/passport/passport_form_view_controller.h
@@ -63,11 +63,11 @@ public:
 	}
 
 	template <typename BoxType>
-	QPointer<BoxType> show(
+	base::weak_qptr<BoxType> show(
 			object_ptr<BoxType> box,
 			Ui::LayerOptions options = Ui::LayerOption::KeepOther,
 			anim::type animated = anim::type::normal) {
-		auto result = QPointer<BoxType>(box.data());
+		auto result = base::weak_qptr<BoxType>(box.data());
 		showBox(std::move(box), options, animated);
 		return result;
 	}
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.cpp b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
index e4979bf3b2..1abfa686be 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.cpp
@@ -910,7 +910,7 @@ void PanelController::suggestReset(Fn<void()> callback) {
 		.confirmed = [=] { resetPassport(callback); },
 		.cancelled = [=] { cancelReset(); },
 		.confirmText = Lang::Hard::PassportCorruptedReset(),
-	})).data());
+	})).get());
 }
 
 void PanelController::resetPassport(Fn<void()> callback) {
@@ -921,7 +921,7 @@ void PanelController::resetPassport(Fn<void()> callback) {
 		.confirmText = Lang::Hard::PassportCorruptedReset(),
 		.confirmStyle = &st::attentionBoxButton,
 	}));
-	_resetBox = Ui::BoxPointer(box.data());
+	_resetBox = Ui::BoxPointer(box.get());
 }
 
 void PanelController::cancelReset() {
@@ -1210,7 +1210,7 @@ void PanelController::startScopeEdit(
 					std::move(scans),
 					std::move(translations),
 					PrepareSpecialFiles(*_editDocument));
-			const auto weak = Ui::MakeWeak(result.data());
+			const auto weak = base::make_weak(result.data());
 			_panelHasUnsavedChanges = [=] {
 				return weak ? weak->hasUnsavedChanges() : false;
 			};
@@ -1229,7 +1229,7 @@ void PanelController::startScopeEdit(
 					std::move(preferredLanguage)),
 				_editValue->error,
 				_editValue->data.parsedInEdit);
-			const auto weak = Ui::MakeWeak(result.data());
+			const auto weak = base::make_weak(result.data());
 			_panelHasUnsavedChanges = [=] {
 				return weak ? weak->hasUnsavedChanges() : false;
 			};
diff --git a/Telegram/SourceFiles/passport/passport_panel_controller.h b/Telegram/SourceFiles/passport/passport_panel_controller.h
index 5c3d296b47..c08645056e 100644
--- a/Telegram/SourceFiles/passport/passport_panel_controller.h
+++ b/Telegram/SourceFiles/passport/passport_panel_controller.h
@@ -174,7 +174,7 @@ private:
 
 	std::unique_ptr<Panel> _panel;
 	Fn<bool()> _panelHasUnsavedChanges;
-	QPointer<Ui::BoxContent> _confirmForgetChangesBox;
+	base::weak_qptr<Ui::BoxContent> _confirmForgetChangesBox;
 	std::vector<Ui::BoxPointer> _editScopeBoxes;
 	Scope *_editScope = nullptr;
 	const Value *_editValue = nullptr;
diff --git a/Telegram/SourceFiles/passport/ui/passport_details_row.cpp b/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
index 55739b7dbb..0fa946fd96 100644
--- a/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
+++ b/Telegram/SourceFiles/passport/ui/passport_details_row.cpp
@@ -571,7 +571,7 @@ DateRow::DateRow(
 	GetYear(value))
 , _value(valueCurrent()) {
 	const auto focused = [=](const object_ptr<DateInput> &field) {
-		return [this, pointer = MakeWeak(field.data())]{
+		return [this, pointer = base::make_weak(field.data())]{
 			_borderAnimationStart = pointer->borderAnimationStart()
 				+ pointer->x()
 				- _day->x();
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.cpp b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
index 379036e6e9..d27161660e 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.cpp
@@ -410,7 +410,7 @@ void CheckoutProcess::handleFormUpdate(const FormUpdate &update) {
 		UnregisterPaymentStart(this);
 		_submitState = SubmitState::Validated;
 		_panel->showWarning(data.bot->name(), data.provider->name());
-		if (const auto box = _enterPasswordBox.data()) {
+		if (const auto box = _enterPasswordBox.get()) {
 			box->closeBox();
 		}
 	}, [&](const VerificationNeeded &data) {
@@ -534,7 +534,7 @@ void CheckoutProcess::handleError(const Error &error) {
 		showToast({ "SmartGlocal Error: " + id });
 	} break;
 	case Error::Type::TmpPassword:
-		if (const auto box = _enterPasswordBox.data()) {
+		if (const auto box = _enterPasswordBox.get()) {
 			if (!box->handleCustomCheckError(id)) {
 				showToast({ "Error: Could not generate tmp password." });
 			}
@@ -542,7 +542,7 @@ void CheckoutProcess::handleError(const Error &error) {
 		break;
 	case Error::Type::Send:
 		_sendFormFailed = true;
-		if (const auto box = _enterPasswordBox.data()) {
+		if (const auto box = _enterPasswordBox.get()) {
 			box->closeBox();
 		}
 		if (_submitState == SubmitState::Finishing) {
@@ -857,7 +857,7 @@ void CheckoutProcess::requestPassword() {
 		fields.customSubmitButton = tr::lng_payments_password_submit();
 		fields.customCheckCallback = [=](
 				const Core::CloudPasswordResult &result,
-				QPointer<PasscodeBox> box) {
+				base::weak_qptr<PasscodeBox> box) {
 			_enterPasswordBox = box;
 			_form->submit(result);
 		};
diff --git a/Telegram/SourceFiles/payments/payments_checkout_process.h b/Telegram/SourceFiles/payments/payments_checkout_process.h
index 2f52caf23f..ad6648c500 100644
--- a/Telegram/SourceFiles/payments/payments_checkout_process.h
+++ b/Telegram/SourceFiles/payments/payments_checkout_process.h
@@ -189,7 +189,7 @@ private:
 	const not_null<Main::Session*> _session;
 	const std::unique_ptr<Form> _form;
 	const std::unique_ptr<Ui::Panel> _panel;
-	QPointer<PasscodeBox> _enterPasswordBox;
+	base::weak_qptr<PasscodeBox> _enterPasswordBox;
 	Fn<void(CheckoutResult)> _reactivate;
 	Fn<void(NonPanelPaymentForm)> _nonPanelPaymentFormProcess;
 	SubmitState _submitState = SubmitState::None;
diff --git a/Telegram/SourceFiles/payments/payments_reaction_process.cpp b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
index 3e5236fda1..3bea078d30 100644
--- a/Telegram/SourceFiles/payments/payments_reaction_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
@@ -140,7 +140,7 @@ void ShowPaidReactionDetails(
 	const auto chosen = std::clamp(kDefaultPerReaction, 1, max);
 
 	struct State {
-		QPointer<Ui::BoxContent> selectBox;
+		base::weak_qptr<Ui::BoxContent> selectBox;
 		bool ignoreShownPeerSwitch = false;
 		bool sending = false;
 	};
@@ -155,7 +155,7 @@ void ShowPaidReactionDetails(
 			state->sending = false;
 			if (success && count > 0) {
 				state->ignoreShownPeerSwitch = true;
-				if (const auto strong = state->selectBox.data()) {
+				if (const auto strong = state->selectBox.get()) {
 					strong->closeBox();
 				}
 			}
@@ -260,7 +260,7 @@ void ShowPaidReactionDetails(
 		},
 	}));
 
-	if (const auto strong = state->selectBox.data()) {
+	if (const auto strong = state->selectBox.get()) {
 		session->data().itemRemoved(
 		) | rpl::start_with_next([=](not_null<const HistoryItem*> removed) {
 			if (removed == item) {
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index 67ad2c7cc0..9a0011234e 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -236,7 +236,7 @@ void AddArrowDown(not_null<RpWidget*> widget) {
 }
 
 void SelectShownPeer(
-		std::shared_ptr<QPointer<PopupMenu>> menu,
+		std::shared_ptr<base::weak_qptr<PopupMenu>> menu,
 		not_null<QWidget*> parent,
 		const std::vector<PaidReactionTop> &mine,
 		uint64 selected,
@@ -311,7 +311,7 @@ void FillTopReactors(
 		bool chosenChanged = false;
 	};
 	const auto state = wrap->lifetime().make_state<State>();
-	const auto menu = std::make_shared<QPointer<Ui::PopupMenu>>();
+	const auto menu = std::make_shared<base::weak_qptr<Ui::PopupMenu>>();
 
 	rpl::combine(
 		std::move(chosen),
diff --git a/Telegram/SourceFiles/settings/business/settings_away_message.cpp b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
index 58f3a61656..181582fa3f 100644
--- a/Telegram/SourceFiles/settings/business/settings_away_message.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_away_message.cpp
@@ -119,10 +119,10 @@ void AddAwayScheduleSelector(
 			Fn<TimeId()> max,
 			Fn<void(TimeId)> done) {
 		using namespace Ui;
-		const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		const auto save = [=](TimeId time) {
 			done(time);
-			if (const auto strong = box->data()) {
+			if (const auto strong = box->get()) {
 				strong->closeBox();
 			}
 		};
diff --git a/Telegram/SourceFiles/settings/business/settings_greeting.cpp b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
index 8437acc7c0..a65d6946dd 100644
--- a/Telegram/SourceFiles/settings/business/settings_greeting.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_greeting.cpp
@@ -89,9 +89,9 @@ void EditPeriodBox(
 	const auto take = TimePickerBox(box, values, phrases, days);
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(take());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
diff --git a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
index e59ef7061d..9c4bcf11bb 100644
--- a/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_quick_replies.cpp
@@ -220,8 +220,8 @@ void EditShortcutNameBox(
 		if (!ValidShortcutName(name)) {
 			field->showError();
 		} else {
-			submit(name, [weak = Ui::MakeWeak(box)] {
-				if (const auto strong = weak.data()) {
+			submit(name, [weak = base::make_weak(box)] {
+				if (const auto strong = weak.get()) {
 					strong->closeBox();
 				}
 			});
diff --git a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
index 135f7df7e3..eb3dc498ed 100644
--- a/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_shortcut_messages.cpp
@@ -178,7 +178,7 @@ private:
 	bool cornerButtonsUnreadMayBeShown() override;
 	bool cornerButtonsHas(CornerButtonType type) override;
 
-	QPointer<Ui::RpWidget> createPinnedToBottom(
+	base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 	void setupComposeControls();
 	void processScroll();
@@ -773,7 +773,7 @@ void ShortcutMessages::setupComposeControls() {
 	}, lifetime());
 }
 
-QPointer<Ui::RpWidget> ShortcutMessages::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> ShortcutMessages::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	auto placeholder = rpl::deferred([=] {
 		return _shortcutId.value();
diff --git a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
index 6e0bf6f504..00e4c291c0 100644
--- a/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_working_hours.cpp
@@ -255,12 +255,12 @@ void EditTimeBox(
 	});
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(std::clamp(
 			((*minutesStart) / 60 + minutes->current()->index()) * 60,
 			low,
 			high));
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
@@ -398,9 +398,9 @@ void EditDayBox(
 	AddDividerText(container, tr::lng_hours_about_day());
 
 	box->addButton(tr::lng_settings_save(), [=] {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(state->data.current());
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
@@ -457,9 +457,9 @@ void ChooseTimezoneBox(
 		});
 	}
 	group->setChangedCallback([=](int index) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		save(list[index].id);
-		if (const auto strong = weak.data()) {
+		if (const auto strong = weak.get()) {
 			strong->closeBox();
 		}
 	});
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
index e8bb2607ab..cdc53eb748 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
@@ -80,7 +80,7 @@ BottomButton CreateBottomDisableButton(
 	divider->show();
 
 	return {
-		.content = Ui::MakeWeak(not_null<Ui::RpWidget*>{ content }),
+		.content = base::make_weak(content),
 		.isBottomFillerShown = divider->geometryValue(
 		) | rpl::map([](const QRect &r) {
 			return r.height() > 0;
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
index a87c1aaed5..cd6a53b85d 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
@@ -82,7 +82,7 @@ void AddSkipInsteadOfField(not_null<Ui::VerticalLayout*> content);
 void AddSkipInsteadOfError(not_null<Ui::VerticalLayout*> content);
 
 struct BottomButton {
-	QPointer<Ui::RpWidget> content;
+	base::weak_qptr<Ui::RpWidget> content;
 	rpl::producer<bool> isBottomFillerShown;
 };
 
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
index 7719fc2ddd..a7dd669b4f 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
@@ -126,7 +126,7 @@ public:
 	using TypedAbstractStep::TypedAbstractStep;
 
 	[[nodiscard]] rpl::producer<QString> title() override;
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
 	void setupContent();
 	void setupValidateGood();
@@ -156,7 +156,7 @@ rpl::producer<QString> Input::title() {
 	return tr::lng_settings_cloud_password_password_title();
 }
 
-QPointer<Ui::RpWidget> Input::createPinnedToTop(
+base::weak_qptr<Ui::RpWidget> Input::createPinnedToTop(
 		not_null<QWidget*> parent) {
 	_parent = parent;
 	return nullptr;
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
index 211c6dff48..31c4c2aeb6 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
@@ -124,14 +124,14 @@ void LoginEmailConfirm::setupContent() {
 			newInput->setFocus();
 			newInput->showError();
 		} else {
-			const auto weak = Ui::MakeWeak(controller()->content());
+			const auto weak = base::make_weak(controller()->content());
 			const auto done = [=] {
 				_api.reset();
 				_processFinishes.fire({});
 				cloudPassword().reload();
 				setStepData(StepData());
 				showBack();
-				if (const auto strong = weak) {
+				if (const auto strong = weak.get()) {
 					Ui::StartFireworks(strong);
 				}
 			};
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
index 1f7a876738..1c6c484ef6 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_manage.cpp
@@ -53,7 +53,7 @@ public:
 	[[nodiscard]] rpl::producer<QString> title() override;
 	void setupContent();
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 protected:
@@ -184,7 +184,7 @@ void Manage::setupContent() {
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> Manage::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> Manage::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 
 	const auto disable = [=](Fn<void()> close) {
diff --git a/Telegram/SourceFiles/settings/settings_active_sessions.cpp b/Telegram/SourceFiles/settings/settings_active_sessions.cpp
index 2b8368b4df..48150fdeb6 100644
--- a/Telegram/SourceFiles/settings/settings_active_sessions.cpp
+++ b/Telegram/SourceFiles/settings/settings_active_sessions.cpp
@@ -496,7 +496,7 @@ void SessionInfoBox(
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 	if (const auto hash = data.hash) {
 		box->addLeftButton(tr::lng_sessions_terminate(), [=] {
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			terminate(hash);
 			if (weak) {
 				box->closeBox();
@@ -652,7 +652,7 @@ private:
 	Full _data;
 
 	object_ptr<Inner> _inner;
-	QPointer<Ui::BoxContent> _terminateBox;
+	base::weak_qptr<Ui::BoxContent> _terminateBox;
 
 	base::Timer _shortPollTimer;
 
@@ -843,12 +843,12 @@ void SessionsContent::terminate(Fn<void()> terminateRequest, QString message) {
 		.confirmText = tr::lng_settings_reset_button(),
 		.confirmStyle = &st::attentionBoxButton,
 	});
-	_terminateBox = Ui::MakeWeak(box.data());
+	_terminateBox = base::make_weak(box.data());
 	_controller->show(std::move(box));
 }
 
 void SessionsContent::terminateOne(uint64 hash) {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	auto callback = [=] {
 		auto done = crl::guard(weak, [=](const MTPBool &result) {
 			if (mtpIsFalse(result)) {
@@ -877,7 +877,7 @@ void SessionsContent::terminateOne(uint64 hash) {
 }
 
 void SessionsContent::terminateAll() {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	auto callback = [=] {
 		const auto reset = crl::guard(weak, [=] {
 			_authorizations->cancelCurrentRequest();
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
index c0b2a47463..fbb8a065ee 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
+++ b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
@@ -73,7 +73,7 @@ rpl::producer<QString> Blocked::title() {
 	return tr::lng_settings_blocked_users();
 }
 
-QPointer<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
+base::weak_qptr<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
 	const auto content = Ui::CreateChild<Ui::VerticalLayout>(parent.get());
 
 	Ui::AddSkip(content);
@@ -118,7 +118,7 @@ QPointer<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
 		}, subtitle->lifetime());
 	}
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Blocked::setupContent() {
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.h b/Telegram/SourceFiles/settings/settings_blocked_peers.h
index b534cd87ec..e8a8e7c2da 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.h
+++ b/Telegram/SourceFiles/settings/settings_blocked_peers.h
@@ -29,7 +29,7 @@ public:
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
 
 private:
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index a59c30b63f..a619971545 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -332,9 +332,9 @@ public:
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 	void showFinished() override;
@@ -582,7 +582,7 @@ void Business::setupContent() {
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> Business::createPinnedToTop(
+base::weak_qptr<Ui::RpWidget> Business::createPinnedToTop(
 		not_null<QWidget*> parent) {
 	auto title = tr::lng_business_title();
 	auto about = [&]() -> rpl::producer<TextWithEntities> {
@@ -671,14 +671,14 @@ QPointer<Ui::RpWidget> Business::createPinnedToTop(
 		}
 	}, content->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Business::showFinished() {
 	_showFinished.fire({});
 }
 
-QPointer<Ui::RpWidget> Business::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> Business::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	const auto content = Ui::CreateChild<Ui::RpWidget>(parent.get());
 
@@ -747,7 +747,7 @@ QPointer<Ui::RpWidget> Business::createPinnedToBottom(
 		_subscribe->setVisible(!premium && premiumPossible);
 	}, _subscribe->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/settings/settings_calls.cpp b/Telegram/SourceFiles/settings/settings_calls.cpp
index 16d3f3a249..d80f394a24 100644
--- a/Telegram/SourceFiles/settings/settings_calls.cpp
+++ b/Telegram/SourceFiles/settings/settings_calls.cpp
@@ -483,7 +483,7 @@ void ChooseMediaDeviceBox(
 	state->currentId = std::move(currentId);
 
 	const auto choose = [=](const QString &id) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		chosen(id);
 		if (weak) {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/settings/settings_common.h b/Telegram/SourceFiles/settings/settings_common.h
index 6a9e214951..bf4102f391 100644
--- a/Telegram/SourceFiles/settings/settings_common.h
+++ b/Telegram/SourceFiles/settings/settings_common.h
@@ -88,11 +88,11 @@ public:
 	[[nodiscard]] virtual const Ui::RoundRect *bottomSkipRounding() const {
 		return nullptr;
 	}
-	[[nodiscard]] virtual QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] virtual base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 			not_null<QWidget*> parent) {
 		return nullptr;
 	}
-	[[nodiscard]] virtual QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] virtual base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 			not_null<Ui::RpWidget*> parent) {
 		return nullptr;
 	}
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 1ed8c28c51..b893508a66 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -73,7 +73,7 @@ public:
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
 
 	void showFinished() override;
@@ -603,7 +603,7 @@ void Credits::setupContent() {
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> Credits::createPinnedToTop(
+base::weak_qptr<Ui::RpWidget> Credits::createPinnedToTop(
 		not_null<QWidget*> parent) {
 	_parent = parent;
 	const auto isCurrency = _creditsType == CreditsType::Ton;
@@ -722,7 +722,7 @@ QPointer<Ui::RpWidget> Credits::createPinnedToTop(
 		}
 	}, content->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Credits::showFinished() {
@@ -799,9 +799,9 @@ Fn<void()> BuyStarsHandler::handler(
 			? _api->options()
 			: Data::CreditTopupOptions();
 		const auto amount = CreditsAmount();
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		FillCreditOptions(show, inner, self, amount, [=] {
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 			if (const auto onstack = paid) {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 2850e85a01..decb554373 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -625,9 +625,9 @@ void FillCreditOptions(
 					.giftPeerId = PeerId(option.giftBarePeerId),
 				};
 
-				const auto weak = Ui::MakeWeak(button);
+				const auto weak = base::make_weak(button);
 				const auto done = [=](Payments::CheckoutResult result) {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->window()->setFocus();
 						if (result == Payments::CheckoutResult::Paid) {
 							if (const auto onstack = paid) {
@@ -889,10 +889,10 @@ void BoostCreditsBox(
 }
 
 void ProcessReceivedSubscriptions(
-		QPointer<Ui::GenericBox> weak,
+		base::weak_qptr<Ui::GenericBox> weak,
 		not_null<Main::Session*> session) {
 	const auto rebuilder = session->data().activeCreditsSubsRebuilder();
-	if (const auto strong = weak.data()) {
+	if (const auto strong = weak.get()) {
 		if (!rebuilder) {
 			return strong->closeBox();
 		}
@@ -903,7 +903,7 @@ void ProcessReceivedSubscriptions(
 				true);
 		api->requestSubscriptions({}, [=](Data::CreditsStatusSlice first) {
 			rebuilder->fire(std::move(first));
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 		});
@@ -1759,7 +1759,7 @@ void GenericCreditsEntryBox(
 		&& !e.giftTransferred
 		&& !e.giftRefunded
 		&& !e.converted;
-	const auto toggleVisibility = [=, weak = Ui::MakeWeak(box)](bool save) {
+	const auto toggleVisibility = [=, weak = base::make_weak(box)](bool save) {
 		const auto showSection = !e.fromGiftsList;
 		const auto savedId = EntryToSavedStarGiftId(&show->session(), e);
 		const auto done = [=](bool ok) {
@@ -1771,7 +1771,7 @@ void GenericCreditsEntryBox(
 							Info::Section::Type::PeerGifts));
 				}
 			}
-			if (const auto strong = weak.data()) {
+			if (const auto strong = weak.get()) {
 				if (ok) {
 					strong->closeBox();
 				} else {
@@ -1817,7 +1817,7 @@ void GenericCreditsEntryBox(
 	const auto canUpgradeFree = canUpgrade && (e.starsUpgradedBySender > 0);
 
 	if (isStarGift && e.id.isEmpty()) {
-		const auto convert = [=, weak = Ui::MakeWeak(box)] {
+		const auto convert = [=, weak = base::make_weak(box)] {
 			const auto stars = e.starsConverted;
 			const auto days = canConvert ? ((timeLeft + 86399) / 86400) : 0;
 			auto text = giftToChannelCanManage
@@ -1851,7 +1851,7 @@ void GenericCreditsEntryBox(
 								.action = GiftAction::Convert,
 							});
 						}
-						if (const auto strong = weak.data()) {
+						if (const auto strong = weak.get()) {
 							if (ok) {
 								strong->closeBox();
 							} else {
@@ -1973,7 +1973,7 @@ void GenericCreditsEntryBox(
 				if (button != Qt::LeftButton) {
 					return false;
 				}
-				const auto done = [=, weak = Ui::MakeWeak(box)] {
+				const auto done = [=, weak = base::make_weak(box)] {
 					ProcessReceivedSubscriptions(weak, session);
 				};
 				const auto fail = [=, s = box->uiShow()](const QString &e) {
@@ -2024,7 +2024,7 @@ void GenericCreditsEntryBox(
 				? tr::lng_gift_show_on_channel
 				: tr::lng_gift_show_on_page)()
 			: tr::lng_box_ok()));
-	const auto send = [=, weak = Ui::MakeWeak(box)] {
+	const auto send = [=, weak = base::make_weak(box)] {
 		if (toRejoin && !toRenew) {
 			if (const auto window = show->resolveWindow()) {
 				const auto finish = [=](Payments::CheckoutResult&&) {
@@ -2049,7 +2049,7 @@ void GenericCreditsEntryBox(
 				ProcessReceivedSubscriptions(weak, session);
 			};
 			const auto fail = [=, show = box->uiShow()](const QString &e) {
-				if ([[maybe_unused]] const auto strong = weak.data()) {
+				if ([[maybe_unused]] const auto strong = weak.get()) {
 					state->confirmButtonBusy = false;
 				}
 				show->showToast(e);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index bd5d8be137..1c5129e2f2 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -353,7 +353,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) {
 		not_null<rpl::event_stream<bool>*> tagsButtonEnabled) {
 	auto &lifetime = container->lifetime();
 
-	const auto weak = Ui::MakeWeak(container);
+	const auto weak = base::make_weak(container);
 	const auto session = &controller->session();
 	const auto limit = [=] {
 		return Data::PremiumLimits(session).dialogFiltersCurrent();
@@ -909,9 +909,9 @@ void SetupTagContent(
 		tagsButton->setToggleLocked(!value);
 	}, tagsButton->lifetime());
 
-	const auto send = [=, weak = Ui::MakeWeak(tagsButton)](bool checked) {
+	const auto send = [=, weak = base::make_weak(tagsButton)](bool checked) {
 		session->data().chatsFilters().requestToggleTags(checked, [=] {
-			if ([[maybe_unused]] const auto strong = weak.data()) {
+			if ([[maybe_unused]] const auto strong = weak.get()) {
 				state->tagsTurnOff.fire(!checked);
 			}
 		});
diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
index 8f639c30a6..75943bcaef 100644
--- a/Telegram/SourceFiles/settings/settings_local_passcode.cpp
+++ b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
@@ -404,7 +404,7 @@ public:
 
 	[[nodiscard]] rpl::producer<std::vector<Type>> removeFromStack() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 private:
@@ -606,7 +606,7 @@ void LocalPasscodeManage::setupContent() {
 	Ui::ResizeFitChild(this, content);
 }
 
-QPointer<Ui::RpWidget> LocalPasscodeManage::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> LocalPasscodeManage::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	auto callback = [=] {
 		_controller->show(
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index f7098544c6..e212d2c457 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -478,7 +478,7 @@ void SetupValidatePhoneNumberSuggestion(
 		st::inviteLinkButton);
 	no->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	no->setClickedCallback([=] {
-		const auto sharedLabel = std::make_shared<QPointer<Ui::FlatLabel>>();
+		const auto sharedLabel = std::make_shared<base::weak_qptr<Ui::FlatLabel>>();
 		const auto height = st::boxLabel.style.font->height;
 		const auto customEmojiFactory = [=](
 			QStringView data,
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.cpp b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
index df18b65ee1..391f63babb 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
@@ -530,7 +530,7 @@ void SetupExceptions(
 	state->controller->setDelegate(state->delegate.get());
 
 	add->setClickedCallback([=] {
-		const auto box = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto box = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		const auto done = [=](not_null<PeerData*> peer) {
 			state->controller->bringToTop(peer);
 			if (*box) {
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 76d93b9d5d..2b04f6db57 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -863,9 +863,9 @@ public:
 
 	[[nodiscard]] rpl::producer<QString> title() override;
 
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToTop(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToTop(
 		not_null<QWidget*> parent) override;
-	[[nodiscard]] QPointer<Ui::RpWidget> createPinnedToBottom(
+	[[nodiscard]] base::weak_qptr<Ui::RpWidget> createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) override;
 
 	void showFinished() override;
@@ -1023,7 +1023,7 @@ void Premium::setupContent() {
 
 }
 
-QPointer<Ui::RpWidget> Premium::createPinnedToTop(
+base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 		not_null<QWidget*> parent) {
 	auto title = _controller->session().premium()
 		? tr::lng_premium_summary_title()
@@ -1168,14 +1168,14 @@ QPointer<Ui::RpWidget> Premium::createPinnedToTop(
 		}
 	}, content->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 void Premium::showFinished() {
 	_showFinished.fire({});
 }
 
-QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
+base::weak_qptr<Ui::RpWidget> Premium::createPinnedToBottom(
 		not_null<Ui::RpWidget*> parent) {
 	const auto content = Ui::CreateChild<Ui::RpWidget>(parent.get());
 
@@ -1278,7 +1278,7 @@ QPointer<Ui::RpWidget> Premium::createPinnedToBottom(
 		_subscribe->setVisible(!premium && premiumPossible);
 	}, _subscribe->lifetime());
 
-	return Ui::MakeWeak(not_null<Ui::RpWidget*>{ content });
+	return base::make_weak(not_null<Ui::RpWidget*>{ content });
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/settings/settings_shortcuts.cpp b/Telegram/SourceFiles/settings/settings_shortcuts.cpp
index 9d5135f614..ecd2f7914c 100644
--- a/Telegram/SourceFiles/settings/settings_shortcuts.cpp
+++ b/Telegram/SourceFiles/settings/settings_shortcuts.cpp
@@ -194,7 +194,7 @@ struct Labeled {
 	};
 	checkModified();
 
-	const auto menu = std::make_shared<QPointer<Ui::PopupMenu>>();
+	const auto menu = std::make_shared<base::weak_qptr<Ui::PopupMenu>>();
 	const auto fill = [=](Entry &entry) {
 		auto index = 0;
 		if (entry.original.empty()) {
diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/settings_websites.cpp
index 7f495998f0..f74ae4c800 100644
--- a/Telegram/SourceFiles/settings/settings_websites.cpp
+++ b/Telegram/SourceFiles/settings/settings_websites.cpp
@@ -182,7 +182,7 @@ void InfoBox(
 	box->addButton(tr::lng_about_done(), [=] { box->closeBox(); });
 	if (const auto hash = data.hash) {
 		box->addLeftButton(tr::lng_settings_disconnect(), [=] {
-			const auto weak = Ui::MakeWeak(box.get());
+			const auto weak = base::make_weak(box.get());
 			terminate(hash);
 			if (weak) {
 				box->closeBox();
@@ -334,7 +334,7 @@ private:
 	Api::Websites::List _data;
 
 	object_ptr<Inner> _inner;
-	QPointer<Ui::BoxContent> _terminateBox;
+	base::weak_qptr<Ui::BoxContent> _terminateBox;
 
 	base::Timer _shortPollTimer;
 
@@ -492,7 +492,7 @@ void Content::terminate(
 		rpl::producer<QString> title,
 		rpl::producer<QString> text,
 		QString blockText) {
-	if (const auto strong = _terminateBox.data()) {
+	if (const auto strong = _terminateBox.get()) {
 		strong->deleteLater();
 	}
 	auto box = Box([=](not_null<Ui::GenericBox*> box) {
@@ -517,12 +517,12 @@ void Content::terminate(
 			*block = box->addRow(object_ptr<Ui::Checkbox>(box, blockText));
 		}
 	});
-	_terminateBox = Ui::MakeWeak(box.data());
+	_terminateBox = base::make_weak(box.data());
 	_controller->show(std::move(box));
 }
 
 void Content::terminateOne(uint64 hash) {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	const auto i = ranges::find(_data, hash, &EntryData::hash);
 	if (i == end(_data)) {
 		return;
@@ -552,7 +552,7 @@ void Content::terminateOne(uint64 hash) {
 }
 
 void Content::terminateAll() {
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	auto callback = [=](bool block) {
 		const auto reset = crl::guard(weak, [=] {
 			_websites->cancelCurrentRequest();
diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
index 6647362881..b111130433 100644
--- a/Telegram/SourceFiles/stdafx.h
+++ b/Telegram/SourceFiles/stdafx.h
@@ -128,7 +128,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/arc_angles.h"
 #include "ui/emoji_config.h"
 #include "ui/qt_object_factory.h"
-#include "ui/qt_weak_factory.h"
 #include "ui/ui_rpl_filter.h"
 
 #include "styles/palette.h"
diff --git a/Telegram/SourceFiles/support/support_autocomplete.cpp b/Telegram/SourceFiles/support/support_autocomplete.cpp
index 45ad83edde..8122a476a2 100644
--- a/Telegram/SourceFiles/support/support_autocomplete.cpp
+++ b/Telegram/SourceFiles/support/support_autocomplete.cpp
@@ -520,7 +520,7 @@ void ConfirmContactBox::prepare() {
 	_contact->initDimensions();
 
 	_submit = [=, original = std::move(_submit)](Qt::KeyboardModifiers m) {
-		const auto weak = Ui::MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		original(m);
 		if (weak) {
 			closeBox();
diff --git a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
index 8651b5b010..0dfc516056 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_date_time.cpp
@@ -147,7 +147,7 @@ ChooseDateTimeBoxDescriptor ChooseDateTimeBox(
 	}, content->lifetime());
 
 	const auto calendar
-		= content->lifetime().make_state<QPointer<CalendarBox>>();
+		= content->lifetime().make_state<base::weak_qptr<CalendarBox>>();
 	const auto calendarStyle = args.style.calendarStyle;
 	state->day->focusedChanges(
 	) | rpl::start_with_next([=](bool focused) {
diff --git a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
index 97f65b65d9..a891c422f1 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_font_box.cpp
@@ -819,7 +819,7 @@ void PreviewPainter::layout() {
 			const auto ratio = state->preview.devicePixelRatio();
 			raw->resize(state->preview.size() / int(ratio));
 		} else {
-			const auto weak = Ui::MakeWeak(raw);
+			const auto weak = base::make_weak(raw);
 			const auto request = PrepareRequest(family);
 			crl::async([=, bg = state->bg] {
 				crl::on_main([
@@ -827,7 +827,7 @@ void PreviewPainter::layout() {
 					state,
 					preview = GeneratePreview(bg, request)
 				]() mutable {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						state->preview = std::move(preview);
 						const auto ratio = state->preview.devicePixelRatio();
 						strong->resize(
diff --git a/Telegram/SourceFiles/ui/boxes/choose_time.cpp b/Telegram/SourceFiles/ui/boxes/choose_time.cpp
index aa7f2836e2..ba2bdba9a7 100644
--- a/Telegram/SourceFiles/ui/boxes/choose_time.cpp
+++ b/Telegram/SourceFiles/ui/boxes/choose_time.cpp
@@ -76,9 +76,9 @@ ChooseTimeResult ChooseTimeWidget(
 			QString::number(startMinutes)),
 	});
 
-	const auto day = Ui::MakeWeak(state->day);
-	const auto hour = Ui::MakeWeak(state->hour);
-	const auto minute = Ui::MakeWeak(state->minute);
+	const auto day = base::make_weak(state->day);
+	const auto hour = base::make_weak(state->hour);
+	const auto minute = base::make_weak(state->minute);
 
 	if (hiddenDaysInput) {
 		day->setVisible(false);
@@ -88,24 +88,24 @@ ChooseTimeResult ChooseTimeWidget(
 	day->setMaxValue(31);
 	day->setWheelStep(1);
 	day->putNext() | rpl::start_with_next([=](QChar ch) {
-		putNext(hour, ch);
+		putNext(hour.get(), ch);
 	}, content->lifetime());
 
 	hour->setPhrase(tr::lng_hours);
 	hour->setMaxValue(23);
 	hour->setWheelStep(1);
 	hour->putNext() | rpl::start_with_next([=](QChar ch) {
-		putNext(minute, ch);
+		putNext(minute.get(), ch);
 	}, content->lifetime());
 	hour->erasePrevious() | rpl::start_with_next([=] {
-		erasePrevious(day);
+		erasePrevious(day.get());
 	}, content->lifetime());
 
 	minute->setPhrase(tr::lng_minutes);
 	minute->setMaxValue(59);
 	minute->setWheelStep(10);
 	minute->erasePrevious() | rpl::start_with_next([=] {
-		erasePrevious(hour);
+		erasePrevious(hour.get());
 	}, content->lifetime());
 
 	content->sizeValue(
@@ -127,9 +127,9 @@ ChooseTimeResult ChooseTimeWidget(
 
 	rpl::merge(
 		rpl::single(rpl::empty),
-		base::qt_signal_producer(day.data(), &MaskedInputField::changed),
-		base::qt_signal_producer(hour.data(), &MaskedInputField::changed),
-		base::qt_signal_producer(minute.data(), &MaskedInputField::changed)
+		base::qt_signal_producer(day.get(), &MaskedInputField::changed),
+		base::qt_signal_producer(hour.get(), &MaskedInputField::changed),
+		base::qt_signal_producer(minute.get(), &MaskedInputField::changed)
 	) | rpl::start_with_next([=] {
 		state->valueInSeconds = 0
 			+ day->getLastText().toUInt() * 3600 * 24
diff --git a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
index 0c06fb5262..6d9f25c984 100644
--- a/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/confirm_box.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 
 void ConfirmBox(not_null<Ui::GenericBox*> box, ConfirmBoxArgs &&args) {
-	const auto weak = Ui::MakeWeak(box);
+	const auto weak = base::make_weak(box);
 	const auto lifetime = box->lifetime().make_state<rpl::lifetime>();
 
 	const auto withTitle = !v::is_null(args.title);
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp b/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
index 49905b87e2..4b0bf0c136 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link.cpp
@@ -286,7 +286,7 @@ void EditInviteLinkBox(
 		}
 	};
 
-	const auto guard = MakeWeak(box);
+	const auto guard = base::make_weak(box);
 	expireGroup->setChangedCallback([=](int value) {
 		if (value) {
 			state->expireValue = value;
diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
index e49e457454..0585a18f21 100644
--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
@@ -897,7 +897,7 @@ void FillPeerQrBox(
 		const auto top = photoSize
 			? userpicMedia->image(photoSize)
 			: QImage();
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 
 		crl::async([=] {
 			const auto qrImage = TelegramQr(
diff --git a/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp b/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp
index 2083a0f483..10303d64a9 100644
--- a/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/single_choice_box.cpp
@@ -46,7 +46,7 @@ void SingleChoiceBox(
 	}
 	const auto callback = args.callback.value();
 	group->setChangedCallback([=](int value) {
-		const auto weak = Ui::MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		callback(value);
 		if (weak) {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
index d7c7f08ab3..be0fa5601b 100644
--- a/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_send_as.cpp
@@ -198,7 +198,7 @@ void ChooseSendAsBox(
 
 	controller->clicked(
 	) | rpl::start_with_next([=](not_null<PeerData*> peer) {
-		const auto weak = MakeWeak(box);
+		const auto weak = base::make_weak(box);
 		if (done(peer) && weak) {
 			box->closeBox();
 		}
diff --git a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
index 68c64708d7..42b0830749 100644
--- a/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
+++ b/Telegram/SourceFiles/ui/controls/subsection_tabs_slider.cpp
@@ -384,7 +384,7 @@ void SubsectionSlider::activate(int index) {
 			}
 		}
 	};
-	const auto weak = MakeWeak(_bar);
+	const auto weak = base::make_weak(_bar);
 	_sectionActivated.fire_copy(index);
 	if (weak) {
 		const auto duration = st::chatTabsSlider.duration;
diff --git a/Telegram/SourceFiles/ui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
index bdf77d1c18..3cb78ae180 100644
--- a/Telegram/SourceFiles/ui/countryinput.cpp
+++ b/Telegram/SourceFiles/ui/countryinput.cpp
@@ -72,7 +72,7 @@ void CountryInput::mousePressEvent(QMouseEvent *e) {
 	mouseMoveEvent(e);
 	if (_active) {
 		auto object = Box<Ui::CountrySelectBox>();
-		const auto box = Ui::MakeWeak(object.data());
+		const auto box = base::make_weak(object.data());
 		_show->showBox(std::move(object), Ui::LayerOption::CloseOther);
 		box->entryChosen(
 		) | rpl::start_with_next([=](
diff --git a/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp b/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
index 5bc42cb8df..392caf2602 100644
--- a/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
+++ b/Telegram/SourceFiles/ui/effects/scroll_content_shadow.cpp
@@ -32,9 +32,9 @@ void SetupShadowsToScrollContent(
 		bottomShadow->move(
 			geometry.x(),
 			geometry.y() + geometry.height() - st::lineWidth);
-	}, [t = Ui::MakeWeak(topShadow), b = Ui::MakeWeak(bottomShadow)] {
-		Ui::DestroyChild(t.data());
-		Ui::DestroyChild(b.data());
+	}, [t = base::make_weak(topShadow), b = base::make_weak(bottomShadow)] {
+		Ui::DestroyChild(t.get());
+		Ui::DestroyChild(b.get());
 	}, topShadow->lifetime());
 
 	topShadow->toggleOn(scroll->scrollTopValue() | rpl::map(_1 > 0));
diff --git a/Telegram/SourceFiles/ui/ui_pch.h b/Telegram/SourceFiles/ui/ui_pch.h
index eb9a86a713..f00ef0bf92 100644
--- a/Telegram/SourceFiles/ui/ui_pch.h
+++ b/Telegram/SourceFiles/ui/ui_pch.h
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/basic_types.h"
 #include "base/flat_map.h"
 #include "base/flat_set.h"
+#include "base/weak_qptr.h"
 
 #include "core/credits_amount.h"
 
@@ -40,5 +41,4 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text.h"
 #include "ui/effects/animations.h"
 #include "ui/qt_object_factory.h"
-#include "ui/qt_weak_factory.h"
 #include "styles/palette.h"
diff --git a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
index 176b5644c4..96a66687bb 100644
--- a/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
+++ b/Telegram/SourceFiles/ui/widgets/chat_filters_tabs_strip.cpp
@@ -88,7 +88,7 @@ void ShowMenu(
 			addAction);
 
 		auto showRemoveBox = [=] {
-			state->removeApi.request(Ui::MakeWeak(parent), controller, id);
+			state->removeApi.request(base::make_weak(parent), controller, id);
 		};
 		addAction({
 			.text = tr::lng_filters_context_remove(tr::now),
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 95944d2f90..29da7f47ad 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -264,7 +264,7 @@ void SectionWidget::setGeometryWithTopMoved(
 	_topDelta = topDelta;
 	bool willBeResized = (size() != newGeometry.size());
 	if (geometry() != newGeometry) {
-		auto weak = Ui::MakeWeak(this);
+		auto weak = base::make_weak(this);
 		setGeometry(newGeometry);
 		if (!weak) {
 			return;
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
index e7baf9c612..deba4892ad 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@@ -725,7 +725,7 @@ void Editor::showMenu() {
 	_menu = base::make_unique_q<Ui::DropdownMenu>(
 		this,
 		st::dropdownMenuWithIcons);
-	_menu->setHiddenCallback([weak = Ui::MakeWeak(this), menu = _menu.get()]{
+	_menu->setHiddenCallback([weak = base::make_weak(this), menu = _menu.get()]{
 		menu->deleteLater();
 		if (weak && weak->_menu == menu) {
 			weak->_menu = nullptr;
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
index 3b3f256afe..b41e479c50 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor_block.h
@@ -26,8 +26,8 @@ public:
 	};
 	struct Context {
 		struct {
-			QPointer<Ui::BoxContent> box;
-			QPointer<ColorEditor> editor;
+			base::weak_qptr<Ui::BoxContent> box;
+			base::weak_qptr<ColorEditor> editor;
 		} colorEditor;
 		QString name;
 		QString possibleCopyOf;
diff --git a/Telegram/SourceFiles/window/window_chat_preview.cpp b/Telegram/SourceFiles/window/window_chat_preview.cpp
index 2a9607accb..68498ec087 100644
--- a/Telegram/SourceFiles/window/window_chat_preview.cpp
+++ b/Telegram/SourceFiles/window/window_chat_preview.cpp
@@ -54,7 +54,7 @@ bool ChatPreviewManager::show(
 		return false;
 	}
 	_menu = std::move(preview.menu);
-	const auto weakMenu = Ui::MakeWeak(_menu.get());
+	const auto weakMenu = base::make_weak(_menu.get());
 	const auto weakThread = base::make_weak(row.key.entry()->asThread());
 	const auto weakController = base::make_weak(_controller);
 	std::move(
@@ -82,7 +82,7 @@ bool ChatPreviewManager::show(
 				}
 			}
 		}
-		if (const auto strong = weakMenu.data()) {
+		if (const auto strong = weakMenu.get()) {
 			strong->hideMenu();
 		}
 	}, _menu->lifetime());
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index fb47a4050e..437e75f0d5 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -276,7 +276,7 @@ void Controller::checkLockByTerms() {
 		showTermsDecline();
 	}, box->lifetime());
 
-	QObject::connect(box, &QObject::destroyed, [=] {
+	QObject::connect(box.get(), &QObject::destroyed, [=] {
 		crl::on_main(widget(), [=] { checkLockByTerms(); });
 	});
 
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index 3eb6184e9d..a1a2d23b4e 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -98,11 +98,11 @@ public:
 		typename BoxType,
 		typename = std::enable_if_t<
 			std::is_base_of_v<Ui::BoxContent, BoxType>>>
-	QPointer<BoxType> show(
+		base::weak_qptr<BoxType> show(
 			object_ptr<BoxType> content,
 			Ui::LayerOptions options = Ui::LayerOption::KeepOther,
 			anim::type animated = anim::type()) {
-		auto result = QPointer<BoxType>(content.data());
+		auto result = base::weak_qptr<BoxType>(content.data());
 		showBox(std::move(content), options, animated);
 		return result;
 	}
@@ -168,7 +168,7 @@ private:
 	const std::unique_ptr<Adaptive> _adaptive;
 	std::unique_ptr<SessionController> _sessionController;
 	rpl::variable<SessionController*> _sessionControllerValue;
-	QPointer<Ui::BoxContent> _termsBox;
+	base::weak_qptr<Ui::BoxContent> _termsBox;
 
 	rpl::event_stream<Media::View::OpenRequest> _openInMediaViewRequests;
 
diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 1e71a84b78..b23efa32f9 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -389,7 +389,7 @@ void FiltersMenu::showMenu(QPoint position, FilterId id) {
 		addAction({
 			.text = tr::lng_filters_context_remove(tr::now),
 			.handler = crl::guard(&_outer, [=, this] {
-				_removeApi.request(Ui::MakeWeak(&_outer), _session, id);
+				_removeApi.request(base::make_weak(&_outer), _session, id);
 			}),
 			.icon = &st::menuIconDeleteAttention,
 			.isAttention = true,
diff --git a/Telegram/SourceFiles/window/window_lock_widgets.cpp b/Telegram/SourceFiles/window/window_lock_widgets.cpp
index b674458d11..3e2f6cb0ce 100644
--- a/Telegram/SourceFiles/window/window_lock_widgets.cpp
+++ b/Telegram/SourceFiles/window/window_lock_widgets.cpp
@@ -212,10 +212,10 @@ void PasscodeLockWidget::suggestSystemUnlock() {
 		) | rpl::filter(
 			rpl::mappers::_1 != SystemUnlockType::None
 		) | rpl::take(1) | rpl::start_with_next([=] {
-			const auto weak = Ui::MakeWeak(this);
+			const auto weak = base::make_weak(this);
 			const auto done = [weak](SystemUnlockResult result) {
 				crl::on_main([=] {
-					if (const auto strong = weak.data()) {
+					if (const auto strong = weak.get()) {
 						strong->systemUnlockDone(result);
 					}
 				});
diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index 7c0deede45..9c52ca45d6 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -751,7 +751,7 @@ void MainMenu::setupMenu() {
 				tr::lng_theme_editor_cant_change_theme()));
 			return;
 		}
-		const auto weak = MakeWeak(this);
+		const auto weak = base::make_weak(this);
 		const auto toggle = [=] {
 			if (!weak) {
 				Window::Theme::ToggleNightMode();
@@ -941,7 +941,7 @@ base::EventFilterResult MainMenu::redirectToInnerChecked(not_null<QEvent*> e) {
 	if (_insideEventRedirect) {
 		return base::EventFilterResult::Continue;
 	}
-	const auto weak = Ui::MakeWeak(this);
+	const auto weak = base::make_weak(this);
 	_insideEventRedirect = true;
 	QGuiApplication::sendEvent(_inner, e);
 	if (weak) {
diff --git a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
index baf22753d5..0a05a3371e 100644
--- a/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu_helpers.cpp
@@ -353,7 +353,7 @@ void SetupMenuBots(
 					st::mainMenuButton.iconLeft,
 					(height - icon->height()) / 2);
 			}, button->lifetime());
-			const auto weak = Ui::MakeWeak(container);
+			const auto weak = base::make_weak(container);
 			const auto show = controller->uiShow();
 			button->setAcceptBoth(true);
 			button->clicks(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index d16067c79f..58775ff4cb 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1832,7 +1832,7 @@ void PeerMenuShareContactBox(
 		return;
 	}
 	// There is no async to make weak from controller.
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto callback = [=](not_null<Data::Thread*> thread) {
 		const auto peer = thread->peer();
 		if (!Data::CanSend(thread, ChatRestriction::SendOther)) {
@@ -1956,7 +1956,7 @@ void PeerMenuCreatePoll(
 		SendPaymentHelper sendPayment;
 		bool lock = false;
 	};
-	const auto weak = QPointer<CreatePollBox>(box);
+	const auto weak = base::make_weak(box);
 	const auto state = box->lifetime().make_state<State>();
 	state->create = [=](const CreatePollBox::Result &result) {
 		auto action = Api::SendAction(
@@ -2066,7 +2066,7 @@ void PeerMenuCreateTodoList(
 		SendPaymentHelper sendPayment;
 		bool lock = false;
 	};
-	const auto weak = QPointer<EditTodoListBox>(box);
+	const auto weak = base::make_weak(box);
 	const auto state = box->lifetime().make_state<State>();
 	state->create = [=](const EditTodoListBox::Result &result) {
 		const auto withPaymentApproved = crl::guard(weak, [=](int stars) {
@@ -2126,7 +2126,7 @@ void PeerMenuEditTodoList(
 		return;
 	}
 	auto box = Box<EditTodoListBox>(controller, item);
-	const auto weak = QPointer<EditTodoListBox>(box);
+	const auto weak = base::make_weak(box);
 	box->submitRequests(
 	) | rpl::start_with_next([=](const EditTodoListBox::Result &result) {
 		const auto api = &item->history()->session().api();
@@ -2328,7 +2328,7 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 		Fn<void(
 			std::vector<not_null<Data::Thread*>>,
 			Api::SendOptions)> sendMany) {
-	const auto weak = std::make_shared<QPointer<PeerListBox>>();
+	const auto weak = std::make_shared<base::weak_qptr<PeerListBox>>();
 	const auto selectable = (sendMany != nullptr);
 	class Controller final : public ChooseRecipientBoxController {
 	public:
@@ -2463,7 +2463,7 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 			state->refreshStarsToSend();
 			const auto shown = raw->hasSelected();
 			if (shown) {
-				const auto weak = Ui::MakeWeak(box);
+				const auto weak = base::make_weak(box);
 				state->submit = [=](Api::SendOptions options) {
 					state->submitLifetime.destroy();
 					const auto show = box->peerListUiShow();
@@ -2551,7 +2551,7 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 	return result;
 }
 
-QPointer<Ui::BoxContent> ShowChooseRecipientBox(
+base::weak_qptr<Ui::BoxContent> ShowChooseRecipientBox(
 		not_null<Window::SessionNavigation*> navigation,
 		FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 		rpl::producer<QString> titleOverride,
@@ -2565,7 +2565,7 @@ QPointer<Ui::BoxContent> ShowChooseRecipientBox(
 		typesRestriction));
 }
 
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		std::shared_ptr<ChatHelpers::Show> show,
 		Data::ForwardDraft &&draft,
 		Fn<void()> &&successCallback) {
@@ -2825,10 +2825,10 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		};
 		auto callback = [=, chosen = std::move(chosen)](
 				Controller::Chosen thread) mutable {
-			const auto weak = Ui::MakeWeak(state->box);
+			const auto weak = base::make_weak(state->box);
 			if (!chosen(thread)) {
 				return;
-			} else if (const auto strong = weak.data()) {
+			} else if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
 			if (successCallback) {
@@ -2857,7 +2857,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		history,
 		msgIds);
 
-	const auto weak = Ui::MakeWeak(state->box);
+	const auto weak = base::make_weak(state->box);
 	const auto field = comment->entity();
 	state->submit = [=](Api::SendOptions options) {
 		const auto peers = state->box->collectSelectedRows();
@@ -3090,10 +3090,10 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		});
 	}, state->box->lifetime());
 
-	return QPointer<Ui::BoxContent>(state->box);
+	return base::make_weak(state->box);
 }
 
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		Data::ForwardDraft &&draft,
 		Fn<void()> &&successCallback) {
@@ -3103,7 +3103,7 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		std::move(successCallback));
 }
 
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		MessageIdsList &&items,
 		Fn<void()> &&successCallback) {
@@ -3113,13 +3113,13 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		std::move(successCallback));
 }
 
-QPointer<Ui::BoxContent> ShowShareGameBox(
+base::weak_qptr<Ui::BoxContent> ShowShareGameBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<UserData*> bot,
 		QString shortName) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [=](not_null<Data::Thread*> thread) mutable {
-		const auto confirm = std::make_shared<QPointer<Ui::BoxContent>>();
+		const auto confirm = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 		auto send = crl::guard(thread, [=] {
 			ShareBotGame(bot, thread, shortName);
 			if (const auto strong = *weak) {
@@ -3166,15 +3166,15 @@ QPointer<Ui::BoxContent> ShowShareGameBox(
 			.moneyRestrictionError = WriteMoneyRestrictionError,
 		}),
 		std::move(initBox)));
-	return weak->data();
+	return weak->get();
 }
 
-QPointer<Ui::BoxContent> ShowDropMediaBox(
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 		not_null<Window::SessionNavigation*> navigation,
 		std::shared_ptr<QMimeData> data,
 		not_null<Data::Forum*> forum,
 		FnMut<void()> &&successCallback) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [
 		data = std::move(data),
 		callback = std::move(successCallback),
@@ -3206,15 +3206,15 @@ QPointer<Ui::BoxContent> ShowDropMediaBox(
 			forum,
 			std::move(chosen)),
 		std::move(initBox)));
-	return weak->data();
+	return weak->get();
 }
 
-QPointer<Ui::BoxContent> ShowDropMediaBox(
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 		not_null<Window::SessionNavigation*> navigation,
 		std::shared_ptr<QMimeData> data,
 		not_null<Data::SavedMessages*> monoforum,
 		FnMut<void()> &&successCallback) {
-	const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+	const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 	auto chosen = [
 		data = std::move(data),
 		callback = std::move(successCallback),
@@ -3246,10 +3246,10 @@ QPointer<Ui::BoxContent> ShowDropMediaBox(
 			monoforum,
 			std::move(chosen)),
 		std::move(initBox)));
-	return weak->data();
+	return weak->get();
 }
 
-QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowSendNowMessagesBox(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<History*> history,
 		MessageIdsList &&items,
@@ -3298,7 +3298,7 @@ QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
 		.text = text,
 		.confirmed = std::move(done),
 		.confirmText = tr::lng_send_button(),
-	})).data();
+	}));
 }
 
 void PeerMenuAddChannelMembers(
@@ -3826,7 +3826,7 @@ void PeerMenuConfirmToggleFee(
 		return;
 	}
 	navigation->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
-		const auto refund = std::make_shared<QPointer<Ui::Checkbox>>();
+		const auto refund = std::make_shared<base::weak_qptr<Ui::Checkbox>>();
 		Ui::ConfirmBox(box, {
 			.text = tr::lng_payment_refund_text(
 				tr::now,
@@ -3846,7 +3846,7 @@ void PeerMenuConfirmToggleFee(
 		*paid = paidAmount->value();
 		paid->value() | rpl::start_with_next([=](int already) {
 			if (!already) {
-				delete base::take(*refund);
+				delete base::take(*refund).get();
 			} else if (!*refund) {
 				const auto skip = st::defaultCheckbox.margin.top();
 				*refund = box->addRow(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index 56c4a6baec..a39b2ba3ac 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -182,45 +182,45 @@ object_ptr<Ui::BoxContent> PrepareChooseRecipientBox(
 	Fn<void(
 		std::vector<not_null<Data::Thread*>>,
 		Api::SendOptions)> sendMany = nullptr);
-QPointer<Ui::BoxContent> ShowChooseRecipientBox(
+base::weak_qptr<Ui::BoxContent> ShowChooseRecipientBox(
 	not_null<Window::SessionNavigation*> navigation,
 	FnMut<bool(not_null<Data::Thread*>)> &&chosen,
 	rpl::producer<QString> titleOverride = nullptr,
 	FnMut<void()> &&successCallback = nullptr,
 	InlineBots::PeerTypes typesRestriction = 0);
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	Data::ForwardDraft &&draft,
 	Fn<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	Data::ForwardDraft &&draft,
 	Fn<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowForwardMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowForwardMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	MessageIdsList &&items,
 	Fn<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowShareUrlBox(
+base::weak_qptr<Ui::BoxContent> ShowShareUrlBox(
 	not_null<Window::SessionNavigation*> navigation,
 	const QString &url,
 	const QString &text,
 	FnMut<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowShareGameBox(
+base::weak_qptr<Ui::BoxContent> ShowShareGameBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<UserData*> bot,
 	QString shortName);
-QPointer<Ui::BoxContent> ShowDropMediaBox(
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 	not_null<Window::SessionNavigation*> navigation,
 	std::shared_ptr<QMimeData> data,
 	not_null<Data::Forum*> forum,
 	FnMut<void()> &&successCallback = nullptr);
-QPointer<Ui::BoxContent> ShowDropMediaBox(
+base::weak_qptr<Ui::BoxContent> ShowDropMediaBox(
 	not_null<Window::SessionNavigation*> navigation,
 	std::shared_ptr<QMimeData> data,
 	not_null<Data::SavedMessages*> monoforum,
 	FnMut<void()> &&successCallback = nullptr);
 
-QPointer<Ui::BoxContent> ShowSendNowMessagesBox(
+base::weak_qptr<Ui::BoxContent> ShowSendNowMessagesBox(
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<History*> history,
 	MessageIdsList &&items,
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index e58806b515..76f4ed2732 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1022,14 +1022,14 @@ void SessionNavigation::applyBoost(
 			}
 			done({});
 		} else {
-			const auto weak = std::make_shared<QPointer<Ui::BoxContent>>();
+			const auto weak = std::make_shared<base::weak_qptr<Ui::BoxContent>>();
 			const auto reassign = [=](
 					std::vector<int> slots,
 					int groups,
 					int channels) {
 				const auto count = int(slots.size());
 				const auto callback = [=](Ui::BoostCounters counters) {
-					if (const auto strong = weak->data()) {
+					if (const auto strong = weak->get()) {
 						strong->closeBox();
 					}
 					done(counters);
@@ -2934,7 +2934,7 @@ auto SessionController::stickerOrEmojiChosen() const
 	return _stickerOrEmojiChosen.events();
 }
 
-QPointer<Ui::BoxContent> SessionController::show(
+base::weak_qptr<Ui::BoxContent> SessionController::show(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options,
 		anim::type animated) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 7bde45c28d..8ca4819def 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -390,7 +390,7 @@ public:
 	void stickerOrEmojiChosen(FileChosen chosen);
 	[[nodiscard]] rpl::producer<FileChosen> stickerOrEmojiChosen() const;
 
-	QPointer<Ui::BoxContent> show(
+	base::weak_qptr<Ui::BoxContent> show(
 		object_ptr<Ui::BoxContent> content,
 		Ui::LayerOptions options = Ui::LayerOption::KeepOther,
 		anim::type animated = anim::type::normal);
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 402034cba6..bed6d0be44 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 402034cba675220647c5e2041f38cf9d977d496e
+Subproject commit bed6d0be4422b8733d3c7e691eac6adf8439597f
diff --git a/Telegram/lib_spellcheck b/Telegram/lib_spellcheck
index c8ded8b758..81297706b3 160000
--- a/Telegram/lib_spellcheck
+++ b/Telegram/lib_spellcheck
@@ -1 +1 @@
-Subproject commit c8ded8b7585f8819780ea22a40c237625aec0c75
+Subproject commit 81297706b32a6ec829a7dff5461ff458f82fb602
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 15bed2e494..1cb389224f 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 15bed2e494c4fa52c93681e7e03c4a83f1e15a6a
+Subproject commit 1cb389224f285e619f2fbc3f9395516d17d62682

From dcac27e0729bc3975965a0497154d54b18def49d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Jul 2025 11:33:49 +0400
Subject: [PATCH 033/341] Make sure colors are ready for webview.

---
 .../inline_bots/bot_attach_web_view.cpp       | 29 +++++++++++++++++++
 .../inline_bots/bot_attach_web_view.h         |  3 ++
 2 files changed, 32 insertions(+)

diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 8e1af089b1..02304eb965 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -885,7 +885,28 @@ void WebViewInstance::activate() {
 	}
 }
 
+void WebViewInstance::requestFullBot() {
+	if (_bot->isFullLoaded()) {
+		return;
+	}
+	_bot->updateFull();
+	_bot->session().changes().peerUpdates(
+		_bot,
+		Data::PeerUpdate::Flag::FullInfo
+	) | rpl::start_with_next([=] {
+		if (_botFullWaitingArgs.has_value()) {
+			auto args = *base::take(_botFullWaitingArgs);
+			if (args.url.isEmpty()) {
+				showGame();
+			} else {
+				show(std::move(args));
+			}
+		}
+	}, _lifetime);
+}
+
 void WebViewInstance::resolve() {
+	requestFullBot();
 	v::match(_source, [&](WebViewSourceButton data) {
 		confirmOpen([=] {
 			if (data.simple) {
@@ -1307,6 +1328,10 @@ void WebViewInstance::maybeChooseAndRequestButton(PeerTypes supported) {
 }
 
 void WebViewInstance::show(ShowArgs &&args) {
+	if (!_bot->isFullLoaded()) {
+		_botFullWaitingArgs.emplace(std::move(args));
+		return;
+	}
 	auto title = args.title.isEmpty()
 		? Info::Profile::NameValue(_bot)
 		: rpl::single(args.title);
@@ -1373,6 +1398,10 @@ void WebViewInstance::show(ShowArgs &&args) {
 void WebViewInstance::showGame() {
 	Expects(v::is<WebViewSourceGame>(_source));
 
+	if (!_bot->isFullLoaded()) {
+		_botFullWaitingArgs.emplace();
+		return;
+	}
 	const auto game = v::get<WebViewSourceGame>(_source);
 	_panelUrl = QString::fromUtf8(_button.url);
 	_panel = Ui::BotWebView::Show({
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
index e7fe7f281e..7487de27e1 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.h
@@ -231,6 +231,7 @@ public:
 
 private:
 	void resolve();
+	void requestFullBot();
 
 	bool openAppFromBotMenuLink();
 
@@ -313,6 +314,8 @@ private:
 	const WebViewButton _button;
 	const WebViewSource _source;
 
+	std::optional<ShowArgs> _botFullWaitingArgs;
+
 	BotAppData *_app = nullptr;
 	QString _appStartParam;
 	bool _dataSent = false;

From 048d995922d5ba1cf9cd35262329b2d24ff79355 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Jul 2025 12:27:22 +0400
Subject: [PATCH 034/341] Add weak_qptr to stdafx.h

---
 Telegram/SourceFiles/stdafx.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
index b111130433..1bc3da35d3 100644
--- a/Telegram/SourceFiles/stdafx.h
+++ b/Telegram/SourceFiles/stdafx.h
@@ -118,6 +118,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/optional.h"
 #include "base/variant.h"
 #include "base/weak_ptr.h"
+#include "base/weak_qptr.h"
 
 #include "scheme.h"
 #include "mtproto/type_utils.h"

From 65e3111e3555cea9920d63289f425a1605a3e5f6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Jul 2025 13:06:58 +0400
Subject: [PATCH 035/341] Use real cloud lang.

---
 .../history/view/media/history_view_media_common.cpp         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index 431a45e7a3..56079194d1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -81,9 +81,8 @@ rpl::producer<TextWithEntities> AgeVerifyAbout(
 		};
 		Assert(shift >= 0 && shift < postfixes.size());
 		const auto postfix = *(begin(postfixes) + shift);
-		return Ui::Text::RichLangValue(u"To access such content, you must confirm that you are at least **{count}** years old as required by UK law."_q.replace(u"{count}"_q, string));
 		return Ui::Text::RichLangValue(Lang::GetNonDefaultValue(
-			kVerifyAgeAboutPrefix + country.toUtf8() + postfix AssertIsDebug(test_this)
+			kVerifyAgeAboutPrefix + country.toUtf8() + postfix
 		).replace(u"{count}"_q, string));
 	});
 }
@@ -378,7 +377,7 @@ void ShowAgeVerification(
 			} else {
 				show->showToast({
 					.title = tr::lng_age_verify_sorry_title(tr::now),
-					.text = tr::lng_age_verify_sorry_text(tr::now),
+					.text = { tr::lng_age_verify_sorry_text(tr::now) },
 					.duration = Ui::Toast::kDefaultDuration * 3,
 				});
 			}

From 25d4a9c7a662b191e06742882061f080d2c8a83e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Jul 2025 10:28:13 +0400
Subject: [PATCH 036/341] Parse current stars rating values.

---
 Telegram/SourceFiles/data/data_changes.h | 33 ++++++++++++------------
 Telegram/SourceFiles/data/data_peer.cpp  |  7 +++++
 Telegram/SourceFiles/data/data_peer.h    | 14 ++++++++++
 Telegram/SourceFiles/data/data_user.cpp  | 26 +++++++++++++++++++
 Telegram/SourceFiles/data/data_user.h    |  4 +++
 5 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 190f3f554c..86dc7f2bf4 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -99,28 +99,29 @@ struct PeerUpdate {
 		StarRefProgram      = (1ULL << 35),
 		PaysPerMessage      = (1ULL << 36),
 		GiftSettings        = (1ULL << 37),
+		StarsRating         = (1ULL << 38),
 
 		// For chats and channels
-		InviteLinks         = (1ULL << 38),
-		Members             = (1ULL << 39),
-		Admins              = (1ULL << 40),
-		BannedUsers         = (1ULL << 41),
-		Rights              = (1ULL << 42),
-		PendingRequests     = (1ULL << 43),
-		Reactions           = (1ULL << 44),
+		InviteLinks         = (1ULL << 39),
+		Members             = (1ULL << 40),
+		Admins              = (1ULL << 41),
+		BannedUsers         = (1ULL << 42),
+		Rights              = (1ULL << 43),
+		PendingRequests     = (1ULL << 44),
+		Reactions           = (1ULL << 45),
 
 		// For channels
-		ChannelAmIn         = (1ULL << 45),
-		StickersSet         = (1ULL << 46),
-		EmojiSet            = (1ULL << 47),
-		DiscussionLink      = (1ULL << 48),
-		MonoforumLink       = (1ULL << 49),
-		ChannelLocation     = (1ULL << 50),
-		Slowmode            = (1ULL << 51),
-		GroupCall           = (1ULL << 52),
+		ChannelAmIn         = (1ULL << 46),
+		StickersSet         = (1ULL << 47),
+		EmojiSet            = (1ULL << 48),
+		DiscussionLink      = (1ULL << 49),
+		MonoforumLink       = (1ULL << 50),
+		ChannelLocation     = (1ULL << 51),
+		Slowmode            = (1ULL << 52),
+		GroupCall           = (1ULL << 53),
 
 		// For iteration
-		LastUsedBit         = (1ULL << 52),
+		LastUsedBit         = (1ULL << 53),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) { return true; }
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index cbc27b596a..fe0cbdf698 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -1690,6 +1690,13 @@ int PeerData::starsPerMessageChecked() const {
 	return starsPerMessage();
 }
 
+Data::StarsRating PeerData::starsRating() const {
+	if (const auto user = asUser()) {
+		return user->starsRating();
+	}
+	return {};
+}
+
 Data::GroupCall *PeerData::groupCall() const {
 	if (const auto chat = asChat()) {
 		return chat->groupCall();
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 66f9d91ef9..96774bf5f7 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -109,6 +109,19 @@ struct UnavailableReason {
 		const MTPvector<MTPRestrictionReason> *list);
 };
 
+struct StarsRating {
+	int level = 0;
+	int levelStars = 0;
+	int currentStars = 0;
+	int nextLevelStars = 0;
+
+	explicit operator bool() const {
+		return level != 0 || levelStars != 0;
+	}
+
+	friend inline bool operator==(StarsRating, StarsRating) = default;
+};
+
 bool ApplyBotMenuButton(
 	not_null<BotInfo*> info,
 	const MTPBotMenuButton *button);
@@ -290,6 +303,7 @@ public:
 
 	[[nodiscard]] int starsPerMessage() const;
 	[[nodiscard]] int starsPerMessageChecked() const;
+	[[nodiscard]] Data::StarsRating starsRating() const;
 
 	[[nodiscard]] UserData *asBot();
 	[[nodiscard]] const UserData *asBot() const;
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 308b1bb609..dd4aa9b6bf 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -64,6 +64,20 @@ bool ApplyBotVerifierSettings(
 	return false;
 }
 
+[[nodiscard]] Data::StarsRating ParseStarsRating(
+		const MTPStarsRating *rating) {
+	if (!rating) {
+		return {};
+	}
+	const auto &data = rating->data();
+	return {
+		.level = data.vlevel().v,
+		.levelStars = int(data.vcurrent_level_stars().v),
+		.currentStars = int(data.vstars().v),
+		.nextLevelStars = int(data.vnext_level_stars().value_or_empty()),
+	};
+}
+
 } // namespace
 
 BotInfo::BotInfo() = default;
@@ -563,6 +577,17 @@ void UserData::setStarsPerMessage(int stars) {
 	checkTrustedPayForMessage();
 }
 
+void UserData::setStarsRating(Data::StarsRating value) {
+	if (_starsRating != value) {
+		_starsRating = value;
+		session().changes().peerUpdated(this, UpdateFlag::StarsRating);
+	}
+}
+
+Data::StarsRating UserData::starsRating() const {
+	return _starsRating;
+}
+
 bool UserData::canAddContact() const {
 	return canShareThisContact() && !isContact();
 }
@@ -848,6 +873,7 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	}
 	user->setBotVerifyDetails(
 		ParseBotVerifyDetails(update.vbot_verification()));
+	user->setStarsRating(ParseStarsRating(update.vstars_rating()));
 
 	if (const auto gifts = update.vdisallowed_gifts()) {
 		const auto &data = gifts->data();
diff --git a/Telegram/SourceFiles/data/data_user.h b/Telegram/SourceFiles/data/data_user.h
index b8c87b67b3..435692cda6 100644
--- a/Telegram/SourceFiles/data/data_user.h
+++ b/Telegram/SourceFiles/data/data_user.h
@@ -195,6 +195,9 @@ public:
 	void setStarsPerMessage(int stars);
 	[[nodiscard]] int starsPerMessage() const;
 
+	void setStarsRating(Data::StarsRating value);
+	[[nodiscard]] Data::StarsRating starsRating() const;
+
 	[[nodiscard]] bool canShareThisContact() const;
 	[[nodiscard]] bool canAddContact() const;
 
@@ -300,6 +303,7 @@ private:
 	QString _phone;
 	QString _privateForwardName;
 	std::unique_ptr<Ui::BotVerifyDetails> _botVerifyDetails;
+	Data::StarsRating _starsRating;
 
 	ChannelId _personalChannelId = 0;
 	MsgId _personalChannelMessageId = 0;

From 232c797507b0340c7149d123d0961a642fc86383 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Jul 2025 14:07:09 +0400
Subject: [PATCH 037/341] Show stars rating bar.

---
 Telegram/CMakeLists.txt                       |   1 +
 Telegram/SourceFiles/data/data_peer.h         |  16 +-
 Telegram/SourceFiles/data/data_peer_common.h  |  25 ++
 .../SourceFiles/data/data_peer_values.cpp     |  13 ++
 Telegram/SourceFiles/data/data_peer_values.h  |   4 +
 Telegram/SourceFiles/info/info.style          |  29 +++
 .../info/profile/info_profile_cover.cpp       |  27 ++-
 .../info/profile/info_profile_cover.h         |   3 +
 .../SourceFiles/ui/controls/stars_rating.cpp  | 215 ++++++++++++++++++
 .../SourceFiles/ui/controls/stars_rating.h    |  64 ++++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 11 files changed, 382 insertions(+), 17 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_peer_common.h
 create mode 100644 Telegram/SourceFiles/ui/controls/stars_rating.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/stars_rating.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c0d00a6dbd..6e285ca175 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -612,6 +612,7 @@ PRIVATE
     data/data_peer_bot_command.h
     data/data_peer_bot_commands.cpp
     data/data_peer_bot_commands.h
+    data/data_peer_common.h
     data/data_peer_id.cpp
     data/data_peer_id.h
     data/data_peer_values.cpp
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 96774bf5f7..2e17161d75 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -7,10 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/notify/data_peer_notify_settings.h"
 #include "data/data_types.h"
 #include "data/data_flags.h"
-#include "data/notify/data_peer_notify_settings.h"
 #include "data/data_cloud_file.h"
+#include "data/data_peer_common.h"
 #include "ui/userpic_view.h"
 
 struct BotInfo;
@@ -109,19 +110,6 @@ struct UnavailableReason {
 		const MTPvector<MTPRestrictionReason> *list);
 };
 
-struct StarsRating {
-	int level = 0;
-	int levelStars = 0;
-	int currentStars = 0;
-	int nextLevelStars = 0;
-
-	explicit operator bool() const {
-		return level != 0 || levelStars != 0;
-	}
-
-	friend inline bool operator==(StarsRating, StarsRating) = default;
-};
-
 bool ApplyBotMenuButton(
 	not_null<BotInfo*> info,
 	const MTPBotMenuButton *button);
diff --git a/Telegram/SourceFiles/data/data_peer_common.h b/Telegram/SourceFiles/data/data_peer_common.h
new file mode 100644
index 0000000000..87d1722ab1
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_peer_common.h
@@ -0,0 +1,25 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+
+struct StarsRating {
+	int level = 0;
+	int levelStars = 0;
+	int currentStars = 0;
+	int nextLevelStars = 0;
+
+	explicit operator bool() const {
+		return level != 0 || levelStars != 0;
+	}
+
+	friend inline bool operator==(StarsRating, StarsRating) = default;
+};
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 5739124d45..0da1a8137f 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -518,6 +518,19 @@ bool ChannelHasSubscriptionUntilDate(ChannelData *channel) {
 	return channel && channel->subscriptionUntilDate() > 0;
 }
 
+rpl::producer<Data::StarsRating> StarsRatingValue(
+		not_null<PeerData*> peer) {
+	if (const auto user = peer->asUser()) {
+		return user->session().changes().peerFlagsValue(
+			user,
+			Data::PeerUpdate::Flag::StarsRating
+		) | rpl::map([=] {
+			return user->starsRating();
+		});
+	}
+	return rpl::single(Data::StarsRating());
+}
+
 rpl::producer<QImage> PeerUserpicImageValue(
 		not_null<PeerData*> peer,
 		int size,
diff --git a/Telegram/SourceFiles/data/data_peer_values.h b/Telegram/SourceFiles/data/data_peer_values.h
index b726746be0..322e1dda39 100644
--- a/Telegram/SourceFiles/data/data_peer_values.h
+++ b/Telegram/SourceFiles/data/data_peer_values.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_peer.h"
+#include "data/data_peer_values.h"
 #include "data/data_chat_participant_status.h"
 
 enum class ImageRoundRadius;
@@ -166,6 +167,9 @@ inline auto PeerFullFlagValue(
 [[nodiscard]] bool ChannelHasActiveCall(not_null<ChannelData*> channel);
 [[nodiscard]] bool ChannelHasSubscriptionUntilDate(ChannelData *channel);
 
+[[nodiscard]] rpl::producer<Data::StarsRating> StarsRatingValue(
+	not_null<PeerData*> peer);
+
 [[nodiscard]] rpl::producer<QImage> PeerUserpicImageValue(
 	not_null<PeerData*> peer,
 	int size,
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 5c9efd10c3..310387abb9 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -351,6 +351,8 @@ InfoProfileCover {
 	status: FlatLabel;
 	statusLeft: pixels;
 	statusTop: pixels;
+	starsRatingLeft: pixels;
+	starsRatingTop: pixels;
 	showLastSeen: RoundButton;
 	showLastSeenPosition: point;
 	showLastSeenVisible: bool;
@@ -384,6 +386,8 @@ infoProfileCover: InfoProfileCover {
 	status: infoProfileStatus;
 	statusLeft: 109px;
 	statusTop: 58px;
+	starsRatingLeft: 107px;
+	starsRatingTop: 57px;
 	showLastSeen: RoundButton(defaultActiveButton) {
 		textFg: windowSubTextFg;
 		textFgOver: windowSubTextFg;
@@ -1187,3 +1191,28 @@ topicsLayoutButtonIconPadding: margins(4px, 0px, 4px, 0px);
 topicsLayoutButtonIconSize: 140px;
 topicsLayoutButtonPadding: margins(4px, 0px, 4px, 12px);
 topicsLayoutButtonSkip: 0px;
+
+StarsRating {
+	margin: margins;
+	padding: margins;
+	style: TextStyle;
+	minSkip: pixels;
+	border: pixels;
+	activeBg: color;
+	inactiveBg: color;
+	activeFg: color;
+	inactiveFg: color;
+}
+infoStarsRating: StarsRating {
+	margin: margins(6px, 6px, 6px, 6px);
+	padding: margins(4px, 1px, 4px, 1px);
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px semibold);
+	}
+	minSkip: 32px;
+	border: 2px;
+	activeBg: windowBgActive;
+	inactiveBg: windowBgRipple;
+	activeFg: windowFgActive;
+	inactiveFg: windowBoldFg;
+}
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index f6798194c3..906a7385d7 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_sticker_player.h"
 #include "lang/lang_keys.h"
 #include "ui/boxes/show_or_premium_box.h"
+#include "ui/controls/stars_rating.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -644,6 +645,12 @@ Cover::Cover(
 	? object_ptr<TopicIconButton>(this, controller, topic)
 	: nullptr)
 , _name(this, _st.name)
+, _starsRating(_peer->isUser()
+	? std::make_unique<Ui::StarsRating>(
+		this,
+		st::infoStarsRating,
+		Data::StarsRatingValue(_peer))
+	: nullptr)
 , _status(this, _st.status)
 , _showLastSeen(this, tr::lng_status_lastseen_when(), _st.showLastSeen)
 , _refreshStatusTimer([this] { refreshStatusText(); }) {
@@ -657,6 +664,16 @@ Cover::Cover(
 
 	if (!_peer->isMegagroup()) {
 		_status->setAttribute(Qt::WA_TransparentForMouseEvents);
+		if (const auto rating = _starsRating.get()) {
+			_status->widthValue() | rpl::start_with_next([=](int width) {
+				rating->setMinimalAddedWidth(width);
+			}, rating->lifetime());
+			_statusShift = rating->collapsedWidthValue();
+			_statusShift.changes() | rpl::start_with_next([=] {
+				refreshStatusGeometry(width());
+			}, _status->lifetime());
+			rating->raise();
+		}
 	}
 
 	setupShowLastSeen();
@@ -1053,9 +1070,13 @@ void Cover::refreshNameGeometry(int newWidth) {
 }
 
 void Cover::refreshStatusGeometry(int newWidth) {
-	auto statusWidth = newWidth - _st.statusLeft - _st.rightSkip;
-	_status->resizeToWidth(statusWidth);
-	_status->moveToLeft(_st.statusLeft, _st.statusTop, newWidth);
+	if (const auto rating = _starsRating.get()) {
+		rating->moveTo(_st.starsRatingLeft, _st.starsRatingTop);
+	}
+	const auto statusLeft = _st.statusLeft + _statusShift.current();
+	auto statusWidth = newWidth - statusLeft - _st.rightSkip;
+	_status->resizeToNaturalWidth(statusWidth);
+	_status->moveToLeft(statusLeft, _st.statusTop, newWidth);
 	const auto left = _st.statusLeft + _status->textMaxWidth();
 	_showLastSeen->moveToLeft(
 		left + _st.showLastSeenPosition.x(),
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h
index 5add87fc71..7e45160788 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h
@@ -22,6 +22,7 @@ class FlatLabel;
 template <typename Widget>
 class SlideWrap;
 class RoundButton;
+class StarsRating;
 } // namespace Ui
 
 namespace HistoryView {
@@ -171,7 +172,9 @@ private:
 	std::optional<QImage> _personalChosen;
 	object_ptr<TopicIconButton> _iconButton;
 	object_ptr<Ui::FlatLabel> _name = { nullptr };
+	std::unique_ptr<Ui::StarsRating> _starsRating;
 	object_ptr<Ui::FlatLabel> _status = { nullptr };
+	rpl::variable<int> _statusShift = 0;
 	object_ptr<Ui::RoundButton> _showLastSeen = { nullptr };
 	//object_ptr<CoverDropArea> _dropArea = { nullptr };
 	base::Timer _refreshStatusTimer;
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
new file mode 100644
index 0000000000..431eb1f328
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -0,0 +1,215 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/stars_rating.h"
+
+#include "lang/lang_keys.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/painter.h"
+#include "ui/rp_widget.h"
+#include "styles/style_info.h"
+
+namespace Ui {
+namespace {
+
+constexpr auto kAutoCollapseTimeout = 4 * crl::time(1000);
+
+} // namespace
+
+StarsRating::StarsRating(
+	QWidget *parent,
+	const style::StarsRating &st,
+	rpl::producer<Data::StarsRating> value)
+: _widget(std::make_unique<Ui::AbstractButton>(parent))
+, _st(st)
+, _value(std::move(value))
+, _collapseTimer([=] { _expanded = false; }) {
+	init();
+}
+
+StarsRating::~StarsRating() = default;
+
+void StarsRating::init() {
+	_expanded.value() | rpl::start_with_next([=](bool expanded) {
+		_widget->setPointerCursor(!expanded);
+		const auto from = expanded ? 0. : 1.;
+		const auto till = expanded ? 1. : 0.;
+		_expandedAnimation.start([=] {
+			updateWidth();
+		}, from, till, st::slideDuration);
+	}, lifetime());
+
+	_widget->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(_widget.get());
+		paint(p);
+	}, lifetime());
+
+	_widget->setClickedCallback([=] {
+		if (!_value.current()) {
+			return;
+		}
+		_expanded = true;
+		_collapseTimer.callOnce(kAutoCollapseTimeout);
+	});
+
+	const auto added = _st.margin + _st.padding;
+	const auto border = 2 * _st.border;
+	const auto fontHeight = _st.style.font->height;
+	const auto height = added.top() + fontHeight + added.bottom() + border;
+	_widget->resize(_widget->width(), height);
+
+	_value.value() | rpl::start_with_next([=](Data::StarsRating rating) {
+		if (!rating) {
+			_widget->resize(0, _widget->height());
+			_collapsedWidthValue = 0;
+			_expanded = false;
+			updateExpandedWidth();
+			_expandedAnimation.stop();
+			return;
+		}
+		updateTexts(rating);
+	}, lifetime());
+}
+
+void StarsRating::updateTexts(Data::StarsRating rating) {
+	_collapsedText.setText(
+		_st.style,
+		Lang::FormatCountDecimal(rating.level));
+	_expandedText.setText(
+		_st.style,
+		tr::lng_boost_level(tr::now, lt_count_decimal, rating.level));
+	_nextText.setText(
+		_st.style,
+		(rating.nextLevelStars
+			? Lang::FormatCountDecimal(rating.level + 1)
+			: QString()));
+
+	const auto added = _st.padding;
+	const auto border = 2 * _st.border;
+	const auto add = added.left() + added.right() + border;
+	const auto min = _expandedText.maxWidth() + _nextText.maxWidth();
+	const auto height = _widget->height();
+	_minimalContentWidth = add + min + _st.minSkip;
+	_collapsedWidthValue = _st.margin.right()
+		+ std::max(
+			add + _collapsedText.maxWidth(),
+			height - _st.margin.top() - _st.margin.bottom());
+	updateExpandedWidth();
+	updateWidth();
+}
+
+void StarsRating::updateExpandedWidth() {
+	_expandedWidthValue = _st.margin.right() + std::max(
+		_collapsedWidthValue.current() + _minimalAddedWidth.current(),
+		_minimalContentWidth.current());
+}
+
+void StarsRating::updateWidth() {
+	const auto widthToRight = anim::interpolate(
+		_collapsedWidthValue.current(),
+		_expandedWidthValue.current(),
+		_expandedAnimation.value(_expanded.current() ? 1. : 0.));
+	_widget->resize(_st.margin.left() + widthToRight, _widget->height());
+	_widget->update();
+}
+
+void StarsRating::raise() {
+	_widget->raise();
+}
+
+void StarsRating::moveTo(int x, int y) {
+	_widget->move(x - _st.margin.left(), y - _st.margin.top());
+}
+
+void StarsRating::paint(QPainter &p) {
+	const auto outer = _widget->rect().marginsRemoved(_st.margin);
+	if (outer.isEmpty()) {
+		return;
+	}
+	const auto border = _st.border;
+	const auto middle = outer.marginsRemoved(
+		{ border, border, border, border });
+	const auto mradius = middle.height() / 2.;
+	const auto inner = middle.marginsRemoved(_st.padding);
+
+	const auto expanded = _expandedAnimation.value(
+		_expanded.current() ? 1. : 0.);
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(_st.inactiveBg);
+	const auto oradius = outer.height() / 2.;
+	p.drawRoundedRect(outer, oradius, oradius);
+	p.setBrush(_st.activeBg);
+
+	const auto value = _value.current();
+	const auto expandedRatio = (value.nextLevelStars > value.levelStars)
+		? ((value.nextLevelStars - value.currentStars)
+			/ float64(value.nextLevelStars - value.levelStars))
+		: 1.;
+	const auto skip = _st.style.font->spacew;
+	const auto expandedFilled = _st.padding.left()
+		+ _expandedText.maxWidth()
+		+ skip
+		+ expandedRatio * (middle.width()
+			- _expandedText.maxWidth()
+			- _nextText.maxWidth()
+			- _st.padding.right()
+			- 2 * skip);
+	const auto collapsedFilled = middle.width();
+	const auto filled = anim::interpolate(
+		collapsedFilled,
+		expandedFilled,
+		expanded);
+	p.drawRoundedRect(
+		middle.x(),
+		middle.y(),
+		filled,
+		middle.height(),
+		mradius,
+		mradius);
+	p.setPen(_st.activeFg);
+	if (expanded < 1.) {
+		p.setOpacity(1. - expanded);
+		const auto skip = (inner.width() - _collapsedText.maxWidth()) / 2;
+		_collapsedText.draw(p, {
+			.position = inner.topLeft() + QPoint(skip, 0),
+			.availableWidth = _collapsedText.maxWidth(),
+		});
+	}
+	if (expanded > 0.) {
+		p.setOpacity(expanded);
+		_expandedText.draw(p, {
+			.position = inner.topLeft(),
+			.availableWidth = _expandedText.maxWidth(),
+		});
+
+		p.setPen(_st.inactiveFg);
+		_nextText.draw(p, {
+			.position = (inner.topLeft()
+				+ QPoint(inner.width() - _nextText.maxWidth(), 0)),
+			.availableWidth = _nextText.maxWidth(),
+		});
+	}
+}
+
+void StarsRating::setMinimalAddedWidth(int addedWidth) {
+	_minimalAddedWidth = addedWidth + (_st.style.font->spacew * 2);
+	updateExpandedWidth();
+	updateWidth();
+}
+
+rpl::producer<int> StarsRating::collapsedWidthValue() const {
+	return _collapsedWidthValue.value();
+}
+
+rpl::lifetime &StarsRating::lifetime() {
+	return _widget->lifetime();
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
new file mode 100644
index 0000000000..43d079e0e6
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -0,0 +1,64 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "data/data_peer_common.h"
+
+namespace style {
+struct StarsRating;
+} // namespace style
+
+namespace Ui {
+
+class AbstractButton;
+class FlatLabel;
+
+class StarsRating final {
+public:
+	StarsRating(
+		QWidget *parent,
+		const style::StarsRating &st,
+		rpl::producer<Data::StarsRating> value);
+	~StarsRating();
+
+	void raise();
+	void moveTo(int x, int y);
+	void setMinimalAddedWidth(int addedWidth);
+
+	[[nodiscard]] rpl::producer<int> collapsedWidthValue() const;
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	void init();
+	void paint(QPainter &p);
+	void updateTexts(Data::StarsRating rating);
+	void updateExpandedWidth();
+	void updateWidth();
+
+	const std::unique_ptr<Ui::AbstractButton> _widget;
+	const style::StarsRating &_st;
+
+	Ui::Text::String _collapsedText;
+	Ui::Text::String _expandedText;
+	Ui::Text::String _nextText;
+
+	rpl::variable<Data::StarsRating> _value;
+	rpl::variable<int> _collapsedWidthValue;
+	rpl::variable<int> _expandedWidthValue;
+	rpl::variable<int> _minimalContentWidth;
+	rpl::variable<int> _minimalAddedWidth;
+	rpl::variable<bool> _expanded = false;
+	Ui::Animations::Simple _expandedAnimation;
+
+	base::Timer _collapseTimer;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 813c5bf02d..b625012c04 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -388,6 +388,8 @@ PRIVATE
     ui/controls/send_as_button.h
     ui/controls/send_button.cpp
     ui/controls/send_button.h
+    ui/controls/stars_rating.cpp
+    ui/controls/stars_rating.h
     ui/controls/subsection_tabs_slider.cpp
     ui/controls/subsection_tabs_slider.h
     ui/controls/swipe_handler.cpp

From f655297052d5379421fd4e10d6f8d8bed29ff13a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Jul 2025 16:32:29 +0400
Subject: [PATCH 038/341] Show stars rating tooltips.

---
 Telegram/SourceFiles/info/info.style          |  13 +-
 .../info/profile/info_profile_cover.cpp       |   3 +-
 .../SourceFiles/ui/controls/stars_rating.cpp  | 152 ++++++++++++++++--
 .../SourceFiles/ui/controls/stars_rating.h    |  18 ++-
 4 files changed, 174 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 310387abb9..283fa1df9a 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1205,7 +1205,7 @@ StarsRating {
 }
 infoStarsRating: StarsRating {
 	margin: margins(6px, 6px, 6px, 6px);
-	padding: margins(4px, 1px, 4px, 1px);
+	padding: margins(6px, 1px, 6px, 1px);
 	style: TextStyle(defaultTextStyle) {
 		font: font(11px semibold);
 	}
@@ -1216,3 +1216,14 @@ infoStarsRating: StarsRating {
 	activeFg: windowFgActive;
 	inactiveFg: windowBoldFg;
 }
+infoStarsRatingLearn: RoundButton(defaultActiveButton) {
+	width: -24px;
+	height: 44px;
+	textTop: 13px;
+	textFg: mediaviewTextLinkFg;
+	textFgOver: mediaviewTextLinkFg;
+	textBg: transparent;
+	textBgOver: transparent;
+	ripple: emptyRippleAnimation;
+}
+infoStarsRatingTooltip: defaultImportantTooltip;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 906a7385d7..de499e71ed 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -649,7 +649,8 @@ Cover::Cover(
 	? std::make_unique<Ui::StarsRating>(
 		this,
 		st::infoStarsRating,
-		Data::StarsRatingValue(_peer))
+		Data::StarsRatingValue(_peer),
+		_parentForTooltip)
 	: nullptr)
 , _status(this, _st.status)
 , _showLastSeen(this, tr::lng_status_lastseen_when(), _st.showLastSeen)
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 431eb1f328..2fa02a2269 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -8,11 +8,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/stars_rating.h"
 
 #include "lang/lang_keys.h"
+#include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/tooltip.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
+#include "ui/ui_utility.h"
 #include "styles/style_info.h"
+#include "styles/style_media_view.h"
 
 namespace Ui {
 namespace {
@@ -24,9 +29,11 @@ constexpr auto kAutoCollapseTimeout = 4 * crl::time(1000);
 StarsRating::StarsRating(
 	QWidget *parent,
 	const style::StarsRating &st,
-	rpl::producer<Data::StarsRating> value)
+	rpl::producer<Data::StarsRating> value,
+	Fn<not_null<QWidget*>()> parentForTooltip)
 : _widget(std::make_unique<Ui::AbstractButton>(parent))
 , _st(st)
+, _parentForTooltip(std::move(parentForTooltip))
 , _value(std::move(value))
 , _collapseTimer([=] { _expanded = false; }) {
 	init();
@@ -41,7 +48,11 @@ void StarsRating::init() {
 		const auto till = expanded ? 1. : 0.;
 		_expandedAnimation.start([=] {
 			updateWidth();
+			if (!_expandedAnimation.animating()) {
+				updateStarsTooltipGeometry();
+			}
 		}, from, till, st::slideDuration);
+		toggleTooltips(expanded);
 	}, lifetime());
 
 	_widget->paintRequest() | rpl::start_with_next([=] {
@@ -116,6 +127,126 @@ void StarsRating::updateWidth() {
 		_expandedAnimation.value(_expanded.current() ? 1. : 0.));
 	_widget->resize(_st.margin.left() + widthToRight, _widget->height());
 	_widget->update();
+	updateStarsTooltipGeometry();
+}
+
+void StarsRating::toggleTooltips(bool shown) {
+	if (!shown) {
+		if (const auto strong = _about.get()) {
+			strong->hideAnimated();
+		}
+		if (const auto strong = _stars.release()) {
+			strong->toggleAnimated(false);
+		}
+		return;
+	}
+	const auto value = _value.current();
+	const auto parent = _parentForTooltip
+		? _parentForTooltip().get()
+		: _widget->window();
+	const auto text = value.nextLevelStars
+		? (Lang::FormatCountDecimal(value.currentStars)
+			+ u" / "_q
+			+ Lang::FormatCountDecimal(value.nextLevelStars))
+		: Lang::FormatCountDecimal(value.currentStars);
+	_stars = std::make_unique<Ui::ImportantTooltip>(
+		parent,
+		Ui::MakeNiceTooltipLabel(
+			_widget.get(),
+			rpl::single(TextWithEntities{ text }),
+			st::storiesInfoTooltipMaxWidth,
+			st::storiesInfoTooltipLabel),
+		st::infoStarsRatingTooltip);
+	const auto stars = _stars.get();
+	const auto weak = QPointer<QWidget>(stars);
+	const auto destroy = [=] {
+		delete weak.data();
+	};
+	stars->setAttribute(Qt::WA_TransparentForMouseEvents);
+	stars->setHiddenCallback(destroy);
+	updateStarsTooltipGeometry();
+	stars->toggleAnimated(true);
+
+	_aboutSt = std::make_unique<style::Toast>(st::defaultMultilineToast);
+	const auto learn = u"Learn More"_q;
+	_aboutSt->padding.setRight(
+		(st::infoStarsRatingLearn.style.font->width(learn)
+			- st::infoStarsRatingLearn.width));
+
+	_about = Ui::Toast::Show(parent, {
+		.text = TextWithEntities{
+			u"Profile level reflects the user's payment reliability."_q,
+		},
+		.st = _aboutSt.get(),
+		.attach = RectPart::Top,
+		.dark = true,
+		.adaptive = true,
+		.acceptinput = true,
+		.duration = kAutoCollapseTimeout,
+	});
+	const auto strong = _about.get();
+	if (!strong) {
+		return;
+	}
+	const auto widget = strong->widget();
+	const auto hideToast = [weak = _about] {
+		if (const auto strong = weak.get()) {
+			strong->hideAnimated();
+		}
+	};
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		widget.get(),
+		rpl::single(learn),
+		st::infoStarsRatingLearn);
+	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	button->show();
+	rpl::combine(
+		widget->sizeValue(),
+		button->sizeValue()
+	) | rpl::start_with_next([=](QSize outer, QSize inner) {
+		button->moveToRight(
+			0,
+			(outer.height() - inner.height()) / 2,
+			outer.width());
+	}, widget->lifetime());
+	button->setClickedCallback([=] {
+		UrlClickHandler::Open(u"https://telegram.org/"_q);
+	});
+}
+
+void StarsRating::updateStarsTooltipGeometry() {
+	if (!_stars) {
+		return;
+	}
+	const auto weakParent = base::make_weak(_stars->parentWidget());
+	const auto weak = base::make_weak(_widget.get());
+	const auto point = _st.margin.left()
+		+ _st.border
+		+ (_activeWidth / (_value.current().nextLevelStars ? 1 : 2));
+	const auto countPosition = [=](QSize size) {
+		const auto strong = weak.get();
+		const auto parent = weakParent.get();
+		if (!strong || !parent) {
+			return QPoint();
+		}
+		const auto geometry = Ui::MapFrom(parent, strong, strong->rect());
+		const auto shift = size.width() / 2;
+		const auto left = geometry.x() + point - shift;
+		const auto margin = st::defaultImportantTooltip.margin;
+		return QPoint(
+			std::min(
+				std::max(left, margin.left()),
+				parent->width() - size.width() - margin.right()),
+			geometry.y() + geometry.height());
+	};
+	_stars->pointAt(
+		Ui::MapFrom(
+			_stars->parentWidget(),
+			_widget.get(),
+			QRect(point, 0, st::lineWidth, _widget->height())),
+		RectPart::Bottom,
+		countPosition);
 }
 
 void StarsRating::raise() {
@@ -149,27 +280,30 @@ void StarsRating::paint(QPainter &p) {
 
 	const auto value = _value.current();
 	const auto expandedRatio = (value.nextLevelStars > value.levelStars)
-		? ((value.nextLevelStars - value.currentStars)
+		? ((value.currentStars - value.levelStars)
 			/ float64(value.nextLevelStars - value.levelStars))
 		: 1.;
-	const auto skip = _st.style.font->spacew;
 	const auto expandedFilled = _st.padding.left()
 		+ _expandedText.maxWidth()
-		+ skip
+		+ _st.padding.right()
 		+ expandedRatio * (middle.width()
+			- _st.padding.left()
 			- _expandedText.maxWidth()
-			- _nextText.maxWidth()
 			- _st.padding.right()
-			- 2 * skip);
-	const auto collapsedFilled = middle.width();
-	const auto filled = anim::interpolate(
+			- _st.padding.left()
+			- _nextText.maxWidth()
+			- _st.padding.right());
+	const auto collapsedFilled = _collapsedWidthValue.current()
+		- _st.margin.right()
+		- 2 * _st.border;
+	_activeWidth = anim::interpolate(
 		collapsedFilled,
 		expandedFilled,
 		expanded);
 	p.drawRoundedRect(
 		middle.x(),
 		middle.y(),
-		filled,
+		_activeWidth,
 		middle.height(),
 		mradius,
 		mradius);
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
index 43d079e0e6..6e94480b72 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.h
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -8,14 +8,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/timer.h"
+#include "base/weak_ptr.h"
 #include "data/data_peer_common.h"
 
 namespace style {
+struct Toast;
 struct StarsRating;
 } // namespace style
 
+namespace Ui::Toast {
+class Instance;
+} // namespace Ui::Toast
+
 namespace Ui {
 
+class ImportantTooltip;
 class AbstractButton;
 class FlatLabel;
 
@@ -24,7 +31,8 @@ public:
 	StarsRating(
 		QWidget *parent,
 		const style::StarsRating &st,
-		rpl::producer<Data::StarsRating> value);
+		rpl::producer<Data::StarsRating> value,
+		Fn<not_null<QWidget*>()> parentForTooltip);
 	~StarsRating();
 
 	void raise();
@@ -41,9 +49,16 @@ private:
 	void updateTexts(Data::StarsRating rating);
 	void updateExpandedWidth();
 	void updateWidth();
+	void toggleTooltips(bool shown);
+	void updateStarsTooltipGeometry();
 
 	const std::unique_ptr<Ui::AbstractButton> _widget;
 	const style::StarsRating &_st;
+	const Fn<not_null<QWidget*>()> _parentForTooltip;
+
+	std::unique_ptr<style::Toast> _aboutSt;
+	base::weak_ptr<Ui::Toast::Instance> _about;
+	std::unique_ptr<Ui::ImportantTooltip> _stars;
 
 	Ui::Text::String _collapsedText;
 	Ui::Text::String _expandedText;
@@ -56,6 +71,7 @@ private:
 	rpl::variable<int> _minimalAddedWidth;
 	rpl::variable<bool> _expanded = false;
 	Ui::Animations::Simple _expandedAnimation;
+	mutable int _activeWidth = 0;
 
 	base::Timer _collapseTimer;
 

From be6dbefe7cac4e89cd14d9ec99a200cd53271fdc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 15 Jul 2025 18:18:58 +0400
Subject: [PATCH 039/341] Show premium badge on gifts.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/api/api_premium.cpp      |  4 ++++
 Telegram/SourceFiles/data/data_star_gift.h    |  3 +++
 .../peer_gifts/info_peer_gifts_common.cpp     | 19 ++++++++++++++++++-
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0b988fb211..7ba789dab5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3521,6 +3521,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_stars_sold_out" = "sold out";
 "lng_gift_stars_resale" = "resale";
 "lng_gift_stars_on_sale" = "on sale";
+"lng_gift_stars_premium" = "premium";
 "lng_gift_stars_tabs_all" = "All Gifts";
 "lng_gift_stars_tabs_my" = "My Gifts";
 "lng_gift_stars_tabs_limited" = "Limited";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 5065541e27..835f3a1c70 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -825,8 +825,11 @@ std::optional<Data::StarGift> FromTL(
 			.resellCount = int(data.vavailability_resale().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(),
 			.firstSaleDate = data.vfirst_sale_date().value_or_empty(),
 			.lastSaleDate = data.vlast_sale_date().value_or_empty(),
+			.requirePremium = data.is_require_premium(),
 			.upgradable = data.vupgrade_stars().has_value(),
 			.birthday = data.is_birthday(),
 			.soldOut = data.is_sold_out(),
@@ -877,6 +880,7 @@ std::optional<Data::StarGift> FromTL(
 			.releasedBy = releasedBy,
 			.limitedLeft = (total - data.vavailability_issued().v),
 			.limitedCount = total,
+			.requirePremium = data.is_require_premium(),
 		};
 		const auto unique = result.unique.get();
 		for (const auto &attribute : data.vattributes().v) {
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index df0aacc953..8b53bd5581 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -74,8 +74,11 @@ struct StarGift {
 	int resellCount = 0;
 	int limitedLeft = 0;
 	int limitedCount = 0;
+	int perUserTotal = 0;
+	int perUserRemains = 0;
 	TimeId firstSaleDate = 0;
 	TimeId lastSaleDate = 0;
+	bool requirePremium = false;
 	bool upgradable = false;
 	bool birthday = false;
 	bool soldOut = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 33e28a9227..da39de9903 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -419,8 +419,11 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		? v::get<GiftTypeStars>(_descriptor).info.unique.get()
 		: nullptr;
 	const auto onsale = (unique && unique->starsForResale && _small);
+	const auto requirePremium = v::is<GiftTypeStars>(_descriptor)
+		&& !v::get<GiftTypeStars>(_descriptor).userpic
+		&& v::get<GiftTypeStars>(_descriptor).info.requirePremium;
 	const auto hidden = v::is<GiftTypeStars>(_descriptor)
-		&& v::get<GiftTypeStars>(_descriptor).hidden;;
+		&& v::get<GiftTypeStars>(_descriptor).hidden;
 	const auto extend = currentExtend();
 	const auto position = QPoint(extend.left(), extend.top());
 	const auto background = _delegate->background();
@@ -430,6 +433,16 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 	if (unique) {
 		cacheUniqueBackground(unique, width, background.height() / dpr);
 		p.drawImage(extend.left(), extend.top(), _uniqueBackgroundCache);
+	} else if (requirePremium) {
+		auto hq = PainterHighQualityEnabler(p);
+		auto pen = st::creditsFg->p;
+		pen.setWidth(style::ConvertScaleExact(2.));
+		p.setPen(pen);
+		p.setBrush(Qt::NoBrush);
+		const auto outer = QRect(0, 0, width, background.height() / dpr);
+		const auto extend = currentExtend();
+		const auto radius = st::giftBoxGiftRadius;
+		p.drawRoundedRect(outer.marginsRemoved(extend), radius, radius);
 	}
 
 	if (_userpic) {
@@ -526,6 +539,8 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 					? tr::lng_gift_stars_resale(tr::now)
 					: soldOut
 					? tr::lng_gift_stars_sold_out(tr::now)
+					: (!data.userpic && data.info.requirePremium)
+					? tr::lng_gift_stars_premium(tr::now)
 					: (!data.userpic && !data.info.unique)
 					? tr::lng_gift_stars_limited(tr::now)
 					: (count == 1)
@@ -544,6 +559,8 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 					? st::boxTextFgGood->c
 					: soldOut
 					? st::attentionButtonFg->c
+					: data.info.requirePremium
+					? st::creditsFg->c
 					: st::windowActiveTextFg->c),
 				.bg2 = (onsale
 					? QColor(0, 0, 0, 0)

From 1cb4413869c3065db6eeb2ff64df323e3e42236d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Jul 2025 11:33:06 +0400
Subject: [PATCH 040/341] Lang pack rating / premium gift features.

---
 Telegram/Resources/langs/lang.strings         |  12 ++
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  20 +-
 .../peer_gifts/info_peer_gifts_common.cpp     |   7 +-
 .../SourceFiles/settings/settings_premium.cpp | 193 ++++++++++++++----
 .../SourceFiles/settings/settings_premium.h   |   7 +
 .../SourceFiles/ui/controls/stars_rating.cpp  |  36 ++--
 6 files changed, 217 insertions(+), 58 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 7ba789dab5..06857aae47 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1876,6 +1876,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_star_ref_revoked_title" = "Link removed";
 "lng_star_ref_revoked_text" = "It will no longer work.";
 
+"lng_stars_rating_tooltip" = "Profile level reflects the user's payment reliability.";
+"lng_stars_rating_learn_more" = "Learn More";
+"lng_stars_rating_about_url" = "https://telegram.org/";
+
 "lng_manage_discussion_group" = "Discussion";
 "lng_manage_discussion_group_add" = "Add a group";
 "lng_manage_linked_channel" = "Linked channel";
@@ -2589,6 +2593,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_premium_unlock_emoji" = "Unlock Animated Emoji";
 "lng_premium_unlock_status" = "Unlock Emoji Status";
 
+"lng_premium_subscribe_months_24" = "2-Year";
 "lng_premium_subscribe_months_12" = "Annual";
 "lng_premium_subscribe_months_6" = "Semiannual";
 "lng_premium_subscribe_months_1" = "Monthly";
@@ -3508,6 +3513,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_ton_amount#one" = "{count} TON";
 "lng_gift_ton_amount#other" = "{count} TON";
 
+"lng_gift_premium_title" = "Premium Gift";
+"lng_gift_premium_text#one" = "Subscribe to **Telegram Premium** to send up to **{count}** of these gifts and unlock access to multiple additional features.";
+"lng_gift_premium_text#other" = "Subscribe to **Telegram Premium** to send up to **{count}** of these gifts and unlock access to multiple additional features.";
 "lng_gift_premium_or_stars" = "Gift Premium or Stars";
 "lng_gift_premium_subtitle" = "Gift Premium";
 "lng_gift_premium_about" = "Give {name} access to exclusive features with Telegram Premium. {features}";
@@ -3559,6 +3567,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_sent_resale_done_self" = "{gift} is now yours.";
 "lng_gift_sent_about#one" = "You spent **{count}** Star from your balance.";
 "lng_gift_sent_about#other" = "You spent **{count}** Stars from your balance.";
+"lng_gift_sent_finished#one" = "You've already sent **{count}** of these gifts, and it's the limit.";
+"lng_gift_sent_finished#other" = "You've already sent **{count}** of these gifts, and it's the limit.";
+"lng_gift_sent_remains#one" = "You can send **{count}** more.";
+"lng_gift_sent_remains#other" = "You can send **{count}** more.";
 "lng_gift_limited_of_one" = "unique";
 "lng_gift_limited_of_count" = "1 of {amount}";
 "lng_gift_collectible_tag" = "gift";
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index c63319b912..b3cf7bf156 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -777,6 +777,19 @@ void ShowSentToast(
 			tr::now,
 			Text::RichLangValue);
 	}, [&](const GiftTypeStars &gift) {
+		if (gift.info.perUserTotal && gift.info.perUserRemains < 2) {
+			return tr::lng_gift_sent_finished(
+				tr::now,
+				lt_count,
+				gift.info.perUserTotal,
+				Text::RichLangValue);
+		} else if (gift.info.perUserTotal) {
+			return tr::lng_gift_sent_remains(
+				tr::now,
+				lt_count,
+				gift.info.perUserRemains - 1,
+				Text::RichLangValue);
+		}
 		const auto amount = gift.info.stars
 			+ (details.upgraded ? gift.info.starsToUpgrade : 0);
 		return tr::lng_gift_sent_about(
@@ -2749,7 +2762,12 @@ void SendGiftBox(
 			button->setClickedCallback([=] {
 				const auto star = std::get_if<GiftTypeStars>(&descriptor);
 				const auto unique = star ? star->info.unique : nullptr;
-				if (unique && star->mine && !peer->isSelf()) {
+				if (star
+					&& star->info.requirePremium
+					&& !peer->session().premium()) {
+					Settings::ShowPremiumGiftPremium(window, star->info);
+					return;
+				} else if (unique && star->mine && !peer->isSelf()) {
 					if (ShowTransferGiftLater(window->uiShow(), unique)) {
 						return;
 					}
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index da39de9903..5ae749173b 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -421,6 +421,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 	const auto onsale = (unique && unique->starsForResale && _small);
 	const auto requirePremium = v::is<GiftTypeStars>(_descriptor)
 		&& !v::get<GiftTypeStars>(_descriptor).userpic
+		&& !v::get<GiftTypeStars>(_descriptor).info.unique
 		&& v::get<GiftTypeStars>(_descriptor).info.requirePremium;
 	const auto hidden = v::is<GiftTypeStars>(_descriptor)
 		&& v::get<GiftTypeStars>(_descriptor).hidden;
@@ -539,7 +540,9 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 					? tr::lng_gift_stars_resale(tr::now)
 					: soldOut
 					? tr::lng_gift_stars_sold_out(tr::now)
-					: (!data.userpic && data.info.requirePremium)
+					: (!data.userpic
+						&& !data.info.unique
+						&& data.info.requirePremium)
 					? tr::lng_gift_stars_premium(tr::now)
 					: (!data.userpic && !data.info.unique)
 					? tr::lng_gift_stars_limited(tr::now)
@@ -559,7 +562,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 					? st::boxTextFgGood->c
 					: soldOut
 					? st::attentionButtonFg->c
-					: data.info.requirePremium
+					: (!data.userpic && data.info.requirePremium)
 					? st::creditsFg->c
 					: st::windowActiveTextFg->c),
 				.bg2 = (onsale
diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 2b04f6db57..5ca2783923 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -91,6 +91,8 @@ using SectionCustomTopBarData = Info::Settings::SectionCustomTopBarData;
 			option.duration = tr::lng_premium_subscribe_months_6(tr::now);
 		} else if (option.duration == tr::lng_years(tr::now, lt_count, 1)) {
 			option.duration = tr::lng_premium_subscribe_months_12(tr::now);
+		} else if (option.duration == tr::lng_years(tr::now, lt_count, 2)) {
+			option.duration = tr::lng_premium_subscribe_months_24(tr::now);
 		}
 	}
 	return result;
@@ -164,6 +166,45 @@ struct Data {
 }
 
 } // namespace EmojiStatus
+
+namespace PremiumGift {
+
+struct Data {
+	DocumentId documentId = 0;
+	int perUserTotal = 0;
+
+	explicit operator bool() const {
+		return documentId != 0;
+	}
+};
+
+[[nodiscard]] QString Serialize(const Data &gift) {
+	return u"premiumgift_:%1,peruser_:%2"_q
+		.arg(gift.documentId)
+		.arg(gift.perUserTotal);
+}
+
+[[nodiscard]] Data Parse(QStringView data) {
+	if (data.startsWith(u"premiumgift_:"_q)) {
+		const auto components = data.split(',');
+		if (components.size() != 2) {
+			return {};
+		}
+		const auto first = components[0].split(':');
+		const auto second = components[1].split(':');
+		if (first.size() != 2 || second.size() != 2) {
+			return {};
+		}
+		return {
+			.documentId = DocumentId(first[1].toULongLong()),
+			.perUserTotal = second[1].toInt(),
+		};
+	}
+	return {};
+}
+
+} // namespace PremiumGift
+
 } // namespace Ref
 
 struct Entry {
@@ -374,7 +415,6 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_business(),
 				tr::lng_premium_summary_about_business(),
 				PremiumFeature::Business,
-				true,
 			},
 		},
 		{
@@ -393,6 +433,7 @@ using Order = std::vector<QString>;
 				tr::lng_premium_summary_subtitle_todo_lists(),
 				tr::lng_premium_summary_about_todo_lists(),
 				PremiumFeature::TodoLists,
+				true,
 			},
 		},
 	};
@@ -542,13 +583,30 @@ void EmojiStatusTopBar::paint(QPainter &p) {
 	}
 }
 
-class TopBarUser final : public Ui::Premium::TopBarAbstract {
+enum class TopBarWithStickerType {
+	EmojiStatus,
+	PremiumGift,
+};
+
+struct TopBarWithStickerArgs {
+	rpl::producer<DocumentData*> stickerValue;
+	rpl::producer<QString> nameValue;
+	rpl::producer<TextWithEntities> aboutValue;
+	TopBarWithStickerType type = TopBarWithStickerType::EmojiStatus;
+};
+
+class TopBarWithSticker final : public Ui::Premium::TopBarAbstract {
 public:
-	TopBarUser(
+	TopBarWithSticker(
 		not_null<QWidget*> parent,
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> peer,
 		rpl::producer<> showFinished);
+	TopBarWithSticker(
+		not_null<QWidget*> parent,
+		not_null<Window::SessionController*> controller,
+		TopBarWithStickerArgs args,
+		rpl::producer<> showFinished);
 
 	void setPaused(bool paused) override;
 	void setTextPosition(int x, int y) override;
@@ -562,10 +620,13 @@ protected:
 private:
 	void updateTitle(
 		DocumentData *document,
-		TextWithEntities name,
+		const TextWithEntities &name,
 		not_null<Window::SessionController*> controller);
-	void updateAbout(DocumentData *document) const;
+	void updateAbout(
+		DocumentData *document,
+		const TextWithEntities &about) const;
 
+	TopBarWithStickerType _type = TopBarWithStickerType::EmojiStatus;
 	object_ptr<Ui::RpWidget> _content;
 	object_ptr<Ui::FlatLabel> _title;
 	object_ptr<Ui::FlatLabel> _about;
@@ -586,12 +647,35 @@ private:
 
 };
 
-TopBarUser::TopBarUser(
+TopBarWithSticker::TopBarWithSticker(
 	not_null<QWidget*> parent,
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
 	rpl::producer<> showFinished)
+: TopBarWithSticker(parent, controller, {
+	.stickerValue = Info::Profile::EmojiStatusIdValue(
+		peer
+	) | rpl::map([=](EmojiStatusId id) -> DocumentData* {
+		const auto documentId = id.collectible
+			? id.collectible->documentId
+			: id.documentId;
+		const auto document = documentId
+			? controller->session().data().document(documentId).get()
+			: nullptr;
+		return (document && document->sticker()) ? document : nullptr;
+	}),
+	.nameValue = Info::Profile::NameValue(peer),
+	.type = TopBarWithStickerType::EmojiStatus,
+}, std::move(showFinished)) {
+}
+
+TopBarWithSticker::	TopBarWithSticker(
+	not_null<QWidget*> parent,
+	not_null<Window::SessionController*> controller,
+	TopBarWithStickerArgs args,
+	rpl::producer<> showFinished)
 : TopBarAbstract(parent, st::userPremiumCover)
+, _type(args.type)
 , _content(this)
 , _title(_content, st::settingsPremiumUserTitle)
 , _about(_content, st::userPremiumCover.about)
@@ -604,6 +688,10 @@ TopBarUser::TopBarUser(
 }) {
 	_starRect = TopBarAbstract::starRect(1., 1.);
 
+	if (_type == TopBarWithStickerType::PremiumGift) {
+		_ministars.setColorOverride(Ui::Premium::CreditsIconGradientStops());
+	}
+
 	rpl::single() | rpl::then(
 		style::PaletteChanged()
 	) | rpl::start_with_next([=] {
@@ -611,24 +699,14 @@ TopBarUser::TopBarUser(
 		update();
 	}, lifetime());
 
-	auto documentValue = Info::Profile::EmojiStatusIdValue(
-		peer
-	) | rpl::map([=](EmojiStatusId id) -> DocumentData* {
-		const auto documentId = id.collectible
-			? id.collectible->documentId
-			: id.documentId;
-		const auto document = documentId
-			? controller->session().data().document(documentId).get()
-			: nullptr;
-		return (document && document->sticker()) ? document : nullptr;
-	});
-
 	rpl::combine(
-		std::move(documentValue),
-		Info::Profile::NameValue(peer)
+		std::move(args.stickerValue),
+		std::move(args.nameValue),
+		std::move(args.aboutValue)
 	) | rpl::start_with_next([=](
 			DocumentData *document,
-			const QString &name) {
+			const QString &name,
+			const TextWithEntities &about) {
 		if (document) {
 			_emojiStatus = std::make_unique<EmojiStatusTopBar>(
 				document,
@@ -641,7 +719,7 @@ TopBarUser::TopBarUser(
 		}
 
 		updateTitle(document, { name }, controller);
-		updateAbout(document);
+		updateAbout(document, about);
 
 		auto event = QResizeEvent(size(), size());
 		resizeEvent(&event);
@@ -746,14 +824,15 @@ TopBarUser::TopBarUser(
 			p.drawImage(_starRect.topLeft(), _imageStar);
 		}
 	}, lifetime());
-
 }
 
-void TopBarUser::updateTitle(
+void TopBarWithSticker::updateTitle(
 		DocumentData *document,
-		TextWithEntities name,
+		const TextWithEntities &name,
 		not_null<Window::SessionController*> controller) {
-	if (!document) {
+	if (_type == TopBarWithStickerType::PremiumGift) {
+		return _title->setMarkedText(name);
+	} else if (!document) {
 		return _title->setMarkedText(
 			tr::lng_premium_summary_user_title(
 				tr::now,
@@ -816,36 +895,40 @@ void TopBarUser::updateTitle(
 	_title->setLink(linkIndex, std::move(link));
 }
 
-void TopBarUser::updateAbout(DocumentData *document) const {
-	_about->setMarkedText((document
-		? tr::lng_premium_emoji_status_about
-		: tr::lng_premium_summary_user_about)(
-			tr::now,
-			Ui::Text::RichLangValue));
+void TopBarWithSticker::updateAbout(
+		DocumentData *document,
+		const TextWithEntities &about) const {
+	_about->setMarkedText((_type == TopBarWithStickerType::PremiumGift)
+		? about
+		: (document
+			? tr::lng_premium_emoji_status_about
+			: tr::lng_premium_summary_user_about)(
+				tr::now,
+				Ui::Text::RichLangValue));
 }
 
-void TopBarUser::setPaused(bool paused) {
+void TopBarWithSticker::setPaused(bool paused) {
 	_ministars.setPaused(paused);
 	if (_emojiStatus) {
 		_emojiStatus->setPaused(paused);
 	}
 }
 
-void TopBarUser::setTextPosition(int x, int y) {
+void TopBarWithSticker::setTextPosition(int x, int y) {
 	_smallTop.position = { x, y };
 }
 
-rpl::producer<int> TopBarUser::additionalHeight() const {
+rpl::producer<int> TopBarWithSticker::additionalHeight() const {
 	return rpl::never<int>();
 }
 
-void TopBarUser::paintEvent(QPaintEvent *e) {
+void TopBarWithSticker::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 
 	TopBarAbstract::paintEdges(p);
 }
 
-void TopBarUser::resizeEvent(QResizeEvent *e) {
+void TopBarWithSticker::resizeEvent(QResizeEvent *e) {
 	_starRect = TopBarAbstract::starRect(1., 1.);
 
 	_ministars.setCenter(_starRect.toRect());
@@ -1053,7 +1136,9 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 	}();
 
 	const auto emojiStatusData = Ref::EmojiStatus::Parse(_ref);
+	const auto premiumGiftData = Ref::PremiumGift::Parse(_ref);
 	const auto isEmojiStatus = (!!emojiStatusData);
+	const auto isPremiumGift = (!!premiumGiftData);
 
 	auto peerWithPremium = [&]() -> PeerData* {
 		if (isEmojiStatus) {
@@ -1064,14 +1149,35 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 		}
 		return nullptr;
 	}();
+	auto premiumGift = [&]() -> DocumentData* {
+		if (isPremiumGift) {
+			auto &data = _controller->session().data();
+			return data.document(premiumGiftData.documentId);
+		}
+		return nullptr;
+	}();
 
 	const auto content = [&]() -> Ui::Premium::TopBarAbstract* {
 		if (peerWithPremium) {
-			return Ui::CreateChild<TopBarUser>(
+			return Ui::CreateChild<TopBarWithSticker>(
 				parent.get(),
 				_controller,
 				peerWithPremium,
 				_showFinished.events());
+		} else if (premiumGift) {
+			return Ui::CreateChild<TopBarWithSticker>(
+				parent.get(),
+				_controller,
+				TopBarWithStickerArgs{
+					.stickerValue = rpl::single(premiumGift),
+					.nameValue = tr::lng_gift_premium_title(),
+					.aboutValue = tr::lng_gift_premium_text(
+						lt_count,
+						rpl::single(premiumGiftData.perUserTotal * 1.),
+						Ui::Text::RichLangValue),
+					.type = TopBarWithStickerType::PremiumGift,
+				},
+				_showFinished.events());
 		}
 		const auto weak = base::make_weak(_controller);
 		const auto clickContextOther = [=] {
@@ -1102,7 +1208,7 @@ base::weak_qptr<Ui::RpWidget> Premium::createPinnedToTop(
 	}, content->lifetime());
 
 	const auto calculateMaximumHeight = [=] {
-		return isEmojiStatus
+		return (isEmojiStatus || isPremiumGift)
 			? st::settingsPremiumUserHeight + TopTransitionSkip()
 			: st::settingsPremiumTopHeight;
 	};
@@ -1352,6 +1458,15 @@ void ShowEmojiStatusPremium(
 	}
 }
 
+void ShowPremiumGiftPremium(
+		not_null<Window::SessionController*> controller,
+		const Data::StarGift &gift) {
+	ShowPremium(controller, Ref::PremiumGift::Serialize({
+		.documentId = gift.document->id,
+		.perUserTotal = gift.perUserTotal,
+	}));
+}
+
 void StartPremiumPayment(
 		not_null<Window::SessionController*> controller,
 		const QString &ref) {
diff --git a/Telegram/SourceFiles/settings/settings_premium.h b/Telegram/SourceFiles/settings/settings_premium.h
index 2effb1e1a4..19333ddee2 100644
--- a/Telegram/SourceFiles/settings/settings_premium.h
+++ b/Telegram/SourceFiles/settings/settings_premium.h
@@ -20,6 +20,10 @@ namespace ChatHelpers {
 class Show;
 } // namespace ChatHelpers
 
+namespace Data {
+struct StarGift;
+} // namespace Data
+
 namespace Ui {
 class RpWidget;
 class RoundButton;
@@ -52,6 +56,9 @@ void ShowGiftPremium(
 void ShowEmojiStatusPremium(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer);
+void ShowPremiumGiftPremium(
+	not_null<Window::SessionController*> controller,
+	const Data::StarGift &gift);
 
 void StartPremiumPayment(
 	not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 2fa02a2269..fb047ded9e 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/stars_rating.h"
 
 #include "lang/lang_keys.h"
+#include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -42,7 +43,8 @@ StarsRating::StarsRating(
 StarsRating::~StarsRating() = default;
 
 void StarsRating::init() {
-	_expanded.value() | rpl::start_with_next([=](bool expanded) {
+	_widget->setPointerCursor(true);
+	_expanded.changes() | rpl::start_with_next([=](bool expanded) {
 		_widget->setPointerCursor(!expanded);
 		const auto from = expanded ? 0. : 1.;
 		const auto till = expanded ? 1. : 0.;
@@ -168,15 +170,15 @@ void StarsRating::toggleTooltips(bool shown) {
 	stars->toggleAnimated(true);
 
 	_aboutSt = std::make_unique<style::Toast>(st::defaultMultilineToast);
-	const auto learn = u"Learn More"_q;
+	const auto learn = tr::lng_stars_rating_learn_more(tr::now);
 	_aboutSt->padding.setRight(
 		(st::infoStarsRatingLearn.style.font->width(learn)
 			- st::infoStarsRatingLearn.width));
 
 	_about = Ui::Toast::Show(parent, {
-		.text = TextWithEntities{
-			u"Profile level reflects the user's payment reliability."_q,
-		},
+		.text = tr::lng_stars_rating_tooltip(
+			tr::now,
+			Ui::Text::WithEntities),
 		.st = _aboutSt.get(),
 		.attach = RectPart::Top,
 		.dark = true,
@@ -211,7 +213,7 @@ void StarsRating::toggleTooltips(bool shown) {
 			outer.width());
 	}, widget->lifetime());
 	button->setClickedCallback([=] {
-		UrlClickHandler::Open(u"https://telegram.org/"_q);
+		UrlClickHandler::Open(tr::lng_stars_rating_about_url(tr::now));
 	});
 }
 
@@ -283,16 +285,18 @@ void StarsRating::paint(QPainter &p) {
 		? ((value.currentStars - value.levelStars)
 			/ float64(value.nextLevelStars - value.levelStars))
 		: 1.;
-	const auto expandedFilled = _st.padding.left()
-		+ _expandedText.maxWidth()
-		+ _st.padding.right()
-		+ expandedRatio * (middle.width()
-			- _st.padding.left()
-			- _expandedText.maxWidth()
-			- _st.padding.right()
-			- _st.padding.left()
-			- _nextText.maxWidth()
-			- _st.padding.right());
+	const auto expandedFilled = (expandedRatio < 1.)
+		? (_st.padding.left()
+			+ _expandedText.maxWidth()
+			+ _st.padding.right()
+			+ expandedRatio * (middle.width()
+				- _st.padding.left()
+				- _expandedText.maxWidth()
+				- _st.padding.right()
+				- _st.padding.left()
+				- _nextText.maxWidth()
+				- _st.padding.right()))
+		: middle.width();
 	const auto collapsedFilled = _collapsedWidthValue.current()
 		- _st.margin.right()
 		- 2 * _st.border;

From 66e8f9865abc73d55874be6b14fd057d2870b2a3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 17 Jul 2025 17:31:38 +0400
Subject: [PATCH 041/341] Started gift collections.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |  17 +++
 .../chat_helpers/chat_helpers.style           |   3 -
 Telegram/SourceFiles/info/info.style          |  16 +++
 .../info_peer_gifts_collections.cpp           | 107 ++++++++++++++++++
 .../peer_gifts/info_peer_gifts_collections.h  |  30 +++++
 .../peer_gifts/info_peer_gifts_widget.cpp     |  19 +++-
 Telegram/SourceFiles/main/main_app_config.cpp |   8 ++
 Telegram/SourceFiles/main/main_app_config.h   |   2 +
 9 files changed, 200 insertions(+), 4 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
 create mode 100644 Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 6e285ca175..a1f99fb31d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1007,6 +1007,8 @@ PRIVATE
     info/media/info_media_widget.h
     info/members/info_members_widget.cpp
     info/members/info_members_widget.h
+    info/peer_gifts/info_peer_gifts_collections.cpp
+    info/peer_gifts/info_peer_gifts_collections.h
     info/peer_gifts/info_peer_gifts_common.cpp
     info/peer_gifts/info_peer_gifts_common.h
     info/peer_gifts/info_peer_gifts_widget.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 06857aae47..2e049a9692 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3751,6 +3751,23 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_resale_early" = "You will be able to resell this gift in {duration}.";
 "lng_gift_transfer_early" = "You will be able to transfer this gift in {duration}.";
 "lng_gift_resale_transfer_early_title" = "Try Later";
+"lng_gift_collection_add" = "Add Collection";
+"lng_gift_collection_new_title" = "Create a New Collection";
+"lng_gift_collection_new_button" = "New Collection";
+"lng_gift_collection_new_text" = "Choose a name for your collection and start adding your gifts there.";
+"lng_gift_collection_new_ph" = "Title";
+"lng_gift_collection_new_create" = "Create";
+"lng_gift_collection_empty_title" = "Organize Your Gifts";
+"lng_gift_collection_empty_text" = "Add some of your gifts to this collection.";
+"lng_gift_collection_empty_button" = "Add to Collection";
+"lng_gift_collection_all" = "All Gifts";
+"lng_gift_collection_add_title" = "Add Gifts";
+"lng_gift_collection_edit" = "Edit Name";
+"lng_gift_collection_limit_title" = "Limit Reached";
+"lng_gift_collection_limit_text" = "Please remove one of the existing collections to add a new one.";
+"lng_gift_collection_delete" = "Delete Collection";
+"lng_gift_collection_add_to" = "Add to Collection";
+"lng_gift_collection_reorder" = "Reorder";
 
 "lng_accounts_limit_title" = "Limit Reached";
 "lng_accounts_limit1#one" = "You have reached the limit of **{count}** connected account.";
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index a2158bbe20..252a7dbc94 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1487,9 +1487,6 @@ editTagField: InputField(defaultInputField) {
 
 	heightMin: 36px;
 }
-editTagLimit: FlatLabel(defaultFlatLabel) {
-	textFg: windowSubTextFg;
-}
 
 editStickerSetNameField: InputField(defaultInputField) {
 	textMargins: margins(0px, 8px, 26px, 4px);
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 283fa1df9a..5e05950c2c 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1227,3 +1227,19 @@ infoStarsRatingLearn: RoundButton(defaultActiveButton) {
 	ripple: emptyRippleAnimation;
 }
 infoStarsRatingTooltip: defaultImportantTooltip;
+
+collectionAbout: FlatLabel(defaultFlatLabel) {
+	minWidth: 256px;
+}
+collectionNameField: InputField(defaultInputField) {
+	textBg: transparent;
+	textMargins: margins(2px, 10px, 32px, 2px);
+
+	placeholderFg: placeholderFg;
+	placeholderFgActive: placeholderFgActive;
+	placeholderFgError: placeholderFgActive;
+	placeholderMargins: margins(2px, 0px, 2px, 0px);
+	placeholderScale: 0.;
+
+	heightMin: 36px;
+}
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
new file mode 100644
index 0000000000..2b66c8a78b
--- /dev/null
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -0,0 +1,107 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/peer_gifts/info_peer_gifts_collections.h"
+
+#include "api/api_credits.h" //
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_star_gift.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/fields/input_field.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_info.h"
+
+namespace Info::PeerGifts {
+namespace {
+
+constexpr auto kCollectionNameLimit = 12;
+
+} // namespace
+
+void NewCollectionBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Data::SavedStarGiftId addId) {
+	box->setTitle(tr::lng_gift_collection_new_title());
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_gift_collection_new_text(),
+			st::collectionAbout));
+	const auto title = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::collectionNameField,
+			tr::lng_gift_collection_new_ph()));
+	title->setMaxLength(kCollectionNameLimit * 2);
+	box->setFocusCallback([=] {
+		title->setFocusFast();
+	});
+
+	Ui::AddLengthLimitLabel(title, kCollectionNameLimit);
+
+	const auto show = navigation->uiShow();
+	const auto session = &peer->session();
+
+	const auto creating = std::make_shared<bool>(false);
+	box->addButton(tr::lng_gift_collection_new_create(), [=] {
+		if (*creating) {
+			return;
+		}
+		const auto text = title->getLastText().trimmed();
+		if (text.isEmpty()) {
+			title->showError();
+			return;
+		}
+
+		*creating = true;
+		auto ids = QVector<MTPInputSavedStarGift>();
+		if (addId) {
+			ids.push_back(Api::InputSavedStarGiftId(addId));
+		}
+		const auto weak = base::make_weak(box);
+		session->api().request(MTPpayments_CreateStarGiftCollection(
+			peer->input,
+			MTP_string(text),
+			MTP_vector<MTPInputSavedStarGift>(ids)
+		)).done([=](const MTPStarGiftCollection &result) {
+			*creating = false;
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		}).fail([=](const MTP::Error &error) {
+			*creating = false;
+			const auto &type = error.type();
+			if (type == u""_q) {
+				show->show(Ui::MakeInformBox({
+					.text = tr::lng_gift_collection_limit_text(),
+					.confirmText = tr::lng_box_ok(),
+					.title = tr::lng_gift_collection_limit_title(),
+				}));
+				if (const auto strong = weak.get()) {
+					strong->closeBox();
+				}
+			} else {
+				show->showToast(error.type());
+			}
+		}).send();
+	});
+
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+
+}
+
+} // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
new file mode 100644
index 0000000000..cbb18a28a8
--- /dev/null
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
@@ -0,0 +1,30 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+class SavedStarGiftId;
+} // namespace Data
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+namespace Info::PeerGifts {
+
+void NewCollectionBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	Data::SavedStarGiftId addId);
+
+} // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 68a79563f6..73bd98c99a 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_credits.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "info/peer_gifts/info_peer_gifts_collections.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/info_controller.h"
 #include "ui/layers/generic_box.h"
@@ -807,6 +808,8 @@ void Widget::setupNotifyCheckbox(bool enabled) {
 }
 
 void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto peer = _inner->peer();
+	const auto canManage = peer->canManageGifts();
 	const auto filter = _filter.current();
 	const auto change = [=](Fn<void(Filter&)> update) {
 		auto now = _filter.current();
@@ -824,6 +827,20 @@ void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 		}, &st::menuIconEarn);
 	}
 
+	if (canManage) {
+		const auto weak = base::make_weak(
+			(Window::SessionNavigation*)controller());
+		addAction(tr::lng_gift_collection_add(tr::now), [=] {
+			if (const auto strong = weak.get()) {
+				strong->uiShow()->show(Box(
+					NewCollectionBox,
+					strong,
+					peer,
+					Data::SavedStarGiftId()));
+			}
+		}, &st::menuIconAddToFolder);
+	}
+
 	addAction({ .isSeparator = true });
 
 	addAction(tr::lng_peer_gifts_filter_unlimited(tr::now), [=] {
@@ -857,7 +874,7 @@ void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 		});
 	}, filter.skipUnique ? nullptr : &st::mediaPlayerMenuCheck);
 
-	if (_inner->peer()->canManageGifts()) {
+	if (canManage) {
 		addAction({ .isSeparator = true });
 
 		addAction(tr::lng_peer_gifts_filter_saved(tr::now), [=] {
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index ea8561669e..32b1ae53d8 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -121,6 +121,14 @@ int AppConfig::pinnedGiftsLimit() const {
 	return get<int>(u"stargifts_pinned_to_top_limit"_q, 6);
 }
 
+int AppConfig::giftCollectionsLimit() const {
+	return get<int>(u"stargifts_collections_limit"_q, 10);
+}
+
+int AppConfig::giftCollectionGiftsLimit() const {
+	return get<int>(u"stargifts_collection_gifts_limit"_q, 500);
+}
+
 bool AppConfig::callsDisabledForSession() const {
 	const auto authorizations = _account->sessionExists()
 		? &_account->session().api().authorizations()
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index c5ba22ee40..7dc2205d1a 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -78,6 +78,8 @@ public:
 	[[nodiscard]] int paidMessageChannelStarsDefault() const;
 
 	[[nodiscard]] int pinnedGiftsLimit() const;
+	[[nodiscard]] int giftCollectionsLimit() const;
+	[[nodiscard]] int giftCollectionGiftsLimit() const;
 
 	[[nodiscard]] bool callsDisabledForSession() const;
 	[[nodiscard]] int confcallSizeLimit() const;

From a7fe004344244da59a673b8b43927b84245781fb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Jul 2025 14:03:52 +0400
Subject: [PATCH 042/341] Load collections, request gifts in them.

---
 Telegram/Resources/langs/lang.strings         |   1 -
 Telegram/SourceFiles/data/data_star_gift.h    |   8 +
 .../data/stickers/data_custom_emoji.cpp       |   5 +-
 .../info_peer_gifts_collections.cpp           |   2 +-
 .../peer_gifts/info_peer_gifts_widget.cpp     | 323 +++++++++++++-----
 Telegram/SourceFiles/ui/controls/sub_tabs.cpp | 239 +++++++++++++
 Telegram/SourceFiles/ui/controls/sub_tabs.h   |  77 +++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 8 files changed, 577 insertions(+), 80 deletions(-)
 create mode 100644 Telegram/SourceFiles/ui/controls/sub_tabs.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/sub_tabs.h

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2e049a9692..ba03b8f6c4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3767,7 +3767,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_collection_limit_text" = "Please remove one of the existing collections to add a new one.";
 "lng_gift_collection_delete" = "Delete Collection";
 "lng_gift_collection_add_to" = "Add to Collection";
-"lng_gift_collection_reorder" = "Reorder";
 
 "lng_accounts_limit_title" = "Limit Reached";
 "lng_accounts_limit1#one" = "You have reached the limit of **{count}** connected account.";
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index 8b53bd5581..89650f31f6 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -150,4 +150,12 @@ struct SavedStarGift {
 	bool mine = false;
 };
 
+struct GiftCollection {
+	int id = 0;
+	int count = 0;
+	QString title;
+	DocumentData *icon = nullptr;
+	uint64 hash = 0;
+};
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index eb34f30dfb..ff551f225e 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -1108,7 +1108,10 @@ TextWithEntities SingleCustomEmoji(DocumentId id) {
 }
 
 TextWithEntities SingleCustomEmoji(not_null<DocumentData*> document) {
-	return SingleCustomEmoji(document->id);
+	const auto sticker = document->sticker();
+	return Ui::Text::SingleCustomEmoji(
+		SerializeCustomEmojiId(document),
+		sticker ? sticker->alt : QString());
 }
 
 bool AllowEmojiWithoutPremium(
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index 2b66c8a78b..d1b49aa49b 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -7,7 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/peer_gifts/info_peer_gifts_collections.h"
 
-#include "api/api_credits.h" //
+#include "api/api_credits.h"
 #include "apiwrap.h"
 #include "data/data_peer.h"
 #include "data/data_star_gift.h"
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 73bd98c99a..773d51ef5b 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -7,9 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/peer_gifts/info_peer_gifts_widget.h"
 
+#include "api/api_hash.h"
 #include "api/api_premium.h"
 #include "apiwrap.h"
 #include "boxes/star_gift_box.h"
+#include "core/ui_integration.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_channel.h"
 #include "data/data_credits.h"
 #include "data/data_session.h"
@@ -17,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/peer_gifts/info_peer_gifts_collections.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/info_controller.h"
+#include "ui/controls/sub_tabs.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
@@ -61,6 +65,28 @@ constexpr auto kPerPage = 50;
 	};
 }
 
+[[nodiscard]] std::vector<Data::GiftCollection> FromTL(
+		not_null<Main::Session*> session,
+		const MTPDpayments_starGiftCollections &data) {
+	auto result = std::vector<Data::GiftCollection>();
+
+	const auto &list = data.vcollections().v;
+	result.reserve(list.size());
+	for (const auto &collection : list) {
+		const auto &data = collection.data();
+		result.push_back({
+			.id = data.vcollection_id().v,
+			.count = data.vgifts_count().v,
+			.title = qs(data.vtitle()),
+			.icon = (data.vicon()
+				? session->data().processDocument(*data.vicon()).get()
+				: nullptr),
+			.hash = data.vhash().v,
+		});
+	}
+	return result;
+}
+
 } // namespace
 
 class InnerWidget final : public Ui::BoxContentDivider {
@@ -92,6 +118,11 @@ private:
 		Data::SavedStarGift gift;
 		GiftDescriptor descriptor;
 	};
+	struct Entries {
+		std::vector<Entry> list;
+		int total = 0;
+		bool allLoaded = false;
+	};
 	struct View {
 		std::unique_ptr<GiftButton> button;
 		Data::SavedStarGiftId manageId;
@@ -105,12 +136,15 @@ private:
 	void paintEvent(QPaintEvent *e) override;
 
 	void subscribeToUpdates();
+	void loadCollections();
 	void loadMore();
+	void loaded(const MTPpayments_SavedStarGifts &result);
 	void refreshButtons();
 	void validateButtons();
 	void showGift(int index);
 	void showMenuFor(not_null<GiftButton*> button, QPoint point);
 	void refreshAbout();
+	void refreshCollectionsTabs();
 
 	void markPinned(std::vector<Entry>::iterator i);
 	void markUnpinned(std::vector<Entry>::iterator i);
@@ -122,20 +156,28 @@ private:
 
 	const not_null<Window::SessionController*> _window;
 	rpl::variable<Filter> _filter;
+	rpl::variable<int> _collectionId;
 	Delegate _delegate;
-	not_null<Controller*> _controller;
+	const not_null<Controller*> _controller;
+	std::unique_ptr<Ui::SubTabs> _collectionsTabs;
 	std::unique_ptr<Ui::FlatLabel> _about;
 	const not_null<PeerData*> _peer;
-	std::vector<Entry> _entries;
-	int _totalCount = 0;
 	rpl::event_stream<> _scrollToTop;
 
+	std::vector<Data::GiftCollection> _collections;
+
+	Entries _all;
+	base::flat_map<int, Entries> _perCollection;
+	not_null<Entries*> _entries;
+	not_null<std::vector<Entry>*> _list;
+
 	MTP::Sender _api;
 	mtpRequestId _loadMoreRequestId = 0;
+	Fn<void()> _collectionsLoadedCallback;
 	QString _offset;
-	bool _allLoaded = false;
 	bool _reloading = false;
 	bool _aboutFiltered = false;
+	bool _collectionsLoaded = false;
 
 	rpl::event_stream<> _resetFilterRequests;
 	rpl::event_stream<bool> _notifyEnabled;
@@ -165,7 +207,9 @@ InnerWidget::InnerWidget(
 , _delegate(&_window->session(), GiftButtonMode::Minimal)
 , _controller(controller)
 , _peer(peer)
-, _totalCount(_peer->peerGiftsCount())
+, _all({ .total = _peer->peerGiftsCount() })
+, _entries(&_all)
+, _list(&_entries->list)
 , _api(&_peer->session().mtp()) {
 	_singleMin = _delegate.buttonSize();
 
@@ -173,13 +217,54 @@ InnerWidget::InnerWidget(
 		subscribeToUpdates();
 	}
 
+	loadCollections();
+
 	_filter.value() | rpl::start_with_next([=] {
 		_reloading = true;
 		_api.request(base::take(_loadMoreRequestId)).cancel();
-		_allLoaded = false;
+		_collectionsLoadedCallback = nullptr;
+		_entries->allLoaded = false;
 		refreshAbout();
 		loadMore();
 	}, lifetime());
+
+	_collectionId.changes() | rpl::start_with_next([=](int now) {
+		_reloading = true;
+		_api.request(base::take(_loadMoreRequestId)).cancel();
+		_collectionsLoadedCallback = nullptr;
+		_entries = now ? &_perCollection[now] : &_all;
+		_list = &_entries->list;
+		refreshAbout();
+		if (_entries->allLoaded) {
+			refreshButtons();
+		} else {
+			loadMore();
+		}
+	}, lifetime());
+}
+
+void InnerWidget::loadCollections() {
+	_api.request(MTPpayments_GetStarGiftCollections(
+		_peer->input,
+		MTP_long(Api::CountHash(_collections
+			| ranges::views::transform(&Data::GiftCollection::hash)))
+	)).done([=](const MTPpayments_StarGiftCollections &result) {
+		result.match([&](const MTPDpayments_starGiftCollections &data) {
+			_collections = FromTL(&_window->session(), data);
+
+			refreshCollectionsTabs();
+		}, [&](const MTPDpayments_starGiftCollectionsNotModified &) {
+		});
+		_collectionsLoaded = true;
+		if (const auto onstack = base::take(_collectionsLoadedCallback)) {
+			onstack();
+		}
+	}).fail([=] {
+		_collectionsLoaded = true;
+		if (const auto onstack = base::take(_collectionsLoadedCallback)) {
+			onstack();
+		}
+	}).send();
 }
 
 void InnerWidget::subscribeToUpdates() {
@@ -194,19 +279,19 @@ void InnerWidget::subscribeToUpdates() {
 				: QString();
 		};
 		const auto i = update.id
-			? ranges::find(_entries, update.id, savedId)
-			: ranges::find(_entries, update.slug, bySlug);
-		if (i == end(_entries)) {
+			? ranges::find(*_list, update.id, savedId)
+			: ranges::find(*_list, update.slug, bySlug);
+		if (i == end(*_list)) {
 			return;
 		}
-		const auto index = int(i - begin(_entries));
+		const auto index = int(i - begin(*_list));
 		using Action = Data::GiftUpdate::Action;
 		if (update.action == Action::Convert
 			|| update.action == Action::Transfer
 			|| update.action == Action::Delete) {
-			_entries.erase(i);
-			if (_totalCount > 0) {
-				--_totalCount;
+			_list->erase(i);
+			if (_entries->total > 0) {
+				--_entries->total;
 			}
 			for (auto &view : _views) {
 				if (view.index >= index) {
@@ -256,7 +341,7 @@ void InnerWidget::subscribeToUpdates() {
 }
 
 void InnerWidget::markPinned(std::vector<Entry>::iterator i) {
-	const auto index = int(i - begin(_entries));
+	const auto index = int(i - begin(*_list));
 
 	i->gift.pinned = true;
 	v::match(i->descriptor, [](const GiftTypePremium &) {
@@ -264,13 +349,13 @@ void InnerWidget::markPinned(std::vector<Entry>::iterator i) {
 		data.pinned = true;
 	});
 	if (index) {
-		std::rotate(begin(_entries), i, i + 1);
+		std::rotate(begin(*_list), i, i + 1);
 	}
-	auto unpin = end(_entries);
+	auto unpin = end(*_list);
 	const auto session = &_window->session();
 	const auto limit = session->appConfig().pinnedGiftsLimit();
-	if (limit < _entries.size()) {
-		const auto j = begin(_entries) + limit;
+	if (limit < _list->size()) {
+		const auto j = begin(*_list) + limit;
 		if (j->gift.pinned) {
 			unpin = j;
 		}
@@ -281,13 +366,13 @@ void InnerWidget::markPinned(std::vector<Entry>::iterator i) {
 			view.manageId = {};
 		}
 	}
-	if (unpin != end(_entries)) {
+	if (unpin != end(_entries->list)) {
 		markUnpinned(unpin);
 	}
 }
 
 void InnerWidget::markUnpinned(std::vector<Entry>::iterator i) {
-	const auto index = int(i - begin(_entries));
+	const auto index = int(i - begin(*_list));
 
 	i->gift.pinned = false;
 	v::match(i->descriptor, [](const GiftTypePremium &) {
@@ -295,19 +380,19 @@ void InnerWidget::markUnpinned(std::vector<Entry>::iterator i) {
 		data.pinned = false;
 	});
 	auto after = index + 1;
-	for (auto j = i + 1; j != end(_entries); ++j) {
+	for (auto j = i + 1; j != end(*_list); ++j) {
 		if (!j->gift.pinned && j->gift.date <= i->gift.date) {
 			break;
 		}
 		++after;
 	}
-	if (after == _entries.size() && !_allLoaded) {
+	if (after == _list->size() && !_entries->allLoaded) {
 		// We don't know if the correct position is exactly in the end
 		// of the loaded part or later, so we hide it for now, let it
 		// be loaded later while scrolling.
-		_entries.erase(i);
+		_list->erase(i);
 	} else if (after > index + 1) {
-		std::rotate(i, i + 1, begin(_entries) + after);
+		std::rotate(i, i + 1, begin(*_list) + after);
 	}
 	for (auto &view : _views) {
 		if (view.index >= index) {
@@ -344,69 +429,85 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 }
 
 void InnerWidget::loadMore() {
-	if (_allLoaded || _loadMoreRequestId) {
+	if (_entries->allLoaded || _loadMoreRequestId) {
 		return;
 	}
 	using Flag = MTPpayments_GetSavedStarGifts::Flag;
 	const auto filter = _filter.current();
-	const auto collectionId = 0;
+	const auto collectionId = _collectionId.current();
 	_loadMoreRequestId = _api.request(MTPpayments_GetSavedStarGifts(
 		MTP_flags((filter.sortByValue ? Flag::f_sort_by_value : Flag())
 			| (filter.skipLimited ? Flag::f_exclude_limited : Flag())
 			| (filter.skipUnlimited ? Flag::f_exclude_unlimited : Flag())
 			| (filter.skipUnique ? Flag::f_exclude_unique : Flag())
 			| (filter.skipSaved ? Flag::f_exclude_saved : Flag())
-			| (filter.skipUnsaved ? Flag::f_exclude_unsaved : Flag())),
+			| (filter.skipUnsaved ? Flag::f_exclude_unsaved : Flag())
+			| (collectionId ? Flag::f_collection_id : Flag())),
 		_peer->input,
 		MTP_int(collectionId),
 		MTP_string(_reloading ? QString() : _offset),
 		MTP_int(kPerPage)
 	)).done([=](const MTPpayments_SavedStarGifts &result) {
-		_loadMoreRequestId = 0;
 		const auto &data = result.data();
-		if (const auto enabled = data.vchat_notifications_enabled()) {
-			_notifyEnabled.fire(mtpIsTrue(*enabled));
-		}
-		if (const auto next = data.vnext_offset()) {
-			_offset = qs(*next);
-		} else {
-			_allLoaded = true;
-		}
-		if (!filter.skipsSomething()) {
-			_totalCount = data.vcount().v;
-		}
 
 		const auto owner = &_peer->owner();
 		owner->processUsers(data.vusers());
 		owner->processChats(data.vchats());
 
-		if (base::take(_reloading)) {
-			_entries.clear();
-		}
-		_entries.reserve(_entries.size() + data.vgifts().v.size());
-		auto hasUnique = false;
-		for (const auto &gift : data.vgifts().v) {
-			if (auto parsed = Api::FromTL(_peer, gift)) {
-				auto descriptor = DescriptorForGift(_peer, *parsed);
-				_entries.push_back({
-					.gift = std::move(*parsed),
-					.descriptor = std::move(descriptor),
-				});
-				hasUnique = (parsed->info.unique != nullptr);
-			}
-		}
-		refreshButtons();
-		refreshAbout();
-
-		if (hasUnique) {
-			Ui::PreloadUniqueGiftResellPrices(&_peer->session());
+		if (_collectionsLoaded) {
+			loaded(result);
+		} else {
+			_collectionsLoadedCallback = [=] {
+				loaded(result);
+			};
 		}
 	}).fail([=] {
 		_loadMoreRequestId = 0;
-		_allLoaded = true;
+		_collectionsLoadedCallback = nullptr;
+		_entries->allLoaded = true;
 	}).send();
 }
 
+void InnerWidget::loaded(const MTPpayments_SavedStarGifts &result) {
+	const auto &data = result.data();
+
+	_loadMoreRequestId = 0;
+	_collectionsLoadedCallback = nullptr;
+	if (const auto enabled = data.vchat_notifications_enabled()) {
+		_notifyEnabled.fire(mtpIsTrue(*enabled));
+	}
+	if (const auto next = data.vnext_offset()) {
+		_offset = qs(*next);
+	} else {
+		_entries->allLoaded = true;
+	}
+	if (!_filter.current().skipsSomething()) {
+		_entries->total = data.vcount().v;
+	}
+
+	if (base::take(_reloading)) {
+		_list->clear();
+	}
+	_list->reserve(_list->size() + data.vgifts().v.size());
+	auto hasUnique = false;
+	for (const auto &gift : data.vgifts().v) {
+		if (auto parsed = Api::FromTL(_peer, gift)) {
+			auto descriptor = DescriptorForGift(_peer, *parsed);
+			_list->push_back({
+				.gift = std::move(*parsed),
+				.descriptor = std::move(descriptor),
+			});
+			hasUnique = (parsed->info.unique != nullptr);
+		}
+	}
+	refreshButtons();
+	refreshAbout();
+
+	if (hasUnique) {
+		Ui::PreloadUniqueGiftResellPrices(&_peer->session());
+	}
+}
+
 void InnerWidget::refreshButtons() {
 	_viewsForWidth = 0;
 	_viewsFromRow = 0;
@@ -420,7 +521,9 @@ void InnerWidget::validateButtons() {
 		return;
 	}
 	const auto padding = st::giftBoxPadding;
-	const auto vskip = padding.bottom();
+	const auto vskip = _collectionsTabs
+		? (padding.top() + _collectionsTabs->height() + padding.top())
+		: padding.bottom();
 	const auto row = _single.height() + st::giftBoxGiftSkip.y();
 	const auto fromRow = std::max(_visibleFrom - vskip, 0) / row;
 	const auto tillRow = (_visibleTill - vskip + row - 1) / row;
@@ -448,9 +551,9 @@ void InnerWidget::validateButtons() {
 		for (auto j = row; j != tillRow; ++j) {
 			for (auto i = column; i != _perRow; ++i) {
 				const auto index = j * _perRow + i;
-				if (index >= _entries.size()) {
+				if (index >= _list->size()) {
 					return false;
-				} else if (_entries[index].gift.info.id == giftId) {
+				} else if ((*_list)[index].gift.info.id == giftId) {
 					return true;
 				}
 			}
@@ -460,12 +563,12 @@ void InnerWidget::validateButtons() {
 	};
 	const auto add = [&](int column, int row) {
 		const auto index = row * _perRow + column;
-		if (index >= _entries.size()) {
+		if (index >= _list->size()) {
 			return false;
 		}
-		const auto giftId = _entries[index].gift.info.id;
-		const auto manageId = _entries[index].gift.manageId;
-		const auto &descriptor = _entries[index].descriptor;
+		const auto giftId = (*_list)[index].gift.info.id;
+		const auto manageId = (*_list)[index].gift.manageId;
+		const auto &descriptor = (*_list)[index].descriptor;
 		const auto already = ranges::find(_views, giftId, &View::giftId);
 		if (already != end(_views)) {
 			views.push_back(base::take(*already));
@@ -520,7 +623,7 @@ auto InnerWidget::pinnedSavedGifts()
 		std::shared_ptr<Data::UniqueGift> unique;
 	};
 	auto entries = std::vector<Entry>();
-	for (const auto &entry : _entries) {
+	for (const auto &entry : *_list) {
 		if (entry.gift.pinned) {
 			Assert(entry.gift.info.unique != nullptr);
 			entries.push_back({
@@ -566,7 +669,7 @@ void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
 
 	auto entry = ::Settings::SavedStarGiftEntry(
 		_peer,
-		_entries[index].gift);
+		(*_list)[index].gift);
 	entry.pinnedSavedGifts = pinnedSavedGifts();
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
 	::Settings::FillSavedStarGiftMenu(
@@ -581,27 +684,27 @@ void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
 }
 
 void InnerWidget::showGift(int index) {
-	Expects(index >= 0 && index < _entries.size());
+	Expects(index >= 0 && index < _list->size());
 
 	_window->show(Box(
 		::Settings::SavedStarGiftBox,
 		_window,
 		_peer,
-		_entries[index].gift,
+		(*_list)[index].gift,
 		pinnedSavedGifts()));
 }
 
 void InnerWidget::refreshAbout() {
 	const auto filter = _filter.current();
-	const auto filteredEmpty = _allLoaded
-		&& _entries.empty()
+	const auto filteredEmpty = _entries->allLoaded
+		&& _list->empty()
 		&& filter.skipsSomething();
 
 	if (filteredEmpty) {
 		auto text = tr::lng_peer_gifts_empty_search(
 			tr::now,
 			Ui::Text::RichLangValue);
-		if (_totalCount > 0) {
+		if (_entries->total > 0) {
 			text.append("\n\n").append(Ui::Text::Link(
 				tr::lng_peer_gifts_view_all(tr::now)));
 		}
@@ -621,7 +724,7 @@ void InnerWidget::refreshAbout() {
 		_aboutFiltered = false;
 	}
 
-	if (!_peer->isSelf() && _peer->canManageGifts() && !_entries.empty()) {
+	if (!_peer->isSelf() && _peer->canManageGifts() && !_list->empty()) {
 		if (_about) {
 			_about = nullptr;
 			resizeToWidth(width());
@@ -641,16 +744,82 @@ void InnerWidget::refreshAbout() {
 	}
 }
 
+void InnerWidget::refreshCollectionsTabs() {
+	if (_collections.empty()) {
+		if (base::take(_collectionsTabs)) {
+			resizeToWidth(width());
+		}
+		return;
+	}
+	auto tabs = std::vector<Ui::SubTabs::Tab>();
+	tabs.push_back({
+		.id = u"all"_q,
+		.text = tr::lng_gift_stars_tabs_all(tr::now, Ui::Text::WithEntities),
+	});
+	for (const auto &collection : _collections) {
+		auto title = TextWithEntities();
+		if (collection.icon) {
+			title.append(
+				Data::SingleCustomEmoji(collection.icon)
+			).append(' ');
+		}
+		title.append(collection.title);
+		tabs.push_back({
+			.id = QString::number(collection.id),
+			.text = std::move(title),
+		});
+	}
+	tabs.push_back({
+		.id = u"add"_q,
+		.text = { '+' + tr::lng_gift_collection_add(tr::now) },
+	});
+	const auto context = Core::TextContext({
+		.session = &_controller->session(),
+	});
+	if (!_collectionsTabs) {
+		_collectionsTabs = std::make_unique<Ui::SubTabs>(
+			this,
+			Ui::SubTabs::Options{ .selected = u"all"_q, .centered = true},
+			std::move(tabs),
+			context);
+		_collectionsTabs->show();
+
+		_collectionsTabs->activated(
+		) | rpl::start_with_next([=](const QString &id) {
+			if (id == u"add"_q) {
+				_controller->uiShow()->show(Box(
+					NewCollectionBox,
+					_controller,
+					peer(),
+					Data::SavedStarGiftId()));
+			} else {
+				_collectionsTabs->setActiveTab(id);
+				_collectionId = (id == u"all"_q) ? 0 : id.toInt();
+			}
+		}, _collectionsTabs->lifetime());
+	} else {
+		_collectionsTabs->setTabs(std::move(tabs), context);
+	}
+	resizeToWidth(width());
+}
+
 int InnerWidget::resizeGetHeight(int width) {
-	const auto count = int(_entries.size());
 	const auto padding = st::giftBoxPadding;
+	auto top = padding.top();
+	if (_collectionsTabs) {
+		_collectionsTabs->resizeToWidth(width);
+		_collectionsTabs->move(0, top);
+		top += _collectionsTabs->height() + padding.top();
+	}
+
+	const auto count = int(_list->size());
 	const auto available = width - padding.left() - padding.right();
 	const auto skipw = st::giftBoxGiftSkip.x();
 	_perRow = std::min(
 		(available + skipw) / (_singleMin.width() + skipw),
 		std::max(count, 1));
 	if (!_perRow) {
-		return 0;
+		return (top == padding.top()) ? 0 : top;
 	}
 	const auto singlew = std::min(
 		((available + skipw) / _perRow) - skipw,
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
new file mode 100644
index 0000000000..88d5c4b2fd
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
@@ -0,0 +1,239 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/sub_tabs.h"
+
+#include "ui/painter.h"
+#include "ui/ui_utility.h"
+#include "styles/style_basic.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_credits.h"
+
+#include <QApplication>
+
+namespace Ui {
+
+SubTabs::SubTabs(
+	QWidget *parent,
+	Options options,
+	std::vector<Tab> tabs,
+	Text::MarkedContext context)
+: RpWidget(parent)
+, _centered(options.centered) {
+	setMouseTracking(true);
+	setTabs(std::move(tabs), context);
+	if (!options.selected.isEmpty()) {
+		setActiveTab(options.selected);
+	}
+}
+
+void SubTabs::setTabs(
+		std::vector<Tab> tabs,
+		Text::MarkedContext context) {
+	auto x = st::giftBoxTabsMargin.left();
+	auto y = st::giftBoxTabsMargin.top();
+
+	setSelected(-1);
+	_buttons.resize(tabs.size());
+	const auto padding = st::giftBoxTabPadding;
+	auto activeId = (_active >= 0
+		&& ranges::contains(tabs, _buttons[_active].tab.id, &Tab::id))
+		? _buttons[_active].tab.id
+		: QString();
+	_active = -1;
+	context.repaint = [=] { update(); };
+	for (auto i = 0, count = int(tabs.size()); i != count; ++i) {
+		auto &tab = tabs[i];
+		Assert(!tab.id.isEmpty());
+
+		auto &button = _buttons[i];
+		button.active = (tab.id == activeId);
+		if (button.tab != tab) {
+			button.text = Text::String();
+			button.text.setMarkedText(
+				st::semiboldTextStyle,
+				tab.text,
+				kMarkupTextOptions,
+				context);
+			button.tab = std::move(tab);
+		}
+		if (button.active) {
+			_active = i;
+		}
+		const auto width = button.text.maxWidth();
+		const auto height = st::giftBoxTabStyle.font->height;
+		const auto r = QRect(0, 0, width, height).marginsAdded(padding);
+		button.geometry = QRect(QPoint(x, y), r.size());
+		x += r.width() + st::giftBoxTabSkip;
+	}
+	const auto width = x
+		- st::giftBoxTabSkip
+		+ st::giftBoxTabsMargin.right();
+	_fullWidth = width;
+	resizeToWidth(this->width());
+	update();
+}
+
+void SubTabs::setActiveTab(const QString &id) {
+	if (id.isEmpty()) {
+		setActive(-1);
+		return;
+	}
+	const auto i = ranges::find(
+		_buttons,
+		id,
+		[](const Button &button) { return button.tab.id; });
+	Assert(i != end(_buttons));
+	setActive(i - begin(_buttons));
+}
+
+rpl::producer<QString> SubTabs::activated() const {
+	return _activated.events();
+}
+
+void SubTabs::setSelected(int index) {
+	const auto was = (_selected >= 0);
+	const auto now = (index >= 0);
+	_selected = index;
+	if (was != now) {
+		setCursor(now ? style::cur_pointer : style::cur_default);
+	}
+}
+
+void SubTabs::setActive(int index) {
+	const auto was = _active;
+	if (was == index) {
+		return;
+	}
+	if (was >= 0 && was < _buttons.size()) {
+		_buttons[was].active = false;
+	}
+	_active = index;
+	_buttons[index].active = true;
+	update();
+}
+
+int SubTabs::resizeGetHeight(int newWidth) {
+	if (_centered) {
+		update();
+		const auto fullWidth = _fullWidth;
+		_fullShift = (fullWidth < newWidth) ? (newWidth - fullWidth) / 2 : 0;
+	}
+	_scrollMax = (_fullWidth > newWidth) ? (_fullWidth - newWidth) : 0;
+	return _buttons.empty()
+		? 0
+		: (st::giftBoxTabsMargin.top()
+			+ _buttons.back().geometry.height()
+			+ st::giftBoxTabsMargin.bottom());
+}
+
+bool SubTabs::eventHook(QEvent *e) {
+	if (e->type() == QEvent::Leave) {
+		setSelected(-1);
+	}
+	return RpWidget::eventHook(e);
+}
+
+void SubTabs::mouseMoveEvent(QMouseEvent *e) {
+	const auto mousex = e->pos().x();
+	const auto drag = QApplication::startDragDistance();
+	if (_dragx > 0) {
+		_scroll = std::clamp(
+			_dragscroll + _dragx - mousex,
+			0.,
+			_scrollMax * 1.);
+		update();
+		return;
+	} else if (_pressx > 0 && std::abs(_pressx - mousex) > drag) {
+		_dragx = _pressx;
+		_dragscroll = _scroll;
+	}
+	auto selected = -1;
+	const auto position = e->pos() + scroll();
+	for (auto i = 0, c = int(_buttons.size()); i != c; ++i) {
+		if (_buttons[i].geometry.contains(position)) {
+			selected = i;
+			break;
+		}
+	}
+	setSelected(selected);
+}
+
+void SubTabs::wheelEvent(QWheelEvent *e) {
+	_scroll = std::clamp(_scroll - ScrollDeltaF(e).x(), 0., _scrollMax * 1.);
+	update();
+}
+
+void SubTabs::mousePressEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	_pressed = _selected;
+	_pressx = e->pos().x();
+}
+
+void SubTabs::mouseReleaseEvent(QMouseEvent *e) {
+	if (e->button() != Qt::LeftButton) {
+		return;
+	}
+	const auto dragx = std::exchange(_dragx, 0);
+	const auto pressed = std::exchange(_pressed, -1);
+	_pressx = 0;
+	if (!dragx
+		&& pressed >= 0
+		&& _selected == pressed
+		&& pressed < _buttons.size()) {
+		_activated.fire_copy(_buttons[pressed].tab.id);
+	}
+}
+
+void SubTabs::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto padding = st::giftBoxTabPadding;
+	const auto shift = -scroll();
+	for (const auto &button : _buttons) {
+		const auto geometry = button.geometry.translated(shift);
+		if (button.active) {
+			p.setBrush(st::giftBoxTabBgActive);
+			p.setPen(Qt::NoPen);
+			const auto radius = geometry.height() / 2.;
+			p.drawRoundedRect(geometry, radius, radius);
+			p.setPen(st::giftBoxTabFgActive);
+		} else {
+			p.setPen(st::giftBoxTabFg);
+		}
+		button.text.draw(p, {
+			.position = geometry.marginsRemoved(padding).topLeft(),
+			.availableWidth = button.text.maxWidth(),
+		});
+	}
+	if (_fullWidth > width()) {
+		const auto &icon = st::defaultEmojiSuggestions;
+		const auto w = icon.fadeRight.width();
+		const auto &c = st::boxDividerBg->c;
+		const auto r = QRect(0, 0, w, height());
+		const auto s = std::abs(float64(shift.x()));
+		constexpr auto kF = 0.5;
+		const auto opacityRight = (_scrollMax - s)
+			/ (icon.fadeRight.width() * kF);
+		p.setOpacity(std::clamp(std::abs(opacityRight), 0., 1.));
+		icon.fadeRight.fill(p, r.translated(width() - w, 0), c);
+
+		const auto opacityLeft = s / (icon.fadeLeft.width() * kF);
+		p.setOpacity(std::clamp(std::abs(opacityLeft), 0., 1.));
+		icon.fadeLeft.fill(p, r, c);
+	}
+
+}
+
+QPoint SubTabs::scroll() const {
+	return QPoint(int(base::SafeRound(_scroll)) - _fullShift, 0);
+}
+
+} // namespace Ui
+
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.h b/Telegram/SourceFiles/ui/controls/sub_tabs.h
new file mode 100644
index 0000000000..d5403c3547
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.h
@@ -0,0 +1,77 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+
+class SubTabs : public RpWidget {
+public:
+	struct Options {
+		QString selected;
+		bool centered = false;
+	};
+	struct Tab {
+		QString id;
+		TextWithEntities text;
+
+		friend inline bool operator==(const Tab &, const Tab &) = default;
+	};
+
+	explicit SubTabs(
+		QWidget *parent,
+		Options options = {},
+		std::vector<Tab> tabs = {},
+		Text::MarkedContext context = {});
+
+	void setTabs(
+		std::vector<Tab> tabs,
+		Text::MarkedContext context = {});
+
+	void setActiveTab(const QString &id);
+
+	[[nodiscard]] rpl::producer<QString> activated() const;
+
+private:
+	struct Button {
+		Tab tab;
+		QRect geometry;
+		Text::String text;
+		bool active = false;
+	};
+
+	int resizeGetHeight(int newWidth) override;
+	void wheelEvent(QWheelEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+	void mousePressEvent(QMouseEvent *e) override;
+	void mouseReleaseEvent(QMouseEvent *e) override;
+	void paintEvent(QPaintEvent *e) override;
+	bool eventHook(QEvent *e) override;
+
+	void setSelected(int index);
+	void setActive(int index);
+	[[nodiscard]] QPoint scroll() const;
+
+	std::vector<Button> _buttons;
+	rpl::event_stream<QString> _activated;
+	int _dragx = 0;
+	int _pressx = 0;
+	float64 _dragscroll = 0.;
+	float64 _scroll = 0.;
+	int _scrollMax = 0;
+	int _fullShift = 0;
+	int _fullWidth = 0;
+	int _selected = -1;
+	int _pressed = -1;
+	int _active = -1;
+	bool _centered = false;
+
+};
+
+} // namespace Ui
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index b625012c04..bd52902889 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -392,6 +392,8 @@ PRIVATE
     ui/controls/stars_rating.h
     ui/controls/subsection_tabs_slider.cpp
     ui/controls/subsection_tabs_slider.h
+    ui/controls/sub_tabs.cpp
+    ui/controls/sub_tabs.h
     ui/controls/swipe_handler.cpp
     ui/controls/swipe_handler.h
     ui/controls/swipe_handler_data.h

From a81b9344cfc8e2248e4de76f54e2f2d9dbd16461 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 18 Jul 2025 23:07:43 +0400
Subject: [PATCH 043/341] Update API scheme on layer 210.

---
 Telegram/SourceFiles/api/api_premium.cpp      |   5 +
 Telegram/SourceFiles/data/data_star_gift.h    |   1 +
 Telegram/SourceFiles/info/info.style          |   8 +
 .../info_peer_gifts_collections.cpp           |   6 +-
 .../peer_gifts/info_peer_gifts_collections.h  |   3 +-
 .../peer_gifts/info_peer_gifts_widget.cpp     | 353 +++++++++++++++---
 .../info/peer_gifts/info_peer_gifts_widget.h  |   2 +
 7 files changed, 330 insertions(+), 48 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 835f3a1c70..5354537879 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -917,6 +917,11 @@ std::optional<Data::SavedStarGift> FromTL(
 		.manageId = (to->isUser()
 			? Id::User(data.vmsg_id().value_or_empty())
 			: Id::Chat(to, data.vsaved_id().value_or_empty())),
+		.collectionIds = (data.vcollection_id()
+			? (data.vcollection_id()->v
+				| ranges::views::transform(&MTPint::v)
+				| ranges::to_vector)
+			: std::vector<int>()),
 		.message = (data.vmessage()
 			? TextWithEntities{
 				.text = qs(data.vmessage()->data().vtext()),
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index 89650f31f6..a44df148c2 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -138,6 +138,7 @@ private:
 struct SavedStarGift {
 	StarGift info;
 	SavedStarGiftId manageId;
+	std::vector<int> collectionIds;
 	TextWithEntities message;
 	int64 starsConverted = 0;
 	int64 starsUpgradedBySender = 0;
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 5e05950c2c..97024937f4 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1243,3 +1243,11 @@ collectionNameField: InputField(defaultInputField) {
 
 	heightMin: 36px;
 }
+collectionEmptyTitle: FlatLabel(boxTitle) {
+}
+collectionEmptyText: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+}
+collectionEmptyTitleMargin: margins(10px, 24px, 10px, 4px);
+collectionEmptyTextMargin: margins(10px, 4px, 10px, 12px);
+collectionEmptyAddMargin: margins(10px, 12px, 10px, 24px);
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index d1b49aa49b..c9c552814a 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -31,7 +31,8 @@ void NewCollectionBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer,
-		Data::SavedStarGiftId addId) {
+		Data::SavedStarGiftId addId,
+		Fn<void(MTPStarGiftCollection)> added) {
 	box->setTitle(tr::lng_gift_collection_new_title());
 
 	box->addRow(
@@ -77,6 +78,9 @@ void NewCollectionBox(
 			MTP_vector<MTPInputSavedStarGift>(ids)
 		)).done([=](const MTPStarGiftCollection &result) {
 			*creating = false;
+			if (const auto onstack = added) {
+				onstack(result);
+			}
 			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
index cbb18a28a8..a59a1cde0b 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
@@ -25,6 +25,7 @@ void NewCollectionBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Window::SessionNavigation*> navigation,
 	not_null<PeerData*> peer,
-	Data::SavedStarGiftId addId);
+	Data::SavedStarGiftId addId,
+	Fn<void(MTPStarGiftCollection)> added);
 
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 773d51ef5b..7c644c4005 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/peer_gifts/info_peer_gifts_widget.h"
 
+#include "api/api_credits.h"
 #include "api/api_hash.h"
 #include "api/api_premium.h"
 #include "apiwrap.h"
@@ -65,6 +66,21 @@ constexpr auto kPerPage = 50;
 	};
 }
 
+[[nodiscard]] Data::GiftCollection FromTL(
+		not_null<Main::Session*> session,
+		const MTPStarGiftCollection &collection) {
+	const auto &data = collection.data();
+	return {
+		.id = data.vcollection_id().v,
+		.count = data.vgifts_count().v,
+		.title = qs(data.vtitle()),
+		.icon = (data.vicon()
+			? session->data().processDocument(*data.vicon()).get()
+			: nullptr),
+		.hash = data.vhash().v,
+	};
+}
+
 [[nodiscard]] std::vector<Data::GiftCollection> FromTL(
 		not_null<Main::Session*> session,
 		const MTPDpayments_starGiftCollections &data) {
@@ -73,16 +89,7 @@ constexpr auto kPerPage = 50;
 	const auto &list = data.vcollections().v;
 	result.reserve(list.size());
 	for (const auto &collection : list) {
-		const auto &data = collection.data();
-		result.push_back({
-			.id = data.vcollection_id().v,
-			.count = data.vgifts_count().v,
-			.title = qs(data.vtitle()),
-			.icon = (data.vicon()
-				? session->data().processDocument(*data.vicon()).get()
-				: nullptr),
-			.hash = data.vhash().v,
-		});
+		result.push_back(FromTL(session, collection));
 	}
 	return result;
 }
@@ -95,7 +102,8 @@ public:
 		QWidget *parent,
 		not_null<Controller*> controller,
 		not_null<PeerData*> peer,
-		rpl::producer<Filter> filter);
+		rpl::producer<Filter> filter,
+		rpl::producer<int> addingToCollectionId);
 
 	[[nodiscard]] not_null<PeerData*> peer() const {
 		return _peer;
@@ -106,10 +114,16 @@ public:
 	[[nodiscard]] rpl::producer<> resetFilterRequests() const {
 		return _resetFilterRequests.events();
 	}
+	[[nodiscard]] rpl::producer<int> addToCollectionRequests() const {
+		return _addToCollectionRequests.events();
+	}
 	[[nodiscard]] rpl::producer<> scrollToTop() const {
 		return _scrollToTop.events();
 	}
 
+	void saveAdding();
+	void collectionAdded(MTPStarGiftCollection result);
+
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
@@ -120,6 +134,7 @@ private:
 	};
 	struct Entries {
 		std::vector<Entry> list;
+		Filter filter;
 		int total = 0;
 		bool allLoaded = false;
 	};
@@ -146,6 +161,8 @@ private:
 	void refreshAbout();
 	void refreshCollectionsTabs();
 
+	[[nodiscard]] int shownCollectionId() const;
+
 	void markPinned(std::vector<Entry>::iterator i);
 	void markUnpinned(std::vector<Entry>::iterator i);
 
@@ -157,10 +174,11 @@ private:
 	const not_null<Window::SessionController*> _window;
 	rpl::variable<Filter> _filter;
 	rpl::variable<int> _collectionId;
+	rpl::variable<int> _addingToCollectionId;
 	Delegate _delegate;
 	const not_null<Controller*> _controller;
 	std::unique_ptr<Ui::SubTabs> _collectionsTabs;
-	std::unique_ptr<Ui::FlatLabel> _about;
+	std::unique_ptr<Ui::RpWidget> _about;
 	const not_null<PeerData*> _peer;
 	rpl::event_stream<> _scrollToTop;
 
@@ -177,8 +195,10 @@ private:
 	QString _offset;
 	bool _reloading = false;
 	bool _aboutFiltered = false;
+	bool _aboutCollection = false;
 	bool _collectionsLoaded = false;
 
+	rpl::event_stream<int> _addToCollectionRequests;
 	rpl::event_stream<> _resetFilterRequests;
 	rpl::event_stream<bool> _notifyEnabled;
 	std::vector<View> _views;
@@ -200,10 +220,12 @@ InnerWidget::InnerWidget(
 	QWidget *parent,
 	not_null<Controller*> controller,
 	not_null<PeerData*> peer,
-	rpl::producer<Filter> filter)
+	rpl::producer<Filter> filter,
+	rpl::producer<int> addingToCollectionId)
 : BoxContentDivider(parent)
 , _window(controller->parentController())
 , _filter(std::move(filter))
+, _addingToCollectionId(std::move(addingToCollectionId))
 , _delegate(&_window->session(), GiftButtonMode::Minimal)
 , _controller(controller)
 , _peer(peer)
@@ -220,26 +242,47 @@ InnerWidget::InnerWidget(
 	loadCollections();
 
 	_filter.value() | rpl::start_with_next([=] {
+		_entries->allLoaded = false;
 		_reloading = true;
 		_api.request(base::take(_loadMoreRequestId)).cancel();
 		_collectionsLoadedCallback = nullptr;
-		_entries->allLoaded = false;
+		refreshButtons();
 		refreshAbout();
 		loadMore();
 	}, lifetime());
 
-	_collectionId.changes() | rpl::start_with_next([=](int now) {
+	_collectionId.changes() | rpl::start_with_next([=](int id) {
 		_reloading = true;
 		_api.request(base::take(_loadMoreRequestId)).cancel();
 		_collectionsLoadedCallback = nullptr;
-		_entries = now ? &_perCollection[now] : &_all;
+		_entries = id ? &_perCollection[id] : &_all;
 		_list = &_entries->list;
+		refreshButtons();
 		refreshAbout();
-		if (_entries->allLoaded) {
-			refreshButtons();
-		} else {
-			loadMore();
+		loadMore();
+	}, lifetime());
+
+	_addingToCollectionId.value(
+	) | rpl::combine_previous(
+	) | rpl::start_with_next([=](int previousId, int id) {
+		_reloading = true;
+		_api.request(base::take(_loadMoreRequestId)).cancel();
+		_collectionsLoadedCallback = nullptr;
+		if (!id) {
+			_collectionId = previousId;
 		}
+		_entries = id ? &_all : &_perCollection[previousId];
+		_list = &_entries->list;
+
+		if (_collectionsTabs) {
+			_collectionsTabs->setVisible(!id);
+		}
+
+		refreshAbout();
+		refreshButtons();
+		crl::on_main(this, [=] {
+			loadMore();
+		});
 	}, lifetime());
 }
 
@@ -428,13 +471,74 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	}
 }
 
+int InnerWidget::shownCollectionId() const {
+	return _addingToCollectionId.current()
+		? 0
+		: _collectionId.current();
+}
+
+void InnerWidget::saveAdding() {
+	using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+	auto add = QVector<MTPInputSavedStarGift>();
+	auto remove = QVector<MTPInputSavedStarGift>();
+	const auto id = _addingToCollectionId.current();
+	auto document = (DocumentData*)nullptr;
+	for (const auto &entry : (*_list)) {
+		if (ranges::contains(entry.gift.collectionIds, id)) {
+			if (!document) {
+				document = entry.gift.info.document;
+			}
+			add.push_back(Api::InputSavedStarGiftId(
+				entry.gift.manageId,
+				entry.gift.info.unique));
+		} else {
+			remove.push_back(Api::InputSavedStarGiftId(
+				entry.gift.manageId,
+				entry.gift.info.unique));
+		}
+	}
+	_window->session().api().request(MTPpayments_UpdateStarGiftCollection(
+		MTP_flags(Flag()
+			| (add.isEmpty() ? Flag() : Flag::f_add_stargift)
+			| (remove.isEmpty() ? Flag() : Flag::f_delete_stargift)),
+		_peer->input,
+		MTP_int(id),
+		MTPstring(),
+		MTP_vector<MTPInputSavedStarGift>(remove),
+		MTP_vector<MTPInputSavedStarGift>(add),
+		MTPVector<MTPInputSavedStarGift>()
+	)).done([=] {
+		_entries->allLoaded = false;
+		_reloading = true;
+		_api.request(base::take(_loadMoreRequestId)).cancel();
+		_collectionsLoadedCallback = nullptr;
+		refreshButtons();
+		refreshAbout();
+		loadMore();
+	}).fail([=](const MTP::Error &error) {
+		_window->showToast(error.type());
+	}).send();
+	_addToCollectionRequests.fire(0);
+
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i != end(_collections) && i->icon != document) {
+		i->icon = document;
+		refreshCollectionsTabs();
+	}
+}
+
+void InnerWidget::collectionAdded(MTPStarGiftCollection result) {
+	_collections.push_back(FromTL(&_window->session(), result));
+	refreshCollectionsTabs();
+}
+
 void InnerWidget::loadMore() {
 	if (_entries->allLoaded || _loadMoreRequestId) {
 		return;
 	}
 	using Flag = MTPpayments_GetSavedStarGifts::Flag;
 	const auto filter = _filter.current();
-	const auto collectionId = _collectionId.current();
+	const auto collectionId = shownCollectionId();
 	_loadMoreRequestId = _api.request(MTPpayments_GetSavedStarGifts(
 		MTP_flags((filter.sortByValue ? Flag::f_sort_by_value : Flag())
 			| (filter.skipLimited ? Flag::f_exclude_limited : Flag())
@@ -521,7 +625,7 @@ void InnerWidget::validateButtons() {
 		return;
 	}
 	const auto padding = st::giftBoxPadding;
-	const auto vskip = _collectionsTabs
+	const auto vskip = (_collectionsTabs && !_collectionsTabs->isHidden())
 		? (padding.top() + _collectionsTabs->height() + padding.top())
 		: padding.bottom();
 	const auto row = _single.height() + st::giftBoxGiftSkip.y();
@@ -542,7 +646,7 @@ void InnerWidget::validateButtons() {
 	const auto fullw = _perRow * (_single.width() + skipw) - skipw;
 	const auto left = padding.left() + (available - fullw) / 2;
 	const auto oneh = _single.height() + st::giftBoxGiftSkip.y();
-	const auto mode = GiftButton::Mode::Minimal;
+	const auto addingToId = _addingToCollectionId.current();
 	auto x = left;
 	auto y = vskip + fromRow * oneh;
 	auto views = std::vector<View>();
@@ -566,9 +670,11 @@ void InnerWidget::validateButtons() {
 		if (index >= _list->size()) {
 			return false;
 		}
-		const auto giftId = (*_list)[index].gift.info.id;
-		const auto manageId = (*_list)[index].gift.manageId;
-		const auto &descriptor = (*_list)[index].descriptor;
+		const auto &entry = (*_list)[index];
+		const auto &gift = entry.gift;
+		const auto giftId = gift.info.id;
+		const auto manageId = gift.manageId;
+		const auto &descriptor = entry.descriptor;
 		const auto already = ranges::find(_views, giftId, &View::giftId);
 		if (already != end(_views)) {
 			views.push_back(base::take(*already));
@@ -596,7 +702,9 @@ void InnerWidget::validateButtons() {
 		view.index = index;
 		view.manageId = manageId;
 		view.giftId = giftId;
-		view.button->setDescriptor(descriptor, mode);
+		view.button->toggleSelected(addingToId
+			&& ranges::contains(gift.collectionIds, addingToId));
+		view.button->setDescriptor(descriptor, GiftButton::Mode::Minimal);
 		view.button->setClickedCallback(callback);
 		return true;
 	};
@@ -686,6 +794,23 @@ void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
 void InnerWidget::showGift(int index) {
 	Expects(index >= 0 && index < _list->size());
 
+	if (const auto id = _addingToCollectionId.current()) {
+		auto &gift = (*_list)[index].gift;
+		const auto selected = ranges::contains(gift.collectionIds, id);
+		if (selected) {
+			gift.collectionIds.erase(
+				ranges::remove(gift.collectionIds, id),
+				end(gift.collectionIds));
+		} else {
+			gift.collectionIds.push_back(id);
+		}
+		const auto view = ranges::find(_views, index, &View::index);
+		if (view != end(_views)) {
+			view->button->toggleSelected(!selected);
+		}
+		return;
+	}
+
 	_window->show(Box(
 		::Settings::SavedStarGiftBox,
 		_window,
@@ -696,11 +821,54 @@ void InnerWidget::showGift(int index) {
 
 void InnerWidget::refreshAbout() {
 	const auto filter = _filter.current();
-	const auto filteredEmpty = _entries->allLoaded
+	const auto collectionEmpty = _collectionId.current()
+		&& _entries->allLoaded
+		&& !_entries->total
+		&& _list->empty();
+	const auto filteredEmpty = !collectionEmpty
+		&& _entries->allLoaded
 		&& _list->empty()
 		&& filter.skipsSomething();
 
-	if (filteredEmpty) {
+	if (collectionEmpty) {
+		const auto id = _collectionId.current();
+		auto about = std::make_unique<Ui::VerticalLayout>(this);
+		about->add(
+			object_ptr<Ui::CenterWrap<>>(
+				about.get(),
+				object_ptr<Ui::FlatLabel>(
+					about.get(),
+					tr::lng_gift_collection_empty_title(),
+					st::collectionEmptyTitle)),
+			st::collectionEmptyTitleMargin);
+		about->add(
+			object_ptr<Ui::CenterWrap<>>(
+				about.get(),
+				object_ptr<Ui::FlatLabel>(
+					about.get(),
+					tr::lng_gift_collection_empty_text(),
+					st::collectionEmptyText)),
+			st::collectionEmptyTextMargin);
+
+		const auto button = about->add(
+			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+				about.get(),
+				object_ptr<Ui::RoundButton>(
+					about.get(),
+					tr::lng_gift_collection_empty_button(),
+					st::defaultActiveButton)),
+			st::collectionEmptyAddMargin)->entity();
+		button->setTextTransform(
+			Ui::RoundButton::TextTransform::NoTransform);
+		button->setClickedCallback([=] {
+			_addToCollectionRequests.fire_copy(id);
+		});
+
+		about->show();
+		_about = std::move(about);
+		_aboutCollection = true;
+		resizeToWidth(width());
+	} else if (filteredEmpty) {
 		auto text = tr::lng_peer_gifts_empty_search(
 			tr::now,
 			Ui::Text::RichLangValue);
@@ -708,20 +876,22 @@ void InnerWidget::refreshAbout() {
 			text.append("\n\n").append(Ui::Text::Link(
 				tr::lng_peer_gifts_view_all(tr::now)));
 		}
-		_about = std::make_unique<Ui::FlatLabel>(
+		auto about = std::make_unique<Ui::FlatLabel>(
 			this,
 			rpl::single(text),
 			st::giftListAbout);
-		_about->setClickHandlerFilter([=](const auto &...) {
+		about->setClickHandlerFilter([=](const auto &...) {
 			_resetFilterRequests.fire({});
 			return false;
 		});
-		_about->show();
+		about->show();
+		_about = std::move(_about);
 		_aboutFiltered = true;
 		resizeToWidth(width());
-	} else if (_aboutFiltered) {
+	} else if (_aboutFiltered || _aboutCollection) {
 		_about = nullptr;
 		_aboutFiltered = false;
+		_aboutCollection = false;
 	}
 
 	if (!_peer->isSelf() && _peer->canManageGifts() && !_list->empty()) {
@@ -787,11 +957,15 @@ void InnerWidget::refreshCollectionsTabs() {
 		_collectionsTabs->activated(
 		) | rpl::start_with_next([=](const QString &id) {
 			if (id == u"add"_q) {
+				const auto added = [=](MTPStarGiftCollection result) {
+					collectionAdded(result);
+				};
 				_controller->uiShow()->show(Box(
 					NewCollectionBox,
 					_controller,
 					peer(),
-					Data::SavedStarGiftId()));
+					Data::SavedStarGiftId(),
+					added));
 			} else {
 				_collectionsTabs->setActiveTab(id);
 				_collectionId = (id == u"all"_q) ? 0 : id.toInt();
@@ -805,13 +979,6 @@ void InnerWidget::refreshCollectionsTabs() {
 
 int InnerWidget::resizeGetHeight(int width) {
 	const auto padding = st::giftBoxPadding;
-	auto top = padding.top();
-	if (_collectionsTabs) {
-		_collectionsTabs->resizeToWidth(width);
-		_collectionsTabs->move(0, top);
-		top += _collectionsTabs->height() + padding.top();
-	}
-
 	const auto count = int(_list->size());
 	const auto available = width - padding.left() - padding.right();
 	const auto skipw = st::giftBoxGiftSkip.x();
@@ -819,8 +986,16 @@ int InnerWidget::resizeGetHeight(int width) {
 		(available + skipw) / (_singleMin.width() + skipw),
 		std::max(count, 1));
 	if (!_perRow) {
-		return (top == padding.top()) ? 0 : top;
+		return 0;
 	}
+	auto result = 0;
+	if (_collectionsTabs && !_collectionsTabs->isHidden()) {
+		result += padding.top();
+		_collectionsTabs->resizeToWidth(width);
+		_collectionsTabs->move(0, result);
+		 result += _collectionsTabs->height();
+	}
+
 	const auto singlew = std::min(
 		((available + skipw) / _perRow) - skipw,
 		2 * _singleMin.width());
@@ -831,7 +1006,7 @@ int InnerWidget::resizeGetHeight(int width) {
 	const auto rows = (count + _perRow - 1) / _perRow;
 	const auto skiph = st::giftBoxGiftSkip.y();
 
-	auto result = rows
+	result += rows
 		? (padding.bottom() * 2 + rows * (singleh + skiph) - skiph)
 		: 0;
 
@@ -889,7 +1064,12 @@ Widget::Widget(
 	not_null<PeerData*> peer)
 : ContentWidget(parent, controller) {
 	_inner = setInnerWidget(
-		object_ptr<InnerWidget>(this, controller, peer, _filter.value()));
+		object_ptr<InnerWidget>(
+			this,
+			controller,
+			peer,
+			_filter.value(),
+			_addingToCollectionId.value()));
 	_inner->notifyEnabled(
 	) | rpl::take(1) | rpl::start_with_next([=](bool enabled) {
 		setupNotifyCheckbox(enabled);
@@ -898,9 +1078,82 @@ Widget::Widget(
 	) | rpl::start_with_next([=] {
 		_filter = Filter();
 	}, _inner->lifetime());
+	_inner->addToCollectionRequests(
+	) | rpl::start_with_next([=](int id) {
+		_addingToCollectionId = id;
+		_filter = Filter();
+	}, _inner->lifetime());
 	_inner->scrollToTop() | rpl::start_with_next([=] {
 		scrollTo({ 0, 0 });
 	}, _inner->lifetime());
+
+	_addingToCollectionId.changes() | rpl::start_with_next([=](int id) {
+		toggleAddButton(id != 0);
+	}, _inner->lifetime());
+}
+
+void Widget::toggleAddButton(bool shown) {
+	if (!shown) {
+		setScrollBottomSkip(0);
+		_hasPinnedToBottom = false;
+		delete _pinnedToBottom.data();
+	} else if (!_pinnedToBottom) {
+		_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+			this,
+			object_ptr<Ui::RpWidget>(this));
+		const auto wrap = _pinnedToBottom.data();
+		wrap->toggle(false, anim::type::instant);
+
+		const auto bottom = wrap->entity();
+		bottom->show();
+
+		const auto save = Ui::CreateChild<Ui::RoundButton>(
+			bottom,
+			tr::lng_settings_save(),
+			st::defaultActiveButton);
+		save->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+		save->show();
+
+		save->setClickedCallback([=] {
+			_inner->saveAdding();
+		});
+
+		const auto &checkSt = st::defaultCheckbox;
+		const auto checkTop = st::boxRadius;
+		bottom->widthValue() | rpl::start_with_next([=](int width) {
+			const auto normal = width
+				- checkSt.margin.left()
+				- checkSt.margin.right();
+			save->resizeToWidth(normal);
+			const auto checkLeft = (width - normal) / 2;
+			save->moveToLeft(checkLeft, checkTop);
+		}, save->lifetime());
+
+		save->heightValue() | rpl::start_with_next([=](int height) {
+			bottom->resize(bottom->width(), st::boxRadius * 2 + height);
+		}, save->lifetime());
+
+		const auto processHeight = [=] {
+			setScrollBottomSkip(wrap->height());
+			wrap->moveToLeft(wrap->x(), height() - wrap->height());
+		};
+
+		_inner->sizeValue(
+		) | rpl::start_with_next([=](const QSize &s) {
+			wrap->resizeToWidth(s.width());
+			crl::on_main(wrap, processHeight);
+		}, wrap->lifetime());
+
+		rpl::combine(
+			wrap->heightValue(),
+			heightValue()
+		) | rpl::start_with_next(processHeight, wrap->lifetime());
+
+		if (_shown) {
+			wrap->toggle(true, anim::type::normal);
+		}
+		_hasPinnedToBottom = true;
+	}
 }
 
 void Widget::showFinished() {
@@ -1001,11 +1254,15 @@ void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 			(Window::SessionNavigation*)controller());
 		addAction(tr::lng_gift_collection_add(tr::now), [=] {
 			if (const auto strong = weak.get()) {
+				const auto added = [=](MTPStarGiftCollection result) {
+					_inner->collectionAdded(result);
+				};
 				strong->uiShow()->show(Box(
 					NewCollectionBox,
 					strong,
 					peer,
-					Data::SavedStarGiftId()));
+					Data::SavedStarGiftId(),
+					added));
 			}
 		}, &st::menuIconAddToFolder);
 	}
@@ -1066,7 +1323,11 @@ void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
 }
 
 rpl::producer<QString> Widget::title() {
-	return tr::lng_peer_gifts_title();
+	return _addingToCollectionId.value() | rpl::map([](int id) {
+		return id
+			? tr::lng_gift_collection_add_title()
+			: tr::lng_peer_gifts_title();
+	}) | rpl::flatten_latest();
 }
 
 rpl::producer<bool> Widget::desiredBottomShadowVisibility() {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index 2ef1fb67cd..4196e9cba8 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -99,11 +99,13 @@ private:
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	void setupNotifyCheckbox(bool enabled);
+	void toggleAddButton(bool shown);
 
 	InnerWidget *_inner = nullptr;
 	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
 	rpl::variable<bool> _hasPinnedToBottom;
 	rpl::variable<Filter> _filter;
+	rpl::variable<int> _addingToCollectionId;
 	bool _shown = false;
 
 };

From 20ce2ead7534df969db20cf3e69e021323dda5fc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Jul 2025 09:17:06 +0400
Subject: [PATCH 044/341] Take rating info url from appConfig.

---
 Telegram/Resources/langs/lang.strings                    | 1 -
 Telegram/SourceFiles/info/profile/info_profile_cover.cpp | 7 +++++++
 Telegram/SourceFiles/main/main_app_config.cpp            | 6 ++++++
 Telegram/SourceFiles/main/main_app_config.h              | 2 ++
 Telegram/SourceFiles/ui/controls/stars_rating.cpp        | 7 +++++--
 Telegram/SourceFiles/ui/controls/stars_rating.h          | 3 +++
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ba03b8f6c4..42bdae3036 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1878,7 +1878,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_stars_rating_tooltip" = "Profile level reflects the user's payment reliability.";
 "lng_stars_rating_learn_more" = "Learn More";
-"lng_stars_rating_about_url" = "https://telegram.org/";
 
 "lng_manage_discussion_group" = "Discussion";
 "lng_manage_discussion_group_add" = "Add a group";
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index de499e71ed..de47f7258b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -36,12 +36,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/labels.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/text/text_utilities.h"
+#include "ui/basic_click_handlers.h"
 #include "ui/ui_utility.h"
 #include "ui/painter.h"
 #include "base/event_filter.h"
 #include "base/unixtime.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
+#include "main/main_app_config.h"
 #include "main/main_session.h"
 #include "settings/settings_premium.h"
 #include "chat_helpers/stickers_lottie.h"
@@ -669,6 +671,11 @@ Cover::Cover(
 			_status->widthValue() | rpl::start_with_next([=](int width) {
 				rating->setMinimalAddedWidth(width);
 			}, rating->lifetime());
+			const auto session = &_peer->session();
+			rating->learnMoreRequests() | rpl::start_with_next([=] {
+				const auto &appConfig = session->appConfig();
+				UrlClickHandler::Open(appConfig.starsRatingLearnMoreUrl());
+			}, rating->lifetime());
 			_statusShift = rating->collapsedWidthValue();
 			_statusShift.changes() | rpl::start_with_next([=] {
 				refreshStatusGeometry(width());
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index 32b1ae53d8..0c24bbd062 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -232,6 +232,12 @@ QString AppConfig::ageVerifyBotUsername() const {
 	return get<QString>(u"verify_age_bot_username"_q, QString());
 }
 
+QString AppConfig::starsRatingLearnMoreUrl() const {
+	return get<QString>(
+		u"stars_rating_learnmore_url"_q,
+		u"https://telegram.org/blog"_q);
+}
+
 void AppConfig::refresh(bool force) {
 	if (_requestId || !_api) {
 		if (force) {
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index 7dc2205d1a..d481d7c7b1 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -109,6 +109,8 @@ public:
 	[[nodiscard]] int ageVerifyMinAge() const;
 	[[nodiscard]] QString ageVerifyBotUsername() const;
 
+	[[nodiscard]] QString starsRatingLearnMoreUrl() const;
+
 	void refresh(bool force = false);
 
 private:
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index fb047ded9e..23ec63146f 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/tooltip.h"
-#include "ui/basic_click_handlers.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
@@ -213,7 +212,7 @@ void StarsRating::toggleTooltips(bool shown) {
 			outer.width());
 	}, widget->lifetime());
 	button->setClickedCallback([=] {
-		UrlClickHandler::Open(tr::lng_stars_rating_about_url(tr::now));
+		_learnMoreRequests.fire({});
 	});
 }
 
@@ -346,6 +345,10 @@ rpl::producer<int> StarsRating::collapsedWidthValue() const {
 	return _collapsedWidthValue.value();
 }
 
+rpl::producer<> StarsRating::learnMoreRequests() const {
+	return _learnMoreRequests.events();
+}
+
 rpl::lifetime &StarsRating::lifetime() {
 	return _widget->lifetime();
 }
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
index 6e94480b72..7af2a41c62 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.h
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -40,6 +40,7 @@ public:
 	void setMinimalAddedWidth(int addedWidth);
 
 	[[nodiscard]] rpl::producer<int> collapsedWidthValue() const;
+	[[nodiscard]] rpl::producer<> learnMoreRequests() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
@@ -73,6 +74,8 @@ private:
 	Ui::Animations::Simple _expandedAnimation;
 	mutable int _activeWidth = 0;
 
+	rpl::event_stream<> _learnMoreRequests;
+
 	base::Timer _collapseTimer;
 
 };

From bcdd202ef95c9439cf5e5031bf1088db125967d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 21 Jul 2025 09:27:57 +0400
Subject: [PATCH 045/341] Fix build with Xcode.

---
 .../peer_gifts/info_peer_gifts_widget.cpp     |  2 +-
 Telegram/SourceFiles/ui/controls/sub_tabs.h   | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 7c644c4005..09bd50d8c9 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -885,7 +885,7 @@ void InnerWidget::refreshAbout() {
 			return false;
 		});
 		about->show();
-		_about = std::move(_about);
+		_about = std::move(about);
 		_aboutFiltered = true;
 		resizeToWidth(width());
 	} else if (_aboutFiltered || _aboutCollection) {
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.h b/Telegram/SourceFiles/ui/controls/sub_tabs.h
index d5403c3547..3e98c23bc2 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.h
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.h
@@ -11,18 +11,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 
+struct SubTabsOptions {
+	QString selected;
+	bool centered = false;
+};
+
+struct SubTabsTab {
+	QString id;
+	TextWithEntities text;
+
+	friend inline bool operator==(
+		const SubTabsTab &,
+		const SubTabsTab &) = default;
+};
+
 class SubTabs : public RpWidget {
 public:
-	struct Options {
-		QString selected;
-		bool centered = false;
-	};
-	struct Tab {
-		QString id;
-		TextWithEntities text;
-
-		friend inline bool operator==(const Tab &, const Tab &) = default;
-	};
+	using Options = SubTabsOptions;
+	using Tab = SubTabsTab;
 
 	explicit SubTabs(
 		QWidget *parent,

From b95a39dc10cf3f0443d4602d9b3b7f34271770d0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 22 Jul 2025 16:04:24 +0400
Subject: [PATCH 046/341] Remove swipe navigation from SubTabs.

---
 Telegram/SourceFiles/ui/controls/sub_tabs.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
index 88d5c4b2fd..41e6edafc0 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
@@ -164,7 +164,11 @@ void SubTabs::mouseMoveEvent(QMouseEvent *e) {
 }
 
 void SubTabs::wheelEvent(QWheelEvent *e) {
-	_scroll = std::clamp(_scroll - ScrollDeltaF(e).x(), 0., _scrollMax * 1.);
+	const auto delta = ScrollDeltaF(e);
+	if (std::abs(delta.x()) > std::abs(delta.y())) {
+		e->accept();
+	}
+	_scroll = std::clamp(_scroll - delta.x(), 0., _scrollMax * 1.);
 	update();
 }
 

From 74065714cbf40ac408581f056af111ff8f9ffc33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Jul 2025 11:33:24 +0400
Subject: [PATCH 047/341] Fix padding for gifts list.

---
 .../SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 09bd50d8c9..517dc775d6 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -993,7 +993,9 @@ int InnerWidget::resizeGetHeight(int width) {
 		result += padding.top();
 		_collectionsTabs->resizeToWidth(width);
 		_collectionsTabs->move(0, result);
-		 result += _collectionsTabs->height();
+		result += _collectionsTabs->height();
+	} else {
+		result += padding.bottom();
 	}
 
 	const auto singlew = std::min(
@@ -1007,7 +1009,7 @@ int InnerWidget::resizeGetHeight(int width) {
 	const auto skiph = st::giftBoxGiftSkip.y();
 
 	result += rows
-		? (padding.bottom() * 2 + rows * (singleh + skiph) - skiph)
+		? (padding.bottom() + rows * (singleh + skiph) - skiph)
 		: 0;
 
 	if (const auto about = _about.get()) {

From bf050a2d5e8e502ef35d033badb3b5ce596e94b0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Jul 2025 10:26:38 +0400
Subject: [PATCH 048/341] Don't mark existing gifts as "sold out".

---
 Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 5ae749173b..3a8fedfc21 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -529,6 +529,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		const auto pinned = data.pinned || data.pinnedSelection;
 		if (count || pinned) {
 			const auto soldOut = !pinned
+				&& !unique
 				&& !data.userpic
 				&& !data.info.limitedLeft;
 			return GiftBadge{

From 22515c8c296bd3df0b4cf1a98645d05cbb0765d6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Jul 2025 15:28:29 +0400
Subject: [PATCH 049/341] Support gift collections editing.

---
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |    9 -
 Telegram/SourceFiles/data/data_session.cpp    |    8 +
 Telegram/SourceFiles/data/data_session.h      |    8 +
 Telegram/SourceFiles/data/data_star_gift.h    |    7 +-
 Telegram/SourceFiles/info/info.style          |   26 +
 .../peer_gifts/info_peer_gifts_common.cpp     |    9 +-
 .../info/peer_gifts/info_peer_gifts_common.h  |    4 +-
 .../peer_gifts/info_peer_gifts_widget.cpp     | 1020 ++++++++++-------
 .../info/peer_gifts/info_peer_gifts_widget.h  |   18 +-
 Telegram/SourceFiles/ui/effects/credits.style |    1 +
 Telegram/lib_ui                               |    2 +-
 11 files changed, 668 insertions(+), 444 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index b3cf7bf156..a2ef4b1cb3 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2517,9 +2517,6 @@ void SendGiftBox(
 					rpl::single(peer->shortName()))));
 	});
 
-	const auto buttonWidth = st::boxWideWidth
-		- st::giftBox.buttonPadding.left()
-		- st::giftBox.buttonPadding.right();
 	const auto button = box->addButton(rpl::single(QString()), [=] {
 		if (state->submitting) {
 			return;
@@ -2560,12 +2557,6 @@ void SendGiftBox(
 		session,
 		st::creditsBoxButtonLabel,
 		&st::giftBox.button.textFg);
-	button->resizeToWidth(buttonWidth);
-	button->widthValue() | rpl::start_with_next([=](int width) {
-		if (width != buttonWidth) {
-			button->resizeToWidth(buttonWidth);
-		}
-	}, button->lifetime());
 }
 
 [[nodiscard]] rpl::producer<ResaleGiftsDescriptor> ResaleGiftsSlice(
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index f3c306a350..9468425002 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -1843,6 +1843,14 @@ rpl::producer<GiftUpdate> Session::giftUpdates() const {
 	return _giftUpdates.events();
 }
 
+void Session::notifyGiftsUpdate(GiftsUpdate &&update) {
+	_giftsUpdates.fire(std::move(update));
+}
+
+rpl::producer<GiftsUpdate> Session::giftsUpdates() const {
+	return _giftsUpdates.events();
+}
+
 HistoryItem *Session::changeMessageId(PeerId peerId, MsgId wasId, MsgId nowId) {
 	const auto list = messagesListForInsert(peerId);
 	const auto i = list->find(wasId);
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index cfcf028718..d934a7ae35 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -103,6 +103,11 @@ struct GiftUpdate {
 	QString slug;
 	Action action = {};
 };
+struct GiftsUpdate {
+	std::vector<Data::SavedStarGiftId> added;
+	std::vector<Data::SavedStarGiftId> removed;
+	int collectionId = 0;
+};
 
 struct SentToScheduled {
 	not_null<History*> history;
@@ -334,6 +339,8 @@ public:
 	[[nodiscard]] rpl::producer<not_null<HistoryItem*>> newItemAdded() const;
 	void notifyGiftUpdate(GiftUpdate &&update);
 	[[nodiscard]] rpl::producer<GiftUpdate> giftUpdates() const;
+	void notifyGiftsUpdate(GiftsUpdate &&update);
+	[[nodiscard]] rpl::producer<GiftsUpdate> giftsUpdates() const;
 	void requestItemRepaint(not_null<const HistoryItem*> item);
 	[[nodiscard]] rpl::producer<not_null<const HistoryItem*>> itemRepaintRequest() const;
 	void requestViewRepaint(not_null<const ViewElement*> view);
@@ -1022,6 +1029,7 @@ private:
 	rpl::event_stream<not_null<const ViewElement*>> _viewLayoutChanges;
 	rpl::event_stream<not_null<HistoryItem*>> _newItemAdded;
 	rpl::event_stream<GiftUpdate> _giftUpdates;
+	rpl::event_stream<GiftsUpdate> _giftsUpdates;
 	rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
 	rpl::event_stream<not_null<const ViewElement*>> _viewRepaintRequest;
 	rpl::event_stream<not_null<const HistoryItem*>> _itemResizeRequest;
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index a44df148c2..e6a2e1ae54 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -126,8 +126,11 @@ public:
 	}
 
 	friend inline bool operator==(
-		const SavedStarGiftId &a,
-		const SavedStarGiftId &b) = default;
+		const SavedStarGiftId &,
+		const SavedStarGiftId &) = default;
+	friend inline auto operator<=>(
+		const SavedStarGiftId &,
+		const SavedStarGiftId &) = default;
 
 private:
 	PeerData *peer = nullptr;
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 97024937f4..e098c8a326 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1251,3 +1251,29 @@ collectionEmptyText: FlatLabel(defaultFlatLabel) {
 collectionEmptyTitleMargin: margins(10px, 24px, 10px, 4px);
 collectionEmptyTextMargin: margins(10px, 4px, 10px, 12px);
 collectionEmptyAddMargin: margins(10px, 12px, 10px, 24px);
+collectionAddIcon: IconEmoji {
+	icon: icon {{ "settings/plus", windowFgActive }};
+	padding: margins(1px, -2px, 1px, 0px);
+}
+collectionEditBox: Box(defaultBox) {
+	buttonPadding: margins(16px, 12px, 16px, 12px);
+	buttonHeight: 42px;
+	buttonWide: true;
+	button: RoundButton(defaultActiveButton) {
+		height: 42px;
+		textTop: 12px;
+		style: semiboldTextStyle;
+	}
+}
+collectionEditMenuToggle: IconButton(infoTopBarMenu) {
+	width: boxTitleHeight;
+	height: boxTitleHeight;
+
+	icon: icon {{ "title_menu_dots", boxTitleCloseFg }};
+	iconOver: icon {{ "title_menu_dots", boxTitleCloseFgOver }};
+	iconPosition: point(-1px, -1px);
+
+	rippleAreaPosition: point(4px, 4px);
+	rippleAreaSize: 40px;
+	ripple: defaultRippleAnimationBgOver;
+}
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 3a8fedfc21..e25463f3f9 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -279,12 +279,19 @@ QMargins GiftButton::currentExtend() const {
 	return _extend + QMargins(added, added, added, added);
 }
 
-void GiftButton::toggleSelected(bool selected) {
+void GiftButton::toggleSelected(bool selected, anim::type animated) {
 	if (_selected == selected) {
+		if (animated == anim::type::instant) {
+			_selectedAnimation.stop();
+		}
 		return;
 	}
 	const auto duration = st::defaultRoundCheckbox.duration;
 	_selected = selected;
+	if (animated == anim::type::instant) {
+		_selectedAnimation.stop();
+		return;
+	}
 	_selectedAnimation.start([=] {
 		update();
 	}, selected ? 0. : 1., selected ? 1. : 0., duration, anim::easeOutCirc);
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 7c8b006dda..e6f15b759e 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -139,7 +139,9 @@ public:
 	void setDescriptor(const GiftDescriptor &descriptor, Mode mode);
 	void setGeometry(QRect inner, QMargins extend);
 
-	void toggleSelected(bool selected);
+	void toggleSelected(
+		bool selected,
+		anim::type animated = anim::type::normal);
 
 	[[nodiscard]] rpl::producer<QPoint> contextMenuRequests() const {
 		return _contextMenuRequests.events();
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 517dc775d6..0ba53ddcbd 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/box_content_divider.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
@@ -100,10 +101,9 @@ class InnerWidget final : public Ui::BoxContentDivider {
 public:
 	InnerWidget(
 		QWidget *parent,
-		not_null<Controller*> controller,
+		not_null<Window::SessionController*> window,
 		not_null<PeerData*> peer,
-		rpl::producer<Filter> filter,
-		rpl::producer<int> addingToCollectionId);
+		rpl::producer<Descriptor> descriptor);
 
 	[[nodiscard]] not_null<PeerData*> peer() const {
 		return _peer;
@@ -111,18 +111,21 @@ public:
 	[[nodiscard]] rpl::producer<bool> notifyEnabled() const {
 		return _notifyEnabled.events();
 	}
-	[[nodiscard]] rpl::producer<> resetFilterRequests() const {
-		return _resetFilterRequests.events();
-	}
-	[[nodiscard]] rpl::producer<int> addToCollectionRequests() const {
-		return _addToCollectionRequests.events();
+	[[nodiscard]] rpl::producer<Descriptor> descriptorChanges() const {
+		return _descriptorChanges.events();
 	}
 	[[nodiscard]] rpl::producer<> scrollToTop() const {
 		return _scrollToTop.events();
 	}
 
-	void saveAdding();
+	[[nodiscard]] rpl::producer<Data::GiftsUpdate> changes() const {
+		return _collectionChanges.value();
+	}
+
+	void reloadCollection(int id);
+	void editCollectionGifts(int id);
 	void collectionAdded(MTPStarGiftCollection result);
+	void fillMenu(const Ui::Menu::MenuCallback &addAction);
 
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
@@ -134,7 +137,7 @@ private:
 	};
 	struct Entries {
 		std::vector<Entry> list;
-		Filter filter;
+		std::optional<Filter> filter;
 		int total = 0;
 		bool allLoaded = false;
 	};
@@ -145,15 +148,27 @@ private:
 		int index = 0;
 	};
 
+public:
+	InnerWidget(
+		QWidget *parent,
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		rpl::producer<Descriptor> descriptor,
+		int addingToCollectionId,
+		Entries all);
+
+private:
 	void visibleTopBottomUpdated(
 		int visibleTop,
 		int visibleBottom) override;
 	void paintEvent(QPaintEvent *e) override;
 
 	void subscribeToUpdates();
+	void applyUpdateTo(Entries &entries, const Data::GiftUpdate &update);
 	void loadCollections();
 	void loadMore();
 	void loaded(const MTPpayments_SavedStarGifts &result);
+	void markInCollection(const Data::SavedStarGift &gift);
 	void refreshButtons();
 	void validateButtons();
 	void showGift(int index);
@@ -161,8 +176,6 @@ private:
 	void refreshAbout();
 	void refreshCollectionsTabs();
 
-	[[nodiscard]] int shownCollectionId() const;
-
 	void markPinned(std::vector<Entry>::iterator i);
 	void markUnpinned(std::vector<Entry>::iterator i);
 
@@ -172,14 +185,13 @@ private:
 		-> Fn<std::vector<Data::CreditsHistoryEntry>()>;
 
 	const not_null<Window::SessionController*> _window;
-	rpl::variable<Filter> _filter;
-	rpl::variable<int> _collectionId;
-	rpl::variable<int> _addingToCollectionId;
+	const not_null<PeerData*> _peer;
+	const int _addingToCollectionId = 0;
+
+	rpl::variable<Descriptor> _descriptor;
 	Delegate _delegate;
-	const not_null<Controller*> _controller;
 	std::unique_ptr<Ui::SubTabs> _collectionsTabs;
 	std::unique_ptr<Ui::RpWidget> _about;
-	const not_null<PeerData*> _peer;
 	rpl::event_stream<> _scrollToTop;
 
 	std::vector<Data::GiftCollection> _collections;
@@ -188,18 +200,17 @@ private:
 	base::flat_map<int, Entries> _perCollection;
 	not_null<Entries*> _entries;
 	not_null<std::vector<Entry>*> _list;
+	rpl::variable<Data::GiftsUpdate> _collectionChanges;
+	base::flat_set<Data::SavedStarGiftId> _inCollection;
 
 	MTP::Sender _api;
 	mtpRequestId _loadMoreRequestId = 0;
 	Fn<void()> _collectionsLoadedCallback;
 	QString _offset;
 	bool _reloading = false;
-	bool _aboutFiltered = false;
-	bool _aboutCollection = false;
 	bool _collectionsLoaded = false;
 
-	rpl::event_stream<int> _addToCollectionRequests;
-	rpl::event_stream<> _resetFilterRequests;
+	rpl::event_stream<Descriptor> _descriptorChanges;
 	rpl::event_stream<bool> _notifyEnabled;
 	std::vector<View> _views;
 	int _viewsForWidth = 0;
@@ -218,20 +229,37 @@ private:
 
 InnerWidget::InnerWidget(
 	QWidget *parent,
-	not_null<Controller*> controller,
+	not_null<Window::SessionController*> window,
 	not_null<PeerData*> peer,
-	rpl::producer<Filter> filter,
-	rpl::producer<int> addingToCollectionId)
+	rpl::producer<Descriptor> descriptor)
+: InnerWidget(
+	parent,
+	window,
+	peer,
+	std::move(descriptor),
+	0,
+	{ .total = peer->peerGiftsCount() }) {
+}
+
+InnerWidget::InnerWidget(
+	QWidget *parent,
+	not_null<Window::SessionController*> window,
+	not_null<PeerData*> peer,
+	rpl::producer<Descriptor> descriptor,
+	int addingToCollectionId,
+	Entries all)
 : BoxContentDivider(parent)
-, _window(controller->parentController())
-, _filter(std::move(filter))
-, _addingToCollectionId(std::move(addingToCollectionId))
-, _delegate(&_window->session(), GiftButtonMode::Minimal)
-, _controller(controller)
+, _window(window)
 , _peer(peer)
-, _all({ .total = _peer->peerGiftsCount() })
+, _addingToCollectionId(addingToCollectionId)
+, _descriptor(std::move(descriptor))
+, _delegate(&_window->session(), GiftButtonMode::Minimal)
+, _all(std::move(all))
 , _entries(&_all)
 , _list(&_entries->list)
+, _collectionChanges(Data::GiftsUpdate{
+	.collectionId = addingToCollectionId,
+})
 , _api(&_peer->session().mtp()) {
 	_singleMin = _delegate.buttonSize();
 
@@ -239,54 +267,57 @@ InnerWidget::InnerWidget(
 		subscribeToUpdates();
 	}
 
+	for (const auto &entry : _all.list) {
+		markInCollection(entry.gift);
+	}
+
 	loadCollections();
 
-	_filter.value() | rpl::start_with_next([=] {
-		_entries->allLoaded = false;
-		_reloading = true;
-		_api.request(base::take(_loadMoreRequestId)).cancel();
-		_collectionsLoadedCallback = nullptr;
-		refreshButtons();
-		refreshAbout();
-		loadMore();
+	_window->session().data().giftsUpdates(
+	) | rpl::start_with_next([=](const Data::GiftsUpdate &update) {
+		const auto added = base::flat_set<Data::SavedStarGiftId>{
+			begin(update.added),
+			end(update.added)
+		};
+		const auto removed = base::flat_set<Data::SavedStarGiftId>{
+			begin(update.removed),
+			end(update.removed)
+		};
+		const auto id = update.collectionId;
+		const auto process = [&](Entries &entries) {
+			for (auto &entry : entries.list) {
+				if (added.contains(entry.gift.manageId)) {
+					entry.gift.collectionIds.push_back(id);
+				} else if (removed.contains(entry.gift.manageId)) {
+					entry.gift.collectionIds.erase(
+						ranges::remove(entry.gift.collectionIds, id),
+						end(entry.gift.collectionIds));
+				}
+			}
+		};
+		for (auto &[_, entries] : _perCollection) {
+			process(entries);
+		}
+		process(_all);
 	}, lifetime());
 
-	_collectionId.changes() | rpl::start_with_next([=](int id) {
-		_reloading = true;
-		_api.request(base::take(_loadMoreRequestId)).cancel();
+	_descriptor.value(
+	) | rpl::start_with_next([=](Descriptor now) {
+		const auto id = now.collectionId;
 		_collectionsLoadedCallback = nullptr;
+		_api.request(base::take(_loadMoreRequestId)).cancel();
 		_entries = id ? &_perCollection[id] : &_all;
 		_list = &_entries->list;
 		refreshButtons();
 		refreshAbout();
 		loadMore();
 	}, lifetime());
-
-	_addingToCollectionId.value(
-	) | rpl::combine_previous(
-	) | rpl::start_with_next([=](int previousId, int id) {
-		_reloading = true;
-		_api.request(base::take(_loadMoreRequestId)).cancel();
-		_collectionsLoadedCallback = nullptr;
-		if (!id) {
-			_collectionId = previousId;
-		}
-		_entries = id ? &_all : &_perCollection[previousId];
-		_list = &_entries->list;
-
-		if (_collectionsTabs) {
-			_collectionsTabs->setVisible(!id);
-		}
-
-		refreshAbout();
-		refreshButtons();
-		crl::on_main(this, [=] {
-			loadMore();
-		});
-	}, lifetime());
 }
 
 void InnerWidget::loadCollections() {
+	if (_addingToCollectionId) {
+		return;
+	}
 	_api.request(MTPpayments_GetStarGiftCollections(
 		_peer->input,
 		MTP_long(Api::CountHash(_collections
@@ -313,76 +344,88 @@ void InnerWidget::loadCollections() {
 void InnerWidget::subscribeToUpdates() {
 	_peer->owner().giftUpdates(
 	) | rpl::start_with_next([=](const Data::GiftUpdate &update) {
-		const auto savedId = [](const Entry &entry) {
-			return entry.gift.manageId;
-		};
-		const auto bySlug = [](const Entry &entry) {
-			return entry.gift.info.unique
-				? entry.gift.info.unique->slug
-				: QString();
-		};
-		const auto i = update.id
-			? ranges::find(*_list, update.id, savedId)
-			: ranges::find(*_list, update.slug, bySlug);
-		if (i == end(*_list)) {
-			return;
-		}
-		const auto index = int(i - begin(*_list));
+		applyUpdateTo(_all, update);
 		using Action = Data::GiftUpdate::Action;
-		if (update.action == Action::Convert
-			|| update.action == Action::Transfer
-			|| update.action == Action::Delete) {
-			_list->erase(i);
-			if (_entries->total > 0) {
-				--_entries->total;
+		if (update.action == Action::Pin || update.action == Action::Unpin) {
+			for (auto &[_, entries] : _perCollection) {
+				applyUpdateTo(entries, update);
 			}
-			for (auto &view : _views) {
-				if (view.index >= index) {
-					--view.index;
-				}
-			}
-		} else if (update.action == Action::Save
-			|| update.action == Action::Unsave) {
-			i->gift.hidden = (update.action == Action::Unsave);
-
-			const auto unpin = i->gift.hidden && i->gift.pinned;
-			v::match(i->descriptor, [](GiftTypePremium &) {
-			}, [&](GiftTypeStars &data) {
-				data.hidden = i->gift.hidden;
-			});
-			for (auto &view : _views) {
-				if (view.index == index) {
-					view.index = -1;
-					view.manageId = {};
-				}
-			}
-			if (unpin) {
-				markUnpinned(i);
-			}
-		} else if (update.action == Action::Pin
-			|| update.action == Action::Unpin) {
-			if (update.action == Action::Pin) {
-				markPinned(i);
-			} else {
-				markUnpinned(i);
-			}
-		} else if (update.action == Action::ResaleChange) {
-			for (auto &view : _views) {
-				if (view.index == index) {
-					view.index = -1;
-					view.manageId = {};
-				}
-			}
-		} else {
-			return;
-		}
-		refreshButtons();
-		if (update.action == Action::Pin) {
-			_scrollToTop.fire({});
-		}
+		};
 	}, lifetime());
 }
 
+void InnerWidget::applyUpdateTo(
+		Entries &entries,
+		const Data::GiftUpdate &update) {
+	using Action = Data::GiftUpdate::Action;
+	const auto savedId = [](const Entry &entry) {
+		return entry.gift.manageId;
+	};
+	const auto bySlug = [](const Entry &entry) {
+		return entry.gift.info.unique
+			? entry.gift.info.unique->slug
+			: QString();
+	};
+	const auto i = update.id
+		? ranges::find(*_list, update.id, savedId)
+		: ranges::find(*_list, update.slug, bySlug);
+	if (i == end(*_list)) {
+		return;
+	}
+	const auto index = int(i - begin(*_list));
+	if (update.action == Action::Convert
+		|| update.action == Action::Transfer
+		|| update.action == Action::Delete) {
+		_list->erase(i);
+		if (_entries->total > 0) {
+			--_entries->total;
+		}
+		for (auto &view : _views) {
+			if (view.index >= index) {
+				--view.index;
+			}
+		}
+	} else if (update.action == Action::Save
+		|| update.action == Action::Unsave) {
+		i->gift.hidden = (update.action == Action::Unsave);
+
+		const auto unpin = i->gift.hidden && i->gift.pinned;
+		v::match(i->descriptor, [](GiftTypePremium &) {
+		}, [&](GiftTypeStars &data) {
+			data.hidden = i->gift.hidden;
+		});
+		for (auto &view : _views) {
+			if (view.index == index) {
+				view.index = -1;
+				view.manageId = {};
+			}
+		}
+		if (unpin) {
+			markUnpinned(i);
+		}
+	} else if (update.action == Action::Pin
+		|| update.action == Action::Unpin) {
+		if (update.action == Action::Pin) {
+			markPinned(i);
+		} else {
+			markUnpinned(i);
+		}
+	} else if (update.action == Action::ResaleChange) {
+		for (auto &view : _views) {
+			if (view.index == index) {
+				view.index = -1;
+				view.manageId = {};
+			}
+		}
+	} else {
+		return;
+	}
+	refreshButtons();
+	if (update.action == Action::Pin) {
+		_scrollToTop.fire({});
+	}
+}
+
 void InnerWidget::markPinned(std::vector<Entry>::iterator i) {
 	const auto index = int(i - begin(*_list));
 
@@ -471,74 +514,21 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 	}
 }
 
-int InnerWidget::shownCollectionId() const {
-	return _addingToCollectionId.current()
-		? 0
-		: _collectionId.current();
-}
-
-void InnerWidget::saveAdding() {
-	using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
-	auto add = QVector<MTPInputSavedStarGift>();
-	auto remove = QVector<MTPInputSavedStarGift>();
-	const auto id = _addingToCollectionId.current();
-	auto document = (DocumentData*)nullptr;
-	for (const auto &entry : (*_list)) {
-		if (ranges::contains(entry.gift.collectionIds, id)) {
-			if (!document) {
-				document = entry.gift.info.document;
-			}
-			add.push_back(Api::InputSavedStarGiftId(
-				entry.gift.manageId,
-				entry.gift.info.unique));
-		} else {
-			remove.push_back(Api::InputSavedStarGiftId(
-				entry.gift.manageId,
-				entry.gift.info.unique));
-		}
-	}
-	_window->session().api().request(MTPpayments_UpdateStarGiftCollection(
-		MTP_flags(Flag()
-			| (add.isEmpty() ? Flag() : Flag::f_add_stargift)
-			| (remove.isEmpty() ? Flag() : Flag::f_delete_stargift)),
-		_peer->input,
-		MTP_int(id),
-		MTPstring(),
-		MTP_vector<MTPInputSavedStarGift>(remove),
-		MTP_vector<MTPInputSavedStarGift>(add),
-		MTPVector<MTPInputSavedStarGift>()
-	)).done([=] {
-		_entries->allLoaded = false;
-		_reloading = true;
-		_api.request(base::take(_loadMoreRequestId)).cancel();
-		_collectionsLoadedCallback = nullptr;
-		refreshButtons();
-		refreshAbout();
-		loadMore();
-	}).fail([=](const MTP::Error &error) {
-		_window->showToast(error.type());
-	}).send();
-	_addToCollectionRequests.fire(0);
-
-	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
-	if (i != end(_collections) && i->icon != document) {
-		i->icon = document;
-		refreshCollectionsTabs();
-	}
-}
-
 void InnerWidget::collectionAdded(MTPStarGiftCollection result) {
 	_collections.push_back(FromTL(&_window->session(), result));
 	refreshCollectionsTabs();
 }
 
 void InnerWidget::loadMore() {
-	if (_entries->allLoaded || _loadMoreRequestId) {
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	const auto filterChanged = (_entries->filter != filter);
+	const auto allLoaded = !filterChanged && _entries->allLoaded;
+	if (allLoaded || _loadMoreRequestId) {
 		return;
 	}
 	using Flag = MTPpayments_GetSavedStarGifts::Flag;
-	const auto filter = _filter.current();
-	const auto collectionId = shownCollectionId();
+	const auto collectionId = descriptor.collectionId;
 	_loadMoreRequestId = _api.request(MTPpayments_GetSavedStarGifts(
 		MTP_flags((filter.sortByValue ? Flag::f_sort_by_value : Flag())
 			| (filter.skipLimited ? Flag::f_exclude_limited : Flag())
@@ -549,7 +539,7 @@ void InnerWidget::loadMore() {
 			| (collectionId ? Flag::f_collection_id : Flag())),
 		_peer->input,
 		MTP_int(collectionId),
-		MTP_string(_reloading ? QString() : _offset),
+		MTP_string(filterChanged ? QString() : _offset),
 		MTP_int(kPerPage)
 	)).done([=](const MTPpayments_SavedStarGifts &result) {
 		const auto &data = result.data();
@@ -558,7 +548,7 @@ void InnerWidget::loadMore() {
 		owner->processUsers(data.vusers());
 		owner->processChats(data.vchats());
 
-		if (_collectionsLoaded) {
+		if (_addingToCollectionId || _collectionsLoaded) {
 			loaded(result);
 		} else {
 			_collectionsLoadedCallback = [=] {
@@ -568,6 +558,7 @@ void InnerWidget::loadMore() {
 	}).fail([=] {
 		_loadMoreRequestId = 0;
 		_collectionsLoadedCallback = nullptr;
+		_entries->filter = _descriptor.current().filter;
 		_entries->allLoaded = true;
 	}).send();
 }
@@ -585,17 +576,31 @@ void InnerWidget::loaded(const MTPpayments_SavedStarGifts &result) {
 	} else {
 		_entries->allLoaded = true;
 	}
-	if (!_filter.current().skipsSomething()) {
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	if (!filter.skipsSomething()) {
 		_entries->total = data.vcount().v;
 	}
-
-	if (base::take(_reloading)) {
+	if (_entries->filter != filter) {
+		_entries->filter = filter;
 		_list->clear();
 	}
 	_list->reserve(_list->size() + data.vgifts().v.size());
+
+	const auto i = ranges::find(
+		_collections,
+		descriptor.collectionId,
+		&Data::GiftCollection::id);
+	const auto collection = (i != end(_collections)) ? &*i : nullptr;
+
 	auto hasUnique = false;
 	for (const auto &gift : data.vgifts().v) {
 		if (auto parsed = Api::FromTL(_peer, gift)) {
+			if (collection && !collection->icon) {
+				collection->icon = parsed->info.document;
+				refreshCollectionsTabs();
+			}
+			markInCollection(*parsed);
 			auto descriptor = DescriptorForGift(_peer, *parsed);
 			_list->push_back({
 				.gift = std::move(*parsed),
@@ -612,6 +617,18 @@ void InnerWidget::loaded(const MTPpayments_SavedStarGifts &result) {
 	}
 }
 
+void InnerWidget::markInCollection(const Data::SavedStarGift &gift) {
+	if (const auto collectionId = _addingToCollectionId) {
+		const auto id = gift.manageId;
+		if (ranges::contains(gift.collectionIds, collectionId)) {
+			const auto &changes = _collectionChanges.current();
+			if (!ranges::contains(changes.removed, id)) {
+				_inCollection.emplace(id);
+			}
+		}
+	}
+}
+
 void InnerWidget::refreshButtons() {
 	_viewsForWidth = 0;
 	_viewsFromRow = 0;
@@ -646,7 +663,6 @@ void InnerWidget::validateButtons() {
 	const auto fullw = _perRow * (_single.width() + skipw) - skipw;
 	const auto left = padding.left() + (available - fullw) / 2;
 	const auto oneh = _single.height() + st::giftBoxGiftSkip.y();
-	const auto addingToId = _addingToCollectionId.current();
 	auto x = left;
 	auto y = vskip + fromRow * oneh;
 	auto views = std::vector<View>();
@@ -702,8 +718,9 @@ void InnerWidget::validateButtons() {
 		view.index = index;
 		view.manageId = manageId;
 		view.giftId = giftId;
-		view.button->toggleSelected(addingToId
-			&& ranges::contains(gift.collectionIds, addingToId));
+		view.button->toggleSelected(
+			_addingToCollectionId && _inCollection.contains(manageId),
+			anim::type::instant);
 		view.button->setDescriptor(descriptor, GiftButton::Mode::Minimal);
 		view.button->setClickedCallback(callback);
 		return true;
@@ -760,7 +777,7 @@ auto InnerWidget::pinnedSavedGifts()
 }
 
 void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
-	if (_menu) {
+	if (_menu || _addingToCollectionId) {
 		return;
 	}
 	const auto index = [&] {
@@ -781,7 +798,7 @@ void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
 	entry.pinnedSavedGifts = pinnedSavedGifts();
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
 	::Settings::FillSavedStarGiftMenu(
-		_controller->uiShow(),
+		_window->uiShow(),
 		_menu.get(),
 		entry,
 		::Settings::SavedStarGiftMenuType::List);
@@ -794,16 +811,31 @@ void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
 void InnerWidget::showGift(int index) {
 	Expects(index >= 0 && index < _list->size());
 
-	if (const auto id = _addingToCollectionId.current()) {
+	if (const auto id = _addingToCollectionId) {
 		auto &gift = (*_list)[index].gift;
-		const auto selected = ranges::contains(gift.collectionIds, id);
+		auto changes = _collectionChanges.current();
+		const auto selected = _inCollection.contains(gift.manageId);
 		if (selected) {
-			gift.collectionIds.erase(
-				ranges::remove(gift.collectionIds, id),
-				end(gift.collectionIds));
+			_inCollection.remove(gift.manageId);
+			if (ranges::contains(gift.collectionIds, id)) {
+				changes.removed.push_back(gift.manageId);
+			} else {
+				changes.added.erase(
+					ranges::remove(changes.added, gift.manageId),
+					end(changes.added));
+			}
 		} else {
-			gift.collectionIds.push_back(id);
+			_inCollection.emplace(gift.manageId);
+			if (ranges::contains(gift.collectionIds, id)) {
+				changes.removed.erase(
+					ranges::remove(changes.removed, gift.manageId),
+					end(changes.removed));
+			} else {
+				changes.added.push_back(gift.manageId);
+			}
 		}
+		_collectionChanges = std::move(changes);
+
 		const auto view = ranges::find(_views, index, &View::index);
 		if (view != end(_views)) {
 			view->button->toggleSelected(!selected);
@@ -820,18 +852,35 @@ void InnerWidget::showGift(int index) {
 }
 
 void InnerWidget::refreshAbout() {
-	const auto filter = _filter.current();
-	const auto collectionEmpty = _collectionId.current()
-		&& _entries->allLoaded
-		&& !_entries->total
-		&& _list->empty();
-	const auto filteredEmpty = !collectionEmpty
-		&& _entries->allLoaded
-		&& _list->empty()
-		&& filter.skipsSomething();
-
-	if (collectionEmpty) {
-		const auto id = _collectionId.current();
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	const auto collectionId = descriptor.collectionId;
+	const auto maybeEmpty = _list->empty();
+	const auto knownEmpty = maybeEmpty && _entries->allLoaded;
+	const auto filteredEmpty = knownEmpty && filter.skipsSomething();
+	const auto collectionCanAdd = knownEmpty && descriptor.collectionId != 0;
+	if (filteredEmpty) {
+		auto text = tr::lng_peer_gifts_empty_search(
+			tr::now,
+			Ui::Text::RichLangValue);
+		if (_entries->total > 0) {
+			text.append("\n\n").append(Ui::Text::Link(
+				tr::lng_peer_gifts_view_all(tr::now)));
+		}
+		auto about = std::make_unique<Ui::FlatLabel>(
+			this,
+			rpl::single(text),
+			st::giftListAbout);
+		about->setClickHandlerFilter([=](const auto &...) {
+			auto now = _descriptor.current();
+			now.filter = Filter();
+			_descriptorChanges.fire(std::move(now));
+			return false;
+		});
+		about->show();
+		_about = std::move(about);
+		resizeToWidth(width());
+	} else if (collectionCanAdd) {
 		auto about = std::make_unique<Ui::VerticalLayout>(this);
 		about->add(
 			object_ptr<Ui::CenterWrap<>>(
@@ -861,48 +910,20 @@ void InnerWidget::refreshAbout() {
 		button->setTextTransform(
 			Ui::RoundButton::TextTransform::NoTransform);
 		button->setClickedCallback([=] {
-			_addToCollectionRequests.fire_copy(id);
+			editCollectionGifts(collectionId);
 		});
 
 		about->show();
 		_about = std::move(about);
-		_aboutCollection = true;
 		resizeToWidth(width());
-	} else if (filteredEmpty) {
-		auto text = tr::lng_peer_gifts_empty_search(
-			tr::now,
-			Ui::Text::RichLangValue);
-		if (_entries->total > 0) {
-			text.append("\n\n").append(Ui::Text::Link(
-				tr::lng_peer_gifts_view_all(tr::now)));
-		}
-		auto about = std::make_unique<Ui::FlatLabel>(
-			this,
-			rpl::single(text),
-			st::giftListAbout);
-		about->setClickHandlerFilter([=](const auto &...) {
-			_resetFilterRequests.fire({});
-			return false;
-		});
-		about->show();
-		_about = std::move(about);
-		_aboutFiltered = true;
-		resizeToWidth(width());
-	} else if (_aboutFiltered || _aboutCollection) {
-		_about = nullptr;
-		_aboutFiltered = false;
-		_aboutCollection = false;
-	}
-
-	if (!_peer->isSelf() && _peer->canManageGifts() && !_list->empty()) {
-		if (_about) {
-			_about = nullptr;
-			resizeToWidth(width());
-		}
-	} else if (!_about) {
+	} else if ((!collectionId && _peer->isSelf())
+		|| (!collectionId && !_peer->canManageGifts())
+		|| maybeEmpty) {
 		_about = std::make_unique<Ui::FlatLabel>(
 			this,
-			(_peer->isSelf()
+			((maybeEmpty && !knownEmpty)
+				? tr::lng_contacts_loading(Ui::Text::WithEntities)
+				: _peer->isSelf()
 				? tr::lng_peer_gifts_about_mine(Ui::Text::RichLangValue)
 				: tr::lng_peer_gifts_about(
 					lt_user,
@@ -911,11 +932,138 @@ void InnerWidget::refreshAbout() {
 			st::giftListAbout);
 		_about->show();
 		resizeToWidth(width());
+	} else if (_about) {
+		_about = nullptr;
+		resizeToWidth(width());
 	}
 }
 
+void InnerWidget::reloadCollection(int id) {
+	_perCollection[id].filter = std::optional<Filter>();
+	_perCollection[id].allLoaded = false;
+
+	auto now = _descriptor.current();
+	now.filter = Filter();
+	now.collectionId = id;
+	_descriptorChanges.fire(std::move(now));
+
+	_api.request(base::take(_loadMoreRequestId)).cancel();
+	_collectionsLoadedCallback = nullptr;
+	refreshButtons();
+	refreshAbout();
+	loadMore();
+}
+
+void InnerWidget::editCollectionGifts(int id) {
+	auto now = _descriptor.current();
+	now.filter = Filter();
+	now.collectionId = 0;
+
+	const auto weak = base::make_weak(this);
+	_window->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_gift_collection_add_title());
+		box->setWidth(st::boxWideWidth);
+		box->setStyle(st::collectionEditBox);
+
+		struct State {
+			rpl::variable<Descriptor> descriptor;
+			rpl::variable<Data::GiftsUpdate> changes;
+			base::unique_qptr<Ui::PopupMenu> menu;
+			bool saving = false;
+		};
+		const auto state = box->lifetime().make_state<State>();
+		const auto content = box->addRow(
+			object_ptr<InnerWidget>(
+				box,
+				_window,
+				_peer,
+				state->descriptor.value(),
+				id,
+				(_all.filter == Filter()) ? _all : Entries()),
+			{});
+		state->changes = content->changes();
+
+		content->descriptorChanges(
+		) | rpl::start_with_next([=](Descriptor now) {
+			state->descriptor = now;
+		}, content->lifetime());
+
+		content->scrollToTop() | rpl::start_with_next([=] {
+			box->scrollToY(0);
+		}, content->lifetime());
+
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+		box->addTopButton(st::collectionEditMenuToggle, [=] {
+			state->menu = base::make_unique_q<Ui::PopupMenu>(
+				box,
+				st::popupMenuWithIcons);
+			content->fillMenu(
+				Ui::Menu::CreateAddActionCallback(state->menu));
+			state->menu->popup(QCursor::pos());
+		});
+		const auto weakBox = base::make_weak(box);
+		auto text = state->changes.value(
+		) | rpl::map([=](const Data::GiftsUpdate &update) {
+			return (!update.added.empty() && update.removed.empty())
+				? tr::lng_gift_collection_add_title()
+				: tr::lng_settings_save();
+		}) | rpl::flatten_latest();
+		box->addButton(std::move(text), [=] {
+			if (state->saving) {
+				return;
+			}
+			using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+			auto add = QVector<MTPInputSavedStarGift>();
+			auto remove = QVector<MTPInputSavedStarGift>();
+			const auto &changes = state->changes.current();
+			for (const auto &id : changes.added) {
+				add.push_back(Api::InputSavedStarGiftId(id));
+			}
+			for (const auto &id : changes.removed) {
+				remove.push_back(Api::InputSavedStarGiftId(id));
+			}
+			if (add.empty() && remove.empty()) {
+				box->closeBox();
+				return;
+			}
+			state->saving = true;
+			const auto session = &_window->session();
+			session->api().request(
+				MTPpayments_UpdateStarGiftCollection(
+					MTP_flags(Flag()
+						| (add.isEmpty() ? Flag() : Flag::f_add_stargift)
+						| (remove.isEmpty()
+							? Flag()
+							: Flag::f_delete_stargift)),
+					_peer->input,
+					MTP_int(id),
+					MTPstring(),
+					MTP_vector<MTPInputSavedStarGift>(remove),
+					MTP_vector<MTPInputSavedStarGift>(add),
+					MTPVector<MTPInputSavedStarGift>())
+			).done([=] {
+				if (const auto strong = weakBox.get()) {
+					state->saving = false;
+					strong->closeBox();
+				}
+				session->data().notifyGiftsUpdate(base::duplicate(changes));
+				if (const auto strong = weak.get()) {
+					strong->reloadCollection(id);
+				}
+			}).fail([=](const MTP::Error &error) {
+				if (const auto strong = weakBox.get()) {
+					state->saving = false;
+					strong->uiShow()->showToast(error.type());
+				}
+			}).send();
+		});
+	}));
+}
+
 void InnerWidget::refreshCollectionsTabs() {
-	if (_collections.empty()) {
+	if (_collections.empty() || _addingToCollectionId) {
 		if (base::take(_collectionsTabs)) {
 			resizeToWidth(width());
 		}
@@ -944,7 +1092,7 @@ void InnerWidget::refreshCollectionsTabs() {
 		.text = { '+' + tr::lng_gift_collection_add(tr::now) },
 	});
 	const auto context = Core::TextContext({
-		.session = &_controller->session(),
+		.session = &_window->session(),
 	});
 	if (!_collectionsTabs) {
 		_collectionsTabs = std::make_unique<Ui::SubTabs>(
@@ -960,15 +1108,18 @@ void InnerWidget::refreshCollectionsTabs() {
 				const auto added = [=](MTPStarGiftCollection result) {
 					collectionAdded(result);
 				};
-				_controller->uiShow()->show(Box(
+				_window->uiShow()->show(Box(
 					NewCollectionBox,
-					_controller,
+					_window,
 					peer(),
 					Data::SavedStarGiftId(),
 					added));
 			} else {
 				_collectionsTabs->setActiveTab(id);
-				_collectionId = (id == u"all"_q) ? 0 : id.toInt();
+
+				auto now = _descriptor.current();
+				now.collectionId = (id == u"all"_q) ? 0 : id.toInt();
+				_descriptorChanges.fire(std::move(now));
 			}
 		}, _collectionsTabs->lifetime());
 	} else {
@@ -1033,6 +1184,101 @@ void InnerWidget::restoreState(not_null<Memento*> memento) {
 	}
 }
 
+void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
+	const auto canManage = _peer->canManageGifts();
+	const auto descriptor = _descriptor.current();
+	const auto filter = descriptor.filter;
+	const auto change = [=](Fn<void(Filter&)> update) {
+		auto now = _descriptor.current();
+		update(now.filter);
+		_descriptorChanges.fire(std::move(now));
+	};
+
+	if (!descriptor.collectionId) {
+		if (filter.sortByValue) {
+			addAction(tr::lng_peer_gifts_filter_by_date(tr::now), [=] {
+				change([](Filter &filter) { filter.sortByValue = false; });
+			}, &st::menuIconSchedule);
+		} else {
+			addAction(tr::lng_peer_gifts_filter_by_value(tr::now), [=] {
+				change([](Filter &filter) { filter.sortByValue = true; });
+			}, &st::menuIconEarn);
+		}
+	}
+
+	if (canManage && !_addingToCollectionId) {
+		const auto peer = _peer;
+		const auto weak = base::make_weak(_window);
+		addAction(tr::lng_gift_collection_add(tr::now), [=] {
+			if (const auto strong = weak.get()) {
+				const auto added = [=](MTPStarGiftCollection result) {
+					collectionAdded(result);
+				};
+				strong->uiShow()->show(Box(
+					NewCollectionBox,
+					strong,
+					peer,
+					Data::SavedStarGiftId(),
+					crl::guard(this, added)));
+			}
+		}, &st::menuIconAddToFolder);
+	}
+
+	addAction({ .isSeparator = true });
+
+	addAction(tr::lng_peer_gifts_filter_unlimited(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipUnlimited = !filter.skipUnlimited;
+			if (filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipLimited = false;
+			}
+		});
+	}, filter.skipUnlimited ? nullptr : &st::mediaPlayerMenuCheck);
+	addAction(tr::lng_peer_gifts_filter_limited(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipLimited = !filter.skipLimited;
+			if (filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipUnlimited = false;
+			}
+		});
+	}, filter.skipLimited ? nullptr : &st::mediaPlayerMenuCheck);
+	addAction(tr::lng_peer_gifts_filter_unique(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipUnique = !filter.skipUnique;
+			if (filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipUnlimited = false;
+			}
+		});
+	}, filter.skipUnique ? nullptr : &st::mediaPlayerMenuCheck);
+
+	if (canManage) {
+		addAction({ .isSeparator = true });
+
+		addAction(tr::lng_peer_gifts_filter_saved(tr::now), [=] {
+			change([](Filter &filter) {
+				filter.skipSaved = !filter.skipSaved;
+				if (filter.skipSaved && filter.skipUnsaved) {
+					filter.skipUnsaved = false;
+				}
+			});
+		}, filter.skipSaved ? nullptr : &st::mediaPlayerMenuCheck);
+		addAction(tr::lng_peer_gifts_filter_unsaved(tr::now), [=] {
+			change([](Filter &filter) {
+				filter.skipUnsaved = !filter.skipUnsaved;
+				if (filter.skipSaved && filter.skipUnsaved) {
+					filter.skipSaved = false;
+				}
+			});
+		}, filter.skipUnsaved ? nullptr : &st::mediaPlayerMenuCheck);
+	}
+}
+
 Memento::Memento(not_null<PeerData*> peer)
 : ContentMemento(peer, nullptr, nullptr, PeerId()) {
 }
@@ -1068,96 +1314,109 @@ Widget::Widget(
 	_inner = setInnerWidget(
 		object_ptr<InnerWidget>(
 			this,
-			controller,
+			controller->parentController(),
 			peer,
-			_filter.value(),
-			_addingToCollectionId.value()));
+			_descriptor.value()));
 	_inner->notifyEnabled(
 	) | rpl::take(1) | rpl::start_with_next([=](bool enabled) {
-		setupNotifyCheckbox(enabled);
+		_notifyEnabled = enabled;
+		refreshBottom();
 	}, _inner->lifetime());
-	_inner->resetFilterRequests(
-	) | rpl::start_with_next([=] {
-		_filter = Filter();
-	}, _inner->lifetime());
-	_inner->addToCollectionRequests(
-	) | rpl::start_with_next([=](int id) {
-		_addingToCollectionId = id;
-		_filter = Filter();
+	_inner->descriptorChanges(
+	) | rpl::start_with_next([=](Descriptor descriptor) {
+		_descriptor = descriptor;
 	}, _inner->lifetime());
 	_inner->scrollToTop() | rpl::start_with_next([=] {
 		scrollTo({ 0, 0 });
 	}, _inner->lifetime());
 
-	_addingToCollectionId.changes() | rpl::start_with_next([=](int id) {
-		toggleAddButton(id != 0);
+	_descriptor.value() | rpl::start_with_next([=] {
+		refreshBottom();
 	}, _inner->lifetime());
 }
 
-void Widget::toggleAddButton(bool shown) {
-	if (!shown) {
+void Widget::refreshBottom() {
+	const auto notify = _notifyEnabled.has_value();
+	const auto descriptor = _descriptor.current();
+	const auto shownId = descriptor.collectionId;
+	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
+	delete _pinnedToBottom.data();
+	if (!notify && !shownId) {
 		setScrollBottomSkip(0);
 		_hasPinnedToBottom = false;
-		delete _pinnedToBottom.data();
-	} else if (!_pinnedToBottom) {
-		_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
-			this,
-			object_ptr<Ui::RpWidget>(this));
-		const auto wrap = _pinnedToBottom.data();
-		wrap->toggle(false, anim::type::instant);
-
-		const auto bottom = wrap->entity();
-		bottom->show();
-
-		const auto save = Ui::CreateChild<Ui::RoundButton>(
-			bottom,
-			tr::lng_settings_save(),
-			st::defaultActiveButton);
-		save->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-		save->show();
-
-		save->setClickedCallback([=] {
-			_inner->saveAdding();
-		});
-
-		const auto &checkSt = st::defaultCheckbox;
-		const auto checkTop = st::boxRadius;
-		bottom->widthValue() | rpl::start_with_next([=](int width) {
-			const auto normal = width
-				- checkSt.margin.left()
-				- checkSt.margin.right();
-			save->resizeToWidth(normal);
-			const auto checkLeft = (width - normal) / 2;
-			save->moveToLeft(checkLeft, checkTop);
-		}, save->lifetime());
-
-		save->heightValue() | rpl::start_with_next([=](int height) {
-			bottom->resize(bottom->width(), st::boxRadius * 2 + height);
-		}, save->lifetime());
-
-		const auto processHeight = [=] {
-			setScrollBottomSkip(wrap->height());
-			wrap->moveToLeft(wrap->x(), height() - wrap->height());
-		};
-
-		_inner->sizeValue(
-		) | rpl::start_with_next([=](const QSize &s) {
-			wrap->resizeToWidth(s.width());
-			crl::on_main(wrap, processHeight);
-		}, wrap->lifetime());
-
-		rpl::combine(
-			wrap->heightValue(),
-			heightValue()
-		) | rpl::start_with_next(processHeight, wrap->lifetime());
-
-		if (_shown) {
-			wrap->toggle(true, anim::type::normal);
-		}
-		_hasPinnedToBottom = true;
+	} else if (shownId) {
+		setupBottomButton(wasBottom);
+	} else {
+		setupNotifyCheckbox(wasBottom, *_notifyEnabled);
 	}
 }
 
+void Widget::setupBottomButton(int wasBottomHeight) {
+	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		this,
+		object_ptr<Ui::RpWidget>(this));
+	const auto wrap = _pinnedToBottom.data();
+	wrap->toggle(false, anim::type::instant);
+
+	const auto bottom = wrap->entity();
+	bottom->show();
+
+	const auto descriptor = _descriptor.current();
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		bottom,
+		rpl::single(QString()),
+		st::collectionEditBox.button);
+	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	button->setText(tr::lng_gift_collection_add_title(
+	) | rpl::map([](const QString &text) {
+		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+	}));
+	button->show();
+
+	button->setClickedCallback([=] {
+		if (const auto id = _descriptor.current().collectionId) {
+			_inner->editCollectionGifts(id);
+		} else {
+			refreshBottom();
+		}
+	});
+
+	const auto buttonTop = st::boxRadius;
+	bottom->widthValue() | rpl::start_with_next([=](int width) {
+		const auto normal = width - 2 * buttonTop;
+		button->resizeToWidth(normal);
+		const auto buttonLeft = (width - normal) / 2;
+		button->moveToLeft(buttonLeft, buttonTop);
+	}, button->lifetime());
+
+	button->heightValue() | rpl::start_with_next([=](int height) {
+		bottom->resize(bottom->width(), st::boxRadius + height);
+	}, button->lifetime());
+
+	const auto processHeight = [=] {
+		setScrollBottomSkip(wrap->height());
+		wrap->moveToLeft(wrap->x(), height() - wrap->height());
+	};
+
+	_inner->sizeValue(
+	) | rpl::start_with_next([=](const QSize &s) {
+		wrap->resizeToWidth(s.width());
+		crl::on_main(wrap, processHeight);
+	}, wrap->lifetime());
+
+	rpl::combine(
+		wrap->heightValue(),
+		heightValue()
+	) | rpl::start_with_next(processHeight, wrap->lifetime());
+
+	if (_shown) {
+		wrap->toggle(
+			true,
+			wasBottomHeight ? anim::type::instant : anim::type::normal);
+	}
+	_hasPinnedToBottom = true;
+}
+
 void Widget::showFinished() {
 	_shown = true;
 	if (const auto bottom = _pinnedToBottom.data()) {
@@ -1165,7 +1424,7 @@ void Widget::showFinished() {
 	}
 }
 
-void Widget::setupNotifyCheckbox(bool enabled) {
+void Widget::setupNotifyCheckbox(int wasBottomHeight, bool enabled) {
 	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
 		this,
 		object_ptr<Ui::RpWidget>(this));
@@ -1226,110 +1485,19 @@ void Widget::setupNotifyCheckbox(bool enabled) {
 	) | rpl::start_with_next(processHeight, wrap->lifetime());
 
 	if (_shown) {
-		wrap->toggle(true, anim::type::normal);
+		wrap->toggle(
+			true,
+			wasBottomHeight ? anim::type::instant : anim::type::normal);
 	}
 	_hasPinnedToBottom = true;
 }
 
 void Widget::fillTopBarMenu(const Ui::Menu::MenuCallback &addAction) {
-	const auto peer = _inner->peer();
-	const auto canManage = peer->canManageGifts();
-	const auto filter = _filter.current();
-	const auto change = [=](Fn<void(Filter&)> update) {
-		auto now = _filter.current();
-		update(now);
-		_filter = now;
-	};
-
-	if (filter.sortByValue) {
-		addAction(tr::lng_peer_gifts_filter_by_date(tr::now), [=] {
-			change([](Filter &filter) { filter.sortByValue = false; });
-		}, &st::menuIconSchedule);
-	} else {
-		addAction(tr::lng_peer_gifts_filter_by_value(tr::now), [=] {
-			change([](Filter &filter) { filter.sortByValue = true; });
-		}, &st::menuIconEarn);
-	}
-
-	if (canManage) {
-		const auto weak = base::make_weak(
-			(Window::SessionNavigation*)controller());
-		addAction(tr::lng_gift_collection_add(tr::now), [=] {
-			if (const auto strong = weak.get()) {
-				const auto added = [=](MTPStarGiftCollection result) {
-					_inner->collectionAdded(result);
-				};
-				strong->uiShow()->show(Box(
-					NewCollectionBox,
-					strong,
-					peer,
-					Data::SavedStarGiftId(),
-					added));
-			}
-		}, &st::menuIconAddToFolder);
-	}
-
-	addAction({ .isSeparator = true });
-
-	addAction(tr::lng_peer_gifts_filter_unlimited(tr::now), [=] {
-		change([](Filter &filter) {
-			filter.skipUnlimited = !filter.skipUnlimited;
-			if (filter.skipUnlimited
-				&& filter.skipLimited
-				&& filter.skipUnique) {
-				filter.skipLimited = false;
-			}
-		});
-	}, filter.skipUnlimited ? nullptr : &st::mediaPlayerMenuCheck);
-	addAction(tr::lng_peer_gifts_filter_limited(tr::now), [=] {
-		change([](Filter &filter) {
-			filter.skipLimited = !filter.skipLimited;
-			if (filter.skipUnlimited
-				&& filter.skipLimited
-				&& filter.skipUnique) {
-				filter.skipUnlimited = false;
-			}
-		});
-	}, filter.skipLimited ? nullptr : &st::mediaPlayerMenuCheck);
-	addAction(tr::lng_peer_gifts_filter_unique(tr::now), [=] {
-		change([](Filter &filter) {
-			filter.skipUnique = !filter.skipUnique;
-			if (filter.skipUnlimited
-				&& filter.skipLimited
-				&& filter.skipUnique) {
-				filter.skipUnlimited = false;
-			}
-		});
-	}, filter.skipUnique ? nullptr : &st::mediaPlayerMenuCheck);
-
-	if (canManage) {
-		addAction({ .isSeparator = true });
-
-		addAction(tr::lng_peer_gifts_filter_saved(tr::now), [=] {
-			change([](Filter &filter) {
-				filter.skipSaved = !filter.skipSaved;
-				if (filter.skipSaved && filter.skipUnsaved) {
-					filter.skipUnsaved = false;
-				}
-			});
-		}, filter.skipSaved ? nullptr : &st::mediaPlayerMenuCheck);
-		addAction(tr::lng_peer_gifts_filter_unsaved(tr::now), [=] {
-			change([](Filter &filter) {
-				filter.skipUnsaved = !filter.skipUnsaved;
-				if (filter.skipSaved && filter.skipUnsaved) {
-					filter.skipSaved = false;
-				}
-			});
-		}, filter.skipUnsaved ? nullptr : &st::mediaPlayerMenuCheck);
-	}
+	_inner->fillMenu(addAction);
 }
 
 rpl::producer<QString> Widget::title() {
-	return _addingToCollectionId.value() | rpl::map([](int id) {
-		return id
-			? tr::lng_gift_collection_add_title()
-			: tr::lng_peer_gifts_title();
-	}) | rpl::flatten_latest();
+	return tr::lng_peer_gifts_title();
 }
 
 rpl::producer<bool> Widget::desiredBottomShadowVisibility() {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index 4196e9cba8..512cd66337 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -45,6 +45,15 @@ struct Filter {
 	friend inline bool operator==(Filter, Filter) = default;
 };
 
+struct Descriptor {
+	Filter filter;
+	int collectionId = 0;
+
+	friend inline bool operator==(
+		const Descriptor &,
+		const Descriptor &) = default;
+};
+
 class InnerWidget;
 
 class Memento final : public ContentMemento {
@@ -98,14 +107,15 @@ private:
 
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
-	void setupNotifyCheckbox(bool enabled);
-	void toggleAddButton(bool shown);
+	void setupNotifyCheckbox(int wasBottomHeight, bool enabled);
+	void setupBottomButton(int wasBottomHeight);
+	void refreshBottom();
 
 	InnerWidget *_inner = nullptr;
 	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
 	rpl::variable<bool> _hasPinnedToBottom;
-	rpl::variable<Filter> _filter;
-	rpl::variable<int> _addingToCollectionId;
+	rpl::variable<Descriptor> _descriptor;
+	std::optional<bool> _notifyEnabled;
 	bool _shown = false;
 
 };
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index b9c69f00e5..8deb501b66 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -99,6 +99,7 @@ creditsGiftBox: Box(defaultBox) {
 giftBox: Box(defaultBox) {
 	buttonPadding: margins(22px, 11px, 22px, 12px);
 	buttonHeight: 42px;
+	buttonWide: true;
 	button: RoundButton(defaultActiveButton) {
 		height: 42px;
 		textTop: 12px;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 1cb389224f..c84d8d8591 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 1cb389224f285e619f2fbc3f9395516d17d62682
+Subproject commit c84d8d8591f6d78c28af1caf2edc251c0ef84ff7

From 2b16b0fc7c6bd1efc65a6e91df2b33c60f90cf7e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Jul 2025 16:03:38 +0400
Subject: [PATCH 050/341] Fix gifts display when can't manage.

---
 .../peer_gifts/info_peer_gifts_widget.cpp     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 0ba53ddcbd..f2cd9454c2 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -858,7 +858,9 @@ void InnerWidget::refreshAbout() {
 	const auto maybeEmpty = _list->empty();
 	const auto knownEmpty = maybeEmpty && _entries->allLoaded;
 	const auto filteredEmpty = knownEmpty && filter.skipsSomething();
-	const auto collectionCanAdd = knownEmpty && descriptor.collectionId != 0;
+	const auto collectionCanAdd = knownEmpty
+		&& descriptor.collectionId != 0
+		&& _peer->canManageGifts();
 	if (filteredEmpty) {
 		auto text = tr::lng_peer_gifts_empty_search(
 			tr::now,
@@ -1087,10 +1089,12 @@ void InnerWidget::refreshCollectionsTabs() {
 			.text = std::move(title),
 		});
 	}
-	tabs.push_back({
-		.id = u"add"_q,
-		.text = { '+' + tr::lng_gift_collection_add(tr::now) },
-	});
+	if (_peer->canManageGifts()) {
+		tabs.push_back({
+			.id = u"add"_q,
+			.text = { '+' + tr::lng_gift_collection_add(tr::now) },
+		});
+	}
 	const auto context = Core::TextContext({
 		.session = &_window->session(),
 	});
@@ -1224,7 +1228,9 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
 		}, &st::menuIconAddToFolder);
 	}
 
-	addAction({ .isSeparator = true });
+	if (canManage || !descriptor.collectionId) {
+		addAction({ .isSeparator = true });
+	}
 
 	addAction(tr::lng_peer_gifts_filter_unlimited(tr::now), [=] {
 		change([](Filter &filter) {
@@ -1339,12 +1345,13 @@ void Widget::refreshBottom() {
 	const auto notify = _notifyEnabled.has_value();
 	const auto descriptor = _descriptor.current();
 	const auto shownId = descriptor.collectionId;
+	const auto withButton = shownId && peer()->canManageGifts();
 	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
 	delete _pinnedToBottom.data();
-	if (!notify && !shownId) {
+	if (!notify && !withButton) {
 		setScrollBottomSkip(0);
 		_hasPinnedToBottom = false;
-	} else if (shownId) {
+	} else if (withButton) {
 		setupBottomButton(wasBottom);
 	} else {
 		setupNotifyCheckbox(wasBottom, *_notifyEnabled);

From 448356f53441b2737d7f300c1bbc031e24f49a4c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Jul 2025 16:57:54 +0400
Subject: [PATCH 051/341] Allow editing/deleting collections.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 .../info_peer_gifts_collections.cpp           |  76 ++++++++++---
 .../peer_gifts/info_peer_gifts_collections.h  |   8 ++
 .../peer_gifts/info_peer_gifts_widget.cpp     | 106 ++++++++++++++++++
 Telegram/SourceFiles/ui/controls/sub_tabs.cpp |  10 ++
 Telegram/SourceFiles/ui/controls/sub_tabs.h   |   3 +
 6 files changed, 189 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 42bdae3036..ac5bd51b7f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3765,6 +3765,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_collection_limit_title" = "Limit Reached";
 "lng_gift_collection_limit_text" = "Please remove one of the existing collections to add a new one.";
 "lng_gift_collection_delete" = "Delete Collection";
+"lng_gift_collection_delete_sure" = "Are you sure you want to delete this collection?";
+"lng_gift_collection_delete_button" = "Delete";
 "lng_gift_collection_add_to" = "Add to Collection";
 
 "lng_accounts_limit_title" = "Limit Reached";
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index c9c552814a..9a1cafb401 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -25,26 +25,29 @@ namespace {
 
 constexpr auto kCollectionNameLimit = 12;
 
-} // namespace
-
-void NewCollectionBox(
+void EditCollectionBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer,
+		int id,
 		Data::SavedStarGiftId addId,
-		Fn<void(MTPStarGiftCollection)> added) {
+		QString currentName,
+		Fn<void(MTPStarGiftCollection)> finished) {
 	box->setTitle(tr::lng_gift_collection_new_title());
 
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
-			tr::lng_gift_collection_new_text(),
+			(id
+				? tr::lng_gift_collection_edit()
+				: tr::lng_gift_collection_new_text()),
 			st::collectionAbout));
 	const auto title = box->addRow(
 		object_ptr<Ui::InputField>(
 			box,
 			st::collectionNameField,
-			tr::lng_gift_collection_new_ph()));
+			tr::lng_gift_collection_new_ph(),
+			currentName));
 	title->setMaxLength(kCollectionNameLimit * 2);
 	box->setFocusCallback([=] {
 		title->setFocusFast();
@@ -56,7 +59,10 @@ void NewCollectionBox(
 	const auto session = &peer->session();
 
 	const auto creating = std::make_shared<bool>(false);
-	box->addButton(tr::lng_gift_collection_new_create(), [=] {
+	auto text = id
+		? tr::lng_settings_save()
+		: tr::lng_gift_collection_new_create();
+	box->addButton(std::move(text), [=] {
 		if (*creating) {
 			return;
 		}
@@ -72,22 +78,19 @@ void NewCollectionBox(
 			ids.push_back(Api::InputSavedStarGiftId(addId));
 		}
 		const auto weak = base::make_weak(box);
-		session->api().request(MTPpayments_CreateStarGiftCollection(
-			peer->input,
-			MTP_string(text),
-			MTP_vector<MTPInputSavedStarGift>(ids)
-		)).done([=](const MTPStarGiftCollection &result) {
+		const auto done = [=](const MTPStarGiftCollection &result) {
 			*creating = false;
-			if (const auto onstack = added) {
+			if (const auto onstack = finished) {
 				onstack(result);
 			}
 			if (const auto strong = weak.get()) {
 				strong->closeBox();
 			}
-		}).fail([=](const MTP::Error &error) {
+		};
+		const auto fail = [=](const MTP::Error &error) {
 			*creating = false;
 			const auto &type = error.type();
-			if (type == u""_q) {
+			if (type == u"COLLECTIONS_TOO_MANY"_q) {
 				show->show(Ui::MakeInformBox({
 					.text = tr::lng_gift_collection_limit_text(),
 					.confirmText = tr::lng_box_ok(),
@@ -99,13 +102,54 @@ void NewCollectionBox(
 			} else {
 				show->showToast(error.type());
 			}
-		}).send();
+		};
+		if (id) {
+			using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
+			session->api().request(MTPpayments_UpdateStarGiftCollection(
+				MTP_flags(Flag::f_title),
+				peer->input,
+				MTP_int(id),
+				MTP_string(text),
+				MTPVector<MTPInputSavedStarGift>(),
+				MTPVector<MTPInputSavedStarGift>(),
+				MTPVector<MTPInputSavedStarGift>()
+			)).done(done).fail(fail).send();
+		} else {
+			session->api().request(MTPpayments_CreateStarGiftCollection(
+				peer->input,
+				MTP_string(text),
+				MTP_vector<MTPInputSavedStarGift>(ids)
+			)).done(done).fail(fail).send();
+		}
 	});
 
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
 	});
+}
 
+} // namespace
+
+void NewCollectionBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		Data::SavedStarGiftId addId,
+		Fn<void(MTPStarGiftCollection)> added) {
+	EditCollectionBox(box, navigation, peer, 0, addId, QString(), added);
+}
+
+void EditCollectionNameBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		QString current,
+		Fn<void(QString)> done) {
+	EditCollectionBox(box, navigation, peer, id, {}, current, [=](
+			const MTPStarGiftCollection &result) {
+		done(qs(result.data().vtitle()));
+	});
 }
 
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
index a59a1cde0b..c60c32e312 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.h
@@ -28,4 +28,12 @@ void NewCollectionBox(
 	Data::SavedStarGiftId addId,
 	Fn<void(MTPStarGiftCollection)> added);
 
+void EditCollectionNameBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	int id,
+	QString current,
+	Fn<void(QString)> done);
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index f2cd9454c2..80f4c66f9f 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/peer_gifts/info_peer_gifts_collections.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/info_controller.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/sub_tabs.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
@@ -173,9 +174,15 @@ private:
 	void validateButtons();
 	void showGift(int index);
 	void showMenuFor(not_null<GiftButton*> button, QPoint point);
+	void showMenuForCollection(int id);
+	void editCollectionName(int id);
+	void confirmDeleteCollection(int id);
 	void refreshAbout();
 	void refreshCollectionsTabs();
 
+	void collectionRenamed(int id, QString name);
+	void collectionRemoved(int id);
+
 	void markPinned(std::vector<Entry>::iterator i);
 	void markUnpinned(std::vector<Entry>::iterator i);
 
@@ -776,6 +783,60 @@ auto InnerWidget::pinnedSavedGifts()
 	};
 }
 
+void InnerWidget::showMenuForCollection(int id) {
+	if (_menu || _addingToCollectionId) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+	addAction(tr::lng_gift_collection_add_title(tr::now), [=] {
+		editCollectionGifts(id);
+	}, &st::menuIconGiftPremium);
+	addAction(tr::lng_gift_collection_edit(tr::now), [=] {
+		editCollectionName(id);
+	}, &st::menuIconEdit);
+	addAction({
+		.text = tr::lng_gift_collection_delete(tr::now),
+		.handler = [=] { confirmDeleteCollection(id); },
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
+	});
+	_menu->popup(QCursor::pos());
+}
+
+void InnerWidget::editCollectionName(int id) {
+	const auto done = [=](QString name) {
+		collectionRenamed(id, name);
+	};
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i == end(_collections)) {
+		return;
+	}
+	_window->uiShow()->show(Box(
+		EditCollectionNameBox,
+		_window,
+		peer(),
+		id,
+		i->title,
+		done));
+}
+
+void InnerWidget::confirmDeleteCollection(int id) {
+	const auto done = [=](Fn<void()> close) {
+		_window->session().api().request(
+			MTPpayments_DeleteStarGiftCollection(_peer->input, MTP_int(id))
+		).send();
+		collectionRemoved(id);
+		close();
+	};
+	_window->uiShow()->show(Ui::MakeConfirmBox({
+		.text = tr::lng_gift_collection_delete_sure(),
+		.confirmed = crl::guard(this, done),
+		.confirmText = tr::lng_gift_collection_delete_button(),
+		.confirmStyle = &st::attentionBoxButton,
+	}));
+}
+
 void InnerWidget::showMenuFor(not_null<GiftButton*> button, QPoint point) {
 	if (_menu || _addingToCollectionId) {
 		return;
@@ -1126,12 +1187,57 @@ void InnerWidget::refreshCollectionsTabs() {
 				_descriptorChanges.fire(std::move(now));
 			}
 		}, _collectionsTabs->lifetime());
+
+		_collectionsTabs->contextMenuRequests(
+		) | rpl::start_with_next([=](const QString &id) {
+			if (id == u"add"_q
+				|| id == u"all"_q
+				|| !_peer->canManageGifts()) {
+				return;
+			}
+			showMenuForCollection(id.toInt());
+		}, _collectionsTabs->lifetime());
 	} else {
 		_collectionsTabs->setTabs(std::move(tabs), context);
 	}
 	resizeToWidth(width());
 }
 
+void InnerWidget::collectionRenamed(int id, QString name) {
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i != end(_collections)) {
+		i->title = name;
+		refreshCollectionsTabs();
+	}
+}
+
+void InnerWidget::collectionRemoved(int id) {
+	auto now = _descriptor.current();
+	if (now.collectionId == id) {
+		now.collectionId = 0;
+		_descriptorChanges.fire(std::move(now));
+	}
+	Assert(_entries != &_perCollection[id]);
+	_perCollection.remove(id);
+	const auto removeFrom = [&](Entries &entries) {
+		for (auto &entry : entries.list) {
+			entry.gift.collectionIds.erase(
+				ranges::remove(entry.gift.collectionIds, id),
+				end(entry.gift.collectionIds));
+		}
+	};
+	removeFrom(_all);
+	for (auto &[_, entries] : _perCollection) {
+		removeFrom(entries);
+	}
+
+	const auto i = ranges::find(_collections, id, &Data::GiftCollection::id);
+	if (i != end(_collections)) {
+		_collections.erase(i);
+		refreshCollectionsTabs();
+	}
+}
+
 int InnerWidget::resizeGetHeight(int width) {
 	const auto padding = st::giftBoxPadding;
 	const auto count = int(_list->size());
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
index 41e6edafc0..4d8a4abc93 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
@@ -95,6 +95,10 @@ rpl::producer<QString> SubTabs::activated() const {
 	return _activated.events();
 }
 
+rpl::producer<QString> SubTabs::contextMenuRequests() const {
+	return _contextMenuRequests.events();
+}
+
 void SubTabs::setSelected(int index) {
 	const auto was = (_selected >= 0);
 	const auto now = (index >= 0);
@@ -195,6 +199,12 @@ void SubTabs::mouseReleaseEvent(QMouseEvent *e) {
 	}
 }
 
+void SubTabs::contextMenuEvent(QContextMenuEvent *e) {
+	if (_selected >= 0 && _selected < _buttons.size()) {
+		_contextMenuRequests.fire_copy(_buttons[_selected].tab.id);
+	}
+}
+
 void SubTabs::paintEvent(QPaintEvent *e) {
 	auto p = QPainter(this);
 	auto hq = PainterHighQualityEnabler(p);
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.h b/Telegram/SourceFiles/ui/controls/sub_tabs.h
index 3e98c23bc2..31c509b85d 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.h
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.h
@@ -43,6 +43,7 @@ public:
 	void setActiveTab(const QString &id);
 
 	[[nodiscard]] rpl::producer<QString> activated() const;
+	[[nodiscard]] rpl::producer<QString> contextMenuRequests() const;
 
 private:
 	struct Button {
@@ -57,6 +58,7 @@ private:
 	void mouseMoveEvent(QMouseEvent *e) override;
 	void mousePressEvent(QMouseEvent *e) override;
 	void mouseReleaseEvent(QMouseEvent *e) override;
+	void contextMenuEvent(QContextMenuEvent *e) override;
 	void paintEvent(QPaintEvent *e) override;
 	bool eventHook(QEvent *e) override;
 
@@ -66,6 +68,7 @@ private:
 
 	std::vector<Button> _buttons;
 	rpl::event_stream<QString> _activated;
+	rpl::event_stream<QString> _contextMenuRequests;
 	int _dragx = 0;
 	int _pressx = 0;
 	float64 _dragscroll = 0.;

From de44c57ada88ab5ca11a80e387c62569e7132568 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 24 Jul 2025 17:04:07 +0400
Subject: [PATCH 052/341] Allow editing collection from three dots.

---
 .../peer_gifts/info_peer_gifts_widget.cpp     | 55 +++++++++++--------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 80f4c66f9f..72ebefb4c5 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -125,6 +125,8 @@ public:
 
 	void reloadCollection(int id);
 	void editCollectionGifts(int id);
+	void editCollectionName(int id);
+	void confirmDeleteCollection(int id);
 	void collectionAdded(MTPStarGiftCollection result);
 	void fillMenu(const Ui::Menu::MenuCallback &addAction);
 
@@ -175,8 +177,6 @@ private:
 	void showGift(int index);
 	void showMenuFor(not_null<GiftButton*> button, QPoint point);
 	void showMenuForCollection(int id);
-	void editCollectionName(int id);
-	void confirmDeleteCollection(int id);
 	void refreshAbout();
 	void refreshCollectionsTabs();
 
@@ -1304,7 +1304,8 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
 		_descriptorChanges.fire(std::move(now));
 	};
 
-	if (!descriptor.collectionId) {
+	const auto collectionId = descriptor.collectionId;
+	if (!collectionId) {
 		if (filter.sortByValue) {
 			addAction(tr::lng_peer_gifts_filter_by_date(tr::now), [=] {
 				change([](Filter &filter) { filter.sortByValue = false; });
@@ -1314,27 +1315,37 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
 				change([](Filter &filter) { filter.sortByValue = true; });
 			}, &st::menuIconEarn);
 		}
+		if (canManage && !_addingToCollectionId) {
+			const auto peer = _peer;
+			const auto weak = base::make_weak(_window);
+			addAction(tr::lng_gift_collection_add(tr::now), [=] {
+				if (const auto strong = weak.get()) {
+					const auto added = [=](MTPStarGiftCollection result) {
+						collectionAdded(result);
+					};
+					strong->uiShow()->show(Box(
+						NewCollectionBox,
+						strong,
+						peer,
+						Data::SavedStarGiftId(),
+						crl::guard(this, added)));
+				}
+			}, &st::menuIconAddToFolder);
+		}
+	} else if (canManage) {
+		addAction(tr::lng_gift_collection_add_title(tr::now), [=] {
+			editCollectionGifts(collectionId);
+		}, &st::menuIconGiftPremium);
+
+		addAction({
+			.text = tr::lng_gift_collection_delete(tr::now),
+			.handler = [=] { confirmDeleteCollection(collectionId); },
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
 	}
 
-	if (canManage && !_addingToCollectionId) {
-		const auto peer = _peer;
-		const auto weak = base::make_weak(_window);
-		addAction(tr::lng_gift_collection_add(tr::now), [=] {
-			if (const auto strong = weak.get()) {
-				const auto added = [=](MTPStarGiftCollection result) {
-					collectionAdded(result);
-				};
-				strong->uiShow()->show(Box(
-					NewCollectionBox,
-					strong,
-					peer,
-					Data::SavedStarGiftId(),
-					crl::guard(this, added)));
-			}
-		}, &st::menuIconAddToFolder);
-	}
-
-	if (canManage || !descriptor.collectionId) {
+	if (canManage || !collectionId) {
 		addAction({ .isSeparator = true });
 	}
 

From a80b67fdc926eef4b82d84dc936ad19ca57b4403 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 10:21:29 +0400
Subject: [PATCH 053/341] Fix build with GCC.

---
 Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 72ebefb4c5..30de7c0fe0 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -1485,7 +1485,6 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 	const auto bottom = wrap->entity();
 	bottom->show();
 
-	const auto descriptor = _descriptor.current();
 	const auto button = Ui::CreateChild<Ui::RoundButton>(
 		bottom,
 		rpl::single(QString()),

From 237d7c1ec1b1d09cc9761b574d7ea845cbc944ff Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 23 Jul 2025 12:06:34 +0400
Subject: [PATCH 054/341] Version 5.16.5.

- Age verification support.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 4 ++++
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index d63d433f73..9cc69dfe9d 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.16.4.0" />
+    Version="5.16.5.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 87df6014c0..ecd7e7e404 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,16,4,0
- PRODUCTVERSION 5,16,4,0
+ FILEVERSION 5,16,5,0
+ PRODUCTVERSION 5,16,5,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.16.4.0"
+            VALUE "FileVersion", "5.16.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.16.4.0"
+            VALUE "ProductVersion", "5.16.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index dcbfacd9e6..c6ef013a03 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,16,4,0
- PRODUCTVERSION 5,16,4,0
+ FILEVERSION 5,16,5,0
+ PRODUCTVERSION 5,16,5,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", "5.16.4.0"
+            VALUE "FileVersion", "5.16.5.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.16.4.0"
+            VALUE "ProductVersion", "5.16.5.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index accbe63b7f..ab667eca30 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5016004;
-constexpr auto AppVersionStr = "5.16.4";
+constexpr auto AppVersion = 5016005;
+constexpr auto AppVersionStr = "5.16.5";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index ea436f7a45..383a21af27 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5016004
+AppVersion         5016005
 AppVersionStrMajor 5.16
-AppVersionStrSmall 5.16.4
-AppVersionStr      5.16.4
+AppVersionStrSmall 5.16.5
+AppVersionStr      5.16.5
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.16.4
+AppVersionOriginal 5.16.5
diff --git a/changelog.txt b/changelog.txt
index ac227269eb..ef2d458692 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+5.16.5 (23.07.25)
+
+- Age verification support.
+
 5.16.4 (11.07.25)
 
 - Fix problem with negative unread counters.

From c94a44aeb84a9bff0e7493af44a0c82e207ee64e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 11:38:25 +0400
Subject: [PATCH 055/341] Fix possible crash in gift sending.

---
 Telegram/SourceFiles/boxes/star_gift_box.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index a2ef4b1cb3..de5f015e46 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2526,6 +2526,7 @@ void SendGiftBox(
 		if (!state->messageAllowed.current()) {
 			details.text = {};
 		}
+		const auto copy = state->media; // Let media outlive the box.
 		const auto weak = base::make_weak(box);
 		const auto done = [=](Payments::CheckoutResult result) {
 			if (result == Payments::CheckoutResult::Paid) {
@@ -2533,7 +2534,7 @@ void SendGiftBox(
 					|| v::is<GiftTypeStars>(details.descriptor)) {
 					window->session().credits().load(true);
 				}
-				const auto copy = state->media;
+				const auto another = copy; // Let media outlive the box.
 				window->showPeerHistory(peer);
 				ShowSentToast(window, details.descriptor, details);
 			}

From cd39853dc8893516da0fb9cee4683bd62664e038 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 24 Jul 2025 11:44:29 +0000
Subject: [PATCH 056/341] Never use LLD with non-Debug build types

---
 Telegram/build/docker/centos_env/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 4df1a8508b..4aecee4709 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -31,7 +31,7 @@ for i in "\$@"; do
 done
 exec /usr/bin/pkg-config --static "\$@"
 EOF
-RUN sed -i '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/")/ -O0 {% if LTO %}-fno-lto -fno-use-linker-plugin -fuse-ld=lld{% endif %}")/' /usr/share/cmake/Modules/Compiler/GNU.cmake
+RUN sed -i '/CMAKE_${lang}_FLAGS_DEBUG_INIT/s/")/ -O0 {% if LTO %}-fno-lto -fno-use-linker-plugin{% endif %} -fuse-ld=lld")/' /usr/share/cmake/Modules/Compiler/GNU.cmake
 RUN sed -i 's/NO_DEFAULT_PATH//g; s/PKG_CONFIG_ALLOW_SYSTEM_LIBS/PKG_CONFIG_IS_DUMB/g' /usr/share/cmake/Modules/FindPkgConfig.cmake
 RUN sed -i 's/set(OpenGL_GL_PREFERENCE "")/set(OpenGL_GL_PREFERENCE "LEGACY")/' /usr/share/cmake/Modules/FindOpenGL.cmake
 RUN sed -i '/Requires.private: valgrind/d' /usr/lib64/pkgconfig/libdrm.pc
@@ -46,7 +46,7 @@ ENV RANLIB=gcc-ranlib
 ENV NM=gcc-nm
 ENV CFLAGS='{% if DEBUG %}-g{% endif %} -O3 {% if LTO %}-flto=auto -ffat-lto-objects{% endif %} -pipe -fPIC -fno-strict-aliasing -fexceptions -fasynchronous-unwind-tables -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -fhardened -Wno-hardened'
 ENV CXXFLAGS=$CFLAGS
-ENV LDFLAGS='{% if not LTO %}-fuse-ld=lld{% endif %} -static-libstdc++ -static-libgcc -static-libasan -pthread -ldl -Wl,--as-needed -Wl,-z,muldefs'
+ENV LDFLAGS='-static-libstdc++ -static-libgcc -static-libasan -pthread -Wl,--push-state,--no-as-needed,-ldl,--pop-state -Wl,--as-needed -Wl,-z,muldefs'
 
 ENV CMAKE_GENERATOR=Ninja
 ENV CMAKE_BUILD_TYPE=None
@@ -533,7 +533,7 @@ RUN git clone -b n6.1.1 --depth=1 https://github.com/FFmpeg/FFmpeg.git \
 	&& ./configure \
 		--extra-cflags="-fno-lto -DCONFIG_SAFE_BITSTREAM_READER=1" \
 		--extra-cxxflags="-fno-lto -DCONFIG_SAFE_BITSTREAM_READER=1" \
-		--extra-ldflags="-lstdc++" \
+		--extra-ldflags="-Wl,--push-state,--no-as-needed,-lstdc++,--pop-state" \
 		--disable-debug \
 		--disable-programs \
 		--disable-doc \

From 58375f06e5fadd1e35cb8f9bcb99e09f17528b10 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 13:05:07 +0400
Subject: [PATCH 057/341] Fix buttons in non-wide-button boxes.

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c84d8d8591..f123352975 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c84d8d8591f6d78c28af1caf2edc251c0ef84ff7
+Subproject commit f123352975386b083ef20aa6e53a9f2a45a85beb

From d458bf6be38963c3aae0fff08d7d2e974329b404 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 13:05:41 +0400
Subject: [PATCH 058/341] Fix possible negative folder counters.

---
 Telegram/SourceFiles/history/history.cpp | 14 +++++++++-----
 Telegram/SourceFiles/history/history.h   |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 3c8c10098e..ed146023f4 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -1983,13 +1983,17 @@ bool History::unreadCountKnown() const {
 	return _unreadCount.has_value();
 }
 
+bool History::useMyUnreadInParent() const {
+	return !isForum() && !amMonoforumAdmin();
+}
+
 void History::setUnreadCount(int newUnreadCount) {
 	Expects(folderKnown());
 
 	if (_unreadCount == newUnreadCount) {
 		return;
 	}
-	const auto notifier = unreadStateChangeNotifier(!isForum());
+	const auto notifier = unreadStateChangeNotifier(useMyUnreadInParent());
 	_unreadCount = newUnreadCount;
 
 	const auto lastOutgoing = [&] {
@@ -2028,7 +2032,7 @@ void History::setUnreadMark(bool unread) {
 		return;
 	}
 	const auto notifier = unreadStateChangeNotifier(
-		!unreadCount() && !isForum());
+		useMyUnreadInParent() && !unreadCount());
 	Thread::setUnreadMarkFlag(unread);
 }
 
@@ -2060,9 +2064,9 @@ void History::setMuted(bool muted) {
 	if (this->muted() == muted) {
 		return;
 	} else {
-		const auto state = isForum()
-			? Dialogs::BadgesState()
-			: computeBadgesState();
+		const auto state = useMyUnreadInParent()
+			? computeBadgesState()
+			: Dialogs::BadgesState();
 		const auto notify = (state.unread || state.reaction);
 		const auto notifier = unreadStateChangeNotifier(notify);
 		Thread::setMuted(muted);
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 7f556bbc71..047a341094 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -608,6 +608,7 @@ private:
 
 	void hasUnreadMentionChanged(bool has) override;
 	void hasUnreadReactionChanged(bool has) override;
+	[[nodiscard]] bool useMyUnreadInParent() const;
 
 	const std::unique_ptr<HistoryMainElementDelegateMixin> _delegateMixin;
 

From bc20e65aae0cb8b3651f7af2873d90889f96d12d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 15:24:13 +0400
Subject: [PATCH 059/341] Support Ctrl+Shift+V "Paste as Plain Text".

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f123352975..ea3c209939 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f123352975386b083ef20aa6e53a9f2a45a85beb
+Subproject commit ea3c209939fc10e93750c4207f5aa1fe6af66e99

From 26b3b13bc4835f7c29aa1417754500d7285374e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 17:08:48 +0400
Subject: [PATCH 060/341] Fix edit gift collection name box.

---
 .../peer_gifts/info_peer_gifts_collections.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index 9a1cafb401..24df5b6410 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -33,15 +33,17 @@ void EditCollectionBox(
 		Data::SavedStarGiftId addId,
 		QString currentName,
 		Fn<void(MTPStarGiftCollection)> finished) {
-	box->setTitle(tr::lng_gift_collection_new_title());
+	box->setTitle(id
+		? tr::lng_gift_collection_edit()
+		: tr::lng_gift_collection_new_title());
 
-	box->addRow(
-		object_ptr<Ui::FlatLabel>(
-			box,
-			(id
-				? tr::lng_gift_collection_edit()
-				: tr::lng_gift_collection_new_text()),
-			st::collectionAbout));
+	if (!id) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_collection_new_text(),
+				st::collectionAbout));
+	}
 	const auto title = box->addRow(
 		object_ptr<Ui::InputField>(
 			box,

From cc79c2cb497fc81bc8c451d8e53df54c62c5c5fd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 17:09:04 +0400
Subject: [PATCH 061/341] Use separate lang key for All Gifts collection.

---
 Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 30de7c0fe0..07f985ecce 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -1135,7 +1135,7 @@ void InnerWidget::refreshCollectionsTabs() {
 	auto tabs = std::vector<Ui::SubTabs::Tab>();
 	tabs.push_back({
 		.id = u"all"_q,
-		.text = tr::lng_gift_stars_tabs_all(tr::now, Ui::Text::WithEntities),
+		.text = tr::lng_gift_collection_all(tr::now, Ui::Text::WithEntities),
 	});
 	for (const auto &collection : _collections) {
 		auto title = TextWithEntities();

From 86d306632d0940d858e73459dd1cab037b9d78d4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 17:09:54 +0400
Subject: [PATCH 062/341] Fix possible crash in stories state restore.

---
 Telegram/SourceFiles/info/stories/info_stories_provider.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index f6863bee8a..cb7528a7c7 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -465,7 +465,7 @@ void Provider::saveState(
 		not_null<Media::Memento*> memento,
 		ListScrollTopState scrollState) {
 	if (_aroundId != kDefaultAroundId && scrollState.item) {
-		memento->setAroundId({ _peer->id, _aroundId });
+		memento->setAroundId({ _peer->id, StoryIdToMsgId(_aroundId) });
 		memento->setIdsLimit(_idsLimit);
 		memento->setScrollTopItem(scrollState.item->globalId());
 		memento->setScrollTopItemPosition(scrollState.position);

From 2f3792a3ee1da1b5627e85ae2f173c34531228d7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 17:10:18 +0400
Subject: [PATCH 063/341] Fix emoji status details display.

---
 Telegram/SourceFiles/settings/settings_premium.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index 5ca2783923..c7e520188a 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -700,9 +700,15 @@ TopBarWithSticker::	TopBarWithSticker(
 	}, lifetime());
 
 	rpl::combine(
-		std::move(args.stickerValue),
-		std::move(args.nameValue),
-		std::move(args.aboutValue)
+		(args.stickerValue
+			? std::move(args.stickerValue)
+			: rpl::single((DocumentData*)nullptr)),
+		(args.nameValue
+			? std::move(args.nameValue)
+			: rpl::single(QString())),
+		(args.aboutValue
+			? std::move(args.aboutValue)
+			: rpl::single(TextWithEntities()))
 	) | rpl::start_with_next([=](
 			DocumentData *document,
 			const QString &name,

From 8ead33bc59171d15ed25585adcd425945720e114 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 17:11:36 +0400
Subject: [PATCH 064/341] Fix check on new gift collection name.

---
 .../SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index 24df5b6410..43260cf714 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -69,7 +69,7 @@ void EditCollectionBox(
 			return;
 		}
 		const auto text = title->getLastText().trimmed();
-		if (text.isEmpty()) {
+		if (text.isEmpty() || text.size() > kCollectionNameLimit) {
 			title->showError();
 			return;
 		}

From 5b1739246d74e2f2b6ca842200cfcf587bd21058 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 17:58:02 +0400
Subject: [PATCH 065/341] Correctly handle gift collection updates.

---
 Telegram/SourceFiles/data/data_session.h      |  3 ++-
 .../peer_gifts/info_peer_gifts_widget.cpp     | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index d934a7ae35..8260fd042f 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -104,9 +104,10 @@ struct GiftUpdate {
 	Action action = {};
 };
 struct GiftsUpdate {
+	not_null<PeerData*> peer;
+	int collectionId = 0;
 	std::vector<Data::SavedStarGiftId> added;
 	std::vector<Data::SavedStarGiftId> removed;
-	int collectionId = 0;
 };
 
 struct SentToScheduled {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 07f985ecce..92f22f488e 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -265,6 +265,7 @@ InnerWidget::InnerWidget(
 , _entries(&_all)
 , _list(&_entries->list)
 , _collectionChanges(Data::GiftsUpdate{
+	.peer = _peer,
 	.collectionId = addingToCollectionId,
 })
 , _api(&_peer->session().mtp()) {
@@ -282,6 +283,9 @@ InnerWidget::InnerWidget(
 
 	_window->session().data().giftsUpdates(
 	) | rpl::start_with_next([=](const Data::GiftsUpdate &update) {
+		if (update.peer != _peer) {
+			return;
+		}
 		const auto added = base::flat_set<Data::SavedStarGiftId>{
 			begin(update.added),
 			end(update.added)
@@ -523,7 +527,12 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 
 void InnerWidget::collectionAdded(MTPStarGiftCollection result) {
 	_collections.push_back(FromTL(&_window->session(), result));
+	const auto id = _collections.back().id;
 	refreshCollectionsTabs();
+
+	auto now = _descriptor.current();
+	now.collectionId = id;
+	_descriptorChanges.fire(std::move(now));
 }
 
 void InnerWidget::loadMore() {
@@ -1018,10 +1027,6 @@ void InnerWidget::reloadCollection(int id) {
 }
 
 void InnerWidget::editCollectionGifts(int id) {
-	auto now = _descriptor.current();
-	now.filter = Filter();
-	now.collectionId = 0;
-
 	const auto weak = base::make_weak(this);
 	_window->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
 		box->setTitle(tr::lng_gift_collection_add_title());
@@ -1034,7 +1039,12 @@ void InnerWidget::editCollectionGifts(int id) {
 			base::unique_qptr<Ui::PopupMenu> menu;
 			bool saving = false;
 		};
-		const auto state = box->lifetime().make_state<State>();
+		const auto state = box->lifetime().make_state<State>(State{
+			.changes = Data::GiftsUpdate{
+				.peer = _peer,
+				.collectionId = id,
+			},
+		});
 		const auto content = box->addRow(
 			object_ptr<InnerWidget>(
 				box,
@@ -1077,7 +1087,6 @@ void InnerWidget::editCollectionGifts(int id) {
 			if (state->saving) {
 				return;
 			}
-			using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
 			auto add = QVector<MTPInputSavedStarGift>();
 			auto remove = QVector<MTPInputSavedStarGift>();
 			const auto &changes = state->changes.current();
@@ -1093,6 +1102,7 @@ void InnerWidget::editCollectionGifts(int id) {
 			}
 			state->saving = true;
 			const auto session = &_window->session();
+			using Flag = MTPpayments_UpdateStarGiftCollection::Flag;
 			session->api().request(
 				MTPpayments_UpdateStarGiftCollection(
 					MTP_flags(Flag()

From 5704a07b68f858ece368bd84197a4a95b4e0c26d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 20:31:56 +0400
Subject: [PATCH 066/341] Animated scroll to activated tab.

---
 .../peer_gifts/info_peer_gifts_widget.cpp     |  2 ++
 Telegram/SourceFiles/ui/controls/sub_tabs.cpp | 24 +++++++++++++++++++
 Telegram/SourceFiles/ui/controls/sub_tabs.h   |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 92f22f488e..9ceb9025de 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -530,6 +530,8 @@ void InnerWidget::collectionAdded(MTPStarGiftCollection result) {
 	const auto id = _collections.back().id;
 	refreshCollectionsTabs();
 
+	_collectionsTabs->setActiveTab(QString::number(id));
+
 	auto now = _descriptor.current();
 	now.collectionId = id;
 	_descriptorChanges.fire(std::move(now));
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
index 4d8a4abc93..1d5fdfda42 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
@@ -118,6 +118,28 @@ void SubTabs::setActive(int index) {
 	}
 	_active = index;
 	_buttons[index].active = true;
+	const auto geometry = _buttons[index].geometry;
+	if (width() > 0
+		&& _fullWidth > width()
+		&& _scrollMax > 0
+		&& !geometry.isEmpty()) {
+		const auto added = std::max(
+			std::min(width() / 8, (width() - geometry.width()) / 2),
+			0);
+		const auto visibleFrom = int(base::SafeRound(_scroll));
+		const auto visibleTill = visibleFrom + width();
+		if ((visibleTill < geometry.x() + geometry.width() + added)
+			|| (visibleFrom + added > geometry.x())) {
+			_scrollTo = std::clamp(
+				geometry.x() + (geometry.width() / 2) - (width() / 2),
+				0,
+				_scrollMax);
+			_scrollAnimation.start([=] {
+				_scroll = _scrollAnimation.value(_scrollTo);
+				update();
+			}, _scroll, _scrollTo, crl::time(150), anim::easeOutCirc);
+		}
+	}
 	update();
 }
 
@@ -146,6 +168,7 @@ void SubTabs::mouseMoveEvent(QMouseEvent *e) {
 	const auto mousex = e->pos().x();
 	const auto drag = QApplication::startDragDistance();
 	if (_dragx > 0) {
+		_scrollAnimation.stop();
 		_scroll = std::clamp(
 			_dragscroll + _dragx - mousex,
 			0.,
@@ -172,6 +195,7 @@ void SubTabs::wheelEvent(QWheelEvent *e) {
 	if (std::abs(delta.x()) > std::abs(delta.y())) {
 		e->accept();
 	}
+	_scrollAnimation.stop();
 	_scroll = std::clamp(_scroll - delta.x(), 0., _scrollMax * 1.);
 	update();
 }
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.h b/Telegram/SourceFiles/ui/controls/sub_tabs.h
index 31c509b85d..ea089926db 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.h
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.h
@@ -73,6 +73,8 @@ private:
 	int _pressx = 0;
 	float64 _dragscroll = 0.;
 	float64 _scroll = 0.;
+	float64 _scrollTo = 0.;
+	Ui::Animations::Simple _scrollAnimation;
 	int _scrollMax = 0;
 	int _fullShift = 0;
 	int _fullWidth = 0;

From ca544dbbaeb5f9f45c3f04008ffa0eb595c0b1cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 21:14:05 +0400
Subject: [PATCH 067/341] Fix glitch in chats search without animations.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index c45a82a2b6..7545081288 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1748,7 +1748,7 @@ void Widget::updateSuggestions(anim::type animated) {
 			_suggestions = nullptr;
 			_hidingSuggestions.clear();
 			storiesExplicitCollapse();
-			updateStoriesVisibility();
+			updateControlsVisibility();
 			_scroll->show();
 		}
 	} else if (suggest && !_suggestions) {

From 7f346ef606d9e06d9ad8b28f02aac5fff0b69407 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 21:14:31 +0400
Subject: [PATCH 068/341] Improve gift collections preloading.

---
 Telegram/SourceFiles/info/info.style          |  3 ++
 .../peer_gifts/info_peer_gifts_widget.cpp     | 49 +++++++++++++++----
 .../info/peer_gifts/info_peer_gifts_widget.h  |  2 +-
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index e098c8a326..fc6f989e58 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1248,6 +1248,9 @@ collectionEmptyTitle: FlatLabel(boxTitle) {
 collectionEmptyText: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 }
+collectionEmptyButton: RoundButton(defaultActiveButton) {
+	width: -96px;
+}
 collectionEmptyTitleMargin: margins(10px, 24px, 10px, 4px);
 collectionEmptyTextMargin: margins(10px, 4px, 10px, 12px);
 collectionEmptyAddMargin: margins(10px, 12px, 10px, 24px);
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 9ceb9025de..d6c24a11a2 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -123,6 +123,10 @@ public:
 		return _collectionChanges.value();
 	}
 
+	[[nodiscard]] rpl::producer<bool> collectionEmptyValue() const {
+		return _collectionEmpty.value();
+	}
+
 	void reloadCollection(int id);
 	void editCollectionGifts(int id);
 	void editCollectionName(int id);
@@ -200,6 +204,7 @@ private:
 	std::unique_ptr<Ui::SubTabs> _collectionsTabs;
 	std::unique_ptr<Ui::RpWidget> _about;
 	rpl::event_stream<> _scrollToTop;
+	rpl::variable<bool> _collectionEmpty;
 
 	std::vector<Data::GiftCollection> _collections;
 
@@ -388,8 +393,8 @@ void InnerWidget::applyUpdateTo(
 		|| update.action == Action::Transfer
 		|| update.action == Action::Delete) {
 		_list->erase(i);
-		if (_entries->total > 0) {
-			--_entries->total;
+		if (entries.total > 0) {
+			--entries.total;
 		}
 		for (auto &view : _views) {
 			if (view.index >= index) {
@@ -627,6 +632,9 @@ void InnerWidget::loaded(const MTPpayments_SavedStarGifts &result) {
 			hasUnique = (parsed->info.unique != nullptr);
 		}
 	}
+	if (_entries->allLoaded) {
+		_entries->total = _entries->list.size();
+	}
 	refreshButtons();
 	refreshAbout();
 
@@ -928,11 +936,13 @@ void InnerWidget::refreshAbout() {
 	const auto filter = descriptor.filter;
 	const auto collectionId = descriptor.collectionId;
 	const auto maybeEmpty = _list->empty();
-	const auto knownEmpty = maybeEmpty && _entries->allLoaded;
+	const auto knownEmpty = maybeEmpty
+		&& (_entries->allLoaded || !_entries->total);
 	const auto filteredEmpty = knownEmpty && filter.skipsSomething();
 	const auto collectionCanAdd = knownEmpty
 		&& descriptor.collectionId != 0
 		&& _peer->canManageGifts();
+	_collectionEmpty = !filteredEmpty && collectionCanAdd;
 	if (filteredEmpty) {
 		auto text = tr::lng_peer_gifts_empty_search(
 			tr::now,
@@ -979,8 +989,12 @@ void InnerWidget::refreshAbout() {
 				object_ptr<Ui::RoundButton>(
 					about.get(),
 					tr::lng_gift_collection_empty_button(),
-					st::defaultActiveButton)),
+					st::collectionEmptyButton)),
 			st::collectionEmptyAddMargin)->entity();
+		button->setText(tr::lng_gift_collection_add_title(
+		) | rpl::map([](const QString &text) {
+			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+		}));
 		button->setTextTransform(
 			Ui::RoundButton::TextTransform::NoTransform);
 		button->setClickedCallback([=] {
@@ -1144,12 +1158,18 @@ void InnerWidget::refreshCollectionsTabs() {
 		}
 		return;
 	}
+
 	auto tabs = std::vector<Ui::SubTabs::Tab>();
 	tabs.push_back({
 		.id = u"all"_q,
 		.text = tr::lng_gift_collection_all(tr::now, Ui::Text::WithEntities),
 	});
 	for (const auto &collection : _collections) {
+		auto &per = _perCollection[collection.id];
+		if (!per.allLoaded) {
+			per.total = collection.count;
+		}
+
 		auto title = TextWithEntities();
 		if (collection.icon) {
 			title.append(
@@ -1279,8 +1299,15 @@ int InnerWidget::resizeGetHeight(int width) {
 
 	_single = QSize(singlew, singleh);
 	const auto rows = (count + _perRow - 1) / _perRow;
+	const auto rowsPerCount = rows
+		? rows
+		: ((std::min(_entries->total, kPerPage) + _perRow - 1) / _perRow);
 	const auto skiph = st::giftBoxGiftSkip.y();
 
+	const auto resultPerCount = result
+		+ (rowsPerCount
+			? (padding.bottom() + rowsPerCount * (singleh + skiph) - skiph)
+			: 0);
 	result += rows
 		? (padding.bottom() + rows * (singleh + skiph) - skiph)
 		: 0;
@@ -1292,7 +1319,7 @@ int InnerWidget::resizeGetHeight(int width) {
 		result += margin.top() + about->height() + margin.bottom();
 	}
 
-	return result;
+	return std::max(result, resultPerCount);
 }
 
 void InnerWidget::saveState(not_null<Memento*> memento) {
@@ -1481,13 +1508,15 @@ void Widget::refreshBottom() {
 		setScrollBottomSkip(0);
 		_hasPinnedToBottom = false;
 	} else if (withButton) {
-		setupBottomButton(wasBottom);
+		setupBottomButton(wasBottom, _inner->collectionEmptyValue());
 	} else {
 		setupNotifyCheckbox(wasBottom, *_notifyEnabled);
 	}
 }
 
-void Widget::setupBottomButton(int wasBottomHeight) {
+void Widget::setupBottomButton(
+		int wasBottomHeight,
+		rpl::producer<bool> hidden) {
 	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
 		this,
 		object_ptr<Ui::RpWidget>(this));
@@ -1506,7 +1535,10 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 	) | rpl::map([](const QString &text) {
 		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
 	}));
-	button->show();
+	std::move(hidden) | rpl::start_with_next([=](bool hidden) {
+		button->setVisible(!hidden);
+		_hasPinnedToBottom = !hidden;
+	}, button->lifetime());
 
 	button->setClickedCallback([=] {
 		if (const auto id = _descriptor.current().collectionId) {
@@ -1549,7 +1581,6 @@ void Widget::setupBottomButton(int wasBottomHeight) {
 			true,
 			wasBottomHeight ? anim::type::instant : anim::type::normal);
 	}
-	_hasPinnedToBottom = true;
 }
 
 void Widget::showFinished() {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index 512cd66337..852d1c2744 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -108,7 +108,7 @@ private:
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	void setupNotifyCheckbox(int wasBottomHeight, bool enabled);
-	void setupBottomButton(int wasBottomHeight);
+	void setupBottomButton(int wasBottomHeight, rpl::producer<bool> hidden);
 	void refreshBottom();
 
 	InnerWidget *_inner = nullptr;

From d458748a7a3d62dde3e6bf7c75c309626eabe128 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 21:20:56 +0400
Subject: [PATCH 069/341] Version 5.16.6.

- Fix bad layout in box buttons.
- Fix several problems in gift collections.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 5 +++++
 6 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 9cc69dfe9d..2973ff2259 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.16.5.0" />
+    Version="5.16.6.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index ecd7e7e404..db2ef61fba 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,16,5,0
- PRODUCTVERSION 5,16,5,0
+ FILEVERSION 5,16,6,0
+ PRODUCTVERSION 5,16,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.16.5.0"
+            VALUE "FileVersion", "5.16.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.16.5.0"
+            VALUE "ProductVersion", "5.16.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c6ef013a03..7a01bcf302 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,16,5,0
- PRODUCTVERSION 5,16,5,0
+ FILEVERSION 5,16,6,0
+ PRODUCTVERSION 5,16,6,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", "5.16.5.0"
+            VALUE "FileVersion", "5.16.6.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.16.5.0"
+            VALUE "ProductVersion", "5.16.6.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index ab667eca30..f6667bfdd7 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5016005;
-constexpr auto AppVersionStr = "5.16.5";
+constexpr auto AppVersion = 5016006;
+constexpr auto AppVersionStr = "5.16.6";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 383a21af27..fa11b740ca 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5016005
+AppVersion         5016006
 AppVersionStrMajor 5.16
-AppVersionStrSmall 5.16.5
-AppVersionStr      5.16.5
+AppVersionStrSmall 5.16.6
+AppVersionStr      5.16.6
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.16.5
+AppVersionOriginal 5.16.6
diff --git a/changelog.txt b/changelog.txt
index ef2d458692..e476437710 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+5.16.6 (25.07.25)
+
+- Fix bad layout in box buttons.
+- Fix several problems in gift collections.
+
 5.16.5 (23.07.25)
 
 - Age verification support.

From 0b2661ad45e5d157d1a5ab5794bf106b99bd3669 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 29 Jul 2025 04:47:01 +0400
Subject: [PATCH 070/341] Use $CRAFT_PROJECT_NAME more for consistency

---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index afc1a67576..f6730ed8dc 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -61,7 +61,7 @@ parts:
       mv "$CRAFT_PART_INSTALL"/usr/bin/{Telegram,telegram-desktop}
 
       APP_ID=org.telegram.desktop
-      sed -i "s/^Icon=$APP_ID$/Icon=snap.telegram-desktop./g" "$CRAFT_PART_INSTALL/usr/share/applications/$APP_ID.desktop"
+      sed -i "s/^Icon=$APP_ID$/Icon=snap.$CRAFT_PROJECT_NAME./g" "$CRAFT_PART_INSTALL/usr/share/applications/$APP_ID.desktop"
       for i in $(find "$CRAFT_PART_INSTALL/usr/share/icons" -name "$APP_ID*.svg" -o -name "$APP_ID*.png"); do
         PREFIXED="$(dirname "$i")/snap.$CRAFT_PROJECT_NAME.$(basename "$i" | sed "s/$APP_ID//")"
         mv "$i" "$PREFIXED"

From 2a3ee968ff0b95bd4c84672651fc14f7bf0859bd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 14:23:39 +0400
Subject: [PATCH 071/341] Fix png theme icon ordering.

Hopefully fixes #29332.
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f6730ed8dc..d12d8093b8 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -129,7 +129,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: 1ffcb17817a2cab167061d530703842395291e69
+    source-commit: e5dde9c599d12d8adb150f1771e374213cf3e2ac
     plugin: dump
     override-pull: |
       craftctl default

From fb777d0c3af3d12a6f3e795f5b78f1654c7cb119 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 29 Jul 2025 19:20:31 +0400
Subject: [PATCH 072/341] Another attempt to fix png theme icon ordering

---
 Telegram/build/docker/centos_env/Dockerfile | 2 +-
 snap/snapcraft.yaml                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 4aecee4709..fe58d9d358 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -91,7 +91,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin https://github.com/desktop-app/patches.git \
-	&& git fetch --depth=1 origin 1ffcb17817a2cab167061d530703842395291e69 \
+	&& git fetch --depth=1 origin e15b5d87c565e516aad5bcafdfe40315f84e5459 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index d12d8093b8..eb681dc838 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -129,7 +129,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: e5dde9c599d12d8adb150f1771e374213cf3e2ac
+    source-commit: e15b5d87c565e516aad5bcafdfe40315f84e5459
     plugin: dump
     override-pull: |
       craftctl default

From f6a3662b0e5a4ef27c5ccfd67f8a77e37adef216 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 29 Jul 2025 19:11:34 +0400
Subject: [PATCH 073/341] Remove LD_LIBRARY_PATH from snap

It's not needed since Qt is linked statically
---
 snap/snapcraft.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index eb681dc838..2349a91506 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -34,7 +34,6 @@ parts:
     source-type: git
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
-      - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-ldav1d,-lhwy,-pop-state -s
     cmake-generator: Ninja
     cmake-parameters:

From 472d9dd467055333e281e5f81564fb5096664b13 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 29 Jul 2025 19:12:00 +0400
Subject: [PATCH 074/341] Rely on mesa-2404 libraries

---
 snap/snapcraft.yaml | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2349a91506..0cdb0006ee 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -72,7 +72,6 @@ parts:
       - ada
       - avif
       - ffmpeg
-      - geoclue
       - jpegli
       - openal
       - protobuf
@@ -116,14 +115,19 @@ parts:
       - libxkbcommon-x11-dev
       - libxv-dev
     stage-packages:
+      - systemd
+      - libgeoclue-2-0
       - libopenh264-7
       - libxcb-cursor0
-      - libxcb-glx0
-      - libxcb-randr0
       - libxcb-record0
       - libxcb-screensaver0
-      - libxcb-sync1
-      - libxcb-xfixes0
+    stage:
+      - ./usr/bin/systemd-detect-virt
+      - ./usr/lib/x86_64-linux-gnu/libgeoclue-2.so*
+      - ./usr/lib/x86_64-linux-gnu/libopenh264.so*
+      - ./usr/lib/x86_64-linux-gnu/libxcb-cursor.so*
+      - ./usr/lib/x86_64-linux-gnu/libxcb-record.so*
+      - ./usr/lib/x86_64-linux-gnu/libxcb-screensaver.so*
 
   patches:
     source: https://github.com/desktop-app/patches.git
@@ -317,13 +321,6 @@ parts:
       - nv-codec-headers
       - pkgs
 
-  geoclue:
-    plugin: nil
-    stage-packages:
-      - libgeoclue-2-0
-    stage:
-      - ./usr/lib/x86_64-linux-gnu/libgeoclue-2.so*
-
   jpegli:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
@@ -460,13 +457,6 @@ parts:
     after:
       - pkgs
 
-  systemd:
-    plugin: nil
-    stage-packages:
-      - systemd
-    stage:
-      - ./usr/bin/systemd-detect-virt
-
   tde2e:
     source: https://github.com/tdlib/td.git
     source-depth: 1

From 043bc754ae72ba660936f6a0439df1a0e4d94710 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 11:40:25 +0400
Subject: [PATCH 075/341] Update API scheme to layer 211.

---
 Telegram/Resources/langs/lang.strings         |  2 ++
 Telegram/SourceFiles/api/api_premium.cpp      | 28 +++++++++++++++++-
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  2 +-
 .../SourceFiles/boxes/transfer_gift_box.cpp   |  2 ++
 Telegram/SourceFiles/data/data_star_gift.h    | 10 ++++---
 .../SourceFiles/dialogs/dialogs_widget.cpp    |  6 +++-
 Telegram/SourceFiles/history/history_item.cpp | 29 ++++++++++++-------
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 27 ++++++++++++-----
 8 files changed, 80 insertions(+), 26 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ac5bd51b7f..9cac3725d4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2182,6 +2182,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_gift_channel_about_unique" = "You can display this gift in channel's Gifts or turn it into unique collectible.";
 "lng_action_gift_for_stars#one" = "{count} Star";
 "lng_action_gift_for_stars#other" = "{count} Stars";
+"lng_action_gift_for_ton#one" = "{count} TON";
+"lng_action_gift_for_ton#other" = "{count} TON";
 "lng_action_gift_got_subtitle" = "Gift from {user}";
 "lng_action_gift_got_stars_text#one" = "Display this gift on your page or convert it to **{count}** Star.";
 "lng_action_gift_got_stars_text#other" = "Display this gift on your page or convert it to **{count}** Stars.";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 5354537879..99834cc949 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -58,6 +58,30 @@ namespace {
 	return options;
 }
 
+[[nodiscard]] int FindStarsForResale(const MTPVector<MTPStarsAmount> *list) {
+	if (!list) {
+		return 0;
+	}
+	for (const auto &amount : list->v) {
+		if (amount.type() == mtpc_starsAmount) {
+			return int(amount.c_starsAmount().vamount().v);
+		}
+	}
+	return 0;
+}
+
+[[nodiscard]] int64 FindTonForResale(const MTPVector<MTPStarsAmount> *list) {
+	if (!list) {
+		return 0;
+	}
+	for (const auto &amount : list->v) {
+		if (amount.type() == mtpc_starsTonAmount) {
+			return int64(amount.c_starsTonAmount().vamount().v);
+		}
+	}
+	return 0;
+}
+
 } // namespace
 
 Premium::Premium(not_null<ApiWrap*> api)
@@ -872,7 +896,8 @@ std::optional<Data::StarGift> FromTL(
 					: PeerId()),
 				.releasedBy = releasedBy,
 				.number = data.vnum().v,
-				.starsForResale = int(data.vresell_stars().value_or_empty()),
+				.starsForResale = FindStarsForResale(data.vresell_amount()),
+				.tonForResale = FindTonForResale(data.vresell_amount()),
 				.model = *model,
 				.pattern = *pattern,
 			}),
@@ -880,6 +905,7 @@ std::optional<Data::StarGift> FromTL(
 			.releasedBy = releasedBy,
 			.limitedLeft = (total - data.vavailability_issued().v),
 			.limitedCount = total,
+			.resellTonOnly = data.is_resale_ton_only(),
 			.requirePremium = data.is_require_premium(),
 		};
 		const auto unique = result.unique.get();
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index de5f015e46..dd45785c99 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -4478,7 +4478,7 @@ void UpdateGiftSellPrice(
 	const auto session = &show->session();
 	session->api().request(MTPpayments_UpdateStarGiftPrice(
 		Api::InputSavedStarGiftId(savedId, unique),
-		MTP_long(price)
+		MTP_starsAmount(MTP_long(price), MTP_int(0))
 	)).done([=](const MTPUpdates &result) {
 		session->api().applyUpdates(result);
 		show->showToast((!price
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index 438beff1e0..54b77db265 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -501,7 +501,9 @@ void BuyResaleGift(
 		}
 	};
 
+	using Flag = MTPDinputInvoiceStarGiftResale::Flag;
 	const auto invoice = MTP_inputInvoiceStarGiftResale(
+		MTP_flags(Flag()),
 		MTP_string(gift->slug),
 		to->input);
 
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index e6a2e1ae54..750679b129 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -48,6 +48,7 @@ struct UniqueGift {
 	int number = 0;
 	int starsForTransfer = -1;
 	int starsForResale = -1;
+	int64 tonForResale = -1;
 	TimeId exportAt = 0;
 	TimeId canTransferAt = 0;
 	TimeId canResellAt = 0;
@@ -78,10 +79,11 @@ struct StarGift {
 	int perUserRemains = 0;
 	TimeId firstSaleDate = 0;
 	TimeId lastSaleDate = 0;
-	bool requirePremium = false;
-	bool upgradable = false;
-	bool birthday = false;
-	bool soldOut = false;
+	bool resellTonOnly : 1 = false;
+	bool requirePremium : 1 = false;
+	bool upgradable : 1 = false;
+	bool birthday : 1 = false;
+	bool soldOut : 1 = false;
 
 	friend inline bool operator==(
 		const StarGift &,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 7545081288..179fde1f83 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2917,15 +2917,19 @@ void Widget::requestPublicPosts(bool fromStart) {
 		.posts = true,
 		.start = fromStart,
 	};
+	using Flag = MTPchannels_SearchPosts::Flag;
 	_postsProcess.requestId = session().api().request(
 		MTPchannels_SearchPosts(
+			MTP_flags(Flag::f_hashtag),
 			MTP_string(_searchState.query.trimmed().mid(1)),
+			MTP_string(), // query
 			MTP_int(fromStart ? 0 : _postsProcess.nextRate),
 			(fromStart
 				? MTP_inputPeerEmpty()
 				: _postsProcess.lastPeer->input),
 			MTP_int(fromStart ? 0 : _postsProcess.lastId),
-			MTP_int(kSearchPerPage))
+			MTP_int(kSearchPerPage),
+			MTP_long(0)) // allow_paid_stars
 	).done([=](const MTPmessages_Messages &result) {
 		searchReceived(type, result, &_postsProcess);
 	}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 429fffee59..c5587b25d5 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -5931,11 +5931,18 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			const MTPDmessageActionStarGiftUnique &action) {
 		auto result = PreparedServiceText();
 		const auto isSelf = _from->isSelf();
-		const auto resaleStars = action.vresale_stars().value_or_empty();
-		const auto resaleCost = TextWithEntities{ resaleStars
-			? tr::lng_action_gift_for_stars(tr::now, lt_count, resaleStars)
-			: QString()
-		};
+		const auto resale = CreditsAmountFromTL(action.vresale_amount());
+		const auto resaleCost = !resale
+			? TextWithEntities()
+			: resale.stars()
+			? TextWithEntities{ tr::lng_action_gift_for_stars(
+				tr::now,
+				lt_count,
+				resale.value()) }
+			: TextWithEntities{ tr::lng_action_gift_for_ton(
+				tr::now,
+				lt_count,
+				resale.value()) };
 		const auto giftPeer = action.vpeer()
 			? peerFromMTP(*action.vpeer())
 			: PeerId();
@@ -5951,10 +5958,10 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 				peerToChannel(giftPeer));
 			if (!from->isServiceUser() && !from->isSelf()) {
 				result.links.push_back(from->createOpenLink());
-				if (resaleStars) {
+				if (resale) {
 					result.links.push_back(channel->createOpenLink());
 				}
-				result.text = resaleStars
+				result.text = resale
 					? tr::lng_action_gift_sent_channel(
 						tr::now,
 						lt_user,
@@ -5974,7 +5981,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 							Ui::Text::Link(channel->name(), 2),
 							Ui::Text::WithEntities);
 			} else {
-				result.text = resaleStars
+				result.text = resale
 					? tr::lng_action_gift_sent_self_channel(
 						tr::now,
 						lt_name,
@@ -5995,10 +6002,10 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			result.links.push_back(channel->createOpenLink());
 		} else {
 			if (!from->isServiceUser() && !_history->peer->isSelf()) {
-				if (!resaleStars || !isSelf) {
+				if (!resale || !isSelf) {
 					result.links.push_back(from->createOpenLink());
 				}
-				result.text = resaleStars
+				result.text = resale
 					? (isSelf
 						? tr::lng_action_gift_sent(
 							tr::now,
@@ -6024,7 +6031,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 								Ui::Text::Link(from->shortName(), 1),
 								Ui::Text::WithEntities);
 			} else {
-				result.text = resaleStars
+				result.text = resale
 					? tr::lng_action_gift_self_bought(
 						tr::now,
 						lt_cost,
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 6f84162365..a9e91e5b60 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -186,7 +186,7 @@ messageActionPaymentRefunded#41b3e202 flags:# peer:Peer currency:string total_am
 messageActionGiftStars#45d5b021 flags:# currency:string amount:long stars:long crypto_currency:flags.0?string crypto_amount:flags.0?long transaction_id:flags.1?string = MessageAction;
 messageActionPrizeStars#b00c47a2 flags:# unclaimed:flags.0?true stars:long transaction_id:string boost_peer:Peer giveaway_msg_id:int = MessageAction;
 messageActionStarGift#4717e8a4 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long = MessageAction;
-messageActionStarGiftUnique#2e3ae60e flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_stars:flags.8?long can_transfer_at:flags.9?int can_resell_at:flags.10?int = MessageAction;
+messageActionStarGiftUnique#34f762f3 flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_amount:flags.8?StarsAmount can_transfer_at:flags.9?int can_resell_at:flags.10?int = MessageAction;
 messageActionPaidMessagesRefunded#ac1f1fcd count:int stars:long = MessageAction;
 messageActionPaidMessagesPrice#84b88578 flags:# broadcast_messages_allowed:flags.0?true stars:long = MessageAction;
 messageActionConferenceCall#2ffe2f7a flags:# missed:flags.0?true active:flags.1?true video:flags.4?true call_id:long duration:flags.2?int other_participants:flags.3?Vector<Peer> = MessageAction;
@@ -1502,7 +1502,7 @@ inputInvoiceStarGiftUpgrade#4d818d5d flags:# keep_original_details:flags.0?true
 inputInvoiceStarGiftTransfer#4a5f5bd9 stargift:InputSavedStarGift to_id:InputPeer = InputInvoice;
 inputInvoicePremiumGiftStars#dabab2ef flags:# user_id:InputUser months:int message:flags.0?TextWithEntities = InputInvoice;
 inputInvoiceBusinessBotTransferStars#f4997e42 bot:InputUser stars:long = InputInvoice;
-inputInvoiceStarGiftResale#63cbc38c slug:string to_id:InputPeer = InputInvoice;
+inputInvoiceStarGiftResale#c39f5324 flags:# ton:flags.0?true slug:string to_id:InputPeer = InputInvoice;
 
 payments.exportedInvoice#aed0cbd9 url:string = payments.ExportedInvoice;
 
@@ -1634,7 +1634,7 @@ storyViews#8d595cd6 flags:# has_viewers:flags.1?true views_count:int forwards_co
 
 storyItemDeleted#51e6ee4f id:int = StoryItem;
 storyItemSkipped#ffadc913 flags:# close_friends:flags.8?true id:int date:int expire_date:int = StoryItem;
-storyItem#79b26a24 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true out:flags.16?true id:int date:int from_id:flags.18?Peer fwd_from:flags.17?StoryFwdHeader expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews sent_reaction:flags.15?Reaction = StoryItem;
+storyItem#edf164f1 flags:# pinned:flags.5?true public:flags.7?true close_friends:flags.8?true min:flags.9?true noforwards:flags.10?true edited:flags.11?true contacts:flags.12?true selected_contacts:flags.13?true out:flags.16?true id:int date:int from_id:flags.18?Peer fwd_from:flags.17?StoryFwdHeader expire_date:int caption:flags.0?string entities:flags.1?Vector<MessageEntity> media:MessageMedia media_areas:flags.14?Vector<MediaArea> privacy:flags.2?Vector<PrivacyRule> views:flags.3?StoryViews sent_reaction:flags.15?Reaction albums:flags.19?Vector<int> = StoryItem;
 
 stories.allStoriesNotModified#1158fe3e flags:# state:string stealth_mode:StoriesStealthMode = stories.AllStories;
 stories.allStories#6efc5e81 flags:# has_more:flags.0?true count:int state:string peer_stories:Vector<PeerStories> chats:Vector<Chat> users:Vector<User> stealth_mode:StoriesStealthMode = stories.AllStories;
@@ -1891,7 +1891,7 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
 starGift#bcff5b flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int = StarGift;
-starGiftUnique#f63778ae flags:# require_premium:flags.6?true id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_stars:flags.4?long released_by:flags.5?Peer = StarGift;
+starGiftUnique#3a274d50 flags:# require_premium:flags.6?true resale_ton_only:flags.7?true id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
 payments.starGifts#2ed82995 hash:int gifts:Vector<StarGift> chats:Vector<Chat> users:Vector<User> = payments.StarGifts;
@@ -1996,6 +1996,11 @@ starGiftCollection#9d6b13b0 flags:# collection_id:int title:string icon:flags.0?
 payments.starGiftCollectionsNotModified#a0ba4f17 = payments.StarGiftCollections;
 payments.starGiftCollections#8a2932f3 collections:Vector<StarGiftCollection> = payments.StarGiftCollections;
 
+storyAlbum#9325705a flags:# album_id:int title:string icon_photo:flags.0?Photo icon_video:flags.1?Document = StoryAlbum;
+
+stories.albumsNotModified#564edaeb = stories.Albums;
+stories.albums#c3987a3a hash:long albums:Vector<StoryAlbum> = stories.Albums;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2519,7 +2524,7 @@ channels.updateEmojiStatus#f0d3e6a8 channel:InputChannel emoji_status:EmojiStatu
 channels.setBoostsToUnblockRestrictions#ad399cee channel:InputChannel boosts:int = Updates;
 channels.setEmojiStickers#3cd930b7 channel:InputChannel stickerset:InputStickerSet = Bool;
 channels.restrictSponsoredMessages#9ae91519 channel:InputChannel restricted:Bool = Updates;
-channels.searchPosts#d19f987b hashtag:string offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
+channels.searchPosts#f2c4f24d flags:# hashtag:flags.0?string query:flags.1?string offset_rate:int offset_peer:InputPeer offset_id:int limit:int allow_paid_stars:flags.2?long = messages.Messages;
 channels.updatePaidMessagesPrice#4b12327b flags:# broadcast_messages_allowed:flags.0?true channel:InputChannel send_paid_messages_stars:long = Updates;
 channels.toggleAutotranslation#167fc0a1 channel:InputChannel enabled:Bool = Updates;
 channels.getMessageAuthor#ece2a0e6 channel:InputChannel id:int = User;
@@ -2604,7 +2609,7 @@ payments.toggleChatStarGiftNotifications#60eaefa1 flags:# enabled:flags.0?true p
 payments.toggleStarGiftsPinnedToTop#1513e7b0 peer:InputPeer stargift:Vector<InputSavedStarGift> = Bool;
 payments.canPurchaseStore#4fdc5ea7 purpose:InputStorePaymentPurpose = Bool;
 payments.getResaleStarGifts#7a5fa236 flags:# sort_by_price:flags.1?true sort_by_num:flags.2?true attributes_hash:flags.0?long gift_id:long attributes:flags.3?Vector<StarGiftAttributeId> offset:string limit:int = payments.ResaleStarGifts;
-payments.updateStarGiftPrice#3baea4e1 stargift:InputSavedStarGift resell_stars:long = Updates;
+payments.updateStarGiftPrice#edbe6ccb stargift:InputSavedStarGift resell_amount:StarsAmount = Updates;
 payments.createStarGiftCollection#1f4a0e87 peer:InputPeer title:string stargift:Vector<InputSavedStarGift> = StarGiftCollection;
 payments.updateStarGiftCollection#4fddbee7 flags:# peer:InputPeer collection_id:int title:flags.0?string delete_stargift:flags.1?Vector<InputSavedStarGift> add_stargift:flags.2?Vector<InputSavedStarGift> order:flags.3?Vector<InputSavedStarGift> = StarGiftCollection;
 payments.reorderStarGiftCollections#c32af4cc peer:InputPeer order:Vector<int> = Bool;
@@ -2690,7 +2695,7 @@ chatlists.getLeaveChatlistSuggestions#fdbcd714 chatlist:InputChatlist = Vector<P
 chatlists.leaveChatlist#74fae13a chatlist:InputChatlist peers:Vector<InputPeer> = Updates;
 
 stories.canSendStory#30eb63f0 peer:InputPeer = stories.CanSendStoryCount;
-stories.sendStory#e4e6694b flags:# pinned:flags.2?true noforwards:flags.4?true fwd_modified:flags.7?true peer:InputPeer media:InputMedia media_areas:flags.5?Vector<MediaArea> caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int fwd_from_id:flags.6?InputPeer fwd_from_story:flags.6?int = Updates;
+stories.sendStory#737fc2ec flags:# pinned:flags.2?true noforwards:flags.4?true fwd_modified:flags.7?true peer:InputPeer media:InputMedia media_areas:flags.5?Vector<MediaArea> caption:flags.0?string entities:flags.1?Vector<MessageEntity> privacy_rules:Vector<InputPrivacyRule> random_id:long period:flags.3?int fwd_from_id:flags.6?InputPeer fwd_from_story:flags.6?int albums:flags.8?Vector<int> = Updates;
 stories.editStory#b583ba46 flags:# peer:InputPeer id:int media:flags.0?InputMedia media_areas:flags.3?Vector<MediaArea> caption:flags.1?string entities:flags.1?Vector<MessageEntity> privacy_rules:flags.2?Vector<InputPrivacyRule> = Updates;
 stories.deleteStories#ae59db5f peer:InputPeer id:Vector<int> = Vector<int>;
 stories.togglePinned#9a75a1ef peer:InputPeer id:Vector<int> pinned:Bool = Vector<int>;
@@ -2715,6 +2720,12 @@ stories.togglePeerStoriesHidden#bd0415c4 peer:InputPeer hidden:Bool = Bool;
 stories.getStoryReactionsList#b9b2881f flags:# forwards_first:flags.2?true peer:InputPeer id:int reaction:flags.0?Reaction offset:flags.1?string limit:int = stories.StoryReactionsList;
 stories.togglePinnedToTop#b297e9b peer:InputPeer id:Vector<int> = Bool;
 stories.searchPosts#d1810907 flags:# hashtag:flags.0?string area:flags.1?MediaArea peer:flags.2?InputPeer offset:string limit:int = stories.FoundStories;
+stories.createAlbum#a36396e5 peer:InputPeer title:string stories:Vector<int> = StoryAlbum;
+stories.updateAlbum#5e5259b6 flags:# peer:InputPeer album_id:int title:flags.0?string delete_stories:flags.1?Vector<int> add_stories:flags.2?Vector<int> order:flags.3?Vector<int> = StoryAlbum;
+stories.reorderAlbums#8535fbd9 peer:InputPeer order:Vector<int> = Bool;
+stories.deleteAlbum#8d3456d0 peer:InputPeer album_id:int = Bool;
+stories.getAlbums#25b3eac7 peer:InputPeer hash:long = stories.Albums;
+stories.getAlbumStories#ac806d61 peer:InputPeer album_id:int offset:int limit:int = stories.Stories;
 
 premium.getBoostsList#60f67660 flags:# gifts:flags.0?true peer:InputPeer offset:string limit:int = premium.BoostsList;
 premium.getMyBoosts#be77b4a = premium.MyBoosts;
@@ -2732,4 +2743,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 210
+// LAYER 211

From a1e36594c23730400bae41a2b5ba4a9d1b17b6a1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Jul 2025 19:35:26 +0400
Subject: [PATCH 076/341] Allow creating albums of stories.

---
 Telegram/CMakeLists.txt                       |   3 +
 Telegram/Resources/langs/lang.strings         |  19 +
 Telegram/SourceFiles/data/data_peer.cpp       |  21 +
 Telegram/SourceFiles/data/data_peer.h         |   3 +
 Telegram/SourceFiles/data/data_stories.cpp    | 129 +++++-
 Telegram/SourceFiles/data/data_stories.h      |  57 ++-
 Telegram/SourceFiles/data/data_story.cpp      |  10 +-
 Telegram/SourceFiles/data/data_story.h        |  14 +
 .../dialogs/ui/dialogs_stories_content.cpp    |   2 +-
 .../SourceFiles/info/info_content_widget.cpp  |   4 +-
 .../SourceFiles/info/info_content_widget.h    |  58 ++-
 Telegram/SourceFiles/info/info_controller.cpp |   8 +-
 Telegram/SourceFiles/info/info_controller.h   |  26 +-
 .../SourceFiles/info/info_wrap_widget.cpp     |  12 +-
 .../info/media/info_media_list_widget.cpp     |  27 +-
 .../info/stories/info_stories_albums.cpp      | 149 +++++++
 .../info/stories/info_stories_albums.h        |  39 ++
 .../info/stories/info_stories_common.h        |  24 ++
 .../stories/info_stories_inner_widget.cpp     | 386 ++++++++++++++++--
 .../info/stories/info_stories_inner_widget.h  |  46 ++-
 .../info/stories/info_stories_provider.cpp    |   8 +-
 .../info/stories/info_stories_provider.h      |   5 +-
 .../info/stories/info_stories_widget.cpp      |  23 +-
 .../info/stories/info_stories_widget.h        |   6 +-
 .../stories/media_stories_controller.cpp      |  94 ++---
 .../SourceFiles/window/window_peer_menu.cpp   |   2 +-
 26 files changed, 963 insertions(+), 212 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_albums.cpp
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_albums.h
 create mode 100644 Telegram/SourceFiles/info/stories/info_stories_common.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index a1f99fb31d..6d431ad44d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1059,6 +1059,9 @@ PRIVATE
     info/statistics/info_statistics_tag.h
     info/statistics/info_statistics_widget.cpp
     info/statistics/info_statistics_widget.h
+    info/stories/info_stories_albums.cpp
+    info/stories/info_stories_albums.h
+    info/stories/info_stories_common.h
     info/stories/info_stories_inner_widget.cpp
     info/stories/info_stories_inner_widget.h
     info/stories/info_stories_provider.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 9cac3725d4..1c3de9b06a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -6455,6 +6455,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_save_promo" = "Subscribe to {link} to save other people's stories that are not protected.";
 "lng_stories_reaction_as_message" = "Send reaction as a private message";
 
+"lng_stories_album_add" = "Add Album";
+"lng_stories_album_new_title" = "Create a New Album";
+"lng_stories_album_new_button" = "New Album";
+"lng_stories_album_new_text" = "Choose a name for your album and start adding your stories there.";
+"lng_stories_album_new_ph" = "Title";
+"lng_stories_album_new_create" = "Create";
+"lng_stories_album_empty_title" = "Organize Your Stories";
+"lng_stories_album_empty_text" = "Add some of your stories to this album.";
+"lng_stories_album_empty_button" = "Add to Album";
+"lng_stories_album_all" = "All Stories";
+"lng_stories_album_add_title" = "Add Stories";
+"lng_stories_album_edit" = "Edit Name";
+"lng_stories_album_limit_title" = "Limit Reached";
+"lng_stories_album_limit_text" = "Please remove one of the existing albums to add a new one.";
+"lng_stories_album_delete" = "Delete Album";
+"lng_stories_album_delete_sure" = "Are you sure you want to delete this album?";
+"lng_stories_album_delete_button" = "Delete";
+"lng_stories_album_add_to" = "Add to Album";
+
 "lng_stealth_mode_menu_item" = "Hide My View";
 "lng_stealth_mode_title" = "Stealth Mode";
 "lng_stealth_mode_unlock_about" = "Subscribe to Telegram Premium to watch stories without appearing in the list of viewers.";
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index fe0cbdf698..1c70a3b6a8 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -709,6 +709,27 @@ bool PeerData::canManageTopics() const {
 	return false;
 }
 
+bool PeerData::canPostStories() const {
+	if (const auto channel = asChannel()) {
+		return channel->canPostStories();
+	}
+	return isSelf();
+}
+
+bool PeerData::canEditStories() const {
+	if (const auto channel = asChannel()) {
+		return channel->canEditStories();
+	}
+	return isSelf();
+}
+
+bool PeerData::canDeleteStories() const {
+	if (const auto channel = asChannel()) {
+		return channel->canDeleteStories();
+	}
+	return isSelf();
+}
+
 bool PeerData::canManageGifts() const {
 	if (const auto channel = asChannel()) {
 		return channel->canPostMessages();
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index 2e17161d75..c27b25834a 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -434,6 +434,9 @@ public:
 	[[nodiscard]] bool canCreateTodoLists() const;
 	[[nodiscard]] bool canCreateTopics() const;
 	[[nodiscard]] bool canManageTopics() const;
+	[[nodiscard]] bool canPostStories() const;
+	[[nodiscard]] bool canEditStories() const;
+	[[nodiscard]] bool canDeleteStories() const;
 	[[nodiscard]] bool canManageGifts() const;
 	[[nodiscard]] bool canTransferGifts() const;
 	[[nodiscard]] bool canExportChatHistory() const;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 03732644eb..08073b683f 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -78,6 +78,22 @@ using UpdateFlag = StoryUpdate::Flag;
 	}, [](const auto &) { return std::optional<StoryMedia>(); });
 }
 
+[[nodiscard]] StoryAlbum FromTL(
+		not_null<Session*> owner,
+		const MTPStoryAlbum &album) {
+	const auto &data = album.data();
+	return {
+		.id = data.valbum_id().v,
+		.title = qs(data.vtitle()),
+		.iconPhoto = (data.vicon_photo()
+			? owner->processPhoto(*data.vicon_photo()).get()
+			: nullptr),
+		.iconVideo = (data.vicon_video()
+			? owner->processDocument(*data.vicon_video()).get()
+			: nullptr),
+	};
+}
+
 } // namespace
 
 std::vector<StoryId> RespectingPinned(const StoriesIds &ids) {
@@ -1084,10 +1100,8 @@ void Stories::resolve(FullStoryId id, Fn<void()> done, bool force) {
 }
 
 void Stories::loadAround(FullStoryId id, StoriesContext context) {
-	if (v::is<StoriesContextSingle>(context.data)) {
-		return;
-	} else if (v::is<StoriesContextSaved>(context.data)
-		|| v::is<StoriesContextArchive>(context.data)) {
+	if (v::is<StoriesContextSingle>(context.data)
+		|| v::is<StoriesContextAlbum>(context.data)) {
 		return;
 	}
 	const auto i = _all.find(id.peer);
@@ -1748,6 +1762,113 @@ void Stories::savedLoadMore(PeerId peerId) {
 	}).send();
 }
 
+auto Stories::albumsListValue(PeerId peerId)
+-> rpl::producer<std::vector<Data::StoryAlbum>> {
+	auto &albums = _albums[peerId];
+	if (!albums.requestId) {
+		loadAlbums(_owner->peer(peerId), albums);
+	}
+	return albums.list.value();
+}
+
+void Stories::loadAlbums(not_null<PeerData*> peer, Albums &albums) {
+	const auto api = &_owner->session().api();
+	api->request(base::take(albums.requestId)).cancel();
+	albums.requestId = api->request(MTPstories_GetAlbums(
+		peer->input,
+		MTP_long(albums.hash)
+	)).done([=](const MTPstories_Albums &result) {
+		result.match([&](const MTPDstories_albums &data) {
+			auto &albums = _albums[peer->id];
+			albums.requestId = 0;
+			albums.hash = data.vhash().v;
+			auto parsed = std::vector<Data::StoryAlbum>();
+			const auto &list = data.valbums().v;
+			parsed.reserve(list.size());
+			for (const auto &album : list) {
+				parsed.push_back(FromTL(_owner, album));
+			}
+			albums.list = std::move(parsed);
+		}, [](const MTPDstories_albumsNotModified &) {
+		});
+	}).fail([=] {
+		auto &albums = _albums[peer->id];
+		albums.requestId = 0;
+		albums.hash = 0;
+	}).send();
+}
+
+void Stories::albumCreate(
+		not_null<PeerData*> peer,
+		const QString &title,
+		StoryId addId,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail) {
+	auto ids = QVector<MTPint>();
+	if (addId) {
+		ids.push_back(MTP_int(addId));
+	}
+	_owner->session().api().request(MTPstories_CreateAlbum(
+		peer->input,
+		MTP_string(title),
+		MTP_vector<MTPint>(ids)
+	)).done([=](const MTPStoryAlbum &result) {
+		auto &albums = _albums[peer->id];
+		auto current = albums.list.current();
+		auto parsed = FromTL(_owner, result);
+		current.push_back(parsed);
+		albums.list = std::move(current);
+		loadAlbums(peer, albums);
+		if (const auto onstack = done) {
+			onstack(std::move(parsed));
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (const auto onstack = fail) {
+			onstack(error.type());
+		}
+	}).send();
+}
+
+void Stories::albumRename(
+		not_null<PeerData*> peer,
+		int id,
+		const QString &title,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail) {
+	using Flag = MTPstories_UpdateAlbum::Flag;
+	_owner->session().api().request(MTPstories_UpdateAlbum(
+		MTP_flags(Flag::f_title),
+		peer->input,
+		MTP_int(id),
+		MTP_string(title),
+		MTPVector<MTPint>(),
+		MTPVector<MTPint>(),
+		MTPVector<MTPint>()
+	)).done([=](const MTPStoryAlbum &result) {
+		auto &albums = _albums[peer->id];
+		auto current = albums.list.current();
+		auto parsed = FromTL(_owner, result);
+		current.push_back(parsed);
+		albums.list = std::move(current);
+		loadAlbums(peer, albums);
+		if (const auto onstack = done) {
+			onstack(std::move(parsed));
+		}
+	}).fail([=](const MTP::Error &error) {
+		if (const auto onstack = fail) {
+			onstack(error.type());
+		}
+	}).send();
+}
+
+void Stories::notifyAlbumUpdate(StoryAlbumUpdate &&update) {
+	_albumUpdates.fire(std::move(update));
+}
+
+rpl::producer<StoryAlbumUpdate> Stories::albumUpdates() const {
+	return _albumUpdates.events();
+}
+
 void Stories::setPinnedToTop(
 		PeerId peerId,
 		std::vector<StoryId> &&pinnedToTop) {
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 2c0da0750c..24e85ebe0d 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -23,11 +23,15 @@ class Show;
 
 namespace Data {
 
+inline constexpr auto kStoriesAlbumIdSaved = 0;
+inline constexpr auto kStoriesAlbumIdArchive = -1;
+
 class Folder;
 class Session;
 struct StoryView;
 struct StoryIdDates;
 class Story;
+struct StoryAlbum;
 class StoryPreload;
 
 struct StoriesIds {
@@ -90,26 +94,20 @@ struct StoriesContextPeer {
 	friend inline bool operator==(StoriesContextPeer, StoriesContextPeer) = default;
 };
 
-struct StoriesContextSaved {
-	friend inline auto operator<=>(
-		StoriesContextSaved,
-		StoriesContextSaved) = default;
-	friend inline bool operator==(StoriesContextSaved, StoriesContextSaved) = default;
-};
+struct StoriesContextAlbum {
+	int id = 0;
 
-struct StoriesContextArchive {
 	friend inline auto operator<=>(
-		StoriesContextArchive,
-		StoriesContextArchive) = default;
-	friend inline bool operator==(StoriesContextArchive, StoriesContextArchive) = default;
+		StoriesContextAlbum,
+		StoriesContextAlbum) = default;
+	friend inline bool operator==(StoriesContextAlbum, StoriesContextAlbum) = default;
 };
 
 struct StoriesContext {
 	std::variant<
 		StoriesContextSingle,
 		StoriesContextPeer,
-		StoriesContextSaved,
-		StoriesContextArchive,
+		StoriesContextAlbum,
 		StorySourcesList> data;
 
 	friend inline auto operator<=>(
@@ -126,6 +124,13 @@ struct StealthMode {
 	friend inline bool operator==(StealthMode, StealthMode) = default;
 };
 
+struct StoryAlbumUpdate {
+	not_null<PeerData*> peer;
+	int albumId = 0;
+	std::vector<StoryId> added;
+	std::vector<StoryId> removed;
+};
+
 inline constexpr auto kStorySourcesListCount = 2;
 
 class Stories final : public base::has_weak_ptr {
@@ -206,6 +211,23 @@ public:
 	[[nodiscard]] bool savedLoaded(PeerId peerId) const;
 	void savedLoadMore(PeerId peerId);
 
+	[[nodiscard]] auto albumsListValue(PeerId peerId)
+		-> rpl::producer<std::vector<Data::StoryAlbum>>;
+	void albumCreate(
+		not_null<PeerData*> peer,
+		const QString &title,
+		StoryId addId,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail);
+	void albumRename(
+		not_null<PeerData*> peer,
+		int id,
+		const QString &title,
+		Fn<void(StoryAlbum)> done,
+		Fn<void(QString)> fail);
+	void notifyAlbumUpdate(StoryAlbumUpdate &&update);
+	[[nodiscard]] rpl::producer<StoryAlbumUpdate> albumUpdates() const;
+
 	void deleteList(const std::vector<FullStoryId> &ids);
 	void toggleInProfileList(
 		const std::vector<FullStoryId> &ids,
@@ -262,6 +284,12 @@ private:
 		bool loaded = false;
 		mtpRequestId requestId = 0;
 	};
+	struct Albums {
+		rpl::variable<std::vector<Data::StoryAlbum>> list;
+		base::flat_map<int, Set> sets;
+		uint64 hash = 0;
+		mtpRequestId requestId = 0;
+	};
 
 	struct PollingSettings {
 		int chat = 0;
@@ -335,6 +363,8 @@ private:
 	void sendViewsSliceRequest();
 	void sendViewsCountsRequest();
 
+	void loadAlbums(not_null<PeerData*> peer, Albums &albums);
+
 	const not_null<Session*> _owner;
 	std::unordered_map<
 		PeerId,
@@ -378,6 +408,9 @@ private:
 	std::unordered_map<PeerId, Set> _saved;
 	rpl::event_stream<PeerId> _savedChanged;
 
+	std::unordered_map<PeerId, Albums> _albums;
+	rpl::event_stream<StoryAlbumUpdate> _albumUpdates;
+
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
 	base::flat_set<PeerId> _markReadRequests;
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index d5a5fc57ea..f8e1bd21b4 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -414,11 +414,7 @@ bool Story::canShare() const {
 }
 
 bool Story::canDelete() const {
-	if (const auto channel = _peer->asChannel()) {
-		return channel->canDeleteStories()
-			|| (out() && channel->canPostStories());
-	}
-	return _peer->isSelf();
+	return _peer->canDeleteStories() || (out() && _peer->canPostStories());
 }
 
 bool Story::canReport() const {
@@ -903,6 +899,10 @@ StoryId Story::repostSourceId() const {
 	return _repostSourceId;
 }
 
+const std::vector<int> &Story::albumIds() const {
+	return _albumIds;
+}
+
 PeerData *Story::fromPeer() const {
 	return _fromPeer;
 }
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index a1de910faf..4537ec0a28 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -237,6 +237,8 @@ public:
 	[[nodiscard]] QString repostSourceName() const;
 	[[nodiscard]] StoryId repostSourceId() const;
 
+	[[nodiscard]] const std::vector<int> &albumIds() const;
+
 	[[nodiscard]] PeerData *fromPeer() const;
 
 private:
@@ -265,6 +267,7 @@ private:
 	PeerData * const _repostSourcePeer = nullptr;
 	const QString _repostSourceName;
 	const StoryId _repostSourceId = 0;
+	std::vector<int> _albumIds;
 	PeerData * const _fromPeer = nullptr;
 	Data::ReactionId _sentReactionId;
 	StoryMedia _media;
@@ -308,4 +311,15 @@ private:
 
 };
 
+struct StoryAlbum {
+	int id = 0;
+	QString title;
+	PhotoData *iconPhoto = nullptr;
+	DocumentData *iconVideo = nullptr;
+
+	friend inline bool operator==(
+		const StoryAlbum &,
+		const StoryAlbum &) = default;
+};
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
index bea4a1b291..3de988b0e3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_stories_content.cpp
@@ -215,7 +215,7 @@ void FillSourceMenu(
 		add(tr::lng_stories_archive_button(tr::now), [=] {
 			controller->showSection(Info::Stories::Make(
 				peer,
-				Info::Stories::Tab::Archive));
+				Info::Stories::ArchiveId()));
 		}, &st::menuIconStoriesArchiveSection);
 		add(tr::lng_stories_my_title(tr::now), [=] {
 			controller->showSection(Info::Stories::Make(peer));
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index efbfbdc14a..992b2befc8 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -477,7 +477,7 @@ Key ContentMemento::key() const {
 	} else if (const auto self = settingsSelf()) {
 		return Settings::Tag{ self };
 	} else if (const auto stories = storiesPeer()) {
-		return Stories::Tag{ stories, storiesTab() };
+		return Stories::Tag{ stories, storiesAlbumId() };
 	} else if (statisticsTag().peer) {
 		return statisticsTag();
 	} else if (const auto starref = starrefPeer()) {
@@ -521,7 +521,7 @@ ContentMemento::ContentMemento(Downloads::Tag downloads) {
 
 ContentMemento::ContentMemento(Stories::Tag stories)
 : _storiesPeer(stories.peer)
-, _storiesTab(stories.tab) {
+, _storiesAlbumId(stories.albumId) {
 }
 
 ContentMemento::ContentMemento(Statistics::Tag statistics)
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 29c376dfa4..8eed5554f9 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "info/info_wrap_widget.h"
+#include "info/stories/info_stories_common.h"
 #include "info/statistics/info_statistics_tag.h"
 #include "ui/controls/swipe_handler_data.h"
 
@@ -47,11 +48,6 @@ namespace Info::Downloads {
 struct Tag;
 } // namespace Info::Downloads
 
-namespace Info::Stories {
-struct Tag;
-enum class Tab;
-} // namespace Info::Stories
-
 namespace Info::Statistics {
 struct Tag;
 } // namespace Info::Statistics
@@ -226,65 +222,65 @@ public:
 		std::shared_ptr<Api::WhoReadList> whoReadIds,
 		FullMsgId contextId,
 		Data::ReactionId selected);
+	virtual ~ContentMemento() = default;
 
-	virtual object_ptr<ContentWidget> createWidget(
+	[[nodiscard]] virtual object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
 		not_null<Controller*> controller,
 		const QRect &geometry) = 0;
 
-	PeerData *peer() const {
+	[[nodiscard]] PeerData *peer() const {
 		return _peer;
 	}
-	PeerId migratedPeerId() const {
+	[[nodiscard]] PeerId migratedPeerId() const {
 		return _migratedPeerId;
 	}
-	Data::ForumTopic *topic() const {
+	[[nodiscard]] Data::ForumTopic *topic() const {
 		return _topic;
 	}
-	Data::SavedSublist *sublist() const {
+	[[nodiscard]] Data::SavedSublist *sublist() const {
 		return _sublist;
 	}
-	UserData *settingsSelf() const {
+	[[nodiscard]] UserData *settingsSelf() const {
 		return _settingsSelf;
 	}
-	PeerData *storiesPeer() const {
+	[[nodiscard]] PeerData *storiesPeer() const {
 		return _storiesPeer;
 	}
-	Stories::Tab storiesTab() const {
-		return _storiesTab;
+	[[nodiscard]] int storiesAlbumId() const {
+		return _storiesAlbumId;
 	}
-	Statistics::Tag statisticsTag() const {
+	[[nodiscard]] Statistics::Tag statisticsTag() const {
 		return _statisticsTag;
 	}
-	PeerData *starrefPeer() const {
+	[[nodiscard]] PeerData *starrefPeer() const {
 		return _starrefPeer;
 	}
-	BotStarRef::Type starrefType() const {
+	[[nodiscard]] BotStarRef::Type starrefType() const {
 		return _starrefType;
 	}
-	PollData *poll() const {
+	[[nodiscard]] PollData *poll() const {
 		return _poll;
 	}
-	FullMsgId pollContextId() const {
+	[[nodiscard]] FullMsgId pollContextId() const {
 		return _poll ? _pollReactionsContextId : FullMsgId();
 	}
-	std::shared_ptr<Api::WhoReadList> reactionsWhoReadIds() const {
+	[[nodiscard]] auto reactionsWhoReadIds() const
+	-> std::shared_ptr<Api::WhoReadList> {
 		return _reactionsWhoReadIds;
 	}
-	Data::ReactionId reactionsSelected() const {
+	[[nodiscard]] Data::ReactionId reactionsSelected() const {
 		return _reactionsSelected;
 	}
-	FullMsgId reactionsContextId() const {
+	[[nodiscard]] FullMsgId reactionsContextId() const {
 		return _reactionsWhoReadIds ? _pollReactionsContextId : FullMsgId();
 	}
-	UserData *globalMediaSelf() const {
+	[[nodiscard]] UserData *globalMediaSelf() const {
 		return _globalMediaSelf;
 	}
-	Key key() const;
+	[[nodiscard]] Key key() const;
 
-	virtual Section section() const = 0;
-
-	virtual ~ContentMemento() = default;
+	[[nodiscard]] virtual Section section() const = 0;
 
 	void setScrollTop(int scrollTop) {
 		_scrollTop = scrollTop;
@@ -295,19 +291,19 @@ public:
 	void setSearchFieldQuery(const QString &query) {
 		_searchFieldQuery = query;
 	}
-	QString searchFieldQuery() const {
+	[[nodiscard]] QString searchFieldQuery() const {
 		return _searchFieldQuery;
 	}
 	void setSearchEnabledByContent(bool enabled) {
 		_searchEnabledByContent = enabled;
 	}
-	bool searchEnabledByContent() const {
+	[[nodiscard]] bool searchEnabledByContent() const {
 		return _searchEnabledByContent;
 	}
 	void setSearchStartsFocused(bool focused) {
 		_searchStartsFocused = focused;
 	}
-	bool searchStartsFocused() const {
+	[[nodiscard]] bool searchStartsFocused() const {
 		return _searchStartsFocused;
 	}
 
@@ -318,7 +314,7 @@ private:
 	Data::SavedSublist *_sublist = nullptr;
 	UserData * const _settingsSelf = nullptr;
 	PeerData * const _storiesPeer = nullptr;
-	Stories::Tab _storiesTab = {};
+	int _storiesAlbumId = 0;
 	Statistics::Tag _statisticsTag;
 	PeerData * const _starrefPeer = nullptr;
 	BotStarRef::Type _starrefType = {};
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 49054d63f1..449c942eaf 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_controller.h"
 
 #include "ui/search_field_controller.h"
-#include "data/data_shared_media.h"
 #include "history/history.h"
 #include "info/info_content_widget.h"
 #include "info/info_memento.h"
@@ -23,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
+#include "data/data_shared_media.h"
 #include "data/data_media_types.h"
 #include "data/data_download_manager.h"
 #include "history/history_item.h"
@@ -118,11 +118,11 @@ PeerData *Key::storiesPeer() const {
 	return nullptr;
 }
 
-Stories::Tab Key::storiesTab() const {
+int Key::storiesAlbumId() const {
 	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
-		return tag->tab;
+		return tag->albumId;
 	}
-	return Stories::Tab();
+	return 0;
 }
 
 Statistics::Tag Key::statisticsTag() const {
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 5b29ac1ce6..59b9f2ce24 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_message_reaction_id.h"
 #include "data/data_search_controller.h"
 #include "info/statistics/info_statistics_tag.h"
+#include "info/stories/info_stories_common.h"
 #include "window/window_session_controller.h"
 
 namespace Api {
@@ -54,25 +55,6 @@ struct Tag {
 
 } // namespace Info::GlobalMedia
 
-namespace Info::Stories {
-
-enum class Tab {
-	Saved,
-	Archive,
-};
-
-struct Tag {
-	explicit Tag(not_null<PeerData*> peer, Tab tab = {})
-	: peer(peer)
-	, tab(tab) {
-	}
-
-	not_null<PeerData*> peer;
-	Tab tab = {};
-};
-
-} // namespace Info::Stories
-
 namespace Info::BotStarRef {
 
 enum class Type : uchar {
@@ -115,7 +97,7 @@ public:
 	bool isDownloads() const;
 	bool isGlobalMedia() const;
 	PeerData *storiesPeer() const;
-	Stories::Tab storiesTab() const;
+	int storiesAlbumId() const;
 	Statistics::Tag statisticsTag() const;
 	PeerData *starrefPeer() const;
 	BotStarRef::Type starrefType() const;
@@ -244,8 +226,8 @@ public:
 	[[nodiscard]] PeerData *storiesPeer() const {
 		return key().storiesPeer();
 	}
-	[[nodiscard]] Stories::Tab storiesTab() const {
-		return key().storiesTab();
+	[[nodiscard]] int storiesAlbumId() const {
+		return key().storiesAlbumId();
 	}
 	[[nodiscard]] Statistics::Tag statisticsTag() const {
 		return key().statisticsTag();
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 20a99a2c58..9acb4740e6 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -286,11 +286,11 @@ Dialogs::RowDescriptor WrapWidget::activeChat() const {
 			peer->owner().history(peer),
 			FullMsgId());
 	} else if (const auto storiesPeer = key().storiesPeer()) {
-		return (key().storiesTab() == Stories::Tab::Saved)
-			? Dialogs::RowDescriptor(
+		return (key().storiesAlbumId() == Stories::ArchiveId())
+			? Dialogs::RowDescriptor()
+			: Dialogs::RowDescriptor(
 				storiesPeer->owner().history(storiesPeer),
-				FullMsgId())
-			: Dialogs::RowDescriptor();
+				FullMsgId());
 	} else if (key().settingsSelf()
 			|| key().isDownloads()
 			|| key().reactionsContextId()
@@ -412,7 +412,7 @@ void WrapWidget::setupTopBarMenuToggle() {
 		}
 	} else if (key.storiesPeer()
 		&& key.storiesPeer()->isSelf()
-		&& key.storiesTab() == Stories::Tab::Saved) {
+		&& key.storiesAlbumId() != Stories::ArchiveId()) {
 		const auto &st = (wrap() == Wrap::Layer)
 			? st::infoLayerTopBarEdit
 			: st::infoTopBarEdit;
@@ -656,7 +656,7 @@ void WrapWidget::finishShowContent() {
 		});
 		_topBar->setStories(_content->titleStories());
 		_topBar->setStoriesArchive(
-			_controller->key().storiesTab() == Stories::Tab::Archive);
+			_controller->key().storiesAlbumId() == Stories::ArchiveId());
 	}
 	_desiredHeights.fire(desiredHeightForContent());
 	_desiredShadowVisibilities.fire(_content->desiredShadowVisibility());
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index f6b382b1e4..f396b1c9d9 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -507,10 +507,10 @@ bool ListWidget::tooltipWindowActive() const {
 void ListWidget::openPhoto(not_null<PhotoData*> photo, FullMsgId id) {
 	using namespace Data;
 
-	const auto tab = _controller->storiesTab();
-	const auto context = (tab == Stories::Tab::Archive)
-		? Data::StoriesContext{ Data::StoriesContextArchive() }
-		: Data::StoriesContext{ Data::StoriesContextSaved() };
+	const auto albumId = _controller->storiesAlbumId();
+	const auto context = Data::StoriesContext{
+		Data::StoriesContextAlbum{ albumId }
+	};
 	_controller->parentController()->openPhoto(
 		photo,
 		{ id, topicRootId(), monoforumPeerId() },
@@ -521,10 +521,10 @@ void ListWidget::openDocument(
 		not_null<DocumentData*> document,
 		FullMsgId id,
 		bool showInMediaView) {
-	const auto tab = _controller->storiesTab();
-	const auto context = (tab == Stories::Tab::Archive)
-		? Data::StoriesContext{ Data::StoriesContextArchive() }
-		: Data::StoriesContext{ Data::StoriesContextSaved() };
+	const auto albumId = _controller->storiesAlbumId();
+	const auto context = Data::StoriesContext{
+		Data::StoriesContextAlbum{ albumId }
+	};
 	_controller->parentController()->openDocument(
 		document,
 		showInMediaView,
@@ -1050,8 +1050,8 @@ void ListWidget::showContextMenu(
 	}
 	if (overSelected == SelectionState::OverSelectedItems) {
 		if (canToggleStoryPinAll()) {
-			const auto tab = _controller->key().storiesTab();
-			const auto toProfile = (tab == Stories::Tab::Archive);
+			const auto albumId = _controller->storiesAlbumId();
+			const auto toProfile = (albumId == Stories::ArchiveId());
 			_contextMenu->addAction(
 				(toProfile
 					? tr::lng_mediaview_save_to_profile
@@ -1102,8 +1102,8 @@ void ListWidget::showContextMenu(
 				item,
 				FullSelection);
 			if (selectionData.canToggleStoryPin) {
-				const auto tab = _controller->key().storiesTab();
-				const auto toProfile = (tab == Stories::Tab::Archive);
+				const auto albumId = _controller->storiesAlbumId();
+				const auto toProfile = (albumId == Stories::ArchiveId());
 				_contextMenu->addAction(
 					(toProfile
 						? tr::lng_mediaview_save_to_profile
@@ -1272,7 +1272,8 @@ void ListWidget::toggleStoryInProfile(
 	}
 	const auto channel = peerIsChannel(list.front().peer);
 	const auto count = int(list.size());
-	const auto toProfile = (_controller->storiesTab() == Stories::Tab::Archive);
+	const auto albumId = _controller->storiesAlbumId();
+	const auto toProfile = (albumId == Stories::ArchiveId());
 	const auto controller = _controller;
 	const auto sure = [=](Fn<void()> close) {
 		using namespace ::Media::Stories;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_albums.cpp b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
new file mode 100644
index 0000000000..d0699202c0
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
@@ -0,0 +1,149 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/stories/info_stories_albums.h"
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_stories.h"
+#include "data/data_story.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/layers/generic_box.h"
+#include "ui/widgets/fields/input_field.h"
+#include "window/window_session_controller.h"
+#include "styles/style_layers.h"
+#include "styles/style_info.h"
+
+namespace Info::Stories {
+namespace {
+
+constexpr auto kAlbumNameLimit = 12;
+
+void EditAlbumBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		StoryId addId,
+		QString currentName,
+		Fn<void(Data::StoryAlbum)> finished) {
+	box->setTitle(id
+		? tr::lng_stories_album_edit()
+		: tr::lng_stories_album_new_title());
+
+	if (!id) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_stories_album_new_text(),
+				st::collectionAbout));
+	}
+	const auto title = box->addRow(
+		object_ptr<Ui::InputField>(
+			box,
+			st::collectionNameField,
+			tr::lng_stories_album_new_ph(),
+			currentName));
+	title->setMaxLength(kAlbumNameLimit * 2);
+	box->setFocusCallback([=] {
+		title->setFocusFast();
+	});
+
+	Ui::AddLengthLimitLabel(title, kAlbumNameLimit);
+
+	const auto show = navigation->uiShow();
+	const auto session = &peer->session();
+
+	const auto creating = std::make_shared<bool>(false);
+	auto text = id
+		? tr::lng_settings_save()
+		: tr::lng_stories_album_new_create();
+	box->addButton(std::move(text), [=] {
+		if (*creating) {
+			return;
+		}
+		const auto text = title->getLastText().trimmed();
+		if (text.isEmpty() || text.size() > kAlbumNameLimit) {
+			title->showError();
+			return;
+		}
+
+		*creating = true;
+		const auto weak = base::make_weak(box);
+		const auto done = [=](Data::StoryAlbum result) {
+			*creating = false;
+			if (const auto onstack = finished) {
+				onstack(result);
+			}
+			if (const auto strong = weak.get()) {
+				strong->closeBox();
+			}
+		};
+		const auto fail = [=](QString type) {
+			*creating = false;
+			if (type == u"ALBUMS_TOO_MANY"_q) {
+				show->show(Ui::MakeInformBox({
+					.text = tr::lng_stories_album_limit_text(),
+					.confirmText = tr::lng_box_ok(),
+					.title = tr::lng_stories_album_limit_title(),
+				}));
+				if (const auto strong = weak.get()) {
+					strong->closeBox();
+				}
+			} else {
+				show->showToast(type);
+			}
+		};
+		if (id) {
+			session->data().stories().albumRename(
+				peer,
+				id,
+				text,
+				done,
+				fail);
+		} else {
+			session->data().stories().albumCreate(
+				peer,
+				text,
+				addId,
+				done,
+				fail);
+		}
+	});
+
+	box->addButton(tr::lng_cancel(), [=] {
+		box->closeBox();
+	});
+}
+
+} // namespace
+
+void NewAlbumBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		StoryId addId,
+		Fn<void(Data::StoryAlbum)> added) {
+	EditAlbumBox(box, navigation, peer, 0, addId, QString(), added);
+}
+
+void EditAlbumNameBox(
+		not_null<Ui::GenericBox*> box,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer,
+		int id,
+		QString current,
+		Fn<void(QString)> done) {
+	EditAlbumBox(box, navigation, peer, id, {}, current, [=](
+			Data::StoryAlbum result) {
+		done(result.title);
+	});
+}
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_albums.h b/Telegram/SourceFiles/info/stories/info_stories_albums.h
new file mode 100644
index 0000000000..d1ef52fc2a
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_albums.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+struct StoryAlbum;
+} // namespace Data
+
+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
+namespace Info::Stories {
+
+void NewAlbumBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	StoryId addId,
+	Fn<void(Data::StoryAlbum)> added);
+
+void EditAlbumNameBox(
+	not_null<Ui::GenericBox*> box,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer,
+	int id,
+	QString current,
+	Fn<void(QString)> done);
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_common.h b/Telegram/SourceFiles/info/stories/info_stories_common.h
new file mode 100644
index 0000000000..df638fe0aa
--- /dev/null
+++ b/Telegram/SourceFiles/info/stories/info_stories_common.h
@@ -0,0 +1,24 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Info::Stories {
+
+[[nodiscard]] int ArchiveId();
+
+struct Tag {
+	explicit Tag(not_null<PeerData*> peer, int albumId = 0)
+	: peer(peer)
+	, albumId(albumId) {
+	}
+
+	not_null<PeerData*> peer;
+	int albumId = 0;
+};
+
+} // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 4848fd3355..b09962071c 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/stories/info_stories_inner_widget.h"
 
+#include "apiwrap.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -19,19 +20,30 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_widget.h"
+#include "info/stories/info_stories_albums.h"
 #include "info/stories/info_stories_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/controls/sub_tabs.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/vertical_list.h"
+#include "styles/style_credits.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_menu_icons.h"
 #include "styles/style_settings.h"
 
 namespace Info::Stories {
@@ -96,6 +108,13 @@ InnerWidget::InnerWidget(
 	not_null<Controller*> controller)
 : RpWidget(parent)
 , _controller(controller)
+, _peer(controller->key().storiesPeer())
+, _addingToAlbumId(0)
+, _albumId(controller->key().storiesAlbumId())
+, _albumChanges(Data::StoryAlbumUpdate{
+	.peer = _peer,
+	.albumId = _addingToAlbumId,
+})
 , _empty(this) {
 	_empty->heightValue(
 	) | rpl::start_with_next(
@@ -104,23 +123,36 @@ InnerWidget::InnerWidget(
 	_list = setupList();
 }
 
+void InnerWidget::setupAlbums() {
+	Ui::AddSkip(_top);
+	_albumsWrap = _top->add(object_ptr<Ui::BoxContentDivider>(_top));
+
+	_peer->owner().stories().albumsListValue(
+		_peer->id
+	) | rpl::start_with_next([=](std::vector<Data::StoryAlbum> &&albums) {
+		_albums = std::move(albums);
+		refreshAlbumsTabs();
+	}, lifetime());
+}
+
+InnerWidget::~InnerWidget() = default;
+
 void InnerWidget::setupTop() {
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
-	if (peer && key.storiesTab() == Stories::Tab::Saved && _isStackBottom) {
-		if (peer->isSelf()) {
+	const auto albumId = _albumId.current();
+	if (albumId == Data::kStoriesAlbumIdArchive) {
+		createAboutArchive();
+	} else if (_isStackBottom) {
+		if (_peer->isSelf()) {
 			createProfileTop();
-		} else if (peer->owner().stories().hasArchive(peer)) {
+		} else if (_peer->owner().stories().hasArchive(_peer)) {
 			createButtons();
 		} else {
-			_top.destroy();
-			refreshHeight();
+			startTop();
+			finalizeTop();
 		}
-	} else if (peer && key.storiesTab() == Stories::Tab::Archive) {
-		createAboutArchive();
 	} else {
-		_top.destroy();
-		refreshHeight();
+		startTop();
+		finalizeTop();
 	}
 }
 
@@ -131,14 +163,11 @@ void InnerWidget::startTop() {
 }
 
 void InnerWidget::createProfileTop() {
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
-
 	startTop();
 
 	using namespace Profile;
-	AddCover(_top, _controller, peer, nullptr, nullptr);
-	AddDetails(_top, _controller, peer, nullptr, nullptr, { v::null });
+	AddCover(_top, _controller, _peer, nullptr, nullptr);
+	AddDetails(_top, _controller, _peer, nullptr, nullptr, { v::null });
 
 	auto tracker = Ui::MultiSlideTracker();
 	const auto dividerWrap = _top->add(
@@ -169,12 +198,10 @@ void InnerWidget::createButtons() {
 void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
 	Expects(_top != nullptr);
 
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
-	const auto stories = &peer->owner().stories();
+	const auto stories = &_peer->owner().stories();
 
-	if (!stories->archiveCountKnown(peer->id)) {
-		stories->archiveLoadMore(peer->id);
+	if (!stories->archiveCountKnown(_peer->id)) {
+		stories->archiveLoadMore(_peer->id);
 	}
 
 	auto count = rpl::single(
@@ -182,10 +209,10 @@ void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
 	) | rpl::then(
 		stories->archiveChanged(
 		) | rpl::filter(
-			rpl::mappers::_1 == peer->id
+			rpl::mappers::_1 == _peer->id
 		) | rpl::to_empty
 	) | rpl::map([=] {
-		return stories->archiveCount(peer->id);
+		return stories->archiveCount(_peer->id);
 	}) | rpl::start_spawning(_top->lifetime());
 
 	const auto archiveWrap = _top->add(
@@ -201,9 +228,8 @@ void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
 
 	const auto archive = archiveWrap->entity();
 	archive->addClickHandler([=] {
-		_controller->showSection(Info::Stories::Make(
-			_controller->key().storiesPeer(),
-			Stories::Tab::Archive));
+		_controller->showSection(
+			Make(_peer, Data::kStoriesAlbumIdArchive));
 	});
 	auto label = rpl::duplicate(
 		count
@@ -227,8 +253,6 @@ void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
 void InnerWidget::addRecentButton(Ui::MultiSlideTracker &tracker) {
 	Expects(_top != nullptr);
 
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
 	const auto recentWrap = _top->add(
 		object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
 			_top,
@@ -239,7 +263,7 @@ void InnerWidget::addRecentButton(Ui::MultiSlideTracker &tracker) {
 
 	using namespace Dialogs::Stories;
 	auto last = LastForPeer(
-		peer
+		_peer
 	) | rpl::map([=](Content &&content) {
 		for (auto &element : content.elements) {
 			element.unreadCount = 0;
@@ -272,7 +296,7 @@ void InnerWidget::addRecentButton(Ui::MultiSlideTracker &tracker) {
 	}, thumbs->lifetime());
 	thumbs->setAttribute(Qt::WA_TransparentForMouseEvents);
 	recent->addClickHandler([=] {
-		_controller->parentController()->openPeerStories(peer->id);
+		_controller->parentController()->openPeerStories(_peer->id);
 	});
 	object_ptr<Profile::FloatingIcon>(
 		recent,
@@ -289,9 +313,7 @@ void InnerWidget::addRecentButton(Ui::MultiSlideTracker &tracker) {
 void InnerWidget::addGiftsButton(Ui::MultiSlideTracker &tracker) {
 	Expects(_top != nullptr);
 
-	const auto key = _controller->key();
-	const auto peer = key.storiesPeer();
-	const auto user = peer->asUser();
+	const auto user = _peer->asUser();
 	Assert(user != nullptr);
 
 	auto count = Profile::PeerGiftsCountValue(
@@ -336,9 +358,11 @@ void InnerWidget::addGiftsButton(Ui::MultiSlideTracker &tracker) {
 }
 
 void InnerWidget::finalizeTop() {
-	Ui::AddSkip(_top, st::infoProfileSkip);
-	Ui::AddDivider(_top);
-
+	const auto addPossibleAlbums = !_addingToAlbumId
+		&& (_albumId.current() != Data::kStoriesAlbumIdArchive);
+	if (addPossibleAlbums) {
+		setupAlbums();
+	}
 	_top->resizeToWidth(width());
 
 	_top->heightValue(
@@ -350,12 +374,11 @@ void InnerWidget::finalizeTop() {
 void InnerWidget::createAboutArchive() {
 	startTop();
 
-	const auto peer = _controller->key().storiesPeer();
 	_top->add(object_ptr<Ui::DividerLabel>(
 		_top,
 		object_ptr<Ui::FlatLabel>(
 			_top,
-			(peer->isChannel()
+			(_peer->isChannel()
 				? tr::lng_stories_channel_archive_about
 				: tr::lng_stories_archive_about)(),
 			st::infoStoriesAboutArchive),
@@ -401,6 +424,291 @@ object_ptr<Media::ListWidget> InnerWidget::setupList() {
 	return result;
 }
 
+void InnerWidget::refreshAlbumsTabs() {
+	Expects(!_addingToAlbumId);
+	Expects(_albumsWrap != nullptr);
+
+	if (_albums.empty() && !_peer->canEditStories()) {
+		if (base::take(_albumsTabs)) {
+			resizeToWidth(width());
+		}
+		return;
+	}
+	auto tabs = std::vector<Ui::SubTabs::Tab>();
+	if (!_albums.empty()) {
+		tabs.push_back({
+			.id = u"all"_q,
+			.text = tr::lng_stories_album_all(
+				tr::now,
+				Ui::Text::WithEntities),
+		});
+		for (const auto &album : _albums) {
+			auto title = TextWithEntities();
+			title.append(album.title);
+			tabs.push_back({
+				.id = QString::number(album.id),
+				.text = std::move(title),
+			});
+		}
+	}
+	if (_peer->canEditStories()) {
+		tabs.push_back({
+			.id = u"add"_q,
+			.text = { '+' + tr::lng_stories_album_add(tr::now) },
+		});
+	}
+	if (!_albumsTabs) {
+		_albumsTabs = std::make_unique<Ui::SubTabs>(
+			_albumsWrap,
+			Ui::SubTabs::Options{
+				.selected = _albums.empty() ? QString() : u"all"_q,
+				.centered = true,
+			},
+			std::move(tabs));
+		_albumsTabs->show();
+
+		const auto padding = st::giftBoxPadding;
+		_albumsWrap->resize(
+			_albumsWrap->width(),
+			padding.top() + _albumsTabs->height() + padding.top());
+		_albumsWrap->widthValue() | rpl::start_with_next([=](int width) {
+			_albumsTabs->resizeToWidth(width);
+		}, _albumsTabs->lifetime());
+		_albumsTabs->move(0, padding.top());
+
+		_albumsTabs->activated(
+		) | rpl::start_with_next([=](const QString &id) {
+			if (id == u"add"_q) {
+				const auto added = [=](Data::StoryAlbum album) {
+					albumAdded(album);
+				};
+				_controller->uiShow()->show(Box(
+					NewAlbumBox,
+					_controller,
+					_peer,
+					StoryId(),
+					added));
+			} else {
+				_albumsTabs->setActiveTab(id);
+
+				//auto now = _descriptor.current();
+				//now.collectionId = (id == u"all"_q) ? 0 : id.toInt();
+				//_descriptorChanges.fire(std::move(now));
+			}
+		}, _albumsTabs->lifetime());
+
+		_albumsTabs->contextMenuRequests(
+		) | rpl::start_with_next([=](const QString &id) {
+			if (id == u"add"_q
+				|| id == u"all"_q
+				|| !_peer->canEditStories()) {
+				return;
+			}
+			showMenuForAlbum(id.toInt());
+		}, _albumsTabs->lifetime());
+	} else {
+		_albumsTabs->setTabs(std::move(tabs));
+	}
+	resizeToWidth(width());
+}
+
+void InnerWidget::showMenuForAlbum(int id) {
+	if (_menu || _addingToAlbumId) {
+		return;
+	}
+	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
+	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
+	addAction(tr::lng_stories_album_add_title(tr::now), [=] {
+		editAlbumStories(id);
+	}, &st::menuIconStoriesSave);
+	addAction(tr::lng_stories_album_edit(tr::now), [=] {
+		editAlbumName(id);
+	}, &st::menuIconEdit);
+	addAction({
+		.text = tr::lng_stories_album_delete(tr::now),
+		.handler = [=] { confirmDeleteAlbum(id); },
+		.icon = &st::menuIconDeleteAttention,
+		.isAttention = true,
+	});
+	_menu->popup(QCursor::pos());
+}
+
+rpl::producer<Data::StoryAlbumUpdate> InnerWidget::changes() const {
+	return _albumChanges.value();
+}
+
+void InnerWidget::reloadAlbum(int id) {
+	// #TODO stories
+}
+
+void InnerWidget::editAlbumStories(int id) {
+	const auto weak = base::make_weak(this);
+	_controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+		box->setTitle(tr::lng_stories_album_add_title());
+		box->setWidth(st::boxWideWidth);
+		box->setStyle(st::collectionEditBox);
+
+		struct State {
+			rpl::variable<Data::StoryAlbumUpdate> changes;
+			base::unique_qptr<Ui::PopupMenu> menu;
+			bool saving = false;
+		};
+		const auto state = box->lifetime().make_state<State>(State{
+			.changes = Data::StoryAlbumUpdate{
+				.peer = _peer,
+				.albumId = id,
+			}
+		});
+		const auto content = box->addRow(
+			object_ptr<InnerWidget>(
+				box,
+				_controller/*,
+				_peer,
+				state->descriptor.value(),
+				id,
+				(_all.filter == Filter()) ? _all : Entries()*/),
+			{});
+		state->changes = content->changes();
+
+		content->scrollToRequests(
+		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
+			box->scrollTo(request);
+		}, content->lifetime());
+
+		box->addTopButton(st::boxTitleClose, [=] {
+			box->closeBox();
+		});
+		const auto weakBox = base::make_weak(box);
+		auto text = state->changes.value(
+		) | rpl::map([=](const Data::StoryAlbumUpdate &update) {
+			return (!update.added.empty() && update.removed.empty())
+				? tr::lng_stories_album_add_title()
+				: tr::lng_settings_save();
+		}) | rpl::flatten_latest();
+		box->addButton(std::move(text), [=] {
+			if (state->saving) {
+				return;
+			}
+			auto add = QVector<MTPint>();
+			auto remove = QVector<MTPint>();
+			const auto &changes = state->changes.current();
+			for (const auto &id : changes.added) {
+				add.push_back(MTP_int(id));
+			}
+			for (const auto &id : changes.removed) {
+				remove.push_back(MTP_int(id));
+			}
+			if (add.empty() && remove.empty()) {
+				box->closeBox();
+				return;
+			}
+			state->saving = true;
+			const auto session = &_controller->session();
+			using Flag = MTPstories_UpdateAlbum::Flag;
+			session->api().request(
+				MTPstories_UpdateAlbum(
+					MTP_flags(Flag()
+						| (add.isEmpty() ? Flag() : Flag::f_add_stories)
+						| (remove.isEmpty()
+							? Flag()
+							: Flag::f_delete_stories)),
+					_peer->input,
+					MTP_int(id),
+					MTPstring(),
+					MTP_vector<MTPint>(remove),
+					MTP_vector<MTPint>(add),
+					MTPVector<MTPint>())
+			).done([=] {
+				if (const auto strong = weakBox.get()) {
+					state->saving = false;
+					strong->closeBox();
+				}
+				session->data().stories().notifyAlbumUpdate(
+					base::duplicate(changes));
+				if (const auto strong = weak.get()) {
+					strong->reloadAlbum(id);
+				}
+			}).fail([=](const MTP::Error &error) {
+				if (const auto strong = weakBox.get()) {
+					state->saving = false;
+					strong->uiShow()->showToast(error.type());
+				}
+			}).send();
+		});
+	}));
+}
+
+void InnerWidget::editAlbumName(int id) {
+	const auto done = [=](QString name) {
+		albumRenamed(id, name);
+	};
+	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
+	if (i == end(_albums)) {
+		return;
+	}
+	_controller->uiShow()->show(Box(
+		EditAlbumNameBox,
+		_controller->parentController(),
+		_peer,
+		id,
+		i->title,
+		done));
+}
+
+void InnerWidget::confirmDeleteAlbum(int id) {
+	const auto done = [=](Fn<void()> close) {
+		_controller->session().api().request(
+			MTPstories_DeleteAlbum(_peer->input, MTP_int(id))
+		).send();
+		albumRemoved(id);
+		close();
+	};
+	_controller->uiShow()->show(Ui::MakeConfirmBox({
+		.text = tr::lng_stories_album_delete_sure(),
+		.confirmed = crl::guard(this, done),
+		.confirmText = tr::lng_stories_album_delete_button(),
+		.confirmStyle = &st::attentionBoxButton,
+	}));
+}
+
+void InnerWidget::albumAdded(Data::StoryAlbum result) {
+	Expects(ranges::contains(_albums, result.id, &Data::StoryAlbum::id));
+
+	_albumId = result.id;
+}
+
+void InnerWidget::albumRenamed(int id, QString name) {
+	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
+	if (i != end(_albums)) {
+		i->title = name;
+		refreshAlbumsTabs();
+	}
+}
+
+void InnerWidget::albumRemoved(int id) {
+	auto now = _albumId.current();
+	if (now == id) {
+		_albumId = 0;
+	}
+	//const auto removeFrom = [&](Entries &entries) {
+	//	for (auto &entry : entries.list) {
+	//		entry.gift.collectionIds.erase(
+	//			ranges::remove(entry.gift.collectionIds, id),
+	//			end(entry.gift.collectionIds));
+	//	}
+	//};
+	//removeFrom(_all);
+	//for (auto &[_, entries] : _perCollection) {
+	//	removeFrom(entries);
+	//}
+
+	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
+	if (i != end(_albums)) {
+		_albums.erase(i);
+		refreshAlbumsTabs();
+	}
+}
+
 void InnerWidget::saveState(not_null<Memento*> memento) {
 	_list->saveState(&memento->media());
 }
@@ -419,8 +727,6 @@ void InnerWidget::selectionAction(SelectionAction action) {
 	_list->selectionAction(action);
 }
 
-InnerWidget::~InnerWidget() = default;
-
 int InnerWidget::resizeGetHeight(int newWidth) {
 	_inResize = true;
 	auto guard = gsl::finally([this] { _inResize = false; });
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index 75d3654273..cda2fac090 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -7,11 +7,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "base/unique_qptr.h"
+#include "data/data_stories.h"
+#include "info/stories/info_stories_common.h"
 #include "ui/rp_widget.h"
 #include "ui/widgets/scroll_area.h"
-#include "base/unique_qptr.h"
+
+namespace Data {
+struct StoryAlbum;
+} // namespace Data
 
 namespace Ui {
+class SubTabs;
+class PopupMenu;
 class VerticalLayout;
 class MultiSlideTracker;
 } // namespace Ui
@@ -26,6 +34,10 @@ namespace Info::Media {
 class ListWidget;
 } // namespace Info::Media
 
+namespace Window {
+class SessionNavigation;
+} // namespace Window
+
 namespace Info::Stories {
 
 class Memento;
@@ -33,9 +45,8 @@ class EmptyWidget;
 
 class InnerWidget final : public Ui::RpWidget {
 public:
-	InnerWidget(
-		QWidget *parent,
-		not_null<Controller*> controller);
+	InnerWidget(QWidget *parent, not_null<Controller*> controller);
+	~InnerWidget();
 
 	bool showInternal(not_null<Memento*> memento);
 	void setIsStackBottom(bool isStackBottom) {
@@ -52,7 +63,13 @@ public:
 	rpl::producer<SelectedItems> selectedListValue() const;
 	void selectionAction(SelectionAction action);
 
-	~InnerWidget();
+	void reloadAlbum(int id);
+	void editAlbumStories(int id);
+	void editAlbumName(int id);
+	void confirmDeleteAlbum(int id);
+	void albumAdded(Data::StoryAlbum result);
+
+	[[nodiscard]] rpl::producer<Data::StoryAlbumUpdate> changes() const;
 
 protected:
 	int resizeGetHeight(int newWidth) override;
@@ -65,6 +82,7 @@ private:
 	void refreshHeight();
 
 	void setupTop();
+	void setupAlbums();
 	void createButtons();
 	void createProfileTop();
 	void createAboutArchive();
@@ -75,9 +93,25 @@ private:
 	void addGiftsButton(Ui::MultiSlideTracker &tracker);
 	void finalizeTop();
 
-	object_ptr<Media::ListWidget> setupList();
+	[[nodiscard]] object_ptr<Media::ListWidget> setupList();
+
+	void refreshAlbumsTabs();
+	void showMenuForAlbum(int id);
+
+	void albumRenamed(int id, QString name);
+	void albumRemoved(int id);
 
 	const not_null<Controller*> _controller;
+	const not_null<PeerData*> _peer;
+	const int _addingToAlbumId = 0;
+
+	std::vector<Data::StoryAlbum> _albums;
+	rpl::variable<int> _albumId;
+	Ui::RpWidget *_albumsWrap = nullptr;
+	std::unique_ptr<Ui::SubTabs> _albumsTabs;
+	rpl::variable<Data::StoryAlbumUpdate> _albumChanges;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
 
 	object_ptr<Ui::VerticalLayout> _top = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index cb7528a7c7..b33bd12062 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -49,7 +49,7 @@ Provider::Provider(not_null<AbstractController*> controller)
 : _controller(controller)
 , _peer(controller->key().storiesPeer())
 , _history(_peer->owner().history(_peer))
-, _tab(controller->key().storiesTab()) {
+, _albumId(controller->key().storiesAlbumId()) {
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		for (auto &layout : _layouts) {
@@ -180,9 +180,9 @@ void Provider::setSearchQuery(QString query) {
 void Provider::refreshViewer() {
 	_viewerLifetime.destroy();
 	const auto idForViewer = _aroundId;
-	auto ids = (_tab == Tab::Saved)
-		? Data::SavedStoriesIds(_peer, idForViewer, _idsLimit)
-		: Data::ArchiveStoriesIds(_peer, idForViewer, _idsLimit);
+	auto ids = (_albumId == Data::kStoriesAlbumIdArchive)
+		? Data::ArchiveStoriesIds(_peer, idForViewer, _idsLimit)
+		: Data::SavedStoriesIds(_peer, idForViewer, _idsLimit); // #TODO stories
 	std::move(
 		ids
 	) | rpl::start_with_next([=](Data::StoriesIdsSlice &&slice) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.h b/Telegram/SourceFiles/info/stories/info_stories_provider.h
index b43350d971..ae8fbd251a 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/weak_ptr.h"
 #include "data/data_stories_ids.h"
 #include "info/media/info_media_common.h"
+#include "info/stories/info_stories_common.h"
 
 class DocumentData;
 class HistoryItem;
@@ -26,8 +27,6 @@ class AbstractController;
 
 namespace Info::Stories {
 
-enum class Tab;
-
 class Provider final
 	: public Media::ListProvider
 	, private Media::ListSectionDelegate
@@ -117,7 +116,7 @@ private:
 	const not_null<AbstractController*> _controller;
 	const not_null<PeerData*> _peer;
 	const not_null<History*> _history;
-	const Tab _tab;
+	const int _albumId = 0;
 
 	StoryId _aroundId = kDefaultAroundId;
 	int _idsLimit = kMinimalIdsLimit;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 30052bc921..f861636331 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/stories/info_stories_widget.h"
 
 #include "data/data_peer.h"
+#include "data/data_stories.h"
 #include "info/stories/info_stories_inner_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
@@ -17,13 +18,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Info::Stories {
 
+int ArchiveId() {
+	return Data::kStoriesAlbumIdArchive;
+}
+
 Memento::Memento(not_null<Controller*> controller)
-: ContentMemento(Tag{ controller->storiesPeer(), controller->storiesTab() })
+: ContentMemento(Tag{
+	controller->storiesPeer(),
+	controller->storiesAlbumId() })
 , _media(controller) {
 }
 
-Memento::Memento(not_null<PeerData*> peer, Tab tab)
-: ContentMemento(Tag{ peer, tab })
+Memento::Memento(not_null<PeerData*> peer, int albumId)
+: ContentMemento(Tag{ peer, albumId })
 , _media(peer, 0, Media::Type::PhotoVideo) {
 }
 
@@ -66,8 +73,8 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 		return false;
 	}
 	if (auto storiesMemento = dynamic_cast<Memento*>(memento.get())) {
-		const auto tab = controller()->key().storiesTab();
-		if (storiesMemento->storiesTab() == tab) {
+		const auto albumId = controller()->key().storiesAlbumId();
+		if (storiesMemento->storiesAlbumId() == albumId) {
 			restoreState(storiesMemento);
 			return true;
 		}
@@ -109,18 +116,18 @@ void Widget::selectionAction(SelectionAction action) {
 
 rpl::producer<QString> Widget::title() {
 	const auto peer = controller()->key().storiesPeer();
-	return (controller()->key().storiesTab() == Tab::Archive)
+	return (controller()->key().storiesAlbumId() == ArchiveId())
 		? tr::lng_stories_archive_title()
 		: (peer && peer->isSelf())
 		? tr::lng_menu_my_profile()
 		: tr::lng_stories_my_title();
 }
 
-std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, Tab tab) {
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, int albumId) {
 	return std::make_shared<Info::Memento>(
 		std::vector<std::shared_ptr<ContentMemento>>(
 			1,
-			std::make_shared<Memento>(peer, tab)));
+			std::make_shared<Memento>(peer, albumId)));
 }
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 45df73f2ba..5a194917c6 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -9,16 +9,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "info/info_content_widget.h"
 #include "info/media/info_media_widget.h"
+#include "info/stories/info_stories_common.h"
 
 namespace Info::Stories {
 
 class InnerWidget;
-enum class Tab;
 
 class Memento final : public ContentMemento {
 public:
 	Memento(not_null<Controller*> controller);
-	Memento(not_null<PeerData*> peer, Tab tab);
+	Memento(not_null<PeerData*> peer, int albumId);
 	~Memento();
 
 	object_ptr<ContentWidget> createWidget(
@@ -70,6 +70,6 @@ private:
 
 [[nodiscard]] std::shared_ptr<Info::Memento> Make(
 	not_null<PeerData*> peer,
-	Tab tab = {});
+	int albumId = 0);
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index 3f136872e3..d1e78cf793 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/stories/media_stories_stealth.h"
 #include "media/stories/media_stories_view.h"
 #include "media/audio/media_audio.h"
+#include "info/stories/info_stories_common.h"
 #include "settings/settings_credits_graphics.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/report_box_graphics.h"
@@ -703,44 +704,36 @@ void Controller::rebuildFromContext(
 	}, [&](StoriesContextPeer) {
 		source = stories.source(peerId);
 		hideSiblings();
-	}, [&](StoriesContextSaved) {
-		if (stories.savedCountKnown(peerId)) {
-			const auto &saved = stories.saved(peerId);
-			auto sorted = RespectingPinned(saved);
+	}, [&](StoriesContextAlbum album) {
+		const auto archive = (album.id == Data::kStoriesAlbumIdArchive);
+		const auto known = archive
+			? stories.archiveCountKnown(peerId)
+			: stories.savedCountKnown(peerId);
+		if (known) {
+			const auto &ids = archive
+				? stories.archive(peerId)
+				: stories.saved(peerId);
+			auto sorted = RespectingPinned(ids);
 			const auto i = ranges::find(sorted, id);
 			const auto tillEnd = int(end(sorted) - i);
 			if (tillEnd > 0) {
 				_index = int(i - begin(sorted));
+				const auto total = archive
+					? stories.archiveCount(peerId)
+					: stories.savedCount(peerId);
 				list = StoriesList{
 					.peer = peer,
-					.ids = saved,
+					.ids = ids,
 					.sorted = std::move(sorted),
-					.total = stories.savedCount(peerId),
+					.total = total,
 				};
-				if (saved.list.size() < list->total
+				if (ids.list.size() < list->total
 					&& tillEnd < kPreloadStoriesCount) {
-					stories.savedLoadMore(peerId);
-				}
-			}
-		}
-		hideSiblings();
-	}, [&](StoriesContextArchive) {
-		if (stories.archiveCountKnown(peerId)) {
-			const auto &archive = stories.archive(peerId);
-			auto sorted = RespectingPinned(archive);
-			const auto i = ranges::find(sorted, id);
-			const auto tillEnd = int(end(sorted) - i);
-			if (tillEnd > 0) {
-				_index = int(i - begin(sorted));
-				list = StoriesList{
-					.peer = peer,
-					.ids = archive,
-					.sorted = std::move(sorted),
-					.total = stories.archiveCount(peerId),
-				};
-				if (archive.list.size() < list->total
-					&& tillEnd < kPreloadStoriesCount) {
-					stories.archiveLoadMore(peerId);
+					if (archive) {
+						stories.archiveLoadMore(peerId);
+					} else {
+						stories.savedLoadMore(peerId);
+					}
 				}
 			}
 		}
@@ -860,19 +853,21 @@ void Controller::show(
 	v::match(_context.data, [&](Data::StoriesContextSingle) {
 	}, [&](Data::StoriesContextPeer) {
 		subscribeToSource();
-	}, [&](Data::StoriesContextSaved) {
-		stories.savedChanged() | rpl::filter(
-			rpl::mappers::_1 == storyId.peer
-		) | rpl::start_with_next([=] {
-			rebuildFromContext(peer, storyId);
-			checkMoveByDelta();
-		}, _contextLifetime);
-	}, [&](Data::StoriesContextArchive) {
-		stories.archiveChanged(
-		) | rpl::start_with_next([=] {
-			rebuildFromContext(peer, storyId);
-			checkMoveByDelta();
-		}, _contextLifetime);
+	}, [&](Data::StoriesContextAlbum album) {
+		if (album.id == Data::kStoriesAlbumIdArchive) {
+			stories.archiveChanged(
+			) | rpl::start_with_next([=] {
+				rebuildFromContext(peer, storyId);
+				checkMoveByDelta();
+			}, _contextLifetime);
+		} else {
+			stories.savedChanged() | rpl::filter(
+				rpl::mappers::_1 == storyId.peer
+			) | rpl::start_with_next([=] {
+				rebuildFromContext(peer, storyId);
+				checkMoveByDelta();
+			}, _contextLifetime);
+		}
 	}, [&](Data::StorySourcesList) {
 		subscribeToSource();
 	});
@@ -1601,10 +1596,12 @@ void Controller::loadMoreToList() {
 	const auto peer = shownPeer();
 	const auto peerId = _shown.peer;
 	auto &stories = peer->owner().stories();
-	v::match(_context.data, [&](StoriesContextSaved) {
-		stories.savedLoadMore(peerId);
-	}, [&](StoriesContextArchive) {
-		stories.archiveLoadMore(peerId);
+	v::match(_context.data, [&](StoriesContextAlbum album) {
+		if (album.id == Data::kStoriesAlbumIdArchive) {
+			stories.archiveLoadMore(peerId);
+		} else {
+			stories.savedLoadMore(peerId); // #TODO stories
+		}
 	}, [](const auto &) {
 	});
 }
@@ -1763,7 +1760,10 @@ void Controller::toggleInProfileRequested(bool inProfile) {
 	if (!story || !story->peer()->isSelf()) {
 		return;
 	}
-	if (!inProfile && v::is<Data::StoriesContextSaved>(_context.data)) {
+	if (!inProfile
+		&& v::is<Data::StoriesContextAlbum>(_context.data)
+		&& (v::get<Data::StoriesContextAlbum>(_context.data).id
+			!= Data::kStoriesAlbumIdArchive)) {
 		moveFromShown();
 	}
 	story->owner().stories().toggleInProfileList(
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 58775ff4cb..8867ee4ee4 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -616,7 +616,7 @@ void Filler::addStoryArchive() {
 		if ([[maybe_unused]] const auto strong = weak.get()) {
 			controller->showSection(Info::Stories::Make(
 				channel,
-				Info::Stories::Tab::Archive));
+				Info::Stories::ArchiveId()));
 		}
 	}, &st::menuIconStoriesArchiveSection);
 }

From c8015898ff913677495d7447c05fb10a6425bb31 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Jul 2025 11:36:40 +0400
Subject: [PATCH 077/341] Update API scheme on layer 211.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a9e91e5b60..a537000a05 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -269,7 +269,7 @@ messages.dialogsSlice#71e094f3 count:int dialogs:Vector<Dialog> messages:Vector<
 messages.dialogsNotModified#f0e3e596 count:int = messages.Dialogs;
 
 messages.messages#8c718e87 messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
-messages.messagesSlice#3a54685e flags:# inexact:flags.1?true count:int next_rate:flags.0?int offset_id_offset:flags.2?int messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
+messages.messagesSlice#762b263d flags:# inexact:flags.1?true count:int next_rate:flags.0?int offset_id_offset:flags.2?int search_flood:flags.3?SearchPostsFlood messages:Vector<Message> chats:Vector<Chat> users:Vector<User> = messages.Messages;
 messages.channelMessages#c776ba4e flags:# inexact:flags.1?true pts:int count:int offset_id_offset:flags.2?int messages:Vector<Message> topics:Vector<ForumTopic> chats:Vector<Chat> users:Vector<User> = messages.Messages;
 messages.messagesNotModified#74535f21 count:int = messages.Messages;
 
@@ -2001,6 +2001,8 @@ storyAlbum#9325705a flags:# album_id:int title:string icon_photo:flags.0?Photo i
 stories.albumsNotModified#564edaeb = stories.Albums;
 stories.albums#c3987a3a hash:long albums:Vector<StoryAlbum> = stories.Albums;
 
+searchPostsFlood#940e707c flags:# remains:int wait_till:flags.0?int stars_amount:long = SearchPostsFlood;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2528,6 +2530,7 @@ channels.searchPosts#f2c4f24d flags:# hashtag:flags.0?string query:flags.1?strin
 channels.updatePaidMessagesPrice#4b12327b flags:# broadcast_messages_allowed:flags.0?true channel:InputChannel send_paid_messages_stars:long = Updates;
 channels.toggleAutotranslation#167fc0a1 channel:InputChannel enabled:Bool = Updates;
 channels.getMessageAuthor#ece2a0e6 channel:InputChannel id:int = User;
+channels.checkSearchPostsFlood#bba9f121 = SearchPostsFlood;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;

From 1c251a308ad1ffd145335bd9d344a206d13be5e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Jul 2025 11:36:58 +0400
Subject: [PATCH 078/341] Allow loading stories in different albums.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 281 ++++++++----------
 Telegram/SourceFiles/data/data_stories.h      |  41 +--
 .../SourceFiles/data/data_stories_ids.cpp     | 104 +------
 Telegram/SourceFiles/data/data_stories_ids.h  |   8 +-
 .../view/history_view_top_bar_widget.cpp      |   9 +-
 Telegram/SourceFiles/info/info_controller.cpp |   4 +
 Telegram/SourceFiles/info/info_controller.h   |   1 +
 .../info/media/info_media_buttons.cpp         |   3 +-
 .../stories/info_stories_inner_widget.cpp     |  96 +++---
 .../info/stories/info_stories_inner_widget.h  |  11 +-
 .../info/stories/info_stories_provider.cpp    |  10 +-
 .../info/stories/info_stories_widget.cpp      |  20 +-
 .../info/stories/info_stories_widget.h        |   1 +
 .../stories/media_stories_controller.cpp      |  46 +--
 14 files changed, 283 insertions(+), 352 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 08073b683f..4f14fabb15 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -353,15 +353,7 @@ void Stories::processExpired() {
 }
 
 Stories::Set *Stories::lookupArchive(not_null<PeerData*> peer) {
-	const auto peerId = peer->id;
-	if (hasArchive(peer)) {
-		const auto i = _archive.find(peerId);
-		return (i != end(_archive))
-			? &i->second
-			: &_archive.emplace(peerId, Set()).first->second;
-	}
-	clearArchive(peer);
-	return nullptr;
+	return albumIdsSet(peer->id, kStoriesAlbumIdArchive);
 }
 
 void Stories::clearArchive(not_null<PeerData*> peer) {
@@ -379,7 +371,7 @@ void Stories::clearArchive(not_null<PeerData*> peer) {
 			}
 		}
 	}
-	_archiveChanged.fire_copy(peerId);
+	_albumIdsChanged.fire({ peerId, kStoriesAlbumIdArchive });
 }
 
 void Stories::parseAndApply(
@@ -523,7 +515,7 @@ Story *Stories::parseAndApply(
 			if (archive->total >= 0 && id > archive->lastId) {
 				++archive->total;
 			}
-			_archiveChanged.fire_copy(peer->id);
+			_albumIdsChanged.fire({ peer->id, kStoriesAlbumIdArchive });
 		}
 	}
 
@@ -615,7 +607,7 @@ void Stories::savedStateChanged(not_null<Story*> story) {
 			if (saved.total >= 0 && id > saved.lastId) {
 				++saved.total;
 			}
-			_savedChanged.fire_copy(peer);
+			_albumIdsChanged.fire({ peer, kStoriesAlbumIdSaved });
 		}
 	} else if (const auto i = _saved.find(peer); i != end(_saved)) {
 		auto &saved = i->second;
@@ -623,7 +615,7 @@ void Stories::savedStateChanged(not_null<Story*> story) {
 			if (saved.total > 0) {
 				--saved.total;
 			}
-			_savedChanged.fire_copy(peer);
+			_albumIdsChanged.fire({ peer, kStoriesAlbumIdSaved });
 		}
 	}
 }
@@ -678,6 +670,8 @@ void Stories::preloadListsMore() {
 		const auto index = static_cast<int>(list);
 		return _sourcesLoaded[index] || !_sourcesStates[index].isEmpty();
 	};
+	const auto selfId = _owner->session().userPeerId();
+	constexpr auto archive = kStoriesAlbumIdArchive;
 	if (loading(StorySourcesList::NotHidden)
 		|| loading(StorySourcesList::Hidden)) {
 		return;
@@ -685,8 +679,8 @@ void Stories::preloadListsMore() {
 		loadMore(StorySourcesList::NotHidden);
 	} else if (!countLoaded(StorySourcesList::Hidden)) {
 		loadMore(StorySourcesList::Hidden);
-	} else if (!archiveCountKnown(_owner->session().userPeerId())) {
-		archiveLoadMore(_owner->session().userPeerId());
+	} else if (!albumIdsCountKnown(selfId, archive)) {
+		albumIdsLoadMore(selfId, archive);
 	}
 }
 
@@ -831,28 +825,24 @@ void Stories::applyDeleted(not_null<PeerData*> peer, StoryId id) {
 				story.get(),
 				UpdateFlag::Destroyed);
 			removeDependencyStory(story.get());
-			if (hasArchive(story->peer())) {
-				if (const auto k = _archive.find(peerId)
-					; k != end(_archive)) {
-					const auto archive = &k->second;
-					if (archive->ids.list.remove(id)) {
-						if (archive->total > 0) {
-							--archive->total;
+			const auto removeFromAlbum = [&](int albumId) {
+				if (const auto set = albumIdsSet(peerId, albumId, true)) {
+					if (set->ids.list.remove(id)) {
+						if (set->total > 0) {
+							--set->total;
 						}
-						_archiveChanged.fire_copy(peerId);
+						_albumIdsChanged.fire({ peerId, albumId });
 					}
 				}
+			};
+			if (hasArchive(story->peer())) {
+				removeFromAlbum(kStoriesAlbumIdArchive);
 			}
 			if (story->inProfile()) {
-				if (const auto k = _saved.find(peerId); k != end(_saved)) {
-					const auto saved = &k->second;
-					if (saved->ids.list.remove(id)) {
-						if (saved->total > 0) {
-							--saved->total;
-						}
-						_savedChanged.fire_copy(peerId);
-					}
-				}
+				removeFromAlbum(kStoriesAlbumIdSaved);
+			}
+			for (const auto id : story->albumIds()) {
+				removeFromAlbum(id);
 			}
 			if (_preloading && _preloading->id() == fullId) {
 				_preloading = nullptr;
@@ -1465,7 +1455,7 @@ void Stories::loadReactionsSlice(
 					slice.list.push_back({
 						.peer = story->peer(),
 						.repostId = story->id(),
-						});
+					});
 				}
 			}, [&](const MTPDstoryReactionPublicForward &data) {
 				const auto item = _owner->addNewMessage(
@@ -1613,153 +1603,140 @@ bool Stories::hasArchive(not_null<PeerData*> peer) const {
 	return false;
 }
 
-const StoriesIds &Stories::archive(PeerId peerId) const {
+const Stories::Set *Stories::albumIdsSet(PeerId peerId, int albumId) const {
+	return const_cast<Stories*>(this)->albumIdsSet(peerId, albumId, true);
+}
+
+Stories::Set *Stories::albumIdsSet(PeerId peerId, int albumId, bool lazy) {
+	if (albumId == kStoriesAlbumIdArchive) {
+		const auto peer = _owner->peer(peerId);
+		if (!hasArchive(peer)) {
+			clearArchive(peer);
+			return nullptr;
+		}
+		const auto i = _archive.find(peerId);
+		return (i != end(_archive))
+			? &i->second
+			: lazy
+			? nullptr
+			: &_archive.emplace(peerId, Set()).first->second;
+	} else if (albumId == kStoriesAlbumIdSaved) {
+		const auto i = _saved.find(peerId);
+		return (i != end(_saved))
+			? &i->second
+			: lazy
+			? nullptr
+			: &_saved.emplace(peerId, Set()).first->second;
+	}
+	auto i = _albums.find(peerId);
+	if (i == end(_albums)) {
+		if (lazy) {
+			return nullptr;
+		}
+		i = _albums.emplace(peerId, Albums()).first;
+	}
+	const auto j = i->second.sets.find(albumId);
+	return (j != end(i->second.sets))
+		? &j->second
+		: lazy
+		? nullptr
+		: &i->second.sets.emplace(albumId).first->second;
+}
+
+const StoriesIds &Stories::albumIds(PeerId peerId, int albumId) const {
 	static const auto empty = StoriesIds();
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) ? i->second.ids : empty;
+	const auto set = albumIdsSet(peerId, albumId);
+	return set ? set->ids : empty;
 }
 
-rpl::producer<PeerId> Stories::archiveChanged() const {
-	return _archiveChanged.events();
+rpl::producer<StoryAlbumIdsKey> Stories::albumIdsChanged() const {
+	return _albumIdsChanged.events();
 }
 
-int Stories::archiveCount(PeerId peerId) const {
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) ? i->second.total : 0;
+int Stories::albumIdsCount(PeerId peerId, int albumId) const {
+	const auto set = albumIdsSet(peerId, albumId);
+	return set ? set->total : 0;
 }
 
-bool Stories::archiveCountKnown(PeerId peerId) const {
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) && (i->second.total >= 0);
+bool Stories::albumIdsCountKnown(PeerId peerId, int albumId) const {
+	const auto set = albumIdsSet(peerId, albumId);
+	return set && (set->total >= 0);
 }
 
-bool Stories::archiveLoaded(PeerId peerId) const {
-	const auto i = _archive.find(peerId);
-	return (i != end(_archive)) && i->second.loaded;
+bool Stories::albumIdsLoaded(PeerId peerId, int albumId) const {
+	const auto set = albumIdsSet(peerId, albumId);
+	return set && set->loaded;
 }
 
-const StoriesIds &Stories::saved(PeerId peerId) const {
-	static const auto empty = StoriesIds();
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) ? i->second.ids : empty;
-}
-
-rpl::producer<PeerId> Stories::savedChanged() const {
-	return _savedChanged.events();
-}
-
-int Stories::savedCount(PeerId peerId) const {
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) ? i->second.total : 0;
-}
-
-bool Stories::savedCountKnown(PeerId peerId) const {
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) && (i->second.total >= 0);
-}
-
-bool Stories::savedLoaded(PeerId peerId) const {
-	const auto i = _saved.find(peerId);
-	return (i != end(_saved)) && i->second.loaded;
-}
-
-void Stories::archiveLoadMore(PeerId peerId) {
+void Stories::albumIdsLoadMore(PeerId peerId, int albumId) {
 	const auto peer = _owner->peer(peerId);
-	const auto archive = lookupArchive(peer);
-	if (!archive || archive->requestId || archive->loaded) {
+	const auto set = albumIdsSet(peerId, albumId);
+	if (!set || set->requestId || set->loaded) {
 		return;
 	}
 	const auto api = &_owner->session().api();
-	archive->requestId = api->request(MTPstories_GetStoriesArchive(
-		peer->input,
-		MTP_int(archive->lastId),
-		MTP_int(archive->lastId ? kArchivePerPage : kArchiveFirstPerPage)
-	)).done([=](const MTPstories_Stories &result) {
-		const auto archive = lookupArchive(peer);
-		if (!archive) {
+	const auto done = [=](const MTPstories_Stories &result) {
+		const auto set = albumIdsSet(peerId, albumId);
+		if (!set) {
 			return;
 		}
-		archive->requestId = 0;
-
-		const auto &data = result.data();
-		const auto now = base::unixtime::now();
-		archive->total = data.vcount().v;
-		for (const auto &story : data.vstories().v) {
-			const auto id = story.match([&](const auto &id) {
-				return id.vid().v;
-			});
-			archive->ids.list.emplace(id);
-			archive->lastId = id;
-			if (!parseAndApply(peer, story, now)) {
-				archive->ids.list.remove(id);
-				if (archive->total > 0) {
-					--archive->total;
-				}
-			}
-		}
-		const auto ids = int(archive->ids.list.size());
-		archive->loaded = data.vstories().v.empty();
-		archive->total = archive->loaded ? ids : std::max(archive->total, ids);
-		_archiveChanged.fire_copy(peerId);
-	}).fail([=] {
-		const auto archive = lookupArchive(peer);
-		if (!archive) {
-			return;
-		}
-		archive->requestId = 0;
-		archive->loaded = true;
-		archive->total = int(archive->ids.list.size());
-		_archiveChanged.fire_copy(peerId);
-	}).send();
-}
-
-void Stories::savedLoadMore(PeerId peerId) {
-	auto &saved = _saved[peerId];
-	if (saved.requestId || saved.loaded) {
-		return;
-	}
-	const auto api = &_owner->session().api();
-	const auto peer = _owner->peer(peerId);
-	saved.requestId = api->request(MTPstories_GetPinnedStories(
-		peer->input,
-		MTP_int(saved.lastId),
-		MTP_int(saved.lastId ? kSavedPerPage : kSavedFirstPerPage)
-	)).done([=](const MTPstories_Stories &result) {
-		auto &saved = _saved[peerId];
-		saved.requestId = 0;
-
+		set->requestId = 0;
 		const auto &data = result.data();
 		const auto now = base::unixtime::now();
 		auto pinnedToTopIds = data.vpinned_to_top().value_or_empty();
 		auto pinnedToTop = pinnedToTopIds
 			| ranges::views::transform(&MTPint::v)
 			| ranges::to_vector;
-		saved.total = data.vcount().v;
+		set->total = data.vcount().v;
 		for (const auto &story : data.vstories().v) {
 			const auto id = story.match([&](const auto &id) {
 				return id.vid().v;
 			});
-			saved.ids.list.emplace(id);
-			saved.lastId = id;
+			set->ids.list.emplace(id);
+			set->lastId = id;
 			if (!parseAndApply(peer, story, now)) {
-				saved.ids.list.remove(id);
-				if (saved.total > 0) {
-					--saved.total;
+				set->ids.list.remove(id);
+				if (set->total > 0) {
+					--set->total;
 				}
 			}
 		}
-		const auto ids = int(saved.ids.list.size());
-		saved.loaded = data.vstories().v.empty();
-		saved.total = saved.loaded ? ids : std::max(saved.total, ids);
-		setPinnedToTop(peerId, std::move(pinnedToTop));
-		_savedChanged.fire_copy(peerId);
-	}).fail([=] {
-		auto &saved = _saved[peerId];
-		saved.requestId = 0;
-		saved.loaded = true;
-		saved.total = int(saved.ids.list.size());
-		_savedChanged.fire_copy(peerId);
-	}).send();
+		const auto count = int(set->ids.list.size());
+		set->loaded = data.vstories().v.empty();
+		set->total = set->loaded ? count : std::max(set->total, count);
+		if (albumId == kStoriesAlbumIdSaved) {
+			setPinnedToTop(peerId, std::move(pinnedToTop));
+		}
+		_albumIdsChanged.fire({ peerId, albumId });
+	};
+	const auto fail = [=] {
+		const auto set = albumIdsSet(peerId, albumId);
+		if (!set) {
+			return;
+		}
+		set->requestId = 0;
+		set->loaded = true;
+		set->total = int(set->ids.list.size());
+		_albumIdsChanged.fire({ peerId, albumId });
+	};
+	set->requestId = (albumId == kStoriesAlbumIdArchive)
+		? api->request(MTPstories_GetStoriesArchive(
+			peer->input,
+			MTP_int(set->lastId),
+			MTP_int(set->lastId ? kArchivePerPage : kArchiveFirstPerPage)
+		)).done(done).fail(fail).send()
+		: (albumId == kStoriesAlbumIdSaved)
+		? api->request(MTPstories_GetPinnedStories(
+			peer->input,
+			MTP_int(set->lastId),
+			MTP_int(set->lastId ? kSavedPerPage : kSavedFirstPerPage)
+		)).done(done).fail(fail).send()
+		: api->request(MTPstories_GetAlbumStories(
+			peer->input,
+			MTP_int(albumId),
+			MTP_int(set->lastId),
+			MTP_int(set->lastId ? kSavedPerPage : kSavedFirstPerPage)
+		)).done(done).fail(fail).send();
 }
 
 auto Stories::albumsListValue(PeerId peerId)
@@ -1976,9 +1953,9 @@ void Stories::toggleInProfileList(
 			}
 		}
 		if (dirty) {
-			savedLoadMore(peerId);
+			albumIdsLoadMore(peerId, kStoriesAlbumIdSaved);
 		} else {
-			_savedChanged.fire_copy(peerId);
+			_albumIdsChanged.fire({ peerId, kStoriesAlbumIdSaved });
 		}
 	}).send();
 }
@@ -2047,7 +2024,7 @@ void Stories::togglePinnedList(
 		setPinnedToTop(peerId, list
 			| ranges::views::transform(&MTPint::v)
 			| ranges::to_vector);
-		_savedChanged.fire_copy(peerId);
+		_albumIdsChanged.fire({ peerId, kStoriesAlbumIdSaved });
 	}).send();
 
 }
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 24e85ebe0d..08c4390b62 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -133,6 +133,18 @@ struct StoryAlbumUpdate {
 
 inline constexpr auto kStorySourcesListCount = 2;
 
+struct StoryAlbumIdsKey {
+	PeerId peerId;
+	int albumId = 0;
+
+	friend inline auto operator<=>(
+		StoryAlbumIdsKey,
+		StoryAlbumIdsKey) = default;
+	friend inline bool operator==(
+		StoryAlbumIdsKey,
+		StoryAlbumIdsKey) = default;
+};
+
 class Stories final : public base::has_weak_ptr {
 public:
 	explicit Stories(not_null<Session*> owner);
@@ -197,19 +209,14 @@ public:
 
 	[[nodiscard]] bool hasArchive(not_null<PeerData*> peer) const;
 
-	[[nodiscard]] const StoriesIds &archive(PeerId peerId) const;
-	[[nodiscard]] rpl::producer<PeerId> archiveChanged() const;
-	[[nodiscard]] int archiveCount(PeerId peerId) const;
-	[[nodiscard]] bool archiveCountKnown(PeerId peerId) const;
-	[[nodiscard]] bool archiveLoaded(PeerId peerId) const;
-	void archiveLoadMore(PeerId peerId);
-
-	[[nodiscard]] const StoriesIds &saved(PeerId peerId) const;
-	[[nodiscard]] rpl::producer<PeerId> savedChanged() const;
-	[[nodiscard]] int savedCount(PeerId peerId) const;
-	[[nodiscard]] bool savedCountKnown(PeerId peerId) const;
-	[[nodiscard]] bool savedLoaded(PeerId peerId) const;
-	void savedLoadMore(PeerId peerId);
+	[[nodiscard]] const StoriesIds &albumIds(
+		PeerId peerId,
+		int albumId) const;
+	[[nodiscard]] rpl::producer<StoryAlbumIdsKey> albumIdsChanged() const;
+	[[nodiscard]] int albumIdsCount(PeerId peerIdl, int albumId) const;
+	[[nodiscard]] bool albumIdsCountKnown(PeerId peerId, int albumId) const;
+	[[nodiscard]] bool albumIdsLoaded(PeerId peerId, int albumId) const;
+	void albumIdsLoadMore(PeerId peerId, int albumId);
 
 	[[nodiscard]] auto albumsListValue(PeerId peerId)
 		-> rpl::producer<std::vector<Data::StoryAlbum>>;
@@ -319,6 +326,9 @@ private:
 	[[nodiscard]] Set *lookupArchive(not_null<PeerData*> peer);
 	void clearArchive(not_null<PeerData*> peer);
 
+	const Set *albumIdsSet(PeerId peerId, int albumId) const;
+	Set *albumIdsSet(PeerId peerId, int albumId, bool lazy = false);
+
 	void applyDeleted(not_null<PeerData*> peer, StoryId id);
 	void applyExpired(FullStoryId id);
 	void applyRemovedFromActive(FullStoryId id);
@@ -403,13 +413,10 @@ private:
 	rpl::event_stream<PeerId> _itemsChanged;
 
 	std::unordered_map<PeerId, Set> _archive;
-	rpl::event_stream<PeerId> _archiveChanged;
-
 	std::unordered_map<PeerId, Set> _saved;
-	rpl::event_stream<PeerId> _savedChanged;
-
 	std::unordered_map<PeerId, Albums> _albums;
 	rpl::event_stream<StoryAlbumUpdate> _albumUpdates;
+	rpl::event_stream<StoryAlbumIdsKey> _albumIdsChanged;
 
 	base::flat_set<PeerId> _markReadPending;
 	base::Timer _markReadTimer;
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index d2ac334272..91eadee34f 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -16,8 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Data {
 
-rpl::producer<StoriesIdsSlice> SavedStoriesIds(
+rpl::producer<StoriesIdsSlice> AlbumStoriesIds(
 		not_null<PeerData*> peer,
+		int albumId,
 		StoryId aroundId,
 		int limit) {
 	return [=](auto consumer) {
@@ -35,22 +36,21 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 
 			const auto peerId = peer->id;
 			const auto stories = &peer->owner().stories();
-			if (!stories->savedCountKnown(peerId)) {
+			if (!stories->albumIdsCountKnown(peerId, albumId)) {
 				return;
 			}
-
-			const auto &saved = stories->saved(peerId);
-			const auto sorted = RespectingPinned(saved);
-			const auto count = stories->savedCount(peerId);
+			const auto &loaded = stories->albumIds(peerId, albumId);
+			const auto sorted = RespectingPinned(loaded);
+			const auto count = stories->albumIdsCount(peerId, albumId);
 			auto i = ranges::find(sorted, aroundId);
 			if (i == end(sorted)) {
-				const auto j = saved.list.lower_bound(aroundId);
-				i = begin(sorted) + int(j - begin(saved.list));
+				const auto j = loaded.list.lower_bound(aroundId);
+				i = begin(sorted) + int(j - begin(loaded.list));
 			}
 			const auto hasBefore = int(i - begin(sorted));
 			const auto hasAfter = int(end(sorted) - i);
 			if (hasAfter < limit) {
-				stories->savedLoadMore(peerId);
+				stories->albumIdsLoadMore(peerId, albumId);
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
@@ -81,91 +81,13 @@ rpl::producer<StoriesIdsSlice> SavedStoriesIds(
 
 		const auto peerId = peer->id;
 		const auto stories = &peer->owner().stories();
-		stories->savedChanged(
+		stories->albumIdsChanged(
 		) | rpl::filter(
-			rpl::mappers::_1 == peerId
+			rpl::mappers::_1 == Data::StoryAlbumIdsKey{ peerId, albumId }
 		) | rpl::start_with_next(schedule, lifetime);
 
-		if (!stories->savedCountKnown(peerId)) {
-			stories->savedLoadMore(peerId);
-		}
-
-		push();
-
-		return lifetime;
-	};
-}
-
-rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
-		not_null<PeerData*> peer,
-		StoryId aroundId,
-		int limit) {
-	return [=](auto consumer) {
-		auto lifetime = rpl::lifetime();
-
-		struct State {
-			StoriesIdsSlice slice;
-			base::has_weak_ptr guard;
-			bool scheduled = false;
-		};
-		const auto state = lifetime.make_state<State>();
-
-		const auto push = [=] {
-			state->scheduled = false;
-
-			const auto peerId = peer->id;
-			const auto stories = &peer->owner().stories();
-			if (!stories->archiveCountKnown(peerId)) {
-				return;
-			}
-
-			const auto &archive = stories->archive(peerId);
-			const auto sorted = RespectingPinned(archive);
-			const auto count = stories->savedCount(peerId);
-			auto i = ranges::find(sorted, aroundId);
-			if (i == end(sorted)) {
-				const auto j = archive.list.lower_bound(aroundId);
-				i = begin(sorted) + int(j - begin(archive.list));
-			}
-			const auto hasBefore = int(i - begin(sorted));
-			const auto hasAfter = int(end(sorted) - i);
-			if (hasAfter < limit) {
-				stories->archiveLoadMore(peerId);
-			}
-			const auto takeBefore = std::min(hasBefore, limit);
-			const auto takeAfter = std::min(hasAfter, limit);
-			auto ids = std::vector<StoryId>();
-			ids.reserve(takeBefore + takeAfter);
-			for (auto j = i - takeBefore; j != i + takeAfter; ++j) {
-				ids.push_back(*j);
-			}
-			const auto added = int(ids.size());
-			state->slice = StoriesIdsSlice(
-				std::move(ids),
-				count,
-				(hasBefore - takeBefore),
-				count - hasBefore - added);
-			consumer.put_next_copy(state->slice);
-		};
-		const auto schedule = [=] {
-			if (state->scheduled) {
-				return;
-			}
-			state->scheduled = true;
-			Ui::PostponeCall(&state->guard, [=] {
-				if (state->scheduled) {
-					push();
-				}
-			});
-		};
-
-		const auto peerId = peer->id;
-		const auto stories = &peer->owner().stories();
-		stories->archiveChanged(
-		) | rpl::start_with_next(schedule, lifetime);
-
-		if (!stories->archiveCountKnown(peerId)) {
-			stories->archiveLoadMore(peerId);
+		if (!stories->albumIdsCountKnown(peerId, albumId)) {
+			stories->albumIdsLoadMore(peerId, albumId);
 		}
 
 		push();
diff --git a/Telegram/SourceFiles/data/data_stories_ids.h b/Telegram/SourceFiles/data/data_stories_ids.h
index 88a5103b3b..67d651ca53 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.h
+++ b/Telegram/SourceFiles/data/data_stories_ids.h
@@ -19,13 +19,9 @@ namespace Data {
 
 using StoriesIdsSlice = AbstractSparseIds<std::vector<StoryId>>;
 
-[[nodiscard]] rpl::producer<StoriesIdsSlice> SavedStoriesIds(
-	not_null<PeerData*> peer,
-	StoryId aroundId,
-	int limit);
-
-[[nodiscard]] rpl::producer<StoriesIdsSlice> ArchiveStoriesIds(
+[[nodiscard]] rpl::producer<StoriesIdsSlice> AlbumStoriesIds(
 	not_null<PeerData*> peer,
+	int albumId,
 	StoryId aroundId,
 	int limit);
 
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index a5ed7ee279..9ff972022d 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -824,9 +824,12 @@ void TopBarWidget::setActiveChat(
 
 			if (const auto channel = peer->asChannel()) {
 				if (channel->canEditStories()
-					&& !channel->owner().stories().archiveCountKnown(
-						channel->id)) {
-					channel->owner().stories().archiveLoadMore(channel->id);
+					&& !channel->owner().stories().albumIdsCountKnown(
+						channel->id,
+						Data::kStoriesAlbumIdArchive)) {
+					channel->owner().stories().albumIdsLoadMore(
+						channel->id,
+						Data::kStoriesAlbumIdArchive);
 				}
 			}
 		}
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 449c942eaf..9fb1b5447d 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -299,6 +299,10 @@ Controller::Controller(
 	setupTopicViewer();
 }
 
+void Controller::replaceKey(Key key) {
+	_key = key;
+}
+
 void Controller::setupMigrationViewer() {
 	const auto peer = _key.peer();
 	if (_key.topic()
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 59b9f2ce24..7e3fff34d5 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -293,6 +293,7 @@ public:
 		return _section;
 	}
 
+	void replaceKey(Key key);
 	[[nodiscard]] bool validateMementoPeer(
 		not_null<ContentMemento*> memento) const;
 
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.cpp b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
index ad908c7e43..f40a2851b0 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
@@ -246,8 +246,9 @@ not_null<Ui::SettingsButton*> AddStoriesButton(
 		not_null<Window::SessionNavigation*> navigation,
 		not_null<PeerData*> peer,
 		Ui::MultiSlideTracker &tracker) {
-	auto count = rpl::single(0) | rpl::then(Data::SavedStoriesIds(
+	auto count = rpl::single(0) | rpl::then(Data::AlbumStoriesIds(
 		peer,
+		0, // = Data::kStoriesAlbumIdSaved
 		ServerMaxStoryId - 1,
 		0
 	) | rpl::map([](const Data::StoriesIdsSlice &slice) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index b09962071c..4b6fbaa341 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -105,22 +105,32 @@ void EmptyWidget::paintEvent(QPaintEvent *e) {
 
 InnerWidget::InnerWidget(
 	QWidget *parent,
-	not_null<Controller*> controller)
+	not_null<Controller*> controller,
+	rpl::producer<int> albumId,
+	int addingToAlbumId)
 : RpWidget(parent)
 , _controller(controller)
 , _peer(controller->key().storiesPeer())
-, _addingToAlbumId(0)
-, _albumId(controller->key().storiesAlbumId())
+, _addingToAlbumId(addingToAlbumId)
+, _albumId(std::move(albumId))
 , _albumChanges(Data::StoryAlbumUpdate{
 	.peer = _peer,
 	.albumId = _addingToAlbumId,
 })
 , _empty(this) {
 	_empty->heightValue(
-	) | rpl::start_with_next(
-		[this] { refreshHeight(); },
-		_empty->lifetime());
-	_list = setupList();
+	) | rpl::start_with_next([=] {
+		refreshHeight();
+	}, _empty->lifetime());
+	setupList();
+
+	_albumId.changes(
+	) | rpl::start_with_next([=](int albumId) {
+		_list.destroy();
+		_controller->replaceKey(Key(Tag(_peer, albumId)));
+		setupList();
+		resizeToWidth(width());
+	}, lifetime());
 }
 
 void InnerWidget::setupAlbums() {
@@ -200,19 +210,20 @@ void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
 
 	const auto stories = &_peer->owner().stories();
 
-	if (!stories->archiveCountKnown(_peer->id)) {
-		stories->archiveLoadMore(_peer->id);
+	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+	if (!stories->albumIdsCountKnown(_peer->id, kArchive)) {
+		stories->albumIdsLoadMore(_peer->id, kArchive);
 	}
 
 	auto count = rpl::single(
 		rpl::empty
 	) | rpl::then(
-		stories->archiveChanged(
+		stories->albumIdsChanged(
 		) | rpl::filter(
-			rpl::mappers::_1 == _peer->id
+			rpl::mappers::_1 == Data::StoryAlbumIdsKey{ _peer->id, kArchive }
 		) | rpl::to_empty
 	) | rpl::map([=] {
-		return stories->archiveCount(_peer->id);
+		return stories->albumIdsCount(_peer->id, kArchive);
 	}) | rpl::start_spawning(_top->lifetime());
 
 	const auto archiveWrap = _top->add(
@@ -228,8 +239,7 @@ void InnerWidget::addArchiveButton(Ui::MultiSlideTracker &tracker) {
 
 	const auto archive = archiveWrap->entity();
 	archive->addClickHandler([=] {
-		_controller->showSection(
-			Make(_peer, Data::kStoriesAlbumIdArchive));
+		_controller->showSection(Make(_peer, kArchive));
 	});
 	auto label = rpl::duplicate(
 		count
@@ -401,27 +411,30 @@ bool InnerWidget::showInternal(not_null<Memento*> memento) {
 	return false;
 }
 
-object_ptr<Media::ListWidget> InnerWidget::setupList() {
-	auto result = object_ptr<Media::ListWidget>(
+void InnerWidget::setupList() {
+	Expects(!_list);
+
+	_list = object_ptr<Media::ListWidget>(
 		this,
 		_controller);
-	result->heightValue(
-	) | rpl::start_with_next(
-		[this] { refreshHeight(); },
-		result->lifetime());
+	const auto raw = _list.data();
+
+	raw->heightValue(
+	) | rpl::start_with_next([=] {
+		refreshHeight();
+	}, raw->lifetime());
 	using namespace rpl::mappers;
-	result->scrollToRequests(
-	) | rpl::map([widget = result.data()](int to) {
+	raw->scrollToRequests(
+	) | rpl::map([=](int to) {
 		return Ui::ScrollToRequest {
-			widget->y() + to,
+			raw->y() + to,
 			-1
 		};
-	}) | rpl::start_to_stream(
-		_scrollToRequests,
-		result->lifetime());
-	_selectedLists.fire(result->selectedListValue());
-	_listTops.fire(result->topValue());
-	return result;
+	}) | rpl::start_to_stream(_scrollToRequests, raw->lifetime());
+	_selectedLists.fire(raw->selectedListValue());
+	_listTops.fire(raw->topValue());
+
+	raw->show();
 }
 
 void InnerWidget::refreshAlbumsTabs() {
@@ -435,6 +448,7 @@ void InnerWidget::refreshAlbumsTabs() {
 		return;
 	}
 	auto tabs = std::vector<Ui::SubTabs::Tab>();
+	auto selected = QString();
 	if (!_albums.empty()) {
 		tabs.push_back({
 			.id = u"all"_q,
@@ -449,6 +463,12 @@ void InnerWidget::refreshAlbumsTabs() {
 				.id = QString::number(album.id),
 				.text = std::move(title),
 			});
+			if (_albumId.current() == album.id) {
+				selected = tabs.back().id;
+			}
+		}
+		if (selected.isEmpty()) {
+			selected = tabs.front().id;
 		}
 	}
 	if (_peer->canEditStories()) {
@@ -461,7 +481,7 @@ void InnerWidget::refreshAlbumsTabs() {
 		_albumsTabs = std::make_unique<Ui::SubTabs>(
 			_albumsWrap,
 			Ui::SubTabs::Options{
-				.selected = _albums.empty() ? QString() : u"all"_q,
+				.selected = selected,
 				.centered = true,
 			},
 			std::move(tabs));
@@ -490,10 +510,7 @@ void InnerWidget::refreshAlbumsTabs() {
 					added));
 			} else {
 				_albumsTabs->setActiveTab(id);
-
-				//auto now = _descriptor.current();
-				//now.collectionId = (id == u"all"_q) ? 0 : id.toInt();
-				//_descriptorChanges.fire(std::move(now));
+				_albumIdChanges.fire((id == u"all"_q) ? 0 : id.toInt());
 			}
 		}, _albumsTabs->lifetime());
 
@@ -508,6 +525,9 @@ void InnerWidget::refreshAlbumsTabs() {
 		}, _albumsTabs->lifetime());
 	} else {
 		_albumsTabs->setTabs(std::move(tabs));
+		if (!selected.isEmpty()) {
+			_albumsTabs->setActiveTab(selected);
+		}
 	}
 	resizeToWidth(width());
 }
@@ -533,6 +553,10 @@ void InnerWidget::showMenuForAlbum(int id) {
 	_menu->popup(QCursor::pos());
 }
 
+rpl::producer<int> InnerWidget::albumIdChanges() const {
+	return _albumIdChanges.events();
+}
+
 rpl::producer<Data::StoryAlbumUpdate> InnerWidget::changes() const {
 	return _albumChanges.value();
 }
@@ -562,7 +586,9 @@ void InnerWidget::editAlbumStories(int id) {
 		const auto content = box->addRow(
 			object_ptr<InnerWidget>(
 				box,
-				_controller/*,
+				_controller,
+				rpl::single(Data::kStoriesAlbumIdArchive),
+				id/*,
 				_peer,
 				state->descriptor.value(),
 				id,
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index cda2fac090..7af0cf100d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -45,7 +45,11 @@ class EmptyWidget;
 
 class InnerWidget final : public Ui::RpWidget {
 public:
-	InnerWidget(QWidget *parent, not_null<Controller*> controller);
+	InnerWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		rpl::producer<int> albumId,
+		int addingToAlbumId = 0);
 	~InnerWidget();
 
 	bool showInternal(not_null<Memento*> memento);
@@ -69,6 +73,7 @@ public:
 	void confirmDeleteAlbum(int id);
 	void albumAdded(Data::StoryAlbum result);
 
+	[[nodiscard]] rpl::producer<int> albumIdChanges() const;
 	[[nodiscard]] rpl::producer<Data::StoryAlbumUpdate> changes() const;
 
 protected:
@@ -82,6 +87,7 @@ private:
 	void refreshHeight();
 
 	void setupTop();
+	void setupList();
 	void setupAlbums();
 	void createButtons();
 	void createProfileTop();
@@ -93,8 +99,6 @@ private:
 	void addGiftsButton(Ui::MultiSlideTracker &tracker);
 	void finalizeTop();
 
-	[[nodiscard]] object_ptr<Media::ListWidget> setupList();
-
 	void refreshAlbumsTabs();
 	void showMenuForAlbum(int id);
 
@@ -107,6 +111,7 @@ private:
 
 	std::vector<Data::StoryAlbum> _albums;
 	rpl::variable<int> _albumId;
+	rpl::event_stream<int> _albumIdChanges;
 	Ui::RpWidget *_albumsWrap = nullptr;
 	std::unique_ptr<Ui::SubTabs> _albumsTabs;
 	rpl::variable<Data::StoryAlbumUpdate> _albumChanges;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index b33bd12062..d81bb06821 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -179,10 +179,8 @@ void Provider::setSearchQuery(QString query) {
 
 void Provider::refreshViewer() {
 	_viewerLifetime.destroy();
-	const auto idForViewer = _aroundId;
-	auto ids = (_albumId == Data::kStoriesAlbumIdArchive)
-		? Data::ArchiveStoriesIds(_peer, idForViewer, _idsLimit)
-		: Data::SavedStoriesIds(_peer, idForViewer, _idsLimit); // #TODO stories
+	const auto aroundId = _aroundId;
+	auto ids = Data::AlbumStoriesIds(_peer, _albumId, aroundId, _idsLimit);
 	std::move(
 		ids
 	) | rpl::start_with_next([=](Data::StoriesIdsSlice &&slice) {
@@ -195,8 +193,8 @@ void Provider::refreshViewer() {
 		auto nearestId = std::optional<StoryId>();
 		for (auto i = 0; i != _slice.size(); ++i) {
 			if (!nearestId
-				|| std::abs(*nearestId - idForViewer)
-					> std::abs(_slice[i] - idForViewer)) {
+				|| std::abs(*nearestId - aroundId)
+					> std::abs(_slice[i] - aroundId)) {
 				nearestId = _slice[i];
 			}
 		}
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index f861636331..1835a0a336 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -52,10 +52,17 @@ object_ptr<ContentWidget> Memento::createWidget(
 Widget::Widget(
 	QWidget *parent,
 	not_null<Controller*> controller)
-: ContentWidget(parent, controller) {
+: ContentWidget(parent, controller)
+, _albumId(controller->key().storiesAlbumId()) {
 	_inner = setInnerWidget(object_ptr<InnerWidget>(
 		this,
-		controller));
+		controller,
+		_albumId.value()));
+	_inner->albumIdChanges() | rpl::start_with_next([=](int id) {
+		controller->showSection(
+			Make(controller->storiesPeer(), id),
+			Window::SectionShow::Way::Backward);
+	}, _inner->lifetime());
 	_inner->setScrollHeightValue(scrollHeightValue());
 	_inner->scrollToRequests(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
@@ -73,10 +80,15 @@ bool Widget::showInternal(not_null<ContentMemento*> memento) {
 		return false;
 	}
 	if (auto storiesMemento = dynamic_cast<Memento*>(memento.get())) {
-		const auto albumId = controller()->key().storiesAlbumId();
-		if (storiesMemento->storiesAlbumId() == albumId) {
+		const auto myId = controller()->key().storiesAlbumId();
+		const auto hisId = storiesMemento->storiesAlbumId();
+		constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+		if (myId == hisId) {
 			restoreState(storiesMemento);
 			return true;
+		} else if (myId != kArchive && hisId != kArchive) {
+			_albumId = hisId;
+			return true;
 		}
 	}
 	return false;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 5a194917c6..84911ceb49 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -64,6 +64,7 @@ private:
 
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
+	rpl::variable<int> _albumId;
 	InnerWidget *_inner = nullptr;
 
 };
diff --git a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
index d1e78cf793..2b473eb935 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_controller.cpp
@@ -705,22 +705,15 @@ void Controller::rebuildFromContext(
 		source = stories.source(peerId);
 		hideSiblings();
 	}, [&](StoriesContextAlbum album) {
-		const auto archive = (album.id == Data::kStoriesAlbumIdArchive);
-		const auto known = archive
-			? stories.archiveCountKnown(peerId)
-			: stories.savedCountKnown(peerId);
+		const auto known = stories.albumIdsCountKnown(peerId, album.id);
 		if (known) {
-			const auto &ids = archive
-				? stories.archive(peerId)
-				: stories.saved(peerId);
+			const auto &ids = stories.albumIds(peerId, album.id);
 			auto sorted = RespectingPinned(ids);
 			const auto i = ranges::find(sorted, id);
 			const auto tillEnd = int(end(sorted) - i);
 			if (tillEnd > 0) {
 				_index = int(i - begin(sorted));
-				const auto total = archive
-					? stories.archiveCount(peerId)
-					: stories.savedCount(peerId);
+				const auto total = stories.albumIdsCount(peerId, album.id);
 				list = StoriesList{
 					.peer = peer,
 					.ids = ids,
@@ -729,11 +722,7 @@ void Controller::rebuildFromContext(
 				};
 				if (ids.list.size() < list->total
 					&& tillEnd < kPreloadStoriesCount) {
-					if (archive) {
-						stories.archiveLoadMore(peerId);
-					} else {
-						stories.savedLoadMore(peerId);
-					}
+					stories.albumIdsLoadMore(peerId, album.id);
 				}
 			}
 		}
@@ -854,20 +843,13 @@ void Controller::show(
 	}, [&](Data::StoriesContextPeer) {
 		subscribeToSource();
 	}, [&](Data::StoriesContextAlbum album) {
-		if (album.id == Data::kStoriesAlbumIdArchive) {
-			stories.archiveChanged(
-			) | rpl::start_with_next([=] {
-				rebuildFromContext(peer, storyId);
-				checkMoveByDelta();
-			}, _contextLifetime);
-		} else {
-			stories.savedChanged() | rpl::filter(
-				rpl::mappers::_1 == storyId.peer
-			) | rpl::start_with_next([=] {
-				rebuildFromContext(peer, storyId);
-				checkMoveByDelta();
-			}, _contextLifetime);
-		}
+		const auto key = Data::StoryAlbumIdsKey{ storyId.peer, album.id };
+		stories.albumIdsChanged() | rpl::filter(
+			rpl::mappers::_1 == key
+		) | rpl::start_with_next([=] {
+			rebuildFromContext(peer, storyId);
+			checkMoveByDelta();
+		}, _contextLifetime);
 	}, [&](Data::StorySourcesList) {
 		subscribeToSource();
 	});
@@ -1597,11 +1579,7 @@ void Controller::loadMoreToList() {
 	const auto peerId = _shown.peer;
 	auto &stories = peer->owner().stories();
 	v::match(_context.data, [&](StoriesContextAlbum album) {
-		if (album.id == Data::kStoriesAlbumIdArchive) {
-			stories.archiveLoadMore(peerId);
-		} else {
-			stories.savedLoadMore(peerId); // #TODO stories
-		}
+		stories.albumIdsLoadMore(peerId, album.id);
 	}, [](const auto &) {
 	});
 }

From c26e8a69ca4db2cb40f0e312d7f85112be042ab0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Jul 2025 13:23:07 +0400
Subject: [PATCH 079/341] Add object_ptr::get.

---
 Telegram/lib_base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index bed6d0be44..f254b4f0be 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit bed6d0be4422b8733d3c7e691eac6adf8439597f
+Subproject commit f254b4f0be10d2c36ac817fbafd3d2254b931bdc

From d4d4f3c082be3a3fcbec7eacd426e7d3795ed8bf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Jul 2025 14:24:55 +0400
Subject: [PATCH 080/341] Switch between story albums.

---
 Telegram/Resources/langs/lang.strings         |   4 +-
 Telegram/SourceFiles/info/info.style          |   1 -
 .../peer_gifts/info_peer_gifts_widget.cpp     |   2 +-
 .../stories/info_stories_inner_widget.cpp     | 215 +++++++++++-------
 .../info/stories/info_stories_inner_widget.h  |   5 +-
 5 files changed, 141 insertions(+), 86 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1c3de9b06a..0ab5fe48b4 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3760,7 +3760,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_collection_new_create" = "Create";
 "lng_gift_collection_empty_title" = "Organize Your Gifts";
 "lng_gift_collection_empty_text" = "Add some of your gifts to this collection.";
-"lng_gift_collection_empty_button" = "Add to Collection";
 "lng_gift_collection_all" = "All Gifts";
 "lng_gift_collection_add_title" = "Add Gifts";
 "lng_gift_collection_edit" = "Edit Name";
@@ -6420,6 +6419,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_archive_title" = "Story Archive";
 "lng_stories_archive_about" = "Only you can see archived stories unless you choose to post them to your profile.";
 "lng_stories_channel_archive_about" = "Only admins of the channel can see archived stories unless they are posted to the channel page.";
+"lng_stories_empty" = "Your stories will be here.";
+"lng_stories_empty_channel" = "Channel posts will be here.";
 "lng_stories_reply_sent" = "Message sent.";
 "lng_stories_hidden_to_contacts" = "Stories from {user} were moved to the **Archive**.";
 "lng_stories_shown_in_chats" = "Stories from {user} were returned from the **Archive**.";
@@ -6463,7 +6464,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_album_new_create" = "Create";
 "lng_stories_album_empty_title" = "Organize Your Stories";
 "lng_stories_album_empty_text" = "Add some of your stories to this album.";
-"lng_stories_album_empty_button" = "Add to Album";
 "lng_stories_album_all" = "All Stories";
 "lng_stories_album_add_title" = "Add Stories";
 "lng_stories_album_edit" = "Edit Name";
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index fc6f989e58..357efe9957 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -763,7 +763,6 @@ infoEmptyAudio: icon {{ "info/info_media_audio_empty", infoEmptyFg }};
 infoEmptyFile: icon {{ "info/info_media_file_empty", infoEmptyFg }};
 infoEmptyVoice: icon {{ "info/info_media_voice_empty", infoEmptyFg }};
 infoEmptyLink: icon {{ "info/info_media_link_empty", infoEmptyFg }};
-infoEmptyStories: icon {{ "info/info_media_story_empty", infoEmptyFg }};
 infoEmptyIconTop: 120px;
 infoEmptyLabelTop: 40px;
 infoEmptyLabelSkip: 20px;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index d6c24a11a2..193c24f809 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -988,7 +988,7 @@ void InnerWidget::refreshAbout() {
 				about.get(),
 				object_ptr<Ui::RoundButton>(
 					about.get(),
-					tr::lng_gift_collection_empty_button(),
+					rpl::single(QString()),
 					st::collectionEmptyButton)),
 			st::collectionEmptyAddMargin)->entity();
 		button->setText(tr::lng_gift_collection_add_title(
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 4b6fbaa341..ef00f8fd65 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -48,61 +48,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Info::Stories {
 
-class EmptyWidget : public Ui::RpWidget {
-public:
-	EmptyWidget(QWidget *parent);
-
-	void setFullHeight(rpl::producer<int> fullHeightValue);
-
-protected:
-	int resizeGetHeight(int newWidth) override;
-
-	void paintEvent(QPaintEvent *e) override;
-
-private:
-	object_ptr<Ui::FlatLabel> _text;
-	int _height = 0;
-
-};
-
-EmptyWidget::EmptyWidget(QWidget *parent)
-: RpWidget(parent)
-, _text(this, st::infoEmptyLabel) {
-}
-
-void EmptyWidget::setFullHeight(rpl::producer<int> fullHeightValue) {
-	std::move(
-		fullHeightValue
-	) | rpl::start_with_next([this](int fullHeight) {
-		// Make icon center be on 1/3 height.
-		auto iconCenter = fullHeight / 3;
-		auto iconHeight = st::infoEmptyStories.height();
-		auto iconTop = iconCenter - iconHeight / 2;
-		_height = iconTop + st::infoEmptyIconTop;
-		resizeToWidth(width());
-	}, lifetime());
-}
-
-int EmptyWidget::resizeGetHeight(int newWidth) {
-	auto labelTop = _height - st::infoEmptyLabelTop;
-	auto labelWidth = newWidth - 2 * st::infoEmptyLabelSkip;
-	_text->resizeToNaturalWidth(labelWidth);
-
-	auto labelLeft = (newWidth - _text->width()) / 2;
-	_text->moveToLeft(labelLeft, labelTop, newWidth);
-
-	update();
-	return _height;
-}
-
-void EmptyWidget::paintEvent(QPaintEvent *e) {
-	auto p = QPainter(this);
-
-	const auto iconLeft = (width() - st::infoEmptyStories.width()) / 2;
-	const auto iconTop = height() - st::infoEmptyIconTop;
-	st::infoEmptyStories.paint(p, iconLeft, iconTop, width());
-}
-
 InnerWidget::InnerWidget(
 	QWidget *parent,
 	not_null<Controller*> controller,
@@ -116,23 +61,37 @@ InnerWidget::InnerWidget(
 , _albumChanges(Data::StoryAlbumUpdate{
 	.peer = _peer,
 	.albumId = _addingToAlbumId,
-})
-, _empty(this) {
-	_empty->heightValue(
-	) | rpl::start_with_next([=] {
-		refreshHeight();
-	}, _empty->lifetime());
-	setupList();
+}) {
+	preloadArchiveCount();
 
-	_albumId.changes(
+	_albumId.value(
 	) | rpl::start_with_next([=](int albumId) {
 		_list.destroy();
 		_controller->replaceKey(Key(Tag(_peer, albumId)));
 		setupList();
+		setupEmpty();
 		resizeToWidth(width());
 	}, lifetime());
 }
 
+void InnerWidget::preloadArchiveCount() {
+	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+	const auto stories = &_peer->owner().stories();
+	if (!_peer->canEditStories()
+		|| stories->albumIdsCountKnown(_peer->id, kArchive)) {
+		return;
+	}
+	const auto key = Data::StoryAlbumIdsKey{ _peer->id, kArchive };
+	stories->albumIdsLoadMore(_peer->id, kArchive);
+	stories->albumIdsChanged() | rpl::filter(
+		rpl::mappers::_1 == key
+	) | rpl::take_while([=] {
+		return !stories->albumIdsCountKnown(_peer->id, kArchive);
+	}) | rpl::start_with_next([=] {
+		refreshAlbumsTabs();
+	}, lifetime());
+}
+
 void InnerWidget::setupAlbums() {
 	Ui::AddSkip(_top);
 	_albumsWrap = _top->add(object_ptr<Ui::BoxContentDivider>(_top));
@@ -437,11 +396,99 @@ void InnerWidget::setupList() {
 	raw->show();
 }
 
+void InnerWidget::setupEmpty() {
+	const auto stories = &_controller->session().data().stories();
+	const auto key = Data::StoryAlbumIdsKey{ _peer->id, _albumId.current() };
+	rpl::combine(
+		rpl::single(
+			rpl::empty
+		) | rpl::then(
+			stories->albumIdsChanged() | rpl::filter(
+				rpl::mappers::_1 == key
+			) | rpl::to_empty
+		),
+		_list->heightValue()
+	) | rpl::start_with_next([=](auto, int listHeight) {
+		if (listHeight) {
+			_empty.destroy();
+			return;
+		}
+		refreshEmpty();
+	}, _list->lifetime());
+}
+
+void InnerWidget::refreshEmpty() {
+	_empty.destroy();
+
+	const auto albumId = _albumId.current();
+	const auto stories = &_controller->session().data().stories();
+	const auto knownEmpty = stories->albumIdsCountKnown(_peer->id, albumId);
+	const auto albumCanAdd = knownEmpty
+		&& albumId
+		&& (albumId != Data::kStoriesAlbumIdArchive)
+		&& _peer->canEditStories();
+	if (albumCanAdd) {
+		auto empty = object_ptr<Ui::VerticalLayout>(this);
+		empty->add(
+			object_ptr<Ui::CenterWrap<>>(
+				empty.get(),
+				object_ptr<Ui::FlatLabel>(
+					empty.get(),
+					tr::lng_stories_album_empty_title(),
+					st::collectionEmptyTitle)),
+			st::collectionEmptyTitleMargin);
+		empty->add(
+			object_ptr<Ui::CenterWrap<>>(
+				empty.get(),
+				object_ptr<Ui::FlatLabel>(
+					empty.get(),
+					tr::lng_stories_album_empty_text(),
+					st::collectionEmptyText)),
+			st::collectionEmptyTextMargin);
+
+		const auto button = empty->add(
+			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+				empty.get(),
+				object_ptr<Ui::RoundButton>(
+					empty.get(),
+					rpl::single(QString()),
+					st::collectionEmptyButton)),
+			st::collectionEmptyAddMargin)->entity();
+		button->setText(tr::lng_stories_album_add_title(
+		) | rpl::map([](const QString &text) {
+			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+		}));
+		button->setTextTransform(
+			Ui::RoundButton::TextTransform::NoTransform);
+		button->setClickedCallback([=] {
+			editAlbumStories(albumId);
+		});
+
+		empty->show();
+		_empty = std::move(empty);
+	} else {
+		_empty = object_ptr<Ui::FlatLabel>(
+			this,
+			(!knownEmpty
+				? tr::lng_contacts_loading(Ui::Text::WithEntities)
+				: _peer->isSelf()
+				? tr::lng_stories_empty(Ui::Text::RichLangValue)
+				: tr::lng_stories_empty_channel(Ui::Text::RichLangValue)),
+			st::giftListAbout);
+		_empty->show();
+	}
+	resizeToWidth(width());
+}
+
 void InnerWidget::refreshAlbumsTabs() {
 	Expects(!_addingToAlbumId);
 	Expects(_albumsWrap != nullptr);
 
-	if (_albums.empty() && !_peer->canEditStories()) {
+	const auto has = _peer->canEditStories()
+		&& _peer->owner().stories().albumIdsCount(
+			_peer->id,
+			Data::kStoriesAlbumIdArchive);
+	if (_albums.empty() && !has) {
 		if (base::take(_albumsTabs)) {
 			resizeToWidth(width());
 		}
@@ -471,7 +518,7 @@ void InnerWidget::refreshAlbumsTabs() {
 			selected = tabs.front().id;
 		}
 	}
-	if (_peer->canEditStories()) {
+	if (has) {
 		tabs.push_back({
 			.id = u"add"_q,
 			.text = { '+' + tr::lng_stories_album_add(tr::now) },
@@ -754,14 +801,22 @@ void InnerWidget::selectionAction(SelectionAction action) {
 }
 
 int InnerWidget::resizeGetHeight(int newWidth) {
+	if (!newWidth) {
+		return 0;
+	}
 	_inResize = true;
 	auto guard = gsl::finally([this] { _inResize = false; });
 
 	if (_top) {
 		_top->resizeToWidth(newWidth);
 	}
-	_list->resizeToWidth(newWidth);
-	_empty->resizeToWidth(newWidth);
+	if (_list) {
+		_list->resizeToWidth(newWidth);
+	}
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->resizeToWidth(newWidth - margin.left() - margin.right());
+	}
 	return recountHeight();
 }
 
@@ -784,25 +839,23 @@ int InnerWidget::recountHeight() {
 		listHeight = _list->heightNoMargins();
 		top += listHeight;
 	}
-	if (listHeight > 0) {
-		_empty->hide();
-	} else {
-		_empty->show();
-		_empty->moveToLeft(0, top);
-		top += _empty->heightNoMargins();
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->moveToLeft(margin.left(), top + margin.top());
+		top += margin.top() + empty->height() + margin.bottom();
 	}
 	return top;
 }
 
 void InnerWidget::setScrollHeightValue(rpl::producer<int> value) {
-	using namespace rpl::mappers;
-	_empty->setFullHeight(rpl::combine(
-		std::move(value),
-		_listTops.events_starting_with(
-			_list->topValue()
-		) | rpl::flatten_latest(),
-		_topHeight.value(),
-		_1 - _2 + _3));
+	//using namespace rpl::mappers;
+	//_empty->setFullHeight(rpl::combine(
+	//	std::move(value),
+	//	_listTops.events_starting_with(
+	//		_list->topValue()
+	//	) | rpl::flatten_latest(),
+	//	_topHeight.value(),
+	//	_1 - _2 + _3));
 }
 
 rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index 7af0cf100d..e042c7ec31 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -85,9 +85,12 @@ protected:
 private:
 	int recountHeight();
 	void refreshHeight();
+	void refreshEmpty();
+	void preloadArchiveCount();
 
 	void setupTop();
 	void setupList();
+	void setupEmpty();
 	void setupAlbums();
 	void createButtons();
 	void createProfileTop();
@@ -120,7 +123,7 @@ private:
 
 	object_ptr<Ui::VerticalLayout> _top = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
-	object_ptr<EmptyWidget> _empty;
+	object_ptr<Ui::RpWidget> _empty = { nullptr };
 
 	bool _inResize = false;
 	bool _isStackBottom = false;

From 8d2a7b00dc476622e9a08f7481fc50828209e99c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Jul 2025 22:29:39 +0400
Subject: [PATCH 081/341] Implement story album management.

---
 Telegram/SourceFiles/data/data_stories.cpp    |  96 ++++++-
 Telegram/SourceFiles/data/data_stories.h      |   7 +-
 Telegram/SourceFiles/data/data_story.cpp      |   6 +-
 Telegram/SourceFiles/data/data_story.h        |   5 +-
 .../downloads/info_downloads_provider.cpp     |  12 +-
 .../info/downloads/info_downloads_provider.h  |   1 +
 .../SourceFiles/info/info_content_widget.cpp  |   9 +-
 .../SourceFiles/info/info_content_widget.h    |   4 +
 Telegram/SourceFiles/info/info_controller.cpp |   7 +
 Telegram/SourceFiles/info/info_controller.h   |  37 +--
 .../SourceFiles/info/info_wrap_widget.cpp     |  12 +-
 Telegram/SourceFiles/info/info_wrap_widget.h  |   4 +-
 .../info/media/info_media_common.cpp          |   8 +-
 .../info/media/info_media_common.h            |   3 +-
 .../info/media/info_media_list_widget.cpp     | 106 ++++++-
 .../info/media/info_media_list_widget.h       |   7 +
 .../info/stories/info_stories_common.h        |   9 +-
 .../stories/info_stories_inner_widget.cpp     | 264 +++++++++++-------
 .../info/stories/info_stories_inner_widget.h  |   2 +-
 .../info/stories/info_stories_provider.cpp    |   5 +-
 .../info/stories/info_stories_provider.h      |   1 +
 .../info/stories/info_stories_widget.cpp      |   9 +-
 .../info/stories/info_stories_widget.h        |   3 +-
 Telegram/SourceFiles/main/main_app_config.cpp |   8 +
 Telegram/SourceFiles/main/main_app_config.h   |   3 +
 25 files changed, 470 insertions(+), 158 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 4f14fabb15..830c763dee 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -477,6 +477,19 @@ Story *Stories::parseAndApply(
 		return nullptr;
 	}
 	const auto id = data.vid().v;
+	auto albumInfo = (Albums*)nullptr;
+	auto list = std::optional<base::flat_set<int>>();
+	if (const auto albums = data.valbums()) {
+		list.emplace();
+		if (!albums->v.empty()) {
+			albumInfo = &_albums[peer->id];
+			list->reserve(albums->v.size());
+			for (const auto &albumId : albums->v) {
+				albumInfo->sets[albumId.v].albumKnownInArchive.emplace(id);
+				list->emplace(albumId.v);
+			}
+		}
+	}
 	const auto fullId = FullStoryId{ peer->id, id };
 	auto &stories = _stories[peer->id];
 	const auto i = stories.find(id);
@@ -484,6 +497,21 @@ Story *Stories::parseAndApply(
 		const auto result = i->second.get();
 		const auto mediaChanged = (result->media() != *media);
 		result->applyChanges(*media, data, now);
+		if (list) {
+			const auto &was = result->albumIds();
+			if (*list != was) {
+				if (!albumInfo && !was.empty()) {
+					albumInfo = &_albums[peer->id];
+				}
+				for (const auto wasId : result->albumIds()) {
+					if (!list->contains(wasId)) {
+						albumInfo->sets[wasId].albumKnownInArchive.remove(id);
+					}
+				}
+				result->setAlbumIds(*base::take(list));
+			}
+		}
+
 		const auto j = _pollingSettings.find(result);
 		if (j != end(_pollingSettings)) {
 			maybeSchedulePolling(result, j->second, now);
@@ -508,6 +536,9 @@ Story *Stories::parseAndApply(
 		data,
 		now
 	)).first->second.get();
+	if (list) {
+		result->setAlbumIds(*base::take(list));
+	}
 
 	if (const auto archive = lookupArchive(peer)) {
 		const auto added = archive->ids.list.emplace(id).second;
@@ -827,6 +858,7 @@ void Stories::applyDeleted(not_null<PeerData*> peer, StoryId id) {
 			removeDependencyStory(story.get());
 			const auto removeFromAlbum = [&](int albumId) {
 				if (const auto set = albumIdsSet(peerId, albumId, true)) {
+					set->albumKnownInArchive.remove(id);
 					if (set->ids.list.remove(id)) {
 						if (set->total > 0) {
 							--set->total;
@@ -1669,9 +1701,18 @@ bool Stories::albumIdsLoaded(PeerId peerId, int albumId) const {
 }
 
 void Stories::albumIdsLoadMore(PeerId peerId, int albumId) {
+	albumIdsLoadMore(peerId, albumId, false);
+}
+
+void Stories::albumIdsLoadMore(PeerId peerId, int albumId, bool reload) {
+	Expects(!reload || albumId > 0);
+
 	const auto peer = _owner->peer(peerId);
 	const auto set = albumIdsSet(peerId, albumId);
-	if (!set || set->requestId || set->loaded) {
+	if (set && reload) {
+		_owner->session().api().request(base::take(set->requestId)).cancel();
+	}
+	if (!set || set->requestId || (!reload && set->loaded)) {
 		return;
 	}
 	const auto api = &_owner->session().api();
@@ -1681,6 +1722,11 @@ void Stories::albumIdsLoadMore(PeerId peerId, int albumId) {
 			return;
 		}
 		set->requestId = 0;
+		if (reload) {
+			set->ids.list.clear();
+			set->ids.pinnedToTop.clear();
+			set->lastId = StoryId();
+		}
 		const auto &data = result.data();
 		const auto now = base::unixtime::now();
 		auto pinnedToTopIds = data.vpinned_to_top().value_or_empty();
@@ -1734,11 +1780,28 @@ void Stories::albumIdsLoadMore(PeerId peerId, int albumId) {
 		: api->request(MTPstories_GetAlbumStories(
 			peer->input,
 			MTP_int(albumId),
-			MTP_int(set->lastId),
-			MTP_int(set->lastId ? kSavedPerPage : kSavedFirstPerPage)
+			MTP_int(reload ? 0 : set->ids.list.size()),
+			MTP_int((reload || set->ids.list.empty())
+				? kSavedFirstPerPage
+				: kSavedPerPage)
 		)).done(done).fail(fail).send();
 }
 
+const base::flat_set<StoryId> &Stories::albumKnownInArchive(
+		PeerId peerId,
+		int albumId) const {
+	static const auto empty = base::flat_set<StoryId>();
+
+	const auto i = _albums.find(peerId);
+	if (i == end(_albums)) {
+		return empty;
+	}
+	const auto j = i->second.sets.find(albumId);
+	return (j != end(i->second.sets))
+		? j->second.albumKnownInArchive
+		: empty;
+}
+
 auto Stories::albumsListValue(PeerId peerId)
 -> rpl::producer<std::vector<Data::StoryAlbum>> {
 	auto &albums = _albums[peerId];
@@ -1839,6 +1902,33 @@ void Stories::albumRename(
 }
 
 void Stories::notifyAlbumUpdate(StoryAlbumUpdate &&update) {
+	const auto peerId = update.peer->id;
+	const auto i = _albums.find(peerId);
+	if (i != end(_albums)) {
+		const auto albumId = update.albumId;
+		const auto j = i->second.sets.find(albumId);
+		if (j != end(i->second.sets)) {
+			for (const auto &id : update.added) {
+				j->second.albumKnownInArchive.emplace(id);
+				if (const auto story = lookup({ peerId, id })) {
+					auto now = (*story)->albumIds();
+					if (now.emplace(albumId).second) {
+						(*story)->setAlbumIds(std::move(now));
+					}
+				}
+			}
+			for (const auto &id : update.removed) {
+				j->second.albumKnownInArchive.remove(id);
+				if (const auto story = lookup({ peerId, id })) {
+					auto now = (*story)->albumIds();
+					if (now.remove(albumId)) {
+						(*story)->setAlbumIds(std::move(now));
+					}
+				}
+			}
+			albumIdsLoadMore(peerId, albumId, true);
+		}
+	}
 	_albumUpdates.fire(std::move(update));
 }
 
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 08c4390b62..2b116a97bf 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -213,10 +213,13 @@ public:
 		PeerId peerId,
 		int albumId) const;
 	[[nodiscard]] rpl::producer<StoryAlbumIdsKey> albumIdsChanged() const;
-	[[nodiscard]] int albumIdsCount(PeerId peerIdl, int albumId) const;
+	[[nodiscard]] int albumIdsCount(PeerId peerId, int albumId) const;
 	[[nodiscard]] bool albumIdsCountKnown(PeerId peerId, int albumId) const;
 	[[nodiscard]] bool albumIdsLoaded(PeerId peerId, int albumId) const;
 	void albumIdsLoadMore(PeerId peerId, int albumId);
+	[[nodiscard]] const base::flat_set<StoryId> &albumKnownInArchive(
+		PeerId peerId,
+		int albumId) const;
 
 	[[nodiscard]] auto albumsListValue(PeerId peerId)
 		-> rpl::producer<std::vector<Data::StoryAlbum>>;
@@ -286,6 +289,7 @@ public:
 private:
 	struct Set {
 		StoriesIds ids;
+		base::flat_set<StoryId> albumKnownInArchive;
 		int total = -1;
 		StoryId lastId = 0;
 		bool loaded = false;
@@ -307,6 +311,7 @@ private:
 		DirectRequest,
 	};
 
+	void albumIdsLoadMore(PeerId peerId, int albumId, bool reload);
 	void parseAndApply(const MTPPeerStories &stories, ParseSource source);
 	[[nodiscard]] Story *parseAndApply(
 		not_null<PeerData*> peer,
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index f8e1bd21b4..5d94ac5c0d 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -899,10 +899,14 @@ StoryId Story::repostSourceId() const {
 	return _repostSourceId;
 }
 
-const std::vector<int> &Story::albumIds() const {
+const base::flat_set<int> &Story::albumIds() const {
 	return _albumIds;
 }
 
+void Story::setAlbumIds(base::flat_set<int> ids) {
+	_albumIds = std::move(ids);
+}
+
 PeerData *Story::fromPeer() const {
 	return _fromPeer;
 }
diff --git a/Telegram/SourceFiles/data/data_story.h b/Telegram/SourceFiles/data/data_story.h
index 4537ec0a28..bcb425c2ca 100644
--- a/Telegram/SourceFiles/data/data_story.h
+++ b/Telegram/SourceFiles/data/data_story.h
@@ -237,7 +237,8 @@ public:
 	[[nodiscard]] QString repostSourceName() const;
 	[[nodiscard]] StoryId repostSourceId() const;
 
-	[[nodiscard]] const std::vector<int> &albumIds() const;
+	[[nodiscard]] const base::flat_set<int> &albumIds() const;
+	void setAlbumIds(base::flat_set<int> ids);
 
 	[[nodiscard]] PeerData *fromPeer() const;
 
@@ -267,7 +268,7 @@ private:
 	PeerData * const _repostSourcePeer = nullptr;
 	const QString _repostSourceName;
 	const StoryId _repostSourceId = 0;
-	std::vector<int> _albumIds;
+	base::flat_set<int> _albumIds;
 	PeerData * const _fromPeer = nullptr;
 	Data::ReactionId _sentReactionId;
 	StoryMedia _media;
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
index ae781cc349..b9a8149267 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_provider.cpp
@@ -16,8 +16,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_session.h"
-#include "main/main_session.h"
 #include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
 #include "history/history.h"
@@ -34,7 +35,8 @@ using namespace Media;
 } // namespace
 
 Provider::Provider(not_null<AbstractController*> controller)
-: _controller(controller) {
+: _controller(controller)
+, _storiesAddToAlbumId(_controller->storiesAddToAlbumId()) {
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		for (auto &layout : _layouts) {
@@ -485,6 +487,9 @@ void Provider::applyDragSelection(
 		return;
 	}
 	const auto search = !_queryWords.isEmpty();
+	const auto selectLimit = _storiesAddToAlbumId
+		? _controller->session().appConfig().storiesAlbumLimit()
+		: MaxSelectedItems;
 	auto chosen = base::flat_set<not_null<const HistoryItem*>>();
 	chosen.reserve(till - from);
 	for (auto i = from; i != till; ++i) {
@@ -496,7 +501,8 @@ void Provider::applyDragSelection(
 		ChangeItemSelection(
 			selected,
 			item,
-			computeSelectionData(item, FullSelection));
+			computeSelectionData(item, FullSelection),
+			selectLimit);
 	}
 	if (selected.size() != chosen.size()) {
 		for (auto i = begin(selected); i != end(selected);) {
diff --git a/Telegram/SourceFiles/info/downloads/info_downloads_provider.h b/Telegram/SourceFiles/info/downloads/info_downloads_provider.h
index cf7bca91d8..d2f2cc6970 100644
--- a/Telegram/SourceFiles/info/downloads/info_downloads_provider.h
+++ b/Telegram/SourceFiles/info/downloads/info_downloads_provider.h
@@ -129,6 +129,7 @@ private:
 	std::optional<int> _fullCount;
 	base::flat_set<not_null<const HistoryItem*>> _downloading;
 	base::flat_set<not_null<const HistoryItem*>> _downloaded;
+	int _storiesAddToAlbumId = 0;
 
 	std::vector<Element> _addPostponed;
 
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index 992b2befc8..bdba718d5f 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -477,7 +477,11 @@ Key ContentMemento::key() const {
 	} else if (const auto self = settingsSelf()) {
 		return Settings::Tag{ self };
 	} else if (const auto stories = storiesPeer()) {
-		return Stories::Tag{ stories, storiesAlbumId() };
+		return Stories::Tag{
+			stories,
+			storiesAlbumId(),
+			storiesAddToAlbumId(),
+		};
 	} else if (statisticsTag().peer) {
 		return statisticsTag();
 	} else if (const auto starref = starrefPeer()) {
@@ -521,7 +525,8 @@ ContentMemento::ContentMemento(Downloads::Tag downloads) {
 
 ContentMemento::ContentMemento(Stories::Tag stories)
 : _storiesPeer(stories.peer)
-, _storiesAlbumId(stories.albumId) {
+, _storiesAlbumId(stories.albumId)
+, _storiesAddToAlbumId(stories.addingToAlbumId) {
 }
 
 ContentMemento::ContentMemento(Statistics::Tag statistics)
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 8eed5554f9..52d6e2e5af 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -250,6 +250,9 @@ public:
 	[[nodiscard]] int storiesAlbumId() const {
 		return _storiesAlbumId;
 	}
+	[[nodiscard]] int storiesAddToAlbumId() const {
+		return _storiesAddToAlbumId;
+	}
 	[[nodiscard]] Statistics::Tag statisticsTag() const {
 		return _statisticsTag;
 	}
@@ -315,6 +318,7 @@ private:
 	UserData * const _settingsSelf = nullptr;
 	PeerData * const _storiesPeer = nullptr;
 	int _storiesAlbumId = 0;
+	int _storiesAddToAlbumId = 0;
 	Statistics::Tag _statisticsTag;
 	PeerData * const _starrefPeer = nullptr;
 	BotStarRef::Type _starrefType = {};
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 9fb1b5447d..047d2e0a64 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -125,6 +125,13 @@ int Key::storiesAlbumId() const {
 	return 0;
 }
 
+int Key::storiesAddToAlbumId() const {
+	if (const auto tag = std::get_if<Stories::Tag>(&_value)) {
+		return tag->addingToAlbumId;
+	}
+	return 0;
+}
+
 Statistics::Tag Key::statisticsTag() const {
 	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
 		return *tag;
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 7e3fff34d5..f80b4ef3a1 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -90,22 +90,24 @@ public:
 		Data::ReactionId selected,
 		FullMsgId contextId);
 
-	PeerData *peer() const;
-	Data::ForumTopic *topic() const;
-	Data::SavedSublist *sublist() const;
-	UserData *settingsSelf() const;
-	bool isDownloads() const;
-	bool isGlobalMedia() const;
-	PeerData *storiesPeer() const;
-	int storiesAlbumId() const;
-	Statistics::Tag statisticsTag() const;
-	PeerData *starrefPeer() const;
-	BotStarRef::Type starrefType() const;
-	PollData *poll() const;
-	FullMsgId pollContextId() const;
-	std::shared_ptr<Api::WhoReadList> reactionsWhoReadIds() const;
-	Data::ReactionId reactionsSelected() const;
-	FullMsgId reactionsContextId() const;
+	[[nodiscard]] PeerData *peer() const;
+	[[nodiscard]] Data::ForumTopic *topic() const;
+	[[nodiscard]] Data::SavedSublist *sublist() const;
+	[[nodiscard]] UserData *settingsSelf() const;
+	[[nodiscard]] bool isDownloads() const;
+	[[nodiscard]] bool isGlobalMedia() const;
+	[[nodiscard]] PeerData *storiesPeer() const;
+	[[nodiscard]] int storiesAlbumId() const;
+	[[nodiscard]] int storiesAddToAlbumId() const;
+	[[nodiscard]] Statistics::Tag statisticsTag() const;
+	[[nodiscard]] PeerData *starrefPeer() const;
+	[[nodiscard]] BotStarRef::Type starrefType() const;
+	[[nodiscard]] PollData *poll() const;
+	[[nodiscard]] FullMsgId pollContextId() const;
+	[[nodiscard]] auto reactionsWhoReadIds() const
+		-> std::shared_ptr<Api::WhoReadList>;
+	[[nodiscard]] Data::ReactionId reactionsSelected() const;
+	[[nodiscard]] FullMsgId reactionsContextId() const;
 
 private:
 	struct PollKey {
@@ -229,6 +231,9 @@ public:
 	[[nodiscard]] int storiesAlbumId() const {
 		return key().storiesAlbumId();
 	}
+	[[nodiscard]] int storiesAddToAlbumId() const {
+		return key().storiesAddToAlbumId();
+	}
 	[[nodiscard]] Statistics::Tag statisticsTag() const {
 		return key().statisticsTag();
 	}
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 9acb4740e6..31b8aa861c 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -312,7 +312,9 @@ void WrapWidget::forceContentRepaint() {
 }
 
 void WrapWidget::setupTop() {
-	if (HasCustomTopBar(_controller.get()) || wrap() == Wrap::Search) {
+	if (HasCustomTopBar(_controller.get())
+		|| wrap() == Wrap::Search
+		|| wrap() == Wrap::StoryAlbumEdit) {
 		_topBar.destroy();
 		return;
 	}
@@ -696,7 +698,13 @@ rpl::producer<int> WrapWidget::desiredHeightForContent() const {
 }
 
 rpl::producer<SelectedItems> WrapWidget::selectedListValue() const {
-	return _selectedLists.events() | rpl::flatten_latest();
+	auto current = _content
+		? _content->selectedListValue()
+		: nullptr;
+	return _selectedLists.events_starting_with(current
+		? std::move(current)
+		: rpl::single(SelectedItems(Storage::SharedMediaType::Photo))
+	) | rpl::flatten_latest();
 }
 
 object_ptr<ContentWidget> WrapWidget::createContent(
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index 40d4459d44..ee656f17b9 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -53,6 +53,7 @@ enum class Wrap {
 	Narrow,
 	Side,
 	Search,
+	StoryAlbumEdit,
 };
 
 struct SelectedItem {
@@ -143,6 +144,8 @@ public:
 		return _removeRequests.events();
 	}
 
+	[[nodiscard]] rpl::producer<SelectedItems> selectedListValue() const;
+
 	void replaceSwipeHandler(Ui::Controls::SwipeHandlerArgs *incompleteArgs);
 
 	~WrapWidget();
@@ -206,7 +209,6 @@ private:
 		not_null<Window::SessionController*> window,
 		not_null<ContentMemento*> memento);
 
-	rpl::producer<SelectedItems> selectedListValue() const;
 	bool requireTopBarSearch() const;
 
 	void addTopBarMenuButton();
diff --git a/Telegram/SourceFiles/info/media/info_media_common.cpp b/Telegram/SourceFiles/info/media/info_media_common.cpp
index 6791b13275..47f3e80185 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_common.cpp
@@ -31,7 +31,11 @@ UniversalMsgId GetUniversalId(not_null<const BaseLayout*> layout) {
 bool ChangeItemSelection(
 		ListSelectedMap &selected,
 		not_null<const HistoryItem*> item,
-		ListItemSelectionData selectionData) {
+		ListItemSelectionData selectionData,
+		int limit) {
+	if (!limit) {
+		limit = MaxSelectedItems;
+	}
 	const auto changeExisting = [&](auto it) {
 		if (it == selected.cend()) {
 			return false;
@@ -41,7 +45,7 @@ bool ChangeItemSelection(
 		}
 		return false;
 	};
-	if (selected.size() < MaxSelectedItems) {
+	if (selected.size() < limit) {
 		const auto &[i, ok] = selected.try_emplace(item, selectionData);
 		if (ok) {
 			return true;
diff --git a/Telegram/SourceFiles/info/media/info_media_common.h b/Telegram/SourceFiles/info/media/info_media_common.h
index b309329a81..d5a8f726d4 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.h
+++ b/Telegram/SourceFiles/info/media/info_media_common.h
@@ -90,7 +90,8 @@ using UniversalMsgId = MsgId;
 bool ChangeItemSelection(
 	ListSelectedMap &selected,
 	not_null<const HistoryItem*> item,
-	ListItemSelectionData selectionData);
+	ListItemSelectionData selectionData,
+	int limit = 0);
 
 class ListSectionDelegate {
 public:
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index f396b1c9d9..3db2c6b11f 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -47,8 +47,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/ui_utility.h"
 #include "ui/inactive_press.h"
 #include "lang/lang_keys.h"
-#include "main/main_session.h"
 #include "main/main_account.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "base/platform/base_platform_info.h"
@@ -148,9 +149,10 @@ ListWidget::ListWidget(
 , _controller(controller)
 , _provider(MakeProvider(_controller))
 , _dateBadge(std::make_unique<DateBadge>(
-		_provider->type(),
-		[=] { scrollDateCheck(); },
-		[=] { scrollDateHide(); })) {
+	_provider->type(),
+	[=] { scrollDateCheck(); },
+	[=] { scrollDateHide(); }))
+, _storiesAddToAlbumId(controller->storiesAddToAlbumId()) {
 	start();
 }
 
@@ -184,6 +186,7 @@ void ListWidget::start() {
 			_provider->setSearchQuery(std::move(query));
 		}, lifetime());
 	} else if (_controller->storiesPeer()) {
+		setupStoriesTrackIds();
 		trackSession(&session());
 		restart();
 	} else {
@@ -260,6 +263,41 @@ void ListWidget::setupSelectRestriction() {
 	}, lifetime());
 }
 
+void ListWidget::setupStoriesTrackIds() {
+	if (!_storiesAddToAlbumId) {
+		return;
+	}
+	const auto peerId = _controller->storiesPeer()->id;
+	const auto stories = &session().data().stories();
+	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
+	const auto key = Data::StoryAlbumIdsKey{ peerId, kArchive };
+	rpl::single(rpl::empty) | rpl::then(
+		stories->albumIdsChanged() | rpl::filter(
+			rpl::mappers::_1 == key
+		) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		const auto albumId = _storiesAddToAlbumId;
+		const auto &ids = stories->albumKnownInArchive(peerId, albumId);
+		if (_storiesInAlbum != ids) {
+			for (const auto id : ids) {
+				if (_storiesInAlbum.emplace(id).second) {
+					_storyMsgsToMarkSelected.emplace(StoryIdToMsgId(id));
+				}
+			}
+			if (_storiesInAlbum.size() > ids.size()) {
+				for (auto i = begin(_storiesInAlbum); i != end(_storiesInAlbum);) {
+					if (ids.contains(*i)) {
+						++i;
+					} else {
+						_storyMsgsToMarkSelected.remove(StoryIdToMsgId(*i));
+						i = _storiesInAlbum.erase(i);
+					}
+				}
+			}
+		}
+	}, lifetime());
+}
+
 rpl::producer<int> ListWidget::scrollToRequests() const {
 	return _scrollToRequests.events();
 }
@@ -544,6 +582,37 @@ void ListWidget::trackSession(not_null<Main::Session*> session) {
 	}, lifetime);
 }
 
+void ListWidget::markStoryMsgsSelected() {
+	const auto now = int(_storyMsgsToMarkSelected.size());
+	const auto guard = gsl::finally([&] {
+		if (now != int(_storyMsgsToMarkSelected.size())) {
+			pushSelectedItems();
+		}
+	});
+	const auto &appConfig = _controller->session().appConfig();
+	const auto selectLimit = appConfig.storiesAlbumLimit();
+	const auto selection = FullSelection;
+	for (const auto &section : _sections) {
+		for (const auto &entry : section.items()) {
+			const auto item = entry->getItem();
+			const auto id = item->id;
+			const auto i = _storyMsgsToMarkSelected.find(id);
+			if (i != end(_storyMsgsToMarkSelected)) {
+				ChangeItemSelection(
+					_selected,
+					item,
+					_provider->computeSelectionData(item, selection),
+					selectLimit);
+				repaintItem(item);
+				_storyMsgsToMarkSelected.erase(i);
+				if (_storyMsgsToMarkSelected.empty()) {
+					return;
+				}
+			}
+		}
+	}
+}
+
 void ListWidget::refreshRows() {
 	saveScrollState();
 
@@ -554,6 +623,8 @@ void ListWidget::refreshRows() {
 		for (const auto &item : _sections.back().items()) {
 			trackSession(&item->getItem()->history()->session());
 		}
+	} else if (!_storyMsgsToMarkSelected.empty()) {
+		markStoryMsgsSelected();
 	}
 
 	if (const auto count = _provider->fullCount()) {
@@ -819,8 +890,9 @@ void ListWidget::paintEvent(QPaintEvent *e) {
 	const auto window = _controller->parentController();
 	const auto paused = window->isGifPausedAtLeastFor(
 		Window::GifPauseReason::Layer);
+	const auto selecting = hasSelectedItems() || _storiesAddToAlbumId;
 	auto context = ListContext{
-		Overview::Layout::PaintContext(ms, hasSelectedItems(), paused),
+		Overview::Layout::PaintContext(ms, selecting, paused),
 		&_selected,
 		&_dragSelected,
 		_dragSelectAction
@@ -890,6 +962,9 @@ void ListWidget::mouseDoubleClickEvent(QMouseEvent *e) {
 void ListWidget::showContextMenu(
 		QContextMenuEvent *e,
 		ContextMenuSource source) {
+	if (_storiesAddToAlbumId) {
+		return;
+	}
 	if (_contextMenu) {
 		_contextMenu = nullptr;
 		repaintItem(_contextItem);
@@ -1487,11 +1562,15 @@ void ListWidget::switchToWordSelection() {
 void ListWidget::applyItemSelection(
 		HistoryItem *item,
 		TextSelection selection) {
+	const auto selectLimit = _storiesAddToAlbumId
+		? _controller->session().appConfig().storiesAlbumLimit()
+		: MaxSelectedItems;
 	if (item
 		&& ChangeItemSelection(
 			_selected,
 			item,
-			_provider->computeSelectionData(item, selection))) {
+			_provider->computeSelectionData(item, selection),
+			selectLimit)) {
 		repaintItem(item);
 		pushSelectedItems();
 	}
@@ -1961,22 +2040,21 @@ void ListWidget::mouseActionFinish(
 	auto pressState = base::take(_pressState);
 	repaintItem(pressState.item);
 
+	const auto selectionMode = hasSelectedItems() || _storiesAddToAlbumId;
 	auto simpleSelectionChange = pressState.item
 		&& pressState.inside
 		&& !_pressWasInactive
 		&& (button != Qt::RightButton)
 		&& (_mouseAction == MouseAction::PrepareDrag
 			|| _mouseAction == MouseAction::PrepareSelect);
-	auto needSelectionToggle = simpleSelectionChange
-		&& hasSelectedItems();
-	auto needSelectionClear = simpleSelectionChange
-		&& hasSelectedText();
+	auto needSelectionToggle = simpleSelectionChange && selectionMode;
+	auto needSelectionClear = simpleSelectionChange && hasSelectedText();
 
 	auto activated = ClickHandler::unpressed();
 	if (_mouseAction == MouseAction::Dragging
 		|| _mouseAction == MouseAction::Selecting) {
 		activated = nullptr;
-	} else if (needSelectionToggle) {
+	} else if (needSelectionToggle || _storiesAddToAlbumId) {
 		activated = nullptr;
 	}
 
@@ -2034,11 +2112,15 @@ void ListWidget::applyDragSelection() {
 
 void ListWidget::applyDragSelection(SelectedMap &applyTo) const {
 	if (_dragSelectAction == DragSelectAction::Selecting) {
+		const auto selectLimit = _storiesAddToAlbumId
+			? _controller->session().appConfig().storiesAlbumLimit()
+			: MaxSelectedItems;
 		for (auto &[item, data] : _dragSelected) {
 			ChangeItemSelection(
 				applyTo,
 				item,
-				_provider->computeSelectionData(item, FullSelection));
+				_provider->computeSelectionData(item, FullSelection),
+				selectLimit);
 		}
 	} else if (_dragSelectAction == DragSelectAction::Deselecting) {
 		for (auto &[item, data] : _dragSelected) {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index fa40321c47..256d82adf5 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -171,6 +171,7 @@ private:
 	void itemLayoutChanged(not_null<const HistoryItem*> item);
 
 	void refreshRows();
+	void markStoryMsgsSelected();
 	void trackSession(not_null<Main::Session*> session);
 
 	[[nodiscard]] SelectedItems collectSelectedItems() const;
@@ -274,6 +275,8 @@ private:
 
 	void setActionBoxWeak(base::weak_qptr<Ui::BoxContent> box);
 
+	void setupStoriesTrackIds();
+
 	const not_null<AbstractController*> _controller;
 	const std::unique_ptr<ListProvider> _provider;
 
@@ -305,6 +308,10 @@ private:
 
 	const std::unique_ptr<DateBadge> _dateBadge;
 
+	int _storiesAddToAlbumId = 0;
+	base::flat_set<StoryId> _storiesInAlbum;
+	base::flat_set<MsgId> _storyMsgsToMarkSelected;
+
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 	rpl::event_stream<> _checkForHide;
 	base::weak_qptr<Ui::BoxContent> _actionBoxWeak;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_common.h b/Telegram/SourceFiles/info/stories/info_stories_common.h
index df638fe0aa..afa0f13eff 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_common.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_common.h
@@ -12,13 +12,18 @@ namespace Info::Stories {
 [[nodiscard]] int ArchiveId();
 
 struct Tag {
-	explicit Tag(not_null<PeerData*> peer, int albumId = 0)
+	explicit Tag(
+		not_null<PeerData*> peer,
+		int albumId = 0,
+		int addingToAlbumId = 0)
 	: peer(peer)
-	, albumId(albumId) {
+	, albumId(albumId)
+	, addingToAlbumId(addingToAlbumId) {
 	}
 
 	not_null<PeerData*> peer;
 	int albumId = 0;
+	int addingToAlbumId = 0;
 };
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index ef00f8fd65..3af67c42e9 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -47,6 +47,150 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_settings.h"
 
 namespace Info::Stories {
+namespace {
+
+class EditAlbumBox final : public Ui::BoxContent {
+public:
+	EditAlbumBox(
+		QWidget*,
+		not_null<Controller*> controller,
+		not_null<PeerData*> peer,
+		Fn<void()> reload,
+		int albumId);
+
+private:
+	void prepare() override;
+
+	void resizeEvent(QResizeEvent *e) override;
+
+	const not_null<Window::SessionController*> _window;
+	const not_null<WrapWidget*> _content;
+	rpl::variable<Data::StoryAlbumUpdate> _changes;
+	Fn<void()> _reload;
+	bool _saving = false;
+
+};
+
+EditAlbumBox::EditAlbumBox(
+	QWidget*,
+	not_null<Controller*> controller,
+	not_null<PeerData*> peer,
+	Fn<void()> reload,
+	int albumId)
+: _window(controller->parentController())
+, _content(Ui::CreateChild<WrapWidget>(
+	this,
+	_window,
+	Wrap::StoryAlbumEdit,
+	std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(
+				peer,
+				Data::kStoriesAlbumIdArchive,
+				albumId))).get()))
+, _changes(Data::StoryAlbumUpdate{ .peer = peer, .albumId = albumId })
+, _reload(std::move(reload)) {
+	_content->selectedListValue(
+	) | rpl::start_with_next([=](const SelectedItems &selection) {
+		const auto stories = &_window->session().data().stories();
+		auto ids = stories->albumKnownInArchive(peer->id, albumId);
+		auto now = _changes.current();
+		now.added.clear();
+		now.added.reserve(selection.list.size());
+		now.removed.clear();
+		now.removed.reserve(ids.size());
+		for (const auto &entry : selection.list) {
+			const auto id = StoryIdFromMsgId(entry.globalId.itemId.msg);
+			if (!ids.remove(id)) {
+				now.added.push_back(id);
+			}
+		}
+		for (const auto id : ids) {
+			now.removed.push_back(id);
+		}
+		_changes = std::move(now);
+	}, lifetime());
+}
+
+void EditAlbumBox::prepare() {
+	setTitle(tr::lng_stories_album_add_title());
+	setStyle(st::collectionEditBox);
+
+	_content->desiredHeightValue(
+	) | rpl::start_with_next([=](int height) {
+		setDimensions(st::boxWideWidth, height);
+	}, _content->lifetime());
+
+	addTopButton(st::boxTitleClose, [=] {
+		closeBox();
+	});
+
+	const auto weakBox = base::make_weak(this);
+	auto text = _changes.value(
+	) | rpl::map([=](const Data::StoryAlbumUpdate &update) {
+		return (!update.added.empty() && update.removed.empty())
+			? tr::lng_stories_album_add_title()
+			: tr::lng_settings_save();
+	}) | rpl::flatten_latest();
+	addButton(std::move(text), [=] {
+		if (_saving) {
+			return;
+		}
+		auto add = QVector<MTPint>();
+		auto remove = QVector<MTPint>();
+		const auto &changes = _changes.current();
+		for (const auto &id : changes.added) {
+			add.push_back(MTP_int(id));
+		}
+		for (const auto &id : changes.removed) {
+			remove.push_back(MTP_int(id));
+		}
+		if (add.empty() && remove.empty()) {
+			closeBox();
+			return;
+		}
+		_saving = true;
+		const auto session = &_window->session();
+		const auto reload = _reload;
+		using Flag = MTPstories_UpdateAlbum::Flag;
+		session->api().request(
+			MTPstories_UpdateAlbum(
+				MTP_flags(Flag()
+					| (add.isEmpty() ? Flag() : Flag::f_add_stories)
+					| (remove.isEmpty()
+						? Flag()
+						: Flag::f_delete_stories)),
+				changes.peer->input,
+				MTP_int(changes.albumId),
+				MTPstring(),
+				MTP_vector<MTPint>(remove),
+				MTP_vector<MTPint>(add),
+				MTPVector<MTPint>())
+		).done([=] {
+			if (const auto strong = weakBox.get()) {
+				strong->_saving = false;
+				strong->closeBox();
+			}
+			session->data().stories().notifyAlbumUpdate(
+				base::duplicate(changes));
+			if (const auto onstack = reload) {
+				onstack();
+			}
+		}).fail([=](const MTP::Error &error) {
+			if (const auto strong = weakBox.get()) {
+				strong->_saving = false;
+				strong->uiShow()->showToast(error.type());
+			}
+		}).send();
+	});
+}
+
+void EditAlbumBox::resizeEvent(QResizeEvent *e) {
+	_content->setGeometry(rect());
+}
+
+} // namespace
 
 InnerWidget::InnerWidget(
 	QWidget *parent,
@@ -66,11 +210,8 @@ InnerWidget::InnerWidget(
 
 	_albumId.value(
 	) | rpl::start_with_next([=](int albumId) {
-		_list.destroy();
-		_controller->replaceKey(Key(Tag(_peer, albumId)));
-		setupList();
-		setupEmpty();
-		resizeToWidth(width());
+		_controller->replaceKey(Key(Tag(_peer, albumId, _addingToAlbumId)));
+		reload();
 	}, lifetime());
 }
 
@@ -108,7 +249,9 @@ InnerWidget::~InnerWidget() = default;
 
 void InnerWidget::setupTop() {
 	const auto albumId = _albumId.current();
-	if (albumId == Data::kStoriesAlbumIdArchive) {
+	if (_addingToAlbumId) {
+		return;
+	} else if (albumId == Data::kStoriesAlbumIdArchive) {
 		createAboutArchive();
 	} else if (_isStackBottom) {
 		if (_peer->isSelf()) {
@@ -608,107 +751,24 @@ rpl::producer<Data::StoryAlbumUpdate> InnerWidget::changes() const {
 	return _albumChanges.value();
 }
 
-void InnerWidget::reloadAlbum(int id) {
-	// #TODO stories
+void InnerWidget::reload() {
+	auto old = std::exchange(_list, object_ptr<Media::ListWidget>(nullptr));
+	setupList();
+	setupEmpty();
+	old.destroy();
+
+	resizeToWidth(width());
 }
 
 void InnerWidget::editAlbumStories(int id) {
 	const auto weak = base::make_weak(this);
-	_controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
-		box->setTitle(tr::lng_stories_album_add_title());
-		box->setWidth(st::boxWideWidth);
-		box->setStyle(st::collectionEditBox);
+	auto box = Box<EditAlbumBox>(_controller, _peer, crl::guard(this, [=] {
+		if (_albumId.current() == id) {
+			reload();
+		}
+	}), id);
 
-		struct State {
-			rpl::variable<Data::StoryAlbumUpdate> changes;
-			base::unique_qptr<Ui::PopupMenu> menu;
-			bool saving = false;
-		};
-		const auto state = box->lifetime().make_state<State>(State{
-			.changes = Data::StoryAlbumUpdate{
-				.peer = _peer,
-				.albumId = id,
-			}
-		});
-		const auto content = box->addRow(
-			object_ptr<InnerWidget>(
-				box,
-				_controller,
-				rpl::single(Data::kStoriesAlbumIdArchive),
-				id/*,
-				_peer,
-				state->descriptor.value(),
-				id,
-				(_all.filter == Filter()) ? _all : Entries()*/),
-			{});
-		state->changes = content->changes();
-
-		content->scrollToRequests(
-		) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
-			box->scrollTo(request);
-		}, content->lifetime());
-
-		box->addTopButton(st::boxTitleClose, [=] {
-			box->closeBox();
-		});
-		const auto weakBox = base::make_weak(box);
-		auto text = state->changes.value(
-		) | rpl::map([=](const Data::StoryAlbumUpdate &update) {
-			return (!update.added.empty() && update.removed.empty())
-				? tr::lng_stories_album_add_title()
-				: tr::lng_settings_save();
-		}) | rpl::flatten_latest();
-		box->addButton(std::move(text), [=] {
-			if (state->saving) {
-				return;
-			}
-			auto add = QVector<MTPint>();
-			auto remove = QVector<MTPint>();
-			const auto &changes = state->changes.current();
-			for (const auto &id : changes.added) {
-				add.push_back(MTP_int(id));
-			}
-			for (const auto &id : changes.removed) {
-				remove.push_back(MTP_int(id));
-			}
-			if (add.empty() && remove.empty()) {
-				box->closeBox();
-				return;
-			}
-			state->saving = true;
-			const auto session = &_controller->session();
-			using Flag = MTPstories_UpdateAlbum::Flag;
-			session->api().request(
-				MTPstories_UpdateAlbum(
-					MTP_flags(Flag()
-						| (add.isEmpty() ? Flag() : Flag::f_add_stories)
-						| (remove.isEmpty()
-							? Flag()
-							: Flag::f_delete_stories)),
-					_peer->input,
-					MTP_int(id),
-					MTPstring(),
-					MTP_vector<MTPint>(remove),
-					MTP_vector<MTPint>(add),
-					MTPVector<MTPint>())
-			).done([=] {
-				if (const auto strong = weakBox.get()) {
-					state->saving = false;
-					strong->closeBox();
-				}
-				session->data().stories().notifyAlbumUpdate(
-					base::duplicate(changes));
-				if (const auto strong = weak.get()) {
-					strong->reloadAlbum(id);
-				}
-			}).fail([=](const MTP::Error &error) {
-				if (const auto strong = weakBox.get()) {
-					state->saving = false;
-					strong->uiShow()->showToast(error.type());
-				}
-			}).send();
-		});
-	}));
+	_controller->uiShow()->show(std::move(box));
 }
 
 void InnerWidget::editAlbumName(int id) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index e042c7ec31..b3657bf5ac 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -67,7 +67,7 @@ public:
 	rpl::producer<SelectedItems> selectedListValue() const;
 	void selectionAction(SelectionAction action);
 
-	void reloadAlbum(int id);
+	void reload();
 	void editAlbumStories(int id);
 	void editAlbumName(int id);
 	void confirmDeleteAlbum(int id);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index d81bb06821..a0d0d0ec98 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -49,7 +49,8 @@ Provider::Provider(not_null<AbstractController*> controller)
 : _controller(controller)
 , _peer(controller->key().storiesPeer())
 , _history(_peer->owner().history(_peer))
-, _albumId(controller->key().storiesAlbumId()) {
+, _albumId(controller->key().storiesAlbumId())
+, _addingToAlbumId(controller->key().storiesAddToAlbumId()) {
 	style::PaletteChanged(
 	) | rpl::start_with_next([=] {
 		for (auto &layout : _layouts) {
@@ -366,7 +367,7 @@ ListItemSelectionData Provider::computeSelectionData(
 		TextSelection selection) {
 	auto result = ListItemSelectionData(selection);
 	const auto id = item->id;
-	if (!IsStoryMsgId(id)) {
+	if (_addingToAlbumId || !IsStoryMsgId(id)) {
 		return result;
 	}
 	const auto peer = item->history()->peer;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.h b/Telegram/SourceFiles/info/stories/info_stories_provider.h
index ae8fbd251a..26cd64a3ba 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.h
@@ -117,6 +117,7 @@ private:
 	const not_null<PeerData*> _peer;
 	const not_null<History*> _history;
 	const int _albumId = 0;
+	const int _addingToAlbumId = 0;
 
 	StoryId _aroundId = kDefaultAroundId;
 	int _idsLimit = kMinimalIdsLimit;
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 1835a0a336..9722ba9453 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -29,8 +29,8 @@ Memento::Memento(not_null<Controller*> controller)
 , _media(controller) {
 }
 
-Memento::Memento(not_null<PeerData*> peer, int albumId)
-: ContentMemento(Tag{ peer, albumId })
+Memento::Memento(not_null<PeerData*> peer, int albumId, int addingToAlbumId)
+: ContentMemento(Tag{ peer, albumId, addingToAlbumId })
 , _media(peer, 0, Media::Type::PhotoVideo) {
 }
 
@@ -57,7 +57,8 @@ Widget::Widget(
 	_inner = setInnerWidget(object_ptr<InnerWidget>(
 		this,
 		controller,
-		_albumId.value()));
+		_albumId.value(),
+		controller->key().storiesAddToAlbumId()));
 	_inner->albumIdChanges() | rpl::start_with_next([=](int id) {
 		controller->showSection(
 			Make(controller->storiesPeer(), id),
@@ -139,7 +140,7 @@ std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, int albumId) {
 	return std::make_shared<Info::Memento>(
 		std::vector<std::shared_ptr<ContentMemento>>(
 			1,
-			std::make_shared<Memento>(peer, albumId)));
+			std::make_shared<Memento>(peer, albumId, 0)));
 }
 
 } // namespace Info::Stories
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 84911ceb49..1985724531 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -18,7 +18,7 @@ class InnerWidget;
 class Memento final : public ContentMemento {
 public:
 	Memento(not_null<Controller*> controller);
-	Memento(not_null<PeerData*> peer, int albumId);
+	Memento(not_null<PeerData*> peer, int albumId, int addingToAlbumId);
 	~Memento();
 
 	object_ptr<ContentWidget> createWidget(
@@ -37,6 +37,7 @@ public:
 
 private:
 	Media::Memento _media;
+	int _addingToAlbumId = 0;
 
 };
 
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index 0c24bbd062..21c6d1eb0c 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -238,6 +238,14 @@ QString AppConfig::starsRatingLearnMoreUrl() const {
 		u"https://telegram.org/blog"_q);
 }
 
+int AppConfig::storiesAlbumsLimit() const {
+	return get<int>(u"stories_albums_limit"_q, 100);
+}
+
+int AppConfig::storiesAlbumLimit() const {
+	return get<int>(u"stories_album_stories_limit"_q, 1000);
+}
+
 void AppConfig::refresh(bool force) {
 	if (_requestId || !_api) {
 		if (force) {
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index d481d7c7b1..78bde39f9c 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -111,6 +111,9 @@ public:
 
 	[[nodiscard]] QString starsRatingLearnMoreUrl() const;
 
+	[[nodiscard]] int storiesAlbumsLimit() const;
+	[[nodiscard]] int storiesAlbumLimit() const;
+
 	void refresh(bool force = false);
 
 private:

From 677891d0ff0d57070411c622307a3f58aafd4ba0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Jul 2025 23:59:08 +0400
Subject: [PATCH 082/341] Allow arbitrary order in story albums.

---
 Telegram/SourceFiles/data/data_stories.cpp    | 62 ++++++++++++++++---
 Telegram/SourceFiles/data/data_stories.h      |  2 +-
 .../SourceFiles/data/data_stories_ids.cpp     |  3 +-
 3 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 830c763dee..abb43c7e5b 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -94,11 +94,38 @@ using UpdateFlag = StoryUpdate::Flag;
 	};
 }
 
+bool InsertSorted(std::vector<StoryId> &list, StoryId id) {
+	const auto i = ranges::lower_bound(list, id, std::greater<>());
+	if (i != end(list) && *i == id) {
+		return false;
+	}
+	list.insert(i, id);
+	return true;
+}
+
+bool RemoveSorted(std::vector<StoryId> &list, StoryId id) {
+	const auto i = ranges::lower_bound(list, id, std::greater<>());
+	if (i != end(list) && *i == id) {
+		list.erase(i);
+		return true;
+	}
+	return false;
+}
+
+bool RemoveUnsorted(std::vector<StoryId> &list, StoryId id) {
+	const auto i = ranges::find(list, id);
+	if (i != end(list)) {
+		list.erase(i);
+		return true;
+	}
+	return false;
+}
+
 } // namespace
 
 std::vector<StoryId> RespectingPinned(const StoriesIds &ids) {
 	if (ids.pinnedToTop.empty()) {
-		return ids.list | ranges::to_vector;
+		return ids.list;
 	}
 	auto result = std::vector<StoryId>();
 	result.reserve(ids.list.size());
@@ -541,7 +568,7 @@ Story *Stories::parseAndApply(
 	}
 
 	if (const auto archive = lookupArchive(peer)) {
-		const auto added = archive->ids.list.emplace(id).second;
+		const auto added = InsertSorted(archive->ids.list, id);
 		if (added) {
 			if (archive->total >= 0 && id > archive->lastId) {
 				++archive->total;
@@ -633,7 +660,7 @@ void Stories::savedStateChanged(not_null<Story*> story) {
 	const auto inProfile = story->inProfile();
 	if (inProfile) {
 		auto &saved = _saved[peer];
-		const auto added = saved.ids.list.emplace(id).second;
+		const auto added = InsertSorted(saved.ids.list, id);
 		if (added) {
 			if (saved.total >= 0 && id > saved.lastId) {
 				++saved.total;
@@ -642,7 +669,7 @@ void Stories::savedStateChanged(not_null<Story*> story) {
 		}
 	} else if (const auto i = _saved.find(peer); i != end(_saved)) {
 		auto &saved = i->second;
-		if (saved.ids.list.remove(id)) {
+		if (RemoveSorted(saved.ids.list, id)) {
 			if (saved.total > 0) {
 				--saved.total;
 			}
@@ -859,7 +886,14 @@ void Stories::applyDeleted(not_null<PeerData*> peer, StoryId id) {
 			const auto removeFromAlbum = [&](int albumId) {
 				if (const auto set = albumIdsSet(peerId, albumId, true)) {
 					set->albumKnownInArchive.remove(id);
-					if (set->ids.list.remove(id)) {
+					RemoveUnsorted(set->ids.pinnedToTop, id);
+
+					const auto sorted = (albumId == kStoriesAlbumIdSaved)
+						|| (albumId == kStoriesAlbumIdArchive);
+					const auto removed = sorted
+						? RemoveSorted(set->ids.list, id)
+						: RemoveUnsorted(set->ids.list, id);
+					if (removed) {
 						if (set->total > 0) {
 							--set->total;
 						}
@@ -1733,15 +1767,25 @@ void Stories::albumIdsLoadMore(PeerId peerId, int albumId, bool reload) {
 		auto pinnedToTop = pinnedToTopIds
 			| ranges::views::transform(&MTPint::v)
 			| ranges::to_vector;
+		const auto ordered = (albumId == kStoriesAlbumIdSaved)
+			|| (albumId == kStoriesAlbumIdArchive);
 		set->total = data.vcount().v;
 		for (const auto &story : data.vstories().v) {
 			const auto id = story.match([&](const auto &id) {
 				return id.vid().v;
 			});
-			set->ids.list.emplace(id);
+			if (ordered) {
+				InsertSorted(set->ids.list, id);
+			} else {
+				set->ids.list.push_back(id);
+			}
 			set->lastId = id;
 			if (!parseAndApply(peer, story, now)) {
-				set->ids.list.remove(id);
+				if (ordered) {
+					RemoveSorted(set->ids.list, id);
+				} else {
+					set->ids.list.pop_back();
+				}
 				if (set->total > 0) {
 					--set->total;
 				}
@@ -2026,12 +2070,12 @@ void Stories::toggleInProfileList(
 					const auto add = loaded || (id.v >= lastId);
 					if (!add) {
 						dirty = true;
-					} else if (saved.ids.list.emplace(id.v).second) {
+					} else if (InsertSorted(saved.ids.list, id.v)) {
 						if (saved.total >= 0) {
 							++saved.total;
 						}
 					}
-				} else if (saved.ids.list.remove(id.v)) {
+				} else if (RemoveSorted(saved.ids.list, id.v)) {
 					if (saved.total > 0) {
 						--saved.total;
 					}
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index 2b116a97bf..d0492cef8a 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -35,7 +35,7 @@ struct StoryAlbum;
 class StoryPreload;
 
 struct StoriesIds {
-	base::flat_set<StoryId, std::greater<>> list;
+	std::vector<StoryId> list; // flat_set<int, greater> for saved/archive.
 	std::vector<StoryId> pinnedToTop;
 
 	friend inline bool operator==(
diff --git a/Telegram/SourceFiles/data/data_stories_ids.cpp b/Telegram/SourceFiles/data/data_stories_ids.cpp
index 91eadee34f..130cb5e327 100644
--- a/Telegram/SourceFiles/data/data_stories_ids.cpp
+++ b/Telegram/SourceFiles/data/data_stories_ids.cpp
@@ -44,8 +44,7 @@ rpl::producer<StoriesIdsSlice> AlbumStoriesIds(
 			const auto count = stories->albumIdsCount(peerId, albumId);
 			auto i = ranges::find(sorted, aroundId);
 			if (i == end(sorted)) {
-				const auto j = loaded.list.lower_bound(aroundId);
-				i = begin(sorted) + int(j - begin(loaded.list));
+				i = begin(sorted);
 			}
 			const auto hasBefore = int(i - begin(sorted));
 			const auto hasAfter = int(end(sorted) - i);

From 953487bb65279ca514886b92836e3df0cf8a0a21 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 12:27:29 +0400
Subject: [PATCH 083/341] Display hidden state in story albums.

---
 .gitignore                                    | 11 +++
 Telegram/SourceFiles/data/data_stories.cpp    | 29 +++++++
 Telegram/SourceFiles/data/data_stories.h      |  1 +
 Telegram/SourceFiles/data/data_story.cpp      |  7 +-
 Telegram/SourceFiles/data/data_types.h        |  2 +
 Telegram/SourceFiles/history/history_item.cpp | 16 ++++
 Telegram/SourceFiles/history/history_item.h   |  4 +
 Telegram/SourceFiles/info/info_top_bar.cpp    | 30 ++++++--
 Telegram/SourceFiles/info/info_top_bar.h      |  4 +-
 .../SourceFiles/info/info_wrap_widget.cpp     |  3 -
 Telegram/SourceFiles/info/info_wrap_widget.h  |  4 +-
 .../info/media/info_media_common.h            |  1 +
 .../info/media/info_media_list_widget.cpp     | 51 +++++++++----
 .../info/media/info_media_list_widget.h       |  5 +-
 .../peer_gifts/info_peer_gifts_widget.cpp     |  6 +-
 .../stories/info_stories_inner_widget.cpp     | 45 ++++-------
 .../info/stories/info_stories_provider.cpp    | 13 +++-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  6 +-
 .../SourceFiles/overview/overview_layout.cpp  | 75 +++++++++++++------
 .../SourceFiles/overview/overview_layout.h    | 33 +++++---
 .../overview/overview_layout_delegate.h       |  4 +
 21 files changed, 247 insertions(+), 103 deletions(-)

diff --git a/.gitignore b/.gitignore
index 35282e1e49..f4fe857af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,14 @@ stage
 *.*~
 .idea/
 cmake-build-debug/
+
+# Local configuration files
+settings.local.json
+*.local.json
+.env
+.env.local
+.env.*.local
+
+# Cursor IDE local settings (but keep .cursor/rules/)
+.cursor/*
+!.cursor/rules/
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index abb43c7e5b..308a9cfb43 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1945,6 +1945,35 @@ void Stories::albumRename(
 	}).send();
 }
 
+void Stories::albumDelete(not_null<PeerData*> peer, int id) {
+	_owner->session().api().request(MTPstories_DeleteAlbum(
+		peer->input,
+		MTP_int(id)
+	)).send();
+
+	auto &albums = _albums[peer->id];
+	auto current = albums.list.current();
+	current.erase(
+		ranges::remove(current, id, &StoryAlbum::id),
+		end(current));
+	albums.list = std::move(current);
+
+	const auto i = albums.sets.find(id);
+	if (i != end(albums.sets)) {
+		_owner->session().api().request(
+			base::take(i->second.requestId)).cancel();
+		for (const auto storyId : i->second.albumKnownInArchive) {
+			if (const auto story = lookup({ peer->id, storyId })) {
+				auto now = (*story)->albumIds();
+				if (now.remove(id)) {
+					(*story)->setAlbumIds(std::move(now));
+				}
+			}
+		}
+		albums.sets.erase(i);
+	}
+}
+
 void Stories::notifyAlbumUpdate(StoryAlbumUpdate &&update) {
 	const auto peerId = update.peer->id;
 	const auto i = _albums.find(peerId);
diff --git a/Telegram/SourceFiles/data/data_stories.h b/Telegram/SourceFiles/data/data_stories.h
index d0492cef8a..c8ea41036b 100644
--- a/Telegram/SourceFiles/data/data_stories.h
+++ b/Telegram/SourceFiles/data/data_stories.h
@@ -235,6 +235,7 @@ public:
 		const QString &title,
 		Fn<void(StoryAlbum)> done,
 		Fn<void(QString)> fail);
+	void albumDelete(not_null<PeerData*> peer, int id);
 	void notifyAlbumUpdate(StoryAlbumUpdate &&update);
 	[[nodiscard]] rpl::producer<StoryAlbumUpdate> albumUpdates() const;
 
diff --git a/Telegram/SourceFiles/data/data_story.cpp b/Telegram/SourceFiles/data/data_story.cpp
index 5d94ac5c0d..1c92ecaf0d 100644
--- a/Telegram/SourceFiles/data/data_story.cpp
+++ b/Telegram/SourceFiles/data/data_story.cpp
@@ -367,7 +367,12 @@ bool Story::pinnedToTop() const {
 }
 
 void Story::setInProfile(bool value) {
-	_inProfile = value;
+	if (_inProfile != value) {
+		_inProfile = value;
+		if (const auto item = _peer->owner().stories().lookupItem(this)) {
+			item->setStoryInProfile(value);
+		}
+	}
 }
 
 bool Story::inProfile() const {
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index d0dce0f1ea..ebc6958c41 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -356,6 +356,8 @@ enum class MessageFlag : uint64 {
 
 	StarsPaidSuggested    = (1ULL << 52),
 	TonPaidSuggested      = (1ULL << 53),
+
+	StoryInProfile        = (1ULL << 54),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index c5587b25d5..5f5424254b 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1634,6 +1634,17 @@ void HistoryItem::setIsPinned(bool pinned) {
 	}
 }
 
+void HistoryItem::setStoryInProfile(bool inProfile) {
+	if (storyInProfile() == inProfile) {
+		return;
+	} else if (inProfile) {
+		_flags |= MessageFlag::StoryInProfile;
+	} else {
+		_flags &= ~MessageFlag::StoryInProfile;
+	}
+	_history->owner().notifyItemDataChange(this);
+}
+
 void HistoryItem::returnSavedMedia() {
 	if (!isEditingMedia()) {
 		return;
@@ -2014,6 +2025,11 @@ void HistoryItem::setStoryFields(not_null<Data::Story*> story) {
 	} else {
 		_flags &= ~MessageFlag::Pinned;
 	}
+	if (story->inProfile()) {
+		_flags |= MessageFlag::StoryInProfile;
+	} else {
+		_flags &= ~MessageFlag::StoryInProfile;
+	}
 }
 
 void HistoryItem::applyEdition(const MTPDmessageService &message) {
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 978624e85e..1f65b0c6a8 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -235,6 +235,9 @@ public:
 	[[nodiscard]] bool invertMedia() const {
 		return _flags & MessageFlag::InvertMedia;
 	}
+	[[nodiscard]] bool storyInProfile() const {
+		return _flags & MessageFlag::StoryInProfile;
+	}
 	[[nodiscard]] bool unread(not_null<Data::Thread*> thread) const;
 	[[nodiscard]] bool showNotification() const;
 	void markClientSideAsRead();
@@ -250,6 +253,7 @@ public:
 	void markMediaAndMentionRead();
 	bool markContentsRead(bool fromThisClient = false);
 	void setIsPinned(bool isPinned);
+	void setStoryInProfile(bool inProfile);
 
 	// For edit media in history_message.
 	void returnSavedMedia();
diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 8e731fc914..71bac1b3c8 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -588,10 +588,6 @@ void TopBar::setStories(rpl::producer<Dialogs::Stories::Content> content) {
 	updateControlsVisibility(anim::type::instant);
 }
 
-void TopBar::setStoriesArchive(bool archive) {
-	_storiesArchive = archive;
-}
-
 void TopBar::setSelectedItems(SelectedItems &&items) {
 	auto wasSelectionMode = selectionMode();
 	_selectedItems = std::move(items);
@@ -628,10 +624,19 @@ void TopBar::updateSelectionState() {
 	_canDelete = computeCanDelete();
 	_canForward = computeCanForward();
 	_canUnpinStories = computeCanUnpinStories();
+	_canToggleStoryPin = computeCanToggleStoryPin();
+	_allStoriesInProfile = computeAllStoriesInProfile();
 	_selectionText->entity()->setValue(generateSelectedText());
 	_delete->toggle(_canDelete, anim::type::instant);
 	_forward->toggle(_canForward, anim::type::instant);
 	_toggleStoryInProfile->toggle(_canToggleStoryPin, anim::type::instant);
+	_toggleStoryInProfile->entity()->setIconOverride(
+		(_allStoriesInProfile
+			? &_st.storiesArchive.icon
+			: &_st.storiesSave.icon),
+		(_allStoriesInProfile
+			? &_st.storiesArchive.iconOver
+			: &_st.storiesSave.iconOver));
 	_toggleStoryPin->toggle(_canToggleStoryPin, anim::type::instant);
 	_toggleStoryPin->entity()->setIconOverride(
 		_canUnpinStories ? &_st.storiesUnpin.icon : nullptr,
@@ -652,6 +657,7 @@ void TopBar::createSelectionControls() {
 	_canForward = computeCanForward();
 	_canUnpinStories = computeCanUnpinStories();
 	_canToggleStoryPin = computeCanToggleStoryPin();
+	_allStoriesInProfile = computeAllStoriesInProfile();
 	_cancelSelection = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
 		object_ptr<Ui::IconButton>(this, _st.mediaCancel),
@@ -710,16 +716,18 @@ void TopBar::createSelectionControls() {
 			this,
 			object_ptr<Ui::IconButton>(
 				this,
-				_storiesArchive ? _st.storiesSave : _st.storiesArchive),
+				_allStoriesInProfile ? _st.storiesArchive : _st.storiesSave),
 			st::infoTopBarScale));
 	registerToggleControlCallback(
 		_toggleStoryInProfile.data(),
 		[this] { return selectionMode() && _canToggleStoryPin; });
 	_toggleStoryInProfile->setDuration(st::infoTopBarDuration);
 	_toggleStoryInProfile->entity()->clicks(
-	) | rpl::map_to(
-		SelectionAction::ToggleStoryInProfile
-	) | rpl::start_to_stream(
+	) | rpl::map([=] {
+		return _allStoriesInProfile
+			? SelectionAction::ToggleStoryToArchive
+			: SelectionAction::ToggleStoryToProfile;
+	}) | rpl::start_to_stream(
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
 	_toggleStoryInProfile->entity()->setVisible(_canToggleStoryPin);
@@ -769,6 +777,12 @@ bool TopBar::computeCanToggleStoryPin() const {
 		&SelectedItem::canToggleStoryPin);
 }
 
+bool TopBar::computeAllStoriesInProfile() const {
+	return ranges::all_of(
+		_selectedItems.list,
+		&SelectedItem::storyInProfile);
+}
+
 Ui::StringWithNumbers TopBar::generateSelectedText() const {
 	return _selectedItems.title(_selectedItems.list.size());
 }
diff --git a/Telegram/SourceFiles/info/info_top_bar.h b/Telegram/SourceFiles/info/info_top_bar.h
index 71cbaa1a3d..6bd2e7ebbf 100644
--- a/Telegram/SourceFiles/info/info_top_bar.h
+++ b/Telegram/SourceFiles/info/info_top_bar.h
@@ -63,7 +63,6 @@ public:
 
 	void setTitle(TitleDescriptor descriptor);
 	void setStories(rpl::producer<Dialogs::Stories::Content> content);
-	void setStoriesArchive(bool archive);
 	void enableBackButton();
 	void highlight();
 
@@ -131,6 +130,7 @@ private:
 	[[nodiscard]] bool computeCanForward() const;
 	[[nodiscard]] bool computeCanUnpinStories() const;
 	[[nodiscard]] bool computeCanToggleStoryPin() const;
+	[[nodiscard]] bool computeAllStoriesInProfile() const;
 	void updateSelectionState();
 	void createSelectionControls();
 
@@ -178,7 +178,7 @@ private:
 	bool _canForward = false;
 	bool _canToggleStoryPin = false;
 	bool _canUnpinStories = false;
-	bool _storiesArchive = false;
+	bool _allStoriesInProfile = false;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _cancelSelection;
 	QPointer<Ui::FadeWrap<Ui::LabelWithNumbers>> _selectionText;
 	QPointer<Ui::FadeWrap<Ui::IconButton>> _forward;
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 31b8aa861c..ec982a3f88 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -657,8 +657,6 @@ void WrapWidget::finishShowContent() {
 			.subtitle = _content->subtitle(),
 		});
 		_topBar->setStories(_content->titleStories());
-		_topBar->setStoriesArchive(
-			_controller->key().storiesAlbumId() == Stories::ArchiveId());
 	}
 	_desiredHeights.fire(desiredHeightForContent());
 	_desiredShadowVisibilities.fire(_content->desiredShadowVisibility());
@@ -787,7 +785,6 @@ bool WrapWidget::showInternal(
 			&& (params.way == Window::SectionShow::Way::ClearStack);
 		if (_controller->validateMementoPeer(content)) {
 			if (!skipInternal && _content->showInternal(content)) {
-				highlightTopBar();
 				return true;
 			}
 		}
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h
index ee656f17b9..3362ec848d 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.h
+++ b/Telegram/SourceFiles/info/info_wrap_widget.h
@@ -65,6 +65,7 @@ struct SelectedItem {
 	bool canForward = false;
 	bool canToggleStoryPin = false;
 	bool canUnpinStory = false;
+	bool storyInProfile = false;
 };
 
 struct SelectedItems {
@@ -80,7 +81,8 @@ enum class SelectionAction {
 	Forward,
 	Delete,
 	ToggleStoryPin,
-	ToggleStoryInProfile,
+	ToggleStoryToProfile,
+	ToggleStoryToArchive,
 };
 
 class WrapWidget final : public Window::SectionWidget {
diff --git a/Telegram/SourceFiles/info/media/info_media_common.h b/Telegram/SourceFiles/info/media/info_media_common.h
index d5a8f726d4..b8c4830f26 100644
--- a/Telegram/SourceFiles/info/media/info_media_common.h
+++ b/Telegram/SourceFiles/info/media/info_media_common.h
@@ -32,6 +32,7 @@ struct ListItemSelectionData {
 	bool canForward = false;
 	bool canToggleStoryPin = false;
 	bool canUnpinStory = false;
+	bool storyInProfile = false;
 
 	friend inline bool operator==(
 		ListItemSelectionData,
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 3db2c6b11f..fd84dca000 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -58,6 +58,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "media/player/media_player_instance.h"
 #include "boxes/delete_messages_box.h"
 #include "boxes/peer_list_controllers.h"
+#include "boxes/sticker_set_box.h" // StickerPremiumMark
 #include "core/file_utilities.h"
 #include "core/application.h"
 #include "ui/toast/toast.h"
@@ -66,6 +67,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h" // giftBoxHiddenMark
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QClipboard>
@@ -152,7 +154,11 @@ ListWidget::ListWidget(
 	_provider->type(),
 	[=] { scrollDateCheck(); },
 	[=] { scrollDateHide(); }))
-, _storiesAddToAlbumId(controller->storiesAddToAlbumId()) {
+, _storiesAddToAlbumId(controller->storiesAddToAlbumId())
+, _hiddenMark(std::make_unique<StickerPremiumMark>(
+		&_controller->session(),
+		st::giftBoxHiddenMark,
+		RectPart::Center)) {
 	start();
 }
 
@@ -312,8 +318,11 @@ void ListWidget::selectionAction(SelectionAction action) {
 	case SelectionAction::Clear: clearSelected(); return;
 	case SelectionAction::Forward: forwardSelected(); return;
 	case SelectionAction::Delete: deleteSelected(); return;
-	case SelectionAction::ToggleStoryInProfile:
-		toggleStoryInProfileSelected();
+	case SelectionAction::ToggleStoryToProfile:
+		toggleStoryInProfileSelected(true);
+		return;
+	case SelectionAction::ToggleStoryToArchive:
+		toggleStoryInProfileSelected(false);
 		return;
 	case SelectionAction::ToggleStoryPin: toggleStoryPinSelected(); return;
 	}
@@ -395,6 +404,7 @@ auto ListWidget::collectSelectedItems() const -> SelectedItems {
 		result.canForward = selection.canForward;
 		result.canToggleStoryPin = selection.canToggleStoryPin;
 		result.canUnpinStory = selection.canUnpinStory;
+		result.storyInProfile = selection.storyInProfile;
 		return result;
 	};
 	auto transformation = [&](const auto &item) {
@@ -527,6 +537,10 @@ bool ListWidget::itemVisible(not_null<const BaseLayout*> item) {
 	return true;
 }
 
+not_null<StickerPremiumMark*> ListWidget::hiddenMark() {
+	return _hiddenMark.get();
+}
+
 QString ListWidget::tooltipText() const {
 	if (const auto link = ClickHandler::getActive()) {
 		return link->tooltip();
@@ -1020,6 +1034,11 @@ void ListWidget::showContextMenu(
 			return !item.second.canToggleStoryPin;
 		});
 	};
+	const auto allInProfile = [&] {
+		return ranges::all_of(_selected, [](auto &&item) {
+			return item.second.storyInProfile;
+		});
+	};
 	const auto canUnpinStoryAll = [&] {
 		return ranges::any_of(_selected, [](auto &&item) {
 			return item.second.canUnpinStory;
@@ -1125,13 +1144,14 @@ void ListWidget::showContextMenu(
 	}
 	if (overSelected == SelectionState::OverSelectedItems) {
 		if (canToggleStoryPinAll()) {
-			const auto albumId = _controller->storiesAlbumId();
-			const auto toProfile = (albumId == Stories::ArchiveId());
+			const auto toProfile = !allInProfile();
 			_contextMenu->addAction(
 				(toProfile
 					? tr::lng_mediaview_save_to_profile
 					: tr::lng_archived_add)(tr::now),
-				crl::guard(this, [this] { toggleStoryInProfileSelected(); }),
+				crl::guard(this, [=] {
+					toggleStoryInProfileSelected(toProfile);
+				}),
 				(toProfile
 					? &st::menuIconStoriesSave
 					: &st::menuIconStoriesArchive));
@@ -1177,14 +1197,15 @@ void ListWidget::showContextMenu(
 				item,
 				FullSelection);
 			if (selectionData.canToggleStoryPin) {
-				const auto albumId = _controller->storiesAlbumId();
-				const auto toProfile = (albumId == Stories::ArchiveId());
+				const auto toProfile = !selectionData.storyInProfile;
 				_contextMenu->addAction(
 					(toProfile
 						? tr::lng_mediaview_save_to_profile
 						: tr::lng_mediaview_archive_story)(tr::now),
 					crl::guard(this, [=] {
-						toggleStoryInProfile({ 1, globalId.itemId });
+						toggleStoryInProfile(
+							{ 1, globalId.itemId },
+							toProfile);
 					}),
 					(toProfile
 						? &st::menuIconStoriesSave
@@ -1317,10 +1338,11 @@ void ListWidget::deleteSelected() {
 	}));
 }
 
-void ListWidget::toggleStoryInProfileSelected() {
-	toggleStoryInProfile(collectSelectedIds(), crl::guard(this, [=] {
-		clearSelected();
-	}));
+void ListWidget::toggleStoryInProfileSelected(bool toProfile) {
+	toggleStoryInProfile(
+		collectSelectedIds(),
+		toProfile,
+		crl::guard(this, [=] { clearSelected(); }));
 }
 
 void ListWidget::toggleStoryPinSelected() {
@@ -1335,6 +1357,7 @@ void ListWidget::toggleStoryPinSelected() {
 
 void ListWidget::toggleStoryInProfile(
 		MessageIdsList &&items,
+		bool toProfile,
 		Fn<void()> confirmed) {
 	auto list = std::vector<FullStoryId>();
 	for (const auto &id : items) {
@@ -1347,8 +1370,6 @@ void ListWidget::toggleStoryInProfile(
 	}
 	const auto channel = peerIsChannel(list.front().peer);
 	const auto count = int(list.size());
-	const auto albumId = _controller->storiesAlbumId();
-	const auto toProfile = (albumId == Stories::ArchiveId());
 	const auto controller = _controller;
 	const auto sure = [=](Fn<void()> close) {
 		using namespace ::Media::Stories;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index 256d82adf5..c578d21f32 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -84,6 +84,7 @@ public:
 	void unregisterHeavyItem(not_null<const BaseLayout*> item) override;
 	void repaintItem(not_null<const BaseLayout*> item) override;
 	bool itemVisible(not_null<const BaseLayout*> item) override;
+	not_null<StickerPremiumMark*> hiddenMark() override;
 
 	// AbstractTooltipShower interface
 	QString tooltipText() const override;
@@ -192,11 +193,12 @@ private:
 	void forwardItems(MessageIdsList &&items);
 	void deleteSelected();
 	void toggleStoryPinSelected();
-	void toggleStoryInProfileSelected();
+	void toggleStoryInProfileSelected(bool toProfile);
 	void deleteItem(GlobalMsgId globalId);
 	void deleteItems(SelectedItems &&items, Fn<void()> confirmed = nullptr);
 	void toggleStoryInProfile(
 		MessageIdsList &&items,
+		bool toProfile,
 		Fn<void()> confirmed = nullptr);
 	void toggleStoryPin(
 		MessageIdsList &&items,
@@ -311,6 +313,7 @@ private:
 	int _storiesAddToAlbumId = 0;
 	base::flat_set<StoryId> _storiesInAlbum;
 	base::flat_set<MsgId> _storyMsgsToMarkSelected;
+	std::unique_ptr<StickerPremiumMark> _hiddenMark;
 
 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
 	rpl::event_stream<> _checkForHide;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 193c24f809..d205cc5c24 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -947,10 +947,8 @@ void InnerWidget::refreshAbout() {
 		auto text = tr::lng_peer_gifts_empty_search(
 			tr::now,
 			Ui::Text::RichLangValue);
-		if (_entries->total > 0) {
-			text.append("\n\n").append(Ui::Text::Link(
-				tr::lng_peer_gifts_view_all(tr::now)));
-		}
+		text.append("\n\n").append(Ui::Text::Link(
+			tr::lng_peer_gifts_view_all(tr::now)));
 		auto about = std::make_unique<Ui::FlatLabel>(
 			this,
 			rpl::single(text),
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 3af67c42e9..c47a5968fb 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -552,17 +552,18 @@ void InnerWidget::setupEmpty() {
 		),
 		_list->heightValue()
 	) | rpl::start_with_next([=](auto, int listHeight) {
-		if (listHeight) {
-			_empty.destroy();
-			return;
+		const auto padding = st::infoMediaMargin;
+		if (const auto raw = _empty.release()) {
+			raw->hide();
+			raw->deleteLater();
+		}
+		if (listHeight <= padding.bottom() + padding.top()) {
+			refreshEmpty();
 		}
-		refreshEmpty();
 	}, _list->lifetime());
 }
 
 void InnerWidget::refreshEmpty() {
-	_empty.destroy();
-
 	const auto albumId = _albumId.current();
 	const auto stories = &_controller->session().data().stories();
 	const auto knownEmpty = stories->albumIdsCountKnown(_peer->id, albumId);
@@ -606,7 +607,6 @@ void InnerWidget::refreshEmpty() {
 		button->setClickedCallback([=] {
 			editAlbumStories(albumId);
 		});
-
 		empty->show();
 		_empty = std::move(empty);
 	} else {
@@ -790,10 +790,11 @@ void InnerWidget::editAlbumName(int id) {
 
 void InnerWidget::confirmDeleteAlbum(int id) {
 	const auto done = [=](Fn<void()> close) {
-		_controller->session().api().request(
-			MTPstories_DeleteAlbum(_peer->input, MTP_int(id))
-		).send();
 		albumRemoved(id);
+
+		const auto stories = &_controller->session().data().stories();
+		stories->albumDelete(_peer, id);
+
 		close();
 	};
 	_controller->uiShow()->show(Ui::MakeConfirmBox({
@@ -807,7 +808,7 @@ void InnerWidget::confirmDeleteAlbum(int id) {
 void InnerWidget::albumAdded(Data::StoryAlbum result) {
 	Expects(ranges::contains(_albums, result.id, &Data::StoryAlbum::id));
 
-	_albumId = result.id;
+	_albumIdChanges.fire_copy(result.id);
 }
 
 void InnerWidget::albumRenamed(int id, QString name) {
@@ -821,20 +822,8 @@ void InnerWidget::albumRenamed(int id, QString name) {
 void InnerWidget::albumRemoved(int id) {
 	auto now = _albumId.current();
 	if (now == id) {
-		_albumId = 0;
+		_albumIdChanges.fire_copy(0);
 	}
-	//const auto removeFrom = [&](Entries &entries) {
-	//	for (auto &entry : entries.list) {
-	//		entry.gift.collectionIds.erase(
-	//			ranges::remove(entry.gift.collectionIds, id),
-	//			end(entry.gift.collectionIds));
-	//	}
-	//};
-	//removeFrom(_all);
-	//for (auto &[_, entries] : _perCollection) {
-	//	removeFrom(entries);
-	//}
-
 	const auto i = ranges::find(_albums, id, &Data::StoryAlbum::id);
 	if (i != end(_albums)) {
 		_albums.erase(i);
@@ -908,14 +897,6 @@ int InnerWidget::recountHeight() {
 }
 
 void InnerWidget::setScrollHeightValue(rpl::producer<int> value) {
-	//using namespace rpl::mappers;
-	//_empty->setFullHeight(rpl::combine(
-	//	std::move(value),
-	//	_listTops.events_starting_with(
-	//		_list->topValue()
-	//	) | rpl::flatten_latest(),
-	//	_topHeight.value(),
-	//	_1 - _2 + _3));
 }
 
 rpl::producer<Ui::ScrollToRequest> InnerWidget::scrollToRequests() const {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index a0d0d0ec98..844ece18a0 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -343,10 +343,20 @@ std::unique_ptr<BaseLayout> Provider::createLayout(
 		}
 		return nullptr;
 	};
+
+	const auto peer = item->history()->peer;
+	const auto channel = peer->asChannel();
+	const auto showPinned = (_albumId == Data::kStoriesAlbumIdSaved);
+	const auto showHidden = peer->isSelf()
+		|| (channel && channel->canEditStories());
+
 	using namespace Overview::Layout;
 	const auto options = MediaOptions{
-		.pinned = item->isPinned(),
 		.story = true,
+		.storyPinned = showPinned && item->isPinned(),
+		.storyShowPinned = showPinned,
+		.storyHidden = showHidden && !item->storyInProfile(),
+		.storyShowHidden = showHidden,
 	};
 	if (const auto photo = getPhoto()) {
 		return std::make_unique<Photo>(delegate, item, photo, options);
@@ -379,6 +389,7 @@ ListItemSelectionData Provider::computeSelectionData(
 		result.canForward = peer->isSelf() && story->canShare();
 		result.canDelete = story->canDelete();
 		result.canUnpinStory = story->pinnedToTop();
+		result.storyInProfile = story->inProfile();
 	}
 	result.canToggleStoryPin = peer->isSelf()
 		|| (channel && channel->canEditStories());
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index a537000a05..2db91068b7 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -248,7 +248,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#29de80be flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating = UserFull;
+userFull#7e63ce1f flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating stars_my_pending_rating:flags2.18?StarsRating stars_my_pending_rating_date:flags2.18?int = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -2001,7 +2001,7 @@ storyAlbum#9325705a flags:# album_id:int title:string icon_photo:flags.0?Photo i
 stories.albumsNotModified#564edaeb = stories.Albums;
 stories.albums#c3987a3a hash:long albums:Vector<StoryAlbum> = stories.Albums;
 
-searchPostsFlood#940e707c flags:# remains:int wait_till:flags.0?int stars_amount:long = SearchPostsFlood;
+searchPostsFlood#3e0b5b6a flags:# query_is_free:flags.0?true total_daily:int remains:int wait_till:flags.1?int stars_amount:long = SearchPostsFlood;
 
 ---functions---
 
@@ -2530,7 +2530,7 @@ channels.searchPosts#f2c4f24d flags:# hashtag:flags.0?string query:flags.1?strin
 channels.updatePaidMessagesPrice#4b12327b flags:# broadcast_messages_allowed:flags.0?true channel:InputChannel send_paid_messages_stars:long = Updates;
 channels.toggleAutotranslation#167fc0a1 channel:InputChannel enabled:Bool = Updates;
 channels.getMessageAuthor#ece2a0e6 channel:InputChannel id:int = User;
-channels.checkSearchPostsFlood#bba9f121 = SearchPostsFlood;
+channels.checkSearchPostsFlood#22567115 flags:# query:flags.0?string = SearchPostsFlood;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index c80ffec3e5..56468feb63 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media_common.h"
 #include "history/view/media/history_view_document.h" // DrawThumbnailAsSongCover
 #include "base/unixtime.h"
+#include "boxes/sticker_set_box.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/effects/spoiler_mess.h"
 #include "ui/image/image.h"
@@ -355,8 +356,11 @@ Photo::Photo(
 	})
 	: nullptr)
 , _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0)
-, _pinned(options.pinned)
 , _story(options.story)
+, _storyPinned(options.storyPinned)
+, _storyShowPinned(options.storyShowPinned)
+, _storyHidden(options.storyHidden)
+, _storyShowHidden(options.storyShowHidden)
 , _link(_sensitiveSpoiler
 	? HistoryView::MakeSensitiveMediaLink(
 		std::make_shared<LambdaClickHandler>(crl::guard(this, [=] {
@@ -408,7 +412,7 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 				|| _dataMedia->image(Data::PhotoSize::Thumbnail));
 		if ((good && !_goodLoaded) || widthChanged) {
 			_goodLoaded = good;
-			_pix = QPixmap();
+			_pix = QImage();
 			if (_goodLoaded) {
 				setPixFrom(_dataMedia->image(Data::PhotoSize::Large)
 					? _dataMedia->image(Data::PhotoSize::Large)
@@ -426,7 +430,7 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 	if (_pix.isNull()) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoBg);
 	} else {
-		p.drawPixmap(0, 0, _pix);
+		p.drawImage(0, 0, _pix);
 	}
 
 	if (_spoiler) {
@@ -442,11 +446,21 @@ void Photo::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		}
 	}
 
+	if (_storyHidden) {
+		delegate()->hiddenMark()->paint(
+			p,
+			_pix,
+			_hiddenBgCache,
+			QPoint(),
+			QSize(_width, _height),
+			_width);
+	}
+
 	if (selected) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoSelectOverlay);
 	}
 
-	if (_pinned) {
+	if (_storyPinned) {
 		const auto &icon = selected
 			? st::storyPinnedIconSelected
 			: st::storyPinnedIcon;
@@ -466,8 +480,7 @@ void Photo::setPixFrom(not_null<Image*> image) {
 	if (!_goodLoaded) {
 		img = Images::Blur(std::move(img));
 	}
-	_pix = Ui::PixmapFromImage(
-		CropMediaFrame(std::move(img), _width, _height));
+	_pix = CropMediaFrame(std::move(img), _width, _height);
 
 	// In case we have inline thumbnail we can unload all images and we still
 	// won't get a blank image in the media viewer when the photo is opened.
@@ -493,7 +506,7 @@ void Photo::clearSpoiler() {
 	if (_spoiler) {
 		_spoiler = nullptr;
 		_sensitiveSpoiler = false;
-		_pix = QPixmap();
+		_pix = QImage();
 		delegate()->repaintItem(this);
 	}
 }
@@ -506,9 +519,11 @@ void Photo::maybeClearSensitiveSpoiler() {
 }
 
 void Photo::itemDataChanged() {
-	const auto pinned = parent()->isPinned();
-	if (_pinned != pinned) {
-		_pinned = pinned;
+	const auto pinned = _storyShowPinned && parent()->isPinned();
+	const auto hidden = _storyShowHidden && !parent()->storyInProfile();
+	if (_storyPinned != pinned || _storyHidden != hidden) {
+		_storyPinned = pinned;
+		_storyHidden = hidden;
 		delegate()->repaintItem(this);
 	}
 }
@@ -541,8 +556,11 @@ Video::Video(
 	})
 	: nullptr)
 , _sensitiveSpoiler(parent->isMediaSensitive() ? 1 : 0)
-, _pinned(options.pinned)
-, _story(options.story) {
+, _story(options.story)
+, _storyPinned(options.storyPinned)
+, _storyShowPinned(options.storyShowPinned)
+, _storyHidden(options.storyHidden)
+, _storyShowHidden(options.storyShowHidden) {
 	setDocumentLinks(_data);
 	if (_sensitiveSpoiler) {
 		_openl = HistoryView::MakeSensitiveMediaLink(
@@ -577,7 +595,11 @@ int32 Video::resizeGetHeight(int32 width) {
 	return _height;
 }
 
-void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const PaintContext *context) {
+void Video::paint(
+		Painter &p,
+		const QRect &clip,
+		TextSelection selection,
+		const PaintContext *context) {
 	ensureDataMediaCreated();
 
 	const auto selected = (selection == FullSelection);
@@ -614,15 +636,14 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			: thumbnail
 			? thumbnail->original()
 			: Images::Blur(blurred->original());
-		_pix = Ui::PixmapFromImage(
-			CropMediaFrame(std::move(img), _width, _height));
+		_pix = CropMediaFrame(std::move(img), _width, _height);
 		_pixBlurred = !(thumbnail || good);
 	}
 
 	if (_pix.isNull()) {
 		p.fillRect(0, 0, _width, _height, st::overviewPhotoBg);
 	} else {
-		p.drawPixmap(0, 0, _pix);
+		p.drawImage(0, 0, _pix);
 	}
 
 	if (_spoiler) {
@@ -638,11 +659,21 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		}
 	}
 
+	if (_storyHidden) {
+		delegate()->hiddenMark()->paint(
+			p,
+			_pix,
+			_hiddenBgCache,
+			QPoint(),
+			QSize(_width, _height),
+			_width);
+	}
+
 	if (selected) {
 		p.fillRect(QRect(0, 0, _width, _height), st::overviewPhotoSelectOverlay);
 	}
 
-	if (_pinned) {
+	if (_storyPinned) {
 		const auto &icon = selected
 			? st::storyPinnedIconSelected
 			: st::storyPinnedIcon;
@@ -723,7 +754,7 @@ void Video::clearSpoiler() {
 	if (_spoiler) {
 		_spoiler = nullptr;
 		_sensitiveSpoiler = false;
-		_pix = QPixmap();
+		_pix = QImage();
 		delegate()->repaintItem(this);
 	}
 }
@@ -736,9 +767,11 @@ void Video::maybeClearSensitiveSpoiler() {
 }
 
 void Video::itemDataChanged() {
-	const auto pinned = parent()->isPinned();
-	if (_pinned != pinned) {
-		_pinned = pinned;
+	const auto pinned = _storyShowPinned && parent()->isPinned();
+	const auto hidden = _storyShowHidden && !parent()->storyInProfile();
+	if (_storyPinned != pinned || _storyHidden != hidden) {
+		_storyPinned = pinned;
+		_storyHidden = hidden;
 		delegate()->repaintItem(this);
 	}
 }
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 5edf2a6ac4..74402d4985 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -190,8 +190,11 @@ struct Info : RuntimeComponent<Info, LayoutItemBase> {
 
 struct MediaOptions {
 	bool spoiler = false;
-	bool pinned = false;
 	bool story = false;
+	bool storyPinned = false;
+	bool storyShowPinned = false;
+	bool storyHidden = false;
+	bool storyShowHidden = false;
 };
 
 class Photo final : public ItemBase {
@@ -225,11 +228,15 @@ private:
 	mutable std::shared_ptr<Data::PhotoMedia> _dataMedia;
 	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
-	QPixmap _pix;
-	bool _goodLoaded = false;
-	bool _sensitiveSpoiler = false;
-	bool _pinned = false;
-	bool _story = false;
+	QImage _pix;
+	QImage _hiddenBgCache;
+	bool _goodLoaded : 1 = false;
+	bool _sensitiveSpoiler : 1 = false;
+	bool _story : 1 = false;
+	bool _storyPinned : 1 = false;
+	bool _storyShowPinned : 1 = false;
+	bool _storyHidden : 1 = false;
+	bool _storyShowHidden : 1 = false;
 
 	ClickHandlerPtr _link;
 
@@ -339,11 +346,15 @@ private:
 	QString _duration;
 	std::unique_ptr<Ui::SpoilerAnimation> _spoiler;
 
-	QPixmap _pix;
-	bool _pixBlurred = true;
-	bool _sensitiveSpoiler = false;
-	bool _pinned = false;
-	bool _story = false;
+	QImage _pix;
+	QImage _hiddenBgCache;
+	bool _pixBlurred : 1 = true;
+	bool _sensitiveSpoiler : 1 = false;
+	bool _story : 1 = false;
+	bool _storyPinned : 1 = false;
+	bool _storyShowPinned : 1 = false;
+	bool _storyHidden : 1 = false;
+	bool _storyShowHidden : 1 = false;
 
 };
 
diff --git a/Telegram/SourceFiles/overview/overview_layout_delegate.h b/Telegram/SourceFiles/overview/overview_layout_delegate.h
index e2fc7717d6..0b81b33583 100644
--- a/Telegram/SourceFiles/overview/overview_layout_delegate.h
+++ b/Telegram/SourceFiles/overview/overview_layout_delegate.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+class StickerPremiumMark;
+
 namespace Overview {
 namespace Layout {
 
@@ -19,6 +21,8 @@ public:
 	virtual void repaintItem(not_null<const ItemBase*> item) = 0;
 	virtual bool itemVisible(not_null<const ItemBase*> item) = 0;
 
+	[[nodiscard]] virtual not_null<StickerPremiumMark*> hiddenMark() = 0;
+
 	virtual void openPhoto(not_null<PhotoData*> photo, FullMsgId id) = 0;
 	virtual void openDocument(
 		not_null<DocumentData*> document,

From 3c89907403edd10a54a98cda2f856d8c72d277dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 12:30:07 +0400
Subject: [PATCH 084/341] Fix last-seen-when button position.

---
 Telegram/SourceFiles/info/profile/info_profile_cover.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index de47f7258b..691fcbbea4 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -1085,7 +1085,7 @@ void Cover::refreshStatusGeometry(int newWidth) {
 	auto statusWidth = newWidth - statusLeft - _st.rightSkip;
 	_status->resizeToNaturalWidth(statusWidth);
 	_status->moveToLeft(statusLeft, _st.statusTop, newWidth);
-	const auto left = _st.statusLeft + _status->textMaxWidth();
+	const auto left = statusLeft + _status->textMaxWidth();
 	_showLastSeen->moveToLeft(
 		left + _st.showLastSeenPosition.x(),
 		_st.showLastSeenPosition.y(),

From 985324ac127436a6afcb4f42ca24901534efb435 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 13:35:48 +0400
Subject: [PATCH 085/341] Support story album links.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../SourceFiles/core/local_url_handlers.cpp   |  6 ++
 Telegram/SourceFiles/data/data_stories.cpp    |  4 +-
 Telegram/SourceFiles/data/data_web_page.cpp   |  2 +
 Telegram/SourceFiles/data/data_web_page.h     |  1 +
 .../view/media/history_view_web_page.cpp      |  2 +
 .../stories/info_stories_inner_widget.cpp     | 63 ++++++++++++++-----
 .../info/stories/info_stories_inner_widget.h  |  1 +
 .../window/window_session_controller.cpp      |  8 +++
 .../window_session_controller_link_info.h     |  1 +
 10 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 0ab5fe48b4..6e240e929e 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -6255,6 +6255,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_emojipack" = "View emoji";
 "lng_view_button_collectible" = "View collectible";
 "lng_view_button_call" = "Join call";
+"lng_view_button_storyalbum" = "View Album";
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
@@ -6466,6 +6467,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_album_empty_text" = "Add some of your stories to this album.";
 "lng_stories_album_all" = "All Stories";
 "lng_stories_album_add_title" = "Add Stories";
+"lng_stories_album_share" = "Share Album";
 "lng_stories_album_edit" = "Edit Name";
 "lng_stories_album_limit_title" = "Limit Reached";
 "lng_stories_album_limit_text" = "Please remove one of the existing albums to add a new one.";
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 90ee230586..a8b81f39c9 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -633,6 +633,8 @@ bool ResolveUsernameOrPhone(
 	}
 	const auto storyParam = params.value(u"story"_q);
 	const auto storyId = storyParam.toInt();
+	const auto storyAlbumParam = params.value(u"album"_q);
+	const auto storyAlbumId = storyAlbumParam.toInt();
 	const auto appname = webChannelPreviewLink ? QString() : appnameParam;
 	const auto commentParam = params.value(u"comment"_q);
 	const auto commentId = commentParam.toInt();
@@ -659,6 +661,7 @@ bool ResolveUsernameOrPhone(
 		.phone = phone,
 		.messageId = post,
 		.storyId = storyId,
+		.storyAlbumId = storyAlbumId,
 		.videoTimestamp = (!videot.isEmpty()
 			? ParseVideoTimestamp(videot)
 			: std::optional<TimeId>()),
@@ -1827,6 +1830,7 @@ QString TryConvertUrlToLocal(QString url) {
 				"/[a-zA-Z0-9\\.\\_\\-]+/?(\\?|$)|"
 				"/\\d+/?(\\?|$)|"
 				"/s/\\d+/?(\\?|$)|"
+				"/a/\\d+/?(\\?|$)|"
 				"/\\d+/\\d+/?(\\?|$)"
 			")"_q, query, matchOptions)) {
 			const auto domain = usernameMatch->captured(1);
@@ -1849,6 +1853,8 @@ QString TryConvertUrlToLocal(QString url) {
 				added = u"&post="_q + postMatch->captured(1);
 			} else if (const auto storyMatch = regex_match(u"^/s/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&story="_q + storyMatch->captured(1);
+			} else if (const auto storyMatch = regex_match(u"^/a/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+				added = u"&album="_q + storyMatch->captured(1);
 			} else if (const auto appNameMatch = regex_match(u"^/([a-zA-Z0-9\\.\\_\\-]+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&appname="_q + appNameMatch->captured(1);
 			}
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index 308a9cfb43..c792aa0826 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1862,9 +1862,9 @@ void Stories::loadAlbums(not_null<PeerData*> peer, Albums &albums) {
 		peer->input,
 		MTP_long(albums.hash)
 	)).done([=](const MTPstories_Albums &result) {
+		auto &albums = _albums[peer->id];
+		albums.requestId = 0;
 		result.match([&](const MTPDstories_albums &data) {
-			auto &albums = _albums[peer->id];
-			albums.requestId = 0;
 			albums.hash = data.vhash().v;
 			auto parsed = std::vector<Data::StoryAlbum>();
 			const auto &list = data.valbums().v;
diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index 508a45d7c0..6293cf2616 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -173,6 +173,8 @@ WebPageType ParseWebPageType(
 		return WebPageType::Giftcode;
 	} else if (type == u"telegram_stickerset"_q) {
 		return WebPageType::StickerSet;
+	} else if (type == u"telegram_story_album"_q) {
+		return WebPageType::StoryAlbum;
 	} else if (hasIV) {
 		return WebPageType::ArticleWithIV;
 	} else {
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index e6c004e64e..4fd2d4ab73 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -49,6 +49,7 @@ enum class WebPageType : uint8 {
 	Theme,
 	Story,
 	StickerSet,
+	StoryAlbum,
 
 	Article,
 	ArticleWithIV,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index be8ef86733..5b64cb2d01 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -232,6 +232,8 @@ constexpr auto kSponsoredUserpicLines = 2;
 		? tr::lng_view_button_emojipack(tr::now)
 		: (type == WebPageType::StickerSet)
 		? tr::lng_view_button_stickerset(tr::now)
+		: (type == WebPageType::StoryAlbum)
+		? tr::lng_view_button_storyalbum(tr::now)
 		: QString());
 	if (page->iv) {
 		const auto manager = &page->owner().customEmojiManager();
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index c47a5968fb..43d38c2e02 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/stories/info_stories_inner_widget.h"
 
 #include "apiwrap.h"
+#include "boxes/share_box.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
@@ -210,6 +211,16 @@ InnerWidget::InnerWidget(
 
 	_albumId.value(
 	) | rpl::start_with_next([=](int albumId) {
+		if (_albumsTabs
+			&& (albumId == Data::kStoriesAlbumIdSaved
+				|| ranges::contains(
+					_albums,
+					albumId,
+					&Data::StoryAlbum::id))) {
+			_albumsTabs->setActiveTab((albumId == Data::kStoriesAlbumIdSaved)
+				? u"all"_q
+				: QString::number(albumId));
+		}
 		_controller->replaceKey(Key(Tag(_peer, albumId, _addingToAlbumId)));
 		reload();
 	}, lifetime());
@@ -699,16 +710,13 @@ void InnerWidget::refreshAlbumsTabs() {
 					StoryId(),
 					added));
 			} else {
-				_albumsTabs->setActiveTab(id);
 				_albumIdChanges.fire((id == u"all"_q) ? 0 : id.toInt());
 			}
 		}, _albumsTabs->lifetime());
 
 		_albumsTabs->contextMenuRequests(
 		) | rpl::start_with_next([=](const QString &id) {
-			if (id == u"add"_q
-				|| id == u"all"_q
-				|| !_peer->canEditStories()) {
+			if (id == u"add"_q || id == u"all"_q) {
 				return;
 			}
 			showMenuForAlbum(id.toInt());
@@ -723,24 +731,39 @@ void InnerWidget::refreshAlbumsTabs() {
 }
 
 void InnerWidget::showMenuForAlbum(int id) {
+	Expects(id > 0);
+
 	if (_menu || _addingToAlbumId) {
 		return;
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
 	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
-	addAction(tr::lng_stories_album_add_title(tr::now), [=] {
-		editAlbumStories(id);
-	}, &st::menuIconStoriesSave);
-	addAction(tr::lng_stories_album_edit(tr::now), [=] {
-		editAlbumName(id);
-	}, &st::menuIconEdit);
-	addAction({
-		.text = tr::lng_stories_album_delete(tr::now),
-		.handler = [=] { confirmDeleteAlbum(id); },
-		.icon = &st::menuIconDeleteAttention,
-		.isAttention = true,
-	});
-	_menu->popup(QCursor::pos());
+	if (_peer->canEditStories()) {
+		addAction(tr::lng_stories_album_add_title(tr::now), [=] {
+			editAlbumStories(id);
+		}, &st::menuIconStoriesSave);
+	}
+	if (const auto username = _peer->username(); !username.isEmpty()) {
+		addAction(tr::lng_stories_album_share(tr::now), [=] {
+			shareAlbumLink(username, id);
+		}, &st::menuIconShare);
+	}
+	if (_peer->canEditStories()) {
+		addAction(tr::lng_stories_album_edit(tr::now), [=] {
+			editAlbumName(id);
+		}, &st::menuIconEdit);
+		addAction({
+			.text = tr::lng_stories_album_delete(tr::now),
+			.handler = [=] { confirmDeleteAlbum(id); },
+			.icon = &st::menuIconDeleteAttention,
+			.isAttention = true,
+		});
+	}
+	if (_menu->empty()) {
+		_menu = nullptr;
+	} else {
+		_menu->popup(QCursor::pos());
+	}
 }
 
 rpl::producer<int> InnerWidget::albumIdChanges() const {
@@ -771,6 +794,12 @@ void InnerWidget::editAlbumStories(int id) {
 	_controller->uiShow()->show(std::move(box));
 }
 
+void InnerWidget::shareAlbumLink(const QString &username, int id) {
+	const auto url = _controller->session().createInternalLinkFull(
+		username + u"/a/"_q + QString::number(id));
+	FastShareLink(_controller->parentController(), url);
+}
+
 void InnerWidget::editAlbumName(int id) {
 	const auto done = [=](QString name) {
 		albumRenamed(id, name);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index b3657bf5ac..838c5044d9 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -69,6 +69,7 @@ public:
 
 	void reload();
 	void editAlbumStories(int id);
+	void shareAlbumLink(const QString &username, int id);
 	void editAlbumName(int id);
 	void confirmDeleteAlbum(int id);
 	void albumAdded(Data::StoryAlbum result);
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 76f4ed2732..53a155529e 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_filters_menu.h"
 #include "window/window_separate_id.h"
 #include "info/channel_statistics/earn/info_channel_earn_list.h"
+#include "info/stories/info_stories_widget.h"
 #include "info/info_memento.h"
 #include "info/info_controller.h"
 #include "inline_bots/bot_attach_web_view.h"
@@ -636,6 +637,11 @@ void SessionNavigation::showPeerByLinkResolved(
 		}
 	} else if (info.storyId) {
 		const auto storyId = FullStoryId{ peer->id, info.storyId };
+		const auto context = (info.storyAlbumId > 0)
+			? Data::StoriesContext{ Data::StoriesContextAlbum{
+				info.storyAlbumId,
+			} }
+			: Data::StoriesContext{ Data::StoriesContextSingle() };
 		peer->owner().stories().resolve(storyId, crl::guard(this, [=] {
 			if (peer->owner().stories().lookup(storyId)) {
 				parentController()->openPeerStory(
@@ -646,6 +652,8 @@ void SessionNavigation::showPeerByLinkResolved(
 				showToast(tr::lng_stories_link_invalid(tr::now));
 			}
 		}));
+	} else if (info.storyAlbumId > 0) {
+		showSection(Info::Stories::Make(peer, info.storyAlbumId));
 	} else if (bot && resolveType == ResolveType::BotApp) {
 		const auto itemId = info.clickFromMessageId;
 		const auto item = _session->data().message(itemId);
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index 6a5744a93e..7421aac748 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -40,6 +40,7 @@ struct PeerByLinkInfo {
 	QString chatLinkSlug;
 	MsgId messageId = ShowAtUnreadMsgId;
 	StoryId storyId = 0;
+	int storyAlbumId = 0;
 	std::optional<TimeId> videoTimestamp;
 	QString text;
 	RepliesByLinkInfo repliesInfo;

From aa499eab611afac05b06cd12dbdb70633470dc51 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 17:15:48 +0400
Subject: [PATCH 086/341] Allow settings gift price in TON.

---
 Telegram/Resources/langs/lang.strings         |  12 +-
 Telegram/SourceFiles/api/api_premium.cpp      |   5 +-
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 281 ++++++-----
 Telegram/SourceFiles/boxes/star_gift_box.h    |   2 +-
 .../SourceFiles/core/local_url_handlers.cpp   |  16 +
 Telegram/SourceFiles/data/data_star_gift.h    |   7 +-
 .../controls/history_view_suggest_options.cpp | 453 ++++++++++--------
 .../controls/history_view_suggest_options.h   |  25 +
 .../peer_gifts/info_peer_gifts_common.cpp     |  14 +-
 Telegram/SourceFiles/lang/lang_tag.cpp        |   4 +-
 Telegram/SourceFiles/lang/lang_tag.h          |   4 +-
 Telegram/SourceFiles/main/main_app_config.cpp |  26 +-
 Telegram/SourceFiles/main/main_app_config.h   |   9 +-
 .../settings/settings_credits_graphics.cpp    |   2 +-
 14 files changed, 539 insertions(+), 321 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6e240e929e..058a3b68fd 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3559,6 +3559,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_send_button_self" = "Buy a Gift for {cost}";
 "lng_gift_buy_resale_title" = "Buy {name}";
 "lng_gift_buy_resale_button" = "Buy for {cost}";
+"lng_gift_buy_resale_equals" = "Equals to {cost}";
+"lng_gift_buy_resale_only_ton" = "The seller only accepts TON as payment";
+"lng_gift_buy_resale_pay_stars" = "Pay in Stars";
+"lng_gift_buy_resale_pay_ton" = "Pay in TON";
 "lng_gift_buy_resale_confirm" = "Do you want to buy {name} for {price} and gift it to {user}?";
 "lng_gift_buy_resale_confirm_self" = "Do you want to buy {name} for {price}?";
 "lng_gift_buy_price_change_title" = "Price change!";
@@ -3704,12 +3708,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "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";
-"lng_gift_sell_placeholder" = "Enter price in Stars";
 "lng_gift_sell_about" = "You will receive {percent} of the selected amount.";
 "lng_gift_sell_amount#one" = "You will receive **{count}** Star.";
 "lng_gift_sell_amount#other" = "You will receive **{count}** Stars.";
 "lng_gift_sell_min_price#one" = "Minimum price is {count} Star.";
 "lng_gift_sell_min_price#other" = "Minimum price is {count} Stars.";
+"lng_gift_sell_only_ton" = "Only Accept TON";
+"lng_gift_sell_only_ton_about" = "If the buyer pays you in TON, there's no risk of refunds, unlike Stars payments.";
+"lng_gift_sell_amount_ton#one" = "You will receive **{count}** TON.";
+"lng_gift_sell_amount_ton#other" = "You will receive **{count}** TON.";
+"lng_gift_sell_min_price_ton#one" = "Minimum price is {count} TON.";
+"lng_gift_sell_min_price_ton#other" = "Minimum price is {count} TON.";
+"lng_gift_sell_title_ton" = "Price in TON";
 "lng_gift_sell_put" = "Put for Sale";
 "lng_gift_sell_update" = "Update the Price";
 "lng_gift_sell_toast" = "{name} is now for sale!";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 99834cc949..a707c624b7 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -895,9 +895,10 @@ std::optional<Data::StarGift> FromTL(
 					? peerFromMTP(*data.vowner_id())
 					: PeerId()),
 				.releasedBy = releasedBy,
-				.number = data.vnum().v,
+				.nanoTonForResale = FindTonForResale(data.vresell_amount()),
 				.starsForResale = FindStarsForResale(data.vresell_amount()),
-				.tonForResale = FindTonForResale(data.vresell_amount()),
+				.number = data.vnum().v,
+				.onlyAcceptTon = data.is_resale_ton_only(),
 				.model = *model,
 				.pattern = *pattern,
 			}),
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index dd45785c99..fd46e1813a 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -47,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "history/admin_log/history_admin_log_item.h"
+#include "history/view/controls/history_view_suggest_options.h"
 #include "history/view/media/history_view_media_generic.h"
 #include "history/view/media/history_view_unique_gift.h"
 #include "history/view/history_view_element.h"
@@ -71,6 +72,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/controls/emoji_button.h"
+#include "ui/controls/ton_common.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/path_shift_gradient.h"
 #include "ui/effects/premium_graphics.h"
@@ -233,6 +235,37 @@ struct SessionResalePrices {
 	crl::time lastReceived = 0;
 };
 
+[[nodiscard]] CreditsAmount StarsFromTon(
+		not_null<Main::Session*> session,
+		CreditsAmount ton) {
+	const auto appConfig = &session->appConfig();
+	const auto starsRate = appConfig->starsWithdrawRate() / 100.;
+	const auto tonRate = appConfig->currencyWithdrawRate();
+	if (!starsRate) {
+		return {};
+	}
+	const auto count = (ton.value() * tonRate) / starsRate;
+	return CreditsAmount(int(base::SafeRound(count)));
+}
+
+[[nodiscard]] CreditsAmount TonFromStars(
+		not_null<Main::Session*> session,
+		CreditsAmount stars) {
+	const auto appConfig = &session->appConfig();
+	const auto starsRate = appConfig->starsWithdrawRate() / 100.;
+	const auto tonRate = appConfig->currencyWithdrawRate();
+	if (!tonRate) {
+		return {};
+	}
+	const auto count = (stars.value() * starsRate) / tonRate;
+	const auto whole = int(std::floor(count));
+	const auto cents = int(base::SafeRound((count - whole) * 100));
+	return CreditsAmount(
+		whole,
+		cents * (Ui::kNanosInOne / 100),
+		CreditsType::Ton);
+}
+
 [[nodiscard]] not_null<SessionResalePrices*> ResalePrices(
 		not_null<Main::Session*> session) {
 	static auto result = base::flat_map<
@@ -4403,19 +4436,6 @@ void ShowUniqueGiftWearBox(
 			session,
 			st::creditsBoxButtonLabel,
 			&st::giftBox.button.textFg);
-
-		rpl::combine(
-			box->widthValue(),
-			button->widthValue()
-		) | rpl::start_with_next([=](int outer, int inner) {
-			const auto padding = st::giftBox.buttonPadding;
-			const auto wanted = outer - padding.left() - padding.right();
-			if (inner != wanted) {
-				button->resizeToWidth(wanted);
-				button->moveToLeft(padding.left(), padding.top());
-			}
-		}, box->lifetime());
-
 		AddUniqueCloseButton(box, {});
 	}));
 }
@@ -4473,12 +4493,14 @@ void UpdateGiftSellPrice(
 		std::shared_ptr<ChatHelpers::Show> show,
 		std::shared_ptr<Data::UniqueGift> unique,
 		Data::SavedStarGiftId savedId,
-		int price) {
+		CreditsAmount price) {
 	const auto was = unique->starsForResale;
 	const auto session = &show->session();
 	session->api().request(MTPpayments_UpdateStarGiftPrice(
 		Api::InputSavedStarGiftId(savedId, unique),
-		MTP_starsAmount(MTP_long(price), MTP_int(0))
+		(price
+			? StarsAmountToTL(price)
+			: MTP_starsAmount(MTP_long(0), MTP_int(0)))
 	)).done([=](const MTPUpdates &result) {
 		session->api().applyUpdates(result);
 		show->showToast((!price
@@ -4489,8 +4511,26 @@ void UpdateGiftSellPrice(
 				tr::now,
 				lt_name,
 				Data::UniqueGiftName(*unique)));
-
-		unique->starsForResale = price;
+		const auto setStars = [&](CreditsAmount amount) {
+			unique->starsForResale = amount.whole();
+		};
+		const auto setTon = [&](CreditsAmount amount) {
+			unique->nanoTonForResale = amount.whole() * Ui::kNanosInOne
+				+ amount.nano();
+		};
+		if (!price) {
+			setStars({});
+			setTon({});
+			unique->onlyAcceptTon = false;
+		} else if (price.ton()) {
+			setStars(StarsFromTon(session, price));
+			setTon(price);
+			unique->onlyAcceptTon = true;
+		} else {
+			setStars(price);
+			setTon(TonFromStars(session, price));
+			unique->onlyAcceptTon = false;
+		}
 		session->data().notifyGiftUpdate({
 			.id = savedId,
 			.slug = unique->slug,
@@ -4517,80 +4557,103 @@ void UniqueGiftSellBox(
 		Data::SavedStarGiftId savedId,
 		int price,
 		Settings::GiftWearBoxStyleOverride st) {
-	box->setTitle(tr::lng_gift_sell_title());
+	const auto session = &show->session();
+	const auto &appConfig = session->appConfig();
+	const auto starsMin = appConfig.giftResaleStarsMin();
+	const auto nanoTonMin = appConfig.giftResaleNanoTonMin();
+	const auto starsThousandths = appConfig.giftResaleStarsThousandths();
+	const auto nanoTonThousandths = appConfig.giftResaleNanoTonThousandths();
+
+	struct State {
+		rpl::variable<bool> onlyTon;
+		rpl::variable<CreditsAmount> price;
+		Fn<std::optional<CreditsAmount>()> computePrice;
+		rpl::event_stream<> errors;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->onlyTon = unique->onlyAcceptTon;
+	const auto priceNow = unique->onlyAcceptTon
+		? CreditsAmount(
+			unique->nanoTonForResale / Ui::kNanosInOne,
+			unique->nanoTonForResale % Ui::kNanosInOne,
+			CreditsType::Ton)
+		: CreditsAmount(unique->starsForResale);
+	state->price = priceNow
+		? priceNow
+		: price
+		? CreditsAmount(price)
+		: CreditsAmount(starsMin);
+
+	box->setTitle(rpl::conditional(
+		state->onlyTon.value(),
+		tr::lng_gift_sell_title_ton(),
+		tr::lng_gift_sell_title()));
 	box->setStyle(st.box ? *st.box : st::upgradeGiftBox);
 	box->setWidth(st::boxWideWidth);
 
 	box->addTopButton(st.close ? *st.close : st::boxTitleClose, [=] {
 		box->closeBox();
 	});
-	const auto priceNow = unique->starsForResale;
 	const auto name = Data::UniqueGiftName(*unique);
 	const auto slug = unique->slug;
 
-	const auto session = &show->session();
-	AddSubsectionTitle(
-		box->verticalLayout(),
-		tr::lng_gift_sell_placeholder(),
-		(st::boxRowPadding - QMargins(
-			st::defaultSubsectionTitlePadding.left(),
-			0,
-			st::defaultSubsectionTitlePadding.right(),
-			st::defaultSubsectionTitlePadding.bottom())));
-	const auto &appConfig = session->appConfig();
-	const auto limit = appConfig.giftResalePriceMax();
-	const auto minimal = appConfig.giftResalePriceMin();
-	const auto thousandths = appConfig.giftResaleReceiveThousandths();
-	const auto wrap = box->addRow(object_ptr<Ui::FixedHeightWidget>(
-		box,
-		st::editTagField.heightMin));
-	auto owned = object_ptr<Ui::NumberInput>(
-		wrap,
-		st::editTagField,
-		rpl::single(QString()),
-		QString::number(priceNow ? priceNow : price ? price : minimal),
-		limit);
-	const auto field = owned.data();
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
-		field->move(0, 0);
-		field->resize(width, field->height());
-		wrap->resize(width, field->height());
-	}, wrap->lifetime());
-	field->paintRequest() | rpl::start_with_next([=](QRect clip) {
-		auto p = QPainter(field);
-		st::paidStarIcon.paint(p, 0, st::paidStarIconTop, field->width());
-	}, field->lifetime());
-	field->selectAll();
-	box->setFocusCallback([=] {
-		field->setFocusFast();
+	const auto container = box->verticalLayout();
+	auto priceInput = HistoryView::AddStarsTonPriceInput(container, {
+		.session = session,
+		.showTon = state->onlyTon.value(),
+		.price = state->price.current(),
+		.starsMin = starsMin,
+		.starsMax = appConfig.giftResaleStarsMax(),
+		.nanoTonMin = nanoTonMin,
+		.nanoTonMax = appConfig.giftResaleNanoTonMax(),
 	});
+	state->price = std::move(priceInput.result);
+	state->computePrice = std::move(priceInput.computeResult);
+	box->setFocusCallback(std::move(priceInput.focusCallback));
 
-	const auto errors = box->lifetime().make_state<
-		rpl::event_stream<>
-	>();
 	auto goods = rpl::merge(
 		rpl::single(rpl::empty) | rpl::map_to(true),
-		base::qt_signal_producer(
-			field,
-			&Ui::NumberInput::changed
-		) | rpl::map_to(true),
-		errors->events() | rpl::map_to(false)
+		std::move(priceInput.updates) | rpl::map_to(true),
+		state->errors.events() | rpl::map_to(false)
 	) | rpl::start_spawning(box->lifetime());
 	auto text = rpl::duplicate(goods) | rpl::map([=](bool good) {
-		const auto value = field->getLastText().toInt();
-		const auto receive = (int64(value) * thousandths) / 1000;
-		return !good
-			? tr::lng_gift_sell_min_price(
-				tr::now,
-				lt_count,
-				minimal,
-				Ui::Text::RichLangValue)
-			: (value >= minimal)
-			? tr::lng_gift_sell_amount(
-				tr::now,
-				lt_count,
-				receive,
-				Ui::Text::RichLangValue)
+		const auto value = state->computePrice();
+		const auto amount = value ? value->value() : 0.;
+		const auto tonMin = nanoTonMin / float64(Ui::kNanosInOne);
+		const auto enough = value
+			&& (amount >= (value->ton() ? tonMin : starsMin));
+		const auto receive = !value
+			? 0
+			: value->ton()
+			? ((amount * nanoTonThousandths) / 1000.)
+			: ((int64(amount) * starsThousandths) / 1000);
+		const auto thousandths = state->onlyTon.current()
+			? nanoTonThousandths
+			: starsThousandths;
+		return (!good || !value)
+			? (state->onlyTon.current()
+				? tr::lng_gift_sell_min_price_ton(
+					tr::now,
+					lt_count,
+					nanoTonMin / float64(Ui::kNanosInOne),
+					Ui::Text::RichLangValue)
+				: tr::lng_gift_sell_min_price(
+					tr::now,
+					lt_count,
+					starsMin,
+					Ui::Text::RichLangValue))
+			: enough
+			? (value->ton()
+				? tr::lng_gift_sell_amount_ton(
+					tr::now,
+					lt_count,
+					receive,
+					Ui::Text::RichLangValue)
+				: tr::lng_gift_sell_amount(
+					tr::now,
+					lt_count,
+					receive,
+					Ui::Text::RichLangValue))
 			: tr::lng_gift_sell_about(
 				tr::now,
 				lt_percent,
@@ -4603,37 +4666,50 @@ void UniqueGiftSellBox(
 			box->verticalLayout()->resizeToWidth(box->width());
 		}),
 		st::boxLabel));
-	Ui::AddSkip(box->verticalLayout());
+
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+	box->addRow(object_ptr<Ui::PlainShadow>(box));
+	Ui::AddSkip(container);
+	Ui::AddSkip(container);
+
+	const auto onlyTon = box->addRow(
+		object_ptr<Ui::Checkbox>(
+			box,
+			tr::lng_gift_sell_only_ton(tr::now),
+			state->onlyTon.current(),
+			st::defaultCheckbox));
+	state->onlyTon = onlyTon->checkedValue();
+
+	Ui::AddSkip(container);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			container,
+			tr::lng_gift_sell_only_ton_about(Ui::Text::RichLangValue),
+			st::boxDividerLabel));
+	Ui::AddSkip(container);
 
 	rpl::duplicate(goods) | rpl::start_with_next([=](bool good) {
 		details->setTextColorOverride(
 			good ? st::windowSubTextFg->c : st::boxTextFgError->c);
 	}, details->lifetime());
 
-	QObject::connect(field, &NumberInput::submitted, [=] {
-		const auto count = field->getLastText().toInt();
-		if (count < minimal) {
-			field->showError();
-			errors->fire({});
+	const auto submit = [=] {
+		const auto value = state->computePrice();
+		if (!value) {
+			state->errors.fire({});
 			return;
 		}
 		box->closeBox();
-		UpdateGiftSellPrice(show, unique, savedId, count);
-	});
-	const auto button = box->addButton(priceNow
+		UpdateGiftSellPrice(show, unique, savedId, *value);
+	};
+	std::move(
+		priceInput.submits
+	) | rpl::start_with_next(submit, details->lifetime());
+	auto submitText = priceNow
 		? tr::lng_gift_sell_update()
-		: tr::lng_gift_sell_put(), [=] { field->submitted({}); });
-	rpl::combine(
-		box->widthValue(),
-		button->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
-		const auto padding = st::giftBox.buttonPadding;
-		const auto wanted = outer - padding.left() - padding.right();
-		if (inner != wanted) {
-			button->resizeToWidth(wanted);
-			button->moveToLeft(padding.left(), padding.top());
-		}
-	}, box->lifetime());
+		: tr::lng_gift_sell_put();
+	box->addButton(std::move(submitText), submit);
 }
 
 void ShowUniqueGiftSellBox(
@@ -4874,17 +4950,6 @@ void UpgradeBox(
 			st::creditsBoxButtonLabel,
 			&st::giftBox.button.textFg);
 	}
-	rpl::combine(
-		box->widthValue(),
-		button->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
-		const auto padding = st::giftBox.buttonPadding;
-		const auto wanted = outer - padding.left() - padding.right();
-		if (inner != wanted) {
-			button->resizeToWidth(wanted);
-			button->moveToLeft(padding.left(), padding.top());
-		}
-	}, box->lifetime());
 
 	AddUniqueCloseButton(box, {});
 }
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index b3df5b5b87..5b42d785d3 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -78,7 +78,7 @@ void UpdateGiftSellPrice(
 	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Data::UniqueGift> unique,
 	Data::SavedStarGiftId savedId,
-	int price);
+	CreditsAmount price);
 void ShowUniqueGiftSellBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Data::UniqueGift> unique,
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index a8b81f39c9..ec18169166 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -1533,6 +1533,18 @@ bool ResolveStarsSettings(
 	return true;
 }
 
+bool ResolveTonSettings(
+		Window::SessionController *controller,
+		const Match &match,
+		const QVariant &context) {
+	if (!controller) {
+		return false;
+	}
+	controller->showSettings(::Settings::CurrencyId());
+	controller->window().activate();
+	return true;
+}
+
 } // namespace
 
 const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
@@ -1637,6 +1649,10 @@ const std::vector<LocalUrlHandler> &LocalUrlHandlers() {
 			u"^stars/?(^\\?.*)?(#|$)"_q,
 			ResolveStarsSettings
 		},
+		{
+			u"^ton/?(^\\?.*)?(#|$)"_q,
+			ResolveTonSettings
+		},
 		{
 			u"^([^\\?]+)(\\?|#|$)"_q,
 			HandleUnknown
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index 750679b129..122f7b5b54 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -45,10 +45,11 @@ struct UniqueGift {
 	QString ownerName;
 	PeerId ownerId = 0;
 	PeerData *releasedBy = nullptr;
-	int number = 0;
-	int starsForTransfer = -1;
+	int64 nanoTonForResale = -1;
 	int starsForResale = -1;
-	int64 tonForResale = -1;
+	int starsForTransfer = -1;
+	int number = 0;
+	bool onlyAcceptTon = false;
 	TimeId exportAt = 0;
 	TimeId canTransferAt = 0;
 	TimeId canResellAt = 0;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index 0784d82782..debbfc8a2b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -48,6 +48,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_settings.h"
 
 namespace HistoryView {
+namespace {
+
+[[nodiscard]] rpl::producer<CreditsAmount> StarsPriceValue(
+		rpl::producer<CreditsAmount> full) {
+	return rpl::single(
+		CreditsAmount()
+	) | rpl::then(std::move(
+		full
+	) | rpl::filter([=](CreditsAmount amount) {
+		return amount.stars();
+	}));
+}
+
+[[nodiscard]] rpl::producer<CreditsAmount> TonPriceValue(
+		rpl::producer<CreditsAmount> full) {
+	return rpl::single(
+		CreditsAmount()
+	) | rpl::then(std::move(
+		full
+	) | rpl::filter([=](CreditsAmount amount) {
+		return amount.ton();
+	}));
+}
+
+} // namespace
 
 void ChooseSuggestTimeBox(
 		not_null<Ui::GenericBox*> box,
@@ -112,6 +137,214 @@ void AddApproximateUsd(
 	usd->widthValue() | rpl::start_with_next(move, usd->lifetime());
 }
 
+StarsTonPriceInput AddStarsTonPriceInput(
+		not_null<Ui::VerticalLayout*> container,
+		StarsTonPriceArgs &&args) {
+	struct State {
+		rpl::variable<bool> ton;
+		rpl::variable<CreditsAmount> price;
+		rpl::event_stream<> updates;
+		rpl::event_stream<> submits;
+	};
+	const auto state = container->lifetime().make_state<State>();
+	state->ton = std::move(args.showTon);
+	state->price = args.price;
+
+	const auto session = args.session;
+	const auto added = st::boxRowPadding - st::defaultSubsectionTitlePadding;
+	const auto manager = &session->data().customEmojiManager();
+	const auto makeIcon = [&](
+			not_null<QWidget*> parent,
+			TextWithEntities text) {
+		return Ui::CreateChild<Ui::FlatLabel>(
+			parent,
+			rpl::single(text),
+			st::defaultFlatLabel,
+			st::defaultPopupMenu,
+			Core::TextContext({ .session = session }));
+	};
+
+	const auto starsWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto starsInner = starsWrap->entity();
+
+	Ui::AddSubsectionTitle(
+		starsInner,
+		tr::lng_suggest_options_stars_price(),
+		QMargins(
+			added.left(),
+			0,
+			added.right(),
+			-st::defaultSubsectionTitlePadding.bottom()));
+
+	const auto starsFieldWrap = starsInner->add(
+		object_ptr<Ui::FixedHeightWidget>(
+			starsInner,
+			st::editTagField.heightMin),
+		st::boxRowPadding);
+	auto ownedStarsField = object_ptr<Ui::NumberInput>(
+		starsFieldWrap,
+		st::editTagField,
+		rpl::single(u"0"_q),
+		((args.price && args.price.stars())
+			? QString::number(args.price.whole())
+			: QString()),
+		args.starsMax);
+	const auto starsField = ownedStarsField.data();
+	const auto starsIcon = makeIcon(starsField, manager->creditsEmoji());
+
+	starsFieldWrap->widthValue() | rpl::start_with_next([=](int width) {
+		starsIcon->move(st::starsFieldIconPosition);
+		starsField->move(0, 0);
+		starsField->resize(width, starsField->height());
+		starsFieldWrap->resize(width, starsField->height());
+	}, starsFieldWrap->lifetime());
+
+	AddApproximateUsd(
+		starsField,
+		session,
+		StarsPriceValue(state->price.value()));
+
+	Ui::AddSkip(starsInner);
+	Ui::AddSkip(starsInner);
+	if (args.starsAbout) {
+		Ui::AddDividerText(starsInner, std::move(args.starsAbout));
+	}
+
+	const auto tonWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	const auto tonInner = tonWrap->entity();
+
+	Ui::AddSubsectionTitle(
+		tonInner,
+		tr::lng_suggest_options_ton_price(),
+		QMargins(
+			added.left(),
+			0,
+			added.right(),
+			-st::defaultSubsectionTitlePadding.bottom()));
+
+	const auto tonFieldWrap = tonInner->add(
+		object_ptr<Ui::FixedHeightWidget>(
+			tonInner,
+			st::editTagField.heightMin),
+		st::boxRowPadding);
+	auto ownedTonField = object_ptr<Ui::InputField>::fromRaw(
+		Ui::CreateTonAmountInput(
+			tonFieldWrap,
+			rpl::single('0' + Ui::TonAmountSeparator() + '0'),
+			((args.price && args.price.ton())
+				? (args.price.whole() * Ui::kNanosInOne + args.price.nano())
+				: 0)));
+	const auto tonField = ownedTonField.data();
+	const auto tonIcon = makeIcon(tonField, Ui::Text::SingleCustomEmoji(
+		manager->registerInternalEmoji(
+			Ui::Earn::IconCurrencyColored(
+				st::tonFieldIconSize,
+				st::currencyFg->c),
+			st::channelEarnCurrencyCommonMargins,
+			false)));
+
+	tonFieldWrap->widthValue() | rpl::start_with_next([=](int width) {
+		tonIcon->move(st::tonFieldIconPosition);
+		tonField->move(0, 0);
+		tonField->resize(width, tonField->height());
+		tonFieldWrap->resize(width, tonField->height());
+	}, tonFieldWrap->lifetime());
+
+	AddApproximateUsd(
+		tonField,
+		session,
+		TonPriceValue(state->price.value()));
+
+	Ui::AddSkip(tonInner);
+	Ui::AddSkip(tonInner);
+	if (args.tonAbout) {
+		Ui::AddDividerText(tonInner, std::move(args.tonAbout));
+	}
+
+	tonWrap->toggleOn(state->ton.value(), anim::type::instant);
+	starsWrap->toggleOn(
+		state->ton.value() | rpl::map(!rpl::mappers::_1),
+		anim::type::instant);
+
+	auto computeResult = [=]() -> std::optional<CreditsAmount> {
+		auto nanos = int64();
+		const auto ton = uint32(state->ton.current() ? 1 : 0);
+		if (ton) {
+			const auto text = tonField->getLastText();
+			const auto now = Ui::ParseTonAmountString(text);
+			if (now
+				&& *now
+				&& ((*now < args.nanoTonMin) || (*now > args.nanoTonMax))) {
+				tonField->showError();
+				return {};
+			}
+			nanos = now.value_or(0);
+		} else {
+			const auto now = starsField->getLastText().toLongLong();
+			if (now && (now < args.starsMin || now > args.starsMax)) {
+				starsField->showError();
+				return {};
+			}
+			nanos = now * Ui::kNanosInOne;
+		}
+		return CreditsAmount(
+			nanos / Ui::kNanosInOne,
+			nanos % Ui::kNanosInOne,
+			ton ? CreditsType::Ton : CreditsType::Stars);
+	};
+
+	const auto updatePrice = [=] {
+		if (auto result = computeResult()) {
+			state->price = *result;
+		}
+		state->updates.fire({});
+	};
+	QObject::connect(
+		starsField,
+		&Ui::NumberInput::changed,
+		starsField,
+		updatePrice);
+	tonField->changes(
+	) | rpl::start_with_next(updatePrice, tonField->lifetime());
+
+	state->ton.changes(
+	) | rpl::start_with_next(updatePrice, container->lifetime());
+
+	QObject::connect(
+		starsField,
+		&Ui::NumberInput::submitted,
+		container,
+		[=] { state->submits.fire({}); });
+	tonField->submits(
+	) | rpl::to_empty | rpl::start_to_stream(
+		state->submits,
+		tonField->lifetime());
+
+	auto focusCallback = [=] {
+		if (state->ton.current()) {
+			tonField->selectAll();
+			tonField->setFocusFast();
+		} else {
+			starsField->selectAll();
+			starsField->setFocusFast();
+		}
+	};
+
+	return {
+		.focusCallback = std::move(focusCallback),
+		.computeResult = std::move(computeResult),
+		.submits = state->submits.events(),
+		.updates = state->updates.events(),
+		.result = state->price.value(),
+	};
+}
+
 void ChooseSuggestPriceBox(
 		not_null<Ui::GenericBox*> box,
 		SuggestPriceBoxArgs &&args) {
@@ -135,42 +368,17 @@ void ChooseSuggestPriceBox(
 	state->date = args.value.date;
 	state->ton = (args.value.ton != 0);
 	state->price = args.value.price();
-	const auto updatePrice = [=] {
-		if (const auto price = state->computePrice()) {
-			state->price = *price;
-		}
-	};
-
-	const auto starsPrice = [=] {
-		return rpl::single(
-			CreditsAmount()
-		) | rpl::then(state->price.value(
-		) | rpl::filter([=](CreditsAmount amount) {
-			return amount.stars();
-		}));
-	};
-	const auto tonPrice = [=] {
-		return rpl::single(
-			CreditsAmount(0, 0, CreditsType::Ton)
-		) | rpl::then(state->price.value(
-		) | rpl::filter([=](CreditsAmount amount) {
-			return amount.ton();
-		}));
-	};
 
 	const auto peer = args.peer;
 	const auto admin = peer->amMonoforumAdmin();
 	const auto broadcast = peer->monoforumBroadcast();
 	const auto usePeer = broadcast ? broadcast : peer;
 	const auto session = &peer->session();
+	const auto &appConfig = session->appConfig();
 	if (!admin) {
 		session->credits().load();
 		session->credits().tonLoad();
 	}
-	const auto starsMin = session->appConfig().suggestedPostStarsMin();
-	const auto starsMax = session->appConfig().suggestedPostStarsMax();
-	const auto nanoTonMin = session->appConfig().suggestedPostNanoTonMin();
-	const auto nanoTonMax = session->appConfig().suggestedPostNanoTonMax();
 	const auto container = box->verticalLayout();
 
 	box->setStyle(st::suggestPriceBox);
@@ -267,7 +475,6 @@ void ChooseSuggestPriceBox(
 					state->buttons[i].active = true;
 					state->buttons[1 - i].active = false;
 					buttons->update();
-					updatePrice();
 					break;
 				}
 			}
@@ -299,64 +506,11 @@ void ChooseSuggestPriceBox(
 
 	Ui::AddSkip(container);
 
-	const auto added = st::boxRowPadding - st::defaultSubsectionTitlePadding;
-	const auto manager = &session->data().customEmojiManager();
-	const auto makeIcon = [&](
-			not_null<QWidget*> parent,
-			TextWithEntities text) {
-		return Ui::CreateChild<Ui::FlatLabel>(
-			parent,
-			rpl::single(text),
-			st::defaultFlatLabel,
-			st::defaultPopupMenu,
-			Core::TextContext({ .session = session }));
+	const auto computePrice = [session](CreditsAmount amount) {
+		return PriceAfterCommission(session, amount).value();
 	};
-
-	const auto starsWrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto starsInner = starsWrap->entity();
-
-	Ui::AddSubsectionTitle(
-		starsInner,
-		tr::lng_suggest_options_stars_price(),
-		QMargins(added.left(), 0, added.right(), -st::defaultSubsectionTitlePadding.bottom()));
-
-	const auto starsFieldWrap = starsInner->add(
-		object_ptr<Ui::FixedHeightWidget>(
-			box,
-			st::editTagField.heightMin),
-		st::boxRowPadding);
-	auto ownedStarsField = object_ptr<Ui::NumberInput>(
-		starsFieldWrap,
-		st::editTagField,
-		rpl::single(u"0"_q),
-		((args.value.exists && args.value.priceWhole && !args.value.ton)
-			? QString::number(args.value.priceWhole)
-			: QString()),
-		starsMax);
-	const auto starsField = ownedStarsField.data();
-	const auto starsIcon = makeIcon(starsField, manager->creditsEmoji());
-
-	QObject::connect(starsField, &Ui::NumberInput::changed, updatePrice);
-
-	starsFieldWrap->widthValue() | rpl::start_with_next([=](int width) {
-		starsIcon->move(st::starsFieldIconPosition);
-		starsField->move(0, 0);
-		starsField->resize(width, starsField->height());
-		starsFieldWrap->resize(width, starsField->height());
-	}, starsFieldWrap->lifetime());
-
-	AddApproximateUsd(starsField, session, starsPrice());
-
-	Ui::AddSkip(starsInner);
-	Ui::AddSkip(starsInner);
-	const auto computePrice = [peer = args.peer](CreditsAmount amount) {
-		return PriceAfterCommission(&peer->session(), amount).value();
-	};
-	const auto formatCommission = [peer = args.peer](CreditsAmount amount) {
-		return FormatAfterCommissionPercent(&peer->session(), amount);
+	const auto formatCommission = [session](CreditsAmount amount) {
+		return FormatAfterCommissionPercent(session, amount);
 	};
 	const auto youGet = [=](rpl::producer<CreditsAmount> price, bool stars) {
 		return (stars
@@ -367,109 +521,34 @@ void ChooseSuggestPriceBox(
 				lt_percent,
 				rpl::duplicate(price) | rpl::map(formatCommission));
 	};
-	Ui::AddDividerText(starsInner, admin
+	auto starsAbout = admin
 		? rpl::combine(
-			youGet(starsPrice(), true),
+			youGet(StarsPriceValue(state->price.value()), true),
 			tr::lng_suggest_options_stars_warning(Ui::Text::RichLangValue)
 		) | rpl::map([=](const QString &t1, const TextWithEntities &t2) {
 			return TextWithEntities{ t1 }.append("\n\n").append(t2);
 		})
-		: tr::lng_suggest_options_stars_price_about(Ui::Text::WithEntities));
-
-	const auto tonWrap = container->add(
-		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
-			container,
-			object_ptr<Ui::VerticalLayout>(container)));
-	const auto tonInner = tonWrap->entity();
-
-	Ui::AddSubsectionTitle(
-		tonInner,
-		tr::lng_suggest_options_ton_price(),
-		QMargins(added.left(), 0, added.right(), -st::defaultSubsectionTitlePadding.bottom()));
-
-	const auto tonFieldWrap = tonInner->add(
-		object_ptr<Ui::FixedHeightWidget>(
-			box,
-			st::editTagField.heightMin),
-		st::boxRowPadding);
-	auto ownedTonField = object_ptr<Ui::InputField>::fromRaw(
-		Ui::CreateTonAmountInput(
-			tonFieldWrap,
-			rpl::single('0' + Ui::TonAmountSeparator() + '0'),
-			((args.value.price() && args.value.ton)
-				? (int64(args.value.priceWhole) * Ui::kNanosInOne
-					+ int64(args.value.priceNano))
-				: 0)));
-	const auto tonField = ownedTonField.data();
-	const auto tonIcon = makeIcon(tonField, Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			Ui::Earn::IconCurrencyColored(
-				st::tonFieldIconSize,
-				st::currencyFg->c),
-			st::channelEarnCurrencyCommonMargins,
-			false)));
-
-	tonField->changes(
-	) | rpl::start_with_next(updatePrice, tonField->lifetime());
-
-	tonFieldWrap->widthValue() | rpl::start_with_next([=](int width) {
-		tonIcon->move(st::tonFieldIconPosition);
-		tonField->move(0, 0);
-		tonField->resize(width, tonField->height());
-		tonFieldWrap->resize(width, tonField->height());
-	}, tonFieldWrap->lifetime());
-
-	AddApproximateUsd(tonField, session, tonPrice());
-
-	Ui::AddSkip(tonInner);
-	Ui::AddSkip(tonInner);
-	Ui::AddDividerText(
-		tonInner,
-		(admin
-			? youGet(tonPrice(), false)
-			: tr::lng_suggest_options_ton_price_about()));
-
-	tonWrap->toggleOn(state->ton.value(), anim::type::instant);
-	starsWrap->toggleOn(
-		state->ton.value() | rpl::map(!rpl::mappers::_1),
-		anim::type::instant);
-
-	state->computePrice = [=]() -> std::optional<CreditsAmount> {
-		auto nanos = int64();
-		const auto ton = uint32(state->ton.current() ? 1 : 0);
-		if (ton) {
-			const auto text = tonField->getLastText();
-			const auto now = Ui::ParseTonAmountString(text);
-			if (now
-				&& *now
-				&& ((*now < nanoTonMin) || (*now > nanoTonMax))) {
-				tonField->showError();
-				return {};
-			}
-			nanos = now.value_or(0);
-		} else {
-			const auto now = starsField->getLastText().toLongLong();
-			if (now && (now < starsMin || now > starsMax)) {
-				starsField->showError();
-				return {};
-			}
-			nanos = now * Ui::kNanosInOne;
-		}
-		return CreditsAmount(
-			nanos / Ui::kNanosInOne,
-			nanos % Ui::kNanosInOne,
-			ton ? CreditsType::Ton : CreditsType::Stars);
-	};
-
-	box->setFocusCallback([=] {
-		if (state->ton.current()) {
-			tonField->selectAll();
-			tonField->setFocusFast();
-		} else {
-			starsField->selectAll();
-			starsField->setFocusFast();
-		}
+		: tr::lng_suggest_options_stars_price_about(Ui::Text::WithEntities);
+	auto tonAbout = admin
+		? youGet(
+			TonPriceValue(state->price.value()),
+			false
+		) | Ui::Text::ToWithEntities()
+		: tr::lng_suggest_options_ton_price_about(Ui::Text::WithEntities);
+	auto priceInput = AddStarsTonPriceInput(container, {
+		.session = session,
+		.showTon = state->ton.value(),
+		.price = args.value.price(),
+		.starsMin = appConfig.suggestedPostStarsMin(),
+		.starsMax = appConfig.suggestedPostStarsMax(),
+		.nanoTonMin = appConfig.suggestedPostNanoTonMin(),
+		.nanoTonMax = appConfig.suggestedPostNanoTonMax(),
+		.starsAbout = std::move(starsAbout),
+		.tonAbout = std::move(tonAbout),
 	});
+	state->price = std::move(priceInput.result);
+	state->computePrice = std::move(priceInput.computeResult);
+	box->setFocusCallback(std::move(priceInput.focusCallback));
 
 	Ui::AddSkip(container);
 
@@ -568,17 +647,13 @@ void ChooseSuggestPriceBox(
 		}
 	}, box->lifetime());
 
-	QObject::connect(
-		starsField,
-		&Ui::NumberInput::submitted,
-		box,
-		state->save);
-	tonField->submits(
-	) | rpl::start_with_next(state->save, tonField->lifetime());
+	std::move(
+		priceInput.submits
+	) | rpl::start_with_next(state->save, box->lifetime());
 
 	const auto button = box->addButton(rpl::single(QString()), state->save);
 	const auto coloredTonIcon = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
+		session->data().customEmojiManager().registerInternalEmoji(
 			Ui::Earn::IconCurrencyColored(
 				st::tonFieldIconSize,
 				st::currencyFg->c),
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h
index 7b270393fd..65eb6c7f9f 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.h
@@ -15,6 +15,7 @@ class Show;
 
 namespace Ui {
 class GenericBox;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Main {
@@ -43,6 +44,30 @@ void ChooseSuggestTimeBox(
 	not_null<Ui::GenericBox*> box,
 	SuggestTimeBoxArgs &&args);
 
+struct StarsTonPriceInput {
+	Fn<void()> focusCallback;
+	Fn<std::optional<CreditsAmount>()> computeResult;
+	rpl::producer<> submits;
+	rpl::producer<> updates;
+	rpl::producer<CreditsAmount> result;
+};
+
+struct StarsTonPriceArgs {
+	not_null<Main::Session*> session;
+	rpl::producer<bool> showTon;
+	CreditsAmount price;
+	int starsMin = 0;
+	int starsMax = 0;
+	int64 nanoTonMin = 0;
+	int64 nanoTonMax = 0;
+	rpl::producer<TextWithEntities> starsAbout;
+	rpl::producer<TextWithEntities> tonAbout;
+};
+
+[[nodiscard]] StarsTonPriceInput AddStarsTonPriceInput(
+	not_null<Ui::VerticalLayout*> container,
+	StarsTonPriceArgs &&args);
+
 struct SuggestPriceBoxArgs {
 	not_null<PeerData*> peer;
 	bool updating = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index e25463f3f9..ef72cb7770 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -96,6 +96,13 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	_mediaLifetime.destroy();
 	unsubscribe();
 
+	const auto format = [=](int64 number) {
+		const auto onlyK = (number < 100'000'000);
+		return (number >= 1'000'000)
+			? Lang::FormatCountToShort(number, onlyK).string
+			: Lang::FormatCountDecimal(number);
+	};
+
 	_descriptor = descriptor;
 	_resalePrice = resalePrice;
 	const auto resale = (_resalePrice > 0);
@@ -156,19 +163,18 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 				? (unique
 					? _delegate->monostar()
 					: _delegate->star()).append(' ').append(
-						Lang::FormatCountDecimal(unique
+						format(unique
 							? unique->starsForResale
 							: data.info.starsResellMin)
 					).append(data.info.resellCount > 1 ? "+" : "")
 				: (_small && unique && unique->starsForResale)
 				? _delegate->monostar().append(' ').append(
-					Lang::FormatCountDecimal(unique->starsForResale))
+					format(unique->starsForResale))
 				: unique
 				? tr::lng_gift_transfer_button(
 					tr::now,
 					Ui::Text::WithEntities)
-				: _delegate->star().append(
-					' ' + Lang::FormatCountDecimal(data.info.stars))),
+				: _delegate->star().append(' ' + format(data.info.stars))),
 			kMarkupTextOptions,
 			_delegate->textContext());
 		if (!_stars) {
diff --git a/Telegram/SourceFiles/lang/lang_tag.cpp b/Telegram/SourceFiles/lang/lang_tag.cpp
index 5136a67a5e..d05d91709c 100644
--- a/Telegram/SourceFiles/lang/lang_tag.cpp
+++ b/Telegram/SourceFiles/lang/lang_tag.cpp
@@ -917,7 +917,7 @@ int NonZeroPartToInt(QString value) {
 		: (value.isEmpty() ? 0 : value.toInt());
 }
 
-ShortenedCount FormatCountToShort(int64 number) {
+ShortenedCount FormatCountToShort(int64 number, bool onlyK) {
 	auto result = ShortenedCount{ number };
 	const auto abs = std::abs(number);
 	const auto shorten = [&](int64 divider, char multiplier) {
@@ -934,7 +934,7 @@ ShortenedCount FormatCountToShort(int64 number) {
 		result.number = rounded * divider;
 		result.shortened = true;
 	};
-	if (abs >= 1'000'000) {
+	if (!onlyK && abs >= 1'000'000) {
 		shorten(1'000'000, 'M');
 	} else if (abs >= 10'000) {
 		shorten(1'000, 'K');
diff --git a/Telegram/SourceFiles/lang/lang_tag.h b/Telegram/SourceFiles/lang/lang_tag.h
index 3d0f231186..74088d9602 100644
--- a/Telegram/SourceFiles/lang/lang_tag.h
+++ b/Telegram/SourceFiles/lang/lang_tag.h
@@ -26,7 +26,9 @@ struct ShortenedCount {
 	QString string;
 	bool shortened = false;
 };
-[[nodiscard]] ShortenedCount FormatCountToShort(int64 number);
+[[nodiscard]] ShortenedCount FormatCountToShort(
+	int64 number,
+	bool onlyK = false);
 [[nodiscard]] QString FormatCountDecimal(int64 number);
 [[nodiscard]] QString FormatExactCountDecimal(float64 number);
 [[nodiscard]] ShortenedCount FormatCreditsAmountToShort(
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index 21c6d1eb0c..5f9183797e 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -148,18 +148,32 @@ bool AppConfig::confcallPrioritizeVP8() const {
 	return get<bool>(u"confcall_use_vp8"_q, false);
 }
 
-int AppConfig::giftResalePriceMax() const {
-	return get<int>(u"stars_stargift_resale_amount_max"_q, 35000);
-}
-
-int AppConfig::giftResalePriceMin() const {
+int AppConfig::giftResaleStarsMin() const {
 	return get<int>(u"stars_stargift_resale_amount_min"_q, 125);
 }
 
-int AppConfig::giftResaleReceiveThousandths() const {
+int AppConfig::giftResaleStarsMax() const {
+	return get<int>(u"stars_stargift_resale_amount_max"_q, 35000);
+}
+
+int AppConfig::giftResaleStarsThousandths() const {
 	return get<int>(u"stars_stargift_resale_commission_permille"_q, 800);
 }
 
+int64 AppConfig::giftResaleNanoTonMin() const {
+	return get<int64>(u"ton_stargift_resale_amount_min"_q, 250'000'000LL);
+}
+
+int64 AppConfig::giftResaleNanoTonMax() const {
+	return get<int64>(
+		u"ton_stargift_resale_amount_max"_q,
+		1'000'000'000'000'000LL);
+}
+
+int AppConfig::giftResaleNanoTonThousandths() const {
+	return get<int>(u"ton_stargift_resale_commission_permille"_q, 800);
+}
+
 int AppConfig::pollOptionsLimit() const {
 	return get<int>(u"poll_answers_max"_q, 12);
 }
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index 78bde39f9c..11f6b66f34 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -85,9 +85,12 @@ public:
 	[[nodiscard]] int confcallSizeLimit() const;
 	[[nodiscard]] bool confcallPrioritizeVP8() const;
 
-	[[nodiscard]] int giftResalePriceMax() const;
-	[[nodiscard]] int giftResalePriceMin() const;
-	[[nodiscard]] int giftResaleReceiveThousandths() const;
+	[[nodiscard]] int giftResaleStarsMin() const;
+	[[nodiscard]] int giftResaleStarsMax() const;
+	[[nodiscard]] int giftResaleStarsThousandths() const;
+	[[nodiscard]] int64 giftResaleNanoTonMin() const;
+	[[nodiscard]] int64 giftResaleNanoTonMax() const;
+	[[nodiscard]] int giftResaleNanoTonThousandths() const;
 
 	[[nodiscard]] int pollOptionsLimit() const;
 	[[nodiscard]] int todoListItemsLimit() const;
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index decb554373..a3d63a2ac0 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1081,7 +1081,7 @@ void FillUniqueGiftMenu(
 				const auto name = UniqueGiftName(*unique);
 				const auto confirm = [=](Fn<void()> close) {
 					close();
-					Ui::UpdateGiftSellPrice(show, unique, savedId, 0);
+					Ui::UpdateGiftSellPrice(show, unique, savedId, {});
 				};
 				show->show(Ui::MakeConfirmBox({
 					.text = tr::lng_gift_sell_unlist_sure(),

From 23c0fcada6016c9cfabe15d2dd3b46373905ab15 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 18:15:34 +0400
Subject: [PATCH 087/341] Show TON icon in resale gifts.

---
 .../data/stickers/data_custom_emoji.cpp       | 63 ++++++++++++++-----
 .../data/stickers/data_custom_emoji.h         |  6 ++
 .../controls/history_view_suggest_options.cpp |  3 +
 .../history/view/history_view_reply.cpp       |  2 +
 .../earn/info_channel_earn_list.cpp           |  6 ++
 .../peer_gifts/info_peer_gifts_common.cpp     | 27 +++++++-
 .../info/peer_gifts/info_peer_gifts_common.h  |  3 +
 .../info/profile/info_profile_actions.cpp     |  1 +
 .../settings/settings_credits_graphics.cpp    |  4 ++
 Telegram/SourceFiles/ui/effects/credits.style |  2 +
 .../window/window_session_controller.cpp      |  1 +
 11 files changed, 100 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index ff551f225e..6de1cbd29d 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lottie/lottie_frame_generator.h"
 #include "ffmpeg/ffmpeg_frame_generator.h"
 #include "chat_helpers/stickers_lottie.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "storage/file_download.h" // kMaxFileInMemory
 #include "ui/chat/chats_filter_tag.h"
 #include "ui/effects/premium_stars_colored.h"
@@ -1020,30 +1021,61 @@ uint64 CustomEmojiManager::coloredSetId() const {
 	return _coloredSetId;
 }
 
+TextWithEntities CustomEmojiManager::tonEmoji(QMargins padding) {
+	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
+		u"builtin:ton_emoji"_q,
+		Ui::Earn::IconCurrencyColored(
+			st::tonIconEmojiSize,
+			st::currencyFg->c),
+		st::tonIconEmojiPadding + padding,
+		false));
+}
+
+TextWithEntities CustomEmojiManager::monoTonEmoji(QMargins padding) {
+	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
+		u"builtin:monoton_emoji"_q,
+		Ui::Earn::IconCurrencyColored(
+			st::tonIconEmojiSize,
+			st::currencyFg->c),
+		st::tonIconEmojiPadding + padding,
+		true));
+}
+
 TextWithEntities CustomEmojiManager::creditsEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(
-		registerInternalEmoji(
-			Ui::GenerateStars(st::normalFont->height, 1),
-			padding,
-			false));
+	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
+		u"builtin:credits_emoji"_q,
+		Ui::GenerateStars(st::normalFont->height, 1),
+		padding,
+		false));
 }
 
 TextWithEntities CustomEmojiManager::ministarEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(
-		registerInternalEmoji(
-			Ui::GenerateStars(st::giftBoxByStarsStyle.font->height, 1),
-			padding,
-			false));
+	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
+		u"builtin:ministar_emoji"_q,
+		Ui::GenerateStars(st::giftBoxByStarsStyle.font->height, 1),
+		padding,
+		false));
 }
 
 QString CustomEmojiManager::registerInternalEmoji(
+		const QString &key,
 		QImage emoji,
 		QMargins padding,
 		bool textColor) {
+	auto i = _imageEmoji.find(key);
+	if (i == end(_imageEmoji)) {
+		i = _imageEmoji.emplace(
+			key,
+			registerImageEmoji(std::move(emoji), textColor)).first;
+	}
+	return i->second + InternalPadding(padding);
+}
+
+QString CustomEmojiManager::registerImageEmoji(
+		QImage emoji,
+		bool textColor) {
 	_internalEmoji.push_back({ std::move(emoji), textColor });
-	return InternalPrefix()
-		+ QString::number(_internalEmoji.size() - 1)
-		+ InternalPadding(padding);
+	return InternalPrefix() + QString::number(_internalEmoji.size() - 1);
 }
 
 QString CustomEmojiManager::registerInternalEmoji(
@@ -1063,10 +1095,7 @@ QString CustomEmojiManager::registerInternalEmoji(
 	icon.paint(p, 0, 0, icon.width());
 	p.end();
 
-	const auto result = registerInternalEmoji(
-		std::move(image),
-		QMargins{},
-		textColor);
+	const auto result = registerImageEmoji(std::move(image), textColor);
 	_iconEmoji.emplace(&icon, result);
 	return result + InternalPadding(padding);
 }
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index b01f7561e4..c7f4f0719b 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -84,6 +84,7 @@ public:
 	[[nodiscard]] Session &owner() const;
 
 	[[nodiscard]] QString registerInternalEmoji(
+		const QString &key,
 		QImage emoji,
 		QMargins padding = {},
 		bool textColor = true);
@@ -99,6 +100,8 @@ public:
 
 	[[nodiscard]] uint64 coloredSetId() const;
 
+	[[nodiscard]] TextWithEntities tonEmoji(QMargins padding = {});
+	[[nodiscard]] TextWithEntities monoTonEmoji(QMargins padding = {});
 	[[nodiscard]] TextWithEntities creditsEmoji(QMargins padding = {});
 	[[nodiscard]] TextWithEntities ministarEmoji(QMargins padding = {});
 
@@ -127,6 +130,7 @@ private:
 		DocumentId documentId,
 		SizeTag tag,
 		int sizeOverride = 0);
+	[[nodiscard]] QString registerImageEmoji(QImage emoji, bool textColor);
 
 	void request();
 	void requestFinished();
@@ -193,6 +197,8 @@ private:
 	std::vector<InternalEmojiData> _internalEmoji;
 	base::flat_map<not_null<const style::icon*>, QString> _iconEmoji;
 
+	base::flat_map<QString, QString> _imageEmoji;
+
 #if 0 // inject-to-on_main
 	crl::time _repaintsLastAdded = 0;
 	rpl::lifetime _repaintsLifetime;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index debbfc8a2b..174e10aa6a 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -243,6 +243,7 @@ StarsTonPriceInput AddStarsTonPriceInput(
 	const auto tonField = ownedTonField.data();
 	const auto tonIcon = makeIcon(tonField, Ui::Text::SingleCustomEmoji(
 		manager->registerInternalEmoji(
+			u"ton_price_field_emoji"_q,
 			Ui::Earn::IconCurrencyColored(
 				st::tonFieldIconSize,
 				st::currencyFg->c),
@@ -654,6 +655,7 @@ void ChooseSuggestPriceBox(
 	const auto button = box->addButton(rpl::single(QString()), state->save);
 	const auto coloredTonIcon = Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
+			u"ton_price_suggest_save"_q,
 			Ui::Earn::IconCurrencyColored(
 				st::tonFieldIconSize,
 				st::currencyFg->c),
@@ -904,6 +906,7 @@ TextWithEntities SuggestOptions::composeText() const {
 	const auto amount = _values.price().ton()
 		? Ui::Text::SingleCustomEmoji(
 			manager->registerInternalEmoji(
+				u"ton_price_preview_emoji"_q,
 				Ui::Earn::IconCurrencyColored(
 					st::suggestBarTonIconSize,
 					st::currencyFg->c),
diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 5d18086720..9635477b5c 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -107,6 +107,7 @@ constexpr auto kNonExpandedLinesLimit = 5;
 		not_null<Main::Session*> session) {
 	return Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
+			u"task_done_reply_preview"_q,
 			MakeTaskDoneImage(),
 			QMargins(0, st::lineWidth, st::lineWidth, 0)));
 }
@@ -114,6 +115,7 @@ constexpr auto kNonExpandedLinesLimit = 5;
 [[nodiscard]] TextWithEntities TaskIcon(not_null<Main::Session*> session) {
 	return Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
+			u"task_not_done_reply_preview"_q,
 			MakeTaskImage(),
 			QMargins(0, st::lineWidth, st::lineWidth, 0)));
 }
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 4e6ef02378..7127310941 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -420,6 +420,11 @@ void InnerWidget::fill() {
 		const auto &st = label->st();
 		auto icon = Ui::Text::SingleCustomEmoji(
 			session->data().customEmojiManager().registerInternalEmoji(
+				(!isIn
+					? u"stats_row_ton_some"_q
+					: (*isIn)
+					? u"stats_row_ton_in"_q
+					: u"stats_row_ton_out"_q),
 				Ui::Earn::IconCurrencyColored(
 					st.style.font,
 					!isIn
@@ -443,6 +448,7 @@ void InnerWidget::fill() {
 
 	const auto bigCurrencyIcon = Ui::Text::SingleCustomEmoji(
 		session->data().customEmojiManager().registerInternalEmoji(
+			u"stats_row_ton_big"_q,
 			Ui::Earn::IconCurrencyColored(
 				st::boxTitle.style.font,
 				st::currencyFg->c),
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index ef72cb7770..db369e328c 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "history/view/media/history_view_sticker_player.h"
 #include "lang/lang_keys.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "main/main_session.h"
 #include "settings/settings_credits_graphics.h"
 #include "ui/layers/generic_box.h"
@@ -614,7 +615,8 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 
 	v::match(_descriptor, [](const GiftTypePremium &) {
 	}, [&](const GiftTypeStars &data) {
-		if (unique && data.pinned) {
+		if (!unique) {
+		} else if (data.pinned) {
 			auto hq = PainterHighQualityEnabler(p);
 			const auto &icon = st::giftBoxPinIcon;
 			const auto skip = st::giftBoxUserpicSkip;
@@ -626,6 +628,25 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 				QSize(icon.width() + 2 * add, icon.height() + 2 * add));
 			p.drawEllipse(rect);
 			icon.paintInCenter(p, rect);
+		} else if (unique->nanoTonForResale && unique->onlyAcceptTon) {
+			if (_tonIcon.isNull()) {
+				_tonIcon = Ui::Earn::IconCurrencyColored(
+					st::tonIconEmojiSize,
+					QColor(255, 255, 255));
+			}
+			const auto size = _tonIcon.size() / _tonIcon.devicePixelRatio();
+			const auto skip = st::giftBoxUserpicSkip;
+			const auto add = (st::giftBoxUserpicSize - size.width()) / 2;
+			p.setPen(Qt::NoPen);
+			p.setBrush(unique->backdrop.patternColor);
+			const auto rect = QRect(
+				QPoint(extend.left() + skip, extend.top() + skip),
+				QSize(size.width() + 2 * add, size.height() + 2 * add));
+			p.drawEllipse(rect);
+			p.drawImage(
+				extend.left() + skip + add,
+				extend.top() + skip + add,
+				_tonIcon);
 		}
 	});
 
@@ -720,6 +741,10 @@ TextWithEntities Delegate::monostar() {
 	return Ui::Text::IconEmoji(&st::starIconEmoji);
 }
 
+TextWithEntities Delegate::monoton() {
+	return _session->data().customEmojiManager().monoTonEmoji();
+}
+
 TextWithEntities Delegate::ministar() {
 	const auto owner = &_session->data();
 	const auto top = st::giftBoxByStarsStarTop;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index e6f15b759e..07b5620675 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -115,6 +115,7 @@ class GiftButtonDelegate {
 public:
 	[[nodiscard]] virtual TextWithEntities star() = 0;
 	[[nodiscard]] virtual TextWithEntities monostar() = 0;
+	[[nodiscard]] virtual TextWithEntities monoton() = 0;
 	[[nodiscard]] virtual TextWithEntities ministar() = 0;
 	[[nodiscard]] virtual Ui::Text::MarkedContext textContext() = 0;
 	[[nodiscard]] virtual QSize buttonSize() = 0;
@@ -173,6 +174,7 @@ private:
 	Ui::Text::String _byStars;
 	std::shared_ptr<Ui::DynamicImage> _userpic;
 	QImage _uniqueBackgroundCache;
+	QImage _tonIcon;
 	std::unique_ptr<Ui::Text::CustomEmoji> _uniquePatternEmoji;
 	base::flat_map<float64, QImage> _uniquePatternCache;
 	std::optional<Ui::Premium::ColoredMiniStars> _stars;
@@ -199,6 +201,7 @@ public:
 
 	TextWithEntities star() override;
 	TextWithEntities monostar() override;
+	TextWithEntities monoton() override;
 	TextWithEntities ministar() override;
 	Ui::Text::MarkedContext textContext() override;
 	QSize buttonSize() override;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 26823bb83b..405dceb0f7 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -908,6 +908,7 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
 	const auto icon = Ui::Text::SingleCustomEmoji(
 		user->owner().customEmojiManager().registerInternalEmoji(
+			u"profile_ton_section_icon"_q,
 			Ui::Earn::IconCurrencyColored(
 				st.rightLabel.style.font,
 				st.rightLabel.textFg->c),
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index a3d63a2ac0..aa78c3bde4 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -722,6 +722,7 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 		if (value.ton()) {
 			text.append(Ui::Text::SingleCustomEmoji(
 				manager->registerInternalEmoji(
+					u"balance_amount_ton_icon"_q,
 					Ui::Earn::IconCurrencyColored(
 						st::tonFieldIconSize,
 						st::currencyFg->c),
@@ -1529,6 +1530,9 @@ void GenericCreditsEntryBox(
 				.append(
 					Ui::Text::SingleCustomEmoji(
 						owner->customEmojiManager().registerInternalEmoji(
+							(e.in
+								? u"stats_transaction_ton_in"_q
+								: u"stats_transaction_ton_out"_q),
 							Ui::Earn::IconCurrencyColored(
 								st::tonFieldIconSize,
 								(e.in
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 8deb501b66..096a869a09 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -81,6 +81,8 @@ starIconEmojiSmall: IconEmoji {
 	icon: icon{{ "chat/mini_stars", creditsBg1 }};
 	padding: margins(0px, 4px, 0px, 0px);
 }
+tonIconEmojiSize: 18px;
+tonIconEmojiPadding: margins(0px, 2px, 0px, 0px);
 
 creditsHistoryEntryTypeAds: icon {{ "folders/folders_channels", premiumButtonFg }};
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 53a155529e..2c4f9e0ae8 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -182,6 +182,7 @@ private:
 	return {
 		.tonEmoji = Ui::Text::SingleCustomEmoji(
 			session->data().customEmojiManager().registerInternalEmoji(
+				u"collectible_ton_icon"_q,
 				Ui::Earn::IconCurrencyColored(
 					st::collectibleInfo.style.font,
 					st::collectibleInfo.textFg->c),

From 2a50d0856b5e53183dfc88d5cdad479233c9f7eb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 29 Jul 2025 19:23:44 +0400
Subject: [PATCH 088/341] Show correct price in resale box.

---
 .../Resources/icons/payments/ton_emoji.svg    | 15 ++++++
 .../SourceFiles/boxes/send_credits_box.cpp    | 43 ++++++++++++++++
 Telegram/SourceFiles/boxes/send_credits_box.h |  8 +++
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 20 ++++----
 Telegram/SourceFiles/boxes/star_gift_box.h    |  2 +-
 .../SourceFiles/boxes/transfer_gift_box.cpp   | 40 ++++++++++-----
 .../data/stickers/data_custom_emoji.cpp       | 20 --------
 .../data/stickers/data_custom_emoji.h         |  2 -
 .../peer_gifts/info_peer_gifts_common.cpp     |  2 +-
 .../settings/settings_credits_graphics.cpp    | 49 +++++++++++++++----
 Telegram/SourceFiles/ui/effects/credits.style | 15 +++++-
 11 files changed, 162 insertions(+), 54 deletions(-)
 create mode 100644 Telegram/Resources/icons/payments/ton_emoji.svg

diff --git a/Telegram/Resources/icons/payments/ton_emoji.svg b/Telegram/Resources/icons/payments/ton_emoji.svg
new file mode 100644
index 0000000000..7de741c10e
--- /dev/null
+++ b/Telegram/Resources/icons/payments/ton_emoji.svg
@@ -0,0 +1,15 @@
+<svg width="72px" height="72px" viewBox="0 0 72 72">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(9.000000, 14.000000)" stroke-width="7.2" stroke="rgb(255,255,255)">
+            <path d="M2.96014341,0 L50.9898193,0 C51.9732032,-7.06402744e-15
+ 52.7703933,0.797190129 52.7703933,1.78057399 C52.7703933,2.08038611
+ 52.6946886,2.3753442 52.5502994,2.63809702 L29.699977,44.2200383
+ C28.7527832,45.9436969 26.5876295,46.5731461 24.8639708,45.6259523
+ C24.2556953,45.2916896 23.7583564,44.7869606 23.4331014,44.1738213
+ L1.38718565,2.61498853 C0.926351231,1.74626794 1.25700829,0.668450654
+ 2.12572888,0.20761623 C2.38272962,0.0712838007 2.6692209,4.97530809e-16
+ 2.96014341,0 Z"></path>
+            <line x1="27" y1="44.4532875" x2="27" y2="0"></line>
+        </g>
+    </g>
+</svg>
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 8f355b1aa6..c35951da35 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -567,6 +567,49 @@ not_null<FlatLabel*> SetButtonMarkedLabel(
 	}), st, textFg);
 }
 
+void SetButtonTwoLabels(
+		not_null<Ui::RpWidget*> button,
+		rpl::producer<TextWithEntities> title,
+		rpl::producer<TextWithEntities> subtitle,
+		const style::FlatLabel &st,
+		const style::FlatLabel &subst,
+		const style::color *textFg) {
+	const auto buttonTitle = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		std::move(title),
+		st);
+	const auto buttonSubtitle = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		std::move(subtitle),
+		subst);
+	buttonSubtitle->setOpacity(0.6);
+	if (textFg) {
+		buttonTitle->setTextColorOverride((*textFg)->c);
+		buttonSubtitle->setTextColorOverride((*textFg)->c);
+		style::PaletteChanged() | rpl::start_with_next([=] {
+			buttonTitle->setTextColorOverride((*textFg)->c);
+			buttonSubtitle->setTextColorOverride((*textFg)->c);
+		}, buttonTitle->lifetime());
+	}
+	rpl::combine(
+		button->sizeValue(),
+		buttonTitle->sizeValue(),
+		buttonSubtitle->sizeValue()
+	) | rpl::start_with_next([=](QSize outer, QSize title, QSize subtitle) {
+		const auto two = title.height() + subtitle.height();
+		const auto titleTop = (outer.height() - two) / 2;
+		const auto subtitleTop = titleTop + title.height();
+		buttonTitle->moveToLeft(
+			(outer.width() - title.width()) / 2,
+			titleTop);
+		buttonSubtitle->moveToLeft(
+			(outer.width() - subtitle.width()) / 2,
+			subtitleTop);
+	}, buttonTitle->lifetime());
+	buttonTitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	buttonSubtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+}
+
 void SendStarsForm(
 		not_null<Main::Session*> session,
 		std::shared_ptr<Payments::CreditsFormData> data,
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index 6dcaef1f8e..f8227846b9 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -52,6 +52,14 @@ not_null<FlatLabel*> SetButtonMarkedLabel(
 	const style::FlatLabel &st,
 	const style::color *textFg = nullptr);
 
+void SetButtonTwoLabels(
+	not_null<Ui::RpWidget*> button,
+	rpl::producer<TextWithEntities> title,
+	rpl::producer<TextWithEntities> subtitle,
+	const style::FlatLabel &st,
+	const style::FlatLabel &subst,
+	const style::color *textFg = nullptr);
+
 void SendStarsForm(
 	not_null<Main::Session*> session,
 	std::shared_ptr<Payments::CreditsFormData> data,
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index fd46e1813a..89a9b9cbed 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -3907,7 +3907,7 @@ void ShowStarGiftBox(
 void SetupResalePriceButton(
 		not_null<Ui::RpWidget*> parent,
 		rpl::producer<QColor> background,
-		rpl::producer<int> price,
+		rpl::producer<CreditsAmount> price,
 		Fn<void()> click) {
 	const auto resale = Ui::CreateChild<
 		Ui::FadeWrapScaled<Ui::AbstractButton>
@@ -3928,11 +3928,13 @@ void SetupResalePriceButton(
 	}, button->lifetime());
 	text->setTextColorOverride(QColor(255, 255, 255, 255));
 
-	std::move(price) | rpl::start_with_next([=](int value) {
-		if (value > 0) {
-			text->setMarkedText(
-				Ui::Text::IconEmoji(&st::starIconEmoji).append(
-					Lang::FormatCountDecimal(value)));
+	std::move(price) | rpl::start_with_next([=](CreditsAmount value) {
+		if (value) {
+			text->setMarkedText(value.ton()
+				? Ui::Text::IconEmoji(&st::tonIconEmoji).append(
+					Lang::FormatCreditsAmountDecimal(value))
+				: Ui::Text::IconEmoji(&st::starIconEmoji).append(
+					Lang::FormatCountDecimal(value.whole())));
 			resale->toggle(true, anim::type::normal);
 		} else {
 			resale->toggle(false, anim::type::normal);
@@ -3968,7 +3970,7 @@ void AddUniqueGiftCover(
 		not_null<VerticalLayout*> container,
 		rpl::producer<Data::UniqueGift> data,
 		rpl::producer<QString> subtitleOverride,
-		rpl::producer<int> resalePrice,
+		rpl::producer<CreditsAmount> resalePrice,
 		Fn<void()> resaleClick) {
 	const auto cover = container->add(object_ptr<RpWidget>(container));
 
@@ -4494,7 +4496,7 @@ void UpdateGiftSellPrice(
 		std::shared_ptr<Data::UniqueGift> unique,
 		Data::SavedStarGiftId savedId,
 		CreditsAmount price) {
-	const auto was = unique->starsForResale;
+	const auto wasOnResale = (unique->starsForResale > 0);
 	const auto session = &show->session();
 	session->api().request(MTPpayments_UpdateStarGiftPrice(
 		Api::InputSavedStarGiftId(savedId, unique),
@@ -4505,7 +4507,7 @@ void UpdateGiftSellPrice(
 		session->api().applyUpdates(result);
 		show->showToast((!price
 			? tr::lng_gift_sell_removed
-			: (was > 0)
+			: wasOnResale
 			? tr::lng_gift_sell_updated
 			: tr::lng_gift_sell_toast)(
 				tr::now,
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index 5b42d785d3..f9daf942fa 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -59,7 +59,7 @@ void AddUniqueGiftCover(
 	not_null<VerticalLayout*> container,
 	rpl::producer<Data::UniqueGift> data,
 	rpl::producer<QString> subtitleOverride = nullptr,
-	rpl::producer<int> resalePrice = nullptr,
+	rpl::producer<CreditsAmount> resalePrice = nullptr,
 	Fn<void()> resaleClick = nullptr);
 void AddWearGiftCover(
 	not_null<VerticalLayout*> container,
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index 54b77db265..389f919d49 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "payments/payments_checkout_process.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/ton_common.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -503,7 +504,7 @@ void BuyResaleGift(
 
 	using Flag = MTPDinputInvoiceStarGiftResale::Flag;
 	const auto invoice = MTP_inputInvoiceStarGiftResale(
-		MTP_flags(Flag()),
+		MTP_flags(gift->onlyAcceptTon ? Flag::f_ton : Flag()),
 		MTP_string(gift->slug),
 		to->input);
 
@@ -662,8 +663,15 @@ void ShowBuyResaleGiftBox(
 
 		auto transfer = tr::lng_gift_buy_resale_button(
 			lt_cost,
-			rpl::single(
-				Ui::Text::IconEmoji(&st::starIconEmoji).append(
+			rpl::single(gift->onlyAcceptTon
+				? Ui::Text::IconEmoji(
+					&st::tonIconEmoji
+				).append(
+					Lang::FormatCreditsAmountDecimal(CreditsAmount(
+						gift->nanoTonForResale / Ui::kNanosInOne,
+						gift->nanoTonForResale % Ui::kNanosInOne,
+						CreditsType::Ton)))
+				: Ui::Text::IconEmoji(&st::starIconEmoji).append(
 					Lang::FormatCountDecimal(gift->starsForResale))),
 			Ui::Text::WithEntities);
 
@@ -698,19 +706,29 @@ void ShowBuyResaleGiftBox(
 					lt_name,
 					rpl::single(Ui::Text::Bold(UniqueGiftName(*gift))),
 					lt_price,
-					tr::lng_action_gift_for_stars(
-						lt_count,
-						rpl::single(gift->starsForResale * 1.),
-						Ui::Text::Bold),
+					(gift->onlyAcceptTon
+						? tr::lng_action_gift_for_ton(
+							lt_count,
+							rpl::single(gift->nanoTonForResale / 1'000'000'000.),
+							Ui::Text::Bold)
+						: tr::lng_action_gift_for_stars(
+							lt_count_decimal,
+							rpl::single(gift->starsForResale * 1.),
+							Ui::Text::Bold)),
 					Ui::Text::WithEntities)
 				: tr::lng_gift_buy_resale_confirm(
 					lt_name,
 					rpl::single(Ui::Text::Bold(UniqueGiftName(*gift))),
 					lt_price,
-					tr::lng_action_gift_for_stars(
-						lt_count,
-						rpl::single(gift->starsForResale * 1.),
-						Ui::Text::Bold),
+					(gift->onlyAcceptTon
+						? tr::lng_action_gift_for_ton(
+							lt_count,
+							rpl::single(gift->nanoTonForResale / 1'000'000'000.),
+							Ui::Text::Bold)
+						: tr::lng_action_gift_for_stars(
+							lt_count_decimal,
+							rpl::single(gift->starsForResale * 1.),
+							Ui::Text::Bold)),
 					lt_user,
 					rpl::single(Ui::Text::Bold(to->shortName())),
 					Ui::Text::WithEntities),
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 6de1cbd29d..925005e0c4 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -1021,26 +1021,6 @@ uint64 CustomEmojiManager::coloredSetId() const {
 	return _coloredSetId;
 }
 
-TextWithEntities CustomEmojiManager::tonEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
-		u"builtin:ton_emoji"_q,
-		Ui::Earn::IconCurrencyColored(
-			st::tonIconEmojiSize,
-			st::currencyFg->c),
-		st::tonIconEmojiPadding + padding,
-		false));
-}
-
-TextWithEntities CustomEmojiManager::monoTonEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
-		u"builtin:monoton_emoji"_q,
-		Ui::Earn::IconCurrencyColored(
-			st::tonIconEmojiSize,
-			st::currencyFg->c),
-		st::tonIconEmojiPadding + padding,
-		true));
-}
-
 TextWithEntities CustomEmojiManager::creditsEmoji(QMargins padding) {
 	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
 		u"builtin:credits_emoji"_q,
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index c7f4f0719b..a279a5999c 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -100,8 +100,6 @@ public:
 
 	[[nodiscard]] uint64 coloredSetId() const;
 
-	[[nodiscard]] TextWithEntities tonEmoji(QMargins padding = {});
-	[[nodiscard]] TextWithEntities monoTonEmoji(QMargins padding = {});
 	[[nodiscard]] TextWithEntities creditsEmoji(QMargins padding = {});
 	[[nodiscard]] TextWithEntities ministarEmoji(QMargins padding = {});
 
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index db369e328c..8f31abcb1d 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -742,7 +742,7 @@ TextWithEntities Delegate::monostar() {
 }
 
 TextWithEntities Delegate::monoton() {
-	return _session->data().customEmojiManager().monoTonEmoji();
+	return Ui::Text::IconEmoji(&st::tonIconEmoji);
 }
 
 TextWithEntities Delegate::ministar() {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index aa78c3bde4..0b13184819 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/gift_premium_box.h"
 #include "boxes/share_box.h"
+#include "boxes/send_credits_box.h" // SetButtonTwoLabels
 #include "boxes/star_gift_box.h"
 #include "boxes/transfer_gift_box.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
@@ -62,6 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/ton_common.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
@@ -1067,8 +1069,8 @@ void FillUniqueGiftMenu(
 		}
 	}
 	if (CanResellGift(&show->session(), e)) {
-		const auto resalePrice = unique->starsForResale;
-		const auto editPrice = (resalePrice > 0
+		const auto inResale = (unique->starsForResale > 0);
+		const auto editPrice = (inResale
 			? tr::lng_gift_transfer_update
 			: tr::lng_gift_transfer_sell)(tr::now);
 		menu->addAction(editPrice, [=] {
@@ -1077,7 +1079,7 @@ void FillUniqueGiftMenu(
 				: GiftWearBoxStyleOverride();
 			ShowUniqueGiftSellBox(show, unique, savedId, style);
 		}, st.resell ? st.resell : &st::menuIconTagSell);
-		if (resalePrice > 0) {
+		if (inResale) {
 			menu->addAction(tr::lng_gift_transfer_unlist(tr::now), [=] {
 				const auto name = UniqueGiftName(*unique);
 				const auto confirm = [=](Fn<void()> close) {
@@ -1240,7 +1242,12 @@ void GenericCreditsEntryBox(
 			return (update.action == Data::GiftUpdate::Action::ResaleChange)
 				&& (update.slug == slug);
 		}) | rpl::to_empty) | rpl::map([unique = e.uniqueGift] {
-			return unique->starsForResale;
+			return unique->onlyAcceptTon
+				? CreditsAmount(
+					unique->nanoTonForResale / Ui::kNanosInOne,
+					unique->nanoTonForResale % Ui::kNanosInOne,
+					CreditsType::Ton)
+				: CreditsAmount(unique->starsForResale);
 		});
 		auto change = [=] {
 			const auto style = st.giftWearBox
@@ -2100,12 +2107,36 @@ void GenericCreditsEntryBox(
 		}
 	});
 	if (canBuyResold) {
-		button->setText(tr::lng_gift_buy_resale_button(
-			lt_cost,
-			rpl::single(
-				Ui::Text::IconEmoji(&st::starIconEmoji).append(
+		if (uniqueGift->onlyAcceptTon) {
+			button->setText(rpl::single(QString()));
+			Ui::SetButtonTwoLabels(
+				button,
+				tr::lng_gift_buy_resale_button(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::tonIconEmoji
+					).append(
+						Lang::FormatCreditsAmountDecimal(CreditsAmount(
+							uniqueGift->nanoTonForResale / Ui::kNanosInOne,
+							uniqueGift->nanoTonForResale % Ui::kNanosInOne,
+							CreditsType::Ton)))),
+					Ui::Text::WithEntities),
+				tr::lng_gift_buy_resale_equals(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmojiSmall
+					).append(Lang::FormatCountDecimal(
+						uniqueGift->starsForResale))),
+					Ui::Text::WithEntities),
+				st::giftResaleButtonTitle,
+				st::giftResaleButtonSubtitle);
+		} else {
+			button->setText(tr::lng_gift_buy_resale_button(
+				lt_cost,
+				rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji).append(
 					Lang::FormatCountDecimal(uniqueGift->starsForResale))),
-			Ui::Text::WithEntities));
+				Ui::Text::WithEntities));
+		}
 	}
 	{
 		using namespace Info::Statistics;
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 096a869a09..6a0483ceea 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -81,8 +81,11 @@ starIconEmojiSmall: IconEmoji {
 	icon: icon{{ "chat/mini_stars", creditsBg1 }};
 	padding: margins(0px, 4px, 0px, 0px);
 }
+tonIconEmoji: IconEmoji {
+	icon: icon{{ "payments/ton_emoji-18x18", currencyFg }};
+	padding: margins(0px, 1px, 0px, 0px);
+}
 tonIconEmojiSize: 18px;
-tonIconEmojiPadding: margins(0px, 2px, 0px, 0px);
 
 creditsHistoryEntryTypeAds: icon {{ "folders/folders_channels", premiumButtonFg }};
 
@@ -320,3 +323,13 @@ creditsHistoryRowRightMinorTop: 18px;
 creditsHistoryRowRightStyle: TextStyle(defaultTextStyle) {
 	font: font(fsize);
 }
+giftResaleButtonTitle: FlatLabel(defaultFlatLabel) {
+	style: semiboldTextStyle;
+	textFg: activeButtonFg;
+}
+giftResaleButtonSubtitle: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px semibold);
+	}
+	textFg: activeButtonFg;
+}

From 3b1c7dc5e18abe4b47ae295a905b1d55dd52b6ed Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Jul 2025 10:03:09 +0400
Subject: [PATCH 089/341] Allow buying gifts resold for TONs.

---
 Telegram/CMakeLists.txt                       |  1 +
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 93 +++++++++++++++----
 Telegram/SourceFiles/boxes/star_gift_box.h    | 10 +-
 .../SourceFiles/boxes/transfer_gift_box.cpp   | 57 ++++++++----
 Telegram/SourceFiles/data/data_star_gift.cpp  | 56 +++++++++++
 Telegram/SourceFiles/data/data_star_gift.h    | 12 ++-
 .../settings/settings_credits_graphics.cpp    | 20 +---
 7 files changed, 187 insertions(+), 62 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_star_gift.cpp

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 6d431ad44d..7875e86e2e 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -646,6 +646,7 @@ PRIVATE
     data/data_shared_media.h
     data/data_sparse_ids.cpp
     data/data_sparse_ids.h
+    data/data_star_gift.cpp
     data/data_star_gift.h
     data/data_statistics.h
     data/data_stories.cpp
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 89a9b9cbed..d28b5d536d 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2094,6 +2094,8 @@ void SendStarsFormRequest(
 		)).done([=](const MTPpayments_PaymentResult &result) {
 			result.match([&](const MTPDpayments_paymentResult &data) {
 				session->api().applyUpdates(data.vupdates());
+				session->credits().tonLoad(true);
+				session->credits().load(true);
 				done(Payments::CheckoutResult::Paid, &data.vupdates());
 			}, [&](const MTPDpayments_paymentVerificationNeeded &data) {
 				done(Payments::CheckoutResult::Failed, nullptr);
@@ -2808,11 +2810,17 @@ void SendGiftBox(
 					using Payments::CheckoutResult;
 					const auto formReady = [=](
 							uint64 formId,
-							uint64 price,
+							CreditsAmount price,
 							std::optional<CheckoutResult> failure) {
 						state->transferRequested = nullptr;
-						if (!failure || *failure == CheckoutResult::Free) {
-							unique->starsForTransfer = price;
+						if (!failure && !price.stars()) {
+							LOG(("API Error: "
+								"Bad transfer invoice currenct."));
+						} else if (!failure
+							|| *failure == CheckoutResult::Free) {
+							unique->starsForTransfer = failure
+								? 0
+								: price.whole();
 							ShowTransferToBox(
 								window,
 								peer,
@@ -2823,7 +2831,7 @@ void SendGiftBox(
 							done();
 						}
 					};
-					RequestStarsForm(
+					RequestOurForm(
 						window->uiShow(),
 						MTP_inputInvoiceStarGiftTransfer(
 							Api::InputSavedStarGiftId(savedId, unique),
@@ -4574,12 +4582,7 @@ void UniqueGiftSellBox(
 	};
 	const auto state = box->lifetime().make_state<State>();
 	state->onlyTon = unique->onlyAcceptTon;
-	const auto priceNow = unique->onlyAcceptTon
-		? CreditsAmount(
-			unique->nanoTonForResale / Ui::kNanosInOne,
-			unique->nanoTonForResale % Ui::kNanosInOne,
-			CreditsType::Ton)
-		: CreditsAmount(unique->starsForResale);
+	const auto priceNow = Data::UniqueGiftResaleAsked(*unique);
 	state->price = priceNow
 		? priceNow
 		: price
@@ -5171,15 +5174,49 @@ void SubmitStarsForm(
 		ready);
 }
 
-void RequestStarsForm(
+void SubmitTonForm(
+		std::shared_ptr<Main::SessionShow> show,
+		MTPInputInvoice invoice,
+		uint64 formId,
+		CreditsAmount ton,
+		Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done) {
+	const auto ready = [=] {
+		SendStarsFormRequest(
+			show,
+			Settings::SmallBalanceResult::Already,
+			formId,
+			invoice,
+			done);
+	};
+	struct State {
+		rpl::lifetime lifetime;
+		bool success = false;
+	};
+	const auto state = std::make_shared<State>();
+
+	const auto session = &show->session();
+	session->credits().tonLoad();
+	session->credits().tonLoadedValue(
+	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
+		state->lifetime.destroy();
+
+		if (session->credits().tonBalance() < ton) {
+			show->show(Box(InsufficientTonBox, session->user(), ton));
+		} else {
+			ready();
+		}
+	}, state->lifetime);
+}
+
+void RequestOurForm(
 	std::shared_ptr<Main::SessionShow> show,
 	MTPInputInvoice invoice,
 	Fn<void(
 		uint64 formId,
-		uint64 price,
+		CreditsAmount price,
 		std::optional<Payments::CheckoutResult> failure)> done) {
 	const auto fail = [=](Payments::CheckoutResult failure) {
-		done(0, 0, failure);
+		done(0, {}, failure);
 	};
 	show->session().api().request(MTPpayments_GetPaymentForm(
 		MTP_flags(0),
@@ -5187,10 +5224,24 @@ void RequestStarsForm(
 		MTPDataJSON() // theme_params
 	)).done([=](const MTPpayments_PaymentForm &result) {
 		result.match([&](const MTPDpayments_paymentFormStarGift &data) {
-			const auto prices = data.vinvoice().data().vprices().v;
+			const auto &invoice = data.vinvoice().data();
+			const auto prices = invoice.vprices().v;
 			if (show->valid() && !prices.isEmpty()) {
 				const auto price = prices.front().data().vamount().v;
-				done(data.vform_id().v, price, std::nullopt);
+				const auto currency = qs(invoice.vcurrency());
+				const auto amount = (currency == Ui::kCreditsCurrency)
+					? CreditsAmount(price)
+					: (currency == u"TON"_q)
+					? CreditsAmount(
+						price / Ui::kNanosInOne,
+						price % Ui::kNanosInOne,
+						CreditsType::Ton)
+					: std::optional<CreditsAmount>();
+				if (amount) {
+					done(data.vform_id().v, *amount, std::nullopt);
+				} else {
+					fail(Payments::CheckoutResult::Failed);
+				}
 			} else {
 				fail(Payments::CheckoutResult::Failed);
 			}
@@ -5214,14 +5265,16 @@ void RequestStarsFormAndSubmit(
 		std::shared_ptr<Main::SessionShow> show,
 		MTPInputInvoice invoice,
 		Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done) {
-	RequestStarsForm(show, invoice, [=](
+	RequestOurForm(show, invoice, [=](
 			uint64 formId,
-			uint64 price,
+			CreditsAmount price,
 			std::optional<Payments::CheckoutResult> failure) {
-		if (!failure) {
-			SubmitStarsForm(show, invoice, formId, price, done);
-		} else {
+		if (failure) {
 			done(*failure, nullptr);
+		} else if (!price.stars()) {
+			done(Payments::CheckoutResult::Failed, nullptr);
+		} else {
+			SubmitStarsForm(show, invoice, formId, price.whole(), done);
 		}
 	});
 }
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index f9daf942fa..39698139c5 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -129,12 +129,18 @@ void SubmitStarsForm(
 	uint64 formId,
 	uint64 price,
 	Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done);
-void RequestStarsForm(
+void SubmitTonForm(
+	std::shared_ptr<Main::SessionShow> show,
+	MTPInputInvoice invoice,
+	uint64 formId,
+	CreditsAmount ton,
+	Fn<void(Payments::CheckoutResult, const MTPUpdates *)> done);
+void RequestOurForm(
 	std::shared_ptr<Main::SessionShow> show,
 	MTPInputInvoice invoice,
 	Fn<void(
 		uint64 formId,
-		uint64 price,
+		CreditsAmount price,
 		std::optional<Payments::CheckoutResult> failure)> done);
 void RequestStarsFormAndSubmit(
 	std::shared_ptr<Main::SessionShow> show,
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index 389f919d49..b47672ae67 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -487,6 +487,7 @@ void BuyResaleGift(
 		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> to,
 		std::shared_ptr<Data::UniqueGift> gift,
+		CreditsType type,
 		Fn<void(Payments::CheckoutResult)> done) {
 	auto paymentDone = [=](
 			Payments::CheckoutResult result,
@@ -504,22 +505,42 @@ void BuyResaleGift(
 
 	using Flag = MTPDinputInvoiceStarGiftResale::Flag;
 	const auto invoice = MTP_inputInvoiceStarGiftResale(
-		MTP_flags(gift->onlyAcceptTon ? Flag::f_ton : Flag()),
+		MTP_flags((type == CreditsType::Ton) ? Flag::f_ton : Flag()),
 		MTP_string(gift->slug),
 		to->input);
 
-	Ui::RequestStarsForm(show, invoice, [=](
+	Ui::RequestOurForm(show, invoice, [=](
 			uint64 formId,
-			uint64 price,
+			CreditsAmount price,
 			std::optional<Payments::CheckoutResult> failure) {
+		if ((type == CreditsType::Ton && price.stars())
+			|| (type == CreditsType::Stars && price.ton())) {
+			paymentDone(Payments::CheckoutResult::Failed, nullptr);
+			return;
+		}
 		const auto submit = [=] {
-			SubmitStarsForm(show, invoice, formId, price, paymentDone);
+			if (price.stars()) {
+				SubmitStarsForm(
+					show,
+					invoice,
+					formId,
+					price.whole(),
+					paymentDone);
+			} else {
+				SubmitTonForm(show, invoice, formId, price, paymentDone);
+			}
 		};
+		const auto was = (type == CreditsType::Ton)
+			? Data::UniqueGiftResaleTon(*gift)
+			: Data::UniqueGiftResaleStars(*gift);
 		if (failure) {
 			paymentDone(*failure, nullptr);
-		} else if (price != gift->starsForResale) {
-			const auto cost = Ui::Text::IconEmoji(&st::starIconEmoji).append(
-				Lang::FormatCountDecimal(price));
+		} else if (price != was) {
+			const auto cost = price.ton()
+				? Ui::Text::IconEmoji(&st::tonIconEmoji).append(
+					Lang::FormatCreditsAmountDecimal(price))
+				: Ui::Text::IconEmoji(&st::starIconEmoji).append(
+					Lang::FormatCountDecimal(price.whole()));
 			const auto cancelled = [=](Fn<void()> close) {
 				paymentDone(Payments::CheckoutResult::Cancelled, nullptr);
 				close();
@@ -663,16 +684,7 @@ void ShowBuyResaleGiftBox(
 
 		auto transfer = tr::lng_gift_buy_resale_button(
 			lt_cost,
-			rpl::single(gift->onlyAcceptTon
-				? Ui::Text::IconEmoji(
-					&st::tonIconEmoji
-				).append(
-					Lang::FormatCreditsAmountDecimal(CreditsAmount(
-						gift->nanoTonForResale / Ui::kNanosInOne,
-						gift->nanoTonForResale % Ui::kNanosInOne,
-						CreditsType::Ton)))
-				: Ui::Text::IconEmoji(&st::starIconEmoji).append(
-					Lang::FormatCountDecimal(gift->starsForResale))),
+			rpl::single(Data::FormatGiftResaleAsked(*gift)),
 			Ui::Text::WithEntities);
 
 		struct State {
@@ -697,7 +709,10 @@ void ShowBuyResaleGiftBox(
 					close();
 				}
 			};
-			BuyResaleGift(show, to, gift, done);
+			const auto type = gift->onlyAcceptTon
+				? CreditsType::Ton
+				: CreditsType::Stars;
+			BuyResaleGift(show, to, gift, type, done);
 		};
 
 		Ui::ConfirmBox(box, {
@@ -709,7 +724,8 @@ void ShowBuyResaleGiftBox(
 					(gift->onlyAcceptTon
 						? tr::lng_action_gift_for_ton(
 							lt_count,
-							rpl::single(gift->nanoTonForResale / 1'000'000'000.),
+							rpl::single(gift->nanoTonForResale
+								/ float64(Ui::kNanosInOne)),
 							Ui::Text::Bold)
 						: tr::lng_action_gift_for_stars(
 							lt_count_decimal,
@@ -723,7 +739,8 @@ void ShowBuyResaleGiftBox(
 					(gift->onlyAcceptTon
 						? tr::lng_action_gift_for_ton(
 							lt_count,
-							rpl::single(gift->nanoTonForResale / 1'000'000'000.),
+							rpl::single(gift->nanoTonForResale
+								/ float64(Ui::kNanosInOne)),
 							Ui::Text::Bold)
 						: tr::lng_action_gift_for_stars(
 							lt_count_decimal,
diff --git a/Telegram/SourceFiles/data/data_star_gift.cpp b/Telegram/SourceFiles/data/data_star_gift.cpp
new file mode 100644
index 0000000000..998c79950b
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_star_gift.cpp
@@ -0,0 +1,56 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_star_gift.h"
+
+#include "lang/lang_tag.h"
+#include "ui/controls/ton_common.h"
+#include "ui/text/text_utilities.h"
+#include "styles/style_credits.h"
+
+namespace Data {
+
+QString UniqueGiftName(const UniqueGift &gift) {
+	return gift.title + u" #"_q + QString::number(gift.number);
+}
+
+CreditsAmount UniqueGiftResaleStars(const UniqueGift &gift) {
+	return CreditsAmount(gift.starsForResale);
+}
+
+CreditsAmount UniqueGiftResaleTon(const UniqueGift &gift) {
+	return CreditsAmount(
+		gift.nanoTonForResale / Ui::kNanosInOne,
+		gift.nanoTonForResale % Ui::kNanosInOne,
+		CreditsType::Ton);
+}
+
+CreditsAmount UniqueGiftResaleAsked(const UniqueGift &gift) {
+	return gift.onlyAcceptTon
+		? UniqueGiftResaleTon(gift)
+		: UniqueGiftResaleStars(gift);
+}
+
+TextWithEntities FormatGiftResaleStars(const UniqueGift &gift) {
+	return Ui::Text::IconEmoji(
+		&st::starIconEmoji
+	).append(Lang::FormatCountDecimal(gift.starsForResale));
+}
+
+TextWithEntities FormatGiftResaleTon(const UniqueGift &gift) {
+	return Ui::Text::IconEmoji(
+		&st::tonIconEmoji
+	).append(Lang::FormatCreditsAmountDecimal(UniqueGiftResaleTon(gift)));
+}
+
+TextWithEntities FormatGiftResaleAsked(const UniqueGift &gift) {
+	return gift.onlyAcceptTon
+		? FormatGiftResaleTon(gift)
+		: FormatGiftResaleStars(gift);
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index 122f7b5b54..b44707aaf9 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -59,9 +59,15 @@ struct UniqueGift {
 	UniqueGiftOriginalDetails originalDetails;
 };
 
-[[nodiscard]] inline QString UniqueGiftName(const UniqueGift &gift) {
-	return gift.title + u" #"_q + QString::number(gift.number);
-}
+[[nodiscard]] QString UniqueGiftName(const UniqueGift &gift);
+
+[[nodiscard]] CreditsAmount UniqueGiftResaleStars(const UniqueGift &gift);
+[[nodiscard]] CreditsAmount UniqueGiftResaleTon(const UniqueGift &gift);
+[[nodiscard]] CreditsAmount UniqueGiftResaleAsked(const UniqueGift &gift);
+
+[[nodiscard]] TextWithEntities FormatGiftResaleStars(const UniqueGift &gift);
+[[nodiscard]] TextWithEntities FormatGiftResaleTon(const UniqueGift &gift);
+[[nodiscard]] TextWithEntities FormatGiftResaleAsked(const UniqueGift &gift);
 
 struct StarGift {
 	uint64 id = 0;
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 0b13184819..e82e6d3012 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1242,12 +1242,7 @@ void GenericCreditsEntryBox(
 			return (update.action == Data::GiftUpdate::Action::ResaleChange)
 				&& (update.slug == slug);
 		}) | rpl::to_empty) | rpl::map([unique = e.uniqueGift] {
-			return unique->onlyAcceptTon
-				? CreditsAmount(
-					unique->nanoTonForResale / Ui::kNanosInOne,
-					unique->nanoTonForResale % Ui::kNanosInOne,
-					CreditsType::Ton)
-				: CreditsAmount(unique->starsForResale);
+			return Data::UniqueGiftResaleAsked(*unique);
 		});
 		auto change = [=] {
 			const auto style = st.giftWearBox
@@ -2113,20 +2108,11 @@ void GenericCreditsEntryBox(
 				button,
 				tr::lng_gift_buy_resale_button(
 					lt_cost,
-					rpl::single(Ui::Text::IconEmoji(
-						&st::tonIconEmoji
-					).append(
-						Lang::FormatCreditsAmountDecimal(CreditsAmount(
-							uniqueGift->nanoTonForResale / Ui::kNanosInOne,
-							uniqueGift->nanoTonForResale % Ui::kNanosInOne,
-							CreditsType::Ton)))),
+					rpl::single(Data::FormatGiftResaleTon(*uniqueGift)),
 					Ui::Text::WithEntities),
 				tr::lng_gift_buy_resale_equals(
 					lt_cost,
-					rpl::single(Ui::Text::IconEmoji(
-						&st::starIconEmojiSmall
-					).append(Lang::FormatCountDecimal(
-						uniqueGift->starsForResale))),
+					rpl::single(Data::FormatGiftResaleStars(*uniqueGift)),
 					Ui::Text::WithEntities),
 				st::giftResaleButtonTitle,
 				st::giftResaleButtonSubtitle);

From 976531902783605cb39fe24e227daefd5edb774d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Jul 2025 10:37:03 +0400
Subject: [PATCH 090/341] Allow choosing Stars/TON payment.

---
 Telegram/Resources/langs/lang.strings         |  2 +-
 .../SourceFiles/boxes/transfer_gift_box.cpp   | 96 +++++++++++++------
 .../settings/settings_credits_graphics.cpp    |  4 +-
 Telegram/SourceFiles/ui/effects/credits.style |  9 +-
 4 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 058a3b68fd..17840c510c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3560,7 +3560,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_buy_resale_title" = "Buy {name}";
 "lng_gift_buy_resale_button" = "Buy for {cost}";
 "lng_gift_buy_resale_equals" = "Equals to {cost}";
-"lng_gift_buy_resale_only_ton" = "The seller only accepts TON as payment";
+"lng_gift_buy_resale_only_ton" = "The seller only accepts TON as payment.";
 "lng_gift_buy_resale_pay_stars" = "Pay in Stars";
 "lng_gift_buy_resale_pay_ton" = "Pay in TON";
 "lng_gift_buy_resale_confirm" = "Do you want to buy {name} for {price} and gift it to {user}?";
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index b47672ae67..2b697bcbdb 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "payments/payments_checkout_process.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/sub_tabs.h"
 #include "ui/controls/ton_common.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/text_utilities.h"
@@ -678,19 +679,59 @@ void ShowBuyResaleGiftBox(
 		not_null<PeerData*> to,
 		Fn<void()> closeParentBox) {
 	show->show(Box([=](not_null<Ui::GenericBox*> box) {
-		box->setTitle(tr::lng_gift_buy_resale_title(
-			lt_name,
-			rpl::single(UniqueGiftName(*gift))));
-
-		auto transfer = tr::lng_gift_buy_resale_button(
-			lt_cost,
-			rpl::single(Data::FormatGiftResaleAsked(*gift)),
-			Ui::Text::WithEntities);
-
 		struct State {
+			rpl::variable<bool> ton;
 			bool sent = false;
 		};
 		const auto state = std::make_shared<State>();
+		state->ton = gift->onlyAcceptTon;
+
+		if (gift->onlyAcceptTon) {
+			box->addRow(
+				object_ptr<Ui::FlatLabel>(
+					box,
+					tr::lng_gift_buy_resale_only_ton(
+						Ui::Text::RichLangValue),
+					st::resaleConfirmTonOnly),
+				st::boxRowPadding + st::resaleConfirmTonOnlyMargin);
+		} else {
+			const auto tabs = box->addRow(
+				object_ptr<Ui::SubTabs>(
+					box,
+					Ui::SubTabsOptions{
+						.selected = u"stars"_q,
+						.centered = true,
+					},
+					std::vector<Ui::SubTabsTab>{
+						{
+							u"stars"_q,
+							tr::lng_gift_buy_resale_pay_stars(
+								tr::now,
+								Ui::Text::WithEntities),
+						},
+						{
+							u"ton"_q,
+							tr::lng_gift_buy_resale_pay_ton(
+								tr::now,
+								Ui::Text::WithEntities),
+						},
+					}),
+				st::boxRowPadding + st::resaleConfirmTonOnlyMargin);
+			tabs->activated() | rpl::start_with_next([=](QString id) {
+				tabs->setActiveTab(id);
+				state->ton = (id == u"ton"_q);
+			}, tabs->lifetime());
+		}
+
+		auto transfer = state->ton.value() | rpl::map([=](bool ton) {
+			return tr::lng_gift_buy_resale_button(
+				lt_cost,
+				rpl::single(ton
+					? Data::FormatGiftResaleTon(*gift)
+					: Data::FormatGiftResaleStars(*gift)),
+				Ui::Text::WithEntities);
+		}) | rpl::flatten_latest();
+
 		auto callback = [=](Fn<void()> close) {
 			if (state->sent) {
 				return;
@@ -704,48 +745,41 @@ void ShowBuyResaleGiftBox(
 				} else if (result != Payments::CheckoutResult::Paid) {
 					state->sent = false;
 				} else {
-					show->showToast(u"done!"_q);
 					closeParentBox();
 					close();
 				}
 			};
-			const auto type = gift->onlyAcceptTon
+			const auto type = state->ton.current()
 				? CreditsType::Ton
 				: CreditsType::Stars;
 			BuyResaleGift(show, to, gift, type, done);
 		};
 
+		auto price = state->ton.value() | rpl::map([=](bool ton) {
+			return ton
+				? tr::lng_action_gift_for_ton(
+					lt_count_decimal,
+					rpl::single(gift->nanoTonForResale
+						/ float64(Ui::kNanosInOne)),
+					Ui::Text::Bold)
+				: tr::lng_action_gift_for_stars(
+					lt_count_decimal,
+					rpl::single(gift->starsForResale * 1.),
+					Ui::Text::Bold);
+		}) | rpl::flatten_latest();
 		Ui::ConfirmBox(box, {
 			.text = to->isSelf()
 				? tr::lng_gift_buy_resale_confirm_self(
 					lt_name,
 					rpl::single(Ui::Text::Bold(UniqueGiftName(*gift))),
 					lt_price,
-					(gift->onlyAcceptTon
-						? tr::lng_action_gift_for_ton(
-							lt_count,
-							rpl::single(gift->nanoTonForResale
-								/ float64(Ui::kNanosInOne)),
-							Ui::Text::Bold)
-						: tr::lng_action_gift_for_stars(
-							lt_count_decimal,
-							rpl::single(gift->starsForResale * 1.),
-							Ui::Text::Bold)),
+					std::move(price),
 					Ui::Text::WithEntities)
 				: tr::lng_gift_buy_resale_confirm(
 					lt_name,
 					rpl::single(Ui::Text::Bold(UniqueGiftName(*gift))),
 					lt_price,
-					(gift->onlyAcceptTon
-						? tr::lng_action_gift_for_ton(
-							lt_count,
-							rpl::single(gift->nanoTonForResale
-								/ float64(Ui::kNanosInOne)),
-							Ui::Text::Bold)
-						: tr::lng_action_gift_for_stars(
-							lt_count_decimal,
-							rpl::single(gift->starsForResale * 1.),
-							Ui::Text::Bold)),
+					std::move(price),
 					lt_user,
 					rpl::single(Ui::Text::Bold(to->shortName())),
 					Ui::Text::WithEntities),
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index e82e6d3012..c314abd938 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2114,8 +2114,8 @@ void GenericCreditsEntryBox(
 					lt_cost,
 					rpl::single(Data::FormatGiftResaleStars(*uniqueGift)),
 					Ui::Text::WithEntities),
-				st::giftResaleButtonTitle,
-				st::giftResaleButtonSubtitle);
+				st::resaleButtonTitle,
+				st::resaleButtonSubtitle);
 		} else {
 			button->setText(tr::lng_gift_buy_resale_button(
 				lt_cost,
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 6a0483ceea..8881c8bbb8 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -323,13 +323,18 @@ creditsHistoryRowRightMinorTop: 18px;
 creditsHistoryRowRightStyle: TextStyle(defaultTextStyle) {
 	font: font(fsize);
 }
-giftResaleButtonTitle: FlatLabel(defaultFlatLabel) {
+resaleButtonTitle: FlatLabel(defaultFlatLabel) {
 	style: semiboldTextStyle;
 	textFg: activeButtonFg;
 }
-giftResaleButtonSubtitle: FlatLabel(defaultFlatLabel) {
+resaleButtonSubtitle: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: font(12px semibold);
 	}
 	textFg: activeButtonFg;
 }
+
+resaleConfirmTonOnly: FlatLabel(boxLabel) {
+	textFg: windowSubTextFg;
+}
+resaleConfirmTonOnlyMargin: margins(0px, 12px, 0px, 12px);

From 9bc26b0068790ce20a1653a951c5ce86140070a0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Jul 2025 10:51:19 +0400
Subject: [PATCH 091/341] Show correct price in gifts list.

---
 .../SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 8f31abcb1d..abeb1ec173 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -169,8 +169,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 							: data.info.starsResellMin)
 					).append(data.info.resellCount > 1 ? "+" : "")
 				: (_small && unique && unique->starsForResale)
-				? _delegate->monostar().append(' ').append(
-					format(unique->starsForResale))
+				? Data::FormatGiftResaleAsked(*unique)
 				: unique
 				? tr::lng_gift_transfer_button(
 					tr::now,

From 170544f68de61789e02f38a9b875a6fa5a8f2049 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Jul 2025 12:21:25 +0400
Subject: [PATCH 092/341] Allow switch resale display to TON.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 25 ++++++++-
 .../SourceFiles/boxes/transfer_gift_box.cpp   |  7 ++-
 .../SourceFiles/boxes/transfer_gift_box.h     |  1 +
 .../SourceFiles/core/local_url_handlers.cpp   |  7 ++-
 Telegram/SourceFiles/data/data_credits.h      |  1 +
 .../peer_gifts/info_peer_gifts_common.cpp     | 54 ++++++++++++-------
 .../info/peer_gifts/info_peer_gifts_common.h  |  6 ++-
 .../settings/settings_credits_graphics.cpp    | 17 +++---
 .../settings/settings_credits_graphics.h      |  7 ++-
 Telegram/SourceFiles/ui/effects/credits.style |  1 -
 11 files changed, 94 insertions(+), 33 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 17840c510c..2d00c68e7b 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3759,6 +3759,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_resale_symbol" = "Symbol";
 "lng_gift_resale_symbols#one" = "{count} Symbol";
 "lng_gift_resale_symbols#other" = "{count} Symbols";
+"lng_gift_resale_switch_to" = "Switch to {currency}";
 "lng_gift_resale_early" = "You will be able to resell this gift in {duration}.";
 "lng_gift_transfer_early" = "You will be able to transfer this gift in {duration}.";
 "lng_gift_resale_transfer_early_title" = "Try Later";
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index d28b5d536d..34ec652710 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2842,7 +2842,10 @@ void SendGiftBox(
 						Settings::GlobalStarGiftBox,
 						window->uiShow(),
 						star->info,
-						peer->id,
+						Settings::StarGiftResaleInfo{
+							.recipientId = peer->id,
+							.forceTon = star->forceTon,
+						},
 						Settings::CreditsEntryBoxStyleOverrides()));
 				} else if (star && star->resale) {
 					const auto id = star->info.id;
@@ -3232,7 +3235,6 @@ void GiftResaleBox(
 		not_null<PeerData*> peer,
 		ResaleGiftsDescriptor descriptor) {
 	box->setWidth(st::boxWideWidth);
-	box->addButton(tr::lng_create_group_back(), [=] { box->closeBox(); });
 
 	// Create a proper vertical layout for the title
 	const auto titleWrap = box->setPinnedToTopContent(
@@ -3273,12 +3275,29 @@ void GiftResaleBox(
 		rpl::event_stream<> updated;
 		ResaleGiftsDescriptor data;
 		rpl::variable<ResaleFilter> filter;
+		rpl::variable<bool> ton;
 		rpl::lifetime loading;
 		int lastMinHeight = 0;
 	};
 	const auto state = content->lifetime().make_state<State>();
 	state->data = std::move(descriptor);
 
+	box->addButton(tr::lng_create_group_back(), [=] { box->closeBox(); });
+
+#ifndef OS_MAC_STORE
+	const auto currency = box->addLeftButton(rpl::single(QString()), [=] {
+		state->ton = !state->ton.current();
+		state->updated.fire({});
+	});
+	currency->setText(tr::lng_gift_resale_switch_to(
+		lt_currency,
+		rpl::conditional(
+			state->ton.value(),
+			rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji)),
+			rpl::single(Ui::Text::IconEmoji(&st::tonIconEmoji))),
+		Ui::Text::WithEntities));
+#endif
+
 	box->heightValue() | rpl::start_with_next([=](int height) {
 		if (height > state->lastMinHeight) {
 			state->lastMinHeight = height;
@@ -3340,9 +3359,11 @@ void GiftResaleBox(
 	) | rpl::map([=] {
 		auto result = GiftsDescriptor();
 		const auto selfId = window->session().userPeerId();
+		const auto forceTon = state->ton.current();
 		for (const auto &gift : state->data.list) {
 			result.list.push_back(GiftTypeStars{
 				.info = gift,
+				.forceTon = forceTon,
 				.resale = true,
 				.mine = (gift.unique->ownerId == selfId),
 			});
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index 2b697bcbdb..598c2a4744 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -676,6 +676,7 @@ void ShowTransferGiftBox(
 void ShowBuyResaleGiftBox(
 		std::shared_ptr<ChatHelpers::Show> show,
 		std::shared_ptr<Data::UniqueGift> gift,
+		bool forceTon,
 		not_null<PeerData*> to,
 		Fn<void()> closeParentBox) {
 	show->show(Box([=](not_null<Ui::GenericBox*> box) {
@@ -684,7 +685,7 @@ void ShowBuyResaleGiftBox(
 			bool sent = false;
 		};
 		const auto state = std::make_shared<State>();
-		state->ton = gift->onlyAcceptTon;
+		state->ton = gift->onlyAcceptTon || forceTon;
 
 		if (gift->onlyAcceptTon) {
 			box->addRow(
@@ -699,7 +700,9 @@ void ShowBuyResaleGiftBox(
 				object_ptr<Ui::SubTabs>(
 					box,
 					Ui::SubTabsOptions{
-						.selected = u"stars"_q,
+						.selected = (state->ton.current()
+							? u"ton"_q
+							: u"stars"_q),
 						.centered = true,
 					},
 					std::vector<Ui::SubTabsTab>{
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.h b/Telegram/SourceFiles/boxes/transfer_gift_box.h
index 27430b43e6..cab7aee2b4 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.h
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.h
@@ -35,6 +35,7 @@ void ShowTransferGiftBox(
 void ShowBuyResaleGiftBox(
 	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Data::UniqueGift> gift,
+	bool forceTon,
 	not_null<PeerData*> to,
 	Fn<void()> closeParentBox);
 
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index ec18169166..b2481979f6 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -1945,7 +1945,12 @@ void ResolveAndShowUniqueGift(
 		session->data().processUsers(data.vusers());
 		if (const auto gift = Api::FromTL(session, data.vgift())) {
 			using namespace ::Settings;
-			show->show(Box(GlobalStarGiftBox, show, *gift, PeerId(), st));
+			show->show(Box(
+				GlobalStarGiftBox,
+				show,
+				*gift,
+				StarGiftResaleInfo(),
+				st));
 		}
 	}).fail([=](const MTP::Error &error) {
 		clear();
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 0b0b9382ed..b8d6d7f92d 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -102,6 +102,7 @@ struct CreditsHistoryEntry final {
 	bool giftRefunded : 1 = false;
 	bool giftUpgraded : 1 = false;
 	bool giftResale : 1 = false;
+	bool giftResaleForceTon : 1 = false;
 	bool giftPinned : 1 = false;
 	bool savedToProfile : 1 = false;
 	bool fromGiftsList : 1 = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index abeb1ec173..ee5139cfc4 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -92,10 +92,9 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	if (_descriptor == descriptor && _resalePrice == resalePrice) {
 		return;
 	}
-	auto player = base::take(_player);
 	const auto starsType = Ui::Premium::MiniStarsType::SlowStars;
-	_mediaLifetime.destroy();
 	unsubscribe();
+	update();
 
 	const auto format = [=](int64 number) {
 		const auto onlyK = (number < 100'000'000);
@@ -161,13 +160,15 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 		_price.setMarkedText(
 			st::semiboldTextStyle,
 			(data.resale
-				? (unique
+				? ((unique && data.forceTon)
+					? Data::FormatGiftResaleTon(*unique)
+					: (unique
 					? _delegate->monostar()
-					: _delegate->star()).append(' ').append(
-						format(unique
-							? unique->starsForResale
-							: data.info.starsResellMin)
-					).append(data.info.resellCount > 1 ? "+" : "")
+						: _delegate->star()).append(' ').append(
+							format(unique
+								? unique->starsForResale
+								: data.info.starsResellMin)
+						).append(data.info.resellCount > 1 ? "+" : ""))
 				: (_small && unique && unique->starsForResale)
 				? Data::FormatGiftResaleAsked(*unique)
 				: unique
@@ -196,11 +197,18 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 				Ui::Premium::CreditsIconGradientStops());
 		}
 	});
-	_delegate->sticker(
+
+	_resolvedDocument = nullptr;
+	_documentLifetime = _delegate->sticker(
 		descriptor
 	) | rpl::start_with_next([=](not_null<DocumentData*> document) {
+		_documentLifetime.destroy();
 		setDocument(document);
-	}, lifetime());
+	});
+	if (_resolvedDocument) {
+		_documentLifetime.destroy();
+	}
+
 	_patterned = false;
 	_uniqueBackgroundCache = QImage();
 	_uniquePatternEmoji = nullptr;
@@ -232,16 +240,19 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	}
 }
 
-bool GiftButton::documentResolved() const {
-	return _player || _mediaLifetime;
-}
-
 void GiftButton::setDocument(not_null<DocumentData*> document) {
+	_resolvedDocument = document;
+	if (_playerDocument == document) {
+		return;
+	}
+
 	const auto media = document->createMediaView();
 	media->checkStickerLarge();
 	media->goodThumbnailWanted();
 
-	rpl::single() | rpl::then(
+	const auto destroyed = base::take(_player);
+	_playerDocument = nullptr;
+	_mediaLifetime = rpl::single() | rpl::then(
 		document->owner().session().downloaderTaskFinished()
 	) | rpl::filter([=] {
 		return media->loaded();
@@ -269,9 +280,13 @@ void GiftButton::setDocument(not_null<DocumentData*> document) {
 				st::giftBoxStickerSize);
 		}
 		result->setRepaintCallback([=] { update(); });
+		_playerDocument = media->owner();
 		_player = std::move(result);
 		update();
-	}, _mediaLifetime);
+	});
+	if (_playerDocument) {
+		_mediaLifetime.destroy();
+	}
 }
 
 void GiftButton::setGeometry(QRect inner, QMargins extend) {
@@ -627,10 +642,11 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 				QSize(icon.width() + 2 * add, icon.height() + 2 * add));
 			p.drawEllipse(rect);
 			icon.paintInCenter(p, rect);
-		} else if (unique->nanoTonForResale && unique->onlyAcceptTon) {
+		} else if (!data.forceTon
+			&& unique->nanoTonForResale
+			&& unique->onlyAcceptTon) {
 			if (_tonIcon.isNull()) {
-				_tonIcon = Ui::Earn::IconCurrencyColored(
-					st::tonIconEmojiSize,
+				_tonIcon = st::tonIconEmoji.icon.instance(
 					QColor(255, 255, 255));
 			}
 			const auto size = _tonIcon.size() / _tonIcon.devicePixelRatio();
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 07b5620675..4c16dbab78 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -65,6 +65,7 @@ struct GiftTypeStars {
 	PeerData *from = nullptr;
 	TimeId date = 0;
 	bool pinnedSelection : 1 = false;
+	bool forceTon : 1 = false;
 	bool userpic : 1 = false;
 	bool pinned : 1 = false;
 	bool hidden : 1 = false;
@@ -160,7 +161,6 @@ private:
 		int height);
 
 	void setDocument(not_null<DocumentData*> document);
-	[[nodiscard]] bool documentResolved() const;
 	[[nodiscard]] QMargins currentExtend() const;
 
 	void unsubscribe();
@@ -188,8 +188,12 @@ private:
 	QRect _button;
 	QMargins _extend;
 
+	DocumentData *_resolvedDocument = nullptr;
+
 	std::unique_ptr<HistoryView::StickerPlayer> _player;
+	DocumentData *_playerDocument = nullptr;
 	rpl::lifetime _mediaLifetime;
+	rpl::lifetime _documentLifetime;
 
 };
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index c314abd938..4196b62046 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1235,14 +1235,17 @@ void GenericCreditsEntryBox(
 		box->setNoContentMargin(true);
 
 		const auto slug = uniqueGift->slug;
+		const auto forceTon = e.giftResaleForceTon;
 		auto price = rpl::single(
 			rpl::empty
 		) | rpl::then(session->data().giftUpdates(
 		) | rpl::filter([=](const Data::GiftUpdate &update) {
 			return (update.action == Data::GiftUpdate::Action::ResaleChange)
 				&& (update.slug == slug);
-		}) | rpl::to_empty) | rpl::map([unique = e.uniqueGift] {
-			return Data::UniqueGiftResaleAsked(*unique);
+		}) | rpl::to_empty) | rpl::map([forceTon, unique = e.uniqueGift] {
+			return forceTon
+				? Data::UniqueGiftResaleTon(*unique)
+				: Data::UniqueGiftResaleAsked(*unique);
 		});
 		auto change = [=] {
 			const auto style = st.giftWearBox
@@ -2091,6 +2094,7 @@ void GenericCreditsEntryBox(
 			ShowBuyResaleGiftBox(
 				show,
 				e.uniqueGift,
+				e.giftResaleForceTon,
 				to,
 				crl::guard(box, [=] { box->closeBox(); }));
 		} else if (canUpgradeFree) {
@@ -2102,7 +2106,7 @@ void GenericCreditsEntryBox(
 		}
 	});
 	if (canBuyResold) {
-		if (uniqueGift->onlyAcceptTon) {
+		if (uniqueGift->onlyAcceptTon || e.giftResaleForceTon) {
 			button->setText(rpl::single(QString()));
 			Ui::SetButtonTwoLabels(
 				button,
@@ -2205,7 +2209,7 @@ void GlobalStarGiftBox(
 		not_null<Ui::GenericBox*> box,
 		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::StarGift &data,
-		PeerId resaleRecipientId,
+		StarGiftResaleInfo resale,
 		CreditsEntryBoxStyleOverrides st) {
 	const auto selfId = show->session().userPeerId();
 	const auto ownerId = data.unique ? data.unique->ownerId.value : 0;
@@ -2216,8 +2220,8 @@ void GlobalStarGiftBox(
 			.credits = CreditsAmount(data.stars),
 			.bareGiftStickerId = data.document->id,
 			.bareGiftOwnerId = ownerId,
-			.bareGiftResaleRecipientId = ((resaleRecipientId != selfId)
-				? resaleRecipientId.value
+			.bareGiftResaleRecipientId = ((resale.recipientId != selfId)
+				? resale.recipientId.value
 				: 0),
 			.stargiftId = data.id,
 			.uniqueGift = data.unique,
@@ -2225,6 +2229,7 @@ void GlobalStarGiftBox(
 			.limitedCount = data.limitedCount,
 			.limitedLeft = data.limitedLeft,
 			.stargift = true,
+			.giftResaleForceTon = resale.forceTon,
 			.fromGiftSlug = true,
 			.in = (ownerId == show->session().userPeerId().value),
 			.gift = true,
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index 9789278fac..a2329e5902 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -155,11 +155,16 @@ void CreditsPrizeBox(
 	not_null<Window::SessionController*> controller,
 	const Data::GiftCode &data,
 	TimeId date);
+
+struct StarGiftResaleInfo {
+	PeerId recipientId;
+	bool forceTon = false;
+};
 void GlobalStarGiftBox(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<ChatHelpers::Show> show,
 	const Data::StarGift &data,
-	PeerId resaleRecipientId,
+	StarGiftResaleInfo resale,
 	CreditsEntryBoxStyleOverrides st = {});
 
 [[nodiscard]] Data::CreditsHistoryEntry SavedStarGiftEntry(
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 8881c8bbb8..28b01272af 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -85,7 +85,6 @@ tonIconEmoji: IconEmoji {
 	icon: icon{{ "payments/ton_emoji-18x18", currencyFg }};
 	padding: margins(0px, 1px, 0px, 0px);
 }
-tonIconEmojiSize: 18px;
 
 creditsHistoryEntryTypeAds: icon {{ "folders/folders_channels", premiumButtonFg }};
 

From 79650cf3180e9f9b3e25f8857e20be4bba73db34 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Jul 2025 14:03:46 +0400
Subject: [PATCH 093/341] Support collection links.

---
 Telegram/Resources/langs/lang.strings         |  2 +
 .../SourceFiles/core/local_url_handlers.cpp   | 10 ++-
 .../SourceFiles/data/data_file_origin.cpp     |  2 +
 Telegram/SourceFiles/data/data_session.cpp    | 10 +++
 Telegram/SourceFiles/data/data_web_page.cpp   |  2 +
 Telegram/SourceFiles/data/data_web_page.h     |  1 +
 .../view/media/history_view_web_page.cpp      |  6 +-
 .../SourceFiles/info/info_content_widget.cpp  | 12 ++++
 .../SourceFiles/info/info_content_widget.h    | 18 +++++-
 Telegram/SourceFiles/info/info_controller.cpp | 17 ++++++
 Telegram/SourceFiles/info/info_controller.h   | 11 ++++
 Telegram/SourceFiles/info/info_memento.cpp    |  2 -
 .../SourceFiles/info/info_wrap_widget.cpp     |  2 +-
 .../info/media/info_media_buttons.cpp         |  6 +-
 .../info/peer_gifts/info_peer_gifts_common.h  | 10 +++
 .../peer_gifts/info_peer_gifts_widget.cpp     | 61 +++++++++++++++----
 .../info/peer_gifts/info_peer_gifts_widget.h  | 15 ++---
 .../stories/info_stories_inner_widget.cpp     |  6 +-
 .../info/stories/info_stories_widget.cpp      |  3 +-
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  1 +
 .../settings/settings_credits_graphics.cpp    |  5 +-
 .../window/window_session_controller.cpp      |  3 +
 .../window_session_controller_link_info.h     |  1 +
 23 files changed, 167 insertions(+), 39 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2d00c68e7b..2290231cee 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3773,6 +3773,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_collection_empty_text" = "Add some of your gifts to this collection.";
 "lng_gift_collection_all" = "All Gifts";
 "lng_gift_collection_add_title" = "Add Gifts";
+"lng_gift_collection_share" = "Share Collection";
 "lng_gift_collection_edit" = "Edit Name";
 "lng_gift_collection_limit_title" = "Limit Reached";
 "lng_gift_collection_limit_text" = "Please remove one of the existing collections to add a new one.";
@@ -6267,6 +6268,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_view_button_collectible" = "View collectible";
 "lng_view_button_call" = "Join call";
 "lng_view_button_storyalbum" = "View Album";
+"lng_view_button_collection" = "View Collection";
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index b2481979f6..7f76e19cda 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -635,6 +635,8 @@ bool ResolveUsernameOrPhone(
 	const auto storyId = storyParam.toInt();
 	const auto storyAlbumParam = params.value(u"album"_q);
 	const auto storyAlbumId = storyAlbumParam.toInt();
+	const auto giftCollectionParam = params.value(u"collection"_q);
+	const auto giftCollectionId = giftCollectionParam.toInt();
 	const auto appname = webChannelPreviewLink ? QString() : appnameParam;
 	const auto commentParam = params.value(u"comment"_q);
 	const auto commentId = commentParam.toInt();
@@ -662,6 +664,7 @@ bool ResolveUsernameOrPhone(
 		.messageId = post,
 		.storyId = storyId,
 		.storyAlbumId = storyAlbumId,
+		.giftCollectionId = giftCollectionId,
 		.videoTimestamp = (!videot.isEmpty()
 			? ParseVideoTimestamp(videot)
 			: std::optional<TimeId>()),
@@ -1847,6 +1850,7 @@ QString TryConvertUrlToLocal(QString url) {
 				"/\\d+/?(\\?|$)|"
 				"/s/\\d+/?(\\?|$)|"
 				"/a/\\d+/?(\\?|$)|"
+				"/c/\\d+/?(\\?|$)|"
 				"/\\d+/\\d+/?(\\?|$)"
 			")"_q, query, matchOptions)) {
 			const auto domain = usernameMatch->captured(1);
@@ -1869,8 +1873,10 @@ QString TryConvertUrlToLocal(QString url) {
 				added = u"&post="_q + postMatch->captured(1);
 			} else if (const auto storyMatch = regex_match(u"^/s/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&story="_q + storyMatch->captured(1);
-			} else if (const auto storyMatch = regex_match(u"^/a/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
-				added = u"&album="_q + storyMatch->captured(1);
+			} else if (const auto albumMatch = regex_match(u"^/a/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+				added = u"&album="_q + albumMatch->captured(1);
+			} else if (const auto collectionMatch = regex_match(u"^/c/(\\d+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
+				added = u"&collection="_q + collectionMatch->captured(1);
 			} else if (const auto appNameMatch = regex_match(u"^/([a-zA-Z0-9\\.\\_\\-]+)(/?\\?|/?$)"_q, usernameMatch->captured(2))) {
 				added = u"&appname="_q + appNameMatch->captured(1);
 			}
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index e92845840f..db84988af0 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -61,6 +61,8 @@ struct FileReferenceAccumulator {
 			push(data.vstickers());
 		}, [&](const MTPDwebPageAttributeUniqueStarGift &data) {
 			push(data.vgift());
+		}, [&](const MTPDwebPageAttributeStarGiftCollection &data) {
+			push(data.vicons());
 		});
 	}
 	void push(const MTPStarGift &data) {
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 9468425002..88a62f1494 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -3798,6 +3798,8 @@ void Session::webpageApplyFields(
 					return (DocumentData*)nullptr;
 				}, [](const MTPDwebPageAttributeUniqueStarGift &) {
 					return (DocumentData*)nullptr;
+				}, [](const MTPDwebPageAttributeStarGiftCollection &) {
+					return (DocumentData*)nullptr;
 				});
 				if (result) {
 					return result;
@@ -3820,6 +3822,14 @@ void Session::webpageApplyFields(
 						result->items.push_back(processDocument(tl));
 					}
 					return result;
+				}, [&](const MTPDwebPageAttributeStarGiftCollection &data) {
+					auto result = std::make_unique<WebPageStickerSet>();
+					result->isEmoji = false;
+					result->isTextColor = false;
+					for (const auto &tl : data.vicons().v) {
+						result->items.push_back(processDocument(tl));
+					}
+					return result;
 				}, [](const auto &) {
 					return WebPageStickerSetPtr(nullptr);
 				});
diff --git a/Telegram/SourceFiles/data/data_web_page.cpp b/Telegram/SourceFiles/data/data_web_page.cpp
index 6293cf2616..9c63bb1118 100644
--- a/Telegram/SourceFiles/data/data_web_page.cpp
+++ b/Telegram/SourceFiles/data/data_web_page.cpp
@@ -175,6 +175,8 @@ WebPageType ParseWebPageType(
 		return WebPageType::StickerSet;
 	} else if (type == u"telegram_story_album"_q) {
 		return WebPageType::StoryAlbum;
+	} else if (type == u"telegram_collection"_q) {
+		return WebPageType::GiftCollection;
 	} else if (hasIV) {
 		return WebPageType::ArticleWithIV;
 	} else {
diff --git a/Telegram/SourceFiles/data/data_web_page.h b/Telegram/SourceFiles/data/data_web_page.h
index 4fd2d4ab73..68abfe1c98 100644
--- a/Telegram/SourceFiles/data/data_web_page.h
+++ b/Telegram/SourceFiles/data/data_web_page.h
@@ -50,6 +50,7 @@ enum class WebPageType : uint8 {
 	Story,
 	StickerSet,
 	StoryAlbum,
+	GiftCollection,
 
 	Article,
 	ArticleWithIV,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index 5b64cb2d01..aa21c16a3b 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -234,6 +234,8 @@ constexpr auto kSponsoredUserpicLines = 2;
 		? tr::lng_view_button_stickerset(tr::now)
 		: (type == WebPageType::StoryAlbum)
 		? tr::lng_view_button_storyalbum(tr::now)
+		: (type == WebPageType::GiftCollection)
+		? tr::lng_view_button_collection(tr::now)
 		: QString());
 	if (page->iv) {
 		const auto manager = &page->owner().customEmojiManager();
@@ -272,7 +274,9 @@ constexpr auto kSponsoredUserpicLines = 2;
 		|| ((type == WebPageType::WallPaper)
 			&& webpage->document
 			&& webpage->document->isWallPaper())
-		|| (type == WebPageType::StickerSet);
+		|| (type == WebPageType::StickerSet)
+		|| (type == WebPageType::StoryAlbum)
+		|| (type == WebPageType::GiftCollection);
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index bdba718d5f..c696a6973e 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -17,6 +17,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_widget.h"
 #include "info/media/info_media_widget.h"
 #include "info/common_groups/info_common_groups_widget.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/stories/info_stories_common.h"
 #include "info/info_layer_widget.h"
 #include "info/info_section_widget.h"
 #include "info/info_controller.h"
@@ -476,6 +478,11 @@ Key ContentMemento::key() const {
 		return Key(poll, pollContextId());
 	} else if (const auto self = settingsSelf()) {
 		return Settings::Tag{ self };
+	} else if (const auto gifts = giftsPeer()) {
+		return PeerGifts::Tag{
+			gifts,
+			giftsCollectionId(),
+		};
 	} else if (const auto stories = storiesPeer()) {
 		return Stories::Tag{
 			stories,
@@ -529,6 +536,11 @@ ContentMemento::ContentMemento(Stories::Tag stories)
 , _storiesAddToAlbumId(stories.addingToAlbumId) {
 }
 
+ContentMemento::ContentMemento(PeerGifts::Tag gifts)
+: _giftsPeer(gifts.peer)
+, _giftsCollectionId(gifts.collectionId) {
+}
+
 ContentMemento::ContentMemento(Statistics::Tag statistics)
 : _statisticsTag(statistics) {
 }
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 52d6e2e5af..647124d0b7 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -8,7 +8,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "info/info_wrap_widget.h"
-#include "info/stories/info_stories_common.h"
 #include "info/statistics/info_statistics_tag.h"
 #include "ui/controls/swipe_handler_data.h"
 
@@ -61,6 +60,14 @@ namespace Info::GlobalMedia {
 struct Tag;
 } // namespace Info::GlobalMedia
 
+namespace Info::PeerGifts {
+struct Tag;
+} // namespace Info::PeerGifts
+
+namespace Info::Stories {
+struct Tag;
+} // namespace Info::Stories
+
 namespace Info {
 
 class ContentMemento;
@@ -208,6 +215,7 @@ public:
 		Data::ForumTopic *topic,
 		Data::SavedSublist *sublist,
 		PeerId migratedPeerId);
+	explicit ContentMemento(PeerGifts::Tag gifts);
 	explicit ContentMemento(Settings::Tag settings);
 	explicit ContentMemento(Downloads::Tag downloads);
 	explicit ContentMemento(Stories::Tag stories);
@@ -253,6 +261,12 @@ public:
 	[[nodiscard]] int storiesAddToAlbumId() const {
 		return _storiesAddToAlbumId;
 	}
+	[[nodiscard]] PeerData *giftsPeer() const {
+		return _giftsPeer;
+	}
+	[[nodiscard]] int giftsCollectionId() const {
+		return _giftsCollectionId;
+	}
 	[[nodiscard]] Statistics::Tag statisticsTag() const {
 		return _statisticsTag;
 	}
@@ -319,6 +333,8 @@ private:
 	PeerData * const _storiesPeer = nullptr;
 	int _storiesAlbumId = 0;
 	int _storiesAddToAlbumId = 0;
+	PeerData * const _giftsPeer = nullptr;
+	int _giftsCollectionId = 0;
 	Statistics::Tag _statisticsTag;
 	PeerData * const _starrefPeer = nullptr;
 	BotStarRef::Type _starrefType = {};
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 047d2e0a64..64b171919c 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -52,6 +52,9 @@ Key::Key(Stories::Tag stories) : _value(stories) {
 Key::Key(Statistics::Tag statistics) : _value(statistics) {
 }
 
+Key::Key(PeerGifts::Tag gifts) : _value(gifts) {
+}
+
 Key::Key(BotStarRef::Tag starref) : _value(starref) {
 }
 
@@ -132,6 +135,20 @@ int Key::storiesAddToAlbumId() const {
 	return 0;
 }
 
+PeerData *Key::giftsPeer() const {
+	if (const auto tag = std::get_if<PeerGifts::Tag>(&_value)) {
+		return tag->peer;
+	}
+	return nullptr;
+}
+
+int Key::giftsCollectionId() const {
+	if (const auto tag = std::get_if<PeerGifts::Tag>(&_value)) {
+		return tag->collectionId;
+	}
+	return 0;
+}
+
 Statistics::Tag Key::statisticsTag() const {
 	if (const auto tag = std::get_if<Statistics::Tag>(&_value)) {
 		return *tag;
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index f80b4ef3a1..5c3bfe46a0 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_message_reaction_id.h"
 #include "data/data_search_controller.h"
+#include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/statistics/info_statistics_tag.h"
 #include "info/stories/info_stories_common.h"
 #include "window/window_session_controller.h"
@@ -82,6 +83,7 @@ public:
 	Key(Downloads::Tag downloads);
 	Key(Stories::Tag stories);
 	Key(Statistics::Tag statistics);
+	Key(PeerGifts::Tag gifts);
 	Key(BotStarRef::Tag starref);
 	Key(GlobalMedia::Tag global);
 	Key(not_null<PollData*> poll, FullMsgId contextId);
@@ -99,6 +101,8 @@ public:
 	[[nodiscard]] PeerData *storiesPeer() const;
 	[[nodiscard]] int storiesAlbumId() const;
 	[[nodiscard]] int storiesAddToAlbumId() const;
+	[[nodiscard]] PeerData *giftsPeer() const;
+	[[nodiscard]] int giftsCollectionId() const;
 	[[nodiscard]] Statistics::Tag statisticsTag() const;
 	[[nodiscard]] PeerData *starrefPeer() const;
 	[[nodiscard]] BotStarRef::Type starrefType() const;
@@ -127,6 +131,7 @@ private:
 		Downloads::Tag,
 		Stories::Tag,
 		Statistics::Tag,
+		PeerGifts::Tag,
 		BotStarRef::Tag,
 		GlobalMedia::Tag,
 		PollKey,
@@ -234,6 +239,12 @@ public:
 	[[nodiscard]] int storiesAddToAlbumId() const {
 		return key().storiesAddToAlbumId();
 	}
+	[[nodiscard]] PeerData *giftsPeer() const {
+		return key().giftsPeer();
+	}
+	[[nodiscard]] int giftsCollectionId() const {
+		return key().giftsCollectionId();
+	}
 	[[nodiscard]] Statistics::Tag statisticsTag() const {
 		return key().statisticsTag();
 	}
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index 945bda8736..48d883590b 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -211,8 +211,6 @@ std::shared_ptr<ContentMemento> Memento::DefaultContent(
 		return std::make_shared<SimilarPeers::Memento>(peer);
 	case Section::Type::RequestsList:
 		return std::make_shared<RequestsList::Memento>(peer);
-	case Section::Type::PeerGifts:
-		return std::make_shared<PeerGifts::Memento>(peer);
 	case Section::Type::SavedSublists:
 		return std::make_shared<Saved::SublistsMemento>(&peer->session());
 	case Section::Type::Members:
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index ec982a3f88..054ec8ce3f 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -446,7 +446,7 @@ void WrapWidget::setupTopBarMenuToggle() {
 				addTopBarMenuButton();
 			}
 		}, _topBar->lifetime());
-	} else if (section.type() == Section::Type::PeerGifts && key.peer()) {
+	} else if (key.giftsPeer()) {
 		addTopBarMenuButton();
 	}
 }
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.cpp b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
index f40a2851b0..473a9558bd 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_chat_section.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/profile/info_profile_values.h"
 #include "info/stories/info_stories_widget.h"
 #include "main/main_session.h"
@@ -386,10 +387,7 @@ not_null<Ui::SettingsButton*> AddPeerGiftsButton(
 		if (navigation->showFrozenError()) {
 			return;
 		}
-		navigation->showSection(
-			std::make_shared<Info::Memento>(
-				peer,
-				Section::Type::PeerGifts));
+		navigation->showSection(Info::PeerGifts::Make(peer));
 	});
 	return wrap->entity();
 }
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 4c16dbab78..8183cbaeeb 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -47,6 +47,16 @@ class SessionController;
 
 namespace Info::PeerGifts {
 
+struct Tag {
+	explicit Tag(not_null<PeerData*> peer, int collectionId = 0)
+	: peer(peer)
+	, collectionId(collectionId) {
+	}
+
+	not_null<PeerData*> peer;
+	int collectionId = 0;
+};
+
 struct GiftTypePremium {
 	int64 cost = 0;
 	QString currency;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index d205cc5c24..63b983337b 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_hash.h"
 #include "api/api_premium.h"
 #include "apiwrap.h"
+#include "boxes/share_box.h"
 #include "boxes/star_gift_box.h"
 #include "core/ui_integration.h"
 #include "data/stickers/data_custom_emoji.h"
@@ -21,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/peer_gifts/info_peer_gifts_collections.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/sub_tabs.h"
 #include "ui/layers/generic_box.h"
@@ -129,6 +131,7 @@ public:
 
 	void reloadCollection(int id);
 	void editCollectionGifts(int id);
+	void shareCollectionLink(const QString &username, int id);
 	void editCollectionName(int id);
 	void confirmDeleteCollection(int id);
 	void collectionAdded(MTPStarGiftCollection result);
@@ -209,7 +212,7 @@ private:
 	std::vector<Data::GiftCollection> _collections;
 
 	Entries _all;
-	base::flat_map<int, Entries> _perCollection;
+	std::map<int, Entries> _perCollection;
 	not_null<Entries*> _entries;
 	not_null<std::vector<Entry>*> _list;
 	rpl::variable<Data::GiftsUpdate> _collectionChanges;
@@ -811,6 +814,11 @@ void InnerWidget::showMenuForCollection(int id) {
 	addAction(tr::lng_gift_collection_add_title(tr::now), [=] {
 		editCollectionGifts(id);
 	}, &st::menuIconGiftPremium);
+	if (const auto username = _peer->username(); !username.isEmpty()) {
+		addAction(tr::lng_stories_album_share(tr::now), [=] {
+			shareCollectionLink(username, id);
+		}, &st::menuIconShare);
+	}
 	addAction(tr::lng_gift_collection_edit(tr::now), [=] {
 		editCollectionName(id);
 	}, &st::menuIconEdit);
@@ -823,6 +831,12 @@ void InnerWidget::showMenuForCollection(int id) {
 	_menu->popup(QCursor::pos());
 }
 
+void InnerWidget::shareCollectionLink(const QString &username, int id) {
+	const auto url = _window->session().createInternalLinkFull(
+		username + u"/c/"_q + QString::number(id));
+	FastShareLink(_window, url);
+}
+
 void InnerWidget::editCollectionName(int id) {
 	const auto done = [=](QString name) {
 		collectionRenamed(id, name);
@@ -1190,9 +1204,17 @@ void InnerWidget::refreshCollectionsTabs() {
 		.session = &_window->session(),
 	});
 	if (!_collectionsTabs) {
+		const auto selectedId = _descriptor.current().collectionId;
+		const auto selected = (selectedId > 0
+			&& ranges::contains(
+				_collections,
+				selectedId,
+				&Data::GiftCollection::id))
+			? QString::number(selectedId)
+			: u"all"_q;
 		_collectionsTabs = std::make_unique<Ui::SubTabs>(
 			this,
-			Ui::SubTabs::Options{ .selected = u"all"_q, .centered = true},
+			Ui::SubTabs::Options{ .selected = selected, .centered = true },
 			std::move(tabs),
 			context);
 		_collectionsTabs->show();
@@ -1248,7 +1270,7 @@ void InnerWidget::collectionRemoved(int id) {
 		_descriptorChanges.fire(std::move(now));
 	}
 	Assert(_entries != &_perCollection[id]);
-	_perCollection.remove(id);
+	_perCollection.erase(id);
 	const auto removeFrom = [&](Entries &entries) {
 		for (auto &entry : entries.list) {
 			entry.gift.collectionIds.erase(
@@ -1439,8 +1461,14 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
 	}
 }
 
-Memento::Memento(not_null<PeerData*> peer)
-: ContentMemento(peer, nullptr, nullptr, PeerId()) {
+Memento::Memento(not_null<Controller*> controller)
+: ContentMemento(Tag{
+	controller->giftsPeer(),
+	controller->giftsCollectionId() }) {
+}
+
+Memento::Memento(not_null<PeerData*> peer, int collectionId)
+: ContentMemento(Tag{ peer, collectionId }) {
 }
 
 Section Memento::section() const {
@@ -1451,7 +1479,7 @@ object_ptr<ContentWidget> Memento::createWidget(
 		QWidget *parent,
 		not_null<Controller*> controller,
 		const QRect &geometry) {
-	auto result = object_ptr<Widget>(parent, controller, peer());
+	auto result = object_ptr<Widget>(parent, controller);
 	result->setInternalState(geometry, this);
 	return result;
 }
@@ -1466,16 +1494,16 @@ std::unique_ptr<ListState> Memento::listState() {
 
 Memento::~Memento() = default;
 
-Widget::Widget(
-	QWidget *parent,
-	not_null<Controller*> controller,
-	not_null<PeerData*> peer)
-: ContentWidget(parent, controller) {
+Widget::Widget(QWidget *parent, not_null<Controller*> controller)
+: ContentWidget(parent, controller)
+, _descriptor(Descriptor{
+	.collectionId = controller->giftsCollectionId(),
+}) {
 	_inner = setInnerWidget(
 		object_ptr<InnerWidget>(
 			this,
 			controller->parentController(),
-			peer,
+			controller->giftsPeer(),
 			_descriptor.value()));
 	_inner->notifyEnabled(
 	) | rpl::take(1) | rpl::start_with_next([=](bool enabled) {
@@ -1694,7 +1722,7 @@ void Widget::setInternalState(
 }
 
 std::shared_ptr<ContentMemento> Widget::doCreateMemento() {
-	auto result = std::make_shared<Memento>(peer());
+	auto result = std::make_shared<Memento>(controller());
 	saveState(result.get());
 	return result;
 }
@@ -1709,4 +1737,11 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
+std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, int albumId) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<Memento>(peer, albumId)));
+}
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index 852d1c2744..bf33486e97 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -58,7 +58,9 @@ class InnerWidget;
 
 class Memento final : public ContentMemento {
 public:
-	explicit Memento(not_null<PeerData*> peer);
+	Memento(not_null<Controller*> controller);
+	Memento(not_null<PeerData*> peer, int collectionId);
+	~Memento();
 
 	object_ptr<ContentWidget> createWidget(
 		QWidget *parent,
@@ -70,8 +72,6 @@ public:
 	void setListState(std::unique_ptr<ListState> state);
 	std::unique_ptr<ListState> listState();
 
-	~Memento();
-
 private:
 	std::unique_ptr<ListState> _listState;
 
@@ -79,10 +79,7 @@ private:
 
 class Widget final : public ContentWidget {
 public:
-	Widget(
-		QWidget *parent,
-		not_null<Controller*> controller,
-		not_null<PeerData*> peer);
+	Widget(QWidget *parent, not_null<Controller*> controller);
 
 	[[nodiscard]] not_null<PeerData*> peer() const;
 
@@ -120,4 +117,8 @@ private:
 
 };
 
+[[nodiscard]] std::shared_ptr<Info::Memento> Make(
+	not_null<PeerData*> peer,
+	int collectionId = 0);
+
 } // namespace Info::PeerGifts
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 43d38c2e02..ba762f044f 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_stories_list.h"
 #include "info/media/info_media_buttons.h"
 #include "info/media/info_media_list_widget.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/profile/info_profile_actions.h"
 #include "info/profile/info_profile_icon.h"
 #include "info/profile/info_profile_values.h"
@@ -456,10 +457,7 @@ void InnerWidget::addGiftsButton(Ui::MultiSlideTracker &tracker) {
 
 	const auto gifts = giftsWrap->entity();
 	gifts->addClickHandler([=] {
-		_controller->showSection(
-			std::make_shared<Info::Memento>(
-				user,
-				Section::Type::PeerGifts));
+		_controller->showSection(PeerGifts::Make(_peer));
 	});
 	auto label = rpl::duplicate(
 		count
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 9722ba9453..68b751a2e5 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -25,7 +25,8 @@ int ArchiveId() {
 Memento::Memento(not_null<Controller*> controller)
 : ContentMemento(Tag{
 	controller->storiesPeer(),
-	controller->storiesAlbumId() })
+	controller->storiesAlbumId(),
+	controller->storiesAddToAlbumId() })
 , _media(controller) {
 }
 
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 2db91068b7..e520e1cf42 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1289,6 +1289,7 @@ webPageAttributeTheme#54b56617 flags:# documents:flags.0?Vector<Document> settin
 webPageAttributeStory#2e94c3e7 flags:# peer:Peer id:int story:flags.0?StoryItem = WebPageAttribute;
 webPageAttributeStickerSet#50cc03d3 flags:# emojis:flags.0?true text_color:flags.1?true stickers:Vector<Document> = WebPageAttribute;
 webPageAttributeUniqueStarGift#cf6f6db8 gift:StarGift = WebPageAttribute;
+webPageAttributeStarGiftCollection#31cad303 icons:Vector<Document> = WebPageAttribute;
 
 messages.votesList#4899484e flags:# count:int votes:Vector<MessagePeerVote> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?string = messages.VotesList;
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 4196b62046..6a44af2a85 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -47,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/channel_statistics/earn/earn_format.h"
 #include "info/channel_statistics/earn/earn_icons.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "info/statistics/info_statistics_list_controllers.h"
 #include "info/info_controller.h"
@@ -1775,9 +1776,7 @@ void GenericCreditsEntryBox(
 			if (ok && showSection) {
 				if (const auto window = show->resolveWindow()) {
 					window->showSection(
-						std::make_shared<Info::Memento>(
-							window->session().user(),
-							Info::Section::Type::PeerGifts));
+						Info::PeerGifts::Make(window->session().user()));
 				}
 			}
 			if (const auto strong = weak.get()) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 2c4f9e0ae8..3a69f7b057 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_filters_menu.h"
 #include "window/window_separate_id.h"
 #include "info/channel_statistics/earn/info_channel_earn_list.h"
+#include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/stories/info_stories_widget.h"
 #include "info/info_memento.h"
 #include "info/info_controller.h"
@@ -655,6 +656,8 @@ void SessionNavigation::showPeerByLinkResolved(
 		}));
 	} else if (info.storyAlbumId > 0) {
 		showSection(Info::Stories::Make(peer, info.storyAlbumId));
+	} else if (info.giftCollectionId > 0) {
+		showSection(Info::PeerGifts::Make(peer, info.giftCollectionId));
 	} else if (bot && resolveType == ResolveType::BotApp) {
 		const auto itemId = info.clickFromMessageId;
 		const auto item = _session->data().message(itemId);
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index 7421aac748..bf6ecc2be7 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -41,6 +41,7 @@ struct PeerByLinkInfo {
 	MsgId messageId = ShowAtUnreadMsgId;
 	StoryId storyId = 0;
 	int storyAlbumId = 0;
+	int giftCollectionId = 0;
 	std::optional<TimeId> videoTimestamp;
 	QString text;
 	RepliesByLinkInfo repliesInfo;

From 4aab5da7aec3eeca65abdb2e9a79878e7df1939f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 30 Jul 2025 23:41:41 +0400
Subject: [PATCH 094/341] Initial global posts search implementation.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |  17 ++
 .../SourceFiles/boxes/send_credits_box.cpp    |  43 ---
 Telegram/SourceFiles/boxes/send_credits_box.h |   8 -
 Telegram/SourceFiles/dialogs/dialogs.style    |  31 ++
 .../dialogs/dialogs_inner_widget.cpp          |  10 +-
 .../dialogs/dialogs_search_posts.cpp          | 283 ++++++++++++++++++
 .../dialogs/dialogs_search_posts.h            |  75 +++++
 .../dialogs/ui/dialogs_suggestions.cpp        | 145 ++++++++-
 .../dialogs/ui/dialogs_suggestions.h          |  23 +-
 .../dialogs/ui/posts_search_intro.cpp         | 174 +++++++++++
 .../dialogs/ui/posts_search_intro.h           |  59 ++++
 .../settings/settings_credits_graphics.cpp    |   2 +-
 .../ui/controls/button_two_labels.cpp         |  57 ++++
 .../ui/controls/button_two_labels.h           |  26 ++
 Telegram/cmake/td_ui.cmake                    |   4 +
 16 files changed, 897 insertions(+), 62 deletions(-)
 create mode 100644 Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/dialogs_search_posts.h
 create mode 100644 Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
 create mode 100644 Telegram/SourceFiles/dialogs/ui/posts_search_intro.h
 create mode 100644 Telegram/SourceFiles/ui/controls/button_two_labels.cpp
 create mode 100644 Telegram/SourceFiles/ui/controls/button_two_labels.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 7875e86e2e..e77d098baa 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -709,6 +709,8 @@ PRIVATE
     dialogs/dialogs_search_from_controllers.h
     dialogs/dialogs_search_tags.cpp
     dialogs/dialogs_search_tags.h
+    dialogs/dialogs_search_posts.cpp
+    dialogs/dialogs_search_posts.h
     dialogs/dialogs_top_bar_suggestion.cpp
     dialogs/dialogs_top_bar_suggestion.h
     dialogs/dialogs_widget.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2290231cee..b363967f1a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -6745,6 +6745,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_recent_chats" = "Chats";
 "lng_recent_channels" = "Channels";
 "lng_recent_apps" = "Apps";
+"lng_recent_posts" = "Posts";
 "lng_all_photos" = "Photos";
 "lng_all_videos" = "Videos";
 "lng_all_downloads" = "Downloads";
@@ -6762,6 +6763,22 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_bot_apps_popular" = "Grossing apps";
 "lng_bot_apps_which" = "Which apps are included here? {link}";
 "lng_bot_apps_which_link" = "Learn >";
+"lng_posts_title" = "Global Search";
+"lng_posts_start" = "Type a keyword to search all posts from public channels.";
+"lng_posts_subscribe" = "Subscribe to Premium";
+"lng_posts_need_subscribe" = "Global search is a Premium feature.";
+"lng_posts_search_button" = "Search {query}";
+"lng_posts_remaining#one" = "{count} free search remaining today";
+"lng_posts_remaining#other" = "{count} free searches remaining today";
+"lng_posts_subtitle_empty" = "Telegram News";
+"lng_posts_subtitle" = "Public posts";
+"lng_posts_limit_reached" = "Limit Reached";
+"lng_posts_limit_about#one" = "You can make up to {count} search query per day.";
+"lng_posts_limit_about#other" = "You can make up to {count} search queries per day.";
+"lng_posts_limit_search_paid" = "Search for {cost}";
+"lng_posts_limit_unlocks" = "free search unlocks in {duration}";
+"lng_posts_paid_spent#one" = "**{count} Star** spent on extra search.";
+"lng_posts_paid_spent#other" = "**{count} Stars** spent on extra search.";
 
 "lng_popular_apps_info_title" = "Top Mini Apps";
 "lng_popular_apps_info_text" = "This catalogue ranks mini apps based on their daily revenue, measured in Stars. To be listed, developers must set their main mini apps in {bot} (as described {link}), have over **1,000** daily users, and earn a daily revenue above **1,000** Stars, based on the weekly average.";
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index c35951da35..8f355b1aa6 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -567,49 +567,6 @@ not_null<FlatLabel*> SetButtonMarkedLabel(
 	}), st, textFg);
 }
 
-void SetButtonTwoLabels(
-		not_null<Ui::RpWidget*> button,
-		rpl::producer<TextWithEntities> title,
-		rpl::producer<TextWithEntities> subtitle,
-		const style::FlatLabel &st,
-		const style::FlatLabel &subst,
-		const style::color *textFg) {
-	const auto buttonTitle = Ui::CreateChild<Ui::FlatLabel>(
-		button,
-		std::move(title),
-		st);
-	const auto buttonSubtitle = Ui::CreateChild<Ui::FlatLabel>(
-		button,
-		std::move(subtitle),
-		subst);
-	buttonSubtitle->setOpacity(0.6);
-	if (textFg) {
-		buttonTitle->setTextColorOverride((*textFg)->c);
-		buttonSubtitle->setTextColorOverride((*textFg)->c);
-		style::PaletteChanged() | rpl::start_with_next([=] {
-			buttonTitle->setTextColorOverride((*textFg)->c);
-			buttonSubtitle->setTextColorOverride((*textFg)->c);
-		}, buttonTitle->lifetime());
-	}
-	rpl::combine(
-		button->sizeValue(),
-		buttonTitle->sizeValue(),
-		buttonSubtitle->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize title, QSize subtitle) {
-		const auto two = title.height() + subtitle.height();
-		const auto titleTop = (outer.height() - two) / 2;
-		const auto subtitleTop = titleTop + title.height();
-		buttonTitle->moveToLeft(
-			(outer.width() - title.width()) / 2,
-			titleTop);
-		buttonSubtitle->moveToLeft(
-			(outer.width() - subtitle.width()) / 2,
-			subtitleTop);
-	}, buttonTitle->lifetime());
-	buttonTitle->setAttribute(Qt::WA_TransparentForMouseEvents);
-	buttonSubtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
-}
-
 void SendStarsForm(
 		not_null<Main::Session*> session,
 		std::shared_ptr<Payments::CreditsFormData> data,
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index f8227846b9..6dcaef1f8e 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -52,14 +52,6 @@ not_null<FlatLabel*> SetButtonMarkedLabel(
 	const style::FlatLabel &st,
 	const style::color *textFg = nullptr);
 
-void SetButtonTwoLabels(
-	not_null<Ui::RpWidget*> button,
-	rpl::producer<TextWithEntities> title,
-	rpl::producer<TextWithEntities> subtitle,
-	const style::FlatLabel &st,
-	const style::FlatLabel &subst,
-	const style::color *textFg = nullptr);
-
 void SendStarsForm(
 	not_null<Main::Session*> session,
 	std::shared_ptr<Payments::CreditsFormData> data,
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 40af906830..7b81b4c577 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -832,3 +832,34 @@ dialogsTopBarSuggestionTitleStyle: TextStyle(defaultTextStyle) {
 dialogsTopBarSuggestionAboutStyle: TextStyle(defaultTextStyle) {
 	font: font(11px);
 }
+
+postsSearchIntroTitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	minWidth: 64px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(semibold 16px);
+	}
+	align: align(top);
+}
+postsSearchIntroTitleMargin: margins(20px, 0px, 20px, 12px);
+postsSearchIntroSubtitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 64px;
+	align: align(top);
+}
+postsSearchIntroSubtitleMargin: margins(20px, 4px, 20px, 12px);
+postsSearchIntroButton: RoundButton(defaultActiveButton) {
+	width: 200px;
+	height: 42px;
+	textTop: 12px;
+	style: semiboldTextStyle;
+}
+postsSearchIntroFooter: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 64px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+postsSearchIntroFooterMargin: margins(20px, 12px, 20px, 0px);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 4ec8f4455c..4a7f9f57b4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1276,6 +1276,10 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 		if (!_searchResults.empty()) {
 			const auto text = showUnreadInSearchResults
 				? u"Search results"_q
+				: (_searchState.tab == ChatSearchTab::PublicPosts && !_searchIn)
+				? (_searchState.query.isEmpty()
+					? tr::lng_posts_subtitle_empty(tr::now)
+					: tr::lng_posts_subtitle(tr::now))
 				: tr::lng_search_found_results(
 					tr::now,
 					lt_count,
@@ -3089,7 +3093,8 @@ void InnerWidget::fillArchiveSearchMenu(not_null<Ui::PopupMenu*> menu) {
 		|| (_searchState.tab == ChatSearchTab::PublicPosts);
 	if (!folder
 		|| !folder->chatsList()->fullSize().current()
-		|| (!globalSearch && _searchState.inChat)) {
+		|| (!globalSearch && _searchState.inChat)
+		|| (_searchState.tab == ChatSearchTab::PublicPosts)) {
 		return;
 	}
 	const auto skip = session().settings().skipArchiveInSearch();
@@ -3468,7 +3473,8 @@ void InnerWidget::applySearchState(SearchState state) {
 		_filter = newFilter;
 		if (_filter.isEmpty()
 			&& !_searchState.fromPeer
-			&& _searchState.tags.empty()) {
+			&& _searchState.tags.empty()
+			&& _searchState.tab != ChatSearchTab::PublicPosts) {
 			clearFilter();
 		} else {
 			setState(WidgetState::Filtered);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
new file mode 100644
index 0000000000..e1fcbe87b1
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -0,0 +1,283 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/dialogs_search_posts.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "data/data_session.h"
+#include "data/data_peer_values.h"
+#include "history/history.h"
+#include "main/main_session.h"
+
+namespace Dialogs {
+namespace {
+
+constexpr auto kQueryDelay = crl::time(500);
+constexpr auto kPerPage = 50;
+
+} // namespace
+
+PostsSearch::PostsSearch(not_null<Main::Session*> session)
+: _session(session)
+, _api(&_session->api().instance())
+, _timer([=] { applyQuery(); })
+, _recheckTimer([=] { recheck(); }) {
+	Data::AmPremiumValue(_session) | rpl::start_with_next([=] {
+		maybePushPremiumUpdate();
+	}, _lifetime);
+}
+
+rpl::producer<PostsSearchState> PostsSearch::stateUpdates() const {
+	return _stateUpdates.events();
+}
+
+void PostsSearch::requestMore() {
+	if (_query) {
+		requestSearch(*_query);
+	}
+}
+
+void PostsSearch::setQuery(const QString &query) {
+	if (_query == query) {
+		return;
+	}
+	_query = query;
+	const auto i = _entries.find(query);
+	if (i != end(_entries)) {
+		pushStateUpdate(i->second);
+	} else if (query.isEmpty()) {
+		applyQuery();
+	} else {
+		_timer.callOnce(kQueryDelay);
+	}
+}
+
+void PostsSearch::setAllowedStars(int stars) {
+	if (_query) {
+		_entries[*_query].allowedStars = stars;
+		requestSearch(*_query);
+	}
+}
+
+void PostsSearch::pushStateUpdate(const Entry &entry) {
+	if (!entry.pages.empty() || entry.loaded) {
+		_stateUpdates.fire(PostsSearchState{
+			.first = (entry.pages.empty()
+				? std::vector<not_null<HistoryItem*>>()
+				: entry.pages.front()),
+			.totalCount = entry.totalCount,
+		});
+	} else if (entry.checkId || entry.searchId) {
+		_stateUpdates.fire(PostsSearchState{
+			.loading = true,
+		});
+	} else {
+		Assert(_floodState.has_value());
+		auto copy = _floodState;
+		copy->query = *_query;
+		copy->needsPremium = !_session->premium();
+		_stateUpdates.fire(PostsSearchState{
+			.intro = std::move(copy),
+		});
+	}
+}
+
+void PostsSearch::maybePushPremiumUpdate() {
+	if (!_floodState || !_query) {
+		return;
+	}
+	auto &entry = _entries[*_query];
+	if (!entry.pages.empty()
+		|| entry.loaded
+		|| entry.checkId
+		|| entry.searchId) {
+		return;
+	}
+	pushStateUpdate(entry);
+}
+
+void PostsSearch::applyQuery() {
+	Expects(_query.has_value());
+
+	_timer.cancel();
+	if (_query->isEmpty()) {
+		requestSearch(QString());
+	} else {
+		requestState(*_query);
+	}
+}
+
+void PostsSearch::requestSearch(const QString &query) {
+	auto &entry = _entries[query];
+	if (entry.searchId || entry.loaded) {
+		return;
+	}
+
+	using Flag = MTPchannels_SearchPosts::Flag;
+	entry.searchId = _api.request(MTPchannels_SearchPosts(
+		MTP_flags(Flag::f_query
+			| (entry.allowedStars ? Flag::f_allow_paid_stars : Flag())),
+		MTP_string(), // hashtag
+		MTP_string(query),
+		MTP_int(entry.offsetRate),
+		(entry.offsetPeer ? entry.offsetPeer->input : MTP_inputPeerEmpty()),
+		MTP_int(entry.offsetId),
+		MTP_int(kPerPage),
+		MTP_long(entry.allowedStars)
+	)).done([=](const MTPmessages_Messages &result) {
+		auto &entry = _entries[query];
+		entry.searchId = 0;
+
+		const auto initial = !entry.offsetId;
+		const auto owner = &_session->data();
+		const auto processList = [&](const MTPVector<MTPMessage> &messages) {
+			auto result = std::vector<not_null<HistoryItem*>>();
+			for (const auto &message : messages.v) {
+				const auto msgId = IdFromMessage(message);
+				const auto peerId = PeerFromMessage(message);
+				const auto lastDate = DateFromMessage(message);
+				if (const auto peer = owner->peerLoaded(peerId)) {
+					if (lastDate) {
+						const auto item = owner->addNewMessage(
+							message,
+							MessageFlags(),
+							NewMessageType::Existing);
+						result.push_back(item);
+					}
+					entry.offsetPeer = peer;
+				} else {
+					LOG(("API Error: a search results with not loaded peer %1"
+						).arg(peerId.value));
+				}
+				entry.offsetId = msgId;
+			}
+			return result;
+		};
+		auto totalCount = 0;
+		auto messages = result.match([&](const MTPDmessages_messages &data) {
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			entry.loaded = true;
+			auto list = processList(data.vmessages());
+			totalCount = list.size();
+			return list;
+		}, [&](const MTPDmessages_messagesSlice &data) {
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			auto list = processList(data.vmessages());
+			const auto nextRate = data.vnext_rate();
+			const auto rateUpdated = nextRate
+				&& (nextRate->v != entry.offsetRate);
+			const auto finished = list.empty();
+			if (rateUpdated) {
+				entry.offsetRate = nextRate->v;
+			}
+			if (finished) {
+				entry.loaded = true;
+			}
+			totalCount = data.vcount().v;
+			if (const auto flood = data.vsearch_flood()) {
+				setFloodStateFrom(flood->data());
+			}
+			return list;
+		}, [&](const MTPDmessages_channelMessages &data) {
+			LOG(("API Error: "
+				"received messages.channelMessages when no channel "
+				"was passed! (PostsSearch::performSearch)"));
+			owner->processUsers(data.vusers());
+			owner->processChats(data.vchats());
+			auto list = processList(data.vmessages());
+			if (list.empty()) {
+				entry.loaded = true;
+			}
+			totalCount = data.vcount().v;
+			return list;
+		}, [&](const MTPDmessages_messagesNotModified &) {
+			LOG(("API Error: received messages.messagesNotModified! "
+				"(PostsSearch::performSearch)"));
+			entry.loaded = true;
+			return std::vector<not_null<HistoryItem*>>();
+		});
+		if (initial) {
+			entry.pages.clear();
+		}
+		entry.pages.push_back(std::move(messages));
+		const auto count = int(entry.pages.size());
+		const auto full = entry.loaded ? count : std::max(count, totalCount);
+		entry.totalCount = full;
+		if (initial && _query == query) {
+			pushStateUpdate(entry);
+		}
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _entries[query];
+		entry.searchId = 0;
+
+		const auto initial = !entry.offsetId;
+		const auto &type = error.type();
+		if (initial && type.startsWith(u"FLOOD_WAIT_"_q)) {
+			requestState(query);
+		} else {
+			entry.loaded = true;
+		}
+	}).handleFloodErrors().send();
+}
+
+void PostsSearch::setFloodStateFrom(const MTPDsearchPostsFlood &data) {
+	_recheckTimer.cancel();
+	const auto left = data.vremains().v;
+	const auto next = data.vwait_till().value_or_empty();
+	if (!left && next > 0) {
+		const auto now = base::unixtime::now();
+		const auto delay = std::clamp(next - now, 1, 86401);
+		_recheckTimer.callOnce(delay * crl::time(1000));
+	}
+	_floodState = PostsSearchIntroState{
+		.freeSearchesPerDay = data.vtotal_daily().v,
+		.freeSearchesLeft = left,
+		.nextFreeSearchTime = next,
+		.starsPerPaidSearch = uint32(data.vstars_amount().v),
+	};
+}
+
+void PostsSearch::recheck() {
+	requestState(*_query, true);
+}
+
+void PostsSearch::requestState(const QString &query, bool force) {
+	auto &entry = _entries[query];
+	if (force) {
+		_api.request(base::take(entry.checkId)).cancel();
+	} else if (entry.checkId || entry.loaded) {
+		return;
+	}
+
+	using Flag = MTPchannels_CheckSearchPostsFlood::Flag;
+	entry.checkId = _api.request(MTPchannels_CheckSearchPostsFlood(
+		MTP_flags(Flag::f_query),
+		MTP_string(query)
+	)).done([=](const MTPSearchPostsFlood &result) {
+		auto &entry = _entries[query];
+		entry.checkId = 0;
+
+		const auto &data = result.data();
+		setFloodStateFrom(data);
+		if (data.is_query_is_free()) {
+			if (!entry.loaded) {
+				requestSearch(query);
+			}
+		} else if (_query == query) {
+			pushStateUpdate(entry);
+		}
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _entries[query];
+		entry.checkId = 0;
+		entry.loaded = true;
+	}).handleFloodErrors().send();
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
new file mode 100644
index 0000000000..630c461ab2
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
@@ -0,0 +1,75 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/timer.h"
+#include "dialogs/ui/posts_search_intro.h"
+#include "mtproto/sender.h"
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Dialogs {
+
+struct PostsSearchState {
+	std::optional<PostsSearchIntroState> intro;
+	std::vector<not_null<HistoryItem*>> first;
+	int totalCount = 0;
+	bool loading = false;
+};
+
+class PostsSearch final {
+public:
+	explicit PostsSearch(not_null<Main::Session*> session);
+
+	[[nodiscard]] rpl::producer<PostsSearchState> stateUpdates() const;
+
+	void setQuery(const QString &query);
+	void setAllowedStars(int stars);
+	void requestMore();
+
+private:
+	struct Entry {
+		std::vector<std::vector<not_null<HistoryItem*>>> pages;
+		int totalCount = 0;
+		mtpRequestId searchId = 0;
+		mtpRequestId checkId = 0;
+		PeerData *offsetPeer = nullptr;
+		MsgId offsetId = 0;
+		int offsetRate = 0;
+		int allowedStars = 0;
+		bool loaded = false;
+	};
+
+	void recheck();
+	void applyQuery();
+	void requestSearch(const QString &query);
+	void requestState(const QString &query, bool force = false);
+	void setFloodStateFrom(const MTPDsearchPostsFlood &data);
+	void pushStateUpdate(const Entry &entry);
+	void maybePushPremiumUpdate();
+
+	const not_null<Main::Session*> _session;
+
+	MTP::Sender _api;
+
+	base::Timer _timer;
+	base::Timer _recheckTimer;
+	base::flat_map<QString, Entry> _entries;
+	std::optional<QString> _query;
+
+	std::optional<PostsSearchIntroState> _floodState;
+
+	rpl::event_stream<PostsSearchState> _stateUpdates;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index a66fe7488b..5786dc9054 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -24,6 +24,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_user.h"
 #include "dialogs/ui/chat_search_empty.h"
+#include "dialogs/ui/chat_search_in.h"
+#include "dialogs/ui/posts_search_intro.h"
+#include "dialogs/dialogs_inner_widget.h"
+#include "dialogs/dialogs_search_posts.h"
 #include "history/history.h"
 #include "info/downloads/info_downloads_widget.h"
 #include "info/media/info_media_widget.h"
@@ -34,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
+#include "settings/settings_premium.h"
 #include "storage/storage_shared_media.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/swipe_handler.h"
@@ -1331,6 +1336,8 @@ Suggestions::Suggestions(
 , _appsScroll(std::make_unique<Ui::ElasticScroll>(this))
 , _appsContent(
 	_appsScroll->setOwnedWidget(object_ptr<Ui::VerticalLayout>(this)))
+, _postsScroll(std::make_unique<Ui::ElasticScroll>(this))
+, _postsWrap(_postsScroll->setOwnedWidget(object_ptr<Ui::RpWidget>(this)))
 , _recentApps(setupRecentApps())
 , _popularApps(setupPopularApps())
 , _searchQueryTimer([=] { applySearchQuery(); }) {
@@ -1397,6 +1404,7 @@ void Suggestions::setupTabs() {
 		{ Key{ Tab::Chats }, tr::lng_recent_chats(tr::now) },
 		{ Key{ Tab::Channels }, tr::lng_recent_channels(tr::now) },
 		{ Key{ Tab::Apps }, tr::lng_recent_apps(tr::now) },
+		{ Key{ Tab::Posts }, tr::lng_recent_posts(tr::now) },
 		{ Key{ Tab::Media, MediaType::Photo }, tr::lng_all_photos(tr::now) },
 		{ Key{ Tab::Media, MediaType::Video }, tr::lng_all_videos(tr::now) },
 		{ Key{ Tab::Downloads }, tr::lng_all_downloads(tr::now) },
@@ -1478,7 +1486,7 @@ void Suggestions::setupChats() {
 				Ui::Text::FixAmpersandInAction),
 			.removeAllConfirm = tr::lng_recent_hide_sure(tr::now),
 			.removeAll = removeAll,
-		});
+			});
 	}, _topPeers->lifetime());
 
 	_topPeers->scrollToRequests(
@@ -1496,8 +1504,8 @@ void Suggestions::setupChats() {
 }
 
 void Suggestions::handlePressForChatPreview(
-		PeerId id,
-		Fn<void(bool)> callback) {
+	PeerId id,
+	Fn<void(bool)> callback) {
 	callback = crl::guard(this, callback);
 	const auto row = RowDescriptor(
 		_controller->session().data().history(id),
@@ -1812,7 +1820,10 @@ bool Suggestions::consumeSearchQuery(const QString &query) {
 	const auto key = _key.current();
 	const auto tab = key.tab;
 	const auto type = (key.tab == Tab::Media) ? key.mediaType : Type::kCount;
-	if (tab != Tab::Downloads
+	if (tab == Tab::Posts) {
+		setPostsSearchQuery(query);
+		return !query.isEmpty();
+	} else if (tab != Tab::Downloads
 		&& type != Type::File
 		&& type != Type::Link
 		&& type != Type::MusicFile) {
@@ -1831,6 +1842,111 @@ bool Suggestions::consumeSearchQuery(const QString &query) {
 	return true;
 }
 
+void Suggestions::setupPostsSearch() {
+	_postsSearch = std::make_unique<PostsSearch>(&_controller->session());
+
+	_postsSearch->stateUpdates(
+	) | rpl::start_with_next([=](const PostsSearchState &state) {
+		if (state.intro) {
+			if (!_postsSearchIntro) {
+				setupPostsIntro(*state.intro);
+			} else {
+				_postsSearchIntro->update(*state.intro);
+			}
+			return;
+		} else if (!_postsContent) {
+			setupPostsResults();
+		}
+
+		_postsContent->applySearchState(SearchState{
+			.tab = ChatSearchTab::PublicPosts,
+			.query = _searchQuery,
+		});
+		if (state.loading) {
+			_postsContent->searchRequested(true);
+		} else {
+			_postsContent->searchReceived(
+				state.first,
+				nullptr,
+				{ .posts = true, .start = true },
+				state.totalCount);
+		}
+		const auto top = _postsScroll->scrollTop();
+		const auto height = _postsScroll->height();
+		_postsContent->setVisibleTopBottom(top, top + height);
+	}, _postsWrap->lifetime());
+}
+
+void Suggestions::setPostsSearchQuery(const QString &query) {
+	if (!_postsSearch) {
+		setupPostsSearch();
+	}
+	_searchQueryTimer.cancel();
+	_postsSearch->setQuery(query);
+}
+
+void Suggestions::setupPostsResults() {
+	Expects(!_postsContent);
+
+	delete base::take(_postsSearchIntro);
+	_postsContent = Ui::CreateChild<InnerWidget>(
+		_postsWrap.get(),
+		_controller,
+		rpl::single(InnerWidget::ChildListShown()));
+
+	_postsContent->applySearchState(SearchState{
+		.tab = ChatSearchTab::PublicPosts,
+		.query = _searchQuery,
+	});
+	_postsContent->searchRequested(true);
+
+	_postsContent->chosenRow(
+	) | rpl::start_with_next([=](const ChosenRow &row) {
+		const auto history = row.key.history();
+		if (!history) {
+			return;
+		}
+		_persist = true;
+		const auto showAtMsgId = row.message.fullId.msg;
+		auto params = Window::SectionShow(
+			Window::SectionShow::Way::ClearStack);
+		params.highlight = Window::SearchHighlightId(_searchQuery);
+		if (row.newWindow) {
+			_controller->showInNewWindow(history->peer, showAtMsgId);
+		} else {
+			_controller->showThread(history, showAtMsgId, params);
+		}
+	}, _postsContent->lifetime());
+
+	_postsContent->heightValue() | rpl::start_with_next([=](int height) {
+		_postsWrap->resize(_postsWrap->width(), height);
+	}, _postsContent->lifetime());
+	_postsContent->setNarrowRatio(0.);
+	_postsContent->show();
+	updateControlsGeometry();
+}
+
+void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
+	Expects(!_postsSearchIntro);
+
+	delete base::take(_postsContent);
+	_postsSearchIntro = Ui::CreateChild<PostsSearchIntro>(_postsWrap, intro);
+
+	_postsSearchIntro->searchWithStars(
+	) | rpl::start_with_next([=](int stars) {
+		if (!_controller->session().premium()) {
+			Settings::ShowPremium(
+				_controller,
+				u"posts_search"_q);
+		} else {
+			_postsSearch->setAllowedStars(stars);
+		}
+	}, _postsSearchIntro->lifetime());
+
+	_postsSearchIntro->show();
+	updateControlsGeometry();
+}
+
 void Suggestions::applySearchQuery() {
 	const auto key = _key.current();
 	const auto controller = _mediaLists[key].wrap->controller();
@@ -1926,7 +2042,10 @@ void Suggestions::switchTab(Key key) {
 }
 
 void Suggestions::ensureContent(Key key) {
-	if (key.tab != Tab::Downloads && key.tab != Tab::Media) {
+	if (key.tab == Tab::Posts) {
+		setPostsSearchQuery(QString());
+		return;
+	} else if (key.tab != Tab::Downloads && key.tab != Tab::Media) {
 		return;
 	}
 	auto &list = _mediaLists[key];
@@ -1958,6 +2077,7 @@ void Suggestions::startSlideAnimation(Key was, Key now) {
 			case Tab::Chats: return _chatsScroll.get();
 			case Tab::Channels: return _channelsScroll.get();
 			case Tab::Apps: return _appsScroll.get();
+			case Tab::Posts: return _postsScroll.get();
 			}
 			return _mediaLists[key].wrap;
 		};
@@ -2009,6 +2129,7 @@ void Suggestions::startShownAnimation(bool shown, Fn<void()> finish) {
 	_chatsScroll->hide();
 	_channelsScroll->hide();
 	_appsScroll->hide();
+	_postsScroll->hide();
 	for (const auto &[key, list] : _mediaLists) {
 		list.wrap->hide();
 	}
@@ -2028,6 +2149,7 @@ void Suggestions::finishShow() {
 	_chatsScroll->setVisible(key == Key{ Tab::Chats });
 	_channelsScroll->setVisible(key == Key{ Tab::Channels });
 	_appsScroll->setVisible(key == Key{ Tab::Apps });
+	_postsScroll->setVisible(key == Key{ Tab::Posts });
 	for (const auto &[mediaKey, list] : _mediaLists) {
 		list.wrap->setVisible(key == mediaKey);
 		if (key == mediaKey) {
@@ -2042,6 +2164,8 @@ void Suggestions::finishShow() {
 		reinstallSwipe(_channelsScroll.get());
 	} else if (key == Key{ Tab::Apps }) {
 		reinstallSwipe(_appsScroll.get());
+	} else if (key == Key{ Tab::Posts }) {
+		reinstallSwipe(_postsScroll.get());
 	}
 }
 
@@ -2055,6 +2179,7 @@ std::vector<Suggestions::Key> Suggestions::TabKeysFor(
 		{ Tab::Chats },
 		{ Tab::Channels },
 		{ Tab::Apps },
+		{ Tab::Posts },
 		{ Tab::Media, MediaType::Photo },
 		{ Tab::Media, MediaType::Video },
 		{ Tab::Downloads },
@@ -2119,6 +2244,16 @@ void Suggestions::updateControlsGeometry() {
 	_appsScroll->setGeometry(content);
 	_appsContent->resizeToWidth(w);
 
+	_postsScroll->setGeometry(content);
+	_postsWrap->resizeToWidth(w);
+	if (_postsSearchIntro) {
+		_postsSearchIntro->setGeometry(0, 0, w, height() - tabs);
+	} else if (_postsContent) {
+		_postsContent->resizeToWidth(w);
+		_postsContent->setMinimumHeight(height() - tabs);
+		_postsContent->refresh();
+	}
+
 	const auto expanding = false;
 	for (const auto &[key, list] : _mediaLists) {
 		const auto full = !list.wrap->scrollBottomSkip();
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index f269085f13..d536f3a9cd 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -32,10 +32,11 @@ namespace Storage {
 enum class SharedMediaType : signed char;
 } // namespace Storage
 
-namespace Ui {
-namespace Controls {
+namespace Ui::Controls {
 struct SwipeHandlerArgs;
-} // namespace Controls
+} // namespace Ui::Controls
+
+namespace Ui {
 class BoxContent;
 class ScrollArea;
 class ElasticScroll;
@@ -51,6 +52,10 @@ class SessionController;
 
 namespace Dialogs {
 
+class InnerWidget;
+class PostsSearch;
+class PostsSearchIntro;
+struct PostsSearchIntroState;
 enum class SearchEmptyIcon;
 
 struct RecentPeersList {
@@ -118,6 +123,7 @@ private:
 		Chats,
 		Channels,
 		Apps,
+		Posts,
 		Media,
 		Downloads,
 	};
@@ -209,6 +215,11 @@ private:
 	void updateControlsGeometry();
 	void applySearchQuery();
 
+	void setupPostsSearch();
+	void setPostsSearchQuery(const QString &query);
+	void setupPostsResults();
+	void setupPostsIntro(const PostsSearchIntroState &intro);
+
 	const not_null<Window::SessionController*> _controller;
 
 	const std::unique_ptr<Ui::ScrollArea> _tabsScroll;
@@ -240,6 +251,12 @@ private:
 	const std::unique_ptr<Ui::ElasticScroll> _appsScroll;
 	const not_null<Ui::VerticalLayout*> _appsContent;
 
+	std::unique_ptr<PostsSearch> _postsSearch;
+	const std::unique_ptr<Ui::ElasticScroll> _postsScroll;
+	const not_null<Ui::RpWidget*> _postsWrap;
+	PostsSearchIntro *_postsSearchIntro = nullptr;
+	InnerWidget *_postsContent = nullptr;
+
 	rpl::producer<> _recentAppsRefreshed;
 	Fn<bool(not_null<PeerData*>)> _recentAppsShows;
 	const std::unique_ptr<ObjectList> _recentApps;
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
new file mode 100644
index 0000000000..b0fe7cbd5b
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -0,0 +1,174 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "dialogs/ui/posts_search_intro.h"
+
+#include "base/timer_rpl.h"
+#include "base/unixtime.h"
+#include "lang/lang_keys.h"
+#include "ui/controls/button_two_labels.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_credits.h"
+#include "styles/style_dialogs.h"
+
+namespace Dialogs {
+namespace {
+
+[[nodiscard]] rpl::producer<QString> FormatCountdownTill(TimeId when) {
+	return rpl::single(rpl::empty) | rpl::then(
+		base::timer_each(1000)
+	) | rpl::map([=] {
+		const auto now = base::unixtime::now();
+		const auto delta = std::max(when - now, 0);
+		const auto hours = delta / 3600;
+		const auto minutes = (delta % 3600) / 60;
+		const auto seconds = delta % 60;
+		constexpr auto kZero = QChar('0');
+		return (hours > 0)
+			? u"%1:%2:%3"_q
+				.arg(hours)
+				.arg(minutes, 2, 10, kZero)
+				.arg(seconds, 2, 10, kZero)
+			: u"%1:%2"_q
+				.arg(minutes)
+				.arg(seconds, 2, 10, kZero);
+	});
+}
+
+} // namespace
+
+PostsSearchIntro::PostsSearchIntro(
+	not_null<Ui::RpWidget*> parent,
+	PostsSearchIntroState state)
+: RpWidget(parent)
+, _state(std::move(state))
+, _content(std::make_unique<Ui::VerticalLayout>(this)) {
+	setup();
+}
+
+PostsSearchIntro::~PostsSearchIntro() = default;
+
+void PostsSearchIntro::update(PostsSearchIntroState state) {
+	_state = std::move(state);
+}
+
+rpl::producer<int> PostsSearchIntro::searchWithStars() const {
+	return _button->clicks() | rpl::map([=] {
+		const auto &now = _state.current();
+		return (now.needsPremium || now.freeSearchesLeft)
+			? 0
+			: int(now.starsPerPaidSearch);
+	});
+}
+
+void PostsSearchIntro::setup() {
+	auto title = _state.value(
+	) | rpl::map([](const PostsSearchIntroState &state) {
+		return (state.needsPremium || state.freeSearchesLeft > 0)
+			? tr::lng_posts_title()
+			: tr::lng_posts_limit_reached();
+	}) | rpl::flatten_latest();
+
+	auto subtitle = _state.value(
+	) | rpl::map([](const PostsSearchIntroState &state) {
+		return (state.needsPremium || state.freeSearchesLeft > 0)
+			? tr::lng_posts_start()
+			: tr::lng_posts_limit_about(
+				lt_count,
+				rpl::single(state.freeSearchesPerDay * 1.));
+	}) | rpl::flatten_latest();
+
+	auto footer = _state.value(
+	) | rpl::map([](const PostsSearchIntroState &state) {
+		if (state.needsPremium) {
+			return tr::lng_posts_need_subscribe();
+		} else if (state.freeSearchesLeft > 0) {
+			return tr::lng_posts_remaining(
+				lt_count,
+				rpl::single(state.freeSearchesLeft * 1.));
+		} else {
+			return rpl::single(QString());
+		}
+	}) | rpl::flatten_latest();
+
+	_title = _content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content.get(),
+			std::move(title),
+			st::postsSearchIntroTitle),
+		st::postsSearchIntroTitleMargin);
+	_title->setTryMakeSimilarLines(true);
+	_subtitle = _content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content.get(),
+			std::move(subtitle),
+			st::postsSearchIntroSubtitle),
+		st::postsSearchIntroSubtitleMargin);
+	_subtitle->setTryMakeSimilarLines(true);
+	_button = _content->add(
+		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			_content.get(),
+			object_ptr<Ui::RoundButton>(
+				_content.get(),
+				rpl::single(QString()),
+				st::postsSearchIntroButton))
+	)->entity();
+	_button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	_footer = _content->add(
+		object_ptr<Ui::FlatLabel>(
+			_content.get(),
+			std::move(footer),
+			st::postsSearchIntroFooter),
+		st::postsSearchIntroFooterMargin);
+	_footer->setTryMakeSimilarLines(true);
+
+	_state.value(
+	) | rpl::start_with_next([=](const PostsSearchIntroState &state) {
+		auto copy = _button->children();
+		for (const auto child : copy) {
+			delete child;
+		}
+		if (state.needsPremium) {
+			_button->setText(tr::lng_posts_subscribe());
+		} else if (state.freeSearchesLeft > 0) {
+			_button->setText(tr::lng_posts_search_button(
+				lt_query,
+				rpl::single(state.query)));
+		} else {
+			_button->setText(rpl::single(QString()));
+
+			Ui::SetButtonTwoLabels(
+				_button,
+				tr::lng_posts_limit_search_paid(
+					lt_cost,
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmoji
+					).append(
+						Lang::FormatCountDecimal(state.starsPerPaidSearch))),
+					Ui::Text::WithEntities),
+				tr::lng_posts_limit_unlocks(
+					lt_duration,
+					FormatCountdownTill(
+						state.nextFreeSearchTime
+					) | Ui::Text::ToWithEntities(),
+					Ui::Text::WithEntities),
+				st::resaleButtonTitle,
+				st::resaleButtonSubtitle);
+		}
+	}, _button->lifetime());
+}
+
+void PostsSearchIntro::resizeEvent(QResizeEvent *e) {
+	_content->resizeToWidth(width());
+	const auto top = std::max(0, (height() - _content->height()) / 3);
+	_content->move(0, top);
+}
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.h b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.h
new file mode 100644
index 0000000000..cebd6e512a
--- /dev/null
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.h
@@ -0,0 +1,59 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/rp_widget.h"
+
+namespace Ui {
+class FlatLabel;
+class RoundButton;
+class VerticalLayout;
+} // namespace Ui
+
+namespace Dialogs {
+
+struct PostsSearchIntroState {
+	QString query;
+	int freeSearchesPerDay = 0;
+	int freeSearchesLeft = 0;
+	TimeId nextFreeSearchTime = 0;
+	uint32 starsPerPaidSearch : 31 = 0;
+	uint32 needsPremium : 1 = 0;
+
+	friend inline bool operator==(
+		PostsSearchIntroState,
+		PostsSearchIntroState) = default;
+};
+
+class PostsSearchIntro final : public Ui::RpWidget {
+public:
+	PostsSearchIntro(
+		not_null<Ui::RpWidget*> parent,
+		PostsSearchIntroState state);
+	~PostsSearchIntro();
+
+	void update(PostsSearchIntroState state);
+
+	[[nodiscard]] rpl::producer<int> searchWithStars() const;
+
+private:
+	void resizeEvent(QResizeEvent *e) override;
+
+	void setup();
+
+	rpl::variable<PostsSearchIntroState> _state;
+
+	std::unique_ptr<Ui::VerticalLayout> _content;
+	Ui::FlatLabel *_title = nullptr;
+	Ui::FlatLabel *_subtitle = nullptr;
+	Ui::RoundButton *_button = nullptr;
+	Ui::FlatLabel *_footer = nullptr;
+
+};
+
+} // namespace Dialogs
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 6a44af2a85..c49994a9bd 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -17,7 +17,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/gift_premium_box.h"
 #include "boxes/share_box.h"
-#include "boxes/send_credits_box.h" // SetButtonTwoLabels
 #include "boxes/star_gift_box.h"
 #include "boxes/transfer_gift_box.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
@@ -64,6 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/controls/button_two_labels.h"
 #include "ui/controls/ton_common.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/dynamic_image.h"
diff --git a/Telegram/SourceFiles/ui/controls/button_two_labels.cpp b/Telegram/SourceFiles/ui/controls/button_two_labels.cpp
new file mode 100644
index 0000000000..2a9bf513f4
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/button_two_labels.cpp
@@ -0,0 +1,57 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/controls/button_two_labels.h"
+
+#include "ui/widgets/labels.h"
+
+namespace Ui {
+
+void SetButtonTwoLabels(
+		not_null<Ui::RpWidget*> button,
+		rpl::producer<TextWithEntities> title,
+		rpl::producer<TextWithEntities> subtitle,
+		const style::FlatLabel &st,
+		const style::FlatLabel &subst,
+		const style::color *textFg) {
+	const auto buttonTitle = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		std::move(title),
+		st);
+	const auto buttonSubtitle = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		std::move(subtitle),
+		subst);
+	buttonSubtitle->setOpacity(0.6);
+	if (textFg) {
+		buttonTitle->setTextColorOverride((*textFg)->c);
+		buttonSubtitle->setTextColorOverride((*textFg)->c);
+		style::PaletteChanged() | rpl::start_with_next([=] {
+			buttonTitle->setTextColorOverride((*textFg)->c);
+			buttonSubtitle->setTextColorOverride((*textFg)->c);
+		}, buttonTitle->lifetime());
+	}
+	rpl::combine(
+		button->sizeValue(),
+		buttonTitle->sizeValue(),
+		buttonSubtitle->sizeValue()
+	) | rpl::start_with_next([=](QSize outer, QSize title, QSize subtitle) {
+		const auto two = title.height() + subtitle.height();
+		const auto titleTop = (outer.height() - two) / 2;
+		const auto subtitleTop = titleTop + title.height();
+		buttonTitle->moveToLeft(
+			(outer.width() - title.width()) / 2,
+			titleTop);
+		buttonSubtitle->moveToLeft(
+			(outer.width() - subtitle.width()) / 2,
+			subtitleTop);
+	}, buttonTitle->lifetime());
+	buttonTitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+	buttonSubtitle->setAttribute(Qt::WA_TransparentForMouseEvents);
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/controls/button_two_labels.h b/Telegram/SourceFiles/ui/controls/button_two_labels.h
new file mode 100644
index 0000000000..5de559a96c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/controls/button_two_labels.h
@@ -0,0 +1,26 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace style {
+struct FlatLabel;
+} // namespace style
+
+namespace Ui {
+
+class RpWidget;
+
+void SetButtonTwoLabels(
+    not_null<Ui::RpWidget*> button,
+    rpl::producer<TextWithEntities> title,
+    rpl::producer<TextWithEntities> subtitle,
+    const style::FlatLabel &st,
+    const style::FlatLabel &subst,
+    const style::color *textFg = nullptr);
+
+} // namespace Ui
\ No newline at end of file
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index bd52902889..75e112d46f 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -109,6 +109,8 @@ PRIVATE
     dialogs/ui/dialogs_stories_list.h
     dialogs/ui/dialogs_top_bar_suggestion_content.cpp
     dialogs/ui/dialogs_top_bar_suggestion_content.h
+    dialogs/ui/posts_search_intro.cpp
+    dialogs/ui/posts_search_intro.h
     dialogs/ui/top_peers_strip.cpp
     dialogs/ui/top_peers_strip.h
 
@@ -361,6 +363,8 @@ PRIVATE
     ui/chat/pinned_bar.h
     ui/chat/requests_bar.cpp
     ui/chat/requests_bar.h
+    ui/controls/button_two_labels.cpp
+    ui/controls/button_two_labels.h
     ui/controls/call_mute_button.cpp
     ui/controls/call_mute_button.h
     ui/controls/chat_service_checkbox.cpp

From 608481df387b1ab4221209991048a63c319e42a4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 13:23:21 +0400
Subject: [PATCH 095/341] Fix build in the next version of MSVC.

---
 Telegram/lib_base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index f254b4f0be..1245f296cb 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit f254b4f0be10d2c36ac817fbafd3d2254b931bdc
+Subproject commit 1245f296cbaae0534937849a48f1d180b6b62526

From b5c1046dcab89de160b83a03452cd76b099d56d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 13:24:11 +0400
Subject: [PATCH 096/341] Implement paid global search requests.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/dialogs/dialogs.style    |  4 +-
 .../dialogs/dialogs_inner_widget.cpp          |  3 +-
 .../dialogs/dialogs_search_posts.cpp          | 44 ++++++++++++++-----
 .../dialogs/dialogs_search_posts.h            |  2 +-
 .../dialogs/ui/dialogs_suggestions.cpp        | 32 +++++++++++++-
 .../dialogs/ui/posts_search_intro.cpp         |  1 +
 .../settings/settings_credits_graphics.cpp    |  7 ++-
 .../settings/settings_credits_graphics.h      |  5 ++-
 .../ui/controls/button_two_labels.cpp         |  2 +
 10 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b363967f1a..2711328e0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2945,6 +2945,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_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.";
 "lng_credits_enough" = "You have enough stars at the moment. {link}";
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 7b81b4c577..849c98f8d6 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -841,13 +841,13 @@ postsSearchIntroTitle: FlatLabel(defaultFlatLabel) {
 	}
 	align: align(top);
 }
-postsSearchIntroTitleMargin: margins(20px, 0px, 20px, 12px);
+postsSearchIntroTitleMargin: margins(20px, 0px, 20px, 4px);
 postsSearchIntroSubtitle: FlatLabel(defaultFlatLabel) {
 	textFg: windowSubTextFg;
 	minWidth: 64px;
 	align: align(top);
 }
-postsSearchIntroSubtitleMargin: margins(20px, 4px, 20px, 12px);
+postsSearchIntroSubtitleMargin: margins(20px, 4px, 20px, 16px);
 postsSearchIntroButton: RoundButton(defaultActiveButton) {
 	width: 200px;
 	height: 42px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 4a7f9f57b4..679eef689b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -164,7 +164,8 @@ constexpr auto kPreviewPostsLimit = 3;
 		: state.fromPeer;
 	const auto waiting = trimmed.isEmpty()
 		&& state.tags.empty()
-		&& !fromPeer;
+		&& !fromPeer
+		&& state.tab != ChatSearchTab::PublicPosts;
 	const auto suggestAllChats = !waiting
 		&& state.tab == ChatSearchTab::MyMessages
 		&& state.filter != ChatTypeFilter::All;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index e1fcbe87b1..d8442d92bf 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -43,25 +43,38 @@ void PostsSearch::requestMore() {
 }
 
 void PostsSearch::setQuery(const QString &query) {
-	if (_query == query) {
+	const auto words = TextUtilities::PrepareSearchWords(query);
+	const auto prepared = words.isEmpty() ? QString() : words.join(' ');
+	if (_query == prepared) {
 		return;
 	}
-	_query = query;
-	const auto i = _entries.find(query);
+	_query = prepared;
+	const auto i = _entries.find(prepared);
 	if (i != end(_entries)) {
 		pushStateUpdate(i->second);
-	} else if (query.isEmpty()) {
+	} else if (prepared.isEmpty()) {
 		applyQuery();
 	} else {
 		_timer.callOnce(kQueryDelay);
 	}
 }
 
-void PostsSearch::setAllowedStars(int stars) {
-	if (_query) {
-		_entries[*_query].allowedStars = stars;
-		requestSearch(*_query);
+int PostsSearch::setAllowedStars(int stars) {
+	if (!_query) {
+		return 0;
+	} else if (_floodState) {
+		if (_floodState->freeSearchesLeft > 0) {
+			stars = 0;
+		} else if (_floodState->nextFreeSearchTime > 0
+			&& _floodState->nextFreeSearchTime <= base::unixtime::now()) {
+			stars = 0;
+		} else {
+			stars = std::min(int(_floodState->starsPerPaidSearch), stars);
+		}
 	}
+	_entries[*_query].allowedStars = stars;
+	requestSearch(*_query);
+	return stars;
 }
 
 void PostsSearch::pushStateUpdate(const Entry &entry) {
@@ -118,17 +131,20 @@ void PostsSearch::requestSearch(const QString &query) {
 		return;
 	}
 
+	const auto useStars = entry.allowedStars;
+	entry.allowedStars = 0;
+
 	using Flag = MTPchannels_SearchPosts::Flag;
 	entry.searchId = _api.request(MTPchannels_SearchPosts(
 		MTP_flags(Flag::f_query
-			| (entry.allowedStars ? Flag::f_allow_paid_stars : Flag())),
+			| (useStars ? Flag::f_allow_paid_stars : Flag())),
 		MTP_string(), // hashtag
 		MTP_string(query),
 		MTP_int(entry.offsetRate),
 		(entry.offsetPeer ? entry.offsetPeer->input : MTP_inputPeerEmpty()),
 		MTP_int(entry.offsetId),
 		MTP_int(kPerPage),
-		MTP_long(entry.allowedStars)
+		MTP_long(useStars)
 	)).done([=](const MTPmessages_Messages &result) {
 		auto &entry = _entries[query];
 		entry.searchId = 0;
@@ -207,7 +223,11 @@ void PostsSearch::requestSearch(const QString &query) {
 			entry.pages.clear();
 		}
 		entry.pages.push_back(std::move(messages));
-		const auto count = int(entry.pages.size());
+		const auto count = int(ranges::accumulate(
+			entry.pages,
+			size_type(),
+			ranges::plus(),
+			&std::vector<not_null<HistoryItem*>>::size));
 		const auto full = entry.loaded ? count : std::max(count, totalCount);
 		entry.totalCount = full;
 		if (initial && _query == query) {
@@ -229,7 +249,7 @@ void PostsSearch::requestSearch(const QString &query) {
 
 void PostsSearch::setFloodStateFrom(const MTPDsearchPostsFlood &data) {
 	_recheckTimer.cancel();
-	const auto left = data.vremains().v;
+	const auto left = std::max(data.vremains().v, 0);
 	const auto next = data.vwait_till().value_or_empty();
 	if (!left && next > 0) {
 		const auto now = base::unixtime::now();
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
index 630c461ab2..27988e0a5e 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
@@ -31,7 +31,7 @@ public:
 	[[nodiscard]] rpl::producer<PostsSearchState> stateUpdates() const;
 
 	void setQuery(const QString &query);
-	void setAllowedStars(int stars);
+	int setAllowedStars(int stars);
 	void requestMore();
 
 private:
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 5786dc9054..7ecfddff4f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -38,11 +38,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common.h"
+#include "settings/settings_credits_graphics.h"
 #include "settings/settings_premium.h"
 #include "storage/storage_shared_media.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/swipe_handler.h"
 #include "ui/effects/ripple_animation.h"
+#include "ui/toast/toast.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
@@ -1821,8 +1823,9 @@ bool Suggestions::consumeSearchQuery(const QString &query) {
 	const auto tab = key.tab;
 	const auto type = (key.tab == Tab::Media) ? key.mediaType : Type::kCount;
 	if (tab == Tab::Posts) {
+		const auto changed = (_searchQuery != query);
 		setPostsSearchQuery(query);
-		return !query.isEmpty();
+		return changed || !query.isEmpty();
 	} else if (tab != Tab::Downloads
 		&& type != Type::File
 		&& type != Type::Link
@@ -1881,6 +1884,7 @@ void Suggestions::setPostsSearchQuery(const QString &query) {
 	if (!_postsSearch) {
 		setupPostsSearch();
 	}
+	_searchQuery = query;
 	_searchQueryTimer.cancel();
 	_postsSearch->setQuery(query);
 }
@@ -1938,8 +1942,32 @@ void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
 			Settings::ShowPremium(
 				_controller,
 				u"posts_search"_q);
+		} else if (!stars) {
+			_postsSearch->setAllowedStars(0);
 		} else {
-			_postsSearch->setAllowedStars(stars);
+			using namespace Settings;
+			const auto done = [=](Settings::SmallBalanceResult result) {
+				if (result == Settings::SmallBalanceResult::Success
+					|| result == Settings::SmallBalanceResult::Already) {
+					const auto spent = _postsSearch->setAllowedStars(stars);
+					if (spent > 0) {
+						_controller->showToast({
+							.text = tr::lng_posts_paid_spent(
+								tr::now,
+								lt_count,
+								spent,
+								Ui::Text::RichLangValue),
+							.attach = RectPart::Top,
+							.duration = Ui::Toast::kDefaultDuration * 2,
+						});
+					}
+				}
+			};
+			MaybeRequestBalanceIncrease(
+				_controller->uiShow(),
+				stars,
+				SmallBalanceForSearch{},
+				done);
 		}
 	}, _postsSearchIntro->lifetime());
 
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index b0fe7cbd5b..20c58948ca 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -162,6 +162,7 @@ void PostsSearchIntro::setup() {
 				st::resaleButtonTitle,
 				st::resaleButtonSubtitle);
 		}
+		_content->resizeToWidth(width());
 	}, _button->lifetime());
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index c49994a9bd..f36da05f9c 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2493,7 +2493,7 @@ void SmallBalanceBox(
 		return owner->peer(peerFromChannel(value.channelId))->name();
 	}, [](SmallBalanceSubscription value) {
 		return value.name;
-	}, [](SmallBalanceDeepLink value) {
+	}, [](SmallBalanceDeepLink) {
 		return QString();
 	}, [&](SmallBalanceStarGift value) {
 		return owner->peer(value.recipientId)->shortName();
@@ -2505,6 +2505,8 @@ void SmallBalanceBox(
 		return value.recipientId
 			? owner->peer(value.recipientId)->shortName()
 			: QString();
+	}, [](SmallBalanceForSearch) {
+		return QString();
 	});
 
 	auto needed = show->session().credits().balanceValue(
@@ -2556,6 +2558,9 @@ void SmallBalanceBox(
 						lt_channel,
 						rpl::single(Ui::Text::Bold(name)),
 						Ui::Text::RichLangValue)
+					: v::is<SmallBalanceForSearch>(source)
+					? tr::lng_credits_small_balance_for_search(
+						Ui::Text::RichLangValue)
 					: name.isEmpty()
 					? tr::lng_credits_small_balance_fallback(
 						Ui::Text::RichLangValue)
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index a2329e5902..8dd4e12504 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -242,6 +242,8 @@ struct SmallBalanceForMessage {
 struct SmallBalanceForSuggest {
 	PeerId recipientId;
 };
+struct SmallBalanceForSearch {
+};
 struct SmallBalanceSource : std::variant<
 	SmallBalanceBot,
 	SmallBalanceReaction,
@@ -249,7 +251,8 @@ struct SmallBalanceSource : std::variant<
 	SmallBalanceDeepLink,
 	SmallBalanceStarGift,
 	SmallBalanceForMessage,
-	SmallBalanceForSuggest> {
+	SmallBalanceForSuggest,
+	SmallBalanceForSearch> {
 	using variant::variant;
 };
 
diff --git a/Telegram/SourceFiles/ui/controls/button_two_labels.cpp b/Telegram/SourceFiles/ui/controls/button_two_labels.cpp
index 2a9bf513f4..d27529ff93 100644
--- a/Telegram/SourceFiles/ui/controls/button_two_labels.cpp
+++ b/Telegram/SourceFiles/ui/controls/button_two_labels.cpp
@@ -22,10 +22,12 @@ void SetButtonTwoLabels(
 		button,
 		std::move(title),
 		st);
+	buttonTitle->show();
 	const auto buttonSubtitle = Ui::CreateChild<Ui::FlatLabel>(
 		button,
 		std::move(subtitle),
 		subst);
+	buttonSubtitle->show();
 	buttonSubtitle->setOpacity(0.6);
 	if (textFg) {
 		buttonTitle->setTextColorOverride((*textFg)->c);

From 1718a123e84eac1cfdc607cecd42dbc348cd13dc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 13:54:15 +0400
Subject: [PATCH 097/341] Add NEW badge to global posts search.

---
 .../dialogs/ui/dialogs_suggestions.cpp        | 50 +++++++++++++++++--
 Telegram/SourceFiles/settings/settings.style  |  1 +
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 7ecfddff4f..c33b90459f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -13,8 +13,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/qt/qt_key_modifiers.h"
 #include "boxes/peer_list_box.h"
 #include "core/application.h"
+#include "core/ui_integration.h"
 #include "data/components/recent_peers.h"
 #include "data/components/top_peers.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
@@ -68,6 +70,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_dialogs.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 #include "styles/style_window.h"
 
 namespace Dialogs {
@@ -151,6 +154,34 @@ struct EntryMenuDescriptor {
 	};
 }
 
+[[nodiscard]] QImage MakeNewBadgeImage() {
+	auto text = Ui::Text::String(
+		st::settingsPremiumNewBadge.style,
+		tr::lng_premium_summary_new_badge(tr::now));
+	const auto size = QSize(text.maxWidth(), text.minHeight());
+	const auto padding = st::settingsPremiumNewBadgePadding;
+	const auto full = size.grownBy(padding);
+	const auto ratio = style::DevicePixelRatio();
+
+	auto result = QImage(full * ratio, QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+
+	auto p = QPainter(&result);
+	auto hq = PainterHighQualityEnabler(p);
+	p.setPen(Qt::NoPen);
+	p.setBrush(st::windowBgActive);
+
+	const auto r = padding.left();
+	p.drawRoundedRect(0, 0, full.width(), full.height(), r, r);
+
+	p.setPen(st::windowFgActive);
+	text.draw(p, { .position = { padding.left(), padding.top() } });
+
+	p.end();
+	return result;
+}
+
 void FillEntryMenu(
 		const Ui::Menu::MenuCallback &add,
 		EntryMenuDescriptor &&descriptor) {
@@ -1421,13 +1452,26 @@ void Suggestions::setupTabs() {
 			tr::lng_all_voice(tr::now),
 		},
 	};
-	auto sections = std::vector<QString>();
+
+	const auto manager = &_controller->session().data().customEmojiManager();
+	const auto badgeData = manager->registerInternalEmoji(
+		u"posts_search_new_badge"_q,
+		MakeNewBadgeImage(),
+		st::badgeEmojiMargin,
+		false);
+	auto sections = std::vector<TextWithEntities>();
 	for (const auto key : _tabKeys) {
 		const auto i = labels.find(key);
 		Assert(i != end(labels));
-		sections.push_back(i->second);
+		auto text = TextWithEntities{ i->second };
+		if (key.tab == Tab::Posts) {
+			text.append(' ').append(Ui::Text::SingleCustomEmoji(badgeData));
+		}
+		sections.push_back(std::move(text));
 	}
-	_tabs->setSections(sections);
+	_tabs->setSections(sections, Core::TextContext({
+		.session = &_controller->session(),
+	}));
 	_tabs->sectionActivated(
 	) | rpl::start_with_next([=](int section) {
 		Assert(section >= 0 && section < _tabKeys.size());
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 70dded5edc..95a0ca7385 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -141,6 +141,7 @@ settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 }
 settingsPremiumNewBadgePosition: point(4px, 1px);
 settingsPremiumNewBadgePadding: margins(4px, 1px, 4px, 1px);
+badgeEmojiMargin: margins(0px, 2px, 0px, 0px);
 
 settingsTTLChatsOff: icon {{ "settings/ttl/autodelete_off", windowSubTextFg }};
 settingsTTLChatsOn: icon {{ "settings/ttl/autodelete_on", windowActiveTextFg }};

From 71a15b7202a20999c807a6ca3ca2aee86610afae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 14:31:47 +0400
Subject: [PATCH 098/341] Implement global post search load-more.

---
 .../dialogs/dialogs_search_posts.cpp          | 39 ++++++++++++++++--
 .../dialogs/dialogs_search_posts.h            |  6 ++-
 .../dialogs/ui/dialogs_suggestions.cpp        | 41 +++++++++++++++++--
 .../dialogs/ui/dialogs_suggestions.h          |  1 +
 4 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index d8442d92bf..177bcbb076 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -36,8 +36,23 @@ rpl::producer<PostsSearchState> PostsSearch::stateUpdates() const {
 	return _stateUpdates.events();
 }
 
+rpl::producer<PostsSearchState> PostsSearch::pagesUpdates() const {
+	return _pagesUpdates.events();
+}
+
 void PostsSearch::requestMore() {
-	if (_query) {
+	if (!_query) {
+		return;
+	}
+	auto &entry = _entries[*_query];
+	if (_queryPushed != *_query || !entry.pagesPushed) {
+		return;
+	} else if (entry.pagesPushed < entry.pages.size()) {
+		_pagesUpdates.fire(PostsSearchState{
+			.page = entry.pages[entry.pagesPushed++],
+			.totalCount = entry.totalCount,
+		});
+	} else {
 		requestSearch(*_query);
 	}
 }
@@ -78,9 +93,27 @@ int PostsSearch::setAllowedStars(int stars) {
 }
 
 void PostsSearch::pushStateUpdate(const Entry &entry) {
+	Expects(_query.has_value());
+
+	const auto initial = (_queryPushed != *_query);
+	if (initial) {
+		_queryPushed = *_query;
+		entry.pagesPushed = 0;
+	} else if (entry.pagesPushed > 0) {
+		if (entry.pagesPushed < entry.pages.size()) {
+			_pagesUpdates.fire(PostsSearchState{
+				.page = entry.pages[entry.pagesPushed++],
+				.totalCount = entry.totalCount,
+			});
+		}
+		return;
+	}
 	if (!entry.pages.empty() || entry.loaded) {
+		if (!entry.pages.empty()) {
+			++entry.pagesPushed;
+		}
 		_stateUpdates.fire(PostsSearchState{
-			.first = (entry.pages.empty()
+			.page = (entry.pages.empty()
 				? std::vector<not_null<HistoryItem*>>()
 				: entry.pages.front()),
 			.totalCount = entry.totalCount,
@@ -230,7 +263,7 @@ void PostsSearch::requestSearch(const QString &query) {
 			&std::vector<not_null<HistoryItem*>>::size));
 		const auto full = entry.loaded ? count : std::max(count, totalCount);
 		entry.totalCount = full;
-		if (initial && _query == query) {
+		if (_query == query) {
 			pushStateUpdate(entry);
 		}
 	}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
index 27988e0a5e..86907aef2f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
@@ -19,7 +19,7 @@ namespace Dialogs {
 
 struct PostsSearchState {
 	std::optional<PostsSearchIntroState> intro;
-	std::vector<not_null<HistoryItem*>> first;
+	std::vector<not_null<HistoryItem*>> page;
 	int totalCount = 0;
 	bool loading = false;
 };
@@ -29,6 +29,7 @@ public:
 	explicit PostsSearch(not_null<Main::Session*> session);
 
 	[[nodiscard]] rpl::producer<PostsSearchState> stateUpdates() const;
+	[[nodiscard]] rpl::producer<PostsSearchState> pagesUpdates() const;
 
 	void setQuery(const QString &query);
 	int setAllowedStars(int stars);
@@ -44,6 +45,7 @@ private:
 		MsgId offsetId = 0;
 		int offsetRate = 0;
 		int allowedStars = 0;
+		mutable int pagesPushed = 0;
 		bool loaded = false;
 	};
 
@@ -63,10 +65,12 @@ private:
 	base::Timer _recheckTimer;
 	base::flat_map<QString, Entry> _entries;
 	std::optional<QString> _query;
+	QString _queryPushed;
 
 	std::optional<PostsSearchIntroState> _floodState;
 
 	rpl::event_stream<PostsSearchState> _stateUpdates;
+	rpl::event_stream<PostsSearchState> _pagesUpdates;
 
 	rpl::lifetime _lifetime;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index c33b90459f..8fddcb2aca 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1913,14 +1913,27 @@ void Suggestions::setupPostsSearch() {
 			_postsContent->searchRequested(true);
 		} else {
 			_postsContent->searchReceived(
-				state.first,
+				state.page,
 				nullptr,
 				{ .posts = true, .start = true },
 				state.totalCount);
+			updatePostsSearchVisibleRange();
 		}
-		const auto top = _postsScroll->scrollTop();
-		const auto height = _postsScroll->height();
-		_postsContent->setVisibleTopBottom(top, top + height);
+	}, _postsWrap->lifetime());
+
+	_postsSearch->pagesUpdates(
+	) | rpl::start_with_next([=](const PostsSearchState &state) {
+		Expects(!state.intro && !state.loading);
+
+		if (!_postsContent) {
+			return;
+		}
+		_postsContent->searchReceived(
+			state.page,
+			nullptr,
+			{ .posts = true },
+			state.totalCount);
+		updatePostsSearchVisibleRange();
 	}, _postsWrap->lifetime());
 }
 
@@ -1969,11 +1982,31 @@ void Suggestions::setupPostsResults() {
 	_postsContent->heightValue() | rpl::start_with_next([=](int height) {
 		_postsWrap->resize(_postsWrap->width(), height);
 	}, _postsContent->lifetime());
+
+	rpl::combine(
+		rpl::single(rpl::empty) | rpl::then(_postsScroll->scrolls()),
+		_postsScroll->heightValue()
+	) | rpl::start_with_next([=] {
+		updatePostsSearchVisibleRange();
+	}, _postsContent->lifetime());
+
+	_postsContent->setLoadMoreCallback([=] {
+		_postsSearch->requestMore();
+	});
+
 	_postsContent->setNarrowRatio(0.);
 	_postsContent->show();
 	updateControlsGeometry();
 }
 
+void Suggestions::updatePostsSearchVisibleRange() {
+	Expects(_postsContent != nullptr);
+
+	const auto top = _postsScroll->scrollTop();
+	const auto height = _postsScroll->height();
+	_postsContent->setVisibleTopBottom(top, top + height);
+}
+
 void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
 	Expects(!_postsSearchIntro);
 
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
index d536f3a9cd..dbe085eacb 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.h
@@ -219,6 +219,7 @@ private:
 	void setPostsSearchQuery(const QString &query);
 	void setupPostsResults();
 	void setupPostsIntro(const PostsSearchIntroState &intro);
+	void updatePostsSearchVisibleRange();
 
 	const not_null<Window::SessionController*> _controller;
 

From 507bcbd332326117903862d7732a9efb847cfe47 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 14:34:50 +0400
Subject: [PATCH 099/341] Show nice global posts search button.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  5 ++
 .../dialogs/dialogs_search_posts.cpp          |  5 +-
 .../dialogs/dialogs_search_posts.h            |  1 +
 .../dialogs/ui/posts_search_intro.cpp         | 75 ++++++++++++++++++-
 .../settings/settings_credits_graphics.cpp    |  2 +-
 ...utton_two_labels.cpp => button_labels.cpp} |  2 +-
 .../{button_two_labels.h => button_labels.h}  |  0
 Telegram/SourceFiles/ui/effects/credits.style |  2 +
 Telegram/cmake/td_ui.cmake                    |  4 +-
 9 files changed, 87 insertions(+), 9 deletions(-)
 rename Telegram/SourceFiles/ui/controls/{button_two_labels.cpp => button_labels.cpp} (97%)
 rename Telegram/SourceFiles/ui/controls/{button_two_labels.h => button_labels.h} (100%)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 849c98f8d6..cc598423cc 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -863,3 +863,8 @@ postsSearchIntroFooter: FlatLabel(defaultFlatLabel) {
 	}
 }
 postsSearchIntroFooterMargin: margins(20px, 12px, 20px, 0px);
+
+postsSearchIcon: icon {{ "box_search", windowFgActive }};
+postsSearchIconPadding: margins(12px, 1px, 6px, 0px);
+postsSearchArrow: icon {{ "dialogs/mini_arrow", windowFgActive }};
+postsSearchArrowPadding: margins(2px, 1px, 8px, 0px);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index 177bcbb076..011c252b10 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -60,9 +60,10 @@ void PostsSearch::requestMore() {
 void PostsSearch::setQuery(const QString &query) {
 	const auto words = TextUtilities::PrepareSearchWords(query);
 	const auto prepared = words.isEmpty() ? QString() : words.join(' ');
-	if (_query == prepared) {
+	if (_queryExact == query) {
 		return;
 	}
+	_queryExact = query;
 	_query = prepared;
 	const auto i = _entries.find(prepared);
 	if (i != end(_entries)) {
@@ -125,7 +126,7 @@ void PostsSearch::pushStateUpdate(const Entry &entry) {
 	} else {
 		Assert(_floodState.has_value());
 		auto copy = _floodState;
-		copy->query = *_query;
+		copy->query = *_queryExact;
 		copy->needsPremium = !_session->premium();
 		_stateUpdates.fire(PostsSearchState{
 			.intro = std::move(copy),
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
index 86907aef2f..5f48b98eb0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.h
@@ -64,6 +64,7 @@ private:
 	base::Timer _timer;
 	base::Timer _recheckTimer;
 	base::flat_map<QString, Entry> _entries;
+	std::optional<QString> _queryExact;
 	std::optional<QString> _query;
 	QString _queryPushed;
 
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index 20c58948ca..b24c9d5f03 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
 #include "lang/lang_keys.h"
-#include "ui/controls/button_two_labels.h"
+#include "ui/controls/button_labels.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
@@ -42,6 +42,72 @@ namespace {
 	});
 }
 
+void SetSearchButtonLabel(
+		not_null<Ui::RpWidget*> button,
+		rpl::producer<TextWithEntities> text) {
+	const auto left = &st::postsSearchIcon;
+	const auto leftPadding = st::postsSearchIconPadding;
+	const auto right = &st::postsSearchArrow;
+	const auto rightPadding = st::postsSearchArrowPadding;
+	const auto leftSkip = left->size().grownBy(leftPadding).width();
+	const auto rightSkip = right->size().grownBy(rightPadding).width();
+
+	struct State {
+		State() : linkFg([] {
+			auto copy = st::windowFgActive->c;
+			copy.setAlphaF(0.6);
+			return copy;
+		}), st(st::resaleButtonTitle) {
+		}
+
+		style::complex_color linkFg;
+		style::FlatLabel st;
+	};
+	auto lifetime = rpl::lifetime();
+	const auto state = lifetime.make_state<State>();
+	state->st.palette.linkFg = state->linkFg.color();
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		button,
+		rpl::duplicate(text),
+		state->st);
+	label->lifetime().add(std::move(lifetime));
+	label->show();
+
+	const auto icons = Ui::CreateChild<Ui::RpWidget>(button);
+	icons->show();
+	rpl::combine(
+		button->sizeValue(),
+		std::move(text)
+	) | rpl::start_with_next([=](QSize size, const auto &) {
+		icons->setGeometry(QRect(QPoint(), size));
+		const auto available = size.width() - leftSkip - rightSkip;
+		if (available <= 0) {
+			return;
+		}
+		const auto width = std::min(available, label->textMaxWidth());
+		label->resizeToWidth(width);
+		const auto full = leftSkip + width + rightSkip;
+		const auto x = (size.width() - full) / 2;
+		const auto y = (size.height() - label->height()) / 2;
+		label->moveToLeft(x + leftSkip, y, size.width());
+	}, icons->lifetime());
+
+	icons->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(icons);
+		left->paint(
+			p,
+			label->x() - leftSkip + leftPadding.left(),
+			label->y() + leftPadding.top(),
+			icons->width());
+		right->paint(
+			p,
+			label->x() + label->width() + rightPadding.left(),
+			label->y() + rightPadding.top(),
+			icons->width());
+	}, icons->lifetime());
+}
+
 } // namespace
 
 PostsSearchIntro::PostsSearchIntro(
@@ -138,9 +204,12 @@ void PostsSearchIntro::setup() {
 		if (state.needsPremium) {
 			_button->setText(tr::lng_posts_subscribe());
 		} else if (state.freeSearchesLeft > 0) {
-			_button->setText(tr::lng_posts_search_button(
+			_button->setText(rpl::single(QString()));
+
+			SetSearchButtonLabel(_button, tr::lng_posts_search_button(
 				lt_query,
-				rpl::single(state.query)));
+				rpl::single(Ui::Text::Colorized(state.query.trimmed())),
+				Ui::Text::WithEntities));
 		} else {
 			_button->setText(rpl::single(QString()));
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index f36da05f9c..457d3e84fb 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -63,7 +63,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/confirm_box.h"
-#include "ui/controls/button_two_labels.h"
+#include "ui/controls/button_labels.h"
 #include "ui/controls/ton_common.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/dynamic_image.h"
diff --git a/Telegram/SourceFiles/ui/controls/button_two_labels.cpp b/Telegram/SourceFiles/ui/controls/button_labels.cpp
similarity index 97%
rename from Telegram/SourceFiles/ui/controls/button_two_labels.cpp
rename to Telegram/SourceFiles/ui/controls/button_labels.cpp
index d27529ff93..8a3f9783af 100644
--- a/Telegram/SourceFiles/ui/controls/button_two_labels.cpp
+++ b/Telegram/SourceFiles/ui/controls/button_labels.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "ui/controls/button_two_labels.h"
+#include "ui/controls/button_labels.h"
 
 #include "ui/widgets/labels.h"
 
diff --git a/Telegram/SourceFiles/ui/controls/button_two_labels.h b/Telegram/SourceFiles/ui/controls/button_labels.h
similarity index 100%
rename from Telegram/SourceFiles/ui/controls/button_two_labels.h
rename to Telegram/SourceFiles/ui/controls/button_labels.h
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 28b01272af..a4e85f14bc 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -325,12 +325,14 @@ creditsHistoryRowRightStyle: TextStyle(defaultTextStyle) {
 resaleButtonTitle: FlatLabel(defaultFlatLabel) {
 	style: semiboldTextStyle;
 	textFg: activeButtonFg;
+	maxHeight: 20px;
 }
 resaleButtonSubtitle: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
 		font: font(12px semibold);
 	}
 	textFg: activeButtonFg;
+	maxHeight: 20px;
 }
 
 resaleConfirmTonOnly: FlatLabel(boxLabel) {
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 75e112d46f..6c2473e35c 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -363,8 +363,8 @@ PRIVATE
     ui/chat/pinned_bar.h
     ui/chat/requests_bar.cpp
     ui/chat/requests_bar.h
-    ui/controls/button_two_labels.cpp
-    ui/controls/button_two_labels.h
+    ui/controls/button_labels.cpp
+    ui/controls/button_labels.h
     ui/controls/call_mute_button.cpp
     ui/controls/call_mute_button.h
     ui/controls/chat_service_checkbox.cpp

From 9d36d7119b5d606d6e1cb34f0a1318f9f4085083 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 25 Jul 2025 11:44:17 +0300
Subject: [PATCH 100/341] Added special param to links for peers to resolve
 them in new window.

---
 Telegram/SourceFiles/core/local_url_handlers.cpp |  2 ++
 .../window/window_session_controller.cpp         | 16 +++++++++++++++-
 .../window/window_session_controller_link_info.h |  1 +
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 7f76e19cda..0cc0ff3fc1 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -708,6 +708,8 @@ bool ResolveUsernameOrPhone(
 			: std::nullopt),
 		.clickFromMessageId = myContext.itemId,
 		.clickFromBotWebviewContext = myContext.botWebviewContext,
+		.historyInNewWindow =
+			(params.value(u"tdesktop_target"_q) == u"blank"_q),
 	});
 	return true;
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 3a69f7b057..cf3d618ccd 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -781,12 +781,26 @@ void SessionNavigation::showPeerByLinkResolved(
 			});
 		} else {
 			const auto draft = info.text;
+			const auto historyInNewWindow = info.historyInNewWindow;
 			params.videoTimestamp = info.videoTimestamp;
 			crl::on_main(this, [=] {
 				if (peer->isUser() && !draft.isEmpty()) {
 					Data::SetChatLinkDraft(peer, { draft });
 				}
-				showPeerHistory(peer, params, msgId);
+				if (historyInNewWindow) {
+					const auto window
+						= Core::App().ensureSeparateWindowFor(peer);
+					const auto controller = window
+						? window->sessionController()
+						: nullptr;
+					if (controller) {
+						controller->showPeerHistory(peer, params, msgId);
+					} else {
+						showPeerHistory(peer, params, msgId);
+					}
+				} else {
+					showPeerHistory(peer, params, msgId);
+				}
 			});
 		}
 	}
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index bf6ecc2be7..7608a07b9c 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -62,6 +62,7 @@ struct PeerByLinkInfo {
 	std::optional<QString> voicechatHash;
 	FullMsgId clickFromMessageId;
 	std::shared_ptr<InlineBots::WebViewContext> clickFromBotWebviewContext;
+	bool historyInNewWindow = false;
 };
 
 } // namespace Window

From 095b171db3a43604b2e0245b63a3a8978f02a237 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Jul 2025 13:17:52 +0300
Subject: [PATCH 101/341] Added highlighting of domain part in hidden urls to
 confirm box.

---
 .../SourceFiles/core/click_handler_types.cpp  | 60 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/click_handler_types.cpp b/Telegram/SourceFiles/core/click_handler_types.cpp
index 9e290988f9..824f7816b2 100644
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/toast/toast.h"
+#include "ui/widgets/popup_menu.h"
 #include "base/qthelp_regex.h"
 #include "base/qt/qt_key_modifiers.h"
 #include "storage/storage_account.h"
@@ -33,6 +34,31 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
+[[nodiscard]] TextWithEntities BoldDomainInUrl(const QString &url) {
+	auto result = TextWithEntities{ .text = url };
+
+	if (const auto parsedUrl = QUrl(url); parsedUrl.isValid()) {
+		if (const auto host = parsedUrl.host(); !host.isEmpty()) {
+			if (const auto hostPos = url.indexOf(host); hostPos != -1) {
+				auto boldEntity = EntityInText(
+					EntityType::Bold,
+					hostPos,
+					host.length());
+
+				if (host.startsWith("www.")) {
+					boldEntity = EntityInText(
+						EntityType::Bold,
+						hostPos + 4,
+						host.length() - 4);
+				}
+
+				result.entities.push_back(boldEntity);
+			}
+		}
+	}
+	return result;
+}
+
 // Possible context owners: media viewer, profile, history widget.
 
 void SearchByHashtag(ClickContext context, const QString &tag) {
@@ -155,7 +181,39 @@ void HiddenUrlClickHandler::Open(QString url, QVariant context) {
 					: st::boxLabel;
 				box->addSkip(st.style.lineHeight - st::boxPadding.bottom());
 				const auto url = box->addRow(
-					object_ptr<Ui::FlatLabel>(box, displayUrl, st));
+					object_ptr<Ui::FlatLabel>(
+						box,
+						rpl::single(BoldDomainInUrl(displayUrl)),
+						st));
+				url->setContextMenuHook([=](
+						Ui::FlatLabel::ContextMenuRequest request) {
+					const auto copyContextText = [=] {
+						TextUtilities::SetClipboardText(
+							TextForMimeData::Simple(displayUrl));
+					};
+					if (request.fullSelection) {
+						request.menu->addAction(
+							tr::lng_context_copy_link(tr::now),
+							copyContextText);
+					} else if (request.uponSelection
+						&& !request.fullSelection) {
+						const auto selection = request.selection;
+						const auto copySelectedText = [=] {
+							TextUtilities::SetClipboardText(
+								TextForMimeData::Simple(
+									displayUrl.mid(
+										selection.from,
+										selection.to - selection.from)));
+						};
+						request.menu->addAction(
+							tr::lng_context_copy_selected(tr::now),
+							copySelectedText);
+					} else if (request.selection.empty()) {
+						request.menu->addAction(
+							tr::lng_context_copy_link(tr::now),
+							copyContextText);
+					}
+				});
 				url->setSelectable(true);
 				url->setContextCopyText(tr::lng_context_copy_link(tr::now));
 			});

From e2acab67e1daa88a744729a9e1f85feab87b3b7f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Jul 2025 13:53:28 +0300
Subject: [PATCH 102/341] Fixed support of covers for documents in pinned bar
 and reply bar.

---
 Telegram/SourceFiles/data/data_document.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index c6befff047..bbb5ae1058 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1429,6 +1429,17 @@ Image *DocumentData::getReplyPreview(
 		Data::FileOrigin origin,
 		not_null<PeerData*> context,
 		bool spoiler) {
+	if (v::is<Data::FileOriginMessage>(origin.data)) {
+		if (const auto item = _owner->message(
+				v::get<FullMsgId>(origin.data))) {
+			if (const auto cover = LookupVideoCover(this, item)) {
+				return cover->getReplyPreview(
+					std::move(origin),
+					context,
+					spoiler);
+			}
+		}
+	}
 	if (!hasThumbnail()) {
 		return nullptr;
 	} else if (!_replyPreview) {

From baf932dd8b1ca5081b75974b6756171ef6793436 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 29 Jul 2025 14:26:55 +0300
Subject: [PATCH 103/341] Fixed support of covers for documents in dialogs
 message preview.

---
 .../SourceFiles/data/data_media_types.cpp     | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index c8a1d35d07..271ae56f59 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -225,8 +225,8 @@ template <typename MediaType>
 	Expects(media->owner()->hasThumbnail());
 
 	const auto document = media->owner();
-	const auto readyCacheKey = CountCacheKey(document, radius, spoiler);
 	if (const auto thumbnail = media->thumbnail()) {
+		const auto readyCacheKey = CountCacheKey(document, radius, spoiler);
 		return {
 			PreparePreviewImage(thumbnail, radius, spoiler),
 			readyCacheKey,
@@ -259,7 +259,8 @@ template <typename MediaType>
 		bool spoiler) {
 	auto result = PreparePhotoPreviewImage(item, media, radius, spoiler);
 	if (!result.data.isNull()
-		&& media->owner()->extendedMediaVideoDuration().has_value()) {
+		&& (media->owner()->extendedMediaVideoDuration().has_value()
+			|| (item->media() && item->media()->videoCover()))) {
 		result.data = PutPlayIcon(std::move(result.data));
 	}
 	return result;
@@ -1157,7 +1158,28 @@ ItemPreview MediaFile::toPreview(ToPreviewOptions options) const {
 	const auto radius = _document->isVideoMessage()
 		? ImageRoundRadius::Ellipse
 		: ImageRoundRadius::Small;
-	if (auto found = FindCachedPreview(
+	if (_videoCover) {
+		if (auto found = FindCachedPreview(
+				existing,
+				not_null{ _videoCover },
+				radius,
+				spoilered)) {
+			images.push_back(std::move(found));
+		} else {
+			const auto media = _videoCover->createMediaView();
+			if (auto prepared = PreparePhotoPreview(
+					parent(),
+					media,
+					radius,
+					_spoiler)
+				; prepared || !prepared.cacheKey) {
+				images.push_back(std::move(prepared));
+				if (!prepared.cacheKey) {
+					context = media;
+				}
+			}
+		}
+	} else if (auto found = FindCachedPreview(
 			existing,
 			_document,
 			radius,

From 003e42a2ae68ab4cf624bcc39f11209982237e1d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 22:20:00 +0400
Subject: [PATCH 104/341] Show nice info about star rating.

---
 .../icons/limits/filled_rating_crown.svg      |   7 +
 .../icons/limits/filled_understood.svg        |   7 +
 .../Resources/icons/menu/rating_gifts.svg     |  11 +
 .../Resources/icons/menu/rating_refund.svg    |   9 +
 Telegram/Resources/icons/menu/users_stars.svg |  10 +
 Telegram/Resources/langs/lang.strings         |  20 +-
 Telegram/SourceFiles/data/data_peer_common.h  |   6 +-
 Telegram/SourceFiles/data/data_user.cpp       |   4 +-
 Telegram/SourceFiles/info/info.style          |  45 +-
 .../info/profile/info_profile_cover.cpp       |  13 +-
 Telegram/SourceFiles/main/main_app_config.cpp |   6 -
 Telegram/SourceFiles/main/main_app_config.h   |   2 -
 Telegram/SourceFiles/ui/boxes/boost_box.cpp   |  25 +-
 .../SourceFiles/ui/controls/stars_rating.cpp  | 637 +++++++++++-------
 .../SourceFiles/ui/controls/stars_rating.h    |  31 +-
 Telegram/SourceFiles/ui/effects/premium.style |   1 +
 .../SourceFiles/ui/effects/premium_bubble.cpp |   3 +-
 .../SourceFiles/ui/effects/premium_bubble.h   |   1 +
 .../ui/effects/premium_graphics.cpp           |  10 +-
 .../SourceFiles/ui/effects/premium_graphics.h |   1 +
 Telegram/SourceFiles/ui/menu_icons.style      |   5 +-
 Telegram/lib_ui                               |   2 +-
 22 files changed, 519 insertions(+), 337 deletions(-)
 create mode 100644 Telegram/Resources/icons/limits/filled_rating_crown.svg
 create mode 100644 Telegram/Resources/icons/limits/filled_understood.svg
 create mode 100644 Telegram/Resources/icons/menu/rating_gifts.svg
 create mode 100644 Telegram/Resources/icons/menu/rating_refund.svg
 create mode 100644 Telegram/Resources/icons/menu/users_stars.svg

diff --git a/Telegram/Resources/icons/limits/filled_rating_crown.svg b/Telegram/Resources/icons/limits/filled_rating_crown.svg
new file mode 100644
index 0000000000..e7cc2e124f
--- /dev/null
+++ b/Telegram/Resources/icons/limits/filled_rating_crown.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / Folder / filled_rating_crown</title>
+    <g id="Icon-/-Filled-/-Folder-/-filled_rating_crown" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.006194,4 C12.2804747,4 12.5305167,4.06540388 12.7563199,4.19621163 C12.9821231,4.32701939 13.1625206,4.50276893 13.2975123,4.72346025 C13.4325041,4.94415157 13.5,5.18550018 13.5,5.44750606 C13.5,5.71705917 13.4325041,5.96227898 13.2975123,6.18316549 C13.1625206,6.404052 12.9821231,6.5799154 12.7563199,6.71075569 L15.4435899,11.5643277 C15.5815617,11.7639089 15.7563694,11.7899721 15.968013,11.6425174 L18.1781768,9.33989673 C18.0593923,9.13003568 18,8.89851056 18,8.64532138 C18,8.38325043 18.0675127,8.14188556 18.202538,7.92122677 C18.3375634,7.70056798 18.5179776,7.52481844 18.7437808,7.39397816 C18.969584,7.26313787 19.2198274,7.19771773 19.494511,7.19771773 C19.7726861,7.19771773 20.0256488,7.26313787 20.2533991,7.39397816 C20.4811495,7.52481844 20.6625206,7.69962458 20.7975123,7.91839656 C20.9325041,8.13716855 21,8.37947682 21,8.64532138 C21,8.91526486 20.9315305,9.16058227 20.7945916,9.38127359 C20.6576527,9.60196491 20.4753248,9.77771445 20.247608,9.90852221 C20.0847544,10.0020705 19.9099761,10.0621678 19.7232729,10.0888143 L18.6881679,14.8280591 L18.18147,17.2645439 C18.0360821,17.8406994 17.5858498,18.2705453 17.2433245,18.5609529 C16.9007991,18.8513606 16.024907,19 15.4030968,19 L8.60301533,19 C7.98112362,19 7.07922209,18.853651 6.73645226,18.5609529 C6.39368244,18.2682549 5.96970407,17.8361186 5.82537564,17.2645439 L5.33200224,14.8280591 L4.28780473,10.091804 C4.09296054,10.0668449 3.91161924,10.005751 3.74378084,9.90852221 C3.51797764,9.77771445 3.33756337,9.60196491 3.20253802,9.38127359 C3.06751267,9.16058227 3,8.91526486 3,8.64532138 C3,8.38325043 3.06751267,8.14188556 3.20253802,7.92122677 C3.33756337,7.70056798 3.51797764,7.52481844 3.74378084,7.39397816 C3.96958405,7.26313787 4.21982744,7.19771773 4.49451103,7.19771773 C4.77268607,7.19771773 5.02564877,7.26313787 5.25339913,7.39397816 C5.48114949,7.52481844 5.66252056,7.69962458 5.79751234,7.91839656 C5.93250411,8.13716855 6,8.37947682 6,8.64532138 C6,8.85527742 5.9585802,9.05033621 5.8757406,9.23049773 L5.8356,9.31024634 L8.05741354,11.6413327 C8.17558193,11.7218918 8.27307085,11.7527925 8.3498803,11.7340349 C8.42668976,11.7152773 8.49488107,11.6628546 8.55445424,11.576767 L11.2500459,6.70934707 C11.0234694,6.57865415 10.8419403,6.40326029 10.7054588,6.18316549 C10.5684863,5.96227898 10.5,5.71705917 10.5,5.44750606 C10.5,5.18172656 10.5675127,4.93943456 10.702538,4.72063004 C10.8375634,4.50182552 11.0189344,4.32701939 11.2466512,4.19621163 C11.474368,4.06540388 11.7275489,4 12.006194,4 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/limits/filled_understood.svg b/Telegram/Resources/icons/limits/filled_understood.svg
new file mode 100644
index 0000000000..337b43cc71
--- /dev/null
+++ b/Telegram/Resources/icons/limits/filled_understood.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / Folder / filled_understood</title>
+    <g id="Icon-/-Filled-/-Folder-/-filled_understood" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.8474094,2.35452236 C13.885383,1.47475174 14.8173541,2.39162557 15.6118925,3.37253311 L15.7012514,3.4837597 C16.5164257,4.50413739 16.896938,5.20519347 17.573079,6.45345067 C18.2023878,7.61607163 19,9.78891004 19,11.0676479 L18.9982623,11.4602681 C18.9876271,12.5429001 18.9217408,13.3886119 18.6297323,14.4132675 L18.4373147,15.0832437 C17.6686959,17.7193108 17.0159257,19.2763685 14.5216634,19.7807735 C13.10206,20.068163 10.6477559,20.1900858 9.65842399,19.3946847 C7.99649075,18.0581246 7.24548521,16.7868457 6.69332563,15.7108913 L6.48407363,15.2966137 C6.20747049,14.7436067 5.49035123,13.0903916 6.59969082,12.2935391 C7.07533115,11.9524455 7.88026093,12.0496935 8.21540442,12.3820783 C9.4579233,13.6143694 9.58232154,15.2464067 11.9078369,15.2464067 C13.3786631,15.2464067 13.9391869,14.2869904 13.9391869,12.58878 C13.9391869,11.3521345 12.1390712,10.1619357 9.97161486,11.0502304 C8.24621513,12.1140246 7.17909072,11.547078 6.86322591,10.7478144 L6.82781627,10.6508891 L6.79127892,10.5445502 C6.5448802,9.79724635 6.61229951,9.16312262 10.1911412,7.82363067 C10.6137438,7.6657143 11.3830789,7.698766 12.0161927,7.78792773 C12.8897042,8.04621996 13.6148836,8.35641256 14.1913276,8.71620571 C14.929645,9.17703372 15.7391454,9.82868756 16.6173642,10.6711738 C16.8017985,10.848104 17.0950516,10.8396614 17.2723632,10.6523169 C17.4496747,10.4649723 17.4439006,10.1696692 17.2594662,9.99273903 C16.7803672,9.5331334 16.3184045,9.12578598 15.8732309,8.77069768 L15.8624136,8.73672043 C15.3582916,7.35121785 14.8646161,6.25548747 14.3777651,5.44628421 C13.9445436,4.72621943 13.3206019,3.99276536 12.5068246,3.24305992 C12.4746432,2.90001775 12.5672164,2.59132364 12.8474094,2.35452236 Z M10.9668008,4.0469269 L11.0518595,3.98215031 C11.2745376,3.81947674 11.4718477,3.74284792 11.8308451,3.8850515 C12.6071746,4.59396408 13.1906226,5.27558261 13.5826599,5.9271944 C13.8835044,6.42723311 14.1925809,7.05721299 14.5092459,7.81609175 C13.7940229,7.39877614 12.9130339,7.05268239 11.8658275,6.77510676 L11.6720359,6.53222118 C11.6390059,6.49065589 11.6057339,6.44860798 11.5724054,6.40616676 L11.3960913,6.1777103 C10.8136406,5.40671311 10.3189783,4.5550951 10.9668008,4.0469269 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/rating_gifts.svg b/Telegram/Resources/icons/menu/rating_gifts.svg
new file mode 100644
index 0000000000..ed3aa9d4b1
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rating_gifts.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / rating_gifts</title>
+    <g id="Icon-/-Menu-/-rating_gifts" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9.49180328,1 C11.2844653,1 12.6018066,2.18644541 12.6018066,3.65 C12.6018066,5.11355459 11.2844653,6.3 9.49180328,6.3 C7.6991413,6.3 6.24590164,5.11355459 6.24590164,3.65 C6.24590164,2.18644541 7.6991413,1 9.49180328,1 Z M9.49180328,2.2 C8.31430075,2.2 7.44590164,2.90897331 7.44590164,3.65 C7.44590164,4.39102669 8.31430075,5.1 9.49180328,5.1 C10.6309547,5.1 11.4018066,4.43203043 11.4018066,3.65 C11.4018066,2.86796957 10.6309547,2.2 9.49180328,2.2 Z" id="Oval" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M14.5081967,1 C16.3008587,1 17.7540984,2.18644541 17.7540984,3.65 C17.7540984,5.11355459 16.3008587,6.3 14.5081967,6.3 C12.7155347,6.3 11.4638672,5.11355459 11.4638672,3.65 C11.4638672,2.18644541 12.7155347,1 14.5081967,1 Z M14.5081967,2.2 C13.3883731,2.2 12.6638672,2.84700401 12.6638672,3.65 C12.6638672,4.45299599 13.3883731,5.1 14.5081967,5.1 C15.6856993,5.1 16.5540984,4.39102669 16.5540984,3.65 C16.5540984,2.90897331 15.6856993,2.2 14.5081967,2.2 Z" id="Oval" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M19.5245902,5.2245614 C20.6708074,5.2245614 21.6,6.15375404 21.6,7.29997124 L21.6,9.62036238 C21.6,10.2776718 21.0671455,10.8105263 20.4098361,10.8105263 L3.59016393,10.8105263 C2.93285454,10.8105263 2.4,10.2776718 2.4,9.62036238 L2.4,7.29997124 C2.4,6.15375404 3.32919263,5.2245614 4.47540984,5.2245614 L19.5245902,5.2245614 Z M19.5245902,6.4245614 L4.47540984,6.4245614 C3.99193433,6.4245614 3.6,6.81649574 3.6,7.29997124 L3.6,9.6095614 L20.4,9.6095614 L20.4,7.29997124 C20.4,6.85368616 20.0660441,6.48540066 19.6343997,6.43138209 L19.5245902,6.4245614 Z" id="Rectangle" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M5.07540984,10.7953216 L5.07540984,18.3761864 C5.07540984,19.3485697 5.86368226,20.1368421 6.83606557,20.1368421 L17.1639344,20.1368421 C18.1363177,20.1368421 18.9245902,19.3485697 18.9245902,18.3761864 L18.9245902,10.7953216 L20.1245902,10.7953216 L20.1245902,18.3761864 C20.1245902,20.0113114 18.7990594,21.3368421 17.1639344,21.3368421 L6.83606557,21.3368421 C5.20094056,21.3368421 3.87540984,20.0113114 3.87540984,18.3761864 L3.87540984,10.7953216 L5.07540984,10.7953216 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <polygon id="Path" fill="#FFFFFF" fill-rule="nonzero" points="11.4 6.11695906 11.4 21 12.6 21 12.6 6.11695906"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/rating_refund.svg b/Telegram/Resources/icons/menu/rating_refund.svg
new file mode 100644
index 0000000000..05434da66a
--- /dev/null
+++ b/Telegram/Resources/icons/menu/rating_refund.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / rating_refund</title>
+    <g id="Icon-/-Menu-/-rating_refund" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M9.58495703,2.34314741 C14.845204,0.914046898 20.2520851,4.07916838 21.661564,9.41264412 C23.0710429,14.7461199 19.9493787,20.2282711 14.6891317,21.6573716 C9.70832403,23.0105542 4.55852362,20.241996 2.84766326,15.3548697 L2.79687536,15.2061286 C2.7724639,15.132795 2.65678419,14.7396157 2.52176727,14.2756688 L2.02361181,12.5403036 C1.92527607,12.1682007 2.1430666,11.785725 2.51006058,11.6860203 C2.87705455,11.5863156 3.25427881,11.807138 3.35261455,12.179241 L3.59432993,13.0275538 C3.80113943,13.7451404 4.06828557,14.6632038 4.10050903,14.760005 C5.52633258,19.0432668 10.0041242,21.485941 14.3330265,20.3098676 C18.8592855,19.0801764 21.5453687,14.3629766 20.3325613,9.77370673 C19.1197538,5.18443691 14.4673212,2.46096029 9.94106224,3.69065143 C7.52370963,4.34739623 5.56035445,6.02376558 4.49357103,8.2653952 C4.32845825,8.61234632 3.91721015,8.75789206 3.57502268,8.59048072 C3.23283521,8.42306937 3.08928781,8.00609621 3.25440059,7.65914509 C4.49336656,5.05570865 6.77676829,3.10607433 9.58495703,2.34314741 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M2.49794681,3.90217796 C2.49794681,3.51694863 2.80594913,3.20465855 3.18588925,3.20465855 C3.56582936,3.20465855 3.87383169,3.51694863 3.87383169,3.90217796 L3.87360558,7.52173176 L6.91980245,7.41555441 C7.2814361,7.4029357 7.58746725,7.67568116 7.62708143,8.03426422 L7.63099908,8.08867052 C7.64406681,8.47367193 7.34684021,8.79651819 6.96712488,8.80976784 L3.24117729,8.93977968 C2.86111038,8.95304159 2.53984537,8.66451926 2.50172057,8.28653895 L2.49800979,8.22097241 L2.49794681,3.90217796 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M12.3540269,17.3251877 C12.6431336,17.3251877 12.9561718,17.1659567 12.9561718,16.7838024 L12.9561718,16.1901404 C14.6843872,16.0054325 15.7076642,14.9990928 15.7076642,13.5341679 C15.7076642,12.2730587 14.9431377,11.50875 13.3562633,11.1648111 L12.0520711,10.8718262 C11.2361478,10.6934875 10.8378231,10.3240717 10.8378231,9.78268638 C10.8378231,9.13302405 11.4031872,8.66170039 12.289781,8.66170039 C13.0093353,8.66170039 13.5104536,8.90373146 14.0693931,9.5215476 C14.3520752,9.81453257 14.5705113,9.92280963 14.8660426,9.92280963 C15.2258197,9.92280963 15.5020772,9.67440933 15.5020772,9.30499349 C15.5020772,8.94831613 15.2900657,8.55979258 14.9302885,8.20948446 C14.4548686,7.76363776 13.7920916,7.47065278 12.9890176,7.36874497 L12.9890176,6.69989325 C12.9890176,6.32410818 12.6816811,6.16487722 12.3861499,6.16487722 C12.0970432,6.16487722 11.7838443,6.31773894 11.7838443,6.69989325 L11.7838443,7.34963725 C10.1198749,7.50249898 9.11603231,8.48973095 9.11603231,9.90370191 C9.11603231,11.1393342 9.88055881,11.960966 11.3453659,12.2857971 L12.6495582,12.5851513 C13.6003978,12.8080747 13.992298,13.1392751 13.992298,13.6997681 C13.992298,14.4258613 13.4205093,14.8844465 12.3989991,14.8844465 C11.6344726,14.8844465 10.9984379,14.5978307 10.4202246,13.9800146 C10.0925704,13.6551834 9.91268177,13.5851218 9.66854726,13.5851218 C9.27664712,13.5851218 8.98111587,13.8335221 8.98111587,14.2602611 C8.98111587,14.6360462 9.19955201,15.0245697 9.59145215,15.3621394 C10.1054195,15.8270938 10.852439,16.1137095 11.7454573,16.1965096 L11.7454573,16.7838024 C11.7454573,17.1659567 12.0584957,17.3251877 12.3540269,17.3251877 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/menu/users_stars.svg b/Telegram/Resources/icons/menu/users_stars.svg
new file mode 100644
index 0000000000..0a068f774a
--- /dev/null
+++ b/Telegram/Resources/icons/menu/users_stars.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Menu / users_stars</title>
+    <g id="Icon-/-Menu-/-users_stars" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M10.6647222,14.6083333 C13.1679529,14.6083333 15.1972222,16.6376027 15.1972222,19.1408333 L15.1972222,19.1805556 C15.1972222,19.5119264 14.9285931,19.7805556 14.5972222,19.7805556 C14.2658514,19.7805556 13.9972222,19.5119264 13.9972222,19.1805556 L13.9972222,19.1408333 C13.9972222,17.3003444 12.5052112,15.8083333 10.6647222,15.8083333 L5.47983871,15.8083333 C3.75894714,15.8083333 2.36388889,17.2033916 2.36388889,18.9242832 C2.36388889,19.255654 2.09525974,19.5242832 1.76388889,19.5242832 C1.43251804,19.5242832 1.16388889,19.255654 1.16388889,18.9242832 C1.16388889,16.5406499 3.09620544,14.6083333 5.47983871,14.6083333 L10.6647222,14.6083333 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M8.47745116,3.81325275 C8.84434853,3.9691957 9.13648401,4.26133118 9.29242697,4.62822855 L9.837,5.91011111 L11.2536218,6.01848992 C12.0546381,6.07958882 12.6656371,6.74303885 12.6765549,7.53105369 L12.6721689,7.67131095 C12.640454,8.08709799 12.4414977,8.47225506 12.1207729,8.73875142 L11.07,9.61111111 L11.3938701,10.9206432 C11.5864903,11.7005519 11.1475494,12.4884712 10.4025244,12.745423 L10.2679383,12.785146 C9.87396987,12.8824474 9.45751925,12.8203294 9.10909531,12.6122923 L7.874,11.8751111 L6.65149995,12.6059661 C5.96413876,13.016376 5.08613461,12.8292111 4.62167189,12.196898 L4.53957882,12.0731599 C4.32863667,11.7198706 4.26783432,11.2968624 4.3707302,10.8984627 L4.60871396,9.97701978 C4.63955115,9.85762211 4.67934978,9.74174595 4.72741862,9.63019415 L4.781,9.51711111 C4.72402035,9.48693702 4.66830927,9.45442225 4.61377597,9.41969742 L4.45384681,9.30892937 L3.75085061,8.78062735 C3.07086182,8.2696154 2.93387902,7.30411853 3.44489097,6.62412974 C3.71113573,6.26984554 4.11709183,6.04742064 4.55898263,6.01371466 L5.912,5.91011111 L6.45757303,4.62822855 C6.79029762,3.84540525 7.69462787,3.48052816 8.47745116,3.81325275 Z M8.00805289,4.91763731 C7.83516435,4.84415422 7.63544068,4.92473827 7.5619576,5.09762682 L6.81242023,6.8611133 C6.762712,6.97806516 6.65195707,7.05755523 6.52524782,7.06722019 L4.65024959,7.21023893 C4.55265687,7.21768299 4.46300042,7.2668061 4.40419957,7.34505068 C4.29134126,7.49522796 4.32159427,7.70846043 4.47177155,7.82131874 L5.17476775,8.34962077 C5.44651754,8.55384088 5.78694643,8.64456615 6.12428682,8.60267031 L7.57841053,8.42207605 C7.70002725,8.40697192 7.81692252,8.4743167 7.86485999,8.58710305 C7.92415906,8.72662077 7.85912899,8.88779362 7.71961127,8.94709269 L6.4517079,9.48598834 C6.11405341,9.62950127 5.8623347,9.92186941 5.77058814,10.2771004 L5.53260437,11.1985433 C5.50987955,11.2865309 5.52330791,11.3799534 5.56989503,11.4579782 C5.66620013,11.6192716 5.87502492,11.671955 6.03631826,11.5756499 L7.70062419,10.5819253 C7.80803032,10.5177952 7.94196968,10.5177952 8.04937581,10.5819253 L9.72427701,11.5819761 C9.80122733,11.6279216 9.89320153,11.6416405 9.98021047,11.6201513 C10.1625874,11.5751082 10.2739185,11.3907479 10.2288754,11.208371 L9.77632428,9.37601536 C9.74506588,9.24945178 9.78889505,9.11615638 9.88916433,9.03284072 L11.3538674,7.81579097 C11.4247003,7.75693456 11.4686403,7.67187163 11.4756446,7.58004398 C11.4899322,7.3927312 11.3496676,7.2293018 11.1623548,7.21501419 L9.22475218,7.06722019 C9.09804293,7.05755523 8.987288,6.97806516 8.93757977,6.8611133 L8.1880424,5.09762682 C8.153602,5.01659659 8.08908313,4.95207771 8.00805289,4.91763731 Z" id="Star" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.0174227,5.90931057 C18.3486503,6.04652517 18.611812,6.3096869 18.7490266,6.64091449 L19.1044444,7.5 L20.0337984,7.57332883 C20.7344012,7.62815795 21.2683217,8.20775826 21.2801433,8.89635992 L21.2761548,9.02664858 C21.2481303,9.38474356 21.0787573,9.71696686 20.805417,9.94999576 L20.0974444,10.552 L20.3154363,11.4563406 C20.4799024,12.1395692 20.0937745,12.8265284 19.4425658,13.0506693 L19.3174274,13.0871582 C18.9686126,13.1711245 18.6007266,13.1129982 18.2947908,12.9255805 L17.4994444,12.438 L16.7339799,12.9079554 C16.1370798,13.2736191 15.3682309,13.1207349 14.9530722,12.5755767 L14.8749121,12.4613522 C14.6783232,12.1404454 14.6243898,11.7521195 14.7260855,11.389785 L14.9136874,10.721373 C14.9302657,10.6623057 14.9495081,10.6043097 14.9712932,10.5475329 L14.9924444,10.496 L14.8586084,10.4042198 L14.3173233,9.99771597 C13.7202762,9.54933497 13.5997585,8.701848 14.0481395,8.10480086 C14.2812853,7.79435268 14.6366446,7.59911993 15.0237072,7.56882844 L15.8944444,7.5 L16.2509734,6.64091449 C16.536738,5.95109613 17.3276044,5.6235459 18.0174227,5.90931057 Z M17.59643,6.9255611 C17.4678713,6.87230428 17.3204807,6.93334851 17.2672239,7.0619072 L16.7120856,8.40197687 C16.6758104,8.48954314 16.5934614,8.54934298 16.4989677,8.55673805 L15.1095308,8.66547529 C15.0373954,8.6711206 14.9711685,8.70750534 14.9277181,8.76536233 C14.8441551,8.87663162 14.8666155,9.03457438 14.9778848,9.11813736 L15.5191699,9.52464117 C15.7230236,9.67773481 15.9788884,9.7445585 16.2315688,9.71069694 L17.183292,9.58315701 C17.2805543,9.57012294 17.375435,9.61996727 17.4198915,9.70745139 C17.4776834,9.82117784 17.4323395,9.96022092 17.318613,10.0180128 L16.4184593,10.4754402 C16.2004755,10.5862121 16.0388382,10.7832041 15.9727639,11.0186219 L15.7851621,11.6870339 C15.7662094,11.7545607 15.7762608,11.8269315 15.8128983,11.8867376 C15.8855887,12.0053956 16.0407073,12.0426597 16.1593653,11.9699692 L17.3683823,11.2293199 C17.449152,11.17984 17.550848,11.17984 17.6316177,11.2293199 L18.8694054,11.9875943 C18.9264214,12.0225226 18.9949829,12.0333554 19.0599901,12.0177069 C19.1952788,11.9851403 19.2785516,11.8490667 19.245985,11.7137779 L18.9067247,10.304416 C18.8845188,10.212168 18.9160198,10.1152669 18.988225,10.0537103 L20.0917784,9.1129056 C20.1427197,9.06947694 20.1742851,9.00756181 20.1795079,8.94082508 C20.1903648,8.80209601 20.086704,8.68083261 19.9479749,8.66997568 L18.5010323,8.55673805 C18.4065386,8.54934298 18.3241896,8.48954314 18.2879144,8.40197687 L17.7327761,7.0619072 C17.707204,7.00017764 17.6581596,6.95113324 17.59643,6.9255611 Z" id="Star-Copy" fill="#FFFFFF" fill-rule="nonzero"></path>
+        <path d="M18.2638889,14.6083333 C20.7890575,14.6083333 22.8361111,16.6553869 22.8361111,19.1805556 C22.8361111,19.5119264 22.567482,19.7805556 22.2361111,19.7805556 C21.9047403,19.7805556 21.6361111,19.5119264 21.6361111,19.1805556 C21.6361111,17.3181286 20.1263158,15.8083333 18.2638889,15.8083333 L15.8789648,15.8077138 C15.6342075,15.3537143 15.2908888,14.9468235 14.8660915,14.6068359 L18.2638889,14.6083333 Z" id="Path" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2711328e0a..6bc8e0a3dc 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1876,8 +1876,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_star_ref_revoked_title" = "Link removed";
 "lng_star_ref_revoked_text" = "It will no longer work.";
 
-"lng_stars_rating_tooltip" = "Profile level reflects the user's payment reliability.";
-"lng_stars_rating_learn_more" = "Learn More";
+"lng_stars_rating_title" = "Rating";
+"lng_stars_rating_future" = "Future Rating";
+"lng_stars_rating_subtitle" = "The rating update updates in 21 days after purchases.";
+"lng_stars_rating_pending#one" = "{count} point is pending. {link}";
+"lng_stars_rating_pending#other" = "{count} points are pending. {link}";
+"lng_stars_rating_pending_preview" = "Preview {arrow}";
+"lng_stars_rating_pending_back" = "Back {arrow}";
+"lng_stars_rating_about" = "This rating reflects **{name}'s** activity on Telegram. What affects it:";
+"lng_stars_rating_about_your" = "This rating reflects your activity on Telegram. What affects it:";
+"lng_stars_title_gifts_telegram" = "Gifts from Telegram";
+"lng_stars_about_gifts_telegram" = "{emoji} 100% of the Stars spent on gifts purchased from Telegram.";
+"lng_stars_title_gifts_users" = "Gifts and Posts from Users";
+"lng_stars_about_gifts_users" = "{emoji} 20% of the Stars spent on resold gifts, paid messages and channel posts.";
+"lng_stars_title_refunds" = "Refunds and Conversions";
+"lng_stars_about_refunds" = "{emoji} 10x of refunded Stars and 85% of bought gifts converted to Stars.";
+"lng_stars_rating_added" = "Added";
+"lng_stars_rating_deducted" = "Deducted";
+"lng_stars_rating_understood" = "Understood";
 
 "lng_manage_discussion_group" = "Discussion";
 "lng_manage_discussion_group_add" = "Add a group";
diff --git a/Telegram/SourceFiles/data/data_peer_common.h b/Telegram/SourceFiles/data/data_peer_common.h
index 87d1722ab1..d3231c3be1 100644
--- a/Telegram/SourceFiles/data/data_peer_common.h
+++ b/Telegram/SourceFiles/data/data_peer_common.h
@@ -11,12 +11,12 @@ namespace Data {
 
 struct StarsRating {
 	int level = 0;
-	int levelStars = 0;
-	int currentStars = 0;
+	int stars = 0;
+	int thisLevelStars = 0;
 	int nextLevelStars = 0;
 
 	explicit operator bool() const {
-		return level != 0 || levelStars != 0;
+		return level != 0 || thisLevelStars != 0;
 	}
 
 	friend inline bool operator==(StarsRating, StarsRating) = default;
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index dd4aa9b6bf..d3c09a06f6 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -72,8 +72,8 @@ bool ApplyBotVerifierSettings(
 	const auto &data = rating->data();
 	return {
 		.level = data.vlevel().v,
-		.levelStars = int(data.vcurrent_level_stars().v),
-		.currentStars = int(data.vstars().v),
+		.stars = int(data.vstars().v),
+		.thisLevelStars = int(data.vcurrent_level_stars().v),
 		.nextLevelStars = int(data.vnext_level_stars().value_or_empty()),
 	};
 }
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 357efe9957..6904786101 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1195,12 +1195,8 @@ StarsRating {
 	margin: margins;
 	padding: margins;
 	style: TextStyle;
-	minSkip: pixels;
-	border: pixels;
 	activeBg: color;
-	inactiveBg: color;
 	activeFg: color;
-	inactiveFg: color;
 }
 infoStarsRating: StarsRating {
 	margin: margins(6px, 6px, 6px, 6px);
@@ -1208,24 +1204,37 @@ infoStarsRating: StarsRating {
 	style: TextStyle(defaultTextStyle) {
 		font: font(11px semibold);
 	}
-	minSkip: 32px;
-	border: 2px;
 	activeBg: windowBgActive;
-	inactiveBg: windowBgRipple;
 	activeFg: windowFgActive;
-	inactiveFg: windowBoldFg;
 }
-infoStarsRatingLearn: RoundButton(defaultActiveButton) {
-	width: -24px;
-	height: 44px;
-	textTop: 13px;
-	textFg: mediaviewTextLinkFg;
-	textFgOver: mediaviewTextLinkFg;
-	textBg: transparent;
-	textBgOver: transparent;
-	ripple: emptyRippleAnimation;
+infoStarsTitle: FlatLabel(defaultFlatLabel) {
+	minWidth: 40px;
+	textFg: windowBoldFg;
+	maxHeight: 24px;
+	style: TextStyle(boxTextStyle) {
+		font: font(17px semibold);
+	}
+	align: align(top);
+}
+infoStarsFeatureTitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	style: semiboldTextStyle;
+	minWidth: 10px;
+	maxHeight: 20px;
+}
+infoStarsFeatureAbout: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	minWidth: 20px;
+}
+infoStarsFeatureIconPosition: point(3px, 7px);
+infoStarsFeatureMargin: margins(0px, 8px, 0px, 6px);
+infoStarsFeatureLabelLeft: 46px;
+infoStarsFeatureSkip: 2px;
+infoStarsCrown: icon {{ "limits/filled_rating_crown-24x24", windowFgActive }};
+infoStarsUnderstood: IconEmoji{
+	icon: icon {{ "limits/filled_understood-20x20", windowFgActive }};
+	padding: margins(0px, -1px, 0px, 0px);
 }
-infoStarsRatingTooltip: defaultImportantTooltip;
 
 collectionAbout: FlatLabel(defaultFlatLabel) {
 	minWidth: 256px;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 691fcbbea4..33d4ab8dad 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -651,8 +651,9 @@ Cover::Cover(
 	? std::make_unique<Ui::StarsRating>(
 		this,
 		st::infoStarsRating,
-		Data::StarsRatingValue(_peer),
-		_parentForTooltip)
+		_controller->uiShow(),
+		_peer->isSelf() ? QString() : _peer->shortName(),
+		Data::StarsRatingValue(_peer))
 	: nullptr)
 , _status(this, _st.status)
 , _showLastSeen(this, tr::lng_status_lastseen_when(), _st.showLastSeen)
@@ -668,14 +669,6 @@ Cover::Cover(
 	if (!_peer->isMegagroup()) {
 		_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 		if (const auto rating = _starsRating.get()) {
-			_status->widthValue() | rpl::start_with_next([=](int width) {
-				rating->setMinimalAddedWidth(width);
-			}, rating->lifetime());
-			const auto session = &_peer->session();
-			rating->learnMoreRequests() | rpl::start_with_next([=] {
-				const auto &appConfig = session->appConfig();
-				UrlClickHandler::Open(appConfig.starsRatingLearnMoreUrl());
-			}, rating->lifetime());
 			_statusShift = rating->collapsedWidthValue();
 			_statusShift.changes() | rpl::start_with_next([=] {
 				refreshStatusGeometry(width());
diff --git a/Telegram/SourceFiles/main/main_app_config.cpp b/Telegram/SourceFiles/main/main_app_config.cpp
index 5f9183797e..844c68dfbd 100644
--- a/Telegram/SourceFiles/main/main_app_config.cpp
+++ b/Telegram/SourceFiles/main/main_app_config.cpp
@@ -246,12 +246,6 @@ QString AppConfig::ageVerifyBotUsername() const {
 	return get<QString>(u"verify_age_bot_username"_q, QString());
 }
 
-QString AppConfig::starsRatingLearnMoreUrl() const {
-	return get<QString>(
-		u"stars_rating_learnmore_url"_q,
-		u"https://telegram.org/blog"_q);
-}
-
 int AppConfig::storiesAlbumsLimit() const {
 	return get<int>(u"stories_albums_limit"_q, 100);
 }
diff --git a/Telegram/SourceFiles/main/main_app_config.h b/Telegram/SourceFiles/main/main_app_config.h
index 11f6b66f34..91fac6690b 100644
--- a/Telegram/SourceFiles/main/main_app_config.h
+++ b/Telegram/SourceFiles/main/main_app_config.h
@@ -112,8 +112,6 @@ public:
 	[[nodiscard]] int ageVerifyMinAge() const;
 	[[nodiscard]] QString ageVerifyBotUsername() const;
 
-	[[nodiscard]] QString starsRatingLearnMoreUrl() const;
-
 	[[nodiscard]] int storiesAlbumsLimit() const;
 	[[nodiscard]] int storiesAlbumLimit() const;
 
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.cpp b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
index d2cfeafca4..e72896a771 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
@@ -451,7 +451,7 @@ void BoostBox(
 			: tr::lng_boost_channel_button();
 	}) | rpl::flatten_latest();
 
-	const auto button = box->addButton(rpl::duplicate(submit), [=] {
+	box->addButton(rpl::duplicate(submit), [=] {
 		if (state->submitted) {
 			return;
 		} else if (state->data.current().nextLevelBoosts > 0
@@ -519,17 +519,6 @@ void BoostBox(
 			box->closeBox();
 		}
 	});
-
-	rpl::combine(
-		std::move(submit),
-		box->widthValue()
-	) | rpl::start_with_next([=](const QString &, int width) {
-		const auto &padding = st::boostBox.buttonPadding;
-		button->resizeToWidth(width
-			- padding.left()
-			- padding.right());
-		button->moveToLeft(padding.left(), button->y());
-	}, button->lifetime());
 }
 
 object_ptr<Ui::RpWidget> MakeLinkLabel(
@@ -788,20 +777,10 @@ void AskBoostBox(
 		data.group);
 
 	auto submit = tr::lng_boost_channel_ask_button();
-	const auto button = box->addButton(rpl::duplicate(submit), [=] {
+	box->addButton(rpl::duplicate(submit), [=] {
 		QGuiApplication::clipboard()->setText(data.link);
 		box->uiShow()->showToast(tr::lng_username_copied(tr::now));
 	});
-	rpl::combine(
-		std::move(submit),
-		box->widthValue()
-	) | rpl::start_with_next([=](const QString &, int width) {
-		const auto &padding = st::boostBox.buttonPadding;
-		button->resizeToWidth(width
-			- padding.left()
-			- padding.right());
-		button->moveToLeft(padding.left(), button->y());
-	}, button->lifetime());
 }
 
 void FillBoostLimit(
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 23ec63146f..5fe6397149 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -7,7 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/controls/stars_rating.h"
 
+#include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
+#include "ui/effects/premium_bubble.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/layers/generic_box.h"
+#include "ui/layers/show.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
@@ -17,25 +23,395 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
 #include "styles/style_info.h"
+#include "styles/style_layers.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
 #include "styles/style_media_view.h"
+#include "styles/style_menu_icons.h"
 
 namespace Ui {
 namespace {
 
 constexpr auto kAutoCollapseTimeout = 4 * crl::time(1000);
 
+using Counters = Data::StarsRating;
+
+struct Feature {
+	const style::icon &icon;
+	QString title;
+	TextWithEntities about;
+};
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeFeature(
+		QWidget *parent,
+		Feature feature,
+		const Text::MarkedContext &context) {
+	auto result = object_ptr<Ui::PaddingWrap<>>(
+		parent,
+		object_ptr<Ui::RpWidget>(parent),
+		st::infoStarsFeatureMargin);
+	const auto widget = result->entity();
+	const auto icon = Ui::CreateChild<Info::Profile::FloatingIcon>(
+		widget,
+		feature.icon,
+		st::infoStarsFeatureIconPosition);
+	const auto title = Ui::CreateChild<Ui::FlatLabel>(
+		widget,
+		feature.title,
+		st::infoStarsFeatureTitle);
+	const auto about = Ui::CreateChild<Ui::FlatLabel>(
+		widget,
+		rpl::single(feature.about),
+		st::infoStarsFeatureAbout,
+		st::defaultPopupMenu,
+		context);
+	icon->show();
+	title->show();
+	about->show();
+	widget->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		const auto left = st::infoStarsFeatureLabelLeft;
+		const auto available = width - left;
+		title->resizeToWidth(available);
+		about->resizeToWidth(available);
+		auto top = 0;
+		title->move(left, top);
+		top += title->height() + st::infoStarsFeatureSkip;
+		about->move(left, top);
+		top += about->height();
+		widget->resize(width, top);
+	}, widget->lifetime());
+	return result;
+}
+
+[[nodiscard]] Fn<QImage()> CustomEmojiBadgeFactory(
+		const QString &text,
+		const style::color &bg,
+		const style::color &fg) {
+	return [=] {
+		auto string = Ui::Text::String(
+			st::settingsPremiumNewBadge.style,
+			text.toUpper());
+		const auto size = QSize(string.maxWidth(), string.minHeight());
+		const auto padding = st::settingsPremiumNewBadgePadding;
+		const auto full = size.grownBy(padding);
+		const auto ratio = style::DevicePixelRatio();
+
+		auto result = QImage(
+			full * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		result.setDevicePixelRatio(ratio);
+		result.fill(Qt::transparent);
+
+		auto p = QPainter(&result);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setPen(Qt::NoPen);
+		p.setBrush(bg);
+
+		const auto r = padding.left();
+		p.drawRoundedRect(0, 0, full.width(), full.height(), r, r);
+
+		p.setPen(fg);
+		string.draw(p, { .position = { padding.left(), padding.top() } });
+
+		p.end();
+		return result;
+	};
+}
+
+[[nodiscard]] Counters AdjustByReached(Counters data) {
+	const auto reached = !data.nextLevelStars;
+	if (reached) {
+		--data.level;
+		data.stars = data.nextLevelStars = std::max({
+			data.stars,
+			data.thisLevelStars,
+			1
+		});
+		data.thisLevelStars = 0;
+	} else {
+		data.stars = std::max(data.thisLevelStars, data.stars);
+		data.nextLevelStars = std::max(
+			data.nextLevelStars,
+			data.stars + 1);
+	}
+	return data;
+}
+
+[[nodiscard]] Fn<QString(int)> BubbleTextFactory(int countForScale) {
+	return [=](int count) {
+		return (countForScale < 10'000)
+			? QString::number(count)
+			: (countForScale < 10'000'000)
+			? (QString::number((count / 100) / 10.) + 'K')
+			: (QString::number((count / 100'000) / 10.) + 'M');
+	};
+}
+
+void FillRatingLimit(
+		rpl::producer<> showFinished,
+		not_null<VerticalLayout*> container,
+		rpl::producer<Counters> data,
+		style::margins limitLinePadding,
+		int starsForScale) {
+	const auto addSkip = [&](int skip) {
+		container->add(object_ptr<Ui::FixedHeightWidget>(container, skip));
+	};
+
+	const auto ratio = [=](Counters rating) {
+		const auto min = rating.thisLevelStars;
+		const auto max = rating.nextLevelStars;
+
+		Assert(rating.stars >= min && rating.stars <= max);
+		const auto count = (max - min);
+		const auto index = (rating.stars - min);
+		if (!index) {
+			return 0.;
+		} else if (index == count) {
+			return 1.;
+		} else if (count == 2) {
+			return 0.5;
+		}
+		const auto available = st::boxWideWidth
+			- st::boxPadding.left()
+			- st::boxPadding.right();
+		const auto average = available / float64(count);
+		const auto levelWidth = [&](int add) {
+			return st::normalFont->width(
+				tr::lng_boost_level(
+					tr::now,
+					lt_count,
+					rating.level + add));
+		};
+		const auto paddings = 2 * st::premiumLineTextSkip;
+		const auto labelLeftWidth = paddings + levelWidth(0);
+		const auto labelRightWidth = paddings + levelWidth(1);
+		const auto first = std::max(average, labelLeftWidth * 1.);
+		const auto last = std::max(average, labelRightWidth * 1.);
+		const auto other = (available - first - last) / (count - 2);
+		return (first + (index - 1) * other) / available;
+	};
+
+	auto adjustedData = rpl::duplicate(data) | rpl::map(AdjustByReached);
+
+	auto bubbleRowState = rpl::duplicate(
+		adjustedData
+	) | rpl::combine_previous(
+		Counters()
+	) | rpl::map([=](Counters previous, Counters counters) {
+		return Premium::BubbleRowState{
+			.counter = counters.stars,
+			.ratio = ratio(counters),
+			.animateFromZero = (counters.level != previous.level),
+			.dynamic = true,
+		};
+	});
+	Premium::AddBubbleRow(
+		container,
+		st::boostBubble,
+		std::move(showFinished),
+		rpl::duplicate(bubbleRowState),
+		Premium::BubbleType::StarRating,
+		BubbleTextFactory(starsForScale),
+		&st::infoStarsCrown,
+		limitLinePadding);
+	addSkip(st::premiumLineTextSkip);
+
+	const auto level = [](int level) {
+		return tr::lng_boost_level(tr::now, lt_count, level);
+	};
+	auto limitState = std::move(
+		bubbleRowState
+	) | rpl::map([](const Premium::BubbleRowState &state) {
+		return Premium::LimitRowState{
+			.ratio = state.ratio,
+			.animateFromZero = state.animateFromZero,
+			.dynamic = state.dynamic
+		};
+	});
+	auto left = rpl::duplicate(
+		adjustedData
+	) | rpl::map([=](Counters counters) {
+		return level(counters.level);
+	});
+	auto right = rpl::duplicate(
+		adjustedData
+	) | rpl::map([=](Counters counters) {
+		return level(counters.level + 1);
+	});
+	Premium::AddLimitRow(
+		container,
+		st::boostLimits,
+		Premium::LimitRowLabels{
+			.leftLabel = std::move(left),
+			.rightLabel = std::move(right),
+			.activeLineBg = [=] { return st::windowBgActive->b; },
+		},
+		std::move(limitState),
+		limitLinePadding);
+}
+
+object_ptr<Ui::FlatLabel> MakeBoostFeaturesBadge(
+		not_null<QWidget*> parent,
+		rpl::producer<QString> text,
+		Fn<QBrush(QRect)> bg) {
+	auto result = object_ptr<Ui::FlatLabel>(
+		parent,
+		std::move(text),
+		st::boostLevelBadge);
+	const auto label = result.data();
+
+	label->show();
+	label->paintRequest() | rpl::start_with_next([=] {
+		const auto size = label->textMaxWidth();
+		const auto rect = QRect(
+			(label->width() - size) / 2,
+			st::boostLevelBadge.margin.top(),
+			size,
+			st::boostLevelBadge.style.font->height
+		).marginsAdded(st::boostLevelBadge.margin);
+		auto p = QPainter(label);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(bg(rect));
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(rect, rect.height() / 2., rect.height() / 2.);
+
+		const auto &lineFg = st::windowBgRipple;
+		const auto line = st::boostLevelBadgeLine;
+		const auto top = st::boostLevelBadge.margin.top()
+			+ ((st::boostLevelBadge.style.font->height - line) / 2);
+		const auto left = 0;
+		const auto skip = st::boostLevelBadgeSkip;
+		if (const auto right = rect.x() - skip; right > left) {
+			p.fillRect(left, top, right - left, line, lineFg);
+		}
+		const auto right = label->width();
+		if (const auto left = rect.x() + rect.width() + skip
+			; left < right) {
+			p.fillRect(left, top, right - left, line, lineFg);
+		}
+	}, label->lifetime());
+
+	return result;
+}
+
+void AboutRatingBox(
+		not_null<GenericBox*> box,
+		const QString &name,
+		Counters data) {
+	box->setWidth(st::boxWideWidth);
+	box->setStyle(st::boostBox);
+
+	struct State {
+		rpl::variable<Counters> data;
+		rpl::variable<bool> full;
+	};
+	const auto state = box->lifetime().make_state<State>();
+	state->data = std::move(data);
+
+	FillRatingLimit(
+		BoxShowFinishes(box),
+		box->verticalLayout(),
+		state->data.value(),
+		st::boxRowPadding,
+		data.stars);
+
+	box->setMaxHeight(st::boostBoxMaxHeight);
+	const auto close = box->addTopButton(
+		st::boxTitleClose,
+		[=] { box->closeBox(); });
+
+	auto title = tr::lng_stars_rating_title();;
+
+	auto text = !name.isEmpty()
+		? tr::lng_stars_rating_about(
+			lt_name,
+			rpl::single(TextWithEntities{ name }),
+			Ui::Text::RichLangValue) | rpl::type_erased()
+		: tr::lng_stars_rating_about_your(
+			Ui::Text::RichLangValue) | rpl::type_erased();
+
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(box, std::move(title), st::infoStarsTitle),
+		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0));
+
+	const auto aboutLabel = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			std::move(text),
+			st::boostText),
+		(st::boxRowPadding
+			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
+	aboutLabel->setTryMakeSimilarLines(true);
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto makeBadge = [&](
+			const QString &text,
+			const style::color &bg,
+			const style::color &fg) {
+		return helper.paletteDependent(
+			CustomEmojiBadgeFactory(text, bg, fg),
+			st::badgeEmojiMargin);
+	};
+	const auto makeActive = [&](const QString &text) {
+		return makeBadge(text, st::windowBgActive, st::windowFgActive);
+	};
+	const auto makeInactive = [&](const QString &text) {
+		return makeBadge(text, st::windowSubTextFg, st::windowFgActive);
+	};
+	const auto features = std::vector<Feature>{
+		{
+			st::menuIconRatingGifts,
+			tr::lng_stars_title_gifts_telegram(tr::now),
+			tr::lng_stars_about_gifts_telegram(
+				tr::now,
+				lt_emoji,
+				makeActive(tr::lng_stars_rating_added(tr::now)),
+				Ui::Text::RichLangValue),
+		},
+		{
+			st::menuIconRatingUsers,
+			tr::lng_stars_title_gifts_users(tr::now),
+			tr::lng_stars_about_gifts_users(
+				tr::now,
+				lt_emoji,
+				makeActive(tr::lng_stars_rating_added(tr::now)),
+				Ui::Text::RichLangValue),
+		},
+		{
+			st::menuIconRatingRefund,
+			tr::lng_stars_title_refunds(tr::now),
+			tr::lng_stars_about_refunds(
+				tr::now,
+				lt_emoji,
+				makeInactive(tr::lng_stars_rating_deducted(tr::now)),
+				Ui::Text::RichLangValue),
+		},
+	};
+	const auto context = helper.context();
+	for (const auto &feature : features) {
+		box->addRow(MakeFeature(box, feature, context));
+	}
+	box->addButton(rpl::single(QString()), [=] {
+		box->closeBox();
+	})->setText(rpl::single(Ui::Text::IconEmoji(
+		&st::infoStarsUnderstood
+	).append(' ').append(tr::lng_stars_rating_understood(tr::now))));
+}
+
 } // namespace
 
 StarsRating::StarsRating(
 	QWidget *parent,
 	const style::StarsRating &st,
-	rpl::producer<Data::StarsRating> value,
-	Fn<not_null<QWidget*>()> parentForTooltip)
+	std::shared_ptr<Ui::Show> show,
+	const QString &name,
+	rpl::producer<Counters> value)
 : _widget(std::make_unique<Ui::AbstractButton>(parent))
 , _st(st)
-, _parentForTooltip(std::move(parentForTooltip))
-, _value(std::move(value))
-, _collapseTimer([=] { _expanded = false; }) {
+, _show(std::move(show))
+, _name(name)
+, _value(std::move(value)) {
 	init();
 }
 
@@ -43,18 +419,6 @@ StarsRating::~StarsRating() = default;
 
 void StarsRating::init() {
 	_widget->setPointerCursor(true);
-	_expanded.changes() | rpl::start_with_next([=](bool expanded) {
-		_widget->setPointerCursor(!expanded);
-		const auto from = expanded ? 0. : 1.;
-		const auto till = expanded ? 1. : 0.;
-		_expandedAnimation.start([=] {
-			updateWidth();
-			if (!_expandedAnimation.animating()) {
-				updateStarsTooltipGeometry();
-			}
-		}, from, till, st::slideDuration);
-		toggleTooltips(expanded);
-	}, lifetime());
 
 	_widget->paintRequest() | rpl::start_with_next([=] {
 		auto p = QPainter(_widget.get());
@@ -65,189 +429,43 @@ void StarsRating::init() {
 		if (!_value.current()) {
 			return;
 		}
-		_expanded = true;
-		_collapseTimer.callOnce(kAutoCollapseTimeout);
+		_show->show(Box(AboutRatingBox, _name, _value.current()));
 	});
 
 	const auto added = _st.margin + _st.padding;
-	const auto border = 2 * _st.border;
 	const auto fontHeight = _st.style.font->height;
-	const auto height = added.top() + fontHeight + added.bottom() + border;
+	const auto height = added.top() + fontHeight + added.bottom();
 	_widget->resize(_widget->width(), height);
 
-	_value.value() | rpl::start_with_next([=](Data::StarsRating rating) {
+	_value.value() | rpl::start_with_next([=](Counters rating) {
 		if (!rating) {
 			_widget->resize(0, _widget->height());
 			_collapsedWidthValue = 0;
-			_expanded = false;
-			updateExpandedWidth();
-			_expandedAnimation.stop();
 			return;
 		}
 		updateTexts(rating);
 	}, lifetime());
 }
 
-void StarsRating::updateTexts(Data::StarsRating rating) {
+void StarsRating::updateTexts(Counters rating) {
 	_collapsedText.setText(
 		_st.style,
 		Lang::FormatCountDecimal(rating.level));
-	_expandedText.setText(
-		_st.style,
-		tr::lng_boost_level(tr::now, lt_count_decimal, rating.level));
-	_nextText.setText(
-		_st.style,
-		(rating.nextLevelStars
-			? Lang::FormatCountDecimal(rating.level + 1)
-			: QString()));
 
 	const auto added = _st.padding;
-	const auto border = 2 * _st.border;
-	const auto add = added.left() + added.right() + border;
-	const auto min = _expandedText.maxWidth() + _nextText.maxWidth();
+	const auto add = added.left() + added.right();
 	const auto height = _widget->height();
-	_minimalContentWidth = add + min + _st.minSkip;
 	_collapsedWidthValue = _st.margin.right()
 		+ std::max(
 			add + _collapsedText.maxWidth(),
 			height - _st.margin.top() - _st.margin.bottom());
-	updateExpandedWidth();
 	updateWidth();
 }
 
-void StarsRating::updateExpandedWidth() {
-	_expandedWidthValue = _st.margin.right() + std::max(
-		_collapsedWidthValue.current() + _minimalAddedWidth.current(),
-		_minimalContentWidth.current());
-}
-
 void StarsRating::updateWidth() {
-	const auto widthToRight = anim::interpolate(
-		_collapsedWidthValue.current(),
-		_expandedWidthValue.current(),
-		_expandedAnimation.value(_expanded.current() ? 1. : 0.));
+	const auto widthToRight = _collapsedWidthValue.current();
 	_widget->resize(_st.margin.left() + widthToRight, _widget->height());
 	_widget->update();
-	updateStarsTooltipGeometry();
-}
-
-void StarsRating::toggleTooltips(bool shown) {
-	if (!shown) {
-		if (const auto strong = _about.get()) {
-			strong->hideAnimated();
-		}
-		if (const auto strong = _stars.release()) {
-			strong->toggleAnimated(false);
-		}
-		return;
-	}
-	const auto value = _value.current();
-	const auto parent = _parentForTooltip
-		? _parentForTooltip().get()
-		: _widget->window();
-	const auto text = value.nextLevelStars
-		? (Lang::FormatCountDecimal(value.currentStars)
-			+ u" / "_q
-			+ Lang::FormatCountDecimal(value.nextLevelStars))
-		: Lang::FormatCountDecimal(value.currentStars);
-	_stars = std::make_unique<Ui::ImportantTooltip>(
-		parent,
-		Ui::MakeNiceTooltipLabel(
-			_widget.get(),
-			rpl::single(TextWithEntities{ text }),
-			st::storiesInfoTooltipMaxWidth,
-			st::storiesInfoTooltipLabel),
-		st::infoStarsRatingTooltip);
-	const auto stars = _stars.get();
-	const auto weak = QPointer<QWidget>(stars);
-	const auto destroy = [=] {
-		delete weak.data();
-	};
-	stars->setAttribute(Qt::WA_TransparentForMouseEvents);
-	stars->setHiddenCallback(destroy);
-	updateStarsTooltipGeometry();
-	stars->toggleAnimated(true);
-
-	_aboutSt = std::make_unique<style::Toast>(st::defaultMultilineToast);
-	const auto learn = tr::lng_stars_rating_learn_more(tr::now);
-	_aboutSt->padding.setRight(
-		(st::infoStarsRatingLearn.style.font->width(learn)
-			- st::infoStarsRatingLearn.width));
-
-	_about = Ui::Toast::Show(parent, {
-		.text = tr::lng_stars_rating_tooltip(
-			tr::now,
-			Ui::Text::WithEntities),
-		.st = _aboutSt.get(),
-		.attach = RectPart::Top,
-		.dark = true,
-		.adaptive = true,
-		.acceptinput = true,
-		.duration = kAutoCollapseTimeout,
-	});
-	const auto strong = _about.get();
-	if (!strong) {
-		return;
-	}
-	const auto widget = strong->widget();
-	const auto hideToast = [weak = _about] {
-		if (const auto strong = weak.get()) {
-			strong->hideAnimated();
-		}
-	};
-
-	const auto button = Ui::CreateChild<Ui::RoundButton>(
-		widget.get(),
-		rpl::single(learn),
-		st::infoStarsRatingLearn);
-	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	button->show();
-	rpl::combine(
-		widget->sizeValue(),
-		button->sizeValue()
-	) | rpl::start_with_next([=](QSize outer, QSize inner) {
-		button->moveToRight(
-			0,
-			(outer.height() - inner.height()) / 2,
-			outer.width());
-	}, widget->lifetime());
-	button->setClickedCallback([=] {
-		_learnMoreRequests.fire({});
-	});
-}
-
-void StarsRating::updateStarsTooltipGeometry() {
-	if (!_stars) {
-		return;
-	}
-	const auto weakParent = base::make_weak(_stars->parentWidget());
-	const auto weak = base::make_weak(_widget.get());
-	const auto point = _st.margin.left()
-		+ _st.border
-		+ (_activeWidth / (_value.current().nextLevelStars ? 1 : 2));
-	const auto countPosition = [=](QSize size) {
-		const auto strong = weak.get();
-		const auto parent = weakParent.get();
-		if (!strong || !parent) {
-			return QPoint();
-		}
-		const auto geometry = Ui::MapFrom(parent, strong, strong->rect());
-		const auto shift = size.width() / 2;
-		const auto left = geometry.x() + point - shift;
-		const auto margin = st::defaultImportantTooltip.margin;
-		return QPoint(
-			std::min(
-				std::max(left, margin.left()),
-				parent->width() - size.width() - margin.right()),
-			geometry.y() + geometry.height());
-	};
-	_stars->pointAt(
-		Ui::MapFrom(
-			_stars->parentWidget(),
-			_widget.get(),
-			QRect(point, 0, st::lineWidth, _widget->height())),
-		RectPart::Bottom,
-		countPosition);
 }
 
 void StarsRating::raise() {
@@ -263,92 +481,27 @@ void StarsRating::paint(QPainter &p) {
 	if (outer.isEmpty()) {
 		return;
 	}
-	const auto border = _st.border;
-	const auto middle = outer.marginsRemoved(
-		{ border, border, border, border });
-	const auto mradius = middle.height() / 2.;
-	const auto inner = middle.marginsRemoved(_st.padding);
-
-	const auto expanded = _expandedAnimation.value(
-		_expanded.current() ? 1. : 0.);
+	const auto inner = outer.marginsRemoved(_st.padding);
 
 	auto hq = PainterHighQualityEnabler(p);
 	p.setPen(Qt::NoPen);
-	p.setBrush(_st.inactiveBg);
-	const auto oradius = outer.height() / 2.;
-	p.drawRoundedRect(outer, oradius, oradius);
 	p.setBrush(_st.activeBg);
 
 	const auto value = _value.current();
-	const auto expandedRatio = (value.nextLevelStars > value.levelStars)
-		? ((value.currentStars - value.levelStars)
-			/ float64(value.nextLevelStars - value.levelStars))
-		: 1.;
-	const auto expandedFilled = (expandedRatio < 1.)
-		? (_st.padding.left()
-			+ _expandedText.maxWidth()
-			+ _st.padding.right()
-			+ expandedRatio * (middle.width()
-				- _st.padding.left()
-				- _expandedText.maxWidth()
-				- _st.padding.right()
-				- _st.padding.left()
-				- _nextText.maxWidth()
-				- _st.padding.right()))
-		: middle.width();
-	const auto collapsedFilled = _collapsedWidthValue.current()
-		- _st.margin.right()
-		- 2 * _st.border;
-	_activeWidth = anim::interpolate(
-		collapsedFilled,
-		expandedFilled,
-		expanded);
-	p.drawRoundedRect(
-		middle.x(),
-		middle.y(),
-		_activeWidth,
-		middle.height(),
-		mradius,
-		mradius);
+	const auto radius = outer.height() / 2.;
+	p.drawRoundedRect(outer, radius, radius);
 	p.setPen(_st.activeFg);
-	if (expanded < 1.) {
-		p.setOpacity(1. - expanded);
-		const auto skip = (inner.width() - _collapsedText.maxWidth()) / 2;
-		_collapsedText.draw(p, {
-			.position = inner.topLeft() + QPoint(skip, 0),
-			.availableWidth = _collapsedText.maxWidth(),
-		});
-	}
-	if (expanded > 0.) {
-		p.setOpacity(expanded);
-		_expandedText.draw(p, {
-			.position = inner.topLeft(),
-			.availableWidth = _expandedText.maxWidth(),
-		});
-
-		p.setPen(_st.inactiveFg);
-		_nextText.draw(p, {
-			.position = (inner.topLeft()
-				+ QPoint(inner.width() - _nextText.maxWidth(), 0)),
-			.availableWidth = _nextText.maxWidth(),
-		});
-	}
-}
-
-void StarsRating::setMinimalAddedWidth(int addedWidth) {
-	_minimalAddedWidth = addedWidth + (_st.style.font->spacew * 2);
-	updateExpandedWidth();
-	updateWidth();
+	const auto skip = (inner.width() - _collapsedText.maxWidth()) / 2;
+	_collapsedText.draw(p, {
+		.position = inner.topLeft() + QPoint(skip, 0),
+		.availableWidth = _collapsedText.maxWidth(),
+	});
 }
 
 rpl::producer<int> StarsRating::collapsedWidthValue() const {
 	return _collapsedWidthValue.value();
 }
 
-rpl::producer<> StarsRating::learnMoreRequests() const {
-	return _learnMoreRequests.events();
-}
-
 rpl::lifetime &StarsRating::lifetime() {
 	return _widget->lifetime();
 }
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
index 7af2a41c62..b72f061d8f 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.h
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -7,7 +7,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/timer.h"
 #include "base/weak_ptr.h"
 #include "data/data_peer_common.h"
 
@@ -25,22 +24,22 @@ namespace Ui {
 class ImportantTooltip;
 class AbstractButton;
 class FlatLabel;
+class Show;
 
 class StarsRating final {
 public:
 	StarsRating(
 		QWidget *parent,
 		const style::StarsRating &st,
-		rpl::producer<Data::StarsRating> value,
-		Fn<not_null<QWidget*>()> parentForTooltip);
+		std::shared_ptr<Ui::Show> show,
+		const QString &name,
+		rpl::producer<Data::StarsRating> value);
 	~StarsRating();
 
 	void raise();
 	void moveTo(int x, int y);
-	void setMinimalAddedWidth(int addedWidth);
 
 	[[nodiscard]] rpl::producer<int> collapsedWidthValue() const;
-	[[nodiscard]] rpl::producer<> learnMoreRequests() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
@@ -48,35 +47,17 @@ private:
 	void init();
 	void paint(QPainter &p);
 	void updateTexts(Data::StarsRating rating);
-	void updateExpandedWidth();
 	void updateWidth();
-	void toggleTooltips(bool shown);
-	void updateStarsTooltipGeometry();
 
 	const std::unique_ptr<Ui::AbstractButton> _widget;
 	const style::StarsRating &_st;
-	const Fn<not_null<QWidget*>()> _parentForTooltip;
-
-	std::unique_ptr<style::Toast> _aboutSt;
-	base::weak_ptr<Ui::Toast::Instance> _about;
-	std::unique_ptr<Ui::ImportantTooltip> _stars;
+	const std::shared_ptr<Ui::Show> _show;
+	const QString _name;
 
 	Ui::Text::String _collapsedText;
-	Ui::Text::String _expandedText;
-	Ui::Text::String _nextText;
 
 	rpl::variable<Data::StarsRating> _value;
 	rpl::variable<int> _collapsedWidthValue;
-	rpl::variable<int> _expandedWidthValue;
-	rpl::variable<int> _minimalContentWidth;
-	rpl::variable<int> _minimalAddedWidth;
-	rpl::variable<bool> _expanded = false;
-	Ui::Animations::Simple _expandedAnimation;
-	mutable int _activeWidth = 0;
-
-	rpl::event_stream<> _learnMoreRequests;
-
-	base::Timer _collapseTimer;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index 4abbea6f14..f5353f100c 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -294,6 +294,7 @@ boostBottomSkip: 6px;
 boostBox: Box(premiumPreviewDoubledLimitsBox) {
 	buttonPadding: margins(16px, 12px, 16px, 12px);
 	buttonHeight: 42px;
+	buttonWide: true;
 	button: RoundButton(defaultActiveButton) {
 		height: 42px;
 		textTop: 12px;
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index 6106201af4..a507f78816 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -422,7 +422,8 @@ void BubbleWidget::paintEvent(QPaintEvent *e) {
 
 	_bubble.paintBubble(p, bubbleRect, [&] {
 		switch (_type) {
-		case BubbleType::NoPremium: return st::windowBgActive->b;
+		case BubbleType::NoPremium:
+		case BubbleType::StarRating: return st::windowBgActive->b;
 		case BubbleType::Premium: return QBrush(_cachedGradient);
 		case BubbleType::Credits: return st::creditsBg3->b;
 		}
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.h b/Telegram/SourceFiles/ui/effects/premium_bubble.h
index 88e37771d0..404a75abef 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.h
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.h
@@ -88,6 +88,7 @@ struct BubbleRowState {
 };
 
 enum class BubbleType : uchar {
+	StarRating,
 	NoPremium,
 	Premium,
 	Credits,
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 5b277429d4..2ace588b1f 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -504,9 +504,17 @@ void AddLimitRow(
 		LimitRowLabels labels,
 		rpl::producer<LimitRowState> state,
 		const style::margins &padding) {
-	parent->add(
+	const auto color = std::move(labels.activeLineBg);
+	const auto line = parent->add(
 		object_ptr<Line>(parent, st, std::move(labels), std::move(state)),
 		padding);
+	if (color) {
+		line->setColorOverride(color());
+
+		style::PaletteChanged() | rpl::start_with_next([=] {
+			line->setColorOverride(color());
+		}, line->lifetime());
+	}
 }
 
 void AddAccountsRow(
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.h b/Telegram/SourceFiles/ui/effects/premium_graphics.h
index 86b136457b..049788ddc0 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.h
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.h
@@ -65,6 +65,7 @@ struct LimitRowLabels {
 	rpl::producer<QString> leftCount;
 	rpl::producer<QString> rightLabel;
 	rpl::producer<QString> rightCount;
+	Fn<QBrush()> activeLineBg;
 };
 
 struct LimitRowState {
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index 3c37626681..f3c1eb27b4 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -185,7 +185,10 @@ menuIconPayment: icon {{ "payments/payment_card", menuIconColor }};
 menuIconOrderPrice: icon {{ "menu/order_price", menuIconColor }};
 menuIconOrderDate: icon {{ "menu/order_date", menuIconColor }};
 menuIconOrderNumber: icon {{ "menu/order_number", menuIconColor }};
-menuIconAdd: icon{{ "menu/add", menuIconColor }};
+menuIconAdd: icon {{ "menu/add", menuIconColor }};
+menuIconRatingGifts: icon {{ "menu/rating_gifts-24x24", menuIconColor }};
+menuIconRatingUsers: icon {{ "menu/users_stars-24x24", menuIconColor }};
+menuIconRatingRefund: icon {{ "menu/rating_refund-24x24", menuIconColor }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ea3c209939..cd01ab20e4 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ea3c209939fc10e93750c4207f5aa1fe6af66e99
+Subproject commit cd01ab20e485aabd0991bb43c7d8302cd0a2ebc4

From 057b8d9e74d12939222fe1fe4e46b2ad6ecf36d5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 23:00:06 +0400
Subject: [PATCH 105/341] Fix build with Xcode.

---
 Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index b24c9d5f03..143fe48f54 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -152,7 +152,8 @@ void PostsSearchIntro::setup() {
 	}) | rpl::flatten_latest();
 
 	auto footer = _state.value(
-	) | rpl::map([](const PostsSearchIntroState &state) {
+	) | rpl::map([](const PostsSearchIntroState &state)
+	-> rpl::producer<QString> {
 		if (state.needsPremium) {
 			return tr::lng_posts_need_subscribe();
 		} else if (state.freeSearchesLeft > 0) {

From e3e97db101e916bd2594d06b57a9167feacd3605 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 00:15:19 +0400
Subject: [PATCH 106/341] Fix build with GCC.

---
 .../SourceFiles/ui/controls/stars_rating.cpp  | 45 -------------------
 .../window/window_session_controller.cpp      |  2 +-
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 5fe6397149..e06a91748a 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -251,50 +251,6 @@ void FillRatingLimit(
 		limitLinePadding);
 }
 
-object_ptr<Ui::FlatLabel> MakeBoostFeaturesBadge(
-		not_null<QWidget*> parent,
-		rpl::producer<QString> text,
-		Fn<QBrush(QRect)> bg) {
-	auto result = object_ptr<Ui::FlatLabel>(
-		parent,
-		std::move(text),
-		st::boostLevelBadge);
-	const auto label = result.data();
-
-	label->show();
-	label->paintRequest() | rpl::start_with_next([=] {
-		const auto size = label->textMaxWidth();
-		const auto rect = QRect(
-			(label->width() - size) / 2,
-			st::boostLevelBadge.margin.top(),
-			size,
-			st::boostLevelBadge.style.font->height
-		).marginsAdded(st::boostLevelBadge.margin);
-		auto p = QPainter(label);
-		auto hq = PainterHighQualityEnabler(p);
-		p.setBrush(bg(rect));
-		p.setPen(Qt::NoPen);
-		p.drawRoundedRect(rect, rect.height() / 2., rect.height() / 2.);
-
-		const auto &lineFg = st::windowBgRipple;
-		const auto line = st::boostLevelBadgeLine;
-		const auto top = st::boostLevelBadge.margin.top()
-			+ ((st::boostLevelBadge.style.font->height - line) / 2);
-		const auto left = 0;
-		const auto skip = st::boostLevelBadgeSkip;
-		if (const auto right = rect.x() - skip; right > left) {
-			p.fillRect(left, top, right - left, line, lineFg);
-		}
-		const auto right = label->width();
-		if (const auto left = rect.x() + rect.width() + skip
-			; left < right) {
-			p.fillRect(left, top, right - left, line, lineFg);
-		}
-	}, label->lifetime());
-
-	return result;
-}
-
 void AboutRatingBox(
 		not_null<GenericBox*> box,
 		const QString &name,
@@ -487,7 +443,6 @@ void StarsRating::paint(QPainter &p) {
 	p.setPen(Qt::NoPen);
 	p.setBrush(_st.activeBg);
 
-	const auto value = _value.current();
 	const auto radius = outer.height() / 2.;
 	p.drawRoundedRect(outer, radius, radius);
 	p.setPen(_st.activeFg);
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index cf3d618ccd..a69dde235b 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -649,7 +649,7 @@ void SessionNavigation::showPeerByLinkResolved(
 				parentController()->openPeerStory(
 					peer,
 					storyId.story,
-					Data::StoriesContext{ Data::StoriesContextSingle() });
+					context);
 			} else {
 				showToast(tr::lng_stories_link_invalid(tr::now));
 			}

From 3d4d3b000e265f4c8d8103aa68979e6be1fd5a0b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 31 Jul 2025 22:22:15 +0400
Subject: [PATCH 107/341] Version 6.0.

- Public Post Search.
- Story Albums.
- Gift Collections.
- Profile Rating.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  4 ++--
 Telegram/build/version                       | 10 +++++-----
 changelog.txt                                |  7 +++++++
 6 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 2973ff2259..3e9a1796be 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="5.16.6.0" />
+    Version="6.0.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index db2ef61fba..b312398a22 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,16,6,0
- PRODUCTVERSION 5,16,6,0
+ FILEVERSION 6,0,0,0
+ PRODUCTVERSION 6,0,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram FZ-LLC"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "5.16.6.0"
+            VALUE "FileVersion", "6.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.16.6.0"
+            VALUE "ProductVersion", "6.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 7a01bcf302..cc8ec9fe5b 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,16,6,0
- PRODUCTVERSION 5,16,6,0
+ FILEVERSION 6,0,0,0
+ PRODUCTVERSION 6,0,0,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", "5.16.6.0"
+            VALUE "FileVersion", "6.0.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "5.16.6.0"
+            VALUE "ProductVersion", "6.0.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index f6667bfdd7..7369c7e3ca 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 5016006;
-constexpr auto AppVersionStr = "5.16.6";
+constexpr auto AppVersion = 6000000;
+constexpr auto AppVersionStr = "6.0";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index fa11b740ca..70b1090b5f 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         5016006
-AppVersionStrMajor 5.16
-AppVersionStrSmall 5.16.6
-AppVersionStr      5.16.6
+AppVersion         6000000
+AppVersionStrMajor 6.0
+AppVersionStrSmall 6.0
+AppVersionStr      6.0.0
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 5.16.6
+AppVersionOriginal 6.0
diff --git a/changelog.txt b/changelog.txt
index e476437710..39a503c217 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+6.0 (31.07.25)
+
+- Public Post Search.
+- Story Albums.
+- Gift Collections.
+- Profile Rating.
+
 5.16.6 (25.07.25)
 
 - Fix bad layout in box buttons.

From 3bb8cb52f86f12f9514b0003f451ca83e373615d Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Fri, 1 Aug 2025 00:42:02 +0000
Subject: [PATCH 108/341] Update User-Agent for DNS to Chrome 138.0.0.0.

---
 .../SourceFiles/mtproto/details/mtproto_domain_resolver.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
index 6f092df424..3b2029b544 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
@@ -65,7 +65,7 @@ QByteArray DnsUserAgent() {
 	static const auto kResult = QByteArray(
 		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
 		"AppleWebKit/537.36 (KHTML, like Gecko) "
-		"Chrome/137.0.0.0 Safari/537.36");
+		"Chrome/138.0.0.0 Safari/537.36");
 	return kResult;
 }
 

From 5d7ae16b4a4abcf0ca668bd7301ea8787d32c3d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 11:22:11 +0400
Subject: [PATCH 109/341] Try fixing working on Windows 7.

---
 Telegram/SourceFiles/platform/win/specific_win.cpp | 3 +++
 Telegram/lib_base                                  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/win/specific_win.cpp b/Telegram/SourceFiles/platform/win/specific_win.cpp
index 488d9a1cb1..df143666ee 100644
--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.cpp
@@ -367,6 +367,9 @@ void start() {
 } // namespace ThirdParty
 
 void start() {
+	const auto supported = base::WinRT::Supported();
+	LOG(("WinRT Supported: %1").arg(Logs::b(supported)));
+
 	// https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/setlocale-wsetlocale#utf-8-support
 	setlocale(LC_ALL, ".UTF8");
 
diff --git a/Telegram/lib_base b/Telegram/lib_base
index 1245f296cb..bc8bb88756 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 1245f296cbaae0534937849a48f1d180b6b62526
+Subproject commit bc8bb88756e607b10564c430dcc626a060a71e80

From 1851e0c02d440eb51e34a2bdcf4067350f2e2d17 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 11:46:22 +0400
Subject: [PATCH 110/341] Show correct empty global search results.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 679eef689b..4a7f9f57b4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -164,8 +164,7 @@ constexpr auto kPreviewPostsLimit = 3;
 		: state.fromPeer;
 	const auto waiting = trimmed.isEmpty()
 		&& state.tags.empty()
-		&& !fromPeer
-		&& state.tab != ChatSearchTab::PublicPosts;
+		&& !fromPeer;
 	const auto suggestAllChats = !waiting
 		&& state.tab == ChatSearchTab::MyMessages
 		&& state.filter != ChatTypeFilter::All;

From 719179c1c2f439b17db972ff4385b3a9bdebc118 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 11:26:03 +0400
Subject: [PATCH 111/341] Version 6.0.1.

- Fix crashing on Windows 7.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 4 ++++
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 3e9a1796be..6b34e58f42 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.0.0.0" />
+    Version="6.0.1.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index b312398a22..61f6765d10 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,0,0
- PRODUCTVERSION 6,0,0,0
+ FILEVERSION 6,0,1,0
+ PRODUCTVERSION 6,0,1,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.0.0.0"
+            VALUE "FileVersion", "6.0.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.0.0"
+            VALUE "ProductVersion", "6.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index cc8ec9fe5b..c89f9c6ec9 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,0,0
- PRODUCTVERSION 6,0,0,0
+ FILEVERSION 6,0,1,0
+ PRODUCTVERSION 6,0,1,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.0.0.0"
+            VALUE "FileVersion", "6.0.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.0.0"
+            VALUE "ProductVersion", "6.0.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 7369c7e3ca..286739a616 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6000000;
-constexpr auto AppVersionStr = "6.0";
+constexpr auto AppVersion = 6000001;
+constexpr auto AppVersionStr = "6.0.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 70b1090b5f..33b7a35895 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6000000
+AppVersion         6000001
 AppVersionStrMajor 6.0
-AppVersionStrSmall 6.0
-AppVersionStr      6.0.0
+AppVersionStrSmall 6.0.1
+AppVersionStr      6.0.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 6.0
+AppVersionOriginal 6.0.1
diff --git a/changelog.txt b/changelog.txt
index 39a503c217..31b62a0a41 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+6.0.1 (01.08.25)
+
+- Fix crashing on Windows 7.
+
 6.0 (31.07.25)
 
 - Public Post Search.

From a28ca46460790edf1c6ecd5c83ad25fef274d905 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 14:48:05 +0400
Subject: [PATCH 112/341] Improve rating level design.

---
 .../Resources/icons/levels/level10_inner.svg  |   7 ++
 .../Resources/icons/levels/level1_inner.svg   |   7 ++
 .../Resources/icons/levels/level20_inner.svg  |   7 ++
 .../Resources/icons/levels/level2_inner.svg   |   7 ++
 .../Resources/icons/levels/level30_inner.svg  |   7 ++
 .../Resources/icons/levels/level3_inner.svg   |   7 ++
 .../Resources/icons/levels/level40_inner.svg  |   7 ++
 .../Resources/icons/levels/level4_inner.svg   |   7 ++
 .../Resources/icons/levels/level50_inner.svg  |   7 ++
 .../Resources/icons/levels/level5_inner.svg   |   7 ++
 .../Resources/icons/levels/level60_inner.svg  |   7 ++
 .../Resources/icons/levels/level6_inner.svg   |   7 ++
 .../Resources/icons/levels/level70_inner.svg  |   7 ++
 .../Resources/icons/levels/level7_inner.svg   |   7 ++
 .../Resources/icons/levels/level80_inner.svg  |   7 ++
 .../Resources/icons/levels/level8_inner.svg   |   7 ++
 .../Resources/icons/levels/level90_inner.svg  |   7 ++
 .../Resources/icons/levels/level9_inner.svg   |   7 ++
 Telegram/SourceFiles/info/info.style          |  16 ---
 .../info/profile/info_levels.style            |  76 +++++++++++++
 .../info/profile/info_profile_cover.cpp       |   3 +-
 .../SourceFiles/ui/controls/stars_rating.cpp  | 104 +++++++++++-------
 .../SourceFiles/ui/controls/stars_rating.h    |  11 +-
 Telegram/cmake/td_ui.cmake                    |   1 +
 24 files changed, 271 insertions(+), 66 deletions(-)
 create mode 100644 Telegram/Resources/icons/levels/level10_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level1_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level20_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level2_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level30_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level3_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level40_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level4_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level50_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level5_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level60_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level6_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level70_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level7_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level80_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level8_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level90_inner.svg
 create mode 100644 Telegram/Resources/icons/levels/level9_inner.svg
 create mode 100644 Telegram/SourceFiles/info/profile/info_levels.style

diff --git a/Telegram/Resources/icons/levels/level10_inner.svg b/Telegram/Resources/icons/levels/level10_inner.svg
new file mode 100644
index 0000000000..8ce8b2c9b2
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level10_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level10_inner</title>
+    <g id="Badge-/-level10_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M23,15 L49,15 C53.418278,15 57,18.581722 57,23 L57,46.8429984 C57,48.7715399 55.8908719,50.5281562 54.1496679,51.357301 L37.2898007,59.3858092 C36.4738291,59.7743671 35.5261709,59.7743671 34.7101993,59.3858092 L17.8503321,51.357301 C16.1091281,50.5281562 15,48.7715399 15,46.8429984 L15,23 C15,18.581722 18.581722,15 23,15 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level1_inner.svg b/Telegram/Resources/icons/levels/level1_inner.svg
new file mode 100644
index 0000000000..37959bcb5d
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level1_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level1_inner</title>
+    <g id="Badge-/-level1_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M53,45 C54.6943359,39.9169922 55.1925159,32.4416725 54.49454,22.5740409 C54.2708931,19.4342396 51.6589867,17.0009114 48.5112305,17 L23.4887695,17 C20.3410133,17.0009114 17.7291069,19.4342396 17.50546,22.5740409 C16.8074841,32.4416725 17.3056641,39.9169922 19,45 C20.9999787,50.9999361 32.8055802,57.9438271 36.0181519,58.0000467 C39.2307237,58.0555136 50.70353,51.8894101 53,45 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level20_inner.svg b/Telegram/Resources/icons/levels/level20_inner.svg
new file mode 100644
index 0000000000..055e99e5c3
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level20_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level20_inner</title>
+    <g id="Badge-/-level20_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M17.5067188,13.1565216 L35.4932812,17.8672879 C35.8254913,17.9542953 36.1745087,17.9542953 36.5067188,17.8672879 L54.4932812,13.1565216 C55.5618111,12.8766685 56.6548914,13.5160174 56.9347444,14.5845472 C56.9780693,14.7499693 57,14.9202646 57,15.091266 L57,50 C57,53.8659932 53.8659932,57 50,57 L22,57 C18.1340068,57 15,53.8659932 15,50 L15,15.091266 C15,13.9866965 15.8954305,13.091266 17,13.091266 C17.1710014,13.091266 17.3412968,13.1131968 17.5067188,13.1565216 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level2_inner.svg b/Telegram/Resources/icons/levels/level2_inner.svg
new file mode 100644
index 0000000000..2cd67761cc
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level2_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level2_inner</title>
+    <g id="Badge-/-level2_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M28,15 L44,15 C51.1797017,15 57,20.8202983 57,28 L57,44 C57,51.1797017 51.1797017,57 44,57 L28,57 C20.8202983,57 15,51.1797017 15,44 L15,28 C15,20.8202983 20.8202983,15 28,15 Z" id="Rectangle" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level30_inner.svg b/Telegram/Resources/icons/levels/level30_inner.svg
new file mode 100644
index 0000000000..b74a2e6efb
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level30_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level30_inner</title>
+    <g id="Badge-/-level30_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M17.5067188,13.1565216 L35.4932812,17.8672879 C35.8254913,17.9542953 36.1745087,17.9542953 36.5067188,17.8672879 L54.4932812,13.1565216 C55.5618111,12.8766685 56.6548914,13.5160174 56.9347444,14.5845472 C56.9780693,14.7499693 57,14.9202646 57,15.091266 L57,47.2740807 C57,49.2380496 55.850227,51.0201354 54.0608393,51.8296203 L37.2365036,59.4406293 C36.4505105,59.7961976 35.5494895,59.7961976 34.7634964,59.4406293 L17.9391607,51.8296203 C16.149773,51.0201354 15,49.2380496 15,47.2740807 L15,15.091266 C15,13.9866965 15.8954305,13.091266 17,13.091266 C17.1710014,13.091266 17.3412968,13.1131968 17.5067188,13.1565216 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level3_inner.svg b/Telegram/Resources/icons/levels/level3_inner.svg
new file mode 100644
index 0000000000..3bc0ef3505
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level3_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level3_inner</title>
+    <g id="Badge-/-level3_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M35.8544323,16.5 C42.5603579,16.5 48.9772339,17.3142695 55.1127909,18.9403855 C57.8720367,19.6721748 59.5984053,22.4098874 59.0695564,25.2151096 L58.9161688,25.9952446 C57.6492744,32.2345248 55.3583898,38.2325914 52.0339947,44.0033008 C48.4623738,50.2031617 44.2319724,54.8983246 39.3449322,58.1412366 L38.808,58.49 L38.6366496,58.5935691 C37.0148548,59.5241021 35.0268922,59.5572143 33.3750071,58.6812087 L33.244,58.609 L33.1538672,58.5548802 C27.4610226,55.1837021 22.8566119,50.5438551 19.3062949,44.5841668 L18.9660053,44.0033008 C15.6094458,38.1767582 13.4677002,31.8512809 12.5350759,24.997545 C12.1766452,22.3675806 13.7646861,19.874921 16.2717218,19.0736995 L16.531,18.998 L17.3695077,18.774139 C22.9281007,17.3348182 28.7645985,16.5777965 34.8855941,16.5056926 L35.8544323,16.5 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level40_inner.svg b/Telegram/Resources/icons/levels/level40_inner.svg
new file mode 100644
index 0000000000..f7fef2c167
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level40_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level40_inner</title>
+    <g id="Badge-/-level40_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.8209245,17.0037365 L23.6412021,18.7573575 C24.5036156,18.9113599 25.3902576,18.6806984 26.0682874,18.1259467 L34.7335244,11.0362073 C35.4702562,10.4334268 36.5297438,10.4334268 37.2664756,11.0362073 L45.9317126,18.1259467 C46.6097424,18.6806984 47.4963844,18.9113599 48.3587979,18.7573575 L58.1790755,17.0037365 C59.2664441,16.8095635 60.3053389,17.5336417 60.4995119,18.6210104 C60.5408831,18.8526891 60.541039,19.0898514 60.4999724,19.3215843 L55.1703343,49.3959706 C54.4933325,53.2161951 51.17282,56 47.2930717,56 L24.7069283,56 C20.82718,56 17.5066675,53.2161951 16.8296657,49.3959706 L11.5000276,19.3215843 C11.3072843,18.2339613 12.0327276,17.1960193 13.1203506,17.003276 C13.3520835,16.9622094 13.5892458,16.9623653 13.8209245,17.0037365 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level4_inner.svg b/Telegram/Resources/icons/levels/level4_inner.svg
new file mode 100644
index 0000000000..b23971ce55
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level4_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level4_inner</title>
+    <g id="Badge-/-level4_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M44.3705856,16.4672101 L55.5327899,27.6294144 C60.1557367,32.2523612 60.1557367,39.7476388 55.5327899,44.3705856 L44.3705856,55.5327899 C39.7476388,60.1557367 32.2523612,60.1557367 27.6294144,55.5327899 L16.4672101,44.3705856 C11.8442633,39.7476388 11.8442633,32.2523612 16.4672101,27.6294144 L27.6294144,16.4672101 C32.2523612,11.8442633 39.7476388,11.8442633 44.3705856,16.4672101 Z" id="Polygon" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level50_inner.svg b/Telegram/Resources/icons/levels/level50_inner.svg
new file mode 100644
index 0000000000..23aa9e3107
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level50_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level50_inner</title>
+    <g id="Badge-/-level50_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.8457992,17.0081784 L23.6412021,18.7573575 C24.5036156,18.9113599 25.3902576,18.6806984 26.0682874,18.1259467 L34.7335244,11.0362073 C35.4702562,10.4334268 36.5297438,10.4334268 37.2664756,11.0362073 L45.9317126,18.1259467 C46.6097424,18.6806984 47.4963844,18.9113599 48.3587979,18.7573575 L58.1542008,17.0081784 C59.2415694,16.8140055 60.2804642,17.5380836 60.4746372,18.6254523 C60.5169804,18.862574 60.516141,19.1053947 60.4721595,19.342218 L55.2572125,47.4227021 C54.7824054,49.9793556 53.0945991,52.1457247 50.731704,53.2313793 L37.6700007,59.2327024 C36.6099358,59.7197592 35.3900642,59.7197592 34.3299993,59.2327024 L21.268296,53.2313793 C18.9054009,52.1457247 17.2175946,49.9793556 16.7427875,47.4227021 L11.5278405,19.342218 C11.3261547,18.2562177 12.0430333,17.2123419 13.1290336,17.0106561 C13.3658569,16.9666746 13.6086775,16.9658353 13.8457992,17.0081784 Z" id="Path" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level5_inner.svg b/Telegram/Resources/icons/levels/level5_inner.svg
new file mode 100644
index 0000000000..e28cd650ab
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level5_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level5_inner</title>
+    <g id="Badge-/-level5_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M24.6347159,52.197233 L15.086894,45.3306104 C13.3626301,44.0905507 12.6070688,41.9044024 13.1995002,39.8696074 L16.4885503,28.5785206 L20.056184,18.2789734 C20.736028,16.3172234 22.5589494,14.9756983 24.6408724,14.9050076 L35.519949,14.536208 L46.4041369,14.5 C48.4875477,14.4932153 50.3596774,15.7663386 51.1123731,17.7018167 L55.0199245,27.7496763 C55.0516847,27.8313442 55.081291,27.9138273 55.1087132,27.9970407 L58.7486546,39.0425771 C59.4120036,41.0555339 58.7334828,43.2666211 57.0537084,44.5658775 L47.7086588,51.7944553 L39.3643082,58.4096688 C37.5845851,59.8205932 35.0761178,59.866608 33.245468,58.5219115 L24.6347159,52.197233 Z" id="Star-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level60_inner.svg b/Telegram/Resources/icons/levels/level60_inner.svg
new file mode 100644
index 0000000000..b006ec3280
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level60_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level60_inner</title>
+    <g id="Badge-/-level60_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M25.1630277,52.850407 L17.8273486,50.8900353 C15.0747,50.1544232 13.4412291,47.3453418 14.1759196,44.6106697 L16.1338353,37.322897 C16.3667018,36.4561188 16.3667018,35.5438812 16.1338353,34.677103 L14.1759196,27.3893303 C13.4412291,24.6546582 15.0747,21.8455768 17.8273486,21.1099647 L25.1630277,19.149593 C26.0355037,18.9164343 26.8311982,18.4603155 27.4708076,17.826696 L32.848571,12.499295 C34.8665291,10.500235 38.1334709,10.500235 40.151429,12.499295 L45.5291924,17.826696 C46.1688018,18.4603155 46.9644963,18.9164343 47.8369723,19.149593 L55.1726514,21.1099647 C57.9253,21.8455768 59.5587709,24.6546582 58.8240804,27.3893303 L56.8661647,34.677103 C56.6332982,35.5438812 56.6332982,36.4561188 56.8661647,37.322897 L58.8240804,44.6106697 C59.5587709,47.3453418 57.9253,50.1544232 55.1726514,50.8900353 L47.8369723,52.850407 C46.9644963,53.0835657 46.1688018,53.5396845 45.5291924,54.173304 L40.151429,59.500705 C38.1334709,61.499765 34.8665291,61.499765 32.848571,59.500705 L27.4708076,54.173304 C26.8311982,53.5396845 26.0355037,53.0835657 25.1630277,52.850407 Z" id="Star-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level6_inner.svg b/Telegram/Resources/icons/levels/level6_inner.svg
new file mode 100644
index 0000000000..1b8a68d0da
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level6_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level6_inner</title>
+    <g id="Badge-/-level6_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M56.5,27.2077494 L56.5,44.7922506 C56.5,46.727022 55.4750178,48.5148244 53.8111544,49.4822101 L38.6888456,58.2744607 C37.0249822,59.2418464 34.9750178,59.2418464 33.3111544,58.2744607 L18.1888456,49.4822101 C16.5249822,48.5148244 15.5,46.727022 15.5,44.7922506 L15.5,27.2077494 C15.5,25.272978 16.5249822,23.4851756 18.1888456,22.5177899 L33.3111544,13.7255393 C34.9750178,12.7581536 37.0249822,12.7581536 38.6888456,13.7255393 L53.8111544,22.5177899 C55.4750178,23.4851756 56.5,25.272978 56.5,27.2077494 Z" id="Polygon-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level70_inner.svg b/Telegram/Resources/icons/levels/level70_inner.svg
new file mode 100644
index 0000000000..d6bc1b8b4a
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level70_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level70_inner</title>
+    <g id="Badge-/-level70_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M25.6231529,53.6849537 L20.2456512,53.1119864 C17.3639984,52.8049492 15.263688,50.1918606 15.5389909,47.256223 L16.0527382,41.7779796 C16.1648264,40.5827489 15.8804506,39.3837383 15.2449668,38.3721824 L12.332278,33.7357975 C10.7714495,31.2512883 11.4691887,27.9507327 13.8958667,26.3394648 L18.424332,23.3326503 C19.4123422,22.6766303 20.1560647,21.7027674 20.5368804,20.5663865 L22.2823186,15.3578763 C23.2176501,12.5667813 26.188027,11.0641444 28.9387422,11.9905637 L34.0718987,13.7193707 C35.1918391,14.0965579 36.4036217,14.0811813 37.5139749,13.6756934 L42.6031895,11.8171724 C45.3303573,10.821243 48.3366176,12.248041 49.3400252,15.0145349 L51.2125014,20.1771366 C51.621034,21.3035012 52.3883797,22.2581898 53.3921518,22.8889356 L57.9928604,25.779908 C60.4582516,27.3290994 61.2366199,30.6109243 59.7371336,33.1342664 L56.9389167,37.8431184 C56.3284081,38.870485 56.07349,40.0763388 56.2148201,41.2683538 L56.8625953,46.7318584 C57.20972,49.6595979 55.1740691,52.3251686 52.3008327,52.7052309 L46.9390371,53.4144716 C45.7692127,53.5692121 44.6839892,54.1181986 43.8564529,54.9738712 L40.0635069,58.8957776 C38.030973,60.9974176 34.7141896,61.0395051 32.6308086,58.9900928 L28.7429758,55.1656495 C27.8947373,54.3312412 26.7964039,53.8099624 25.6231529,53.6849537 Z" id="Star-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level7_inner.svg b/Telegram/Resources/icons/levels/level7_inner.svg
new file mode 100644
index 0000000000..d0a0c79299
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level7_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level7_inner</title>
+    <g id="Badge-/-level7_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M47.5119469,15.9725146 L56.9485165,28.1544765 C57.8703305,29.3444749 58.2101938,30.8974518 57.8718989,32.3737956 L54.4087892,47.487062 C54.0704943,48.9634057 53.0908608,50.2024337 51.7472,50.8534058 L37.9922031,57.5173789 C36.6485423,58.1683511 35.087096,58.1604167 33.7498732,57.4958219 L20.0607825,50.6923941 C18.7235597,50.0277993 17.7561016,48.7788774 17.4322729,47.2991691 L14.1172527,32.1514602 C13.793424,30.6717519 14.1484698,29.1223062 15.0818847,27.9417349 L24.637213,15.8562787 C25.570628,14.6757075 26.9808209,13.9925021 28.468599,14 L43.6989186,14.0774536 C45.1866968,14.0850136 46.5901329,14.7825162 47.5119469,15.9725146 Z" id="Polygon-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level80_inner.svg b/Telegram/Resources/icons/levels/level80_inner.svg
new file mode 100644
index 0000000000..a469b74988
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level80_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level80_inner</title>
+    <g id="Badge-/-level80_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M25.4075318,55.0983015 L20.6181753,54.4891523 C18.1878179,54.1800396 16.3367069,52.1599065 16.2405902,49.7118564 L16.0511788,44.887634 C16.0102196,43.84442 15.6446438,42.8400089 15.0054554,42.0145324 L12.0496025,38.1972124 C10.5496559,36.2601145 10.6691726,33.5227316 12.3322407,31.723734 L15.609547,28.1785595 C16.3182481,27.4119333 16.769973,26.4432062 16.9016985,25.4075318 L17.5108477,20.6181753 C17.8199604,18.1878179 19.8400935,16.3367069 22.2881436,16.2405902 L27.112366,16.0511788 C28.15558,16.0102196 29.1599911,15.6446438 29.9854676,15.0054554 L33.8027876,12.0496025 C35.7398855,10.5496559 38.4772684,10.6691726 40.276266,12.3322407 L43.8214405,15.609547 C44.5880667,16.3182481 45.5567938,16.769973 46.5924682,16.9016985 L51.3818247,17.5108477 C53.8121821,17.8199604 55.6632931,19.8400935 55.7594098,22.2881436 L55.9488212,27.112366 C55.9897804,28.15558 56.3553562,29.1599911 56.9945446,29.9854676 L59.9503975,33.8027876 C61.4503441,35.7398855 61.3308274,38.4772684 59.6677593,40.276266 L56.390453,43.8214405 C55.6817519,44.5880667 55.230027,45.5567938 55.0983015,46.5924682 L54.4891523,51.3818247 C54.1800396,53.8121821 52.1599065,55.6632931 49.7118564,55.7594098 L44.887634,55.9488212 C43.84442,55.9897804 42.8400089,56.3553562 42.0145324,56.9945446 L38.1972124,59.9503975 C36.2601145,61.4503441 33.5227316,61.3308274 31.723734,59.6677593 L28.1785595,56.390453 C27.4119333,55.6817519 26.4432062,55.230027 25.4075318,55.0983015 Z" id="Star" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level8_inner.svg b/Telegram/Resources/icons/levels/level8_inner.svg
new file mode 100644
index 0000000000..f4a0d3b7d1
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level8_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level8_inner</title>
+    <g id="Badge-/-level8_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M27.9852814,15 L44.0147186,15 C45.6060176,15 47.132141,15.632141 48.2573593,16.7573593 L55.2426407,23.7426407 C56.367859,24.867859 57,26.3939824 57,27.9852814 L57,44.0147186 C57,45.6060176 56.367859,47.132141 55.2426407,48.2573593 L48.2573593,55.2426407 C47.132141,56.367859 45.6060176,57 44.0147186,57 L27.9852814,57 C26.3939824,57 24.867859,56.367859 23.7426407,55.2426407 L16.7573593,48.2573593 C15.632141,47.132141 15,45.6060176 15,44.0147186 L15,27.9852814 C15,26.3939824 15.632141,24.867859 16.7573593,23.7426407 L23.7426407,16.7573593 C24.867859,15.632141 26.3939824,15 27.9852814,15 Z" id="Rectangle" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level90_inner.svg b/Telegram/Resources/icons/levels/level90_inner.svg
new file mode 100644
index 0000000000..d25a731d93
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level90_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level90_inner</title>
+    <g id="Badge-/-level90_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15.8733536,45.5876663 L13.5374788,26.4767308 C13.2739231,24.3204523 14.4193524,22.2383675 16.3756386,21.3177141 L34.3082495,12.8783965 C35.3803169,12.3738678 36.6196831,12.3738678 37.6917505,12.8783965 L55.6243614,21.3177141 C57.5806476,22.2383675 58.7260769,24.3204523 58.4625212,26.4767308 L56.1266464,45.5876663 C55.9615284,46.9385772 55.2580965,48.1641245 54.1775745,48.9834175 L39.003776,60.4887707 C37.2255672,61.8370764 34.7744328,61.8370764 32.996224,60.4887707 L17.8224255,48.9834175 C16.7419035,48.1641245 16.0384716,46.9385772 15.8733536,45.5876663 Z" id="Diamond-Flat" fill="#FFFFFF"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/icons/levels/level9_inner.svg b/Telegram/Resources/icons/levels/level9_inner.svg
new file mode 100644
index 0000000000..27fe8c25a2
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level9_inner.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="72px" height="72px" viewBox="0 0 72 72" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Badge / level9_inner</title>
+    <g id="Badge-/-level9_inner" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <circle id="Oval" fill="#FFFFFF" cx="36" cy="36" r="21"></circle>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 6904786101..1899f02414 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1191,22 +1191,6 @@ topicsLayoutButtonIconSize: 140px;
 topicsLayoutButtonPadding: margins(4px, 0px, 4px, 12px);
 topicsLayoutButtonSkip: 0px;
 
-StarsRating {
-	margin: margins;
-	padding: margins;
-	style: TextStyle;
-	activeBg: color;
-	activeFg: color;
-}
-infoStarsRating: StarsRating {
-	margin: margins(6px, 6px, 6px, 6px);
-	padding: margins(6px, 1px, 6px, 1px);
-	style: TextStyle(defaultTextStyle) {
-		font: font(11px semibold);
-	}
-	activeBg: windowBgActive;
-	activeFg: windowFgActive;
-}
 infoStarsTitle: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
 	textFg: windowBoldFg;
diff --git a/Telegram/SourceFiles/info/profile/info_levels.style b/Telegram/SourceFiles/info/profile/info_levels.style
new file mode 100644
index 0000000000..e1d38d51a8
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_levels.style
@@ -0,0 +1,76 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+using "ui/basic.style";
+
+LevelShape {
+	icon: icon;
+	position: point;
+}
+levelStyle: TextStyle(defaultTextStyle) {
+	font: font(11px semibold);
+}
+levelTextFg: windowFgActive;
+levelMargin: margins(6px, 6px, 6px, 6px);
+
+levelBase: LevelShape {
+	position: point(0px, 8px);
+}
+level1: LevelShape(levelBase) {
+	icon: icon {{ "levels/level1_inner-31x31", windowBgActive }};
+}
+level2: LevelShape(levelBase) {
+	icon: icon {{ "levels/level2_inner-31x31", windowBgActive }};
+}
+level3: LevelShape(levelBase) {
+	icon: icon {{ "levels/level3_inner-31x31", windowBgActive }};
+}
+level4: LevelShape(levelBase) {
+	icon: icon {{ "levels/level4_inner-31x31", windowBgActive }};
+}
+level5: LevelShape(levelBase) {
+	icon: icon {{ "levels/level5_inner-31x31", windowBgActive }};
+}
+level6: LevelShape(levelBase) {
+	icon: icon {{ "levels/level6_inner-31x31", windowBgActive }};
+}
+level7: LevelShape(levelBase) {
+	icon: icon {{ "levels/level7_inner-31x31", windowBgActive }};
+}
+level8: LevelShape(levelBase) {
+	icon: icon {{ "levels/level8_inner-31x31", windowBgActive }};
+}
+level9: LevelShape(levelBase) {
+	icon: icon {{ "levels/level9_inner-31x31", windowBgActive }};
+}
+level10: LevelShape(levelBase) {
+	icon: icon {{ "levels/level10_inner-31x31", windowBgActive }};
+}
+level20: LevelShape(levelBase) {
+	icon: icon {{ "levels/level20_inner-31x31", windowBgActive }};
+}
+level30: LevelShape(levelBase) {
+	icon: icon {{ "levels/level30_inner-31x31", windowBgActive }};
+}
+level40: LevelShape(levelBase) {
+	icon: icon {{ "levels/level40_inner-31x31", windowBgActive }};
+}
+level50: LevelShape(levelBase) {
+	icon: icon {{ "levels/level50_inner-31x31", windowBgActive }};
+}
+level60: LevelShape(levelBase) {
+	icon: icon {{ "levels/level60_inner-31x31", windowBgActive }};
+}
+level70: LevelShape(levelBase) {
+	icon: icon {{ "levels/level70_inner-31x31", windowBgActive }};
+}
+level80: LevelShape(levelBase) {
+	icon: icon {{ "levels/level80_inner-31x31", windowBgActive }};
+}
+level90: LevelShape(levelBase) {
+	icon: icon {{ "levels/level90_inner-31x31", windowBgActive }};
+}
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 33d4ab8dad..f4bfaa946c 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -650,7 +650,6 @@ Cover::Cover(
 , _starsRating(_peer->isUser()
 	? std::make_unique<Ui::StarsRating>(
 		this,
-		st::infoStarsRating,
 		_controller->uiShow(),
 		_peer->isSelf() ? QString() : _peer->shortName(),
 		Data::StarsRatingValue(_peer))
@@ -669,7 +668,7 @@ Cover::Cover(
 	if (!_peer->isMegagroup()) {
 		_status->setAttribute(Qt::WA_TransparentForMouseEvents);
 		if (const auto rating = _starsRating.get()) {
-			_statusShift = rating->collapsedWidthValue();
+			_statusShift = rating->widthValue();
 			_statusShift.changes() | rpl::start_with_next([=] {
 				refreshStatusGeometry(width());
 			}, _status->lifetime());
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index e06a91748a..b66584697e 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -23,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
 #include "styles/style_info.h"
+#include "styles/style_info_levels.h"
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
 #include "styles/style_settings.h"
@@ -355,16 +356,47 @@ void AboutRatingBox(
 	).append(' ').append(tr::lng_stars_rating_understood(tr::now))));
 }
 
+[[nodiscard]] not_null<const style::LevelShape*> SelectShape(int level) {
+	struct Shape {
+		int level = 0;
+		not_null<const style::LevelShape*> shape;
+	};
+	const auto list = std::vector<Shape>{
+		{ 1, &st::level1 },
+		{ 2, &st::level2 },
+		{ 3, &st::level3 },
+		{ 4, &st::level4 },
+		{ 5, &st::level5 },
+		{ 6, &st::level6 },
+		{ 7, &st::level7 },
+		{ 8, &st::level8 },
+		{ 9, &st::level9 },
+		{ 10, &st::level10 },
+		{ 20, &st::level20 },
+		{ 30, &st::level30 },
+		{ 40, &st::level40 },
+		{ 50, &st::level50 },
+		{ 60, &st::level60 },
+		{ 70, &st::level70 },
+		{ 80, &st::level80 },
+		{ 90, &st::level90 },
+	};
+	const auto i = ranges::lower_bound(
+		list,
+		level + 1,
+		ranges::less(),
+		&Shape::level);
+	return (i != begin(list)) ? (i - 1)->shape : list.front().shape;
+}
+
 } // namespace
 
 StarsRating::StarsRating(
 	QWidget *parent,
-	const style::StarsRating &st,
 	std::shared_ptr<Ui::Show> show,
 	const QString &name,
 	rpl::producer<Counters> value)
 : _widget(std::make_unique<Ui::AbstractButton>(parent))
-, _st(st)
 , _show(std::move(show))
 , _name(name)
 , _value(std::move(value)) {
@@ -388,40 +420,35 @@ void StarsRating::init() {
 		_show->show(Box(AboutRatingBox, _name, _value.current()));
 	});
 
-	const auto added = _st.margin + _st.padding;
-	const auto fontHeight = _st.style.font->height;
-	const auto height = added.top() + fontHeight + added.bottom();
-	_widget->resize(_widget->width(), height);
+	_widget->resize(_widget->width(), st::level1.icon.height());
 
 	_value.value() | rpl::start_with_next([=](Counters rating) {
-		if (!rating) {
-			_widget->resize(0, _widget->height());
-			_collapsedWidthValue = 0;
-			return;
-		}
-		updateTexts(rating);
+		updateData(rating);
 	}, lifetime());
 }
 
-void StarsRating::updateTexts(Counters rating) {
-	_collapsedText.setText(
-		_st.style,
-		Lang::FormatCountDecimal(rating.level));
-
-	const auto added = _st.padding;
-	const auto add = added.left() + added.right();
-	const auto height = _widget->height();
-	_collapsedWidthValue = _st.margin.right()
-		+ std::max(
-			add + _collapsedText.maxWidth(),
-			height - _st.margin.top() - _st.margin.bottom());
+void StarsRating::updateData(Data::StarsRating rating) {
+	if (!rating) {
+		_shape = nullptr;
+		_widthValue = 0;
+	} else {
+		_shape = SelectShape(rating.level);
+		_collapsedText.setText(
+			st::levelStyle,
+			Lang::FormatCountDecimal(rating.level));
+		_widthValue = _shape->icon.width() - st::levelMargin.left();
+	}
 	updateWidth();
 }
 
 void StarsRating::updateWidth() {
-	const auto widthToRight = _collapsedWidthValue.current();
-	_widget->resize(_st.margin.left() + widthToRight, _widget->height());
-	_widget->update();
+	if (const auto widthToRight = _widthValue.current()) {
+		const auto &margin = st::levelMargin;
+		_widget->resize(margin.left() + widthToRight, _widget->height());
+		_widget->update();
+	} else {
+		_widget->resize(0, _widget->height());
+	}
 }
 
 void StarsRating::raise() {
@@ -429,32 +456,25 @@ void StarsRating::raise() {
 }
 
 void StarsRating::moveTo(int x, int y) {
-	_widget->move(x - _st.margin.left(), y - _st.margin.top());
+	_widget->move(x - st::levelMargin.left(), y - st::levelMargin.top());
 }
 
 void StarsRating::paint(QPainter &p) {
-	const auto outer = _widget->rect().marginsRemoved(_st.margin);
-	if (outer.isEmpty()) {
+	if (!_shape) {
 		return;
 	}
-	const auto inner = outer.marginsRemoved(_st.padding);
+	_shape->icon.paint(p, 0, 0, _widget->width());
 
-	auto hq = PainterHighQualityEnabler(p);
-	p.setPen(Qt::NoPen);
-	p.setBrush(_st.activeBg);
-
-	const auto radius = outer.height() / 2.;
-	p.drawRoundedRect(outer, radius, radius);
-	p.setPen(_st.activeFg);
-	const auto skip = (inner.width() - _collapsedText.maxWidth()) / 2;
+	const auto x = (_widget->width() - _collapsedText.maxWidth()) / 2;
+	p.setPen(st::levelTextFg);
 	_collapsedText.draw(p, {
-		.position = inner.topLeft() + QPoint(skip, 0),
+		.position = QPoint(x, 0) + _shape->position,
 		.availableWidth = _collapsedText.maxWidth(),
 	});
 }
 
-rpl::producer<int> StarsRating::collapsedWidthValue() const {
-	return _collapsedWidthValue.value();
+rpl::producer<int> StarsRating::widthValue() const {
+	return _widthValue.value();
 }
 
 rpl::lifetime &StarsRating::lifetime() {
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
index b72f061d8f..4393c81e5f 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.h
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace style {
 struct Toast;
-struct StarsRating;
+struct LevelShape;
 } // namespace style
 
 namespace Ui::Toast {
@@ -30,7 +30,6 @@ class StarsRating final {
 public:
 	StarsRating(
 		QWidget *parent,
-		const style::StarsRating &st,
 		std::shared_ptr<Ui::Show> show,
 		const QString &name,
 		rpl::producer<Data::StarsRating> value);
@@ -39,25 +38,25 @@ public:
 	void raise();
 	void moveTo(int x, int y);
 
-	[[nodiscard]] rpl::producer<int> collapsedWidthValue() const;
+	[[nodiscard]] rpl::producer<int> widthValue() const;
 
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
 	void init();
 	void paint(QPainter &p);
-	void updateTexts(Data::StarsRating rating);
+	void updateData(Data::StarsRating rating);
 	void updateWidth();
 
 	const std::unique_ptr<Ui::AbstractButton> _widget;
-	const style::StarsRating &_st;
 	const std::shared_ptr<Ui::Show> _show;
 	const QString _name;
 
 	Ui::Text::String _collapsedText;
 
 	rpl::variable<Data::StarsRating> _value;
-	rpl::variable<int> _collapsedWidthValue;
+	rpl::variable<int> _widthValue;
+	const style::LevelShape *_shape = nullptr;
 
 };
 
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 6c2473e35c..25d13f8750 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -27,6 +27,7 @@ set(style_files
     info/info.style
     info/channel_statistics/boosts/giveaway/giveaway.style
     info/channel_statistics/earn/channel_earn.style
+    info/profile/info_levels.style
     info/userpic/info_userpic_builder.style
     intro/intro.style
     iv/iv.style

From 61bdbdb5d6cc3f1959e432cf8086a62707629411 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 15:03:14 +0400
Subject: [PATCH 113/341] Fix alignment of custom verification.

---
 Telegram/SourceFiles/info/info.style                     | 3 +++
 Telegram/SourceFiles/info/profile/info_profile_cover.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 1899f02414..4b940d1b43 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -446,6 +446,9 @@ infoPeerBadge: InfoPeerBadge {
 	position: infoVerifiedCheckPosition;
 	sizeTag: 0; // Normal
 }
+infoBotVerifyBadge: InfoPeerBadge(infoPeerBadge) {
+	position: point(-2px, 2px);
+}
 
 infoIconFg: windowBoldFg;
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index f4bfaa946c..0f7941977a 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -593,7 +593,7 @@ Cover::Cover(
 , _botVerify(
 	std::make_unique<Badge>(
 		this,
-		st::infoPeerBadge,
+		st::infoBotVerifyBadge,
 		&peer->session(),
 		BotVerifyBadgeForPeer(peer),
 		nullptr,

From d2c0ec12f3bc6ef900237e7a2ffa9b28e93e3199 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 15:20:36 +0400
Subject: [PATCH 114/341] Improve negative level display.

---
 Telegram/SourceFiles/ui/controls/stars_rating.cpp  | 6 +++---
 Telegram/SourceFiles/ui/effects/premium_bubble.cpp | 8 ++++----
 Telegram/SourceFiles/ui/effects/premium_bubble.h   | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index b66584697e..32dcf87b5a 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -121,6 +121,9 @@ struct Feature {
 }
 
 [[nodiscard]] Counters AdjustByReached(Counters data) {
+	if (data.stars < 0) {
+		return data;
+	}
 	const auto reached = !data.nextLevelStars;
 	if (reached) {
 		--data.level;
@@ -274,9 +277,6 @@ void AboutRatingBox(
 		data.stars);
 
 	box->setMaxHeight(st::boostBoxMaxHeight);
-	const auto close = box->addTopButton(
-		st::boxTitleClose,
-		[=] { box->closeBox(); });
 
 	auto title = tr::lng_stars_rating_title();;
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index a507f78816..75a6965a1d 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -64,7 +64,7 @@ crl::time Bubble::SlideNoDeflectionDuration() {
 	return kSlideDuration * kStepBeforeDeflection;
 }
 
-int Bubble::counter() const {
+std::optional<int> Bubble::counter() const {
 	return _counter;
 }
 
@@ -100,7 +100,7 @@ int Bubble::countMaxWidth(int maxPossibleCounter) const {
 void Bubble::setCounter(int value) {
 	if (_counter != value) {
 		_counter = value;
-		_numberAnimation.setText(_textFactory(_counter), _counter);
+		_numberAnimation.setText(_textFactory(value), value);
 	}
 }
 
@@ -113,7 +113,7 @@ void Bubble::setFlipHorizontal(bool value) {
 }
 
 void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
-	if (_counter < 0) {
+	if (!_counter.has_value()) {
 		return;
 	}
 
@@ -364,7 +364,7 @@ void BubbleWidget::animateTo(BubbleRowState state) {
 }
 
 void BubbleWidget::paintEvent(QPaintEvent *e) {
-	if (_bubble.counter() < 0) {
+	if (!_bubble.counter().has_value()) {
 		return;
 	}
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.h b/Telegram/SourceFiles/ui/effects/premium_bubble.h
index 404a75abef..b867250400 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.h
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.h
@@ -45,7 +45,7 @@ public:
 
 	[[nodiscard]] static crl::time SlideNoDeflectionDuration();
 
-	[[nodiscard]] int counter() const;
+	[[nodiscard]] std::optional<int> counter() const;
 	[[nodiscard]] int height() const;
 	[[nodiscard]] int width() const;
 	[[nodiscard]] int bubbleRadius() const;
@@ -72,7 +72,7 @@ private:
 	const int _textTop;
 	const bool _hasTail;
 
-	int _counter = -1;
+	std::optional<int> _counter;
 	EdgeProgress _tailEdge = 0.;
 	bool _flipHorizontal = false;
 

From e1b2f940add38d0df591d8d55410fb1cf9fa93d0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 1 Aug 2025 12:03:57 +0300
Subject: [PATCH 115/341] Fixed ability to reveal spoiler in title with login
 email pattern.

---
 .../settings/settings_privacy_security.cpp       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_privacy_security.cpp b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
index fcc1d3fd5c..57e794d736 100644
--- a/Telegram/SourceFiles/settings/settings_privacy_security.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_security.cpp
@@ -606,6 +606,19 @@ void SetupLoginEmail(
 
 	button->addClickHandler([=, email = std::move(email)] {
 		controller->uiShow()->show(Box([=](not_null<Ui::GenericBox*> box) {
+			{
+				box->getDelegate()->setTitle(rpl::duplicate(
+					email
+				) | rpl::map(Ui::Text::WrapEmailPattern));
+				for (const auto &child : ranges::views::reverse(
+						box->parentWidget()->children())) {
+					if (child && child->isWidgetType()) {
+						(static_cast<QWidget*>(child))->setAttribute(
+							Qt::WA_TransparentForMouseEvents);
+						break;
+					}
+				}
+			}
 			Ui::ConfirmBox(box, Ui::ConfirmBoxArgs{
 				.text = tr::lng_settings_cloud_login_email_box_about(),
 				.confirmed = [=](Fn<void()> close) {
@@ -614,9 +627,6 @@ void SetupLoginEmail(
 				},
 				.confirmText = tr::lng_settings_cloud_login_email_box_ok(),
 			});
-			box->getDelegate()->setTitle(rpl::duplicate(
-				email
-			) | rpl::map(Ui::Text::WrapEmailPattern));
 		}));
 	});
 

From 62c9666013a846bf2bf63375e53dfe2d1f48724d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 16:13:15 +0400
Subject: [PATCH 116/341] Show star rating preview.

---
 Telegram/Resources/langs/lang.strings         |  5 +-
 Telegram/SourceFiles/data/data_peer_common.h  |  9 +++
 Telegram/SourceFiles/data/data_session.cpp    | 10 ++++
 Telegram/SourceFiles/data/data_session.h      |  6 ++
 Telegram/SourceFiles/data/data_user.cpp       |  6 ++
 .../info/profile/info_profile_cover.cpp       |  5 +-
 .../SourceFiles/ui/controls/stars_rating.cpp  | 57 +++++++++++++++++--
 .../SourceFiles/ui/controls/stars_rating.h    |  4 +-
 Telegram/SourceFiles/ui/effects/premium.style |  3 +
 9 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 6bc8e0a3dc..7290984b24 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1878,9 +1878,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_stars_rating_title" = "Rating";
 "lng_stars_rating_future" = "Future Rating";
-"lng_stars_rating_subtitle" = "The rating update updates in 21 days after purchases.";
-"lng_stars_rating_pending#one" = "{count} point is pending. {link}";
-"lng_stars_rating_pending#other" = "{count} points are pending. {link}";
+"lng_stars_rating_pending#one" = "The rating updates in 21 days after purchases.\n{count} point is pending. {link}";
+"lng_stars_rating_pending#other" = "The rating updates in 21 days after purchases.\n{count} points are pending. {link}";
 "lng_stars_rating_pending_preview" = "Preview {arrow}";
 "lng_stars_rating_pending_back" = "Back {arrow}";
 "lng_stars_rating_about" = "This rating reflects **{name}'s** activity on Telegram. What affects it:";
diff --git a/Telegram/SourceFiles/data/data_peer_common.h b/Telegram/SourceFiles/data/data_peer_common.h
index d3231c3be1..656f089f9f 100644
--- a/Telegram/SourceFiles/data/data_peer_common.h
+++ b/Telegram/SourceFiles/data/data_peer_common.h
@@ -22,4 +22,13 @@ struct StarsRating {
 	friend inline bool operator==(StarsRating, StarsRating) = default;
 };
 
+struct StarsRatingPending {
+	StarsRating value;
+	TimeId date = 0;
+
+	explicit operator bool() const {
+		return value && date;
+	}
+};
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 88a62f1494..bef5a20e52 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -5185,6 +5185,16 @@ int Session::commonStarsPerMessage(
 	return (i != end(_commonStarsPerMessage)) ? i->second : 0;
 }
 
+void Session::setPendingStarsRating(StarsRatingPending value) {
+	_pendingStarsRating = value
+		? std::make_unique<StarsRatingPending>(value)
+		: nullptr;
+}
+
+StarsRatingPending Session::pendingStarsRating() const {
+	return _pendingStarsRating ? *_pendingStarsRating : StarsRatingPending();
+}
+
 void Session::clearLocalStorage() {
 	_cache->close();
 	_cache->clear();
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 8260fd042f..cdcbb5cd4b 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -72,6 +72,7 @@ class BusinessInfo;
 struct ReactionId;
 struct UnavailableReason;
 struct CreditsStatusSlice;
+struct StarsRatingPending;
 struct UniqueGift;
 
 struct RepliesReadTillUpdate {
@@ -872,6 +873,9 @@ public:
 	[[nodiscard]] int commonStarsPerMessage(
 		not_null<const ChannelData*> channel) const;
 
+	void setPendingStarsRating(StarsRatingPending value);
+	[[nodiscard]] StarsRatingPending pendingStarsRating() const;
+
 	void clearLocalStorage();
 
 private:
@@ -1226,6 +1230,8 @@ private:
 
 	MsgId _nonHistoryEntryId = ShortcutMaxMsgId;
 
+	std::unique_ptr<StarsRatingPending> _pendingStarsRating;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index d3c09a06f6..967d7b5669 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -874,6 +874,12 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	user->setBotVerifyDetails(
 		ParseBotVerifyDetails(update.vbot_verification()));
 	user->setStarsRating(ParseStarsRating(update.vstars_rating()));
+	if (user->isSelf()) {
+		user->owner().setPendingStarsRating({
+			.value = ParseStarsRating(update.vstars_my_pending_rating()),
+			.date = update.vstars_my_pending_rating_date().value_or_empty(),
+		});
+	}
 
 	if (const auto gifts = update.vdisallowed_gifts()) {
 		const auto &data = gifts->data();
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 0f7941977a..6a79eca9c7 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -652,7 +652,10 @@ Cover::Cover(
 		this,
 		_controller->uiShow(),
 		_peer->isSelf() ? QString() : _peer->shortName(),
-		Data::StarsRatingValue(_peer))
+		Data::StarsRatingValue(_peer),
+		(_peer->isSelf()
+			? [=] { return _peer->owner().pendingStarsRating(); }
+			: Fn<Data::StarsRatingPending()>()))
 	: nullptr)
 , _status(this, _st.status)
 , _showLastSeen(this, tr::lng_status_lastseen_when(), _st.showLastSeen)
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 32dcf87b5a..0adfa4e500 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "ui/ui_utility.h"
+#include "styles/style_chat.h" // textMoreIconEmoji
 #include "styles/style_info.h"
 #include "styles/style_info_levels.h"
 #include "styles/style_layers.h"
@@ -258,16 +259,18 @@ void FillRatingLimit(
 void AboutRatingBox(
 		not_null<GenericBox*> box,
 		const QString &name,
-		Counters data) {
+		Counters data,
+		Data::StarsRatingPending pending) {
 	box->setWidth(st::boxWideWidth);
 	box->setStyle(st::boostBox);
 
 	struct State {
 		rpl::variable<Counters> data;
+		rpl::variable<bool> pending;
 		rpl::variable<bool> full;
 	};
 	const auto state = box->lifetime().make_state<State>();
-	state->data = std::move(data);
+	state->data = data;
 
 	FillRatingLimit(
 		BoxShowFinishes(box),
@@ -278,7 +281,10 @@ void AboutRatingBox(
 
 	box->setMaxHeight(st::boostBoxMaxHeight);
 
-	auto title = tr::lng_stars_rating_title();;
+	auto title = rpl::conditional(
+		state->pending.value(),
+		tr::lng_stars_rating_future(),
+		tr::lng_stars_rating_title());
 
 	auto text = !name.isEmpty()
 		? tr::lng_stars_rating_about(
@@ -292,6 +298,41 @@ void AboutRatingBox(
 		object_ptr<Ui::FlatLabel>(box, std::move(title), st::infoStarsTitle),
 		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0));
 
+	if (pending) {
+		auto text = state->pending.value(
+		) | rpl::map([=](bool value) {
+			return tr::lng_stars_rating_pending(
+				tr::now,
+				lt_count_decimal,
+				pending.value.stars - data.stars,
+				lt_link,
+				Ui::Text::Link((value
+					? tr::lng_stars_rating_pending_back
+					: tr::lng_stars_rating_pending_preview)(
+						tr::now,
+						lt_arrow,
+						Ui::Text::IconEmoji(&st::textMoreIconEmoji),
+						Ui::Text::WithEntities)),
+				Ui::Text::RichLangValue);
+		});
+		const auto aboutPending = box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				std::move(text),
+				st::boostTextPending),
+			(st::boxRowPadding
+				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
+		aboutPending->setTryMakeSimilarLines(true);
+		aboutPending->setClickHandlerFilter([=](const auto &...) {
+			state->pending = !state->pending.current();
+			state->data = state->pending.current()
+				? pending.value
+				: data;
+			box->verticalLayout()->resizeToWidth(box->width());
+			return false;
+		});
+	}
+
 	const auto aboutLabel = box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
@@ -395,11 +436,13 @@ StarsRating::StarsRating(
 	QWidget *parent,
 	std::shared_ptr<Ui::Show> show,
 	const QString &name,
-	rpl::producer<Counters> value)
+	rpl::producer<Counters> value,
+	Fn<Data::StarsRatingPending()> pending)
 : _widget(std::make_unique<Ui::AbstractButton>(parent))
 , _show(std::move(show))
 , _name(name)
-, _value(std::move(value)) {
+, _value(std::move(value))
+, _pending(std::move(pending)) {
 	init();
 }
 
@@ -417,7 +460,9 @@ void StarsRating::init() {
 		if (!_value.current()) {
 			return;
 		}
-		_show->show(Box(AboutRatingBox, _name, _value.current()));
+		_show->show(Box(AboutRatingBox, _name, _value.current(), _pending
+			? _pending()
+			: Data::StarsRatingPending()));
 	});
 
 	_widget->resize(_widget->width(), st::level1.icon.height());
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.h b/Telegram/SourceFiles/ui/controls/stars_rating.h
index 4393c81e5f..a803810c47 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.h
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.h
@@ -32,7 +32,8 @@ public:
 		QWidget *parent,
 		std::shared_ptr<Ui::Show> show,
 		const QString &name,
-		rpl::producer<Data::StarsRating> value);
+		rpl::producer<Data::StarsRating> value,
+		Fn<Data::StarsRatingPending()> pending);
 	~StarsRating();
 
 	void raise();
@@ -55,6 +56,7 @@ private:
 	Ui::Text::String _collapsedText;
 
 	rpl::variable<Data::StarsRating> _value;
+	Fn<Data::StarsRatingPending()> _pending;
 	rpl::variable<int> _widthValue;
 	const style::LevelShape *_shape = nullptr;
 
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index f5353f100c..75422a7514 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -286,6 +286,9 @@ boostText: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
 	align: align(top);
 }
+boostTextPending: FlatLabel(boostText) {
+	textFg: windowSubTextFg;
+}
 boostReassignText: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
 	align: align(top);

From 22fb456d1343565a9876d435c5fe3bfe5d11fcd3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 16:42:27 +0400
Subject: [PATCH 117/341] Fix scrolling in SubTabs.

---
 Telegram/SourceFiles/ui/controls/sub_tabs.cpp | 22 ++++++++++++++++++-
 Telegram/SourceFiles/ui/controls/sub_tabs.h   |  1 +
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
index 1d5fdfda42..e5c6e616e9 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.cpp
@@ -192,8 +192,28 @@ void SubTabs::mouseMoveEvent(QMouseEvent *e) {
 
 void SubTabs::wheelEvent(QWheelEvent *e) {
 	const auto delta = ScrollDeltaF(e);
-	if (std::abs(delta.x()) > std::abs(delta.y())) {
+
+	const auto phase = e->phase();
+	const auto horizontal = (std::abs(delta.x()) > std::abs(delta.y()));
+	if (phase == Qt::NoScrollPhase) {
+		_locked = std::nullopt;
+	} else if (phase == Qt::ScrollBegin) {
+		_locked = std::nullopt;
+	} else if (!_locked) {
+		_locked = horizontal ? Qt::Horizontal : Qt::Vertical;
+	}
+	if (horizontal) {
+		if (_locked == Qt::Vertical) {
+			return;
+		}
 		e->accept();
+	} else {
+		if (_locked == Qt::Horizontal) {
+			e->accept();
+		} else {
+			e->ignore();
+		}
+		return;
 	}
 	_scrollAnimation.stop();
 	_scroll = std::clamp(_scroll - delta.x(), 0., _scrollMax * 1.);
diff --git a/Telegram/SourceFiles/ui/controls/sub_tabs.h b/Telegram/SourceFiles/ui/controls/sub_tabs.h
index ea089926db..63bf2c27c2 100644
--- a/Telegram/SourceFiles/ui/controls/sub_tabs.h
+++ b/Telegram/SourceFiles/ui/controls/sub_tabs.h
@@ -69,6 +69,7 @@ private:
 	std::vector<Button> _buttons;
 	rpl::event_stream<QString> _activated;
 	rpl::event_stream<QString> _contextMenuRequests;
+	std::optional<Qt::Orientation> _locked;
 	int _dragx = 0;
 	int _pressx = 0;
 	float64 _dragscroll = 0.;

From 6d81636d1effde425060e34ffee56883fc64994c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 17:26:44 +0400
Subject: [PATCH 118/341] Improve switching stories albums.

---
 .../info/stories/info_stories_inner_widget.cpp    | 15 +++++++++++----
 .../info/stories/info_stories_inner_widget.h      |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index ba762f044f..f6830d6fbf 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -530,10 +530,6 @@ void InnerWidget::setupList() {
 		_controller);
 	const auto raw = _list.data();
 
-	raw->heightValue(
-	) | rpl::start_with_next([=] {
-		refreshHeight();
-	}, raw->lifetime());
 	using namespace rpl::mappers;
 	raw->scrollToRequests(
 	) | rpl::map([=](int to) {
@@ -549,6 +545,8 @@ void InnerWidget::setupList() {
 }
 
 void InnerWidget::setupEmpty() {
+	_list->resizeToWidth(width());
+
 	const auto stories = &_controller->session().data().stories();
 	const auto key = Data::StoryAlbumIdsKey{ _peer->id, _albumId.current() };
 	rpl::combine(
@@ -566,9 +564,11 @@ void InnerWidget::setupEmpty() {
 			raw->hide();
 			raw->deleteLater();
 		}
+		_emptyLoading = false;
 		if (listHeight <= padding.bottom() + padding.top()) {
 			refreshEmpty();
 		}
+		refreshHeight();
 	}, _list->lifetime());
 }
 
@@ -629,6 +629,7 @@ void InnerWidget::refreshEmpty() {
 			st::giftListAbout);
 		_empty->show();
 	}
+	_emptyLoading = !albumCanAdd && !knownEmpty;
 	resizeToWidth(width());
 }
 
@@ -893,6 +894,7 @@ int InnerWidget::resizeGetHeight(int newWidth) {
 		const auto margin = st::giftListAboutMargin;
 		empty->resizeToWidth(newWidth - margin.left() - margin.right());
 	}
+
 	return recountHeight();
 }
 
@@ -920,6 +922,11 @@ int InnerWidget::recountHeight() {
 		empty->moveToLeft(margin.left(), top + margin.top());
 		top += margin.top() + empty->height() + margin.bottom();
 	}
+	if (_emptyLoading) {
+		top = std::max(top, _lastNonLoadingHeight);
+	} else {
+		_lastNonLoadingHeight = top;
+	}
 	return top;
 }
 
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index 838c5044d9..ae273cc9de 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -125,6 +125,8 @@ private:
 	object_ptr<Ui::VerticalLayout> _top = { nullptr };
 	object_ptr<Media::ListWidget> _list = { nullptr };
 	object_ptr<Ui::RpWidget> _empty = { nullptr };
+	int _lastNonLoadingHeight = 0;
+	bool _emptyLoading = false;
 
 	bool _inResize = false;
 	bool _isStackBottom = false;

From 88d9fd42c4eef3543c3f5e61991f20685226e6d1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 17:29:56 +0400
Subject: [PATCH 119/341] Submit album/collection title by Enter.

---
 .../info/peer_gifts/info_peer_gifts_collections.cpp  | 12 +++++++-----
 .../SourceFiles/info/stories/info_stories_albums.cpp | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
index 43260cf714..a237403e60 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_collections.cpp
@@ -61,10 +61,7 @@ void EditCollectionBox(
 	const auto session = &peer->session();
 
 	const auto creating = std::make_shared<bool>(false);
-	auto text = id
-		? tr::lng_settings_save()
-		: tr::lng_gift_collection_new_create();
-	box->addButton(std::move(text), [=] {
+	const auto submit = [=] {
 		if (*creating) {
 			return;
 		}
@@ -123,7 +120,12 @@ void EditCollectionBox(
 				MTP_vector<MTPInputSavedStarGift>(ids)
 			)).done(done).fail(fail).send();
 		}
-	});
+	};
+	title->submits() | rpl::start_with_next(submit, title->lifetime());
+	auto text = id
+		? tr::lng_settings_save()
+		: tr::lng_gift_collection_new_create();
+	box->addButton(std::move(text), submit);
 
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();
diff --git a/Telegram/SourceFiles/info/stories/info_stories_albums.cpp b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
index d0699202c0..b8751c8db6 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_albums.cpp
@@ -61,10 +61,7 @@ void EditAlbumBox(
 	const auto session = &peer->session();
 
 	const auto creating = std::make_shared<bool>(false);
-	auto text = id
-		? tr::lng_settings_save()
-		: tr::lng_stories_album_new_create();
-	box->addButton(std::move(text), [=] {
+	const auto submit = [=] {
 		if (*creating) {
 			return;
 		}
@@ -115,7 +112,12 @@ void EditAlbumBox(
 				done,
 				fail);
 		}
-	});
+	};
+	title->submits() | rpl::start_with_next(submit, title->lifetime());
+	auto text = id
+		? tr::lng_settings_save()
+		: tr::lng_stories_album_new_create();
+	box->addButton(std::move(text), submit);
 
 	box->addButton(tr::lng_cancel(), [=] {
 		box->closeBox();

From 2ccdcf8a9212865fa2f723a80e6318631d8c0d24 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 17:44:42 +0400
Subject: [PATCH 120/341] Fix bad closing of suggestions.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 8fddcb2aca..71b8171d1d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1941,6 +1941,9 @@ void Suggestions::setPostsSearchQuery(const QString &query) {
 	if (!_postsSearch) {
 		setupPostsSearch();
 	}
+	if (!query.isEmpty()) {
+		_persist = true;
+	}
 	_searchQuery = query;
 	_searchQueryTimer.cancel();
 	_postsSearch->setQuery(query);

From 45ebf7b5c6960b444d8359a85554a2b927d08190 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 17:47:37 +0400
Subject: [PATCH 121/341] Use separate keys for add buttons.

---
 Telegram/Resources/langs/lang.strings                  |  2 ++
 .../info/peer_gifts/info_peer_gifts_widget.cpp         | 10 +++++-----
 .../info/stories/info_stories_inner_widget.cpp         |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 7290984b24..641f0b66d7 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3789,6 +3789,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_collection_empty_text" = "Add some of your gifts to this collection.";
 "lng_gift_collection_all" = "All Gifts";
 "lng_gift_collection_add_title" = "Add Gifts";
+"lng_gift_collection_add_button" = "Add Gifts";
 "lng_gift_collection_share" = "Share Collection";
 "lng_gift_collection_edit" = "Edit Name";
 "lng_gift_collection_limit_title" = "Limit Reached";
@@ -6496,6 +6497,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stories_album_empty_text" = "Add some of your stories to this album.";
 "lng_stories_album_all" = "All Stories";
 "lng_stories_album_add_title" = "Add Stories";
+"lng_stories_album_add_button" = "Add Stories";
 "lng_stories_album_share" = "Share Album";
 "lng_stories_album_edit" = "Edit Name";
 "lng_stories_album_limit_title" = "Limit Reached";
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 63b983337b..f89ed3b313 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -811,7 +811,7 @@ void InnerWidget::showMenuForCollection(int id) {
 	}
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
 	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
-	addAction(tr::lng_gift_collection_add_title(tr::now), [=] {
+	addAction(tr::lng_gift_collection_add_button(tr::now), [=] {
 		editCollectionGifts(id);
 	}, &st::menuIconGiftPremium);
 	if (const auto username = _peer->username(); !username.isEmpty()) {
@@ -1003,7 +1003,7 @@ void InnerWidget::refreshAbout() {
 					rpl::single(QString()),
 					st::collectionEmptyButton)),
 			st::collectionEmptyAddMargin)->entity();
-		button->setText(tr::lng_gift_collection_add_title(
+		button->setText(tr::lng_gift_collection_add_button(
 		) | rpl::map([](const QString &text) {
 			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
 		}));
@@ -1108,7 +1108,7 @@ void InnerWidget::editCollectionGifts(int id) {
 		auto text = state->changes.value(
 		) | rpl::map([=](const Data::GiftsUpdate &update) {
 			return (!update.added.empty() && update.removed.empty())
-				? tr::lng_gift_collection_add_title()
+				? tr::lng_gift_collection_add_button()
 				: tr::lng_settings_save();
 		}) | rpl::flatten_latest();
 		box->addButton(std::move(text), [=] {
@@ -1392,7 +1392,7 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
 			}, &st::menuIconAddToFolder);
 		}
 	} else if (canManage) {
-		addAction(tr::lng_gift_collection_add_title(tr::now), [=] {
+		addAction(tr::lng_gift_collection_add_button(tr::now), [=] {
 			editCollectionGifts(collectionId);
 		}, &st::menuIconGiftPremium);
 
@@ -1557,7 +1557,7 @@ void Widget::setupBottomButton(
 		rpl::single(QString()),
 		st::collectionEditBox.button);
 	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	button->setText(tr::lng_gift_collection_add_title(
+	button->setText(tr::lng_gift_collection_add_button(
 	) | rpl::map([](const QString &text) {
 		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
 	}));
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index f6830d6fbf..d086c9372c 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -132,7 +132,7 @@ void EditAlbumBox::prepare() {
 	auto text = _changes.value(
 	) | rpl::map([=](const Data::StoryAlbumUpdate &update) {
 		return (!update.added.empty() && update.removed.empty())
-			? tr::lng_stories_album_add_title()
+			? tr::lng_stories_album_add_button()
 			: tr::lng_settings_save();
 	}) | rpl::flatten_latest();
 	addButton(std::move(text), [=] {
@@ -607,7 +607,7 @@ void InnerWidget::refreshEmpty() {
 					rpl::single(QString()),
 					st::collectionEmptyButton)),
 			st::collectionEmptyAddMargin)->entity();
-		button->setText(tr::lng_stories_album_add_title(
+		button->setText(tr::lng_stories_album_add_button(
 		) | rpl::map([](const QString &text) {
 			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
 		}));
@@ -738,7 +738,7 @@ void InnerWidget::showMenuForAlbum(int id) {
 	_menu = base::make_unique_q<Ui::PopupMenu>(this, st::popupMenuWithIcons);
 	const auto addAction = Ui::Menu::CreateAddActionCallback(_menu);
 	if (_peer->canEditStories()) {
-		addAction(tr::lng_stories_album_add_title(tr::now), [=] {
+		addAction(tr::lng_stories_album_add_button(tr::now), [=] {
 			editAlbumStories(id);
 		}, &st::menuIconStoriesSave);
 	}

From c2f5e7eb452145a68c939835db57d9f6c5cd1575 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 18:24:12 +0400
Subject: [PATCH 122/341] Add Stories button at the bottom.

---
 .../stories/info_stories_inner_widget.cpp     |   3 +
 .../info/stories/info_stories_inner_widget.h  |   5 +
 .../info/stories/info_stories_widget.cpp      | 104 ++++++++++++++++++
 .../info/stories/info_stories_widget.h        |  15 +++
 4 files changed, 127 insertions(+)

diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index d086c9372c..762f408e3f 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -567,6 +567,8 @@ void InnerWidget::setupEmpty() {
 		_emptyLoading = false;
 		if (listHeight <= padding.bottom() + padding.top()) {
 			refreshEmpty();
+		} else {
+			_albumEmpty = false;
 		}
 		refreshHeight();
 	}, _list->lifetime());
@@ -580,6 +582,7 @@ void InnerWidget::refreshEmpty() {
 		&& albumId
 		&& (albumId != Data::kStoriesAlbumIdArchive)
 		&& _peer->canEditStories();
+	_albumEmpty = albumCanAdd;
 	if (albumCanAdd) {
 		auto empty = object_ptr<Ui::VerticalLayout>(this);
 		empty->add(
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
index ae273cc9de..809148653d 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.h
@@ -74,6 +74,10 @@ public:
 	void confirmDeleteAlbum(int id);
 	void albumAdded(Data::StoryAlbum result);
 
+	[[nodiscard]] rpl::producer<bool> albumEmptyValue() const {
+		return _albumEmpty.value();
+	}
+
 	[[nodiscard]] rpl::producer<int> albumIdChanges() const;
 	[[nodiscard]] rpl::producer<Data::StoryAlbumUpdate> changes() const;
 
@@ -135,6 +139,7 @@ private:
 	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
 	rpl::event_stream<rpl::producer<int>> _listTops;
 	rpl::variable<int> _topHeight;
+	rpl::variable<bool> _albumEmpty;
 
 };
 
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index 68b751a2e5..d093987a47 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -12,9 +12,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/stories/info_stories_inner_widget.h"
 #include "info/info_controller.h"
 #include "info/info_memento.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
 #include "lang/lang_keys.h"
 #include "ui/ui_utility.h"
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
 
 namespace Info::Stories {
 
@@ -70,6 +75,10 @@ Widget::Widget(
 	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
 		scrollTo(request);
 	}, _inner->lifetime());
+
+	_albumId.value() | rpl::start_with_next([=] {
+		refreshBottom();
+	}, _inner->lifetime());
 }
 
 void Widget::setIsStackBottom(bool isStackBottom) {
@@ -120,6 +129,97 @@ void Widget::restoreState(not_null<Memento*> memento) {
 	scrollTopRestore(memento->scrollTop());
 }
 
+void Widget::refreshBottom() {
+	const auto albumId = _albumId.current();
+	const auto withButton = albumId
+		&& controller()->storiesPeer()->canEditStories();
+	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
+	delete _pinnedToBottom.data();
+	if (!withButton) {
+		setScrollBottomSkip(0);
+		_hasPinnedToBottom = false;
+	} else {
+		setupBottomButton(wasBottom, _inner->albumEmptyValue());
+	}
+}
+
+void Widget::setupBottomButton(
+		int wasBottomHeight,
+		rpl::producer<bool> hidden) {
+	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+		this,
+		object_ptr<Ui::RpWidget>(this));
+	const auto wrap = _pinnedToBottom.data();
+	wrap->toggle(false, anim::type::instant);
+
+	const auto bottom = wrap->entity();
+	bottom->show();
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		bottom,
+		rpl::single(QString()),
+		st::collectionEditBox.button);
+	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	button->setText(tr::lng_stories_album_add_button(
+	) | rpl::map([](const QString &text) {
+		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
+	}));
+	button->show();
+	std::move(hidden) | rpl::start_with_next([=](bool hidden) {
+		button->setVisible(!hidden);
+		_hasPinnedToBottom = !hidden;
+	}, button->lifetime());
+
+	button->setClickedCallback([=] {
+		if (const auto id = _albumId.current()) {
+			_inner->editAlbumStories(id);
+		} else {
+			refreshBottom();
+		}
+	});
+
+	const auto buttonTop = st::boxRadius;
+	bottom->widthValue() | rpl::start_with_next([=](int width) {
+		const auto normal = width - 2 * buttonTop;
+		button->resizeToWidth(normal);
+		const auto buttonLeft = (width - normal) / 2;
+		button->moveToLeft(buttonLeft, buttonTop);
+	}, button->lifetime());
+
+	button->heightValue() | rpl::start_with_next([=](int height) {
+		bottom->resize(bottom->width(), st::boxRadius + height);
+	}, button->lifetime());
+
+	const auto processHeight = [=] {
+		setScrollBottomSkip(wrap->height());
+		wrap->moveToLeft(wrap->x(), height() - wrap->height());
+	};
+
+	_inner->sizeValue(
+	) | rpl::start_with_next([=](const QSize &s) {
+		wrap->resizeToWidth(s.width());
+		crl::on_main(wrap, processHeight);
+	}, wrap->lifetime());
+
+	rpl::combine(
+		wrap->heightValue(),
+		heightValue()
+	) | rpl::start_with_next(processHeight, wrap->lifetime());
+
+	if (_shown) {
+		wrap->toggle(
+			true,
+			wasBottomHeight ? anim::type::instant : anim::type::normal);
+	}
+}
+
+void Widget::showFinished() {
+	_shown = true;
+	if (const auto bottom = _pinnedToBottom.data()) {
+		bottom->toggle(true, anim::type::normal);
+	}
+}
+
 rpl::producer<SelectedItems> Widget::selectedListValue() const {
 	return _inner->selectedListValue();
 }
@@ -137,6 +237,10 @@ rpl::producer<QString> Widget::title() {
 		: tr::lng_stories_my_title();
 }
 
+rpl::producer<bool> Widget::desiredBottomShadowVisibility() {
+	return _hasPinnedToBottom.value();
+}
+
 std::shared_ptr<Info::Memento> Make(not_null<PeerData*> peer, int albumId) {
 	return std::make_shared<Info::Memento>(
 		std::vector<std::shared_ptr<ContentMemento>>(
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 1985724531..9fcbcd7978 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -11,6 +11,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_widget.h"
 #include "info/stories/info_stories_common.h"
 
+namespace Ui {
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
 namespace Info::Stories {
 
 class InnerWidget;
@@ -59,14 +64,24 @@ public:
 
 	rpl::producer<QString> title() override;
 
+	rpl::producer<bool> desiredBottomShadowVisibility() override;
+
+	void showFinished() override;
+
 private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
+	void setupBottomButton(int wasBottomHeight, rpl::producer<bool> hidden);
+	void refreshBottom();
+
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	rpl::variable<int> _albumId;
 	InnerWidget *_inner = nullptr;
+	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
+	rpl::variable<bool> _hasPinnedToBottom;
+	bool _shown = false;
 
 };
 

From 051b8c4b6388ad27841907aaeb69bf3e086c3cf7 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 1 Aug 2025 18:41:54 +0400
Subject: [PATCH 123/341] Limit malloc_trim to once per 10 seconds

---
 Telegram/SourceFiles/platform/linux/integration_linux.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 1a5e3b6903..0bb06f5508 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -183,7 +183,7 @@ LinuxIntegration::LinuxIntegration()
 				return timer;
 			}();
 
-			if (timer.hasExpired(1000)) {
+			if (timer.hasExpired(10000)) {
 				malloc_trim(0);
 				timer.start();
 			}

From 667822ca08f97ba97ed91eb4e5683d9f6bf2a7b3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 20:53:59 +0400
Subject: [PATCH 124/341] Improve negative rating display.

---
 .../Resources/icons/levels/level_warning.svg  |  7 ++
 Telegram/Resources/langs/lang.strings         |  4 +
 .../SourceFiles/data/data_peer_values.cpp     |  6 +-
 .../info/profile/info_levels.style            |  4 +
 .../SourceFiles/ui/controls/stars_rating.cpp  | 80 +++++++++++++++----
 Telegram/SourceFiles/ui/effects/premium.style | 10 +++
 .../SourceFiles/ui/effects/premium_bubble.cpp | 10 +--
 .../SourceFiles/ui/effects/premium_bubble.h   |  1 +
 .../ui/effects/premium_graphics.cpp           | 13 +--
 9 files changed, 110 insertions(+), 25 deletions(-)
 create mode 100644 Telegram/Resources/icons/levels/level_warning.svg

diff --git a/Telegram/Resources/icons/levels/level_warning.svg b/Telegram/Resources/icons/levels/level_warning.svg
new file mode 100644
index 0000000000..cba1db0076
--- /dev/null
+++ b/Telegram/Resources/icons/levels/level_warning.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Filled / Folder / filled_warning</title>
+    <g id="Icon-/-Filled-/-Folder-/-filled_warning" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M4.88979533,20 L19.1102047,20 C20.5643501,20 21.4708304,18.4289284 20.7437577,17.1777157 L13.633553,4.93840953 C12.9064803,3.68719682 11.0935197,3.68719682 10.366447,4.93840953 L3.25624234,17.1777157 C2.52916961,18.4289284 3.43564989,20 4.88979533,20 Z M12,9.51724138 C12.4659903,9.51724138 12.84375,9.89500112 12.84375,10.3609914 L12.84375,13.3631466 C12.84375,13.8291368 12.4659903,14.2068966 12,14.2068966 C11.5340097,14.2068966 11.15625,13.8291368 11.15625,13.3631466 L11.15625,10.3609914 C11.15625,9.89500112 11.5340097,9.51724138 12,9.51724138 Z M12.018319,17.1862069 L11.981681,17.1862069 C11.463676,17.1862069 11.04375,16.7662809 11.04375,16.2482759 C11.04375,15.7302709 11.463676,15.3103448 11.981681,15.3103448 L12.018319,15.3103448 C12.536324,15.3103448 12.95625,15.7302709 12.95625,16.2482759 C12.95625,16.7662809 12.536324,17.1862069 12.018319,17.1862069 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 641f0b66d7..f7f2fef5a5 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1882,6 +1882,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stars_rating_pending#other" = "The rating updates in 21 days after purchases.\n{count} points are pending. {link}";
 "lng_stars_rating_pending_preview" = "Preview {arrow}";
 "lng_stars_rating_pending_back" = "Back {arrow}";
+"lng_stars_rating_negative_label" = "Negative Rating";
+"lng_stars_rating_negative" = "A negative rating indicates that **{name}'s** payments are unreliable.";
+"lng_stars_rating_negative_your#one" = "A negative rating indicates that your payments are unreliable. Spend **{count} Star** to fix this issue.";
+"lng_stars_rating_negative_your#other" = "A negative rating indicates that your payments are unreliable. Spend **{count} Stars** to fix this issue.";
 "lng_stars_rating_about" = "This rating reflects **{name}'s** activity on Telegram. What affects it:";
 "lng_stars_rating_about_your" = "This rating reflects your activity on Telegram. What affects it:";
 "lng_stars_title_gifts_telegram" = "Gifts from Telegram";
diff --git a/Telegram/SourceFiles/data/data_peer_values.cpp b/Telegram/SourceFiles/data/data_peer_values.cpp
index 0da1a8137f..77fdb049b3 100644
--- a/Telegram/SourceFiles/data/data_peer_values.cpp
+++ b/Telegram/SourceFiles/data/data_peer_values.cpp
@@ -525,7 +525,11 @@ rpl::producer<Data::StarsRating> StarsRatingValue(
 			user,
 			Data::PeerUpdate::Flag::StarsRating
 		) | rpl::map([=] {
-			return user->starsRating();
+			auto result = user->starsRating();
+			if (!user->isSelf() && result.level < 0) {
+				result.stars = 0;
+			}
+			return result;
 		});
 	}
 	return rpl::single(Data::StarsRating());
diff --git a/Telegram/SourceFiles/info/profile/info_levels.style b/Telegram/SourceFiles/info/profile/info_levels.style
index e1d38d51a8..9d1ae14eac 100644
--- a/Telegram/SourceFiles/info/profile/info_levels.style
+++ b/Telegram/SourceFiles/info/profile/info_levels.style
@@ -74,3 +74,7 @@ level80: LevelShape(levelBase) {
 level90: LevelShape(levelBase) {
 	icon: icon {{ "levels/level90_inner-31x31", windowBgActive }};
 }
+levelNegative: LevelShape(levelBase) {
+	icon: icon {{ "levels/level_warning-18x18", attentionButtonFg, point(6px, 7px) }};
+}
+levelNegativeBubble: icon {{ "levels/level_warning-28x28", windowFgActive }};
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 0adfa4e500..6983bb64f4 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -157,13 +157,19 @@ void FillRatingLimit(
 		rpl::producer<> showFinished,
 		not_null<VerticalLayout*> container,
 		rpl::producer<Counters> data,
+		Premium::BubbleType type,
 		style::margins limitLinePadding,
-		int starsForScale) {
+		int starsForScale,
+		bool hideCount) {
 	const auto addSkip = [&](int skip) {
 		container->add(object_ptr<Ui::FixedHeightWidget>(container, skip));
 	};
 
+	const auto negative = (type == Premium::BubbleType::NegativeRating);
 	const auto ratio = [=](Counters rating) {
+		if (negative) {
+			return 0.5;
+		}
 		const auto min = rating.thisLevelStars;
 		const auto max = rating.nextLevelStars;
 
@@ -213,12 +219,14 @@ void FillRatingLimit(
 	});
 	Premium::AddBubbleRow(
 		container,
-		st::boostBubble,
+		(hideCount ? st::iconOnlyPremiumBubble : st::boostBubble),
 		std::move(showFinished),
 		rpl::duplicate(bubbleRowState),
-		Premium::BubbleType::StarRating,
-		BubbleTextFactory(starsForScale),
-		&st::infoStarsCrown,
+		type,
+		(hideCount
+			? [](int) { return QString(); }
+			: BubbleTextFactory(starsForScale)),
+		negative ? &st::levelNegativeBubble : &st::infoStarsCrown,
 		limitLinePadding);
 	addSkip(st::premiumLineTextSkip);
 
@@ -227,30 +235,35 @@ void FillRatingLimit(
 	};
 	auto limitState = std::move(
 		bubbleRowState
-	) | rpl::map([](const Premium::BubbleRowState &state) {
+	) | rpl::map([negative](const Premium::BubbleRowState &state) {
 		return Premium::LimitRowState{
-			.ratio = state.ratio,
-			.animateFromZero = state.animateFromZero,
+			.ratio = negative ? 0.5 : state.ratio,
+			.animateFromZero = !negative && state.animateFromZero,
 			.dynamic = state.dynamic
 		};
 	});
 	auto left = rpl::duplicate(
 		adjustedData
 	) | rpl::map([=](Counters counters) {
-		return level(counters.level);
+		return (counters.level < 0) ? QString() : level(counters.level);
 	});
 	auto right = rpl::duplicate(
 		adjustedData
 	) | rpl::map([=](Counters counters) {
-		return level(counters.level + 1);
+		return (counters.level < 0)
+			? tr::lng_stars_rating_negative_label(tr::now)
+			: level(counters.level + 1);
 	});
 	Premium::AddLimitRow(
 		container,
-		st::boostLimits,
+		(negative ? st::negativeStarsLimits : st::boostLimits),
 		Premium::LimitRowLabels{
 			.leftLabel = std::move(left),
 			.rightLabel = std::move(right),
-			.activeLineBg = [=] { return st::windowBgActive->b; },
+			.activeLineBg = [=] { return negative
+				? st::attentionButtonFg->b
+				: st::windowBgActive->b;
+			},
 		},
 		std::move(limitState),
 		limitLinePadding);
@@ -276,8 +289,12 @@ void AboutRatingBox(
 		BoxShowFinishes(box),
 		box->verticalLayout(),
 		state->data.value(),
+		(data.level < 0
+			? Premium::BubbleType::NegativeRating
+			: Premium::BubbleType::StarRating),
 		st::boxRowPadding,
-		data.stars);
+		data.stars,
+		(data.level < 0 && !data.stars));
 
 	box->setMaxHeight(st::boostBoxMaxHeight);
 
@@ -294,10 +311,40 @@ void AboutRatingBox(
 		: tr::lng_stars_rating_about_your(
 			Ui::Text::RichLangValue) | rpl::type_erased();
 
+	if (data.level < 0) {
+		auto text = (data.stars < 0)
+			? tr::lng_stars_rating_negative_your(
+				lt_count_decimal,
+				rpl::single(-data.stars * 1.),
+				Ui::Text::RichLangValue)
+			: tr::lng_stars_rating_negative(
+				lt_name,
+				rpl::single(TextWithEntities{ name }),
+				Ui::Text::RichLangValue);
+		const auto aboutNegative = box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				std::move(text),
+				st::boostTextNegative),
+			(st::boxRowPadding
+				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
+		aboutNegative->setTryMakeSimilarLines(true);
+	}
+
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(box, std::move(title), st::infoStarsTitle),
 		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0));
 
+	AssertIsDebug();
+	pending = {
+		.value = {
+			.level = 10,
+			.stars = 100,
+			.thisLevelStars = 90,
+			.nextLevelStars = 110,
+		},
+		.date = 86400,
+	};
 	if (pending) {
 		auto text = state->pending.value(
 		) | rpl::map([=](bool value) {
@@ -398,6 +445,9 @@ void AboutRatingBox(
 }
 
 [[nodiscard]] not_null<const style::LevelShape*> SelectShape(int level) {
+	if (level < 0) {
+		return &st::levelNegative;
+	}
 	struct Shape {
 		int level = 0;
 		not_null<const style::LevelShape*> shape;
@@ -480,7 +530,9 @@ void StarsRating::updateData(Data::StarsRating rating) {
 		_shape = SelectShape(rating.level);
 		_collapsedText.setText(
 			st::levelStyle,
-			Lang::FormatCountDecimal(rating.level));
+			(rating.level < 0
+				? QString()
+				: Lang::FormatCountDecimal(rating.level)));
 		_widthValue = _shape->icon.width() - st::levelMargin.left();
 	}
 	updateWidth();
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index 75422a7514..a510a70963 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -255,6 +255,9 @@ boostLimits: PremiumLimits(defaultPremiumLimits) {
 	gradientFromLeft: true;
 	nonPremiumBg: windowBgRipple;
 }
+negativeStarsLimits: PremiumLimits(boostLimits) {
+	gradientFromLeft: false;
+}
 boostBubble: PremiumBubble(defaultPremiumBubble) {
 	height: 32px;
 	padding: margins(7px, 0px, 11px, 0px);
@@ -263,6 +266,10 @@ boostBubble: PremiumBubble(defaultPremiumBubble) {
 	tailSize: size(14px, 6px);
 	font: font(16px);
 }
+iconOnlyPremiumBubble: PremiumBubble(boostBubble) {
+	padding: margins(7px, 0px, 7px, 0px);
+	textSkip: 0px;
+}
 boostTitleSkip: 32px;
 boostTitle: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
@@ -289,6 +296,9 @@ boostText: FlatLabel(defaultFlatLabel) {
 boostTextPending: FlatLabel(boostText) {
 	textFg: windowSubTextFg;
 }
+boostTextNegative: FlatLabel(boostText) {
+	textFg: attentionButtonFg;
+}
 boostReassignText: FlatLabel(defaultFlatLabel) {
 	minWidth: 40px;
 	align: align(top);
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index 75a6965a1d..8d3629ec70 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/padding_wrap.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/painter.h"
+#include "styles/style_info_levels.h"
 #include "styles/style_layers.h"
 #include "styles/style_premium.h"
 
@@ -181,11 +182,9 @@ void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
 	p.setPen(st::activeButtonFg);
 	p.setFont(_st.font);
 	const auto iconLeft = r.x() + _st.padding.left();
-	_icon->paint(
-		p,
-		iconLeft,
-		bubbleRect.y() + (bubbleRect.height() - _icon->height()) / 2,
-		bubbleRect.width());
+	const auto iconTop = bubbleRect.y()
+		+ (bubbleRect.height() - _icon->height()) / 2;
+	_icon->paint(p, iconLeft, iconTop, bubbleRect.width());
 	_numberAnimation.paint(
 		p,
 		iconLeft + _icon->width() + _st.textSkip,
@@ -424,6 +423,7 @@ void BubbleWidget::paintEvent(QPaintEvent *e) {
 		switch (_type) {
 		case BubbleType::NoPremium:
 		case BubbleType::StarRating: return st::windowBgActive->b;
+		case BubbleType::NegativeRating: return st::attentionButtonFg->b;
 		case BubbleType::Premium: return QBrush(_cachedGradient);
 		case BubbleType::Credits: return st::creditsBg3->b;
 		}
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.h b/Telegram/SourceFiles/ui/effects/premium_bubble.h
index b867250400..4d621a47a4 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.h
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.h
@@ -89,6 +89,7 @@ struct BubbleRowState {
 
 enum class BubbleType : uchar {
 	StarRating,
+	NegativeRating,
 	NoPremium,
 	Premium,
 	Credits,
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index 2ace588b1f..f4d7c4f90d 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -372,7 +372,6 @@ void Line::recache(const QSize &s) {
 		}
 	};
 	const auto textPadding = st::premiumLineTextSkip;
-	const auto textTop = (s.height() - _leftLabel.minHeight()) / 2;
 	const auto rwidth = _rightLabel.maxWidth();
 	const auto pen = [&](bool gradient) {
 		return gradient ? st::activeButtonFg : _st.nonPremiumFg;
@@ -385,8 +384,10 @@ void Line::recache(const QSize &s) {
 		if (_dynamic) {
 			p.setFont(st::normalFont);
 			p.setPen(pen(_st.gradientFromLeft));
-			_leftLabel.drawLeft(p, textPadding, textTop, width, width);
-			_rightLabel.drawRight(p, textPadding, textTop, rwidth, width);
+			const auto leftTop = (s.height() - _leftLabel.minHeight()) / 2;
+			_leftLabel.drawLeft(p, textPadding, leftTop, width, width);
+			const auto rightTop = (s.height() - _rightLabel.minHeight()) / 2;
+			_rightLabel.drawRight(p, textPadding, rightTop, rwidth, width);
 		}
 		_leftPixmap = std::move(leftPixmap);
 	}
@@ -398,8 +399,10 @@ void Line::recache(const QSize &s) {
 		if (_dynamic) {
 			p.setFont(st::normalFont);
 			p.setPen(pen(!_st.gradientFromLeft));
-			_leftLabel.drawLeft(p, textPadding, textTop, width, width);
-			_rightLabel.drawRight(p, textPadding, textTop, rwidth, width);
+			const auto leftTop = (s.height() - _leftLabel.minHeight()) / 2;
+			_leftLabel.drawLeft(p, textPadding, leftTop, width, width);
+			const auto rightTop = (s.height() - _rightLabel.minHeight()) / 2;
+			_rightLabel.drawRight(p, textPadding, rightTop, rwidth, width);
 		}
 		_rightPixmap = std::move(rightPixmap);
 	}

From 0bbfe20089fd24d897c622cf1e3e8d3856e9536e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 21:58:23 +0400
Subject: [PATCH 125/341] Improve pending rating info.

---
 Telegram/Resources/langs/lang.strings         |  6 ++-
 .../info/media/info_media_list_widget.cpp     | 44 ++++++++++++++-----
 .../info/media/info_media_list_widget.h       |  2 +
 .../SourceFiles/ui/controls/stars_rating.cpp  | 17 +++----
 4 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f7f2fef5a5..88ac676494 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1878,8 +1878,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_stars_rating_title" = "Rating";
 "lng_stars_rating_future" = "Future Rating";
-"lng_stars_rating_pending#one" = "The rating updates in 21 days after purchases.\n{count} point is pending. {link}";
-"lng_stars_rating_pending#other" = "The rating updates in 21 days after purchases.\n{count} points are pending. {link}";
+"lng_stars_rating_updates#one" = "in {count} day";
+"lng_stars_rating_updates#other" = "in {count} days";
+"lng_stars_rating_pending#one" = "The rating will update {when}.\n{count} point is pending. {link}";
+"lng_stars_rating_pending#other" = "The rating will update {when}.\n{count} points are pending. {link}";
 "lng_stars_rating_pending_preview" = "Preview {arrow}";
 "lng_stars_rating_pending_back" = "Back {arrow}";
 "lng_stars_rating_negative_label" = "Negative Rating";
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index fd84dca000..3c62d16368 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -154,6 +154,7 @@ ListWidget::ListWidget(
 	_provider->type(),
 	[=] { scrollDateCheck(); },
 	[=] { scrollDateHide(); }))
+, _selectedLimit(MaxSelectedItems)
 , _storiesAddToAlbumId(controller->storiesAddToAlbumId())
 , _hiddenMark(std::make_unique<StickerPremiumMark>(
 		&_controller->session(),
@@ -275,6 +276,7 @@ void ListWidget::setupStoriesTrackIds() {
 	}
 	const auto peerId = _controller->storiesPeer()->id;
 	const auto stories = &session().data().stories();
+
 	constexpr auto kArchive = Data::kStoriesAlbumIdArchive;
 	const auto key = Data::StoryAlbumIdsKey{ peerId, kArchive };
 	rpl::single(rpl::empty) | rpl::then(
@@ -302,6 +304,32 @@ void ListWidget::setupStoriesTrackIds() {
 			}
 		}
 	}, lifetime());
+
+	if (!stories->albumIdsCountKnown(peerId, _storiesAddToAlbumId)) {
+		stories->albumIdsLoadMore(peerId, _storiesAddToAlbumId);
+	}
+
+	const auto akey = Data::StoryAlbumIdsKey{ peerId, _storiesAddToAlbumId };
+	rpl::single(rpl::empty) | rpl::then(
+		stories->albumIdsChanged() | rpl::filter(
+			rpl::mappers::_1 == akey
+		) | rpl::to_empty
+	) | rpl::start_with_next([=] {
+		_storiesAddToAlbumTotal = stories->albumIdsCount(
+			peerId,
+			_storiesAddToAlbumId);
+
+		const auto albumId = _storiesAddToAlbumId;
+		const auto &ids = stories->albumKnownInArchive(peerId, albumId);
+		const auto loadedCount = int(ids.size());
+		const auto total = std::max(_storiesAddToAlbumTotal, loadedCount);
+		const auto nonLoadedInAlbum = total - loadedCount;
+
+		const auto appConfig = &_controller->session().appConfig();
+		const auto totalLimit = appConfig->storiesAlbumLimit();
+
+		_selectedLimit = std::max(totalLimit - nonLoadedInAlbum, 0);
+	}, lifetime());
 }
 
 rpl::producer<int> ListWidget::scrollToRequests() const {
@@ -603,8 +631,6 @@ void ListWidget::markStoryMsgsSelected() {
 			pushSelectedItems();
 		}
 	});
-	const auto &appConfig = _controller->session().appConfig();
-	const auto selectLimit = appConfig.storiesAlbumLimit();
 	const auto selection = FullSelection;
 	for (const auto &section : _sections) {
 		for (const auto &entry : section.items()) {
@@ -616,7 +642,7 @@ void ListWidget::markStoryMsgsSelected() {
 					_selected,
 					item,
 					_provider->computeSelectionData(item, selection),
-					selectLimit);
+					_selectedLimit);
 				repaintItem(item);
 				_storyMsgsToMarkSelected.erase(i);
 				if (_storyMsgsToMarkSelected.empty()) {
@@ -1263,7 +1289,7 @@ void ListWidget::showContextMenu(
 				crl::guard(this, [=] {
 					if (hasSelectedText()) {
 						clearSelected();
-					} else if (_selected.size() == MaxSelectedItems) {
+					} else if (_selected.size() == _selectedLimit) {
 						return;
 					} else if (_selected.empty()) {
 						update();
@@ -1583,15 +1609,12 @@ void ListWidget::switchToWordSelection() {
 void ListWidget::applyItemSelection(
 		HistoryItem *item,
 		TextSelection selection) {
-	const auto selectLimit = _storiesAddToAlbumId
-		? _controller->session().appConfig().storiesAlbumLimit()
-		: MaxSelectedItems;
 	if (item
 		&& ChangeItemSelection(
 			_selected,
 			item,
 			_provider->computeSelectionData(item, selection),
-			selectLimit)) {
+			_selectedLimit)) {
 		repaintItem(item);
 		pushSelectedItems();
 	}
@@ -2133,15 +2156,12 @@ void ListWidget::applyDragSelection() {
 
 void ListWidget::applyDragSelection(SelectedMap &applyTo) const {
 	if (_dragSelectAction == DragSelectAction::Selecting) {
-		const auto selectLimit = _storiesAddToAlbumId
-			? _controller->session().appConfig().storiesAlbumLimit()
-			: MaxSelectedItems;
 		for (auto &[item, data] : _dragSelected) {
 			ChangeItemSelection(
 				applyTo,
 				item,
 				_provider->computeSelectionData(item, FullSelection),
-				selectLimit);
+				_selectedLimit);
 		}
 	} else if (_dragSelectAction == DragSelectAction::Deselecting) {
 		for (auto &[item, data] : _dragSelected) {
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index c578d21f32..4ff5113d1f 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -310,7 +310,9 @@ private:
 
 	const std::unique_ptr<DateBadge> _dateBadge;
 
+	int _selectedLimit = 0;
 	int _storiesAddToAlbumId = 0;
+	int _storiesAddToAlbumTotal = 0;
 	base::flat_set<StoryId> _storiesInAlbum;
 	base::flat_set<MsgId> _storyMsgsToMarkSelected;
 	std::unique_ptr<StickerPremiumMark> _hiddenMark;
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 6983bb64f4..3fe7df020f 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/controls/stars_rating.h"
 
+#include "base/unixtime.h"
 #include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
 #include "ui/effects/premium_bubble.h"
@@ -335,23 +336,19 @@ void AboutRatingBox(
 		object_ptr<Ui::FlatLabel>(box, std::move(title), st::infoStarsTitle),
 		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0));
 
-	AssertIsDebug();
-	pending = {
-		.value = {
-			.level = 10,
-			.stars = 100,
-			.thisLevelStars = 90,
-			.nextLevelStars = 110,
-		},
-		.date = 86400,
-	};
 	if (pending) {
+		const auto now = base::unixtime::now();
+		const auto days = std::max((pending.date - now + 43200) / 86400, 1);
 		auto text = state->pending.value(
 		) | rpl::map([=](bool value) {
 			return tr::lng_stars_rating_pending(
 				tr::now,
 				lt_count_decimal,
 				pending.value.stars - data.stars,
+				lt_when,
+				TextWithEntities{
+					tr::lng_stars_rating_updates(tr::now, lt_count, days),
+				},
 				lt_link,
 				Ui::Text::Link((value
 					? tr::lng_stars_rating_pending_back

From 54b881184319ee831f668e43619945d73172a352 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 1 Aug 2025 22:44:55 +0400
Subject: [PATCH 126/341] Version 6.0.2.

- Improve design of profile stars rating.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 4 ++++
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 6b34e58f42..2bcd1762c5 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.0.1.0" />
+    Version="6.0.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 61f6765d10..771c9f04c6 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,1,0
- PRODUCTVERSION 6,0,1,0
+ FILEVERSION 6,0,2,0
+ PRODUCTVERSION 6,0,2,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.0.1.0"
+            VALUE "FileVersion", "6.0.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.1.0"
+            VALUE "ProductVersion", "6.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index c89f9c6ec9..52da953ba8 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,1,0
- PRODUCTVERSION 6,0,1,0
+ FILEVERSION 6,0,2,0
+ PRODUCTVERSION 6,0,2,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.0.1.0"
+            VALUE "FileVersion", "6.0.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.1.0"
+            VALUE "ProductVersion", "6.0.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 286739a616..6a25561deb 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6000001;
-constexpr auto AppVersionStr = "6.0.1";
+constexpr auto AppVersion = 6000002;
+constexpr auto AppVersionStr = "6.0.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 33b7a35895..f6da1d233b 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6000001
+AppVersion         6000002
 AppVersionStrMajor 6.0
-AppVersionStrSmall 6.0.1
-AppVersionStr      6.0.1
+AppVersionStrSmall 6.0.2
+AppVersionStr      6.0.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 6.0.1
+AppVersionOriginal 6.0.2
diff --git a/changelog.txt b/changelog.txt
index 31b62a0a41..5a260449b1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+6.0.2 (01.08.25)
+
+- Improve design of profile stars rating.
+
 6.0.1 (01.08.25)
 
 - Fix crashing on Windows 7.

From 67079545b36af3b1a44ef7d2adfcf35cdaf203e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Aug 2025 11:15:09 +0400
Subject: [PATCH 127/341] Ease filtering on posts search queries.

---
 Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index 011c252b10..f6ea385258 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -20,6 +20,12 @@ namespace {
 constexpr auto kQueryDelay = crl::time(500);
 constexpr auto kPerPage = 50;
 
+[[nodiscard]] const QRegularExpression &SearchSplitter() {
+	static const auto result = QRegularExpression(QString::fromLatin1(""
+		"[\\@\\s\\-\\+\\(\\)\\[\\]\\{\\}\\<\\>\\,\\.\\!\\_\\;\\\"\\'\\x0]"));
+	return result;
+}
+
 } // namespace
 
 PostsSearch::PostsSearch(not_null<Main::Session*> session)
@@ -58,7 +64,9 @@ void PostsSearch::requestMore() {
 }
 
 void PostsSearch::setQuery(const QString &query) {
-	const auto words = TextUtilities::PrepareSearchWords(query);
+	const auto words = TextUtilities::PrepareSearchWords(
+		query,
+		&SearchSplitter());
 	const auto prepared = words.isEmpty() ? QString() : words.join(' ');
 	if (_queryExact == query) {
 		return;

From 56be0ef4befee875603fa3a5cd18ff660a8e046b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 3 Aug 2025 19:19:32 +0300
Subject: [PATCH 128/341] Fixed incorrect state of disabled calls for account
 in notifications.

---
 Telegram/SourceFiles/api/api_authorizations.cpp          | 6 +-----
 Telegram/SourceFiles/settings/settings_notifications.cpp | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp
index 6cd28824e6..78e463c116 100644
--- a/Telegram/SourceFiles/api/api_authorizations.cpp
+++ b/Telegram/SourceFiles/api/api_authorizations.cpp
@@ -217,11 +217,7 @@ void Authorizations::toggleCallsDisabled(uint64 hash, bool disabled) {
 		MTP_bool(disabled)
 	)).done([=] {
 		_toggleCallsDisabledRequests.remove(hash);
-	}).fail([=](const MTP::Error &error) {
-		LOG(("API Error: toggle calls %1. Hash: %2. %3.")
-			.arg(disabled ? u"disabled"_q : u"enabled"_q)
-			.arg(hash)
-			.arg(error.type()));
+	}).fail([=] {
 		_toggleCallsDisabledRequests.remove(hash);
 	}).send();
 	_toggleCallsDisabledRequests.emplace(hash, id);
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 00a8bdb9e6..97aa4328ce 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -1086,6 +1086,8 @@ void SetupNotificationsContent(
 		container,
 		tr::lng_settings_notifications_calls_title());
 	const auto authorizations = &session->api().authorizations();
+	// Request valid value of calls disabled flag.
+	authorizations->reload();
 	const auto acceptCalls = addCheckbox(
 		tr::lng_settings_call_accept_calls(),
 		{ &st::menuIconCallsReceive },

From 1f8d3ed9119d9756939fb3b0424f408b0ff1a014 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Aug 2025 11:46:19 +0400
Subject: [PATCH 129/341] Fix incorrect filesize check.

Fixes #29630.
---
 Telegram/SourceFiles/export/export_api_wrap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp
index fbb5b258eb..e378d9007c 100644
--- a/Telegram/SourceFiles/export/export_api_wrap.cpp
+++ b/Telegram/SourceFiles/export/export_api_wrap.cpp
@@ -2068,7 +2068,7 @@ bool ApiWrap::processFileLoad(
 	} else if (!story && (_settings->media.types & type) != type) {
 		file.skipReason = SkipReason::FileType;
 		return true;
-	} else if (!story && fullSize >= _settings->media.sizeLimit) {
+	} else if (!story && fullSize > _settings->media.sizeLimit) {
 		// Don't load thumbs for large files that we skip.
 		file.skipReason = SkipReason::FileSize;
 		return true;

From a96874ac5572bdb02f6ad5b508ca64d1cf44e342 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Aug 2025 11:51:42 +0400
Subject: [PATCH 130/341] Allow '@' in search posts queries.

---
 Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index f6ea385258..f5211b879b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -22,7 +22,7 @@ constexpr auto kPerPage = 50;
 
 [[nodiscard]] const QRegularExpression &SearchSplitter() {
 	static const auto result = QRegularExpression(QString::fromLatin1(""
-		"[\\@\\s\\-\\+\\(\\)\\[\\]\\{\\}\\<\\>\\,\\.\\!\\_\\;\\\"\\'\\x0]"));
+		"[\\s\\-\\+\\(\\)\\[\\]\\{\\}\\<\\>\\,\\.\\!\\_\\;\\\"\\'\\x0]"));
 	return result;
 }
 

From 7f896a9f401f4c439e9b698e8b904df642a94cd9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Aug 2025 12:50:24 +0400
Subject: [PATCH 131/341] Use better ton icon in strings.

---
 Telegram/Resources/icons/chat/mini_ton_bold.svg            | 7 +++++++
 .../SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp | 2 +-
 .../SourceFiles/settings/settings_credits_graphics.cpp     | 5 ++++-
 Telegram/SourceFiles/ui/effects/credits.style              | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/Resources/icons/chat/mini_ton_bold.svg

diff --git a/Telegram/Resources/icons/chat/mini_ton_bold.svg b/Telegram/Resources/icons/chat/mini_ton_bold.svg
new file mode 100644
index 0000000000..64dc4fa576
--- /dev/null
+++ b/Telegram/Resources/icons/chat/mini_ton_bold.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Icon / Mini / mini_ton_bold</title>
+    <g id="Icon-/-Mini-/-mini_ton_bold" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M12.5980305,2.7875 C13.2201476,2.7875 13.7244732,3.29182558 13.7244732,3.9139427 C13.7244732,4.11165014 13.6724374,4.30587532 13.5735947,4.47710133 L9.21676388,12.0244744 C8.80179975,12.7433201 7.88266529,12.9896647 7.16381961,12.5747006 C6.92829269,12.4387393 6.73407151,12.2414175 6.60185728,12.0037668 L2.40584723,4.46158062 C2.10339516,3.91793325 2.29892259,3.23203413 2.84256996,2.92958206 C3.01005587,2.83640316 3.19854713,2.7875 3.39020787,2.7875 L12.5980305,2.7875 Z M7.24956057,4.2875 L4.025,4.2875 L7.24956057,10.0835 L7.24956057,4.2875 Z M11.95,4.2875 L8.74956057,4.2875 L8.74956057,9.8255 L11.95,4.2875 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index ee5139cfc4..cde387252a 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -646,7 +646,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 			&& unique->nanoTonForResale
 			&& unique->onlyAcceptTon) {
 			if (_tonIcon.isNull()) {
-				_tonIcon = st::tonIconEmoji.icon.instance(
+				_tonIcon = st::tonIconEmojiLarge.icon.instance(
 					QColor(255, 255, 255));
 			}
 			const auto size = _tonIcon.size() / _tonIcon.devicePixelRatio();
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 457d3e84fb..3f6f024ad3 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2115,7 +2115,10 @@ void GenericCreditsEntryBox(
 					Ui::Text::WithEntities),
 				tr::lng_gift_buy_resale_equals(
 					lt_cost,
-					rpl::single(Data::FormatGiftResaleStars(*uniqueGift)),
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmojiSmall
+					).append(Lang::FormatCountDecimal(
+						uniqueGift->starsForResale))),
 					Ui::Text::WithEntities),
 				st::resaleButtonTitle,
 				st::resaleButtonSubtitle);
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index a4e85f14bc..a92b0e9451 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -82,6 +82,10 @@ starIconEmojiSmall: IconEmoji {
 	padding: margins(0px, 4px, 0px, 0px);
 }
 tonIconEmoji: IconEmoji {
+	icon: icon{{ "chat/mini_ton_bold", currencyFg }};
+	padding: margins(1px, 3px, 1px, 0px);
+}
+tonIconEmojiLarge: IconEmoji {
 	icon: icon{{ "payments/ton_emoji-18x18", currencyFg }};
 	padding: margins(0px, 1px, 0px, 0px);
 }

From b876605e937b105a133ff0a515830100841d34ee Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Aug 2025 16:02:01 +0400
Subject: [PATCH 132/341] Remove per-star options in giveaway creation.

---
 Telegram/SourceFiles/api/api_premium.cpp      | 26 +++++++++++++------
 Telegram/SourceFiles/api/api_premium.h        |  3 ++-
 .../boosts/create_giveaway_box.cpp            |  2 +-
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index a707c624b7..27f25175ba 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -45,15 +45,17 @@ namespace {
 	auto options = PremiumSubscriptionOptionsFromTL(tlOptions);
 	for (auto i = 0; i < options.size(); i++) {
 		const auto &tlOption = tlOptions[i].data();
+		const auto currency = qs(tlOption.vcurrency());
 		const auto perUserText = Ui::FillAmountAndCurrency(
 			tlOption.vamount().v / float64(tlOption.vusers().v),
-			qs(tlOption.vcurrency()),
+			currency,
 			false);
 		options[i].costPerMonth = perUserText
 			+ ' '
 			+ QChar(0x00D7)
 			+ ' '
 			+ QString::number(tlOption.vusers().v);
+		options[i].currency = currency;
 	}
 	return options;
 }
@@ -613,24 +615,32 @@ std::vector<GiftOptionData> PremiumGiftCodeOptions::optionsForPeer() const {
 	return result;
 }
 
-Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::options(int amount) {
-	const auto it = _subscriptionOptions.find(amount);
+Data::PremiumSubscriptionOptions PremiumGiftCodeOptions::optionsForGiveaway(
+		int usersCount) {
+	const auto skipForStars = [&](Data::PremiumSubscriptionOptions options) {
+		const auto proj = &Data::PremiumSubscriptionOption::currency;
+		options.erase(
+			ranges::remove(options, Ui::kCreditsCurrency, proj),
+			end(options));
+		return options;
+	};
+	const auto it = _subscriptionOptions.find(usersCount);
 	if (it != end(_subscriptionOptions)) {
-		return it->second;
+		return skipForStars(it->second);
 	} else {
 		auto tlOptions = QVector<MTPPremiumGiftCodeOption>();
 		for (auto i = 0; i < _optionsForOnePerson.months.size(); i++) {
 			tlOptions.push_back(MTP_premiumGiftCodeOption(
 				MTP_flags(MTPDpremiumGiftCodeOption::Flags(0)),
-				MTP_int(amount),
+				MTP_int(usersCount),
 				MTP_int(_optionsForOnePerson.months[i]),
 				MTPstring(),
 				MTPint(),
 				MTP_string(_optionsForOnePerson.currencies[i]),
-				MTP_long(_optionsForOnePerson.totalCosts[i] * amount)));
+				MTP_long(_optionsForOnePerson.totalCosts[i] * usersCount)));
 		}
-		_subscriptionOptions[amount] = GiftCodesFromTL(tlOptions);
-		return _subscriptionOptions[amount];
+		_subscriptionOptions[usersCount] = GiftCodesFromTL(tlOptions);
+		return skipForStars(_subscriptionOptions[usersCount]);
 	}
 }
 
diff --git a/Telegram/SourceFiles/api/api_premium.h b/Telegram/SourceFiles/api/api_premium.h
index 2b692a4849..e3eb8f1e45 100644
--- a/Telegram/SourceFiles/api/api_premium.h
+++ b/Telegram/SourceFiles/api/api_premium.h
@@ -180,7 +180,8 @@ public:
 
 	[[nodiscard]] rpl::producer<rpl::no_value, QString> request();
 	[[nodiscard]] std::vector<GiftOptionData> optionsForPeer() const;
-	[[nodiscard]] Data::PremiumSubscriptionOptions options(int amount);
+	[[nodiscard]] Data::PremiumSubscriptionOptions optionsForGiveaway(
+			int usersCount);
 	[[nodiscard]] const std::vector<int> &availablePresets() const;
 	[[nodiscard]] int monthsFromPreset(int monthsIndex);
 	[[nodiscard]] Payments::InvoicePremiumGiftCode invoice(
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index cc1c092bc3..0c219aa2f1 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -1066,7 +1066,7 @@ void CreateGiveawayBox(
 			Ui::Premium::AddGiftOptions(
 				listOptions,
 				durationGroup,
-				state->apiOptions.options(usersCount),
+				state->apiOptions.optionsForGiveaway(usersCount),
 				st::giveawayGiftCodeGiftOption,
 				true);
 

From b4272c306d50098afcbb3086d3e606e7a5286818 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 4 Aug 2025 22:27:08 +0400
Subject: [PATCH 133/341] Get rid of registerImageEmoji/registerInternalEmoji.

---
 Telegram/SourceFiles/boxes/boxes.style        |  12 ++-
 .../boxes/moderate_messages_box.cpp           |  24 +----
 .../boxes/peers/edit_peer_color_box.cpp       |  18 +---
 .../boxes/peers/edit_peer_invite_link.cpp     |  20 ++--
 .../boxes/peers/edit_peer_permissions_box.cpp |  24 +----
 .../SourceFiles/boxes/send_credits_box.cpp    |  13 +--
 Telegram/SourceFiles/boxes/send_credits_box.h |   6 +-
 Telegram/SourceFiles/boxes/send_files_box.cpp |  11 +-
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  50 ++++-----
 .../SourceFiles/data/data_media_types.cpp     |   3 +-
 .../data/data_premium_subscription_option.h   |   1 +
 .../data/stickers/data_custom_emoji.cpp       |  86 ---------------
 .../data/stickers/data_custom_emoji.h         |  19 ----
 Telegram/SourceFiles/dialogs/dialogs.style    |  11 +-
 .../dialogs/dialogs_search_tags.cpp           |  18 +---
 .../SourceFiles/dialogs/ui/dialogs_layout.cpp |   8 +-
 .../dialogs/ui/dialogs_suggestions.cpp        |  45 ++------
 Telegram/SourceFiles/history/history_item.cpp |  28 ++---
 .../history/history_item_components.cpp       |  15 +--
 .../controls/history_view_suggest_options.cpp |  55 ++++------
 .../history/view/history_view_message.cpp     |  19 +---
 .../history/view/history_view_reply.cpp       |  84 +++++----------
 .../history/view/history_view_reply.h         |   9 +-
 .../history/view/media/history_view_media.cpp |  12 +--
 .../view/media/history_view_web_page.cpp      |   7 +-
 .../bot/starref/info_bot_starref_common.cpp   |   6 +-
 .../earn/channel_earn.style                   |   6 +-
 .../channel_statistics/earn/earn_icons.cpp    |  39 ++++++-
 .../info/channel_statistics/earn/earn_icons.h |  14 +++
 .../earn/info_channel_earn_list.cpp           |  49 ++++-----
 Telegram/SourceFiles/info/info.style          |   7 ++
 .../peer_gifts/info_peer_gifts_common.cpp     |  12 ++-
 .../info/peer_gifts/info_peer_gifts_common.h  |   4 +
 .../info/profile/info_profile_actions.cpp     |  29 +++--
 .../info_statistics_list_controllers.cpp      |   6 +-
 .../media/stories/media_stories_header.cpp    |   5 +-
 .../stories/media_stories_repost_view.cpp     |   2 +-
 .../SourceFiles/media/view/media_view.style   |   6 +-
 .../payments/payments_reaction_process.cpp    |  10 +-
 .../payments/ui/payments_reaction_box.cpp     |   6 +-
 .../payments/ui/payments_reaction_box.h       |   7 +-
 Telegram/SourceFiles/settings/settings.style  |   8 +-
 .../SourceFiles/settings/settings_credits.cpp |  13 +--
 .../settings/settings_credits_graphics.cpp    | 100 ++++++------------
 .../SourceFiles/settings/settings_main.cpp    |  22 +---
 .../SourceFiles/statistics/statistics.style   |   4 +
 .../ui/boxes/collectible_info_box.cpp         |  18 ++--
 .../ui/boxes/collectible_info_box.h           |  10 +-
 Telegram/SourceFiles/ui/chat/chat.style       |  46 +++++---
 .../SourceFiles/ui/controls/stars_rating.cpp  |  46 +-------
 Telegram/SourceFiles/ui/effects/credits.style |  13 ++-
 .../ui/effects/credits_graphics.cpp           |   8 +-
 Telegram/SourceFiles/ui/menu_icons.style      |   1 +
 .../SourceFiles/window/window_peer_menu.cpp   |   7 +-
 .../window/window_session_controller.cpp      |  18 +---
 Telegram/lib_ui                               |   2 +-
 56 files changed, 402 insertions(+), 720 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 25d6aca2fc..29fb5b4ac3 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -1116,8 +1116,16 @@ moderateBoxExpandInnerSkip: 2px;
 moderateBoxExpandFont: font(11px);
 moderateBoxExpandToggleSize: 4px;
 moderateBoxExpandToggleFourStrokes: 3px;
-moderateBoxExpandIcon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
-moderateBoxExpandIconDown: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+moderateBoxExpandIcon: IconEmoji{
+	icon: icon{{ "info/edit/expand_arrow_small-flip_vertical", windowActiveTextFg }};
+	padding: margins(-2px, -1px, 0px, 0px);
+	useIconColor: true;
+}
+moderateBoxExpandIconDown: IconEmoji{
+	icon: icon{{ "info/edit/expand_arrow_small", windowActiveTextFg }};
+	padding: margins(-2px, -1px, 0px, 0px);
+	useIconColor: true;
+}
 moderateBoxDividerLabel: FlatLabel(boxDividerLabel) {
 	palette: TextPalette(defaultTextPalette) {
 		selectLinkFg: windowActiveTextFg;
diff --git a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
index bf8c08c3ea..1b493eca61 100644
--- a/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/moderate_messages_box.cpp
@@ -403,22 +403,10 @@ void CreateModerateMessagesBox(
 			const auto container = wrap->entity();
 			wrap->toggle(false, anim::type::instant);
 
-			const auto session = &participants.front()->session();
-			const auto emojiMargin = QMargins(
-				-st::moderateBoxExpandInnerSkip,
-				-st::moderateBoxExpandInnerSkip / 2,
-				0,
-				0);
-			const auto emojiUp = Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::moderateBoxExpandIcon,
-					emojiMargin,
-					false));
-			const auto emojiDown = Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::moderateBoxExpandIconDown,
-					emojiMargin,
-					false));
+			const auto emojiUp = Ui::Text::IconEmoji(
+				&st::moderateBoxExpandIcon);
+			const auto emojiDown = Ui::Text::IconEmoji(
+				&st::moderateBoxExpandIconDown);
 
 			auto label = object_ptr<Ui::FlatLabel>(
 				inner,
@@ -463,9 +451,7 @@ void CreateModerateMessagesBox(
 						Ui::Text::WithEntities);
 			}) | rpl::flatten_latest(
 			) | rpl::start_with_next([=](const TextWithEntities &text) {
-				raw->setMarkedText(
-					Ui::Text::Link(text, u"internal:"_q),
-					Core::TextContext({ .session = session }));
+				raw->setMarkedText(Ui::Text::Link(text, u"internal:"_q));
 			}, label->lifetime());
 
 			Ui::AddSkip(inner);
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 29019c1091..c7336a1a85 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/background_box.h"
 #include "boxes/stickers_box.h"
 #include "chat_helpers/compose/compose_show.h"
-#include "core/ui_integration.h" // TextContext
 #include "data/stickers/data_custom_emoji.h"
 #include "data/stickers/data_stickers.h"
 #include "data/data_changes.h"
@@ -164,7 +163,6 @@ private:
 	void updateText();
 
 	const uint32 _level;
-	const TextWithEntities _icon;
 	const Ui::Text::MarkedContext _context;
 	Ui::Text::String _text;
 	bool _minimal = false;
@@ -460,22 +458,12 @@ LevelBadge::LevelBadge(
 	uint32 level,
 	not_null<Main::Session*> session)
 : Ui::RpWidget(parent)
-, _level(level)
-, _icon(Ui::Text::SingleCustomEmoji(
-	session->data().customEmojiManager().registerInternalEmoji(
-		st::settingsLevelBadgeLock,
-		QMargins(0, st::settingsLevelBadgeLockSkip, 0, 0),
-		false)))
-, _context(Core::TextContext({
-	.session = session,
-	.repaint = [this] { update(); },
-})) {
+, _level(level) {
 	updateText();
 }
 
 void LevelBadge::updateText() {
-	auto text = _icon;
-	text.append(' ');
+	auto text = Ui::Text::IconEmoji(&st::settingsLevelBadgeLock).append(' ');
 	if (!_minimal) {
 		text.append(tr::lng_boost_level(
 			tr::now,
@@ -490,7 +478,7 @@ void LevelBadge::updateText() {
 		st,
 		text,
 		kMarkupTextOptions,
-		_context);
+		Ui::Text::MarkedContext{ .repaint = [=] { update(); } });
 	const auto &padding = st::settingsColorSamplePadding;
 	QWidget::resize(
 		_text.maxWidth() + rect::m::sum::h(padding),
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 17fb1537fb..3e4e451fd3 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -29,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item_helpers.h" // GetErrorForSending.
 #include "history/view/history_view_group_call_bar.h" // GenerateUserpics...
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "qr/qr_generate.h"
@@ -42,6 +43,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/userpic_button.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -247,6 +249,9 @@ private:
 	const Role _role = Role::Joined;
 	rpl::variable<LinkData> _data;
 
+	Ui::Text::CustomEmojiHelper _emojiHelper;
+	TextWithEntities _creditsEmoji;
+
 	base::unique_qptr<Ui::PopupMenu> _menu;
 	rpl::event_stream<Processed> _processed;
 
@@ -408,6 +413,8 @@ Controller::Controller(
 	const auto current = _data.current();
 	_link = current.link;
 	_revoked = current.revoked;
+	_creditsEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 }
 
 rpl::producer<LinkData> Controller::dataValue() const {
@@ -725,7 +732,7 @@ void Controller::setupAboveJoinedWidget() {
 				? tr::lng_group_invite_subscription_info_title(
 					tr::now,
 					lt_emoji,
-					session().data().customEmojiManager().creditsEmoji(),
+					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
 					lt_multiplier,
@@ -736,15 +743,12 @@ void Controller::setupAboveJoinedWidget() {
 				: tr::lng_group_invite_subscription_info_title_none(
 					tr::now,
 					lt_emoji,
-					session().data().customEmojiManager().creditsEmoji(),
+					_creditsEmoji,
 					lt_price,
 					{ QString::number(current.subscription.credits) },
 					Ui::Text::WithEntities),
 			kMarkupTextOptions,
-			Core::TextContext({
-				.session = &session(),
-				.repaint = [=] { widget->update(); },
-			}));
+			_emojiHelper.context([=] { widget->update(); }));
 		auto &lifetime = widget->lifetime();
 		const auto rateValue = lifetime.make_state<rpl::variable<float64>>(
 			session().credits().rateValue(_peer));
@@ -991,11 +995,11 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 			tr::lng_credits_subscription_subtitle(
 				tr::now,
 				lt_emoji,
-				session->data().customEmojiManager().creditsEmoji(),
+				_creditsEmoji,
 				lt_cost,
 				{ QString::number(data.subscription.credits) },
 				Ui::Text::WithEntities),
-			Core::TextContext({ .session = session }));
+			_emojiHelper.context());
 		const auto subtitle2 = box->addRow(
 			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
 				box,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
index f13430e82b..46cfe1c30f 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_permissions_box.cpp
@@ -886,32 +886,18 @@ rpl::producer<int> AddSlowmodeSlider(
 	return secondsCount->value();
 }
 
-void AddBoostsUnrestrictLabels(
-		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session) {
+void AddBoostsUnrestrictLabels(not_null<Ui::VerticalLayout*> container) {
 	const auto labels = container->add(
 		object_ptr<Ui::FixedHeightWidget>(container, st::normalFont->height),
 		st::slowmodeLabelsMargin);
-	const auto manager = &session->data().customEmojiManager();
-	const auto one = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			st::boostMessageIcon,
-			st::boostMessageIconPadding));
-	const auto many = Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			st::boostsMessageIcon,
-			st::boostsMessageIconPadding));
-	const auto context = Core::TextContext({
-		.session = session,
-		.customEmojiLoopLimit = 1,
-	});
+	const auto one = Ui::Text::IconEmoji(&st::boostMessageIcon);
+	const auto many = Ui::Text::IconEmoji(&st::boostsMessageIcon);
 	for (auto i = 0; i != kBoostsUnrestrictValues; ++i) {
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
 			st::boostsUnrestrictLabel);
 		label->setMarkedText(
-			TextWithEntities(i ? many : one).append(QString::number(i + 1)),
-			context);
+			TextWithEntities(i ? many : one).append(QString::number(i + 1)));
 		rpl::combine(
 			labels->widthValue(),
 			label->widthValue()
@@ -977,7 +963,7 @@ rpl::producer<int> AddBoostsUnrestrictSlider(
 
 	const auto inner = outer->entity();
 
-	AddBoostsUnrestrictLabels(inner, &peer->session());
+	AddBoostsUnrestrictLabels(inner);
 
 	const auto slider = inner->add(
 		object_ptr<Ui::MediaSlider>(inner, st::localStorageLimitSlider),
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 8f355b1aa6..4ecd915df4 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -455,7 +455,7 @@ void SendCreditsBox(
 					lt_count,
 					rpl::single(form->invoice.amount) | tr::to_count(),
 					lt_emoji,
-					rpl::single(CreditsEmojiSmall(session)),
+					rpl::single(CreditsEmojiSmall()),
 					Ui::Text::RichLangValue),
 			state->confirmButtonBusy.value()
 		) | rpl::map([](TextWithEntities &&text, bool busy) {
@@ -502,16 +502,13 @@ void SendCreditsBox(
 	}
 }
 
-TextWithEntities CreditsEmoji(not_null<Main::Session*> session) {
-	return Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			st::settingsPremiumIconStar,
-			QMargins{ 0, -st::moderateBoxExpandInnerSkip, 0, 0 },
-			true),
+TextWithEntities CreditsEmoji() {
+	return Ui::Text::IconEmoji(
+		&st::starIconEmojiLarge,
 		QString(QChar(0x2B50)));
 }
 
-TextWithEntities CreditsEmojiSmall(not_null<Main::Session*> session) {
+TextWithEntities CreditsEmojiSmall() {
 	return Ui::Text::IconEmoji(
 		&st::starIconEmoji,
 		QString(QChar(0x2B50)));
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.h b/Telegram/SourceFiles/boxes/send_credits_box.h
index 6dcaef1f8e..43fb75b033 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.h
+++ b/Telegram/SourceFiles/boxes/send_credits_box.h
@@ -32,11 +32,9 @@ void SendCreditsBox(
 	std::shared_ptr<Payments::CreditsFormData> data,
 	Fn<void()> sent);
 
-[[nodiscard]] TextWithEntities CreditsEmoji(
-	not_null<Main::Session*> session);
+[[nodiscard]] TextWithEntities CreditsEmoji();
 
-[[nodiscard]] TextWithEntities CreditsEmojiSmall(
-	not_null<Main::Session*> session);
+[[nodiscard]] TextWithEntities CreditsEmojiSmall();
 
 not_null<FlatLabel*> SetButtonMarkedLabel(
 	not_null<RpWidget*> button,
diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp
index b16040eeae..37ecd0abd4 100644
--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@@ -843,9 +843,8 @@ void SendFilesBox::refreshPriceTag() {
 			QPainter(raw).drawImage(0, 0, _priceTagBg);
 		}, raw->lifetime());
 
-		const auto session = &_show->session();
 		auto price = _price.value() | rpl::map([=](uint64 amount) {
-			auto result = Ui::Text::Colorized(Ui::CreditsEmoji(session));
+			auto result = Ui::Text::Colorized(Ui::CreditsEmoji());
 			result.append(Lang::FormatCountDecimal(amount));
 			return result;
 		});
@@ -857,10 +856,10 @@ void SendFilesBox::refreshPriceTag() {
 			raw,
 			QString(),
 			st::paidTagLabel);
-		std::move(text) | rpl::start_with_next([=](TextWithEntities &&text) {
-			label->setMarkedText(text, Core::TextContext({
-				.session = session,
-			}));
+		std::move(
+			text
+		) | rpl::start_with_next([=](const TextWithEntities &text) {
+			label->setMarkedText(text);
 		}, label->lifetime());
 		label->show();
 		label->sizeValue() | rpl::start_with_next([=](QSize size) {
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 34ec652710..175f951031 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -54,6 +54,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/history_item_helpers.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
 #include "info/profile/info_profile_icon.h"
 #include "lang/lang_keys.h"
@@ -82,6 +83,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/new_badges.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -1194,8 +1196,9 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 }
 
 [[nodiscard]] Text::String TabTextForPrice(
-		not_null<Main::Session*> session,
-		int price) {
+		int price,
+		TextWithEntities creditsIcon,
+		Ui::Text::MarkedContext context) {
 	const auto simple = [](const QString &text) {
 		return Text::String(st::semiboldTextStyle, text);
 	};
@@ -1210,13 +1213,12 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 	} else if (price == kPriceTabResale) {
 		return simple(tr::lng_gift_stars_tabs_resale(tr::now));
 	}
-	auto &manager = session->data().customEmojiManager();
 	auto result = Text::String();
 	result.setMarkedText(
 		st::semiboldTextStyle,
-		manager.creditsEmoji().append(QString::number(price)),
+		creditsIcon.append(QString::number(price)),
 		kMarkupTextOptions,
-		Core::TextContext({ .session = session }));
+		context);
 	return result;
 }
 
@@ -1636,7 +1638,6 @@ struct GiftPriceTabs {
 	object_ptr<RpWidget> widget;
 };
 [[nodiscard]] GiftPriceTabs MakeGiftsPriceTabs(
-		not_null<Window::SessionController*> window,
 		not_null<PeerData*> peer,
 		rpl::producer<std::vector<GiftTypeStars>> gifts,
 		bool hasMyUnique) {
@@ -1745,7 +1746,6 @@ struct GiftPriceTabs {
 		state->priceTab = state->buttons[index].price;
 	};
 
-	const auto session = &peer->session();
 	state->prices.value(
 	) | rpl::start_with_next([=](const std::vector<int> &prices) {
 		auto x = st::giftBoxTabsMargin.left();
@@ -1759,12 +1759,18 @@ struct GiftPriceTabs {
 			currentPrice = kPriceTabAll;
 		}
 		state->active = -1;
+		auto helper = Ui::Text::CustomEmojiHelper();
+		const auto creditsIcon = helper.paletteDependent(
+			Ui::Earn::IconCreditsEmoji());
 		for (auto i = 0, count = int(prices.size()); i != count; ++i) {
 			const auto price = prices[i];
 			auto &button = state->buttons[i];
 			if (button.text.isEmpty() || button.price != price) {
 				button.price = price;
-				button.text = TabTextForPrice(session, price);
+				button.text = TabTextForPrice(
+					price,
+					creditsIcon,
+					helper.context());
 			}
 			button.active = (price == currentPrice);
 			if (button.active) {
@@ -2177,7 +2183,6 @@ void SoldOutBox(
 
 void AddUpgradeButton(
 		not_null<Ui::VerticalLayout*> container,
-		not_null<Main::Session*> session,
 		int cost,
 		not_null<PeerData*> peer,
 		Fn<void(bool)> toggled,
@@ -2190,7 +2195,8 @@ void AddUpgradeButton(
 	button->toggleOn(rpl::single(false))->toggledValue(
 	) | rpl::start_with_next(toggled, button->lifetime());
 
-	auto star = session->data().customEmojiManager().creditsEmoji();
+	auto helper = Ui::Text::CustomEmojiHelper();
+	auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		button,
 		tr::lng_gift_send_unique(
@@ -2201,7 +2207,7 @@ void AddUpgradeButton(
 			Text::WithEntities),
 		st::boxLabel,
 		st::defaultPopupMenu,
-		Core::TextContext({ .session = session }));
+		helper.context());
 	label->show();
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	button->widthValue() | rpl::start_with_next([=](int outer) {
@@ -2355,7 +2361,7 @@ void SendGiftBox(
 	});
 
 	auto cost = state->details.value(
-	) | rpl::map([session](const GiftDetails &details) {
+	) | rpl::map([](const GiftDetails &details) {
 		return v::match(details.descriptor, [&](const GiftTypePremium &data) {
 			const auto stars = (details.byStars && data.stars)
 				? data.stars
@@ -2363,7 +2369,7 @@ void SendGiftBox(
 				? data.cost
 				: 0;
 			if (stars) {
-				return CreditsEmojiSmall(session).append(
+				return CreditsEmojiSmall().append(
 					Lang::FormatCountDecimal(std::abs(stars)));
 			}
 			return TextWithEntities{
@@ -2372,7 +2378,7 @@ void SendGiftBox(
 		}, [&](const GiftTypeStars &data) {
 			const auto amount = std::abs(data.info.stars)
 				+ (details.upgraded ? data.info.starsToUpgrade : 0);
-			return CreditsEmojiSmall(session).append(
+			return CreditsEmojiSmall().append(
 				Lang::FormatCountDecimal(amount));
 		});
 	});
@@ -2448,8 +2454,7 @@ void SendGiftBox(
 			const auto showing = std::make_shared<bool>();
 			AddDivider(container);
 			AddSkip(container);
-			AddUpgradeButton(container, session, costToUpgrade, peer, [=](
-					bool on) {
+			AddUpgradeButton(container, costToUpgrade, peer, [=](bool on) {
 				auto now = state->details.current();
 				now.upgraded = on;
 				state->details = std::move(now);
@@ -3027,7 +3032,6 @@ void AddBlock(
 	state->gifts = GiftsStars(&window->session(), peer);
 
 	auto tabs = MakeGiftsPriceTabs(
-		window,
 		peer,
 		state->gifts.value(),
 		!state->my.list.empty() && !peer->isSelf());
@@ -4445,11 +4449,7 @@ void ShowUniqueGiftWearBox(
 					u"wear_collectibles"_q);
 			}
 		});
-		const auto lock = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::historySendDisabledIcon,
-				st::giftBoxLockMargins,
-				true));
+		const auto lock = Ui::Text::IconEmoji(&st::giftBoxLock);
 		auto label = rpl::combine(
 			tr::lng_gift_wear_start(),
 			Data::AmPremiumValue(&show->session())
@@ -4936,7 +4936,6 @@ void UpgradeBox(
 	box->setStyle(preview ? st::giftBox : st::upgradeGiftBox);
 
 	const auto cost = args.cost;
-	const auto session = &controller->session();
 	auto buttonText = preview ? tr::lng_box_ok() : rpl::single(QString());
 	const auto button = box->addButton(std::move(buttonText), [=] {
 		if (preview) {
@@ -4961,7 +4960,8 @@ void UpgradeBox(
 		UpgradeGift(controller, args.savedId, keepDetails, cost, done);
 	});
 	if (!preview) {
-		auto star = session->data().customEmojiManager().creditsEmoji();
+		auto helper = Ui::Text::CustomEmojiHelper();
+		auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
 		SetButtonMarkedLabel(
 			button,
 			(cost
@@ -4972,7 +4972,7 @@ void UpgradeBox(
 							CreditsAmount{ cost }))),
 					Ui::Text::WithEntities)
 				: tr::lng_gift_upgrade_confirm(Ui::Text::WithEntities)),
-			&controller->session(),
+			helper.context(),
 			st::creditsBoxButtonLabel,
 			&st::giftBox.button.textFg);
 	}
diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index 271ae56f59..bef2e57e1c 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -2232,8 +2232,7 @@ ItemPreview MediaInvoice::toPreview(ToPreviewOptions options) const {
 			? parent()->translatedText()
 			: parent()->originalText());
 	const auto hasMiniImages = !images.empty();
-	auto nice = Ui::Text::Colorized(
-		Ui::CreditsEmojiSmall(&parent()->history()->session()));
+	auto nice = Ui::Text::Colorized(Ui::CreditsEmojiSmall());
 	nice.append(WithCaptionNotificationText(type, caption, hasMiniImages));
 	return {
 		.text = std::move(nice),
diff --git a/Telegram/SourceFiles/data/data_premium_subscription_option.h b/Telegram/SourceFiles/data/data_premium_subscription_option.h
index 5b11a532f0..42fa985d5a 100644
--- a/Telegram/SourceFiles/data/data_premium_subscription_option.h
+++ b/Telegram/SourceFiles/data/data_premium_subscription_option.h
@@ -16,6 +16,7 @@ struct PremiumSubscriptionOption {
 	QString costPerMonth;
 	QString costNoDiscount;
 	QString costTotal;
+	QString currency;
 	QString total;
 	QString botUrl;
 };
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
index 925005e0c4..a923f44db1 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.cpp
@@ -41,7 +41,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
-#include "styles/style_credits.h" // giftBoxByStarsStyle
 
 namespace Data {
 namespace {
@@ -101,10 +100,6 @@ private:
 		: FrameSizeFromTag(tag);
 }
 
-[[nodiscard]] QString InternalPrefix() {
-	return u"internal:"_q;
-}
-
 [[nodiscard]] QString UserpicEmojiPrefix() {
 	return u"userpic:"_q;
 }
@@ -570,8 +565,6 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 		const auto original = data.mid(ForceStaticPrefix().size());
 		return std::make_unique<Ui::Text::FirstFrameEmoji>(
 			create(original, std::move(update), tag, sizeOverride));
-	} else if (data.startsWith(InternalPrefix())) {
-		return internal(data);
 	} else if (data.startsWith(UserpicEmojiPrefix())) {
 		const auto ratio = style::DevicePixelRatio();
 		const auto size = EmojiSizeFromTag(tag) / ratio;
@@ -619,26 +612,6 @@ std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::create(
 	});
 }
 
-std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::internal(
-		QStringView data) {
-	const auto v = data.mid(InternalPrefix().size()).split(',');
-	if (v.size() != 5 && v.size() != 1) {
-		return nullptr;
-	}
-	const auto index = v[0].toInt();
-	Assert(index >= 0 && index < _internalEmoji.size());
-
-	auto &info = _internalEmoji[index];
-	const auto padding = (v.size() == 5)
-		? QMargins(v[1].toInt(), v[2].toInt(), v[3].toInt(), v[4].toInt())
-		: QMargins();
-	return std::make_unique<Ui::CustomEmoji::Internal>(
-		data.toString(),
-		info.image,
-		padding,
-		info.textColor);
-}
-
 std::unique_ptr<Ui::Text::CustomEmoji> CustomEmojiManager::userpic(
 		QStringView data,
 		Fn<void()> update,
@@ -1021,65 +994,6 @@ uint64 CustomEmojiManager::coloredSetId() const {
 	return _coloredSetId;
 }
 
-TextWithEntities CustomEmojiManager::creditsEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
-		u"builtin:credits_emoji"_q,
-		Ui::GenerateStars(st::normalFont->height, 1),
-		padding,
-		false));
-}
-
-TextWithEntities CustomEmojiManager::ministarEmoji(QMargins padding) {
-	return Ui::Text::SingleCustomEmoji(registerInternalEmoji(
-		u"builtin:ministar_emoji"_q,
-		Ui::GenerateStars(st::giftBoxByStarsStyle.font->height, 1),
-		padding,
-		false));
-}
-
-QString CustomEmojiManager::registerInternalEmoji(
-		const QString &key,
-		QImage emoji,
-		QMargins padding,
-		bool textColor) {
-	auto i = _imageEmoji.find(key);
-	if (i == end(_imageEmoji)) {
-		i = _imageEmoji.emplace(
-			key,
-			registerImageEmoji(std::move(emoji), textColor)).first;
-	}
-	return i->second + InternalPadding(padding);
-}
-
-QString CustomEmojiManager::registerImageEmoji(
-		QImage emoji,
-		bool textColor) {
-	_internalEmoji.push_back({ std::move(emoji), textColor });
-	return InternalPrefix() + QString::number(_internalEmoji.size() - 1);
-}
-
-QString CustomEmojiManager::registerInternalEmoji(
-		const style::icon &icon,
-		QMargins padding,
-		bool textColor) {
-	const auto i = _iconEmoji.find(&icon);
-	if (i != end(_iconEmoji)) {
-		return i->second + InternalPadding(padding);
-	}
-	auto image = QImage(
-		icon.size() * style::DevicePixelRatio(),
-		QImage::Format_ARGB32_Premultiplied);
-	image.fill(Qt::transparent);
-	image.setDevicePixelRatio(style::DevicePixelRatio());
-	auto p = QPainter(&image);
-	icon.paint(p, 0, 0, icon.width());
-	p.end();
-
-	const auto result = registerImageEmoji(std::move(image), textColor);
-	_iconEmoji.emplace(&icon, result);
-	return result + InternalPadding(padding);
-}
-
 [[nodiscard]] QString CustomEmojiManager::peerUserpicEmojiData(
 		not_null<PeerData*> peer,
 		QMargins padding,
diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index a279a5999c..003861142c 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -83,16 +83,6 @@ public:
 	[[nodiscard]] Main::Session &session() const;
 	[[nodiscard]] Session &owner() const;
 
-	[[nodiscard]] QString registerInternalEmoji(
-		const QString &key,
-		QImage emoji,
-		QMargins padding = {},
-		bool textColor = true);
-	[[nodiscard]] QString registerInternalEmoji(
-		const style::icon &icon,
-		QMargins padding = {},
-		bool textColor = true);
-
 	[[nodiscard]] QString peerUserpicEmojiData(
 		not_null<PeerData*> peer,
 		QMargins padding = {},
@@ -101,7 +91,6 @@ public:
 	[[nodiscard]] uint64 coloredSetId() const;
 
 	[[nodiscard]] TextWithEntities creditsEmoji(QMargins padding = {});
-	[[nodiscard]] TextWithEntities ministarEmoji(QMargins padding = {});
 
 private:
 	static constexpr auto kSizeCount = int(SizeTag::kCount);
@@ -128,7 +117,6 @@ private:
 		DocumentId documentId,
 		SizeTag tag,
 		int sizeOverride = 0);
-	[[nodiscard]] QString registerImageEmoji(QImage emoji, bool textColor);
 
 	void request();
 	void requestFinished();
@@ -154,8 +142,6 @@ private:
 		SizeTag tag,
 		int sizeOverride,
 		LoaderFactory factory);
-	[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> internal(
-		QStringView data);
 	[[nodiscard]] std::unique_ptr<Ui::Text::CustomEmoji> userpic(
 		QStringView data,
 		Fn<void()> update,
@@ -192,11 +178,6 @@ private:
 	bool _repaintTimerScheduled = false;
 	bool _requestSetsScheduled = false;
 
-	std::vector<InternalEmojiData> _internalEmoji;
-	base::flat_map<not_null<const style::icon*>, QString> _iconEmoji;
-
-	base::flat_map<QString, QString> _imageEmoji;
-
 #if 0 // inject-to-on_main
 	crl::time _repaintsLastAdded = 0;
 	rpl::lifetime _repaintsLifetime;
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index cc598423cc..bef7689685 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -556,7 +556,10 @@ dialogsMiniForward: DialogsMiniIcon {
 	skipMedia: 2px;
 }
 
-dialogsMiniReplyIcon: icon {{ "mini_forward-flip_horizontal", attentionButtonFg, point(0px, 2px) }};
+dialogsMiniReplyIcon: IconEmoji {
+	icon: icon {{ "mini_forward-flip_horizontal", attentionButtonFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
 
 dialogsMiniReplyStory: DialogsMiniIcon {
 	icon: ThreeStateIcon {
@@ -799,8 +802,10 @@ dialogsSearchTagSkip: point(8px, 4px);
 dialogsSearchTagBottom: 10px;
 dialogsSearchTagLocked: icon{{ "dialogs/mini_tag_lock", lightButtonFgOver }};
 dialogsSearchTagPromo: defaultTextStyle;
-dialogsSearchTagArrow: icon{{ "dialogs/mini_arrow", windowSubTextFg }};
-dialogsSearchTagArrowPadding: margins(-6px, 3px, 0px, 0px);
+dialogsSearchTagArrow: IconEmoji {
+	icon: icon{{ "dialogs/mini_arrow", windowSubTextFg }};
+	padding: margins(-6px, 3px, 0px, 0px);
+}
 dialogsSearchTagPromoLeft: 6px;
 dialogsSearchTagPromoRight: 1px;
 dialogsSearchTagPromoSkip: 6px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
index 6b105f0943..61272816a0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_tags.cpp
@@ -52,24 +52,14 @@ namespace {
 	});
 }
 
-[[nodiscard]] Ui::Text::String FillAdditionalText(
-		not_null<Data::Session*> owner,
-		int width) {
-	auto emoji = Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			st::dialogsSearchTagArrow,
-			st::dialogsSearchTagArrowPadding));
+[[nodiscard]] Ui::Text::String FillAdditionalText(int width) {
+	auto emoji = Ui::Text::IconEmoji(&st::dialogsSearchTagArrow);
 	auto result = Ui::Text::String();
-	const auto context = Core::TextContext({
-		.session = &owner->session(),
-		.customEmojiLoopLimit = 1,
-	});
 	const auto attempt = [&](const auto &phrase) {
 		result.setMarkedText(
 			st::dialogsSearchTagPromo,
 			phrase(tr::now, lt_arrow, emoji, Ui::Text::WithEntities),
-			kMarkupTextOptions,
-			context);
+			kMarkupTextOptions);
 		return result.maxWidth() < width;
 	};
 	if (attempt(tr::lng_add_tag_phrase_long)
@@ -230,7 +220,7 @@ void SearchTags::layout() {
 	if (_tags.size() == 1 && _tags.front().promo) {
 		_additionalLeft = x - skip.x() + st::dialogsSearchTagPromoSkip;
 		const auto additionalWidth = _width - _additionalLeft;
-		_additionalText = FillAdditionalText(_owner, additionalWidth);
+		_additionalText = FillAdditionalText(additionalWidth);
 	} else {
 		_additionalText = {};
 	}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index 81b5a20269..955e8d7801 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -594,13 +594,9 @@ void PaintRow(
 						}),
 						Text::WithEntities);
 				if (draft && draft->reply) {
-					auto &data = thread->owner().customEmojiManager();
 					draftText = Ui::Text::Colorized(
-						Ui::Text::SingleCustomEmoji(
-							data.registerInternalEmoji(
-								st::dialogsMiniReplyIcon,
-								{},
-								true))).append(std::move(draftText));
+						Ui::Text::IconEmoji(&st::dialogsMiniReplyIcon)
+					).append(std::move(draftText));
 				}
 				const auto context = Core::TextContext({
 					.session = &thread->session(),
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 71b8171d1d..cbc30b9646 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -47,6 +47,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/swipe_handler.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/toast/toast.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/buttons.h"
@@ -154,34 +156,6 @@ struct EntryMenuDescriptor {
 	};
 }
 
-[[nodiscard]] QImage MakeNewBadgeImage() {
-	auto text = Ui::Text::String(
-		st::settingsPremiumNewBadge.style,
-		tr::lng_premium_summary_new_badge(tr::now));
-	const auto size = QSize(text.maxWidth(), text.minHeight());
-	const auto padding = st::settingsPremiumNewBadgePadding;
-	const auto full = size.grownBy(padding);
-	const auto ratio = style::DevicePixelRatio();
-
-	auto result = QImage(full * ratio, QImage::Format_ARGB32_Premultiplied);
-	result.setDevicePixelRatio(ratio);
-	result.fill(Qt::transparent);
-
-	auto p = QPainter(&result);
-	auto hq = PainterHighQualityEnabler(p);
-	p.setPen(Qt::NoPen);
-	p.setBrush(st::windowBgActive);
-
-	const auto r = padding.left();
-	p.drawRoundedRect(0, 0, full.width(), full.height(), r, r);
-
-	p.setPen(st::windowFgActive);
-	text.draw(p, { .position = { padding.left(), padding.top() } });
-
-	p.end();
-	return result;
-}
-
 void FillEntryMenu(
 		const Ui::Menu::MenuCallback &add,
 		EntryMenuDescriptor &&descriptor) {
@@ -1453,25 +1427,20 @@ void Suggestions::setupTabs() {
 		},
 	};
 
-	const auto manager = &_controller->session().data().customEmojiManager();
-	const auto badgeData = manager->registerInternalEmoji(
-		u"posts_search_new_badge"_q,
-		MakeNewBadgeImage(),
-		st::badgeEmojiMargin,
-		false);
+	auto helper = Ui::Text::CustomEmojiHelper();
 	auto sections = std::vector<TextWithEntities>();
 	for (const auto key : _tabKeys) {
 		const auto i = labels.find(key);
 		Assert(i != end(labels));
 		auto text = TextWithEntities{ i->second };
 		if (key.tab == Tab::Posts) {
-			text.append(' ').append(Ui::Text::SingleCustomEmoji(badgeData));
+			text.append(' ').append(helper.paletteDependent(
+				Ui::Text::CustomEmojiTextBadge(
+					tr::lng_premium_summary_new_badge(tr::now))));
 		}
 		sections.push_back(std::move(text));
 	}
-	_tabs->setSections(sections, Core::TextContext({
-		.session = &_controller->session(),
-	}));
+	_tabs->setSections(sections, helper.context());
 	_tabs->sectionActivated(
 	) | rpl::start_with_next([=](int section) {
 		Assert(section >= 0 && section < _tabKeys.size());
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 5f5424254b..237f75e18f 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -143,11 +143,10 @@ template <typename T>
 }
 
 [[nodiscard]] TextWithEntities AmountAndStarCurrency(
-		not_null<Main::Session*> session,
 		int64 amount,
 		const QString &currency) {
 	if (currency == Ui::kCreditsCurrency) {
-		return Ui::CreditsEmojiSmall(session).append(
+		return Ui::CreditsEmojiSmall().append(
 			Lang::FormatCountDecimal(std::abs(amount)));
 	}
 	return { Ui::FillAmountAndCurrency(amount, currency) };
@@ -4602,10 +4601,7 @@ void HistoryItem::createServiceFromMtp(const MTPDmessageService &message) {
 		payment->recurringInit = data.is_recurring_init();
 		payment->recurringUsed = data.is_recurring_used();
 		payment->isCreditsCurrency = (currency == Ui::kCreditsCurrency);
-		payment->amount = AmountAndStarCurrency(
-			&_history->session(),
-			amount,
-			currency);
+		payment->amount = AmountAndStarCurrency(amount, currency);
 		payment->invoiceLink = std::make_shared<LambdaClickHandler>([=](
 				ClickContext context) {
 			using namespace Payments;
@@ -5037,10 +5033,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			: tr::lng_action_payment_bot_done)(
 				tr::now,
 				lt_amount,
-				AmountAndStarCurrency(
-					&_history->session(),
-					data.vtotal_amount().v,
-					qs(data.vcurrency())),
+				AmountAndStarCurrency(data.vtotal_amount().v, qs(data.vcurrency())),
 				Ui::Text::WithEntities);
 		return result;
 	};
@@ -5418,7 +5411,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		session->giftBoxStickersPacks().load();
 		const auto amount = action.vamount().v;
 		const auto currency = qs(action.vcurrency());
-		const auto cost = AmountAndStarCurrency(session, amount, currency);
+		const auto cost = AmountAndStarCurrency(amount, currency);
 		const auto anonymous = _from->isServiceUser();
 		if (anonymous) {
 			result.text = tr::lng_action_gift_received_anonymous(
@@ -5645,7 +5638,6 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			const auto isSelf = (_from->id == _from->session().userPeerId());
 			const auto peer = isSelf ? _history->peer : _from;
 			const auto cost = AmountAndStarCurrency(
-				&_history->session(),
 				action.vamount().value_or_empty(),
 				qs(action.vcurrency().value_or_empty()));
 			result.links.push_back(peer->createOpenLink());
@@ -5755,7 +5747,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			lt_peer,
 			Ui::Text::Link(refund->peer->name(), 1), // Link 1.
 			lt_amount,
-			AmountAndStarCurrency(&_history->session(), amount, currency),
+			AmountAndStarCurrency(amount, currency),
 			Ui::Text::WithEntities);
 		return result;
 	};
@@ -5768,10 +5760,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		_history->session().giftBoxStickersPacks().load();
 		const auto amount = action.vamount().v;
 		const auto currency = qs(action.vcurrency());
-		const auto cost = AmountAndStarCurrency(
-			&_history->session(),
-			amount,
-			currency);
+		const auto cost = AmountAndStarCurrency(amount, currency);
 		const auto anonymous = _from->isServiceUser();
 		if (anonymous) {
 			result.text = tr::lng_action_gift_received_anonymous(
@@ -5805,10 +5794,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 		_history->session().giftBoxStickersPacks().tonLoad();
 		const auto amount = action.vamount().v;
 		const auto currency = qs(action.vcurrency());
-		const auto cost = AmountAndStarCurrency(
-			&_history->session(),
-			amount,
-			currency);
+		const auto cost = AmountAndStarCurrency(amount, currency);
 		const auto anonymous = _from->isServiceUser();
 		if (anonymous) {
 			result.text = tr::lng_action_gift_received_anonymous(
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index 82c091e56f..b608c16da1 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -55,6 +55,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "support/support_helper.h"
 #include "styles/style_boxes.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
 #include "styles/style_dialogs.h" // dialogsMiniReplyStory.
 #include "styles/style_settings.h"
 #include "styles/style_widgets.h"
@@ -747,11 +748,6 @@ ReplyKeyboard::ReplyKeyboard(
 		const auto context = _item->fullId();
 		const auto rowCount = int(markup->data.rows.size());
 		_rows.reserve(rowCount);
-		const auto buttonEmoji = Ui::Text::SingleCustomEmoji(
-			owner->customEmojiManager().registerInternalEmoji(
-				st::settingsPremiumIconStar,
-				QMargins(0, -st::moderateBoxExpandInnerSkip, 0, 0),
-				true));
 		for (auto i = 0; i != rowCount; ++i) {
 			const auto &row = markup->data.rows[i];
 			const auto rowSize = int(row.size());
@@ -786,7 +782,8 @@ ReplyKeyboard::ReplyKeyboard(
 					auto firstPart = true;
 					for (const auto &part : text.split(QChar(0x2B50))) {
 						if (!firstPart) {
-							result.append(buttonEmoji);
+							result.append(Ui::Text::IconEmoji(
+								&st::starIconEmojiLarge));
 						}
 						result.append(part);
 						firstPart = false;
@@ -805,11 +802,7 @@ ReplyKeyboard::ReplyKeyboard(
 					button.text.setMarkedText(
 						_st->textStyle(),
 						TextUtilities::SingleLine(textWithEntities),
-						kMarkupTextOptions,
-						Core::TextContext({
-							.session = &item->history()->owner().session(),
-							.repaint = [=] { _st->repaint(item); },
-						}));
+						kMarkupTextOptions);
 				} else {
 					button.text.setText(
 						_st->textStyle(),
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index 174e10aa6a..95ad31b06e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -152,16 +152,17 @@ StarsTonPriceInput AddStarsTonPriceInput(
 
 	const auto session = args.session;
 	const auto added = st::boxRowPadding - st::defaultSubsectionTitlePadding;
-	const auto manager = &session->data().customEmojiManager();
+	auto helper = Ui::Text::CustomEmojiHelper();
 	const auto makeIcon = [&](
 			not_null<QWidget*> parent,
-			TextWithEntities text) {
+			Ui::Text::PaletteDependentEmoji emoji) {
+		auto text = helper.paletteDependent(std::move(emoji));
 		return Ui::CreateChild<Ui::FlatLabel>(
 			parent,
-			rpl::single(text),
+			rpl::single(std::move(text)),
 			st::defaultFlatLabel,
 			st::defaultPopupMenu,
-			Core::TextContext({ .session = session }));
+			helper.context());
 	};
 
 	const auto starsWrap = container->add(
@@ -193,7 +194,9 @@ StarsTonPriceInput AddStarsTonPriceInput(
 			: QString()),
 		args.starsMax);
 	const auto starsField = ownedStarsField.data();
-	const auto starsIcon = makeIcon(starsField, manager->creditsEmoji());
+	const auto starsIcon = makeIcon(
+		starsField,
+		Ui::Earn::IconCreditsEmoji());
 
 	starsFieldWrap->widthValue() | rpl::start_with_next([=](int width) {
 		starsIcon->move(st::starsFieldIconPosition);
@@ -241,14 +244,7 @@ StarsTonPriceInput AddStarsTonPriceInput(
 				? (args.price.whole() * Ui::kNanosInOne + args.price.nano())
 				: 0)));
 	const auto tonField = ownedTonField.data();
-	const auto tonIcon = makeIcon(tonField, Ui::Text::SingleCustomEmoji(
-		manager->registerInternalEmoji(
-			u"ton_price_field_emoji"_q,
-			Ui::Earn::IconCurrencyColored(
-				st::tonFieldIconSize,
-				st::currencyFg->c),
-			st::channelEarnCurrencyCommonMargins,
-			false)));
+	const auto tonIcon = makeIcon(tonField, Ui::Earn::IconCurrencyEmoji());
 
 	tonFieldWrap->widthValue() | rpl::start_with_next([=](int width) {
 		tonIcon->move(st::tonFieldIconPosition);
@@ -652,15 +648,11 @@ void ChooseSuggestPriceBox(
 		priceInput.submits
 	) | rpl::start_with_next(state->save, box->lifetime());
 
+	auto helper = Ui::Text::CustomEmojiHelper();
 	const auto button = box->addButton(rpl::single(QString()), state->save);
-	const auto coloredTonIcon = Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			u"ton_price_suggest_save"_q,
-			Ui::Earn::IconCurrencyColored(
-				st::tonFieldIconSize,
-				st::currencyFg->c),
-			st::suggestPriceTonIconMargins));
-	button->setContext(Core::TextContext({ .session = &peer->session() }));
+	const auto coloredTonIcon = helper.paletteDependent(
+		Ui::Earn::IconCurrencyEmoji());
+	button->setContext(helper.context());
 	button->setText(state->price.value(
 	) | rpl::map([=](CreditsAmount price) {
 		if (args.mode == SuggestMode::Change) {
@@ -901,20 +893,15 @@ void SuggestOptions::updateTexts() {
 }
 
 TextWithEntities SuggestOptions::composeText() const {
-	const auto manager = &_peer->owner().customEmojiManager();
-	const auto top = st::giftBoxByStarsStarTop;
+	auto helper = Ui::Text::CustomEmojiHelper();
 	const auto amount = _values.price().ton()
-		? Ui::Text::SingleCustomEmoji(
-			manager->registerInternalEmoji(
-				u"ton_price_preview_emoji"_q,
-				Ui::Earn::IconCurrencyColored(
-					st::suggestBarTonIconSize,
-					st::currencyFg->c),
-				st::suggestBarTonIconMargins,
-				false)).append(
-					Lang::FormatCreditsAmountDecimal(_values.price()))
-		: manager->ministarEmoji({ 0, top, 0, 0 }).append(
-			Lang::FormatCreditsAmountDecimal(_values.price()));
+		? helper.paletteDependent(Ui::Earn::IconCurrencyEmoji({
+			.size = st::suggestBarTonIconSize,
+			.margin = st::suggestBarTonIconMargins,
+		})).append(Lang::FormatCreditsAmountDecimal(_values.price()))
+		: helper.paletteDependent(
+			Ui::Earn::IconCreditsEmojiSmall()
+		).append(Lang::FormatCreditsAmountDecimal(_values.price()));
 	const auto date = langDateTime(base::unixtime::parse(_values.date));
 	if (!_values.price() && !_values.date) {
 		return tr::lng_suggest_bar_text(tr::now, Ui::Text::WithEntities);
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 8d478b1ecd..c32f444ddd 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -576,30 +576,19 @@ void Message::refreshRightBadge() {
 		_rightBadgeHasBoosts = 1;
 
 		const auto many = (boosts > 1);
-		const auto &icon = many
-			? st::boostsMessageIcon
-			: st::boostMessageIcon;
-		const auto padding = many
-			? st::boostsMessageIconPadding
-			: st::boostMessageIconPadding;
-		const auto owner = &item->history()->owner();
-		auto added = Ui::Text::SingleCustomEmoji(
-			owner->customEmojiManager().registerInternalEmoji(icon, padding)
+		auto added = Ui::Text::IconEmoji(many
+			? &st::boostsMessageIcon
+			: &st::boostMessageIcon
 		).append(many ? QString::number(boosts) : QString());
 		badge.append(' ').append(Ui::Text::Colorized(added, 1));
 	}
 	if (badge.empty()) {
 		_rightBadge.clear();
 	} else {
-		const auto context = Core::TextContext({
-			.session = &item->history()->session(),
-			.customEmojiLoopLimit = 1,
-		});
 		_rightBadge.setMarkedText(
 			st::defaultTextStyle,
 			badge,
-			Ui::NameTextOptions(),
-			context);
+			Ui::NameTextOptions());
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_reply.cpp b/Telegram/SourceFiles/history/view/history_view_reply.cpp
index 9635477b5c..fc18f3dcdf 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_reply.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/chat_style.h"
 #include "ui/effects/ripple_animation.h"
 #include "ui/effects/spoiler_mess.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
@@ -103,23 +104,6 @@ constexpr auto kNonExpandedLinesLimit = 5;
 	return style::colorizeImage(result, white);
 }
 
-[[nodiscard]] TextWithEntities TaskDoneIcon(
-		not_null<Main::Session*> session) {
-	return Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			u"task_done_reply_preview"_q,
-			MakeTaskDoneImage(),
-			QMargins(0, st::lineWidth, st::lineWidth, 0)));
-}
-
-[[nodiscard]] TextWithEntities TaskIcon(not_null<Main::Session*> session) {
-	return Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			u"task_not_done_reply_preview"_q,
-			MakeTaskImage(),
-			QMargins(0, st::lineWidth, st::lineWidth, 0)));
-}
-
 } // namespace
 
 void ValidateBackgroundEmoji(
@@ -322,13 +306,23 @@ void Reply::update(
 		&& !fields.quote.empty();
 	_hasQuoteIcon = hasQuoteIcon ? 1 : 0;
 
-	const auto session = &view->history()->session();
+	const auto repaint = [=] { item->customEmojiRepaint(); };
+	auto helper = Ui::Text::CustomEmojiHelper(Core::TextContext({
+		.session = &view->history()->session(),
+		.repaint = repaint,
+	}));
 	const auto text = (!_displaying && data->unavailable())
 		? TextWithEntities()
 		: task
 		? Ui::Text::Colorized(task->completionDate
-			? TaskDoneIcon(session)
-			: TaskIcon(session)).append(task->text)
+			? helper.image({
+				.image = MakeTaskDoneImage(),
+				.margin = QMargins(0, st::lineWidth, st::lineWidth, 0),
+			})
+			: helper.image({
+				.image = MakeTaskImage(),
+				.margin = QMargins(0, st::lineWidth, st::lineWidth, 0),
+			})).append(task->text)
 		: (message && (fields.quote.empty() || !fields.manualQuote))
 		? message->inReplyText()
 		: !fields.quote.empty()
@@ -345,16 +339,11 @@ void Reply::update(
 			.ignoreTopic = true,
 		}).text
 		: TextWithEntities();
-	const auto repaint = [=] { item->customEmojiRepaint(); };
-	const auto context = Core::TextContext({
-		.session = &view->history()->session(),
-		.repaint = repaint,
-	});
 	_text.setMarkedText(
 		st::defaultTextStyle,
 		text,
 		_multiline ? Ui::ItemTextDefaultOptions() : Ui::DialogTextOptions(),
-		context);
+		helper.context());
 
 	updateName(view, data);
 
@@ -550,15 +539,16 @@ void Reply::updateName(
 		: 0;
 	auto nameFull = TextWithEntities();
 	if (displayAsExternal && !groupNameAdded && !fields.storyId) {
-		nameFull.append(PeerEmoji(history, sender));
+		nameFull.append(PeerEmoji(sender));
 	}
 	nameFull.append(name);
 	if (groupNameAdded) {
-		nameFull.append(' ').append(PeerEmoji(history, externalPeer));
+		nameFull.append(' ').append(PeerEmoji(externalPeer));
 		nameFull.append(externalPeer->name());
 	} else if (originalNameAdded) {
-		nameFull.append(' ').append(ForwardEmoji(&history->owner()));
-		nameFull.append(forwarded->originalSender
+		nameFull.append(' ').append(
+			st::historyReplyForward
+		).append(forwarded->originalSender
 			? forwarded->originalSender->name()
 			: forwarded->originalHiddenSenderInfo->name);
 	}
@@ -936,34 +926,16 @@ void Reply::stopLastRipple() {
 	}
 }
 
-TextWithEntities Reply::PeerEmoji(
-		not_null<History*> history,
-		PeerData *peer) {
-	return PeerEmoji(&history->owner(), peer);
-}
-
-TextWithEntities Reply::PeerEmoji(
-		not_null<Data::Session*> owner,
-		PeerData *peer) {
+TextWithEntities Reply::PeerEmoji(PeerData *peer) {
 	using namespace std;
 	const auto icon = !peer
-		? pair(&st::historyReplyUser, st::historyReplyUserPadding)
+		? &st::historyReplyUser
 		: peer->isBroadcast()
-		? pair(&st::historyReplyChannel, st::historyReplyChannelPadding)
+		? &st::historyReplyChannel
 		: (peer->isChannel() || peer->isChat())
-		? pair(&st::historyReplyGroup, st::historyReplyGroupPadding)
-		: pair(&st::historyReplyUser, st::historyReplyUserPadding);
-	return Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			*icon.first,
-			icon.second));
-}
-
-TextWithEntities Reply::ForwardEmoji(not_null<Data::Session*> owner) {
-	return Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			st::historyReplyForward,
-			st::historyReplyForwardPadding));
+		? &st::historyReplyGroup
+		: &st::historyReplyUser;
+	return Ui::Text::IconEmoji(icon);
 }
 
 TextWithEntities Reply::ComposePreviewName(
@@ -996,11 +968,11 @@ TextWithEntities Reply::ComposePreviewName(
 	auto nameFull = TextWithEntities();
 	using namespace HistoryView;
 	if (displayAsExternal && !groupNameAdded) {
-		nameFull.append(Reply::PeerEmoji(history, sender));
+		nameFull.append(Reply::PeerEmoji(sender));
 	}
 	nameFull.append(shorten ? sender->shortName() : sender->name());
 	if (groupNameAdded) {
-		nameFull.append(' ').append(Reply::PeerEmoji(history, toPeer));
+		nameFull.append(' ').append(Reply::PeerEmoji(toPeer));
 		nameFull.append(toPeer->name());
 	}
 	return (quote
diff --git a/Telegram/SourceFiles/history/view/history_view_reply.h b/Telegram/SourceFiles/history/view/history_view_reply.h
index 3e1a55addc..6b78cbca99 100644
--- a/Telegram/SourceFiles/history/view/history_view_reply.h
+++ b/Telegram/SourceFiles/history/view/history_view_reply.h
@@ -99,14 +99,7 @@ public:
 		return _link;
 	}
 
-	[[nodiscard]] static TextWithEntities PeerEmoji(
-		not_null<History*> history,
-		PeerData *peer);
-	[[nodiscard]] static TextWithEntities PeerEmoji(
-		not_null<Data::Session*> owner,
-		PeerData *peer);
-	[[nodiscard]] static TextWithEntities ForwardEmoji(
-		not_null<Data::Session*> owner);
+	[[nodiscard]] static TextWithEntities PeerEmoji(PeerData *peer);
 	[[nodiscard]] static TextWithEntities ComposePreviewName(
 		not_null<History*> history,
 		not_null<HistoryItem*> to,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media.cpp b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
index 8741c51f69..ae837b3dc1 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media.cpp
@@ -241,14 +241,12 @@ void Media::drawPurchasedTag(
 		if (!amount) {
 			return;
 		}
-		const auto session = &item->history()->session();
-		auto text = Ui::Text::Colorized(Ui::CreditsEmojiSmall(session));
+		auto text = Ui::Text::Colorized(Ui::CreditsEmojiSmall());
 		text.append(Lang::FormatCountDecimal(amount));
 		purchased->text.setMarkedText(
 			st::defaultTextStyle,
 			text,
-			kMarkupTextOptions,
-			Core::TextContext({ .session = session }));
+			kMarkupTextOptions);
 	}
 
 	const auto st = context.st;
@@ -403,8 +401,7 @@ void Media::drawSpoilerTag(
 				tr::lng_sensitive_tag(tr::now));
 			iconSkip = st::mediaMenuIconStealth.width() * 1.4;
 		} else {
-			const auto session = &history()->session();
-			auto price = Ui::Text::Colorized(Ui::CreditsEmoji(session));
+			auto price = Ui::Text::Colorized(Ui::CreditsEmoji());
 			price.append(Lang::FormatCountDecimal(tag->price));
 			text.setMarkedText(
 				st::semiboldTextStyle,
@@ -413,8 +410,7 @@ void Media::drawSpoilerTag(
 					lt_price,
 					price,
 					Ui::Text::WithEntities),
-				kMarkupTextOptions,
-				Core::TextContext({ .session = session }));
+				kMarkupTextOptions);
 		}
 		const auto width = iconSkip + text.maxWidth();
 		const auto inner = QRect(0, 0, width, text.minHeight());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
index aa21c16a3b..f25d133ca8 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_web_page.cpp
@@ -238,12 +238,7 @@ constexpr auto kSponsoredUserpicLines = 2;
 		? tr::lng_view_button_collection(tr::now)
 		: QString());
 	if (page->iv) {
-		const auto manager = &page->owner().customEmojiManager();
-		const auto &icon = st::historyIvIcon;
-		const auto padding = st::historyIvIconPadding;
-		return Ui::Text::SingleCustomEmoji(
-			manager->registerInternalEmoji(icon, padding)
-		).append(text);
+		return Ui::Text::IconEmoji(&st::historyIvIcon).append(text);
 	}
 	return { text };
 }
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
index 5e3b7d5ece..9ff2989746 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -601,8 +601,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
 		if (const auto average = program.revenuePerUser) {
 			const auto layout = box->verticalLayout();
-			const auto session = &initialRecipient->session();
-			auto text = Ui::Text::Colorized(Ui::CreditsEmoji(session));
+			auto text = Ui::Text::Colorized(Ui::CreditsEmoji());
 			text.append(Lang::FormatCreditsAmountRounded(average));
 			layout->add(
 				object_ptr<Ui::FlatLabel>(
@@ -613,8 +612,7 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 							Ui::Text::Wrapped(text, EntityType::Bold)),
 						Ui::Text::WithEntities),
 					st::starrefRevenueText,
-					st::defaultPopupMenu,
-					Core::TextContext({ .session = session })),
+					st::defaultPopupMenu),
 				st::boxRowPadding);
 			Ui::AddSkip(layout, st::defaultVerticalListSkip);
 		}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
index 86fa3772d8..f85b36d29d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/channel_earn.style
@@ -148,4 +148,8 @@ botEarnLockedButtonLabel: FlatLabel(channelEarnOverviewMajorLabel) {
 		font: font(10px semibold);
 	}
 }
-botEarnButtonLockMargins: margins(-2px, 4px, 0px, 0px);
+botEarnButtonLock: IconEmoji {
+	icon: icon{{ "chat/mini_lock", premiumButtonFg }};
+	padding: margins(-2px, 4px, 0px, 0px);
+}
+
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
index fa5b2444da..3ffe9d7905 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -7,9 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/earn_icons.h"
 
+#include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
-#include "ui/text/text_custom_emoji.h"
+#include "ui/text/custom_emoji_instance.h"
 #include "ui/rect.h"
+#include "styles/style_credits.h"
 #include "styles/style_menu_icons.h"
 #include "styles/style_widgets.h"
 #include "styles/style_info.h" // infoIconReport.
@@ -144,9 +146,38 @@ QImage MenuIconCredits() {
 std::unique_ptr<Ui::Text::CustomEmoji> MakeCurrencyIconEmoji(
 		const style::font &font,
 		const QColor &c) {
-	return std::make_unique<Ui::Text::StaticCustomEmoji>(
-		IconCurrencyColored(font, c),
-		u"currency_icon:%1:%2"_q.arg(font->height).arg(c.name()));
+	return std::make_unique<Ui::CustomEmoji::Internal>(
+		u"currency_icon:%1:%2"_q.arg(font->height).arg(c.name()),
+		IconCurrencyColored(font, c));
+}
+
+Ui::Text::PaletteDependentEmoji IconCreditsEmoji(
+		IconDescriptor descriptor) {
+	return { .factory = [=] {
+		return Ui::GenerateStars(
+			descriptor.size ? descriptor.size : st::normalFont->height,
+			1);
+	}, .margin = descriptor.margin.value_or(QMargins()) };
+}
+
+Ui::Text::PaletteDependentEmoji IconCurrencyEmoji(
+		IconDescriptor descriptor) {
+	return { .factory = [=] {
+		return IconCurrencyColored(
+			descriptor.size ? descriptor.size : st::earnTonIconSize,
+			st::currencyFg->c);
+	}, .margin = descriptor.margin.value_or(st::earnTonIconMargin) };
+}
+
+Ui::Text::PaletteDependentEmoji IconCreditsEmojiSmall() {
+	return IconCreditsEmoji({
+		.size = st::giftBoxByStarsStyle.font->height,
+		.margin = QMargins{ 0, st::giftBoxByStarsStarTop, 0, 0 },
+	});
+}
+
+Ui::Text::PaletteDependentEmoji IconCurrencyEmojiSmall() {
+	return IconCreditsEmoji({});
 }
 
 } // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
index 0e5a419ec7..efbedd7ee2 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "ui/text/custom_emoji_helper.h"
+
 namespace Ui::Text {
 class CustomEmoji;
 } // namespace Ui::Text
@@ -26,4 +28,16 @@ std::unique_ptr<Ui::Text::CustomEmoji> MakeCurrencyIconEmoji(
 	const style::font &font,
 	const QColor &c);
 
+struct IconDescriptor {
+	int size = 0;
+	std::optional<QMargins> margin;
+};
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCreditsEmoji(
+	IconDescriptor descriptor = {});
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCurrencyEmoji(
+	IconDescriptor descriptor = {});
+
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCreditsEmojiSmall();
+[[nodiscard]] Ui::Text::PaletteDependentEmoji IconCurrencyEmojiSmall();
+
 } // namespace Ui::Earn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 7127310941..2757e22fd1 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -418,43 +418,30 @@ void InnerWidget::fill() {
 			std::optional<bool> isIn,
 			std::optional<QMargins> margins) {
 		const auto &st = label->st();
-		auto icon = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				(!isIn
-					? u"stats_row_ton_some"_q
-					: (*isIn)
-					? u"stats_row_ton_in"_q
-					: u"stats_row_ton_out"_q),
-				Ui::Earn::IconCurrencyColored(
-					st.style.font,
-					!isIn
-						? st::currencyFg->c
-						: (*isIn)
-						? st::boxTextFgGood->c
-						: st::menuIconAttentionColor->c),
-				margins ? *margins : st::channelEarnCurrencyCommonMargins,
-				false));
 		const auto prepended = !isIn
 			? TextWithEntities()
 			: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
 		std::move(
 			value
 		) | rpl::start_with_next([=](CreditsAmount v) {
+			auto helper = Ui::Text::CustomEmojiHelper();
+			auto icon = helper.paletteDependent({ .factory = [=] {
+				return Ui::Earn::IconCurrencyColored(
+					st.style.font,
+					!isIn
+					? st::currencyFg->c
+					: (*isIn)
+					? st::boxTextFgGood->c
+					: st::menuIconAttentionColor->c);
+				}, .margin = margins
+					? *margins
+					: st::channelEarnCurrencyCommonMargins });
 			label->setMarkedText(
 				base::duplicate(prepended).append(icon).append(MajorPart(v)),
-				Core::TextContext({ .session = session }));
+				helper.context());
 		}, label->lifetime());
 	};
 
-	const auto bigCurrencyIcon = Ui::Text::SingleCustomEmoji(
-		session->data().customEmojiManager().registerInternalEmoji(
-			u"stats_row_ton_big"_q,
-			Ui::Earn::IconCurrencyColored(
-				st::boxTitle.style.font,
-				st::currencyFg->c),
-			st::channelEarnCurrencyLearnMargins,
-			false));
-
 	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
 	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
 		auto label = Ui::CreateLabelWithCustomEmoji(
@@ -475,6 +462,14 @@ void InnerWidget::fill() {
 			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
 				box->setNoContentMargin(true);
 
+				auto emojiHelper = Ui::Text::CustomEmojiHelper();
+				const auto bigCurrencyIcon = emojiHelper.paletteDependent({
+					.factory = [=] {
+						return Ui::Earn::IconCurrencyColored(
+							st::boxTitle.style.font,
+							st::currencyFg->c);
+					}, .margin = st::channelEarnCurrencyLearnMargins });
+
 				const auto content = box->verticalLayout().get();
 
 				Ui::AddSkip(content);
@@ -586,7 +581,7 @@ void InnerWidget::fill() {
 										Ui::Text::Link(bigCurrencyIcon, 1)),
 									Ui::Text::RichLangValue
 								),
-								Core::TextContext({ .session = session }),
+								emojiHelper.context(),
 								st::boxTitle)))->entity();
 					const auto diamonds = l->lifetime().make_state<int>(0);
 					l->setLink(1, std::make_shared<LambdaClickHandler>([=] {
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 4b940d1b43..8049b8cc5c 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -430,6 +430,10 @@ infoEditContactCover: InfoProfileCover(infoProfileCover) {
 }
 infoEditContactPersonalLeft: 6px;
 
+infoRatingDeductedBadge: RoundButton(customEmojiTextBadge) {
+	textBg: windowSubTextFg;
+}
+
 infoProfileInaccessibleUserpic: icon {{ "info/inaccessible_userpic", historyPeerUserpicFg }};
 
 infoVerifiedCheckPosition: point(4px, 2px);
@@ -1275,3 +1279,6 @@ collectionEditMenuToggle: IconButton(infoTopBarMenu) {
 	rippleAreaSize: 40px;
 	ripple: defaultRippleAnimationBgOver;
 }
+
+earnTonIconSize: 16px;
+earnTonIconMargin: margins(0px, 2px, 0px, 0px);
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index cde387252a..08dfe4aa74 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -742,6 +742,10 @@ Delegate::Delegate(not_null<Main::Session*> session, GiftButtonMode mode)
 	st::giftBoxHiddenMark,
 	RectPart::Center))
 , _mode(mode) {
+	_ministarEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmojiSmall());
+	_starEmoji = _emojiHelper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 }
 
 Delegate::Delegate(Delegate &&other) = default;
@@ -749,7 +753,7 @@ Delegate::Delegate(Delegate &&other) = default;
 Delegate::~Delegate() = default;
 
 TextWithEntities Delegate::star() {
-	return _session->data().customEmojiManager().creditsEmoji();
+	return _starEmoji;
 }
 
 TextWithEntities Delegate::monostar() {
@@ -761,13 +765,11 @@ TextWithEntities Delegate::monoton() {
 }
 
 TextWithEntities Delegate::ministar() {
-	const auto owner = &_session->data();
-	const auto top = st::giftBoxByStarsStarTop;
-	return owner->customEmojiManager().ministarEmoji({ 0, top, 0, 0 });
+	return _ministarEmoji;
 }
 
 Ui::Text::MarkedContext Delegate::textContext() {
-	return Core::TextContext({ .session = _session });
+	return _emojiHelper.context();
 }
 
 QSize Delegate::buttonSize() {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 8183cbaeeb..c227f351d1 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_star_gift.h"
 #include "ui/abstract_button.h"
 #include "ui/effects/premium_stars_colored.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text.h"
 
 class StickerPremiumMark;
@@ -237,6 +238,9 @@ private:
 	QSize _single;
 	QImage _bg;
 	GiftButtonMode _mode = GiftButtonMode::Full;
+	Ui::Text::CustomEmojiHelper	_emojiHelper;
+	TextWithEntities _ministarEmoji;
+	TextWithEntities _starEmoji;
 
 };
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 405dceb0f7..955b8185bd 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -855,6 +855,7 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 		not_null<Controller*> controller) {
 	struct State final {
 		rpl::variable<CreditsAmount> balance;
+		Ui::Text::CustomEmojiHelper helper;
 	};
 	const auto state = wrap->lifetime().make_state<State>();
 	const auto parentController = controller->parentController();
@@ -906,14 +907,11 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 	const auto &st = st::infoSharedMediaButton;
 	const auto button = wrapButton->entity();
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
-	const auto icon = Ui::Text::SingleCustomEmoji(
-		user->owner().customEmojiManager().registerInternalEmoji(
-			u"profile_ton_section_icon"_q,
-			Ui::Earn::IconCurrencyColored(
-				st.rightLabel.style.font,
-				st.rightLabel.textFg->c),
-			st::channelEarnCurrencyCommonMargins,
-			false));
+	const auto icon = state->helper.paletteDependent({ .factory = [=] {
+		return Ui::Earn::IconCurrencyColored(
+			st.rightLabel.style.font,
+			st.rightLabel.textFg->c);
+	}, .margin = st::channelEarnCurrencyCommonMargins });
 	name->show();
 	rpl::combine(
 		button->widthValue(),
@@ -932,10 +930,7 @@ rpl::producer<CreditsAmount> AddCurrencyAction(
 				.append(QChar(' '))
 				.append(Info::ChannelEarn::MajorPart(balance))
 				.append(Info::ChannelEarn::MinorPart(balance)),
-			Core::TextContext({
-				.session = &user->session(),
-				.repaint = [=] { name->update(); },
-			}));
+			state->helper.context());
 		name->resizeToNaturalWidth(available);
 		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
 	}, name->lifetime());
@@ -988,7 +983,10 @@ rpl::producer<CreditsAmount> AddCreditsAction(
 	const auto &st = st::infoSharedMediaButton;
 	const auto button = wrapButton->entity();
 	const auto name = Ui::CreateChild<Ui::FlatLabel>(button, st.rightLabel);
-	const auto icon = user->owner().customEmojiManager().creditsEmoji();
+
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto icon = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
+	const auto context = helper.context([=] { name->update(); });
 	name->show();
 	rpl::combine(
 		button->widthValue(),
@@ -1006,10 +1004,7 @@ rpl::producer<CreditsAmount> AddCreditsAction(
 			base::duplicate(icon)
 				.append(QChar(' '))
 				.append(Lang::FormatCreditsAmountDecimal(balance)),
-			Core::TextContext({
-				.session = &user->session(),
-				.repaint = [=] { name->update(); },
-			}));
+			context);
 		name->resizeToNaturalWidth(available);
 		name->moveToRight(st::settingsButtonRightSkip, st.padding.top());
 	}, name->lifetime());
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index a956b763ea..319f3be521 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -1215,13 +1215,13 @@ CreditsController::CreditsController(CreditsDescriptor d)
 		if (data.startsWith(u"ton"_q)) {
 			const auto in = data.split(u":"_q)[1].startsWith(u"in"_q);
 			return std::make_unique<Ui::Text::ShiftedEmoji>(
-				std::make_unique<Ui::Text::StaticCustomEmoji>(
+				std::make_unique<Ui::CustomEmoji::Internal>(
+					data.toString(),
 					Ui::Earn::IconCurrencyColored(
 						st::tonFieldIconSize,
 						in
 							? st::boxTextFgGood->c
-							: st::menuIconAttentionColor->c),
-					data.toString()),
+							: st::menuIconAttentionColor->c)),
 				QPoint(0, st::lineWidth));
 		}
 		const auto desc = DeserializeCreditsRowDescriptionData(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_header.cpp b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
index 316000a4fb..b2cf0c30fe 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_header.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_header.cpp
@@ -276,10 +276,7 @@ struct MadePrivacyBadge {
 		not_null<Data::Session*> owner,
 		PeerData *peer,
 		QString name) {
-	auto result = Ui::Text::SingleCustomEmoji(
-		owner->customEmojiManager().registerInternalEmoji(
-			st::storiesRepostIcon,
-			st::storiesRepostIconPadding));
+	auto result = Ui::Text::IconEmoji(&st::storiesRepostIcon);
 	if (peer) {
 		result.append(Ui::Text::SingleCustomEmoji(
 			owner->customEmojiManager().peerUserpicEmojiData(
diff --git a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
index 0b8065b460..423738da9c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_repost_view.cpp
@@ -240,7 +240,7 @@ void RepostView::recountDimensions() {
 	}
 
 	auto nameFull = TextWithEntities();
-	nameFull.append(HistoryView::Reply::PeerEmoji(owner, _sourcePeer));
+	nameFull.append(HistoryView::Reply::PeerEmoji(_sourcePeer));
 	nameFull.append(name);
 	auto context = Core::TextContext({
 		.session = &_story->session(),
diff --git a/Telegram/SourceFiles/media/view/media_view.style b/Telegram/SourceFiles/media/view/media_view.style
index cd0214f807..91b9d78c55 100644
--- a/Telegram/SourceFiles/media/view/media_view.style
+++ b/Telegram/SourceFiles/media/view/media_view.style
@@ -1074,8 +1074,10 @@ storiesRepostSimpleStyle: QuoteStyle(defaultQuoteStyle) {
 	outline: 0px;
 	radius: 10px;
 }
-storiesRepostIcon: icon {{ "mediaview/mini_repost", windowFg }};
-storiesRepostIconPadding: margins(0px, 4px, 2px, 0px);
+storiesRepostIcon: IconEmoji{
+	icon: icon {{ "mediaview/mini_repost", windowFg }};
+	padding: margins(0px, 4px, 2px, 0px);
+}
 storiesRepostUserpicPadding: margins(0px, 1px, 4px, 0px);
 
 mediaviewSponsoredButton: RoundButton(defaultActiveButton) {
diff --git a/Telegram/SourceFiles/payments/payments_reaction_process.cpp b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
index 3bea078d30..81f9aed290 100644
--- a/Telegram/SourceFiles/payments/payments_reaction_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_reaction_process.cpp
@@ -176,19 +176,13 @@ void ShowPaidReactionDetails(
 
 	auto submitText = [=](rpl::producer<int> amount) {
 		auto nice = std::move(amount) | rpl::map([=](int count) {
-			return Ui::CreditsEmojiSmall(session).append(
+			return Ui::CreditsEmojiSmall().append(
 				Lang::FormatCountDecimal(count));
 		});
 		return tr::lng_paid_react_send(
 			lt_price,
 			std::move(nice),
-			Ui::Text::RichLangValue
-		) | rpl::map([=](TextWithEntities &&text) {
-			return Ui::TextWithContext{
-				.text = std::move(text),
-				.context = Core::TextContext({ .session = session }),
-			};
-		});
+			Ui::Text::RichLangValue);
 	};
 	auto top = std::vector<Ui::PaidReactionTop>();
 	const auto add = [&](const Data::MessageReactionsTopPaid &entry) {
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index 9a0011234e..bc2b89a8aa 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -545,10 +545,8 @@ void PaidReactionsBox(
 			st::creditsBoxButtonLabel);
 		args.submit(
 			state->chosen.value()
-		) | rpl::start_with_next([=](const TextWithContext &text) {
-			buttonLabel->setMarkedText(
-				text.text,
-				text.context);
+		) | rpl::start_with_next([=](const TextWithEntities &text) {
+			buttonLabel->setMarkedText(text);
 		}, buttonLabel->lifetime());
 		buttonLabel->setTextColorOverride(
 			box->getDelegate()->style().button.textFg->c);
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.h b/Telegram/SourceFiles/payments/ui/payments_reaction_box.h
index bf52952ac3..fb6c2df863 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.h
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.h
@@ -23,11 +23,6 @@ class BoxContent;
 class GenericBox;
 class DynamicImage;
 
-struct TextWithContext {
-	TextWithEntities text;
-	Text::MarkedContext context;
-};
-
 struct PaidReactionTop {
 	QString name;
 	std::shared_ptr<DynamicImage> photo;
@@ -45,7 +40,7 @@ struct PaidReactionBoxArgs {
 
 	not_null<Main::Session*> session;
 	QString channel;
-	Fn<rpl::producer<TextWithContext>(rpl::producer<int> amount)> submit;
+	Fn<rpl::producer<TextWithEntities>(rpl::producer<int> amount)> submit;
 	rpl::producer<CreditsAmount> balanceValue;
 	Fn<void(int, uint64)> send;
 };
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 95a0ca7385..c952f13c7f 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -141,7 +141,6 @@ settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
 }
 settingsPremiumNewBadgePosition: point(4px, 1px);
 settingsPremiumNewBadgePadding: margins(4px, 1px, 4px, 1px);
-badgeEmojiMargin: margins(0px, 2px, 0px, 0px);
 
 settingsTTLChatsOff: icon {{ "settings/ttl/autodelete_off", windowSubTextFg }};
 settingsTTLChatsOn: icon {{ "settings/ttl/autodelete_on", windowActiveTextFg }};
@@ -598,8 +597,11 @@ settingsColorButton: SettingsButton(settingsButton) {
 settingsColorRadioMargin: 17px;
 settingsColorRadioSkip: 13px;
 settingsColorRadioStroke: 2px;
-settingsLevelBadgeLock: icon {{ "chat/mini_lock", premiumButtonFg }};
-settingsLevelBadgeLockSkip: 4px;
+settingsLevelBadgeLock: IconEmoji{
+	icon: icon {{ "chat/mini_lock", premiumButtonFg }};
+	padding: margins(0px, 4px, 0px, 0px);
+	useIconColor: true;
+}
 
 messagePrivacyTopSkip: 8px;
 messagePrivacyRadioSkip: 6px;
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index b893508a66..62b7c6f0a4 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -38,6 +38,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
 #include "ui/layers/generic_box.h"
+#include "ui/text/custom_emoji_instance.h"
 #include "ui/text/format_values.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
@@ -444,9 +445,9 @@ void Credits::setupContent() {
 					p.drawEllipse(r);
 					icon.paintInCenter(p, r, st::windowBgActive->c);
 				}
-				return std::make_unique<Ui::Text::StaticCustomEmoji>(
-					std::move(image),
-					u"topup_button"_q);
+				return std::make_unique<Ui::CustomEmoji::Internal>(
+					u"topup_button"_q,
+					std::move(image));
 			};
 			return { .customEmojiFactory = std::move(customEmojiFactory) };
 		}());
@@ -489,11 +490,11 @@ void Credits::setupContent() {
 		auto customEmojiFactory = [=](const auto &...) {
 			return std::make_unique<Ui::Text::ShiftedEmoji>(
 				isCurrency
-					? std::make_unique<Ui::Text::StaticCustomEmoji>(
+					? std::make_unique<Ui::CustomEmoji::Internal>(
+						u"currency_icon:%1"_q.arg(height),
 						Ui::Earn::IconCurrencyColored(
 							st::tonFieldIconSize,
-							st::currencyFg->c),
-						u"currency_icon:%1"_q.arg(height))
+							st::currencyFg->c))
 					: Ui::MakeCreditsIconEmoji(height, 1),
 				isCurrency
 					? QPoint(0, st::lineWidth * 2)
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 3f6f024ad3..a52b1d0313 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -77,6 +77,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
@@ -469,15 +470,15 @@ SubscriptionRightLabel PaintSubscriptionRightLabelCallback(
 		not_null<Main::Session*> session,
 		const style::PeerListItem &st,
 		int amount) {
+	auto helper = Ui::Text::CustomEmojiHelper();
+	auto starIcon = helper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
 	const auto text = std::make_shared<Ui::Text::String>();
 	text->setMarkedText(
 		st::semiboldTextStyle,
-		TextWithEntities()
-			.append(session->data().customEmojiManager().creditsEmoji())
-			.append(QChar::Space)
-			.append(Lang::FormatCountDecimal(amount)),
+		starIcon.append(' ').append(Lang::FormatCountDecimal(amount)),
 		kMarkupTextOptions,
-		Core::TextContext({ .session = session }));
+		helper.context());
 	const auto &font = text->style()->font;
 	const auto &statusFont = st::contactsStatusFont;
 	const auto status = tr::lng_group_invite_joined_right(tr::now);
@@ -721,20 +722,14 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 		balanceValue
 	) | rpl::start_with_next([=](CreditsAmount value) {
 		auto text = TextWithEntities();
-		const auto manager = &session->data().customEmojiManager();
+		auto helper = Ui::Text::CustomEmojiHelper();
 		if (value.ton()) {
-			text.append(Ui::Text::SingleCustomEmoji(
-				manager->registerInternalEmoji(
-					u"balance_amount_ton_icon"_q,
-					Ui::Earn::IconCurrencyColored(
-						st::tonFieldIconSize,
-						st::currencyFg->c),
-					st::channelEarnCurrencyLearnMargins,
-					false))
+			text.append(
+				helper.paletteDependent(Ui::Earn::IconCurrencyEmoji())
 			).append(' ').append(Lang::FormatCreditsAmountDecimal(value));
 		} else {
 			text.append(
-				manager->creditsEmoji()
+				helper.paletteDependent(Ui::Earn::IconCreditsEmoji())
 			).append(' ').append(
 				Lang::FormatCreditsAmountToShort(value).string);
 		}
@@ -742,10 +737,7 @@ not_null<Ui::RpWidget*> AddBalanceWidget(
 			st::semiboldTextStyle,
 			text,
 			kMarkupTextOptions,
-			Core::TextContext({
-				.session = session,
-				.repaint = [=] { balance->update(); },
-			}));
+			helper.context([=] { balance->update(); }));
 		balance->setBalance(value);
 		resize();
 	}, balance->lifetime());
@@ -780,7 +772,6 @@ void BoostCreditsBox(
 	box->setNoContentMargin(true);
 
 	const auto content = box->verticalLayout();
-	const auto session = &controller->session();
 	Ui::AddSkip(content);
 	{
 		const auto &stUser = st::premiumGiftsUserpicButton;
@@ -820,21 +811,16 @@ void BoostCreditsBox(
 				- st::boxRowPadding.right());
 		auto textWithEntities = TextWithEntities();
 		textWithEntities.append(
-			Ui::Text::SingleCustomEmoji(
-				session->data().customEmojiManager().registerInternalEmoji(
-					st::boostsListMiniIcon,
-					{ st.font->descent * 2, st.font->descent / 2, 0, 0 },
-					true)));
-		textWithEntities.append(
+			Ui::Text::IconEmoji(&st::boostsListEntryIcon)
+		).append(
 			tr::lng_boosts_list_title(tr::now, lt_count, b.multiplier));
 		text->setMarkedText(
 			st,
 			std::move(textWithEntities),
 			kMarkupTextOptions,
-			Core::TextContext({
-				.session = session,
+			Ui::Text::MarkedContext{
 				.repaint = [=] { badge->update(); },
-			}));
+			});
 		badge->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = QPainter(badge);
@@ -1485,10 +1471,9 @@ void GenericCreditsEntryBox(
 			object_ptr<Ui::FixedHeightWidget>(
 				content,
 				st::defaultTextStyle.font->height));
-		const auto context = Core::TextContext({
-			.session = session,
-			.repaint = [=] { amount->update(); },
-		});
+		auto helper = Ui::Text::CustomEmojiHelper();
+		const auto starEmoji = helper.paletteDependent(
+			Ui::Earn::IconCreditsEmoji());
 		if (e.soldOutInfo) {
 			text->setText(
 				st::defaultTextStyle,
@@ -1499,12 +1484,12 @@ void GenericCreditsEntryBox(
 				tr::lng_credits_subscription_subtitle(
 					tr::now,
 					lt_emoji,
-					owner->customEmojiManager().creditsEmoji(),
+					starEmoji,
 					lt_cost,
 					{ QString::number(s.subscription.credits) },
 					Ui::Text::WithEntities),
 				kMarkupTextOptions,
-				context);
+				helper.context([=] { amount->update(); }));
 		} else if (e.credits.stars()) {
 			auto t = TextWithEntities()
 				.append((e.in && (creditsHistoryStarGift || !isStarGift))
@@ -1514,12 +1499,12 @@ void GenericCreditsEntryBox(
 					: kMinus)
 				.append(Lang::FormatCreditsAmountDecimal(e.credits.abs()))
 				.append(QChar(' '))
-				.append(owner->customEmojiManager().creditsEmoji());
+				.append(starEmoji);
 			text->setMarkedText(
 				st::semiboldTextStyle,
 				std::move(t),
 				kMarkupTextOptions,
-				context);
+				helper.context([=] { amount->update(); }));
 		} else if (e.credits.ton()) {
 			auto t = TextWithEntities()
 				.append((e.in ? QChar('+') : kMinus))
@@ -1528,30 +1513,18 @@ void GenericCreditsEntryBox(
 				st::channelEarnHistoryMajorLabel.style,
 				std::move(t),
 				kMarkupTextOptions,
-				context);
+				helper.context([=] { amount->update(); }));
 
 			auto minor = TextWithEntities()
 				.append(Info::ChannelEarn::MinorPart(e.credits.abs()))
 				.append(QChar(' '))
-				.append(
-					Ui::Text::SingleCustomEmoji(
-						owner->customEmojiManager().registerInternalEmoji(
-							(e.in
-								? u"stats_transaction_ton_in"_q
-								: u"stats_transaction_ton_out"_q),
-							Ui::Earn::IconCurrencyColored(
-								st::tonFieldIconSize,
-								(e.in
-									? st::boxTextFgGood->c
-									: st::menuIconAttentionColor->c)),
-							QMargins(0, st::lineWidth * 1, 0, 0),
-							false)));
+				.append(Ui::Text::IconEmoji(&st::tonIconEmojiInSmall));
 			minorText = lifetime.make_state<Ui::Text::String>();
 			minorText->setMarkedText(
 				st::channelEarnHistoryMinorLabel.style,
 				std::move(minor),
 				kMarkupTextOptions,
-				context);
+				helper.context([=] { amount->update(); }));
 		}
 		const auto font = text->style()->font;
 		const auto roundedFont = st::defaultTextStyle.font;
@@ -2746,11 +2719,6 @@ void AddWithdrawalWidget(
 		tr::lng_channel_earn_balance_button(tr::now),
 		st::channelEarnSemiboldLabel);
 	const auto processInputChange = [&] {
-		const auto buttonEmoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::settingsPremiumIconStar,
-				{ 0, -st::moderateBoxExpandInnerSkip, 0, 0 },
-				true));
 		using Balance = rpl::variable<CreditsAmount>;
 		const auto currentBalance = input->lifetime().make_state<Balance>(
 			rpl::duplicate(availableBalanceValue));
@@ -2766,9 +2734,8 @@ void AddWithdrawalWidget(
 						lt_count,
 						amount,
 						lt_emoji,
-						buttonEmoji,
-						Ui::Text::RichLangValue),
-					Core::TextContext({ .session = session }));
+						Ui::Text::IconEmoji(&st::starIconEmojiLarge),
+						Ui::Text::RichLangValue));
 			}
 		};
 		QObject::connect(input, &Ui::MaskedInputField::changed, process);
@@ -2836,15 +2803,10 @@ void AddWithdrawalWidget(
 		constexpr auto kDateUpdateInterval = crl::time(250);
 		const auto was = base::unixtime::serialize(dt);
 
-		const auto context = Core::TextContext({
-			.session = session,
+		const auto context = Ui::Text::MarkedContext{
 			.repaint = [=] { lockedLabel->update(); },
-		});
-		const auto emoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				st::chatSimilarLockedIcon,
-				st::botEarnButtonLockMargins,
-				true));
+		};
+		const auto emoji = Ui::Text::IconEmoji(&st::botEarnButtonLock);
 
 		rpl::single(
 			rpl::empty
@@ -2933,7 +2895,7 @@ void AddWithdrawalWidget(
 						tr::lng_bot_earn_balance_about_url(tr::now));
 				}),
 			Ui::Text::RichLangValue),
-		Core::TextContext({ .session = session }),
+		{},
 		st::boxDividerLabel);
 	Ui::AddSkip(container);
 	container->add(object_ptr<Ui::DividerLabel>(
diff --git a/Telegram/SourceFiles/settings/settings_main.cpp b/Telegram/SourceFiles/settings/settings_main.cpp
index e212d2c457..0320235e34 100644
--- a/Telegram/SourceFiles/settings/settings_main.cpp
+++ b/Telegram/SourceFiles/settings/settings_main.cpp
@@ -772,30 +772,12 @@ void SetupPremium(
 					? Lang::FormatCreditsAmountToShort(c).string
 					: QString();
 			}),
-			st::settingsButton);
+			st::settingsButton,
+			{ &st::menuIconTon });
 		button->addClickHandler([=] {
 			controller->setPremiumRef("settings");
 			showOther(CurrencyId());
 		});
-
-		const auto badge = Ui::CreateChild<Ui::RpWidget>(button.get());
-		const auto image = Ui::Earn::IconCurrencyColored(
-			st::tonFieldIconSize,
-			st::menuIconColor->c);
-
-		badge->resize(Size(st::tonFieldIconSize));
-		badge->paintRequest(
-		) | rpl::start_with_next([=] {
-			auto p = QPainter(badge);
-			p.drawImage(0, 0, image);
-		}, badge->lifetime());
-
-		button->sizeValue() | rpl::start_with_next([=](const QSize &s) {
-			badge->moveToLeft(
-				button->st().iconLeft
-					+ (st::menuIconShop.width() - badge->width()) / 2,
-				(s.height() - badge->height()) / 2);
-		}, badge->lifetime());
 	}
 	const auto button = AddButtonWithIcon(
 		container,
diff --git a/Telegram/SourceFiles/statistics/statistics.style b/Telegram/SourceFiles/statistics/statistics.style
index 8cc22a9b96..8f7395a340 100644
--- a/Telegram/SourceFiles/statistics/statistics.style
+++ b/Telegram/SourceFiles/statistics/statistics.style
@@ -159,6 +159,10 @@ getBoostsButtonIcon: icon {{ "menu/gift_premium", lightButtonFg }};
 boostsListMiniIcon: icon{{ "boosts/boost_mini2", premiumButtonFg }};
 boostsListMiniIconPadding: margins(1px, 0px, 0px, 0px);
 boostsListMiniIconSkip: 1px;
+boostsListEntryIcon: IconEmoji {
+	icon: boostsListMiniIcon;
+	padding: margins(6px, 2px, 0px, 0px);
+}
 boostsListBadgeTextPadding: margins(16px, 1px, 6px, 0px);
 boostsListBadgePadding: margins(4px, 1px, 4px, 0px);
 boostsListBadgeHeight: 16px;
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
index fb0300664e..5dc0aced6d 100644
--- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "settings/settings_common.h"
 #include "styles/style_boxes.h"
+#include "styles/style_credits.h"
 #include "styles/style_layers.h"
 
 #include <QtCore/QRegularExpression>
@@ -47,16 +48,14 @@ constexpr auto kTonMultiplier = uint64(1000000000);
 	return langDateTime(base::unixtime::parse(date));
 }
 
-[[nodiscard]] TextWithEntities FormatPrice(
-		const CollectibleInfo &info,
-		const CollectibleDetails &details) {
+[[nodiscard]] TextWithEntities FormatPrice(const CollectibleInfo &info) {
 	auto minor = Info::ChannelEarn::MinorPart(info.cryptoAmount);
 	if (minor.size() == 1 && minor.at(0) == '.') {
 		minor += '0';
 	}
 	auto price = (info.cryptoCurrency == u"TON"_q)
-		? base::duplicate(
-			details.tonEmoji
+		? Ui::Text::IconEmoji(
+			&st::tonIconEmoji
 		).append(
 			Info::ChannelEarn::MajorPart(info.cryptoAmount)
 		).append(minor)
@@ -123,8 +122,7 @@ CollectibleType DetectCollectibleType(const QString &entity) {
 
 void CollectibleInfoBox(
 		not_null<Ui::GenericBox*> box,
-		CollectibleInfo info,
-		CollectibleDetails details) {
+		CollectibleInfo info) {
 	box->setWidth(st::boxWideWidth);
 	box->setStyle(st::collectibleBox);
 
@@ -218,15 +216,13 @@ void CollectibleInfoBox(
 			lt_date,
 			TextWithEntities{ FormatDate(info.date) },
 			lt_price,
-			FormatPrice(info, details),
+			FormatPrice(info),
 			Ui::Text::RichLangValue);
 	const auto label = box->addRow(
 		object_ptr<Ui::FlatLabel>(box, st::collectibleInfo),
 		st::collectibleInfoPadding);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	auto context = details.tonEmojiContext;
-	context.repaint = [label] { label->update(); };
-	label->setMarkedText(text, context);
+	label->setMarkedText(text);
 
 	const auto more = box->addRow(
 		object_ptr<Ui::RoundButton>(
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.h b/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
index 9080819c98..2fc94dfc55 100644
--- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.h
@@ -32,14 +32,6 @@ struct CollectibleInfo {
 	TimeId date = 0;
 };
 
-struct CollectibleDetails {
-	TextWithEntities tonEmoji;
-	Text::MarkedContext tonEmojiContext;
-};
-
-void CollectibleInfoBox(
-	not_null<Ui::GenericBox*> box,
-	CollectibleInfo info,
-	CollectibleDetails details);
+void CollectibleInfoBox(not_null<Ui::GenericBox*> box, CollectibleInfo info);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index eeb1966260..cdd1c44431 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -34,14 +34,22 @@ historyReplyBottom: 2px;
 historyReplyPreview: 32px;
 historyReplyPreviewMargin: margins(7px, 4px, 4px, 4px);
 historyReplyPadding: margins(11px, 2px, 6px, 2px);
-historyReplyUser: icon {{ "chat/reply_type_user", windowFg }};
-historyReplyUserPadding: margins(0px, 4px, 4px, 0px);
-historyReplyGroup: icon {{ "chat/reply_type_group", windowFg }};
-historyReplyGroupPadding: margins(0px, 4px, 4px, 0px);
-historyReplyChannel: icon {{ "chat/reply_type_channel", windowFg }};
-historyReplyChannelPadding: margins(0px, 5px, 4px, 0px);
-historyReplyForward: icon {{ "mini_forward", windowFg }};
-historyReplyForwardPadding: margins(0px, 2px, 2px, 0px);
+historyReplyUser: IconEmoji {
+	icon: icon {{ "chat/reply_type_user", windowFg }};
+	padding: margins(0px, 4px, 4px, 0px);
+}
+historyReplyGroup: IconEmoji {
+	icon: icon {{ "chat/reply_type_group", windowFg }};
+	padding: margins(0px, 4px, 4px, 0px);
+}
+historyReplyChannel: IconEmoji {
+	icon: icon {{ "chat/reply_type_channel", windowFg }};
+	padding: margins(0px, 5px, 4px, 0px);
+}
+historyReplyForward: IconEmoji {
+	icon: icon {{ "mini_forward", windowFg }};
+	padding: margins(0px, 2px, 2px, 0px);
+}
 
 msgReplyPadding: margins(6px, 6px, 11px, 6px);
 msgReplyBarPos: point(1px, 0px);
@@ -1096,13 +1104,18 @@ repliesComposeControls: ComposeControls(defaultComposeControls) {
 	tabbedHeightMin: 220px;
 }
 
-boostMessageIcon: icon {{ "stories/boost_mini", windowFg }};
-boostMessageIconPadding: margins(0px, 2px, 0px, 0px);
-boostsMessageIcon: icon {{ "stories/boosts_mini", windowFg }};
-boostsMessageIconPadding: margins(0px, 2px, 0px, 0px);
-
-historyIvIcon: icon{{ "boosts/boost_mini2", windowFg }};
-historyIvIconPadding: margins(2px, 2px, 2px, 0px);
+boostMessageIcon: IconEmoji {
+	icon: icon {{ "stories/boost_mini", windowFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
+boostsMessageIcon: IconEmoji {
+	icon: icon {{ "stories/boosts_mini", windowFg }};
+	padding: margins(0px, 2px, 0px, 0px);
+}
+historyIvIcon: IconEmoji {
+	icon: icon {{ "boosts/boost_mini2", windowFg }};
+	padding: margins(2px, 2px, 2px, 0px);
+}
 
 chatIntroStickerSize: 96px;
 chatIntroWidth: 224px;
@@ -1373,7 +1386,6 @@ chatTabsOutlineHorizontal: ChatTabsOutline {
 chatTabsOutlineVertical: ChatTabsOutline(chatTabsOutlineHorizontal) {
 }
 
-suggestPriceTonIconMargins: margins(0px, 2px, 0px, 0px);
 suggestPriceBox: Box(defaultBox) {
 	buttonPadding: margins(22px, 22px, 22px, 22px);
 	buttonHeight: 42px;
@@ -1404,7 +1416,7 @@ tonInput: InputField(defaultInputField) {
 }
 starsFieldIconPosition: point(0px, 10px);
 tonFieldIconSize: 16px;
-tonFieldIconPosition: point(2px, 9px);
+tonFieldIconPosition: point(2px, 11px);
 
 suggestBarTonIconSize: 14px;
 suggestBarTonIconMargins: margins(0px, 3px, 0px, 0px);
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 3fe7df020f..27293ec258 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 #include "ui/layers/show.h"
 #include "ui/text/custom_emoji_helper.h"
+#include "ui/text/custom_emoji_text_badge.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
@@ -87,41 +88,6 @@ struct Feature {
 	return result;
 }
 
-[[nodiscard]] Fn<QImage()> CustomEmojiBadgeFactory(
-		const QString &text,
-		const style::color &bg,
-		const style::color &fg) {
-	return [=] {
-		auto string = Ui::Text::String(
-			st::settingsPremiumNewBadge.style,
-			text.toUpper());
-		const auto size = QSize(string.maxWidth(), string.minHeight());
-		const auto padding = st::settingsPremiumNewBadgePadding;
-		const auto full = size.grownBy(padding);
-		const auto ratio = style::DevicePixelRatio();
-
-		auto result = QImage(
-			full * ratio,
-			QImage::Format_ARGB32_Premultiplied);
-		result.setDevicePixelRatio(ratio);
-		result.fill(Qt::transparent);
-
-		auto p = QPainter(&result);
-		auto hq = PainterHighQualityEnabler(p);
-		p.setPen(Qt::NoPen);
-		p.setBrush(bg);
-
-		const auto r = padding.left();
-		p.drawRoundedRect(0, 0, full.width(), full.height(), r, r);
-
-		p.setPen(fg);
-		string.draw(p, { .position = { padding.left(), padding.top() } });
-
-		p.end();
-		return result;
-	};
-}
-
 [[nodiscard]] Counters AdjustByReached(Counters data) {
 	if (data.stars < 0) {
 		return data;
@@ -389,17 +355,15 @@ void AboutRatingBox(
 	auto helper = Ui::Text::CustomEmojiHelper();
 	const auto makeBadge = [&](
 			const QString &text,
-			const style::color &bg,
-			const style::color &fg) {
+			const style::RoundButton &st) {
 		return helper.paletteDependent(
-			CustomEmojiBadgeFactory(text, bg, fg),
-			st::badgeEmojiMargin);
+			Ui::Text::CustomEmojiTextBadge(text, st));
 	};
 	const auto makeActive = [&](const QString &text) {
-		return makeBadge(text, st::windowBgActive, st::windowFgActive);
+		return makeBadge(text, st::customEmojiTextBadge);
 	};
 	const auto makeInactive = [&](const QString &text) {
-		return makeBadge(text, st::windowSubTextFg, st::windowFgActive);
+		return makeBadge(text, st::infoRatingDeductedBadge);
 	};
 	const auto features = std::vector<Feature>{
 		{
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index a92b0e9451..4d963e2d2c 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -81,6 +81,11 @@ starIconEmojiSmall: IconEmoji {
 	icon: icon{{ "chat/mini_stars", creditsBg1 }};
 	padding: margins(0px, 4px, 0px, 0px);
 }
+starIconEmojiLarge: IconEmoji {
+	icon: icon {{ "settings/premium/star", settingsIconFg }};
+	padding: margins(0px, -2px, 0px, 0px);
+}
+
 tonIconEmoji: IconEmoji {
 	icon: icon{{ "chat/mini_ton_bold", currencyFg }};
 	padding: margins(1px, 3px, 1px, 0px);
@@ -89,6 +94,9 @@ tonIconEmojiLarge: IconEmoji {
 	icon: icon{{ "payments/ton_emoji-18x18", currencyFg }};
 	padding: margins(0px, 1px, 0px, 0px);
 }
+tonIconEmojiInSmall: IconEmoji(tonIconEmoji) {
+	padding: margins(0px, 2px, 0px, 0px);
+}
 
 creditsHistoryEntryTypeAds: icon {{ "folders/folders_channels", premiumButtonFg }};
 
@@ -228,7 +236,10 @@ giftListAbout: FlatLabel(defaultFlatLabel) {
 giftListAboutMargin: margins(12px, 24px, 12px, 24px);
 giftBoxEmojiToggleTop: 7px;
 giftBoxLimitTop: 28px;
-giftBoxLockMargins: margins(-2px, 1px, 0px, 0px);
+giftBoxLock: IconEmoji {
+	icon: icon {{ "emoji/premium_lock", placeholderFgActive }};
+	padding: margins(-2px, 1px, 0px, 0px);
+}
 giftBoxPinIcon: icon {{ "dialogs/dialogs_pinned", premiumButtonFg }};
 
 creditsHistoryEntriesList: PeerList(defaultPeerList) {
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index 18e5c01eee..9131ea8352 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -26,8 +26,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/empty_userpic.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_instance.h"
 #include "ui/text/format_values.h"
-#include "ui/text/text_custom_emoji.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/wrap/padding_wrap.h"
@@ -692,9 +692,9 @@ QImage CreditsWhiteDoubledIcon(int size, float64 outlineRatio) {
 std::unique_ptr<Ui::Text::CustomEmoji> MakeCreditsIconEmoji(
 		int height,
 		int count) {
-	return std::make_unique<Ui::Text::StaticCustomEmoji>(
-		GenerateStars(height, count),
-		u"credits_icon:%1:%2"_q.arg(height).arg(count));
+	return std::make_unique<Ui::CustomEmoji::Internal>(
+		u"credits_icon:%1:%2"_q.arg(height).arg(count),
+		GenerateStars(height, count));
 }
 
 Ui::Text::MarkedContext MakeCreditsIconContext(int height, int count) {
diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style
index f3c1eb27b4..f39a3c5cd9 100644
--- a/Telegram/SourceFiles/ui/menu_icons.style
+++ b/Telegram/SourceFiles/ui/menu_icons.style
@@ -189,6 +189,7 @@ menuIconAdd: icon {{ "menu/add", menuIconColor }};
 menuIconRatingGifts: icon {{ "menu/rating_gifts-24x24", menuIconColor }};
 menuIconRatingUsers: icon {{ "menu/users_stars-24x24", menuIconColor }};
 menuIconRatingRefund: icon {{ "menu/rating_refund-24x24", menuIconColor }};
+menuIconTon: icon{{ "payments/ton_emoji-18x18", menuIconColor, point(3px, 2px) }};
 
 menuIconTTLAny: icon {{ "menu/auto_delete_plain", menuIconColor }};
 menuIconTTLAnyTextPosition: point(11px, 22px);
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 8867ee4ee4..c9204a1c4e 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -41,6 +41,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "calls/calls_instance.h"
 #include "inline_bots/bot_attach_web_view.h" // InlineBots::PeerType.
 #include "ui/toast/toast.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/chat_filters_tabs_strip.h"
@@ -78,6 +79,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_memento.h"
 #include "info/channel_statistics/boosts/info_boosts_widget.h"
 #include "info/channel_statistics/earn/info_channel_earn_widget.h"
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/profile/info_profile_cover.h"
 #include "info/profile/info_profile_values.h"
 #include "info/statistics/info_statistics_widget.h"
@@ -1683,6 +1685,7 @@ void Filler::addToggleFee() {
 	}, feeRemoved ? &st::menuIconEarn : &st::menuIconCancelFee);
 	_addAction({ .isSeparator = true });
 	_addAction({ .make = [=](not_null<Ui::RpWidget*> actionParent) {
+		auto helper = Ui::Text::CustomEmojiHelper();
 		const auto text = feeRemoved
 			? tr::lng_context_fee_free(
 				tr::now,
@@ -1694,8 +1697,8 @@ void Filler::addToggleFee() {
 				lt_name,
 				TextWithEntities{ user->shortName() },
 				lt_amount,
-				user->owner().customEmojiManager().ministarEmoji(
-					{ 0, st::giftBoxByStarsStarTop, 0, 0 }
+				helper.paletteDependent(
+					Ui::Earn::IconCurrencyEmojiSmall()
 				).append(Lang::FormatCountDecimal(
 					user->owner().commonStarsPerMessage(parent)
 				)),
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index a69dde235b..292ceb1fbb 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -178,21 +178,6 @@ private:
 	return false;
 }
 
-[[nodiscard]] Ui::CollectibleDetails PrepareCollectibleDetails(
-		not_null<Main::Session*> session) {
-	return {
-		.tonEmoji = Ui::Text::SingleCustomEmoji(
-			session->data().customEmojiManager().registerInternalEmoji(
-				u"collectible_ton_icon"_q,
-				Ui::Earn::IconCurrencyColored(
-					st::collectibleInfo.style.font,
-					st::collectibleInfo.textFg->c),
-				st::collectibleInfoTonMargins,
-				true)),
-		.tonEmojiContext = Core::TextContext({ .session = session }),
-	};
-}
-
 [[nodiscard]] Ui::CollectibleInfo Parse(
 		const QString &entity,
 		not_null<PeerData*> owner,
@@ -868,8 +853,7 @@ void SessionNavigation::resolveCollectible(
 		_collectibleRequestId = 0;
 		uiShow()->show(Box(
 			Ui::CollectibleInfoBox,
-			Parse(entity, _session->data().peer(ownerId), result),
-			PrepareCollectibleDetails(_session)));
+			Parse(entity, _session->data().peer(ownerId), result)));
 	}).fail([=](const MTP::Error &error) {
 		_collectibleEntity = QString();
 		_collectibleRequestId = 0;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index cd01ab20e4..7d1c158389 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit cd01ab20e485aabd0991bb43c7d8302cd0a2ebc4
+Subproject commit 7d1c15838960b77d49401104404d2e637f476c2c

From 00a396c3e758049ffd3a85ff7696e025cdcdcd47 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 6 Aug 2025 00:13:15 +0400
Subject: [PATCH 134/341] Fix stage paths in snap

---
 snap/snapcraft.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 0cdb0006ee..ac1c7f8a36 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -123,11 +123,11 @@ parts:
       - libxcb-screensaver0
     stage:
       - ./usr/bin/systemd-detect-virt
-      - ./usr/lib/x86_64-linux-gnu/libgeoclue-2.so*
-      - ./usr/lib/x86_64-linux-gnu/libopenh264.so*
-      - ./usr/lib/x86_64-linux-gnu/libxcb-cursor.so*
-      - ./usr/lib/x86_64-linux-gnu/libxcb-record.so*
-      - ./usr/lib/x86_64-linux-gnu/libxcb-screensaver.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-record.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-screensaver.so*
 
   patches:
     source: https://github.com/desktop-app/patches.git

From 9a2679efaa619283f24307df6261f9db7dd0d595 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 8 Aug 2025 00:15:12 +0400
Subject: [PATCH 135/341] Remove unity7 plug from snap

Looks like the desktop plug has everything needed since snapd 2.67
---
 snap/snapcraft.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ac1c7f8a36..de0734498e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -23,7 +23,6 @@ apps:
       - network-bind
       - network-status
       - removable-media
-      - unity7
     slots:
       - mpris
 

From 02b43c93754cc77a5d083a42f4052e5526c49b7d Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 8 Aug 2025 01:29:47 +0400
Subject: [PATCH 136/341] Remove systemd-detect-virt from snap

It could be used from the core snap since hardware-observe plug was connected
---
 snap/snapcraft.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index de0734498e..b5d8c63e02 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -114,14 +114,12 @@ parts:
       - libxkbcommon-x11-dev
       - libxv-dev
     stage-packages:
-      - systemd
       - libgeoclue-2-0
       - libopenh264-7
       - libxcb-cursor0
       - libxcb-record0
       - libxcb-screensaver0
     stage:
-      - ./usr/bin/systemd-detect-virt
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*

From efb213fb9f47f8536d11df4aaa988ef8dea7c800 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Aug 2025 09:52:57 +0400
Subject: [PATCH 137/341] Fix build with latest Xcode.

---
 Telegram/SourceFiles/history/history_widget.cpp                 | 2 +-
 .../history/view/controls/history_view_compose_controls.cpp     | 2 +-
 Telegram/ThirdParty/tgcalls                                     | 2 +-
 Telegram/lib_webrtc                                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 7d9f5765a4..ca8901fabe 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -8694,7 +8694,7 @@ void HistoryWidget::editMessage(
 		controller()->showToast(tr::lng_edit_caption_voice(tr::now));
 		return;
 	} else if (const auto media = item->media()) {
-		if (const auto todolist = media->todolist()) {
+		if (media->todolist()) {
 			Window::PeerMenuEditTodoList(controller(), item);
 			return;
 		}
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index b104c9c498..f6f13ba081 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -3035,7 +3035,7 @@ void ComposeControls::editMessage(not_null<HistoryItem*> item) {
 		_show->showBox(Ui::MakeInformBox(tr::lng_edit_caption_voice()));
 		return;
 	} else if (const auto media = item->media()) {
-		if (const auto todolist = media->todolist()) {
+		if (media->todolist()) {
 			Assert(_regularWindow != nullptr);
 			Window::PeerMenuEditTodoList(_regularWindow, item);
 			return;
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index d78b0507c5..24694f64b0 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit d78b0507c54d76d5fe9691c8efe2638dee2c1536
+Subproject commit 24694f64b03e301ec2c90792566046e61a2c4967
diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc
index e44439ed95..792c7a5b48 160000
--- a/Telegram/lib_webrtc
+++ b/Telegram/lib_webrtc
@@ -1 +1 @@
-Subproject commit e44439ed95559bfb4730db65f954937e149b7199
+Subproject commit 792c7a5b4846c489753deb5b87f67b3d11b399cf

From 536884bb469dae5d250d3fd99b44fb7e0f938467 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Aug 2025 11:26:39 +0400
Subject: [PATCH 138/341] Fix build with new Xcode.

---
 Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp | 2 +-
 Telegram/SourceFiles/calls/group/calls_group_call.cpp   | 2 +-
 Telegram/SourceFiles/dialogs/dialogs_entry.cpp          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
index 8f5f4221dd..201705a6f6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp
@@ -1257,7 +1257,7 @@ void Controller::fillAutoTranslateButton() {
 				_navigation->uiShow(),
 				_peer,
 				[=](int level) {
-					if (const auto strong = weak.get()) {
+					if (weak.get()) {
 						state->isLocked = (level < requiredLevel);
 					}
 					return (level < requiredLevel)
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 6714d32fac..96b2f7a043 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -3982,7 +3982,7 @@ void GroupCall::inviteUsers(
 		}
 	};
 
-	if (const auto call = _conferenceCall.get()) {
+	if (_conferenceCall.get()) {
 		for (const auto &request : requests) {
 			inviteToConference(request, [=] {
 				return &state->result;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_entry.cpp b/Telegram/SourceFiles/dialogs/dialogs_entry.cpp
index f863378136..9298a8d7fb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_entry.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_entry.cpp
@@ -230,7 +230,7 @@ uint64 Entry::computeSortPosition(FilterId filterId) const {
 
 void Entry::updateChatListExistence() {
 	if (const auto history = asHistory()) {
-		if (const auto channel = history->peer->asMonoforum()) {
+		if (history->peer->asMonoforum()) {
 			if (!folderKnown()) {
 				history->clearFolder();
 			}

From 62329c104cdaeb32fc2115f9e21edf031b4f8093 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 9 Aug 2025 02:43:12 +0400
Subject: [PATCH 139/341] Fix accidentally broken CMAKE_INSTALL_PREFIX in snap

Regression was introduced in a6a8363527d5853612e56b18841aed71f9ddb44a
---
 snap/snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index b5d8c63e02..05ed177462 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -37,7 +37,7 @@ parts:
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
-      - -DCMAKE_INSTALL_PREFIX=/
+      - -DCMAKE_INSTALL_PREFIX=/usr
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
     override-pull: |

From 60447f073f96177ed2f7e18c6d4525649d7dcf50 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 9 Aug 2025 02:42:06 +0400
Subject: [PATCH 140/341] Partially revert "Move packages to a separate snap
 part"

This partially reverts commit ef2e9406c74a7d509f10371de680d4da8633b872 restoring per-part build packages so changes to them don't lead to rebuild of all parts.
---
 snap/snapcraft.yaml | 96 +++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 47 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 05ed177462..8a1023090a 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -34,6 +34,15 @@ parts:
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-ldav1d,-lhwy,-pop-state -s
+    build-packages:
+      - clang
+      - libboost-regex-dev
+      - libheif-dev
+      - libjxl-dev
+      - libssl-dev
+      - libxcb-keysyms1-dev
+      - libxcb-record0-dev
+      - libxcb-screensaver0-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -81,38 +90,6 @@ parts:
 
   pkgs:
     plugin: nil
-    build-packages:
-      - clang
-      - gperf
-      - nasm
-      - wget
-      - libboost-regex-dev
-      - libdav1d-dev
-      - libheif-dev
-      - libhwy-dev
-      - libjxl-dev
-      - libopenh264-dev
-      - libopus-dev
-      - libpipewire-0.3-dev
-      - libssl-dev
-      - libvdpau-dev
-      - libvpx-dev
-      - libxcb-cursor-dev
-      - libxcb-glx0-dev
-      - libxcb-icccm4-dev
-      - libxcb-image0-dev
-      - libxcb-keysyms1-dev
-      - libxcb-randr0-dev
-      - libxcb-record0-dev
-      - libxcb-render-util0-dev
-      - libxcb-screensaver0-dev
-      - libxcb-shape0-dev
-      - libxcb-sync-dev
-      - libxcb-util-dev
-      - libxcb-xfixes0-dev
-      - libxcb-xkb-dev
-      - libxkbcommon-x11-dev
-      - libxv-dev
     stage-packages:
       - libgeoclue-2-0
       - libopenh264-7
@@ -157,6 +134,8 @@ parts:
     source-depth: 1
     source-tag: v1.3.0
     plugin: cmake
+    build-packages:
+      - libdav1d-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -165,14 +144,20 @@ parts:
       - -DAVIF_CODEC_DAV1D=SYSTEM
       - -DAVIF_LIBYUV=OFF
     prime: [-./*]
-    after:
-      - pkgs
 
   ffmpeg:
     source: https://github.com/FFmpeg/FFmpeg.git
     source-depth: 1
     source-branch: n6.1.1
     plugin: autotools
+    build-packages:
+      - nasm
+      - libdav1d-dev
+      - libopenh264-dev
+      - libopus-dev
+      - libvdpau-dev
+      - libvpx-dev
+      - libxv-dev
     autotools-configure-parameters:
       - --prefix=/usr
       - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
@@ -316,13 +301,14 @@ parts:
     prime: [-./*]
     after:
       - nv-codec-headers
-      - pkgs
 
   jpegli:
     source: https://github.com/libjxl/libjxl.git
     source-depth: 1
     source-tag: v0.11.1
     plugin: cmake
+    build-packages:
+      - libhwy-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -353,14 +339,14 @@ parts:
       - ./usr/include/jpeglib.h
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libjpeg.a
     prime: [-./*]
-    after:
-      - pkgs
 
   openal:
     source: https://github.com/kcat/openal-soft.git
     source-depth: 1
     source-tag: 1.24.3
     plugin: cmake
+    build-packages:
+      - libpipewire-0.3-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -372,8 +358,6 @@ parts:
       - -DALSOFT_INSTALL_CONFIG=OFF
       - -DALSOFT_BACKEND_PIPEWIRE=OFF
     prime: [-./*]
-    after:
-      - pkgs
 
   nv-codec-headers:
     source: https://github.com/FFmpeg/nv-codec-headers.git
@@ -396,8 +380,6 @@ parts:
       - -DCMAKE_INSTALL_PREFIX=/usr
       - -Dprotobuf_BUILD_TESTS=OFF
     prime: [-./*]
-    after:
-      - pkgs
 
   qt:
     source: https://github.com/qt/qt5.git
@@ -413,6 +395,21 @@ parts:
     plugin: cmake
     build-environment:
       - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state
+    build-packages:
+      - libssl-dev
+      - libxcb-cursor-dev
+      - libxcb-glx0-dev
+      - libxcb-icccm4-dev
+      - libxcb-image0-dev
+      - libxcb-keysyms1-dev
+      - libxcb-randr0-dev
+      - libxcb-render-util0-dev
+      - libxcb-shape0-dev
+      - libxcb-sync-dev
+      - libxcb-util-dev
+      - libxcb-xfixes0-dev
+      - libxcb-xkb-dev
+      - libxkbcommon-x11-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -434,13 +431,14 @@ parts:
     after:
       - jpegli
       - patches
-      - pkgs
 
   rnnoise:
     source: https://github.com/xiph/rnnoise.git
     source-depth: 1
     source-tag: v0.2
     plugin: autotools
+    build-packages:
+      - wget
     autotools-configure-parameters:
       - --prefix=/usr
       - --libdir=\${exec_prefix}/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
@@ -451,14 +449,15 @@ parts:
       craftctl default
       sed -i 's/os_support.h/common.h/g;s/OPUS_CLEAR/RNN_CLEAR/g' src/vec{,_neon}.h
     prime: [-./*]
-    after:
-      - pkgs
 
   tde2e:
     source: https://github.com/tdlib/td.git
     source-depth: 1
     source-commit: 51743dfd01dff6179e2d8f7095729caa4e2222e9
     plugin: cmake
+    build-packages:
+      - gperf
+      - libssl-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -466,14 +465,18 @@ parts:
       - -DCMAKE_INSTALL_LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
       - -DTD_E2E_ONLY=ON
     prime: [-./*]
-    after:
-      - pkgs
 
   webrtc:
     source: https://github.com/desktop-app/tg_owt.git
     source-depth: 1
     source-commit: 62321fd7128ab2650b459d4195781af8185e46b5
     plugin: cmake
+    build-packages:
+      - libopenh264-dev
+      - libopus-dev
+      - libpipewire-0.3-dev
+      - libssl-dev
+      - libvpx-dev
     cmake-generator: Ninja
     cmake-parameters:
       - -DCMAKE_BUILD_TYPE=Release
@@ -482,4 +485,3 @@ parts:
     after:
       - ffmpeg
       - jpegli
-      - pkgs

From 9672b2ec234af570b2808d22bb402609b0804932 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 9 Aug 2025 08:47:39 +0000
Subject: [PATCH 141/341] Use double dash consistently in snap ldflags

---
 snap/snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 8a1023090a..fe56b47024 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -33,7 +33,7 @@ parts:
     source-type: git
     parse-info: [usr/share/metainfo/org.telegram.desktop.metainfo.xml]
     build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-ldav1d,-lhwy,-pop-state -s
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,--push-state,--no-as-needed,-ldav1d,-lhwy,--pop-state -s
     build-packages:
       - clang
       - libboost-regex-dev
@@ -394,7 +394,7 @@ parts:
       - qtwayland
     plugin: cmake
     build-environment:
-      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,-push-state,-no-as-needed,-lhwy,-pop-state
+      - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -Wl,--push-state,--no-as-needed,-lhwy,--pop-state
     build-packages:
       - libssl-dev
       - libxcb-cursor-dev

From a8430d8ecf52820db4af881566ee250df8f2a6dc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 9 Aug 2025 07:36:30 +0000
Subject: [PATCH 142/341] Self-build openh264 in snap for lesser package size

---
 snap/snapcraft.yaml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index fe56b47024..be96318fcd 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -92,13 +92,11 @@ parts:
     plugin: nil
     stage-packages:
       - libgeoclue-2-0
-      - libopenh264-7
       - libxcb-cursor0
       - libxcb-record0
       - libxcb-screensaver0
     stage:
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
-      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-record.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-screensaver.so*
@@ -153,7 +151,6 @@ parts:
     build-packages:
       - nasm
       - libdav1d-dev
-      - libopenh264-dev
       - libopus-dev
       - libvdpau-dev
       - libvpx-dev
@@ -163,6 +160,7 @@ parts:
       - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
       - --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
       - --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
+      - --extra-ldflags="-Wl,--push-state,--no-as-needed,-lstdc++,--pop-state"
       - --disable-debug
       - --disable-programs
       - --disable-doc
@@ -301,6 +299,7 @@ parts:
     prime: [-./*]
     after:
       - nv-codec-headers
+      - openh264
 
   jpegli:
     source: https://github.com/libjxl/libjxl.git
@@ -369,6 +368,19 @@ parts:
       - LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
     prime: [-./*]
 
+  openh264:
+    source: https://github.com/cisco/openh264.git
+    source-depth: 1
+    source-tag: v2.6.0
+    plugin: meson
+    build-packages:
+      - meson
+    meson-parameters:
+      - --prefix=/usr
+      - --buildtype=release
+      - --default-library=static
+    prime: [-./*]
+
   protobuf:
     source: https://github.com/protocolbuffers/protobuf.git
     source-depth: 1
@@ -472,7 +484,6 @@ parts:
     source-commit: 62321fd7128ab2650b459d4195781af8185e46b5
     plugin: cmake
     build-packages:
-      - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
       - libssl-dev
@@ -485,3 +496,4 @@ parts:
     after:
       - ffmpeg
       - jpegli
+      - openh264

From 0bc59a82ba9aa30a29b3d140f60ff860298b018a Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 9 Aug 2025 11:26:05 +0000
Subject: [PATCH 143/341] Use symbolic links for icons in snap

---
 snap/snapcraft.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index be96318fcd..cd6f96ddb0 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -72,9 +72,11 @@ parts:
       for i in $(find "$CRAFT_PART_INSTALL/usr/share/icons" -name "$APP_ID*.svg" -o -name "$APP_ID*.png"); do
         PREFIXED="$(dirname "$i")/snap.$CRAFT_PROJECT_NAME.$(basename "$i" | sed "s/$APP_ID//")"
         mv "$i" "$PREFIXED"
-        DEST="$(dirname "$i" | sed 's@usr/share@meta/gui@')"
-        mkdir -p "$DEST"
-        cp -r "$PREFIXED" "$DEST"
+        DEST="$(echo "$PREFIXED" | sed 's@usr/share@meta/gui@')"
+        DESTDIR="$(dirname "$DEST")"
+        mkdir -p "$DESTDIR"
+        RELATIVE="$(realpath -s --relative-to="$DESTDIR" "$PREFIXED")"
+        ln -sfn "$RELATIVE" "$DEST"
       done
     after:
       - ada

From 547369649136fe0807ce105b9067c4b4b8194a30 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Aug 2025 14:04:32 +0400
Subject: [PATCH 144/341] Fix dice-type game display.

---
 .../SourceFiles/history/view/media/history_view_sticker.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
index 90bfe44ecf..c5472feda6 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_sticker.cpp
@@ -569,7 +569,7 @@ void Sticker::dataMediaCreated() const {
 void Sticker::setDiceIndex(const QString &emoji, int index) {
 	_diceEmoji = emoji;
 	_diceIndex = index;
-	_playingOnce = (index >= 0);
+	_playingOnce = (index > 0);
 	_stopOnLastFrame = (index > 0);
 }
 

From bf0b85afd1022f260c876926fc3bc572d523e7ec Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 10:43:10 +0400
Subject: [PATCH 145/341] Improve posts search transaction entry view.

---
 Telegram/Resources/langs/lang.strings               |  1 +
 .../SourceFiles/api/api_credits_history_entry.cpp   |  1 +
 Telegram/SourceFiles/boxes/gift_premium_box.cpp     |  3 ++-
 Telegram/SourceFiles/data/data_credits.h            |  1 +
 Telegram/SourceFiles/dialogs/dialogs.style          |  1 -
 .../statistics/info_statistics_list_controllers.cpp | 13 +++++--------
 .../settings/settings_credits_graphics.cpp          |  9 +++++++--
 Telegram/SourceFiles/ui/effects/credits.style       |  1 +
 .../SourceFiles/ui/effects/credits_graphics.cpp     | 10 +++++++++-
 9 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 88ac676494..e7cff1fa3d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2902,6 +2902,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_credits_box_history_entry_ads" = "Ads Platform";
 "lng_credits_box_history_entry_premium_bot" = "Stars Top-Up";
 "lng_credits_box_history_entry_currency_in" = "TON Top-Up";
+"lng_credits_box_history_entry_posts_search" = "Posts Search";
 "lng_credits_box_history_entry_api" = "Paid Broadcast";
 "lng_credits_box_history_entry_floodskip_about#one" = "{count} Message";
 "lng_credits_box_history_entry_floodskip_about#other" = "{count} Messages";
diff --git a/Telegram/SourceFiles/api/api_credits_history_entry.cpp b/Telegram/SourceFiles/api/api_credits_history_entry.cpp
index c6acdfeb6d..dbf616471d 100644
--- a/Telegram/SourceFiles/api/api_credits_history_entry.cpp
+++ b/Telegram/SourceFiles/api/api_credits_history_entry.cpp
@@ -153,6 +153,7 @@ Data::CreditsHistoryEntry CreditsHistoryEntryFromTL(
 		.floodSkip = int(tl.data().vfloodskip_number().value_or(0)),
 		.converted = stargift && incoming,
 		.stargift = stargift.has_value(),
+		.postsSearch = tl.data().is_posts_search(),
 		.giftUpgraded = tl.data().is_stargift_upgrade(),
 		.giftResale = tl.data().is_stargift_resale(),
 		.reaction = tl.data().is_reaction(),
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 425e816af4..16fab1907a 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -1674,7 +1674,8 @@ void AddCreditsHistoryEntryTable(
 			show,
 			peerId);
 	}
-	if (actorId || (!entry.starrefCommission && peerId)) {
+	if (!entry.postsSearch
+		&& (actorId || (!entry.starrefCommission && peerId))) {
 		auto text = entry.starrefCommission
 			? tr::lng_credits_box_history_entry_referred()
 			: entry.in
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index b8d6d7f92d..aa7e29837b 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -98,6 +98,7 @@ struct CreditsHistoryEntry final {
 	bool converted : 1 = false;
 	bool anonymous : 1 = false;
 	bool stargift : 1 = false;
+	bool postsSearch : 1 = false;
 	bool giftTransferred : 1 = false;
 	bool giftRefunded : 1 = false;
 	bool giftUpgraded : 1 = false;
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index bef7689685..3484cbce3d 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -868,7 +868,6 @@ postsSearchIntroFooter: FlatLabel(defaultFlatLabel) {
 	}
 }
 postsSearchIntroFooterMargin: margins(20px, 12px, 20px, 0px);
-
 postsSearchIcon: icon {{ "box_search", windowFgActive }};
 postsSearchIconPadding: margins(12px, 1px, 6px, 0px);
 postsSearchArrow: icon {{ "dialogs/mini_arrow", windowFgActive }};
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
index 319f3be521..a486a546e9 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
@@ -887,6 +887,8 @@ void CreditsRow::init() {
 			tr::now,
 			lt_count,
 			_entry.paidMessagesCount)
+		: _entry.postsSearch
+		? tr::lng_credits_box_history_entry_posts_search(tr::now)
 		: ((!_entry.subscriptionUntil.isNull() && !isSpecial)
 			|| (_entry.giftUpgraded && !isSpecial)
 			|| (_entry.giftResale && !isSpecial)
@@ -997,14 +999,9 @@ void CreditsRow::init() {
 		}
 	}
 	if (!_paintUserpicCallback) {
-		_paintUserpicCallback = /*_entry.stargift
-			? Ui::GenerateGiftStickerUserpicCallback(
-				_session,
-				_entry.bareGiftStickerId,
-				_context.repaint)
-			: */!isSpecial
-			? PeerListRow::generatePaintUserpicCallback(false)
-			: Ui::GenerateCreditsPaintUserpicCallback(_entry);
+		_paintUserpicCallback = (isSpecial || _entry.postsSearch)
+			? Ui::GenerateCreditsPaintUserpicCallback(_entry)
+			: PeerListRow::generatePaintUserpicCallback(false);
 	}
 }
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index a52b1d0313..74ce6624a5 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1282,7 +1282,10 @@ void GenericCreditsEntryBox(
 		content->add(object_ptr<Ui::CenterWrap<>>(
 			content,
 			GenericEntryPhoto(content, callback, stUser.photoSize)));
-	} else if (peer && !e.gift && !e.premiumMonthsForStars) {
+	} else if (peer
+		&& !e.gift
+		&& !e.premiumMonthsForStars
+		&& !e.postsSearch) {
 		if (e.subscriptionUntil.isNull() && s.until.isNull()) {
 			content->add(object_ptr<Ui::CenterWrap<>>(
 				content,
@@ -1368,7 +1371,7 @@ void GenericCreditsEntryBox(
 				? st::creditsHistoryEntryStarGiftSkip
 				: st::creditsHistoryEntryGiftStickerSkip);
 		}, icon->lifetime());
-	} else {
+	} else if (!e.postsSearch) {
 		const auto widget = content->add(
 			object_ptr<Ui::CenterWrap<>>(
 				content,
@@ -1405,6 +1408,8 @@ void GenericCreditsEntryBox(
 						tr::now,
 						lt_count,
 						e.paidMessagesCount)
+					: e.postsSearch
+					? tr::lng_credits_box_history_entry_posts_search(tr::now)
 					: e.premiumMonthsForStars
 					? tr::lng_premium_summary_title(tr::now)
 					: !e.title.isEmpty()
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 4d963e2d2c..4b9fb822b3 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -99,6 +99,7 @@ tonIconEmojiInSmall: IconEmoji(tonIconEmoji) {
 }
 
 creditsHistoryEntryTypeAds: icon {{ "folders/folders_channels", premiumButtonFg }};
+creditsHistorySearchPostsIcon: icon {{ "box_search", historyPeerUserpicFg }};
 
 creditsHistoryEntryGiftStickerSkip: -20px;
 creditsHistoryEntryGiftStickerSize: 150px;
diff --git a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
index 9131ea8352..676668463d 100644
--- a/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/credits_graphics.cpp
@@ -223,6 +223,12 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 		};
 	}
 	const auto bg = [&]() -> EmptyUserpic::BgColors {
+		if (entry.postsSearch) {
+			return {
+				st::historyPeerSavedMessagesBg,
+				st::historyPeerSavedMessagesBg2,
+			};
+		}
 		switch (entry.peerType) {
 		case Data::CreditsHistoryEntry::PeerType::API:
 			return { st::historyPeer2UserpicBg, st::historyPeer2UserpicBg2 };
@@ -306,7 +312,9 @@ PaintRoundImageCallback GenerateCreditsPaintUserpicCallback(
 	return [=](Painter &p, int x, int y, int outerWidth, int size) mutable {
 		userpic->paintCircle(p, x, y, outerWidth, size);
 		const auto rect = QRect(x, y, size, size);
-		((entry.peerType == PeerType::AppStore)
+		(entry.postsSearch
+			? st::creditsHistorySearchPostsIcon
+			: (entry.peerType == PeerType::AppStore)
 			? st::sessionIconiPhone
 			: (entry.peerType == PeerType::PlayMarket)
 			? st::sessionIconAndroid

From ee85bb9a1b784206c7a03ed6453c682d9068449b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 11:36:39 +0400
Subject: [PATCH 146/341] Improve rating layout.

---
 .../info/profile/info_levels.style            | 59 ++++++++++---------
 .../SourceFiles/ui/controls/stars_rating.cpp  |  3 +-
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_levels.style b/Telegram/SourceFiles/info/profile/info_levels.style
index 9d1ae14eac..9a545eb325 100644
--- a/Telegram/SourceFiles/info/profile/info_levels.style
+++ b/Telegram/SourceFiles/info/profile/info_levels.style
@@ -12,67 +12,68 @@ LevelShape {
 	position: point;
 }
 levelStyle: TextStyle(defaultTextStyle) {
-	font: font(11px semibold);
+	font: font(9px semibold);
 }
 levelTextFg: windowFgActive;
-levelMargin: margins(6px, 6px, 6px, 6px);
+levelMargin: margins(4px, 3px, 2px, 2px);
 
 levelBase: LevelShape {
-	position: point(0px, 8px);
+	position: point(0px, 6px);
 }
 level1: LevelShape(levelBase) {
-	icon: icon {{ "levels/level1_inner-31x31", windowBgActive }};
+	position: point(-1px, 6px);
+	icon: icon {{ "levels/level1_inner-26x26", windowBgActive }};
 }
-level2: LevelShape(levelBase) {
-	icon: icon {{ "levels/level2_inner-31x31", windowBgActive }};
+level2: LevelShape(level1) {
+	icon: icon {{ "levels/level2_inner-26x26", windowBgActive }};
 }
-level3: LevelShape(levelBase) {
-	icon: icon {{ "levels/level3_inner-31x31", windowBgActive }};
+level3: LevelShape(level1) {
+	icon: icon {{ "levels/level3_inner-26x26", windowBgActive }};
 }
-level4: LevelShape(levelBase) {
-	icon: icon {{ "levels/level4_inner-31x31", windowBgActive }};
+level4: LevelShape(level1) {
+	icon: icon {{ "levels/level4_inner-26x26", windowBgActive }};
 }
-level5: LevelShape(levelBase) {
-	icon: icon {{ "levels/level5_inner-31x31", windowBgActive }};
+level5: LevelShape(level1) {
+	icon: icon {{ "levels/level5_inner-26x26", windowBgActive }};
 }
-level6: LevelShape(levelBase) {
-	icon: icon {{ "levels/level6_inner-31x31", windowBgActive }};
+level6: LevelShape(level1) {
+	icon: icon {{ "levels/level6_inner-26x26", windowBgActive }};
 }
-level7: LevelShape(levelBase) {
-	icon: icon {{ "levels/level7_inner-31x31", windowBgActive }};
+level7: LevelShape(level1) {
+	icon: icon {{ "levels/level7_inner-26x26", windowBgActive }};
 }
-level8: LevelShape(levelBase) {
-	icon: icon {{ "levels/level8_inner-31x31", windowBgActive }};
+level8: LevelShape(level1) {
+	icon: icon {{ "levels/level8_inner-26x26", windowBgActive }};
 }
-level9: LevelShape(levelBase) {
-	icon: icon {{ "levels/level9_inner-31x31", windowBgActive }};
+level9: LevelShape(level1) {
+	icon: icon {{ "levels/level9_inner-26x26", windowBgActive }};
 }
 level10: LevelShape(levelBase) {
-	icon: icon {{ "levels/level10_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level10_inner-26x26", windowBgActive }};
 }
 level20: LevelShape(levelBase) {
-	icon: icon {{ "levels/level20_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level20_inner-26x26", windowBgActive }};
 }
 level30: LevelShape(levelBase) {
-	icon: icon {{ "levels/level30_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level30_inner-26x26", windowBgActive }};
 }
 level40: LevelShape(levelBase) {
-	icon: icon {{ "levels/level40_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level40_inner-26x26", windowBgActive }};
 }
 level50: LevelShape(levelBase) {
-	icon: icon {{ "levels/level50_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level50_inner-26x26", windowBgActive }};
 }
 level60: LevelShape(levelBase) {
-	icon: icon {{ "levels/level60_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level60_inner-26x26", windowBgActive }};
 }
 level70: LevelShape(levelBase) {
-	icon: icon {{ "levels/level70_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level70_inner-26x26", windowBgActive }};
 }
 level80: LevelShape(levelBase) {
-	icon: icon {{ "levels/level80_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level80_inner-26x26", windowBgActive }};
 }
 level90: LevelShape(levelBase) {
-	icon: icon {{ "levels/level90_inner-31x31", windowBgActive }};
+	icon: icon {{ "levels/level90_inner-26x26", windowBgActive }};
 }
 levelNegative: LevelShape(levelBase) {
 	icon: icon {{ "levels/level_warning-18x18", attentionButtonFg, point(6px, 7px) }};
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index 27293ec258..e39dec86af 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -494,7 +494,8 @@ void StarsRating::updateData(Data::StarsRating rating) {
 			(rating.level < 0
 				? QString()
 				: Lang::FormatCountDecimal(rating.level)));
-		_widthValue = _shape->icon.width() - st::levelMargin.left();
+		const auto &margin = st::levelMargin;
+		_widthValue = _shape->icon.width() + margin.right() - margin.left();
 	}
 	updateWidth();
 }

From 77cec0e3387e1864e25dcca5d977a1d0dc8ea325 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 13:36:48 +0400
Subject: [PATCH 147/341] Make big Upgrade button for gifts.

---
 Telegram/Resources/langs/lang.strings         |  7 ++--
 .../SourceFiles/boxes/gift_premium_box.cpp    | 35 +++----------------
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  7 ++--
 .../settings/settings_credits_graphics.cpp    | 35 +++++++++++++++----
 4 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e7cff1fa3d..c5481df459 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3611,8 +3611,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_hidden_hint_channel" = "This gift is hidden from visitors of your channel.";
 "lng_gift_visible_hint_channel" = "This gift is visible in your channel's Gifts.";
 "lng_gift_in_blockchain" = "This gift is in TON blockchain. {link}";
-"lng_gift_in_blockchain_link" = "View >";
-"lng_gift_visible_hide" = "Hide >";
+"lng_gift_in_blockchain_link_arrow" = "View {arrow}";
+"lng_gift_visible_hide_arrow" = "Hide {arrow}";
+"lng_gift_visible_show_arrow" = "Show {arrow}";
 "lng_gift_show_on_page" = "Display on my Page";
 "lng_gift_show_on_channel" = "Display in channel's Gifts";
 "lng_gift_availability" = "Availability";
@@ -3631,7 +3632,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_unique_address_copied" = "Address copied to clipboard.";
 "lng_gift_unique_status" = "Status";
 "lng_gift_unique_status_non" = "Non-Unique";
-"lng_gift_unique_status_upgrade" = "upgrade";
+"lng_gift_unique_upgrade" = "Upgrade";
 "lng_gift_unique_number" = "Collectible #{index}";
 "lng_gift_unique_number_by" = "Collectible #{index} by {name}";
 "lng_gift_unique_model" = "Model";
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 16fab1907a..0da643c073 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -466,8 +466,7 @@ void AddTableRow(
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeNonUniqueStatusTableValue(
-		not_null<Ui::TableLayout*> table,
-		Fn<void()> startUpgrade) {
+		not_null<Ui::TableLayout*> table) {
 	auto result = object_ptr<Ui::RpWidget>(table);
 	const auto raw = result.data();
 
@@ -477,34 +476,10 @@ void AddTableRow(
 		table->st().defaultValue,
 		st::defaultPopupMenu);
 
-	const auto upgrade = startUpgrade
-		? Ui::CreateChild<Ui::RoundButton>(
-			raw,
-			tr::lng_gift_unique_status_upgrade(),
-			table->st().smallButton)
-		: (Ui::RoundButton*)(nullptr);
-	if (upgrade) {
-		using namespace Ui;
-		upgrade->setTextTransform(RoundButton::TextTransform::NoTransform);
-		upgrade->setClickedCallback(startUpgrade);
-	}
-
-	rpl::combine(
-		raw->widthValue(),
-		upgrade ? upgrade->widthValue() : rpl::single(0)
-	) | rpl::start_with_next([=](int width, int toggleWidth) {
-		const auto toggleSkip = toggleWidth
-			? (st::normalFont->spacew + toggleWidth)
-			: 0;
-		label->resizeToNaturalWidth(width - toggleSkip);
+	raw->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		label->resizeToNaturalWidth(width);
 		label->moveToLeft(0, 0, width);
-		if (upgrade) {
-			upgrade->moveToLeft(
-				label->width() + st::normalFont->spacew,
-				(table->st().defaultValue.style.font->ascent
-					- table->st().smallButton.style.font->ascent),
-				width);
-		}
 	}, label->lifetime());
 
 	label->heightValue() | rpl::start_with_next([=](int height) {
@@ -1525,7 +1500,7 @@ void AddStarGiftTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_status(),
-			MakeNonUniqueStatusTableValue(table, std::move(startUpgrade)),
+			MakeNonUniqueStatusTableValue(table),
 			marginWithButton);
 	}
 	if (unique) {
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 175f951031..ef50dea3d6 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -4967,9 +4967,10 @@ void UpgradeBox(
 			(cost
 				? tr::lng_gift_upgrade_button(
 					lt_price,
-					rpl::single(star.append(
-						' ' + Lang::FormatCreditsAmountDecimal(
-							CreditsAmount{ cost }))),
+					rpl::single(Ui::Text::IconEmoji(
+						&st::starIconEmoji
+					).append(' ').append(Lang::FormatCreditsAmountDecimal(
+						CreditsAmount{ cost }))),
 					Ui::Text::WithEntities)
 				: tr::lng_gift_upgrade_confirm(Ui::Text::WithEntities)),
 			helper.context(),
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 74ce6624a5..9f5338da4b 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1884,14 +1884,29 @@ void GenericCreditsEntryBox(
 		const auto visiblePhrase = giftToChannelCanManage
 			? tr::lng_gift_visible_hint_channel
 			: tr::lng_gift_visible_hint;
-		auto withHide = rpl::combine(
-			visiblePhrase(),
-			tr::lng_gift_visible_hide()
-		) | rpl::map([](QString &&hint, QString &&hide) {
+		auto withShow = rpl::combine(
+			hiddenPhrase(),
+			tr::lng_gift_visible_show_arrow(
+				lt_arrow,
+				rpl::single(arrow),
+				Ui::Text::WithEntities)
+		) | rpl::map([=](QString &&hint, const TextWithEntities &hide) {
 			return TextWithEntities{ std::move(hint) }.append(' ').append(
 				Ui::Text::Link(std::move(hide)));
 		});
-		auto text = !e.savedToProfile
+		auto withHide = rpl::combine(
+			visiblePhrase(),
+			tr::lng_gift_visible_hide_arrow(
+				lt_arrow,
+				rpl::single(arrow),
+				Ui::Text::WithEntities)
+		) | rpl::map([](QString &&hint, const TextWithEntities &hide) {
+			return TextWithEntities{ std::move(hint) }.append(' ').append(
+				Ui::Text::Link(std::move(hide)));
+		});
+		auto text = (!e.savedToProfile && canToggle && canUpgrade)
+			? std::move(withShow)
+			: !e.savedToProfile
 			? hiddenPhrase(Ui::Text::WithEntities)
 			: canToggle
 			? std::move(withHide)
@@ -1921,7 +1936,11 @@ void GenericCreditsEntryBox(
 				box,
 				tr::lng_gift_in_blockchain(
 					lt_link,
-					tr::lng_gift_in_blockchain_link() | Ui::Text::ToLink(),
+					tr::lng_gift_in_blockchain_link_arrow(
+						lt_arrow,
+						rpl::single(arrow),
+						Ui::Text::WithEntities
+					) | Ui::Text::ToLink(),
 					Ui::Text::WithEntities),
 				st::creditsBoxAboutDivider));
 		label->setClickHandlerFilter([=](const auto &...) {
@@ -2005,6 +2024,8 @@ void GenericCreditsEntryBox(
 			? tr::lng_credits_subscription_off_rejoin_button()
 			: canUpgradeFree
 			? tr::lng_gift_upgrade_free()
+			: canUpgrade
+			? tr::lng_gift_unique_upgrade()
 			: (canToggle && !e.savedToProfile)
 			? (e.giftChannelSavedId
 				? tr::lng_gift_show_on_channel
@@ -2074,7 +2095,7 @@ void GenericCreditsEntryBox(
 				e.giftResaleForceTon,
 				to,
 				crl::guard(box, [=] { box->closeBox(); }));
-		} else if (canUpgradeFree) {
+		} else if (canUpgrade) {
 			upgrade();
 		} else if (canToggle && !e.savedToProfile) {
 			toggleVisibility(true);

From 86cffae001e871adb37b48ee6463114f4c08da33 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 15:23:58 +0400
Subject: [PATCH 148/341] Remove unused function.

---
 Telegram/SourceFiles/data/stickers/data_custom_emoji.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
index 003861142c..c35d7520fb 100644
--- a/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
+++ b/Telegram/SourceFiles/data/stickers/data_custom_emoji.h
@@ -90,8 +90,6 @@ public:
 
 	[[nodiscard]] uint64 coloredSetId() const;
 
-	[[nodiscard]] TextWithEntities creditsEmoji(QMargins padding = {});
-
 private:
 	static constexpr auto kSizeCount = int(SizeTag::kCount);
 

From 60f6ea3252310439866e6656a031f4c78f64fc18 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 16:22:02 +0400
Subject: [PATCH 149/341] Show informative empty posts search.

---
 Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp   | 4 +++-
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 4 ++++
 Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp  | 7 +++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
index f5211b879b..626c96151f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_search_posts.cpp
@@ -117,7 +117,9 @@ void PostsSearch::pushStateUpdate(const Entry &entry) {
 		}
 		return;
 	}
-	if (!entry.pages.empty() || entry.loaded) {
+	const auto empty = entry.pages.empty()
+		|| (entry.pages.size() == 1 && entry.pages.front().empty());
+	if (!empty || (entry.loaded && !_query->isEmpty())) {
 		if (!entry.pages.empty()) {
 			++entry.pagesPushed;
 		}
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index cbc30b9646..2b18340e17 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -2020,6 +2020,10 @@ void Suggestions::setupPostsIntro(const PostsSearchIntroState &intro) {
 		}
 	}, _postsSearchIntro->lifetime());
 
+	_postsScroll->heightValue() | rpl::start_with_next([=](int height) {
+		_postsWrap->resize(_postsWrap->width(), height);
+	}, _postsSearchIntro->lifetime());
+
 	_postsSearchIntro->show();
 	updateControlsGeometry();
 }
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index 143fe48f54..086976f035 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -198,6 +198,12 @@ void PostsSearchIntro::setup() {
 
 	_state.value(
 	) | rpl::start_with_next([=](const PostsSearchIntroState &state) {
+		if (state.query.trimmed().isEmpty()) {
+			_button->resize(_button->width(), 0);
+			_content->resizeToWidth(width());
+			return;
+		}
+
 		auto copy = _button->children();
 		for (const auto child : copy) {
 			delete child;
@@ -232,6 +238,7 @@ void PostsSearchIntro::setup() {
 				st::resaleButtonTitle,
 				st::resaleButtonSubtitle);
 		}
+		_button->resize(_button->width(), st::postsSearchIntroButton.height);
 		_content->resizeToWidth(width());
 	}, _button->lifetime());
 }

From 87cdc2299002cd25cb1bd7d26b28685cc8dd162a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Aug 2025 20:23:51 +0400
Subject: [PATCH 150/341] Fix marking read in new forum layout.

---
 Telegram/SourceFiles/data/data_forum.cpp     | 28 ++++++++
 Telegram/SourceFiles/data/data_forum.h       |  5 ++
 Telegram/SourceFiles/data/data_histories.cpp |  2 +-
 Telegram/SourceFiles/history/history.cpp     | 74 +++++++++++++++++---
 Telegram/SourceFiles/history/history.h       |  7 +-
 5 files changed, 105 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_forum.cpp b/Telegram/SourceFiles/data/data_forum.cpp
index 3890b4c0ed..0a20f0aeac 100644
--- a/Telegram/SourceFiles/data/data_forum.cpp
+++ b/Telegram/SourceFiles/data/data_forum.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_session.h"
 #include "data/data_forum_icons.h"
 #include "data/data_forum_topic.h"
+#include "data/data_replies_list.h"
 #include "data/notify/data_notify_settings.h"
 #include "history/history.h"
 #include "history/history_item.h"
@@ -276,6 +277,33 @@ Thread *Forum::activeSubsectionThread() const {
 	return _activeSubsectionTopic;
 }
 
+void Forum::markUnreadCountsUnknown(MsgId readTillId) {
+	if (!channel()->useSubsectionTabs()) {
+		return;
+	}
+	for (const auto &[rootId, topic] : _topics) {
+		const auto replies = topic->replies();
+		if (replies->unreadCountCurrent() > 0) {
+			replies->setInboxReadTill(readTillId, std::nullopt);
+		}
+	}
+}
+
+void Forum::updateUnreadCounts(
+		MsgId readTillId,
+		const base::flat_map<not_null<ForumTopic*>, int> &counts) {
+	if (!channel()->useSubsectionTabs()) {
+		return;
+	}
+	for (const auto &[rootId, topic] : _topics) {
+		const auto raw = topic.get();
+		const auto replies = raw->replies();
+		const auto i = counts.find(raw);
+		const auto count = (i != end(counts)) ? i->second : 0;
+		replies->setInboxReadTill(readTillId, count);
+	}
+}
+
 void Forum::listMessageChanged(HistoryItem *from, HistoryItem *to) {
 	if (from || to) {
 		reorderLastTopics();
diff --git a/Telegram/SourceFiles/data/data_forum.h b/Telegram/SourceFiles/data/data_forum.h
index ae0cc2d1a5..cccacadeef 100644
--- a/Telegram/SourceFiles/data/data_forum.h
+++ b/Telegram/SourceFiles/data/data_forum.h
@@ -99,6 +99,11 @@ public:
 	void saveActiveSubsectionThread(not_null<Thread*> thread);
 	[[nodiscard]] Thread *activeSubsectionThread() const;
 
+	void markUnreadCountsUnknown(MsgId readTillId);
+	void updateUnreadCounts(
+		MsgId readTillId,
+		const base::flat_map<not_null<ForumTopic*>, int> &counts);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index f114f6d433..30983b9347 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -713,7 +713,7 @@ void Histories::sendReadRequest(not_null<History*> history, State &state) {
 			} else {
 				Assert(!state->sentReadTill || state->sentReadTill > tillId);
 			}
-			history->validateMonoforumUnread(tillId);
+			history->validateMonoAndForumUnread(tillId);
 			sendReadRequests();
 			finish();
 		};
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index ed146023f4..88a786f38a 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -33,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_channel_admins.h"
 #include "data/data_changes.h"
 #include "data/data_chat_filters.h"
+#include "data/data_replies_list.h"
 #include "data/data_send_action.h"
 #include "data/data_star_gift.h"
 #include "data/data_emoji_statuses.h"
@@ -3156,6 +3157,58 @@ void History::applyDialogTopMessage(MsgId topMessageId) {
 	}
 }
 
+void History::tryMarkForumIntervalRead(
+		MsgId wasInboxReadBefore,
+		MsgId nowInboxReadBefore) {
+	if (!isForum()
+		|| !peer->asChannel()->useSubsectionTabs()
+		|| (nowInboxReadBefore <= wasInboxReadBefore)) {
+		return;
+	} else if (loadedAtBottom() && nowInboxReadBefore >= minMsgId()) {
+		// Count for each sublist how many messages are still not read.
+		auto counts = base::flat_map<not_null<Data::ForumTopic*>, int>();
+		for (const auto &block : blocks) {
+			for (const auto &message : block->messages) {
+				const auto item = message->data();
+				if (!item->isRegular() || item->id < nowInboxReadBefore) {
+					continue;
+				}
+				if (const auto topic = item->topic()) {
+					++counts[topic];
+				}
+			}
+		}
+		if (const auto forum = peer->forum()) {
+			forum->updateUnreadCounts(nowInboxReadBefore - 1, counts);
+		}
+	} else if (minMsgId() <= wasInboxReadBefore
+		&& maxMsgId() >= nowInboxReadBefore) {
+		// Count for each sublist how many messages were read.
+		for (const auto &block : blocks) {
+			for (const auto &message : block->messages) {
+				const auto item = message->data();
+				if (!item->isRegular() || item->id < wasInboxReadBefore) {
+					continue;
+				} else if (item->id >= nowInboxReadBefore) {
+					break;
+				}
+				if (const auto topic = item->topic()) {
+					const auto replies = topic->replies();
+					const auto unread = replies->unreadCountCurrent();
+					if (unread > 0) {
+						replies->setInboxReadTill(item->id, unread - 1);
+					}
+				}
+			}
+		}
+	} else {
+		// We can't invalidate sublist unread counts here, because no read
+		// request was yet sent to the server (so it can't return correct
+		// values yet), we need to do that after we send read request.
+		_flags |= Flag::MonoAndForumUnreadInvalidatePending;
+	}
+}
+
 void History::tryMarkMonoforumIntervalRead(
 		MsgId wasInboxReadBefore,
 		MsgId nowInboxReadBefore) {
@@ -3201,24 +3254,29 @@ void History::tryMarkMonoforumIntervalRead(
 		// We can't invalidate sublist unread counts here, because no read
 		// request was yet sent to the server (so it can't return correct
 		// values yet), we need to do that after we send read request.
-		_flags |= Flag::MonoforumUnreadInvalidatePending;
+		_flags |= Flag::MonoAndForumUnreadInvalidatePending;
 	}
 }
 
-void History::validateMonoforumUnread(MsgId readTillId) {
-	if (!(_flags & Flag::MonoforumUnreadInvalidatePending)) {
+void History::validateMonoAndForumUnread(MsgId readTillId) {
+	if (!(_flags & Flag::MonoAndForumUnreadInvalidatePending)) {
 		return;
 	}
-	_flags &= ~Flag::MonoforumUnreadInvalidatePending;
-	if (!amMonoforumAdmin()) {
-		return;
-	} else if (const auto monoforum = peer->monoforum()) {
-		monoforum->markUnreadCountsUnknown(readTillId);
+	_flags &= ~Flag::MonoAndForumUnreadInvalidatePending;
+	if (isForum()) {
+		if (const auto forum = peer->forum()) {
+			forum->markUnreadCountsUnknown(readTillId);
+		}
+	} else if (amMonoforumAdmin()) {
+		if (const auto monoforum = peer->monoforum()) {
+			monoforum->markUnreadCountsUnknown(readTillId);
+		}
 	}
 }
 
 void History::setInboxReadTill(MsgId upTo) {
 	if (_inboxReadBefore) {
+		tryMarkForumIntervalRead(*_inboxReadBefore, upTo + 1);
 		tryMarkMonoforumIntervalRead(*_inboxReadBefore, upTo + 1);
 		accumulate_max(*_inboxReadBefore, upTo + 1);
 	} else {
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 047a341094..40ee83ceef 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -434,7 +434,10 @@ public:
 	void tryMarkMonoforumIntervalRead(
 		MsgId wasInboxReadBefore,
 		MsgId nowInboxReadBefore);
-	void validateMonoforumUnread(MsgId readTillId);
+	void tryMarkForumIntervalRead(
+		MsgId wasInboxReadBefore,
+		MsgId nowInboxReadBefore);
+	void validateMonoAndForumUnread(MsgId readTillId);
 
 	[[nodiscard]] bool isTopPromoted() const;
 
@@ -480,7 +483,7 @@ private:
 		FakeUnreadWhileOpened = (1 << 5),
 		HasPinnedMessages = (1 << 6),
 		ResolveChatListMessage = (1 << 7),
-		MonoforumUnreadInvalidatePending = (1 << 8),
+		MonoAndForumUnreadInvalidatePending = (1 << 8),
 	};
 	using Flags = base::flags<Flag>;
 	friend inline constexpr auto is_flag_type(Flag) {

From cc98f7da36c28d4ae710c636e2fb5cc240500337 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Aug 2025 20:24:15 +0400
Subject: [PATCH 151/341] Fix topic unread count badges.

---
 .../SourceFiles/history/view/history_view_subsection_tabs.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
index 19036b8788..f1bb1f33c2 100644
--- a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
@@ -728,7 +728,7 @@ void SubsectionTabs::refreshSlice() {
 			}
 			return thread->chatListBadgesState();
 		}();
-		if (topic) {
+		if (topic && badges.unreadCounter <= 0) {
 			// Don't show the small indicators for non-visited unread topics.
 			badges.unread = false;
 		}

From d60bfa238f84054aaaad7b39e2af77b828e97838 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 11 Aug 2025 13:54:52 +0400
Subject: [PATCH 152/341] Merge TWidget* into Ui::RpWidget*.

---
 Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp       | 2 +-
 Telegram/SourceFiles/chat_helpers/bot_keyboard.h         | 4 ++--
 .../chat_helpers/emoji_suggestions_widget.cpp            | 4 ++--
 Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp       | 2 +-
 .../history/admin_log/history_admin_log_inner.cpp        | 6 +++---
 .../history/admin_log/history_admin_log_inner.h          | 2 +-
 .../history/admin_log/history_admin_log_section.cpp      | 7 ++++---
 Telegram/SourceFiles/history/history_inner_widget.cpp    | 6 +++---
 Telegram/SourceFiles/history/history_widget.cpp          | 4 ++--
 .../history/view/history_view_list_widget.cpp            | 6 +++---
 .../history/view/history_view_top_bar_widget.h           | 2 +-
 .../SourceFiles/inline_bots/inline_results_widget.cpp    | 2 +-
 Telegram/SourceFiles/media/player/media_player_panel.cpp | 2 +-
 .../SourceFiles/media/view/media_view_overlay_widget.h   | 9 ---------
 Telegram/SourceFiles/profile/profile_cover_drop_area.cpp | 6 +++++-
 Telegram/SourceFiles/profile/profile_cover_drop_area.h   | 2 +-
 Telegram/SourceFiles/ui/filter_icon_panel.cpp            | 2 +-
 Telegram/SourceFiles/ui/widgets/color_editor.cpp         | 8 ++++----
 Telegram/SourceFiles/ui/widgets/multi_select.cpp         | 4 ++--
 Telegram/SourceFiles/window/main_window.cpp              | 2 +-
 Telegram/SourceFiles/window/main_window.h                | 4 ++--
 .../SourceFiles/window/notifications_manager_default.cpp | 2 +-
 .../SourceFiles/window/notifications_manager_default.h   | 2 +-
 Telegram/SourceFiles/window/themes/window_theme_editor.h | 2 +-
 .../SourceFiles/window/themes/window_theme_warning.cpp   | 2 +-
 .../SourceFiles/window/themes/window_theme_warning.h     | 2 +-
 Telegram/SourceFiles/window/window_controller.cpp        | 2 +-
 Telegram/SourceFiles/window/window_controller.h          | 2 +-
 Telegram/lib_ui                                          | 2 +-
 29 files changed, 49 insertions(+), 53 deletions(-)

diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
index f455a965a3..e3ddd4d689 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.cpp
@@ -126,7 +126,7 @@ int Style::minButtonWidth(HistoryMessageMarkupButton::Type type) const {
 BotKeyboard::BotKeyboard(
 	not_null<Window::SessionController*> controller,
 	QWidget *parent)
-: TWidget(parent)
+: RpWidget(parent)
 , _controller(controller)
 , _st(&st::botKbButton) {
 	setGeometry(0, 0, _st->margin, st::botKbScroll.deltat);
diff --git a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
index 622bbd5bef..712d79b009 100644
--- a/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
+++ b/Telegram/SourceFiles/chat_helpers/bot_keyboard.h
@@ -21,7 +21,7 @@ class SessionController;
 } // namespace Window
 
 class BotKeyboard
-	: public TWidget
+	: public Ui::RpWidget
 	, public Ui::AbstractTooltipShower
 	, public ClickHandlerHost {
 public:
@@ -44,7 +44,7 @@ public:
 	void step_selected(crl::time ms, bool timer);
 	void resizeToWidth(int newWidth, int maxOuterHeight) {
 		_maxOuterHeight = maxOuterHeight;
-		return TWidget::resizeToWidth(newWidth);
+		return RpWidget::resizeToWidth(newWidth);
 	}
 
 	[[nodiscard]] bool maximizeSize() const;
diff --git a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
index 16f3a8f73a..b0a1cd5f24 100644
--- a/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_suggestions_widget.cpp
@@ -704,12 +704,12 @@ void SuggestionsWidget::enterEventHook(QEnterEvent *e) {
 	if (!inner().contains(mapToInner(QCursor::pos()))) {
 		clearMouseSelection();
 	}
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void SuggestionsWidget::leaveEventHook(QEvent *e) {
 	clearMouseSelection();
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 SuggestionsController::SuggestionsController(
diff --git a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
index 5ff9b9ab93..a3d8ba3968 100644
--- a/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
@@ -277,7 +277,7 @@ void TabbedPanel::leaveEventHook(QEvent *e) {
 	} else {
 		_hideTimer.callOnce(kHideTimeoutMs);
 	}
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void TabbedPanel::otherEnter() {
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
index c47e562fae..6c956ac39f 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
@@ -1008,7 +1008,7 @@ void InnerWidget::itemsAdded(Direction direction, int addedCount) {
 }
 
 void InnerWidget::updateSize() {
-	TWidget::resizeToWidth(width());
+	RpWidget::resizeToWidth(width());
 	restoreScrollPosition();
 	updateVisibleTopItem();
 	checkPreloadMore();
@@ -1684,7 +1684,7 @@ void InnerWidget::mouseReleaseEvent(QMouseEvent *e) {
 
 void InnerWidget::enterEventHook(QEnterEvent *e) {
 	mouseActionUpdate(QCursor::pos());
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void InnerWidget::leaveEventHook(QEvent *e) {
@@ -1698,7 +1698,7 @@ void InnerWidget::leaveEventHook(QEvent *e) {
 		_cursor = style::cur_default;
 		setCursor(_cursor);
 	}
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void InnerWidget::mouseActionStart(const QPoint &screenPos, Qt::MouseButton button) {
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
index 9f58afb921..bd537fe141 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.h
@@ -77,7 +77,7 @@ public:
 
 	void resizeToWidth(int newWidth, int minHeight) {
 		_minHeight = minHeight;
-		return TWidget::resizeToWidth(newWidth);
+		return RpWidget::resizeToWidth(newWidth);
 	}
 
 	void saveState(not_null<SectionMemento*> memento);
diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
index 56fce9db19..b8f2177332 100644
--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
+++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_section.cpp
@@ -37,7 +37,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace AdminLog {
 
-class FixedBar final : public TWidget {
+class FixedBar final : public Ui::RpWidget {
 public:
 	FixedBar(
 		QWidget *parent,
@@ -109,7 +109,8 @@ object_ptr<Window::SectionWidget> SectionMemento::createWidget(
 FixedBar::FixedBar(
 	QWidget *parent,
 	not_null<Window::SessionController*> controller,
-	not_null<ChannelData*> channel) : TWidget(parent)
+	not_null<ChannelData*> channel)
+: RpWidget(parent)
 , _controller(controller)
 , _channel(channel)
 , _field(this, st::defaultMultiSelectSearchField, tr::lng_dlg_filter())
@@ -276,7 +277,7 @@ void FixedBar::mousePressEvent(QMouseEvent *e) {
 	if (e->button() == Qt::LeftButton) {
 		goBack();
 	} else {
-		TWidget::mousePressEvent(e);
+		RpWidget::mousePressEvent(e);
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index bdfe45ca02..6ffd488289 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -3732,7 +3732,7 @@ void HistoryInner::setShownPinned(HistoryItem *item) {
 void HistoryInner::enterEventHook(QEnterEvent *e) {
 	_mouseActive = true;
 	mouseActionUpdate(QCursor::pos());
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void HistoryInner::leaveEventHook(QEvent *e) {
@@ -3748,7 +3748,7 @@ void HistoryInner::leaveEventHook(QEvent *e) {
 		setCursor(_cursor);
 	}
 	_mouseActive = false;
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 HistoryInner::~HistoryInner() {
@@ -3770,7 +3770,7 @@ HistoryInner::~HistoryInner() {
 
 bool HistoryInner::focusNextPrevChild(bool next) {
 	if (_selected.empty()) {
-		return TWidget::focusNextPrevChild(next);
+		return RpWidget::focusNextPrevChild(next);
 	} else {
 		clearSelected();
 		return true;
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index ca8901fabe..a077bbd51b 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5187,7 +5187,7 @@ void HistoryWidget::updateOverStates(QPoint pos) {
 }
 
 void HistoryWidget::leaveToChildEvent(QEvent *e, QWidget *child) {
-// e -- from enterEvent() of child TWidget
+// e -- from enterEvent() of child RpWidget
 	if (hasMouseTracking()) {
 		updateOverStates(mapFromGlobal(QCursor::pos()));
 	}
@@ -5367,7 +5367,7 @@ bool HistoryWidget::eventFilter(QObject *obj, QEvent *e) {
 			}
 		}
 	}
-	return TWidget::eventFilter(obj, e);
+	return RpWidget::eventFilter(obj, e);
 }
 
 bool HistoryWidget::floatPlayerHandleWheelEvent(QEvent *e) {
diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
index 6a46231354..f2ff933bba 100644
--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp
@@ -1993,7 +1993,7 @@ void ListWidget::updateSize() {
 
 void ListWidget::resizeToWidth(int newWidth, int minHeight) {
 	_minHeight = minHeight;
-	TWidget::resizeToWidth(newWidth);
+	RpWidget::resizeToWidth(newWidth);
 	restoreScrollPosition();
 }
 
@@ -3205,7 +3205,7 @@ rpl::producer<bool> ListWidget::touchMaybeSelectingValue() const {
 void ListWidget::enterEventHook(QEnterEvent *e) {
 	_mouseActive = true;
 	mouseActionUpdate(QCursor::pos());
-	return TWidget::enterEventHook(e);
+	return RpWidget::enterEventHook(e);
 }
 
 void ListWidget::leaveEventHook(QEvent *e) {
@@ -3225,7 +3225,7 @@ void ListWidget::leaveEventHook(QEvent *e) {
 		setCursor(_cursor);
 	}
 	_mouseActive = false;
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void ListWidget::updateDragSelection() {
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
index 2af2448c72..5bbd5182d5 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.h
@@ -233,7 +233,7 @@ private:
 	object_ptr<Ui::IconButton> _menuToggle;
 	base::unique_qptr<Ui::PopupMenu> _menu;
 
-	object_ptr<TWidget> _membersShowArea = { nullptr };
+	object_ptr<RpWidget> _membersShowArea = { nullptr };
 	rpl::event_stream<bool> _membersShowAreaActive;
 
 	float64 _narrowRatio = 0.;
diff --git a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
index b0dd0e5b72..c5cf41ce8b 100644
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@@ -80,7 +80,7 @@ Widget::Widget(
 	// Inner widget has OpaquePaintEvent attribute so it doesn't repaint on scroll.
 	// But we should force it to repaint so that GIFs will continue to animate without update() calls.
 	// We do that by creating a transparent widget above our _inner.
-	auto forceRepaintOnScroll = object_ptr<TWidget>(this);
+	auto forceRepaintOnScroll = object_ptr<RpWidget>(this);
 	forceRepaintOnScroll->setGeometry(innerRect().x() + st::roundRadiusSmall, innerRect().y() + st::roundRadiusSmall, st::roundRadiusSmall, st::roundRadiusSmall);
 	forceRepaintOnScroll->setAttribute(Qt::WA_TransparentForMouseEvents);
 	forceRepaintOnScroll->show();
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 2b7ab6d823..9da485b116 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -99,7 +99,7 @@ void Panel::updateControlsGeometry() {
 	if (scrollHeight > 0) {
 		_scroll->setGeometryToRight(contentRight(), scrollTop, width, scrollHeight);
 	}
-	if (const auto widget = static_cast<TWidget*>(_scroll->widget())) {
+	if (const auto widget = static_cast<RpWidget*>(_scroll->widget())) {
 		widget->resizeToWidth(width);
 	}
 }
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
index 2044d9caae..2ec83512be 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.h
@@ -109,15 +109,6 @@ public:
 
 	void show(OpenRequest request);
 
-	//void leaveToChildEvent(QEvent *e, QWidget *child) override {
-	//	// e -- from enterEvent() of child TWidget
-	//	updateOverState(Over::None);
-	//}
-	//void enterFromChildEvent(QEvent *e, QWidget *child) override {
-	//	// e -- from leaveEvent() of child TWidget
-	//	updateOver(mapFromGlobal(QCursor::pos()));
-	//}
-
 	void activateControls();
 	void close();
 	void minimize();
diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
index 6b10b827a3..4f686130bf 100644
--- a/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
+++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.cpp
@@ -12,7 +12,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Profile {
 
-CoverDropArea::CoverDropArea(QWidget *parent, const QString &title, const QString &subtitle) : TWidget(parent)
+CoverDropArea::CoverDropArea(
+	QWidget *parent,
+	const QString &title,
+	const QString &subtitle)
+: RpWidget(parent)
 , _title(title)
 , _subtitle(subtitle)
 , _titleWidth(st::profileDropAreaTitleFont->width(_title))
diff --git a/Telegram/SourceFiles/profile/profile_cover_drop_area.h b/Telegram/SourceFiles/profile/profile_cover_drop_area.h
index 156d53adea..ee5b455518 100644
--- a/Telegram/SourceFiles/profile/profile_cover_drop_area.h
+++ b/Telegram/SourceFiles/profile/profile_cover_drop_area.h
@@ -12,7 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Profile {
 
-class CoverDropArea : public TWidget {
+class CoverDropArea : public Ui::RpWidget {
 public:
 	CoverDropArea(QWidget *parent, const QString &title, const QString &subtitle);
 
diff --git a/Telegram/SourceFiles/ui/filter_icon_panel.cpp b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
index 34299d15c3..de82ad7700 100644
--- a/Telegram/SourceFiles/ui/filter_icon_panel.cpp
+++ b/Telegram/SourceFiles/ui/filter_icon_panel.cpp
@@ -296,7 +296,7 @@ void FilterIconPanel::leaveEventHook(QEvent *e) {
 	} else {
 		_hideTimer.callOnce(kHideTimeoutMs);
 	}
-	return TWidget::leaveEventHook(e);
+	return RpWidget::leaveEventHook(e);
 }
 
 void FilterIconPanel::otherEnter() {
diff --git a/Telegram/SourceFiles/ui/widgets/color_editor.cpp b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
index c8fc937f8b..8b21f06ba3 100644
--- a/Telegram/SourceFiles/ui/widgets/color_editor.cpp
+++ b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
@@ -17,7 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_boxes.h"
 #include "styles/style_media_view.h"
 
-class ColorEditor::Picker : public TWidget {
+class ColorEditor::Picker : public Ui::RpWidget {
 public:
 	Picker(QWidget *parent, Mode mode, QColor color);
 
@@ -94,7 +94,7 @@ QCursor ColorEditor::Picker::generateCursor() {
 }
 
 ColorEditor::Picker::Picker(QWidget *parent, Mode mode, QColor color)
-: TWidget(parent)
+: RpWidget(parent)
 , _mode(mode) {
 	setCursor(generateCursor());
 
@@ -292,7 +292,7 @@ void ColorEditor::Picker::setFromColor(QColor color) {
 	}
 }
 
-class ColorEditor::Slider : public TWidget {
+class ColorEditor::Slider : public Ui::RpWidget {
 public:
 	enum class Direction {
 		Horizontal,
@@ -365,7 +365,7 @@ ColorEditor::Slider::Slider(
 	Direction direction,
 	Type type,
 	QColor color)
-: TWidget(parent)
+: RpWidget(parent)
 , _direction(direction)
 , _type(type)
 , _color(color.red(), color.green(), color.blue())
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index 8c9649f375..30435a0e10 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -409,7 +409,7 @@ void Item::setOver(bool over) {
 
 } // namespace
 
-class MultiSelect::Inner : public TWidget {
+class MultiSelect::Inner : public RpWidget {
 public:
 	using ScrollCallback = Fn<void(int activeTop, int activeBottom)>;
 	Inner(
@@ -652,7 +652,7 @@ MultiSelect::Inner::Inner(
 	rpl::producer<QString> placeholder,
 	const QString &query,
 	ScrollCallback callback)
-: TWidget(parent)
+: RpWidget(parent)
 , _st(st)
 , _scrollCallback(std::move(callback))
 , _field(this, _st.field, std::move(placeholder), query)
diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp
index 8b220f9792..4ff5bb644a 100644
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -995,7 +995,7 @@ bool MainWindow::minimizeToTray() {
 	return true;
 }
 
-void MainWindow::showRightColumn(object_ptr<TWidget> widget) {
+void MainWindow::showRightColumn(object_ptr<Ui::RpWidget> widget) {
 	const auto wasWidth = width();
 	const auto wasRightWidth = _rightColumn ? _rightColumn->width() : 0;
 	_rightColumn = std::move(widget);
diff --git a/Telegram/SourceFiles/window/main_window.h b/Telegram/SourceFiles/window/main_window.h
index d0b5fedcef..a37988cf5a 100644
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -100,7 +100,7 @@ public:
 	}
 	void positionUpdated();
 
-	void showRightColumn(object_ptr<TWidget> widget);
+	void showRightColumn(object_ptr<Ui::RpWidget> widget);
 	int maximalExtendBy() const;
 	bool canExtendNoMove(int extendBy) const;
 
@@ -215,7 +215,7 @@ private:
 	object_ptr<Ui::PlainShadow> _titleShadow = { nullptr };
 	object_ptr<Ui::RpWidget> _outdated;
 	object_ptr<Ui::RpWidget> _body;
-	object_ptr<TWidget> _rightColumn = { nullptr };
+	object_ptr<Ui::RpWidget> _rightColumn = { nullptr };
 
 	bool _isActive = false;
 
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index e5a0a78ac1..441f97eae3 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -621,7 +621,7 @@ QPoint Widget::computePosition(int height) const {
 	return QPoint(_startPosition.x(), _startPosition.y() + realShift);
 }
 
-Background::Background(QWidget *parent) : TWidget(parent) {
+Background::Background(QWidget *parent) : RpWidget(parent) {
 	setAttribute(Qt::WA_OpaquePaintEvent);
 }
 
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.h b/Telegram/SourceFiles/window/notifications_manager_default.h
index 219ce8d83a..7a2356101d 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.h
+++ b/Telegram/SourceFiles/window/notifications_manager_default.h
@@ -190,7 +190,7 @@ private:
 
 };
 
-class Background : public TWidget {
+class Background : public Ui::RpWidget {
 public:
 	Background(QWidget *parent);
 
diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.h b/Telegram/SourceFiles/window/themes/window_theme_editor.h
index c875e79dbd..4d1a03f4b8 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.h
@@ -47,7 +47,7 @@ struct ParsedTheme {
 [[nodiscard]] Data::CloudTheme ReadCloudFromText(const QByteArray &text);
 [[nodiscard]] QByteArray StripCloudTextFields(const QByteArray &text);
 
-class Editor : public TWidget {
+class Editor : public Ui::RpWidget {
 public:
 	Editor(
 		QWidget*,
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
index 8323de02d3..bb53332f7f 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.cpp
@@ -26,7 +26,7 @@ constexpr int kWaitBeforeRevertMs = 15999;
 } // namespace
 
 WarningWidget::WarningWidget(QWidget *parent)
-: TWidget(parent)
+: RpWidget(parent)
 , _timer([=] { handleTimer(); })
 , _secondsLeft(kWaitBeforeRevertMs / 1000)
 , _keepChanges(this, tr::lng_theme_keep_changes(), st::defaultBoxButton)
diff --git a/Telegram/SourceFiles/window/themes/window_theme_warning.h b/Telegram/SourceFiles/window/themes/window_theme_warning.h
index ec35c34965..80b47bc058 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_warning.h
+++ b/Telegram/SourceFiles/window/themes/window_theme_warning.h
@@ -19,7 +19,7 @@ class RoundButton;
 namespace Window {
 namespace Theme {
 
-class WarningWidget : public TWidget {
+class WarningWidget : public Ui::RpWidget {
 public:
 	WarningWidget(QWidget *parent);
 
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 437e75f0d5..52d0cc048f 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -431,7 +431,7 @@ void Controller::showBox(
 	_widget.showOrHideBoxOrLayer(std::move(content), options, animated);
 }
 
-void Controller::showRightColumn(object_ptr<TWidget> widget) {
+void Controller::showRightColumn(object_ptr<Ui::RpWidget> widget) {
 	_widget.showRightColumn(std::move(widget));
 }
 
diff --git a/Telegram/SourceFiles/window/window_controller.h b/Telegram/SourceFiles/window/window_controller.h
index a1a2d23b4e..5d09a68745 100644
--- a/Telegram/SourceFiles/window/window_controller.h
+++ b/Telegram/SourceFiles/window/window_controller.h
@@ -79,7 +79,7 @@ public:
 	void showToast(TextWithEntities &&text, crl::time duration = 0);
 	void showToast(const QString &text, crl::time duration = 0);
 
-	void showRightColumn(object_ptr<TWidget> widget);
+	void showRightColumn(object_ptr<Ui::RpWidget> widget);
 
 	void showBox(
 		object_ptr<Ui::BoxContent> content,
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7d1c158389..7a21118ca0 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7d1c15838960b77d49401104404d2e637f476c2c
+Subproject commit 7a21118ca0964dc66673df7a2241f846ec094860

From 1b4ea2e9c673c1d661db861778d8173b52ee555b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Aug 2025 16:10:35 +0400
Subject: [PATCH 153/341] Use Api::ParseTextWithEntities more.

---
 Telegram/SourceFiles/api/api_premium.cpp       |  9 +++------
 Telegram/SourceFiles/boxes/translate_box.cpp   |  9 +++------
 Telegram/SourceFiles/data/data_poll.cpp        | 18 ++++++------------
 Telegram/SourceFiles/data/data_todo_list.cpp   | 16 ++++------------
 Telegram/SourceFiles/history/history_item.cpp  | 18 ++++++------------
 .../history/history_item_components.cpp        |  6 +-----
 6 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 27f25175ba..c8380d62d7 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -960,12 +960,9 @@ std::optional<Data::SavedStarGift> FromTL(
 				| ranges::to_vector)
 			: std::vector<int>()),
 		.message = (data.vmessage()
-			? TextWithEntities{
-				.text = qs(data.vmessage()->data().vtext()),
-				.entities = Api::EntitiesFromMTP(
-					session,
-					data.vmessage()->data().ventities().v),
-			}
+			? Api::ParseTextWithEntities(
+				session,
+				*data.vmessage())
 			: TextWithEntities()),
 		.starsConverted = int64(data.vconvert_stars().value_or_empty()),
 		.starsUpgradedBySender = int64(
diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index 8e29782b5b..027b9d7467 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -248,12 +248,9 @@ void TranslateBox(
 				showText(
 					Ui::Text::Italic(tr::lng_translate_box_error(tr::now)));
 			} else {
-				showText(TextWithEntities{
-					.text = qs(list.front().data().vtext()),
-					.entities = Api::EntitiesFromMTP(
-						&peer->session(),
-						list.front().data().ventities().v),
-				});
+				showText(Api::ParseTextWithEntities(
+					&peer->session(),
+					list.front()));
 			}
 		}).fail([=](const MTP::Error &error) {
 			showText(
diff --git a/Telegram/SourceFiles/data/data_poll.cpp b/Telegram/SourceFiles/data/data_poll.cpp
index 64a3176d55..658f7c209f 100644
--- a/Telegram/SourceFiles/data/data_poll.cpp
+++ b/Telegram/SourceFiles/data/data_poll.cpp
@@ -70,12 +70,9 @@ bool PollData::closeByTimer() {
 bool PollData::applyChanges(const MTPDpoll &poll) {
 	Expects(poll.vid().v == id);
 
-	const auto newQuestion = TextWithEntities{
-		.text = qs(poll.vquestion().data().vtext()),
-		.entities = Api::EntitiesFromMTP(
-			&session(),
-			poll.vquestion().data().ventities().v),
-	};
+	const auto newQuestion = Api::ParseTextWithEntities(
+		&session(),
+		poll.vquestion());
 	const auto newFlags = (poll.is_closed() ? Flag::Closed : Flag(0))
 		| (poll.is_public_voters() ? Flag::PublicVotes : Flag(0))
 		| (poll.is_multiple_choice() ? Flag::MultiChoice : Flag(0))
@@ -88,12 +85,9 @@ bool PollData::applyChanges(const MTPDpoll &poll) {
 		return data.match([&](const MTPDpollAnswer &answer) {
 			auto result = PollAnswer();
 			result.option = answer.voption().v;
-			result.text = TextWithEntities{
-				.text = qs(answer.vtext().data().vtext()),
-				.entities = Api::EntitiesFromMTP(
-					&session(),
-					answer.vtext().data().ventities().v),
-			};
+			result.text = Api::ParseTextWithEntities(
+				&session(),
+				answer.vtext());
 			return result;
 		});
 	}) | ranges::views::take(
diff --git a/Telegram/SourceFiles/data/data_todo_list.cpp b/Telegram/SourceFiles/data/data_todo_list.cpp
index d50bcf6296..8400eb249d 100644
--- a/Telegram/SourceFiles/data/data_todo_list.cpp
+++ b/Telegram/SourceFiles/data/data_todo_list.cpp
@@ -45,12 +45,9 @@ Main::Session &TodoListData::session() const {
 }
 
 bool TodoListData::applyChanges(const MTPDtodoList &todolist) {
-	const auto newTitle = TextWithEntities{
-		.text = qs(todolist.vtitle().data().vtext()),
-		.entities = Api::EntitiesFromMTP(
-			&session(),
-			todolist.vtitle().data().ventities().v),
-	};
+	const auto newTitle = Api::ParseTextWithEntities(
+		&session(),
+		todolist.vtitle());
 	const auto newFlags = (todolist.is_others_can_append()
 		? Flag::OthersCanAppend
 		: Flag())
@@ -222,12 +219,7 @@ TodoListItem TodoListItemFromMTP(
 		const MTPTodoItem &item) {
 	const auto &data = item.data();
 	return {
-		.text = TextWithEntities{
-			.text = qs(data.vtitle().data().vtext()),
-			.entities = Api::EntitiesFromMTP(
-				session,
-				data.vtitle().data().ventities().v),
-		},
+		.text = Api::ParseTextWithEntities(session, data.vtitle()),
 		.id = data.vid().v,
 	};
 }
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 237f75e18f..788456e7da 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -6295,12 +6295,9 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 			Data::GiftCode{
 				.slug = qs(data.vslug()),
 				.message = (data.vmessage()
-					? TextWithEntities{
-						.text = qs(data.vmessage()->data().vtext()),
-						.entities = Api::EntitiesFromMTP(
-							&history()->session(),
-							data.vmessage()->data().ventities().v),
-					}
+					? Api::ParseTextWithEntities(
+						&history()->session(),
+						*data.vmessage())
 					: TextWithEntities()),
 				.channel = (boostedId
 					? history()->owner().channel(boostedId).get()
@@ -6347,12 +6344,9 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 		using Fields = Data::GiftCode;
 		auto fields = Fields{
 			.message = (data.vmessage()
-				? TextWithEntities{
-					.text = qs(data.vmessage()->data().vtext()),
-					.entities = Api::EntitiesFromMTP(
-						&history()->session(),
-						data.vmessage()->data().ventities().v),
-				}
+				? Api::ParseTextWithEntities(
+					&history()->session(),
+					*data.vmessage())
 				: TextWithEntities()),
 			.channel = ((service && peerIsChannel(to))
 				? history()->owner().channel(peerToChannel(to)).get()
diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp
index b608c16da1..184a368706 100644
--- a/Telegram/SourceFiles/history/history_item_components.cpp
+++ b/Telegram/SourceFiles/history/history_item_components.cpp
@@ -1336,11 +1336,7 @@ MessageFactcheck FromMTP(
 	}
 	const auto &data = factcheck->data();
 	if (const auto text = data.vtext()) {
-		const auto &data = text->data();
-		result.text = {
-			qs(data.vtext()),
-			Api::EntitiesFromMTP(session, data.ventities().v),
-		};
+		result.text = Api::ParseTextWithEntities(session, *text);
 	}
 	if (const auto country = data.vcountry()) {
 		result.country = qs(country->v);

From 428e0598953075ecceb0be0fd965351516470a10 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Aug 2025 16:36:36 +0400
Subject: [PATCH 154/341] Write unknown cons to mtproto logs.

---
 Telegram/lib_tl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_tl b/Telegram/lib_tl
index 237cbeb9d1..783052514e 160000
--- a/Telegram/lib_tl
+++ b/Telegram/lib_tl
@@ -1 +1 @@
-Subproject commit 237cbeb9d1c637759f89a508c1d854caf16e1984
+Subproject commit 783052514ea6bd9ed0b7ddb4e5adb8c0077e5b9a

From c939eda7bb499a17824955948e1724374314ad88 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Aug 2025 16:35:15 +0400
Subject: [PATCH 155/341] Hide "Use for calls" in Socks5 while not supported.

---
 Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp b/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp
index 8ed267514c..e6d06a5666 100644
--- a/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp
+++ b/Telegram/SourceFiles/mtproto/mtproto_proxy_data.cpp
@@ -153,7 +153,7 @@ ProxyData::Status ProxyData::status() const {
 }
 
 bool ProxyData::supportsCalls() const {
-	return (type == Type::Socks5);
+	return false;// (type == Type::Socks5);
 }
 
 bool ProxyData::tryCustomResolve() const {

From b2fb2d5821cd51d55740969d44d1821cbd1f3b19 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 11 Aug 2025 19:25:01 +0400
Subject: [PATCH 156/341] Attempt to fix the naturalWidth feature.

---
 Telegram/SourceFiles/api/api_chat_invite.cpp  |  62 ++++----
 .../boxes/filters/edit_filter_links.cpp       |  35 ++--
 .../SourceFiles/boxes/gift_credits_box.cpp    |  23 ++-
 .../SourceFiles/boxes/gift_premium_box.cpp    |   9 +-
 .../boxes/peers/add_participants_box.cpp      |  12 +-
 .../boxes/peers/edit_peer_color_box.cpp       |  21 ++-
 .../boxes/peers/edit_peer_invite_link.cpp     |  22 +--
 .../boxes/peers/replace_boost_box.cpp         |   3 +-
 .../SourceFiles/boxes/premium_preview_box.cpp |  29 ++--
 .../SourceFiles/boxes/send_credits_box.cpp    |  14 +-
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  12 +-
 .../calls/group/calls_group_common.cpp        |   9 +-
 .../group/calls_group_invite_controller.cpp   |   3 +-
 .../group/ui/calls_group_recording_box.cpp    |  15 +-
 .../chat_helpers/message_field.cpp            |   3 +-
 .../dialogs/dialogs_inner_widget.cpp          |   7 +-
 .../dialogs/ui/posts_search_intro.cpp         |  20 +--
 .../controls/history_view_suggest_options.cpp |  23 +--
 .../view/media/history_view_media_common.cpp  |  15 +-
 .../bot/starref/info_bot_starref_common.cpp   |  17 +-
 .../SourceFiles/info/info_wrap_widget.cpp     |   2 +-
 .../peer_gifts/info_peer_gifts_common.cpp     |   6 +-
 .../info/profile/info_profile_icon.cpp        |  10 +-
 .../info/stories/info_stories_widget.cpp      |   3 +-
 .../inline_bots/bot_attach_web_view.cpp       |  49 +++---
 .../media/stories/media_stories_stealth.cpp   |   7 +-
 .../passport/passport_panel_form.cpp          |  22 ++-
 .../passport/passport_panel_password.cpp      |  54 +++----
 .../payments/ui/payments_form_summary.cpp     |  11 +-
 .../payments/ui/payments_reaction_box.cpp     |   3 +-
 Telegram/SourceFiles/settings/settings.style  |   2 +-
 .../settings/settings_blocked_peers.cpp       |  22 ++-
 .../SourceFiles/settings/settings_common.cpp  |  11 +-
 .../settings/settings_credits_graphics.cpp    | 149 ++++++++++--------
 .../SourceFiles/settings/settings_folders.cpp |  11 +-
 Telegram/SourceFiles/ui/boxes/boost_box.cpp   |   6 +-
 .../ui/boxes/collectible_info_box.cpp         |   6 +-
 .../ui/boxes/show_or_premium_box.cpp          |  26 +--
 .../SourceFiles/ui/controls/stars_rating.cpp  |  20 ++-
 Telegram/SourceFiles/ui/effects/premium.style |  16 --
 .../ui/widgets/slider_natural_width.h         |  10 +-
 Telegram/lib_ui                               |   2 +-
 42 files changed, 414 insertions(+), 388 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index 0d5880fcb5..afc365c139 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -215,43 +215,43 @@ void ConfirmSubscriptionBox(
 		2.);
 
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_invite_subscription_title(),
-				st::inviteLinkSubscribeBoxTitle)));
+			tr::lng_channel_invite_subscription_title(),
+			st::inviteLinkSubscribeBoxTitle),
+		st::boxRowPadding,
+		style::al_top);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_invite_subscription_about(
-					lt_channel,
-					rpl::single(Ui::Text::Bold(name)),
-					lt_price,
-					tr::lng_credits_summary_options_credits(
-						lt_count,
-						rpl::single(amount) | tr::to_count(),
-						Ui::Text::Bold),
-					Ui::Text::WithEntities),
-				st::inviteLinkSubscribeBoxAbout)));
+			tr::lng_channel_invite_subscription_about(
+				lt_channel,
+				rpl::single(Ui::Text::Bold(name)),
+				lt_price,
+				tr::lng_credits_summary_options_credits(
+					lt_count,
+					rpl::single(amount) | tr::to_count(),
+					Ui::Text::Bold),
+				Ui::Text::WithEntities),
+			st::inviteLinkSubscribeBoxAbout),
+		st::boxRowPadding,
+		style::al_top);
 	Ui::AddSkip(content);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_channel_invite_subscription_terms(
-					lt_link,
-					rpl::combine(
-						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);
-					}),
-					Ui::Text::RichLangValue),
-				st::inviteLinkSubscribeBoxTerms)));
+			tr::lng_channel_invite_subscription_terms(
+				lt_link,
+				rpl::combine(
+					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);
+				}),
+				Ui::Text::RichLangValue),
+			st::inviteLinkSubscribeBoxTerms),
+		st::boxRowPadding,
+		style::al_top);
 
 	{
 		const auto balance = Settings::AddBalanceWidget(
diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
index acd6da5641..d420be8351 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp
@@ -538,25 +538,24 @@ void LinkController::addHeader(not_null<Ui::VerticalLayout*> container) {
 
 	const auto isStatic = _filterTitle.isStatic;
 	verticalLayout->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			verticalLayout,
-			object_ptr<Ui::FlatLabel>(
-				verticalLayout,
-				(_data.url.isEmpty()
-					? tr::lng_filters_link_no_about(Ui::Text::WithEntities)
-					: tr::lng_filters_link_share_about(
-						lt_folder,
-						rpl::single(Ui::Text::Wrapped(
-							_filterTitle.text,
-							EntityType::Bold)),
-						Ui::Text::WithEntities)),
-				st::settingsFilterDividerLabel,
-				st::defaultPopupMenu,
-				Core::TextContext({
-					.session = &_window->session(),
-					.customEmojiLoopLimit = isStatic ? -1 : 0,
-				}))),
-		st::filterLinkDividerLabelPadding);
+			(_data.url.isEmpty()
+				? tr::lng_filters_link_no_about(Ui::Text::WithEntities)
+				: tr::lng_filters_link_share_about(
+					lt_folder,
+					rpl::single(Ui::Text::Wrapped(
+						_filterTitle.text,
+						EntityType::Bold)),
+					Ui::Text::WithEntities)),
+			st::settingsFilterDividerLabel,
+			st::defaultPopupMenu,
+			Core::TextContext({
+				.session = &_window->session(),
+				.customEmojiLoopLimit = isStatic ? -1 : 0,
+			})),
+		st::filterLinkDividerLabelPadding,
+		style::al_top)->setTryMakeSimilarLines(true);
 
 	verticalLayout->geometryValue(
 	) | rpl::start_with_next([=](const QRect &r) {
diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index 8df343cec4..f96069a1b3 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -78,19 +78,18 @@ void GiftCreditsBox(
 				u"internal:stars_examples"_q);
 		});
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
+			Ui::CreateLabelWithCustomEmoji(
 				content,
-				Ui::CreateLabelWithCustomEmoji(
-					content,
-					tr::lng_credits_box_history_entry_gift_out_about(
-						lt_user,
-						rpl::single(TextWithEntities{ peer->shortName() }),
-						lt_link,
-						std::move(link),
-						Ui::Text::RichLangValue),
-					Core::TextContext({ .session = &peer->session() }),
-					st::creditsBoxAbout)),
-			st::boxRowPadding);
+				tr::lng_credits_box_history_entry_gift_out_about(
+					lt_user,
+					rpl::single(TextWithEntities{ peer->shortName() }),
+					lt_link,
+					std::move(link),
+					Ui::Text::RichLangValue),
+				Core::TextContext({ .session = &peer->session() }),
+				st::creditsBoxAbout),
+			st::boxRowPadding,
+			style::al_top);
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(box->verticalLayout());
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 0da643c073..daf79b39d3 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -741,7 +741,8 @@ void GiftCodeBox(
 					std::move(shareLink),
 					Ui::Text::WithEntities)),
 			st::giveawayGiftCodeFooter),
-		st::giveawayGiftCodeFooterMargin);
+		st::giveawayGiftCodeFooterMargin,
+		style::al_top);
 	footer->setClickHandlerFilter([=](const auto &...) {
 		ShareWithFriend(controller, slug);
 		return false;
@@ -883,7 +884,8 @@ void GiftCodePendingBox(
 			box,
 			tr::lng_gift_link_pending_footer(),
 			st::giveawayGiftCodeFooter),
-		st::giveawayGiftCodeFooterMargin);
+		st::giveawayGiftCodeFooterMargin,
+		style::al_top);
 
 	const auto close = Ui::CreateChild<Ui::IconButton>(
 		box.get(),
@@ -1186,7 +1188,8 @@ void GiveawayInfoBox(
 						: tr::lng_prizes_cancelled()),
 					st::giveawayRefundedLabel),
 				st::giveawayRefundedPadding),
-			{ padding.left(), 0, padding.right(), padding.bottom() });
+			{ padding.left(), 0, padding.right(), padding.bottom() },
+			style::al_top);
 		const auto bg = wrap->lifetime().make_state<Ui::RoundRect>(
 			st::boxRadius,
 			st::attentionBoxButton.textBgOver);
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index 75ccf927d9..ed99b06ed5 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -233,7 +233,8 @@ void FillUpgradeToPremiumCover(
 			container,
 			rpl::single(text),
 			st::inviteForbiddenInfo),
-		st::inviteForbiddenInfoPadding);
+		st::inviteForbiddenInfoPadding,
+		style::al_top);
 }
 
 void SimpleForbiddenBox(
@@ -511,7 +512,8 @@ void InviteForbiddenController::setComplexCover() {
 		if (_can) {
 			container->add(
 				MakeShowOrLabel(container, tr::lng_invite_upgrade_or()),
-				st::inviteForbiddenOrLabelPadding);
+				st::inviteForbiddenOrLabelPadding,
+				style::al_top);
 		}
 		container->add(
 			object_ptr<Ui::FlatLabel>(
@@ -520,7 +522,8 @@ void InviteForbiddenController::setComplexCover() {
 					? tr::lng_invite_upgrade_via_title()
 					: tr::lng_via_link_cant()),
 				st::inviteForbiddenTitle),
-			st::inviteForbiddenTitlePadding);
+			st::inviteForbiddenTitlePadding,
+			style::al_top);
 
 		const auto about = _can
 			? (_peer->isBroadcast()
@@ -544,7 +547,8 @@ void InviteForbiddenController::setComplexCover() {
 				container,
 				rpl::single(about),
 				st::inviteForbiddenInfo),
-			st::inviteForbiddenInfoPadding);
+			st::inviteForbiddenInfoPadding,
+			style::al_top);
 	}
 	delegate()->peerListSetAboveWidget(std::move(cover));
 }
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index c7336a1a85..8542e862de 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -81,7 +81,6 @@ public:
 		bool selected);
 
 	[[nodiscard]] uint8 index() const;
-	int naturalWidth() const override;
 
 	void setSelected(bool selected);
 
@@ -181,6 +180,15 @@ ColorSample::ColorSample(
 		colorIndex
 	) | rpl::start_with_next([=](uint8 index) {
 		_index = index;
+		setNaturalWidth([&] {
+			if (_name.isEmpty() || _style->colorPatternIndex(_index)) {
+				return st::settingsColorSampleSize;
+			}
+			const auto padding = st::settingsColorSamplePadding;
+			return std::max(
+				padding.left() + _name.maxWidth() + padding.right(),
+				padding.top() + st::semiboldFont->height + padding.bottom());
+		}());
 		update();
 	}, lifetime());
 }
@@ -195,6 +203,7 @@ ColorSample::ColorSample(
 , _index(colorIndex)
 , _selected(selected)
 , _simple(true) {
+	setNaturalWidth(st::settingsColorSampleSize);
 }
 
 void ColorSample::setSelected(bool selected) {
@@ -276,16 +285,6 @@ uint8 ColorSample::index() const {
 	return _index;
 }
 
-int ColorSample::naturalWidth() const {
-	if (_name.isEmpty() || _style->colorPatternIndex(_index)) {
-		return st::settingsColorSampleSize;
-	}
-	const auto padding = st::settingsColorSamplePadding;
-	return std::max(
-		padding.left() + _name.maxWidth() + padding.right(),
-		padding.top() + st::semiboldFont->height + padding.bottom());
-}
-
 PreviewWrap::PreviewWrap(
 	not_null<Ui::GenericBox*> box,
 	std::shared_ptr<Ui::ChatStyle> style,
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 3e4e451fd3..abd6113ad0 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -976,21 +976,22 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_credits_box_subscription_title(),
-				st::creditsBoxAboutTitle)));
+				st::creditsBoxAboutTitle),
+			st::boxRowPadding,
+			style::al_top);
 
 		Ui::AddSkip(content);
 
 		const auto subtitle1 = box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					st::creditsTopupPrice)))->entity();
+				st::creditsTopupPrice),
+			st::boxRowPadding,
+			style::al_top);
 		subtitle1->setMarkedText(
 			tr::lng_credits_subscription_subtitle(
 				tr::now,
@@ -1027,8 +1028,7 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_credits_box_out_about(
@@ -1037,7 +1037,9 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 					) | Ui::Text::ToLink(
 						tr::lng_credits_box_out_about_link(tr::now)),
 					Ui::Text::WithEntities),
-				st::creditsBoxAboutDivider)));
+				st::creditsBoxAboutDivider),
+			st::boxRowPadding,
+			style::al_top);
 
 		const auto button = box->addButton(tr::lng_box_ok(), [=] {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
index 85be6dd1ce..f76b4cc0b0 100644
--- a/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/replace_boost_box.cpp
@@ -221,7 +221,8 @@ void Controller::prepare() {
 					Ui::Text::RichLangValue),
 				Ui::Text::RichLangValue),
 			st::boostReassignText),
-		st::boxRowPadding);
+		st::boxRowPadding,
+		style::al_top);
 	delegate()->peerListSetAboveWidget(std::move(above));
 
 	const auto now = base::unixtime::now();
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index da6f461d4b..e1fef3b9da 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -1079,26 +1079,21 @@ void PreviewBox(
 	auto text = state->selected.value(
 	) | rpl::map(SectionAbout) | rpl::flatten_latest();
 
-	const auto padding = st::premiumPreviewAboutPadding;
-	const auto available = size.width() - padding.left() - padding.right();
-	auto titleLabel = object_ptr<Ui::FlatLabel>(
-		box,
-		std::move(title),
-		st::premiumPreviewAboutTitle);
-	titleLabel->resizeToWidth(available);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			std::move(titleLabel)),
-		st::premiumPreviewAboutTitlePadding);
-	auto textLabel = object_ptr<Ui::FlatLabel>(
-		box,
-		std::move(text),
-		st::premiumPreviewAbout);
-	textLabel->resizeToWidth(available);
+			std::move(title),
+			st::premiumPreviewAboutTitle),
+		st::premiumPreviewAboutTitlePadding,
+		style::al_top);
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(box, std::move(textLabel)),
-		padding);
+		object_ptr<Ui::FlatLabel>(
+			box,
+			std::move(text),
+			st::premiumPreviewAbout),
+		st::premiumPreviewAboutPadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
 	box->addRow(
 		CreateSwitch(box->verticalLayout(), &state->selected, state->order),
 		st::premiumDotsMargin);
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 4ecd915df4..9b8fe27847 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -364,14 +364,15 @@ void SendCreditsBox(
 	}
 
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			form->invoice.subscriptionPeriod
 				? rpl::single(form->title)
 				: tr::lng_credits_box_out_title(),
-			st::settingsPremiumUserTitle)));
+			st::settingsPremiumUserTitle),
+		st::boxRowPadding,
+		style::al_top);
 	if (form->invoice.subscriptionPeriod && form->botId && form->photo) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
@@ -383,12 +384,13 @@ void SendCreditsBox(
 		Ui::AddSkip(content);
 	}
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			SendCreditsConfirmText(session, form.get()),
-			st::creditsBoxAbout)));
+			st::creditsBoxAbout),
+		st::boxRowPadding,
+		style::al_top);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index ef50dea3d6..ca2ce8bbcf 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2981,13 +2981,15 @@ void AddBlock(
 			content,
 			std::move(args.subtitle),
 			st::giftBoxSubtitle),
-		st::giftBoxSubtitleMargin);
+		st::giftBoxSubtitleMargin,
+		style::al_top);
 	const auto about = content->add(
 		object_ptr<FlatLabel>(
 			content,
 			std::move(args.about),
 			st::giftBoxAbout),
-		st::giftBoxAboutMargin);
+		st::giftBoxAboutMargin,
+		style::al_top);
 	about->setClickHandlerFilter(std::move(args.aboutFilter));
 	content->add(std::move(args.content));
 }
@@ -4381,13 +4383,15 @@ void ShowUniqueGiftWearBox(
 					lt_name,
 					rpl::single(UniqueGiftName(gift))),
 				st.title ? *st.title : st::uniqueGiftTitle),
-			st::settingsPremiumRowTitlePadding);
+			st::settingsPremiumRowTitlePadding,
+			style::al_top);
 		content->add(
 			object_ptr<Ui::FlatLabel>(
 				content,
 				tr::lng_gift_wear_about(),
 				st.subtitle ? *st.subtitle : st::uniqueGiftSubtitle),
-			st::settingsPremiumRowAboutPadding);
+			st::settingsPremiumRowAboutPadding,
+			style::al_top);
 		infoRow(
 			tr::lng_gift_wear_badge_title(),
 			(channel
diff --git a/Telegram/SourceFiles/calls/group/calls_group_common.cpp b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
index 066d140861..008ca1107d 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_common.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
@@ -136,7 +136,8 @@ void ConferenceCallJoinConfirm(
 					Ui::Text::RichLangValue)
 				: tr::lng_confcall_join_text(Ui::Text::RichLangValue)),
 			st::confcallLinkCenteredText),
-		st::boxRowPadding
+		st::boxRowPadding,
+		style::al_top
 	)->setTryMakeSimilarLines(true);
 
 	const auto &participants = call->participants();
@@ -209,7 +210,8 @@ void ConferenceCallJoinConfirm(
 				box,
 				std::move(text),
 				st::confcallLinkCenteredText),
-			st::boxRowPadding
+			st::boxRowPadding,
+			style::al_top
 		)->setTryMakeSimilarLines(true);
 	}
 	const auto joinAndClose = [=] {
@@ -335,7 +337,8 @@ void ShowConferenceCallLinkBox(
 				(st.centerLabel
 					? *st.centerLabel
 					: st::confcallLinkCenteredText)),
-			st::boxRowPadding
+			st::boxRowPadding,
+			style::al_top
 		)->setTryMakeSimilarLines(true);
 
 		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 2);
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index 6994aff627..a79bfa65f3 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -1054,7 +1054,8 @@ not_null<Ui::RpWidget*> CreateReActivateHeader(not_null<QWidget*> parent) {
 			result,
 			tr::lng_confcall_inactive_about(),
 			st::confcallLinkCenteredText),
-		st::boxRowPadding + st::confcallLinkTitlePadding
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top
 	)->setTryMakeSimilarLines(true);
 	Ui::AddDivider(result);
 
diff --git a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
index 513fa203c9..8f269593a4 100644
--- a/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
+++ b/Telegram/SourceFiles/calls/group/ui/calls_group_recording_box.cpp
@@ -196,22 +196,13 @@ void RecordingInfo::prepareVideo() {
 }
 
 void RecordingInfo::setLabel(const QString &text) {
-	const auto label = _container->add(
+	_container->add(
 		object_ptr<Ui::FlatLabel>(
 			_container,
 			text,
 			st::groupCallRecordingSubLabel),
-		st::groupCallRecordingSubLabelMargins);
-
-	rpl::combine(
-		sizeValue(),
-		label->sizeValue()
-	) | rpl::start_with_next([=](QSize my, QSize labelSize) {
-		label->moveToLeft(
-			(my.width() - labelSize.width()) / 2,
-			label->y(),
-			my.width());
-	}, label->lifetime());
+		st::groupCallRecordingSubLabelMargins,
+		style::al_top);
 }
 
 RecordingType RecordingInfo::type() const {
diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 8f5172c567..6fdf722bbf 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -1467,7 +1467,8 @@ void FrozenInfoBox(
 			content,
 			tr::lng_frozen_title(),
 			st.title ? *st.title : st::uniqueGiftTitle),
-		st::settingsPremiumRowTitlePadding);
+		st::settingsPremiumRowTitlePadding,
+		style::al_top);
 
 	Ui::AddSkip(content, st::defaultVerticalListSkip * 3);
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 4a7f9f57b4..683c34e082 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -4147,14 +4147,15 @@ void InnerWidget::refreshEmpty() {
 				.name = u"no_chats"_q,
 				.sizeOverride = Size(st::changePhoneIconSize),
 			});
-		_emptyList->add(
-			object_ptr<Ui::CenterWrap<>>(_emptyList, std::move(icon.widget)));
+		_emptyList->add(std::move(icon.widget), {}, style::al_top);
 		Ui::AddSkip(_emptyList);
 		_emptyList->add(
 			object_ptr<Ui::FlatLabel>(
 				_emptyList,
 				tr::lng_no_conversations(),
-				st::dialogEmptyButtonLabel));
+				st::dialogEmptyButtonLabel),
+			{},
+			style::al_top);
 		if (_state == WidgetState::Default) {
 			icon.animate(anim::repeat::once);
 		}
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index 086976f035..8c9c59714d 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -170,30 +170,32 @@ void PostsSearchIntro::setup() {
 			_content.get(),
 			std::move(title),
 			st::postsSearchIntroTitle),
-		st::postsSearchIntroTitleMargin);
+		st::postsSearchIntroTitleMargin,
+		style::al_top);
 	_title->setTryMakeSimilarLines(true);
 	_subtitle = _content->add(
 		object_ptr<Ui::FlatLabel>(
 			_content.get(),
 			std::move(subtitle),
 			st::postsSearchIntroSubtitle),
-		st::postsSearchIntroSubtitleMargin);
+		st::postsSearchIntroSubtitleMargin,
+		style::al_top);
 	_subtitle->setTryMakeSimilarLines(true);
 	_button = _content->add(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+		object_ptr<Ui::RoundButton>(
 			_content.get(),
-			object_ptr<Ui::RoundButton>(
-				_content.get(),
-				rpl::single(QString()),
-				st::postsSearchIntroButton))
-	)->entity();
+			rpl::single(QString()),
+			st::postsSearchIntroButton),
+		{},
+		style::al_top);
 	_button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_footer = _content->add(
 		object_ptr<Ui::FlatLabel>(
 			_content.get(),
 			std::move(footer),
 			st::postsSearchIntroFooter),
-		st::postsSearchIntroFooterMargin);
+		st::postsSearchIntroFooterMargin,
+		style::al_top);
 	_footer->setTryMakeSimilarLines(true);
 
 	_state.value(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index 95ad31b06e..fc4118399b 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -389,12 +389,13 @@ void ChooseSuggestPriceBox(
 		box->setNoContentMargin(true);
 
 		Ui::AddSkip(container, st::boxTitleHeight * 1.1);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				std::move(title),
-				st::settingsPremiumUserTitle)));
+				st::settingsPremiumUserTitle),
+			st::boxRowPadding,
+			style::al_top);
 	}
 
 	state->buttons.push_back({
@@ -667,7 +668,7 @@ void ChooseSuggestPriceBox(
 			return tr::lng_suggest_options_offer(
 				tr::now,
 				lt_amount,
-				TextWithEntities{ coloredTonIcon }.append(
+				Ui::Text::IconEmoji(&st::tonIconEmoji).append(
 					Lang::FormatCreditsAmountDecimal(price)),
 				Ui::Text::WithEntities);
 		}
@@ -786,19 +787,19 @@ void InsufficientTonBox(
 	const auto nano = add.whole() * Ui::kNanosInOne + add.nano();
 	const auto amount = Ui::FormatTonAmount(nano).full;
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_suggest_low_ton_title(tr::now, lt_amount, amount),
-				st::boxTitle)),
-		st::boxRowPadding + st::lowTonTitlePadding);
+			tr::lng_suggest_low_ton_title(tr::now, lt_amount, amount),
+			st::boxTitle),
+		st::boxRowPadding + st::lowTonTitlePadding,
+		style::al_top);
 	const auto label = box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			tr::lng_suggest_low_ton_text(Ui::Text::RichLangValue),
 			st::lowTonText),
-		st::boxRowPadding + st::lowTonTextPadding);
+		st::boxRowPadding + st::lowTonTextPadding,
+		style::al_top);
 	label->setTryMakeSimilarLines(true);
 	label->resizeToWidth(
 		st::boxWidth - st::boxRowPadding.left() - st::boxRowPadding.right());
diff --git a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
index 56079194d1..8a9cec6910 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_media_common.cpp
@@ -354,19 +354,22 @@ void ShowAgeVerification(
 				box,
 				tr::lng_age_verify_title(),
 				st::settingsAgeVerifyTitle),
-			st::boxRowPadding + st::settingsAgeVerifyMargin);
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				AgeVerifyAbout(&bot->session()),
 				st::settingsAgeVerifyText),
-			st::boxRowPadding + st::settingsAgeVerifyMargin);
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_age_verify_here(Ui::Text::RichLangValue),
 				st::settingsAgeVerifyText),
-			st::boxRowPadding + st::settingsAgeVerifyMargin);
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
 
 		const auto weak = QPointer<Ui::GenericBox>(box);
 		const auto done = crl::guard(&bot->session(), [=](int age) {
@@ -446,13 +449,15 @@ void ShowAgeVerificationMobile(
 				box,
 				AgeVerifyAbout(session),
 				st::settingsAgeVerifyText),
-			st::boxRowPadding + st::settingsAgeVerifyMargin);
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_age_verify_mobile(Ui::Text::RichLangValue),
 				st::settingsAgeVerifyText),
-			st::boxRowPadding + st::settingsAgeVerifyMargin);
+			st::boxRowPadding + st::settingsAgeVerifyMargin,
+			style::al_top);
 
 		box->addButton(tr::lng_box_ok(), [=] {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
index 9ff2989746..45a539104d 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -470,7 +470,8 @@ object_ptr<Ui::BoxContent> StarRefLinkBox(
 						FormatForProgramDuration(program.durationMonths),
 						Ui::Text::WithEntities),
 				st::starrefCenteredText),
-			st::boxRowPadding);
+			st::boxRowPadding,
+			style::al_top);
 
 		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
 
@@ -478,7 +479,9 @@ object_ptr<Ui::BoxContent> StarRefLinkBox(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_star_ref_link_recipient(),
-				st::starrefCenteredText));
+				st::starrefCenteredText),
+			st::boxRowPadding,
+			style::al_top);
 		Ui::AddSkip(box->verticalLayout());
 		box->addRow(object_ptr<Ui::AbstractButton>::fromRaw(
 			MakePeerBubbleButton(box, peer).release()
@@ -596,7 +599,8 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 					FormatForProgramDuration(program.durationMonths),
 					Ui::Text::WithEntities),
 				st::starrefCenteredText),
-			st::boxRowPadding);
+			st::boxRowPadding,
+			style::al_top);
 
 		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
 		if (const auto average = program.revenuePerUser) {
@@ -613,7 +617,8 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 						Ui::Text::WithEntities),
 					st::starrefRevenueText,
 					st::defaultPopupMenu),
-				st::boxRowPadding);
+				st::boxRowPadding,
+				style::al_top);
 			Ui::AddSkip(layout, st::defaultVerticalListSkip);
 		}
 
@@ -635,7 +640,9 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 				object_ptr<Ui::FlatLabel>(
 					box,
 					tr::lng_star_ref_link_recipient(),
-					st::starrefCenteredText));
+					st::starrefCenteredText),
+				st::boxRowPadding,
+				style::al_top);
 			Ui::AddSkip(box->verticalLayout());
 			const auto recipientWrap = box->addRow(
 				object_ptr<Ui::VerticalLayout>(box),
diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 054ec8ce3f..9048245092 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -829,7 +829,7 @@ rpl::producer<int> WrapWidget::desiredHeightValue() const {
 
 QRect WrapWidget::contentGeometry() const {
 	const auto top = _topBar ? _topBar->height() : 0;
-	return rect().marginsRemoved({ 0, top, 0, 0 });
+	return rect().marginsRemoved({ 0, std::min(top, height()), 0, 0});
 }
 
 bool WrapWidget::returnToFirstStackFrame(
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 08dfe4aa74..289ea5844d 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -1009,13 +1009,15 @@ void SelectGiftToUnpin(
 				box,
 				tr::lng_gift_many_pinned_title(),
 				st::giftBoxSubtitle),
-			st::giftBoxSubtitleMargin);
+			st::giftBoxSubtitleMargin,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_gift_many_pinned_choose(),
 				st::giftTooManyPinnedChoose),
-			st::giftBoxAboutMargin);
+			st::giftBoxAboutMargin,
+			style::al_top);
 
 		const auto gifts = box->addRow(
 			object_ptr<Ui::RpWidget>(box),
diff --git a/Telegram/SourceFiles/info/profile/info_profile_icon.cpp b/Telegram/SourceFiles/info/profile/info_profile_icon.cpp
index 9f8dee9109..174b144cf8 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_icon.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_icon.cpp
@@ -25,14 +25,10 @@ FloatingIcon::FloatingIcon(
 : RpWidget(parent)
 , _icon(&icon)
 , _point(position) {
-	resize(
-		_point.x() + _icon->width(),
-		_point.y() + _icon->height());
+	setGeometry(QRect(
+		QPoint(0, 0),
+		QSize(_point.x() + _icon->width(), _point.y() + _icon->height())));
 	setAttribute(Qt::WA_TransparentForMouseEvents);
-	parent->widthValue(
-	) | rpl::start_with_next(
-		[this] { moveToLeft(0, 0); },
-		lifetime());
 }
 
 void FloatingIcon::paintEvent(QPaintEvent *e) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index d093987a47..ad33ef4975 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -131,7 +131,8 @@ void Widget::restoreState(not_null<Memento*> memento) {
 
 void Widget::refreshBottom() {
 	const auto albumId = _albumId.current();
-	const auto withButton = albumId
+	const auto withButton = (albumId != Data::kStoriesAlbumIdSaved)
+		&& (albumId != Data::kStoriesAlbumIdArchive)
 		&& controller()->storiesPeer()->canEditStories();
 	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
 	delete _pinnedToBottom.data();
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 02304eb965..be8fbdbefa 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -511,15 +511,18 @@ void ConfirmEmojiStatusAccessBox(
 	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
 
 	auto name = Ui::Text::Bold(bot->name());
-	box->addRow(object_ptr<Ui::FlatLabel>(
-		box,
-		tr::lng_bot_emoji_status_access_text(
-			lt_bot,
-			rpl::single(name),
-			lt_name,
-			rpl::single(name),
-			Ui::Text::RichLangValue),
-		st::botEmojiStatusText));
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_bot_emoji_status_access_text(
+				lt_bot,
+				rpl::single(name),
+				lt_name,
+				rpl::single(name),
+				Ui::Text::RichLangValue),
+			st::botEmojiStatusText),
+		st::boxRowPadding,
+		style::al_top);
 
 	box->addButton(tr::lng_bot_emoji_status_access_allow(), [=] {
 		if (!CheckEmojiStatusPremium(bot)) {
@@ -557,19 +560,25 @@ void ConfirmEmojiStatusBox(
 		box->closeBox();
 	});
 
-	box->addRow(object_ptr<Ui::FlatLabel>(
-		box,
-		tr::lng_bot_emoji_status_title(),
-		st::botEmojiStatusTitle));
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_bot_emoji_status_title(),
+			st::botEmojiStatusTitle),
+		st::boxRowPadding,
+		style::al_top);
 	AddSkip(box->verticalLayout());
 
-	box->addRow(object_ptr<Ui::FlatLabel>(
-		box,
-		tr::lng_bot_emoji_status_text(
-			lt_bot,
-			rpl::single(Ui::Text::Bold(bot->name())),
-			Ui::Text::RichLangValue),
-		st::botEmojiStatusText));
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			tr::lng_bot_emoji_status_text(
+				lt_bot,
+				rpl::single(Ui::Text::Bold(bot->name())),
+				Ui::Text::RichLangValue),
+			st::botEmojiStatusText),
+		st::boxRowPadding,
+		style::al_top);
 
 	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
 
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index b64de9eafd..6bde919a7d 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -327,8 +327,11 @@ struct Feature {
 		box->setWidth(st::boxWideWidth);
 		box->setStyle(st::storiesStealthBox);
 		box->addRow(MakeLogo(box));
-		box->addRow(MakeTitle(box));
-		box->addRow(MakeAbout(box, data->state.value()));
+		box->addRow(MakeTitle(box), st::boxRowPadding, style::al_top);
+		box->addRow(
+			MakeAbout(box, data->state.value()),
+			st::boxRowPadding,
+			style::al_top);
 		box->addRow(MakeFeature(box, FeaturePast()));
 		box->addRow(
 			MakeFeature(box, FeatureNext()),
diff --git a/Telegram/SourceFiles/passport/passport_panel_form.cpp b/Telegram/SourceFiles/passport/passport_panel_form.cpp
index 3c3d725338..5cbaa59412 100644
--- a/Telegram/SourceFiles/passport/passport_panel_form.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_form.cpp
@@ -81,22 +81,20 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 	}, _userpic->lifetime());
 
 	_about1 = inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			inner,
-			object_ptr<Ui::FlatLabel>(
-				inner,
-				tr::lng_passport_request1(tr::now, lt_bot, bot->name()),
-				st::passportPasswordLabelBold)),
-		st::passportFormAbout1Padding)->entity();
+			tr::lng_passport_request1(tr::now, lt_bot, bot->name()),
+			st::passportPasswordLabelBold),
+		st::passportFormAbout1Padding,
+		style::al_top);
 
 	_about2 = inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			inner,
-			object_ptr<Ui::FlatLabel>(
-				inner,
-				tr::lng_passport_request2(tr::now),
-				st::passportPasswordLabel)),
-		st::passportFormAbout2Padding)->entity();
+			tr::lng_passport_request2(tr::now),
+			st::passportPasswordLabel),
+		st::passportFormAbout2Padding,
+		style::al_top);
 
 	inner->add(object_ptr<Ui::BoxContentDivider>(
 		inner,
diff --git a/Telegram/SourceFiles/passport/passport_panel_password.cpp b/Telegram/SourceFiles/passport/passport_panel_password.cpp
index 7046f14f08..322179fa63 100644
--- a/Telegram/SourceFiles/passport/passport_panel_password.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_password.cpp
@@ -171,25 +171,23 @@ void PanelNoPassword::setupContent() {
 	}, _inner->lifetime());
 
 	_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				tr::lng_passport_request1(
-					tr::now,
-					lt_bot,
-					_controller->bot()->name()),
-				st::passportPasswordLabelBold)),
-		st::passportPasswordAbout1Padding)->entity();
+			tr::lng_passport_request1(
+				tr::now,
+				lt_bot,
+				_controller->bot()->name()),
+			st::passportPasswordLabelBold),
+		st::passportPasswordAbout1Padding,
+		style::al_top);
 
 	_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				tr::lng_passport_request2(tr::now),
-				st::passportPasswordLabel)),
-		st::passportPasswordAbout2Padding)->entity();
+			tr::lng_passport_request2(tr::now),
+			st::passportPasswordLabel),
+		st::passportPasswordAbout2Padding,
+		style::al_top);
 
 	const auto iconWrap = _inner->add(
 		object_ptr<Ui::CenterWrap<Ui::FixedHeightWidget>>(
@@ -204,13 +202,12 @@ void PanelNoPassword::setupContent() {
 		QPoint(0, 0));
 
 	_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				tr::lng_passport_create_password(tr::now),
-				st::passportPasswordSetupLabel)),
-		st::passportFormAbout2Padding)->entity();
+			tr::lng_passport_create_password(tr::now),
+			st::passportPasswordSetupLabel),
+		st::passportFormAbout2Padding,
+		style::al_top);
 
 	refreshBottom();
 }
@@ -218,15 +215,14 @@ void PanelNoPassword::setupContent() {
 void PanelNoPassword::refreshBottom() {
 	const auto pattern = _controller->unconfirmedEmailPattern();
 	_about.reset(_inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			_inner,
-			object_ptr<Ui::FlatLabel>(
-				_inner,
-				(pattern.isEmpty()
-					? tr::lng_passport_about_password(tr::now)
-					: tr::lng_passport_code_sent(tr::now, lt_email, pattern)),
-				st::passportPasswordSetupLabel)),
-		st::passportFormAbout2Padding)->entity());
+			(pattern.isEmpty()
+				? tr::lng_passport_about_password(tr::now)
+				: tr::lng_passport_code_sent(tr::now, lt_email, pattern)),
+			st::passportPasswordSetupLabel),
+		st::passportFormAbout2Padding,
+		style::al_top));
 	if (pattern.isEmpty()) {
 		const auto button = _inner->add(
 			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
diff --git a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
index ae68d8bdde..fd93541786 100644
--- a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
@@ -119,10 +119,13 @@ bool FormSummary::showCriticalError(const TextWithEntities &text) {
 		return false;
 	}
 	Ui::AddSkip(_layout.get(), st::paymentsPricesTopSkip);
-	_layout->add(object_ptr<FlatLabel>(
-		_layout.get(),
-		rpl::single(text),
-		st::paymentsCriticalError));
+	_layout->add(
+		object_ptr<FlatLabel>(
+			_layout.get(),
+			rpl::single(text),
+			st::paymentsCriticalError),
+		{},
+		style::al_top);
 	return true;
 }
 
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index bc2b89a8aa..eb1366685a 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -481,7 +481,8 @@ void PaidReactionsBox(
 			box,
 			tr::lng_paid_react_title(),
 			st::boostCenteredTitle),
-		st::boxRowPadding + QMargins(0, st::paidReactTitleSkip, 0, 0));
+		st::boxRowPadding + QMargins(0, st::paidReactTitleSkip, 0, 0),
+		style::al_top);
 	const auto labelWrap = box->addRow(
 		object_ptr<RpWidget>(box),
 		(st::boxRowPadding
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index c952f13c7f..c5610967d4 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -302,7 +302,7 @@ settingsAccentColorSkip: 4px;
 settingsAccentColorLine: 3px;
 
 settingsFilterDividerLabel: FlatLabel(boxDividerLabel) {
-	minWidth: 258px;
+	minWidth: 200px;
 	maxHeight: 0px;
 	align: align(top);
 }
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
index fbb8a065ee..820e55988d 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
+++ b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
@@ -186,22 +186,20 @@ void Blocked::setupContent() {
 		}, content->lifetime());
 
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_blocked_list_empty_title(),
-					st::changePhoneTitle)),
-			st::changePhoneTitlePadding);
+				tr::lng_blocked_list_empty_title(),
+				st::changePhoneTitle),
+			st::changePhoneTitlePadding,
+			style::al_top);
 
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_blocked_list_empty_description(),
-					st::changePhoneDescription)),
-			st::changePhoneDescriptionPadding);
+				tr::lng_blocked_list_empty_description(),
+				st::changePhoneDescription),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
 
 		Ui::AddSkip(content, st::settingsBlockedListIconPadding.top());
 	}
diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp
index d7f6139220..67ab82a18e 100644
--- a/Telegram/SourceFiles/settings/settings_common.cpp
+++ b/Telegram/SourceFiles/settings/settings_common.cpp
@@ -227,14 +227,13 @@ void AddDividerTextWithLottie(
 
 	if (descriptor.about) {
 		verticalLayout->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				verticalLayout,
-				object_ptr<Ui::FlatLabel>(
-					verticalLayout,
-					std::move(descriptor.about),
-					st::settingsFilterDividerLabel)),
+				std::move(descriptor.about),
+				st::settingsFilterDividerLabel),
 			descriptor.aboutMargins.value_or(
-				st::settingsFilterDividerLabelPadding));
+				st::settingsFilterDividerLabelPadding),
+			style::al_top)->setTryMakeSimilarLines(true);
 	}
 
 	verticalLayout->geometryValue(
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 9f5338da4b..2ef4636fd9 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -853,8 +853,7 @@ void BoostCreditsBox(
 	AddCreditsBoostTable(controller->uiShow(), content, {}, b);
 	Ui::AddSkip(content);
 
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		box,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			tr::lng_credits_box_out_about(
@@ -863,7 +862,9 @@ void BoostCreditsBox(
 				) | Ui::Text::ToLink(
 					tr::lng_credits_box_out_about_link(tr::now)),
 				Ui::Text::WithEntities),
-			st::creditsBoxAboutDivider)));
+			st::creditsBoxAboutDivider),
+		st::boxRowPadding,
+		style::al_top);
 	Ui::AddSkip(content);
 
 	const auto button = box->addButton(tr::lng_box_ok(), [=] {
@@ -1391,8 +1392,7 @@ void GenericCreditsEntryBox(
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				rpl::single(!s.title.isEmpty()
@@ -1434,7 +1434,9 @@ void GenericCreditsEntryBox(
 					: (peer && !e.reaction)
 					? peer->name()
 					: Ui::GenerateEntryName(e).text),
-				st::creditsBoxAboutTitle)));
+				st::creditsBoxAboutTitle),
+			st::boxRowPadding,
+			style::al_top);
 
 		Ui::AddSkip(content);
 	}
@@ -1607,68 +1609,69 @@ void GenericCreditsEntryBox(
 
 	if (!isStarGift && !e.description.empty()) {
 		Ui::AddSkip(content);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				rpl::single(e.description),
-				st::creditsBoxAbout)));
+				st::creditsBoxAbout),
+			st::boxRowPadding,
+			style::al_top);
 	}
 
 	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
 	if (!uniqueGift && (starGiftCanManage || e.converted)) {
 		Ui::AddSkip(content);
 		const auto about = box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					(e.giftRefunded
-						? tr::lng_action_gift_refunded(
-							Ui::Text::RichLangValue)
-						: e.starsUpgradedBySender
-						? tr::lng_action_gift_got_upgradable_text(
-							Ui::Text::RichLangValue)
-						: (e.starsToUpgrade
-							&& giftToSelf
-							&& !e.giftTransferred)
-						? tr::lng_action_gift_self_about_unique(
-							Ui::Text::WithEntities)
-						: (e.starsToUpgrade
-							&& giftToChannelCanManage
-							&& !e.giftTransferred)
-						? tr::lng_action_gift_channel_about_unique(
-							Ui::Text::WithEntities)
-						: ((canConvert || e.converted)
-							? rpl::combine(
-								(canConvert
-									? (giftToSelf
-										? tr::lng_action_gift_self_about
-										: giftToChannelCanTransfer
-										? tr::lng_action_gift_channel_about
-										: tr::lng_action_gift_got_stars_text)
-									: (giftToChannel
-										? tr::lng_gift_channel_got
-										: tr::lng_gift_got_stars))(
-										lt_count,
-										rpl::single(e.starsConverted * 1.),
-										Ui::Text::RichLangValue),
-								tr::lng_paid_about_link()
-							) | rpl::map([](
-									TextWithEntities text,
-									QString link) {
-								return text.append(' ').append(
-									Ui::Text::Link(link));
-							})
-							: (e.savedToProfile
-								? (giftToChannel
-									? tr::lng_action_gift_can_remove_channel
-									: tr::lng_action_gift_can_remove_text)
+				(e.giftRefunded
+					? tr::lng_action_gift_refunded(
+						Ui::Text::RichLangValue)
+					: e.starsUpgradedBySender
+					? tr::lng_action_gift_got_upgradable_text(
+						Ui::Text::RichLangValue)
+					: (e.starsToUpgrade
+						&& giftToSelf
+						&& !e.giftTransferred)
+					? tr::lng_action_gift_self_about_unique(
+						Ui::Text::WithEntities)
+					: (e.starsToUpgrade
+						&& giftToChannelCanManage
+						&& !e.giftTransferred)
+					? tr::lng_action_gift_channel_about_unique(
+						Ui::Text::WithEntities)
+					: ((canConvert || e.converted)
+						? rpl::combine(
+							(canConvert
+								? (giftToSelf
+									? tr::lng_action_gift_self_about
+									: giftToChannelCanTransfer
+									? tr::lng_action_gift_channel_about
+									: tr::lng_action_gift_got_stars_text)
 								: (giftToChannel
-									? tr::lng_action_gift_got_gift_channel
-									: tr::lng_action_gift_got_gift_text))(
-										Ui::Text::WithEntities))),
-					st::creditsBoxAbout)))->entity();
+									? tr::lng_gift_channel_got
+									: tr::lng_gift_got_stars))(
+									lt_count,
+									rpl::single(e.starsConverted * 1.),
+									Ui::Text::RichLangValue),
+							tr::lng_paid_about_link()
+						) | rpl::map([](
+								TextWithEntities text,
+								QString link) {
+							return text.append(' ').append(
+								Ui::Text::Link(link));
+						})
+						: (e.savedToProfile
+							? (giftToChannel
+								? tr::lng_action_gift_can_remove_channel
+								: tr::lng_action_gift_can_remove_text)
+							: (giftToChannel
+								? tr::lng_action_gift_got_gift_channel
+								: tr::lng_action_gift_got_gift_text))(
+									Ui::Text::WithEntities))),
+				st::creditsBoxAbout),
+			st::boxRowPadding,
+			style::al_top);
 		about->setClickHandlerFilter([=](const auto &...) {
 			Core::App().iv().openWithIvPreferred(
 				session,
@@ -1690,8 +1693,7 @@ void GenericCreditsEntryBox(
 				std::move(text),
 				u"internal:stars_examples"_q);
 		});
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			Ui::CreateLabelWithCustomEmoji(
 				box,
 				(!e.in && peer)
@@ -1706,7 +1708,9 @@ void GenericCreditsEntryBox(
 						std::move(link),
 						Ui::Text::RichLangValue),
 				Core::TextContext({ .session = session }),
-				st::creditsBoxAbout)));
+				st::creditsBoxAbout),
+			st::boxRowPadding,
+			style::al_top);
 	} else if (e.paidMessagesCommission && e.barePeerId) {
 		Ui::AddSkip(content);
 		auto link = tr::lng_credits_paid_messages_fee_about_link(
@@ -1719,8 +1723,7 @@ void GenericCreditsEntryBox(
 				u"internal:edit_paid_messages_fee/"_q + QString::number(id));
 		});
 		const auto percent = 100. - (e.paidMessagesCommission / 10.);
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			Ui::CreateLabelWithCustomEmoji(
 				box,
 				tr::lng_credits_paid_messages_fee_about(
@@ -1731,7 +1734,9 @@ void GenericCreditsEntryBox(
 					std::move(link),
 					Ui::Text::RichLangValue),
 				Core::TextContext({ .session = session }),
-				st::creditsBoxAbout)));
+				st::creditsBoxAbout),
+			st::boxRowPadding,
+			style::al_top);
 	}
 
 	Ui::AddSkip(content);
@@ -1864,8 +1869,7 @@ void GenericCreditsEntryBox(
 	Ui::AddSkip(content);
 
 	if (!isStarGift && e.credits.stars()) {
-		box->addRow(object_ptr<Ui::CenterWrap<>>(
-			box,
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_credits_box_out_about(
@@ -1874,7 +1878,9 @@ void GenericCreditsEntryBox(
 					) | Ui::Text::ToLink(
 						tr::lng_credits_box_out_about_link(tr::now)),
 					Ui::Text::WithEntities),
-				st::creditsBoxAboutDivider)));
+				st::creditsBoxAboutDivider),
+			st::boxRowPadding,
+			style::al_top);
 	} else if (starGiftCanManage) {
 		const auto hiddenPhrase = giftToChannelCanManage
 			? tr::lng_gift_hidden_hint_channel
@@ -1925,7 +1931,9 @@ void GenericCreditsEntryBox(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				std::move(text),
-				st::creditsBoxAboutDivider));
+				st::creditsBoxAboutDivider),
+			st::boxRowPadding,
+			style::al_top);
 		label->setClickHandlerFilter([=](const auto &...) {
 			toggleVisibility(!e.savedToProfile);
 			return false;
@@ -1942,7 +1950,9 @@ void GenericCreditsEntryBox(
 						Ui::Text::WithEntities
 					) | Ui::Text::ToLink(),
 					Ui::Text::WithEntities),
-				st::creditsBoxAboutDivider));
+				st::creditsBoxAboutDivider),
+			st::boxRowPadding,
+			style::al_top);
 		label->setClickHandlerFilter([=](const auto &...) {
 			UrlClickHandler::Open(
 				TonAddressUrl(session, uniqueGift->ownerAddress));
@@ -1994,8 +2004,7 @@ void GenericCreditsEntryBox(
 		} else if (s.cancelled || s.cancelledByBot) {
 			label->setTextColorOverride(st::menuIconAttentionColor->c);
 		}
-		box->addRow(
-			object_ptr<Ui::CenterWrap<>>(box, std::move(label)));
+		box->addRow(std::move(label), st::boxRowPadding, style::al_top);
 	}
 
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp
index 1c5129e2f2..c8ac855a84 100644
--- a/Telegram/SourceFiles/settings/settings_folders.cpp
+++ b/Telegram/SourceFiles/settings/settings_folders.cpp
@@ -862,13 +862,12 @@ void SetupTopContent(
 	verticalLayout->add(std::move(icon.widget));
 
 	verticalLayout->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			verticalLayout,
-			object_ptr<Ui::FlatLabel>(
-				verticalLayout,
-				tr::lng_filters_about(),
-				st::settingsFilterDividerLabel)),
-		st::settingsFilterDividerLabelPadding);
+			tr::lng_filters_about(),
+			st::settingsFilterDividerLabel),
+		st::settingsFilterDividerLabelPadding,
+		style::al_top)->setTryMakeSimilarLines(true);
 
 	verticalLayout->geometryValue(
 	) | rpl::start_with_next([=](const QRect &r) {
diff --git a/Telegram/SourceFiles/ui/boxes/boost_box.cpp b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
index e72896a771..6dab099149 100644
--- a/Telegram/SourceFiles/ui/boxes/boost_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/boost_box.cpp
@@ -752,14 +752,16 @@ void AskBoostBox(
 			box,
 			std::move(title),
 			st::boostCenteredTitle),
-		st::boxRowPadding + QMargins(0, st::boostTitleSkip, 0, 0));
+		st::boxRowPadding + QMargins(0, st::boostTitleSkip, 0, 0),
+		style::al_top);
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			std::move(text),
 			st::boostText),
 		(st::boxRowPadding
-			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
+			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+		style::al_top);
 
 	auto stats = object_ptr<Ui::IconButton>(box, st::boostLinkStatsButton);
 	stats->setClickedCallback(openStatistics);
diff --git a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
index 5dc0aced6d..f9c24efb5e 100644
--- a/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/collectible_info_box.cpp
@@ -201,7 +201,8 @@ void CollectibleInfoBox(
 			box,
 			rpl::single(header),
 			st::collectibleHeader),
-		st::collectibleHeaderPadding
+		st::collectibleHeaderPadding,
+		style::al_top
 	)->setClickHandlerFilter([copyCallback](const auto &...) {
 		copyCallback(false);
 		return false;
@@ -220,7 +221,8 @@ void CollectibleInfoBox(
 			Ui::Text::RichLangValue);
 	const auto label = box->addRow(
 		object_ptr<Ui::FlatLabel>(box, st::collectibleInfo),
-		st::collectibleInfoPadding);
+		st::collectibleInfoPadding,
+		style::al_top);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	label->setMarkedText(text);
 
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
index 426ddce42e..00cfa4b789 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
@@ -57,10 +57,12 @@ constexpr auto kShowOrLineOpacity = 0.3;
 object_ptr<RpWidget> MakeShowOrLabel(
 		not_null<RpWidget*> parent,
 		rpl::producer<QString> text) {
-	auto result = object_ptr<FlatLabel>(
+	auto result = object_ptr<CenterWrap<>>(
 		parent,
-		std::move(text),
-		st::showOrLabel);
+		object_ptr<FlatLabel>(
+			parent,
+			std::move(text),
+			st::showOrLabel));
 	const auto raw = result.data();
 
 	raw->paintRequest(
@@ -69,7 +71,8 @@ object_ptr<RpWidget> MakeShowOrLabel(
 
 		const auto full = st::showOrLineWidth;
 		const auto left = (raw->width() - full) / 2;
-		const auto text = raw->textMaxWidth() + 2 * st::showOrLabelSkip;
+		const auto text = raw->entity()->naturalWidth()
+			+ 2 * st::showOrLabelSkip;
 		const auto fill = (full - text) / 2;
 		const auto stroke = st::lineWidth;
 		const auto top = st::showOrLineTop;
@@ -152,13 +155,15 @@ void ShowOrPremiumBox(
 			box,
 			std::move(skin.showTitle),
 			st::boostCenteredTitle),
-		st::showOrTitlePadding + buttonPadding);
+		st::showOrTitlePadding + buttonPadding,
+		style::al_top);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.showAbout),
 			st::boostText),
-		st::showOrAboutPadding + buttonPadding);
+		st::showOrAboutPadding + buttonPadding,
+		style::al_top);
 	const auto show = box->addRow(
 		object_ptr<RoundButton>(
 			box,
@@ -168,19 +173,22 @@ void ShowOrPremiumBox(
 	show->setTextTransform(RoundButton::TextTransform::NoTransform);
 	box->addRow(
 		MakeShowOrLabel(box, std::move(skin.orPremium)),
-		st::showOrLabelPadding + buttonPadding);
+		st::showOrLabelPadding + buttonPadding,
+		style::al_top);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.premiumTitle),
 			st::boostCenteredTitle),
-		st::showOrTitlePadding + buttonPadding);
+		st::showOrTitlePadding + buttonPadding,
+		style::al_top);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
 			std::move(skin.premiumAbout),
 			st::boostText),
-		st::showOrPremiumAboutPadding + buttonPadding);
+		st::showOrPremiumAboutPadding + buttonPadding,
+		style::al_top);
 
 	const auto premium = CreateChild<GradientButton>(
 		box.get(),
diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index e39dec86af..f5c9dce7d8 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -288,19 +288,21 @@ void AboutRatingBox(
 				lt_name,
 				rpl::single(TextWithEntities{ name }),
 				Ui::Text::RichLangValue);
-		const auto aboutNegative = box->addRow(
+		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
 				std::move(text),
 				st::boostTextNegative),
 			(st::boxRowPadding
-				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
-		aboutNegative->setTryMakeSimilarLines(true);
+				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+			style::al_top
+		)->setTryMakeSimilarLines(true);
 	}
 
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(box, std::move(title), st::infoStarsTitle),
-		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0));
+		st::boxRowPadding + QMargins(0, st::boostTitleSkip / 2, 0, 0),
+		style::al_top);
 
 	if (pending) {
 		const auto now = base::unixtime::now();
@@ -331,7 +333,8 @@ void AboutRatingBox(
 				std::move(text),
 				st::boostTextPending),
 			(st::boxRowPadding
-				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
+				+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+			style::al_top);
 		aboutPending->setTryMakeSimilarLines(true);
 		aboutPending->setClickHandlerFilter([=](const auto &...) {
 			state->pending = !state->pending.current();
@@ -343,14 +346,15 @@ void AboutRatingBox(
 		});
 	}
 
-	const auto aboutLabel = box->addRow(
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			box,
 			std::move(text),
 			st::boostText),
 		(st::boxRowPadding
-			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)));
-	aboutLabel->setTryMakeSimilarLines(true);
+			+ QMargins(0, st::boostTextSkip, 0, st::boostBottomSkip)),
+		style::al_top
+	)->setTryMakeSimilarLines(true);
 
 	auto helper = Ui::Text::CustomEmojiHelper();
 	const auto makeBadge = [&](
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index a510a70963..584b5509e0 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -224,18 +224,6 @@ premiumGiftOption: PremiumOption {
 	badgeMargins: margins(5px, 1px, 5px, 0px);
 }
 
-premiumGiftUserpicPadding: margins(10px, 27px, 18px, 13px);
-premiumGiftTitlePadding: margins(18px, 0px, 18px, 0px);
-premiumGiftAboutPadding: margins(18px, 5px, 18px, 23px);
-premiumGiftTermsPadding: margins(18px, 27px, 18px, 0px);
-premiumGiftTerms: FlatLabel(defaultFlatLabel) {
-	minWidth: 256px;
-	align: align(top);
-	textFg: windowSubTextFg;
-	style: TextStyle(defaultTextStyle) {
-		font: font(11px);
-	}
-}
 premiumGiftBox: Box(premiumPreviewBox) {
 	buttonPadding: margins(12px, 12px, 12px, 12px);
 }
@@ -245,10 +233,6 @@ premiumGiftsUserpicButton: UserpicButton(defaultUserpicButton) {
 	photoSize: 66px;
 	photoPosition: point(-1px, -1px);
 }
-premiumGiftsUserpicBadgeSize: size(26px, 26px);
-premiumGiftsUserpicBadgeInner: 2px;
-premiumGiftsUserpicBadgeFont: font(14px bold);
-premiumGiftsBoostIcon: icon{{ "stories/boost_mini", windowBgActive }};
 
 boostSkipTop: 37px;
 boostLimits: PremiumLimits(defaultPremiumLimits) {
diff --git a/Telegram/SourceFiles/ui/widgets/slider_natural_width.h b/Telegram/SourceFiles/ui/widgets/slider_natural_width.h
index f2c52aa0a9..b912f5261d 100644
--- a/Telegram/SourceFiles/ui/widgets/slider_natural_width.h
+++ b/Telegram/SourceFiles/ui/widgets/slider_natural_width.h
@@ -14,15 +14,7 @@ namespace Ui {
 class CustomWidthSlider final : public SettingsSlider {
 public:
 	using Ui::SettingsSlider::SettingsSlider;
-	void setNaturalWidth(int w) {
-		_naturalWidth = w;
-	}
-	int naturalWidth() const override {
-		return _naturalWidth;
-	}
-
-private:
-	int _naturalWidth = 0;
+	using SettingsSlider::setNaturalWidth;
 
 };
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 7a21118ca0..3201934f69 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 7a21118ca0964dc66673df7a2241f846ec094860
+Subproject commit 3201934f69e03d1461d8b5670ff6babbd6ca3789

From cf16472dd04bcc45d9e35ab5165244399e6cb398 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 13 Aug 2025 11:15:33 +0400
Subject: [PATCH 157/341] Fix user profiles.

---
 Telegram/SourceFiles/info/profile/info_profile_actions.cpp | 7 +++++--
 Telegram/lib_ui                                            | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 955b8185bd..69942551f0 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1493,8 +1493,11 @@ object_ptr<Ui::RpWidget> DetailsFiller::setupInfo() {
 
 		if (!user->isBot()) {
 			tracker.track(result->add(
-				CreateBirthday(result, controller, user)));
-			tracker.track(result->add(CreateWorkingHours(result, user)));
+				CreateBirthday(result, controller, user),
+				{},
+				style::al_justify));
+			tracker.track(result->add(
+				CreateWorkingHours(result, user), {}, style::al_justify));
 
 			auto locationText = user->session().changes().peerFlagsValue(
 				user,
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 3201934f69..a0fb3ce977 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 3201934f69e03d1461d8b5670ff6babbd6ca3789
+Subproject commit a0fb3ce977ab5ff5952dcb96ef25caa17d6c1da1

From 192a56ee15f8168bc60fca9f89f4b50930b4c92c Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 12 Aug 2025 20:19:24 +0000
Subject: [PATCH 158/341] Shorter notifications proxy check for Linux
 notifications

---
 .../platform/linux/notifications_manager_linux.cpp     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index f73fceab05..6c2f4a73f2 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -263,15 +263,7 @@ void Create(Window::Notifications::System *system) {
 					res,
 					nullptr);
 
-			if (!proxy) {
-				ServiceRegistered = false;
-				CurrentServerInformation = {};
-				CurrentCapabilities = {};
-				managerSetter(nullptr);
-				return;
-			}
-
-			ServiceRegistered = bool(proxy.get_name_owner());
+			ServiceRegistered = proxy ? bool(proxy.get_name_owner()) : false;
 			if (!ServiceRegistered) {
 				CurrentServerInformation = {};
 				CurrentCapabilities = {};

From 4cefc218190574dcaebe17e9c692ac2bfc1b4efd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 15:46:29 +0400
Subject: [PATCH 159/341] Close forum when searching in different chat.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 179fde1f83..4aa3c7dca4 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -2742,6 +2742,11 @@ void Widget::showMainMenu() {
 }
 
 void Widget::searchMessages(SearchState state) {
+	if (const auto peer = state.inChat.peer()) {
+		if (_openedForum && peer->forum() != _openedForum) {
+			controller()->closeForum();
+		}
+	}
 	applySearchState(std::move(state));
 	session().local().saveRecentSearchHashtags(_searchState.query);
 }

From 96360619e1628d76cc42e1e486f8776e5f8bbf30 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 16:30:11 +0400
Subject: [PATCH 160/341] Add some asserts in stats.

---
 .../SourceFiles/statistics/view/stack_linear_chart_common.cpp   | 2 ++
 .../SourceFiles/statistics/widgets/point_details_widget.cpp     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp b/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
index b7727bd714..50b86284f1 100644
--- a/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
+++ b/Telegram/SourceFiles/statistics/view/stack_linear_chart_common.cpp
@@ -83,6 +83,8 @@ PiePartData PiePartsPercentageByIndices(
 	for (const auto &line : chartData.lines) {
 		auto sum = ChartValue(0);
 		for (auto i = xIndices.min; i <= xIndices.max; i++) {
+			const auto index = int(base::SafeRound(i));
+			Assert(index >= 0 && index < line.y.size());
 			sum += line.y[i];
 		}
 		if (linesFilter) {
diff --git a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
index c000d919b9..b5e7daa6b2 100644
--- a/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
+++ b/Telegram/SourceFiles/statistics/widgets/point_details_widget.cpp
@@ -303,6 +303,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 	if (xIndex < 0) {
 		return;
 	}
+	Assert(xIndex < _chartData.x.size());
 	{
 		constexpr auto kOneDay = 3600 * 24 * 1000;
 		const auto timestamp = _chartData.x[xIndex];
@@ -328,6 +329,7 @@ void PointDetailsWidget::setXIndex(int xIndex) {
 		= (_chartData.currency == Data::StatisticalCurrency::Credits);
 	for (auto i = 0; i < _chartData.lines.size(); i++) {
 		const auto &dataLine = _chartData.lines[i];
+		Assert(xIndex < dataLine.y.size());
 		auto textLine = Line();
 		textLine.id = dataLine.id;
 		if (_maxPercentageWidth) {

From f9bf40a771233ca988a4eff3243b012440675e47 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 17:01:23 +0400
Subject: [PATCH 161/341] Fix crash in forum removal with new tabs.

---
 .../SourceFiles/history/view/history_view_chat_section.cpp    | 2 +-
 .../SourceFiles/history/view/history_view_subsection_tabs.cpp | 4 ++++
 .../SourceFiles/history/view/history_view_subsection_tabs.h   | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
index fc4cf0fc3c..7d96d7e0f9 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
@@ -456,7 +456,7 @@ ChatWidget::~ChatWidget() {
 	if (_repliesRootId) {
 		controller()->sendingAnimation().clear();
 	}
-	if (_subsectionTabs) {
+	if (_subsectionTabs && !_subsectionTabs->dying()) {
 		_subsectionTabsLifetime.destroy();
 		controller()->saveSubsectionTabs(base::take(_subsectionTabs));
 	}
diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
index f1bb1f33c2..9d61f1c85e 100644
--- a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
@@ -510,6 +510,10 @@ void SubsectionTabs::toggleModes() {
 	_layoutRequests.fire({});
 }
 
+bool SubsectionTabs::dying() const {
+	return !UsedFor(_history);
+}
+
 rpl::producer<> SubsectionTabs::removeRequests() const {
 	if (const auto forum = _history->peer->forum()) {
 		return forum->destroyed();
diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h
index 75a37104ea..d0d78f140c 100644
--- a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.h
@@ -49,6 +49,7 @@ public:
 
 	[[nodiscard]] static bool UsedFor(not_null<Data::Thread*> thread);
 
+	[[nodiscard]] bool dying() const;
 	[[nodiscard]] rpl::producer<> removeRequests() const;
 
 	void extractToParent(not_null<Ui::RpWidget*> parent);

From 7f2a0b66302df44ae161687934592f10de315055 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 17:01:34 +0400
Subject: [PATCH 162/341] Scroll a bit further when switching tabs.

---
 .../history/view/history_view_subsection_tabs.cpp           | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
index 9d61f1c85e..51ebf3b9e0 100644
--- a/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_subsection_tabs.cpp
@@ -237,6 +237,12 @@ void SubsectionTabs::setupSlider(
 	slider->requestShown(
 	) | rpl::start_with_next([=](Ui::ScrollToRequest request) {
 		const auto full = vertical ? scroll->height() : scroll->width();
+		const auto tab = request.ymax - request.ymin;
+		if (tab < full) {
+			const auto add = std::min(full - tab, tab) / 2;
+			request.ymax += add;
+			request.ymin -= add;
+		}
 		const auto scrollValue = vertical
 			? scroll->scrollTop()
 			: scroll->scrollLeft();

From e656cb8118677a024f40057551ead5b5952db49d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 18:28:39 +0400
Subject: [PATCH 163/341] Fix vertical layout once again.

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index a0fb3ce977..777188f65a 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit a0fb3ce977ab5ff5952dcb96ef25caa17d6c1da1
+Subproject commit 777188f65aeeca4213321da95ca64919eae74650

From ec8a475a2cba9e967b8e395f46d3cde236d61447 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 18:43:06 +0400
Subject: [PATCH 164/341] Fix top bar selection label resizing.

---
 Telegram/SourceFiles/info/info_top_bar.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Telegram/SourceFiles/info/info_top_bar.cpp b/Telegram/SourceFiles/info/info_top_bar.cpp
index 71bac1b3c8..af7006b382 100644
--- a/Telegram/SourceFiles/info/info_top_bar.cpp
+++ b/Telegram/SourceFiles/info/info_top_bar.cpp
@@ -669,6 +669,7 @@ void TopBar::createSelectionControls() {
 	) | rpl::start_to_stream(
 		_selectionActionRequests,
 		_cancelSelection->lifetime());
+
 	_selectionText = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::LabelWithNumbers>>(
 		this,
 		object_ptr<Ui::LabelWithNumbers>(
@@ -679,6 +680,11 @@ void TopBar::createSelectionControls() {
 		st::infoTopBarScale));
 	_selectionText->setDuration(st::infoTopBarDuration);
 	_selectionText->entity()->resize(0, _st.height);
+	_selectionText->naturalWidthValue(
+	) | rpl::skip(1) | rpl::start_with_next([=] {
+		updateSelectionControlsGeometry(width());
+	}, _selectionText->lifetime());
+
 	_forward = wrap(Ui::CreateChild<Ui::FadeWrap<Ui::IconButton>>(
 		this,
 		object_ptr<Ui::IconButton>(this, _st.mediaForward),

From 5cad9a8c441462da96e538266a240694ce59573a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Aug 2025 09:32:40 +0400
Subject: [PATCH 165/341] Fix build on layer 211.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index e520e1cf42..97d329dcbe 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1853,7 +1853,7 @@ starsTransactionPeerAPI#f9677aad = StarsTransactionPeer;
 
 starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
 
-starsTransaction#13659eb0 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true stargift_upgrade:flags.18?true business_transfer:flags.21?true stargift_resale:flags.22?true id:string amount:StarsAmount date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift floodskip_number:flags.15?int starref_commission_permille:flags.16?int starref_peer:flags.17?Peer starref_amount:flags.17?StarsAmount paid_messages:flags.19?int premium_gift_months:flags.20?int ads_proceeds_from_date:flags.23?int ads_proceeds_to_date:flags.23?int = StarsTransaction;
+starsTransaction#13659eb0 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true stargift_upgrade:flags.18?true business_transfer:flags.21?true stargift_resale:flags.22?true posts_search:flags.24?true id:string amount:StarsAmount date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift floodskip_number:flags.15?int starref_commission_permille:flags.16?int starref_peer:flags.17?Peer starref_amount:flags.17?StarsAmount paid_messages:flags.19?int premium_gift_months:flags.20?int ads_proceeds_from_date:flags.23?int ads_proceeds_to_date:flags.23?int = StarsTransaction;
 
 payments.starsStatus#6c9ce8ed flags:# balance:StarsAmount subscriptions:flags.1?Vector<StarsSubscription> subscriptions_next_offset:flags.2?string subscriptions_missing_balance:flags.4?long history:flags.3?Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
 

From 1b104bcf29db6e31ad44c16e28d33a135e7a9554 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 15 Aug 2025 08:47:14 +0000
Subject: [PATCH 166/341] Update Windows SDK version

---
 docs/building-win-x64.md | 2 +-
 docs/building-win.md     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md
index 476aaf1106..403c346b80 100644
--- a/docs/building-win-x64.md
+++ b/docs/building-win-x64.md
@@ -8,7 +8,7 @@
 
 ## Prepare folder
 
-The build is done in **Visual Studio 2022** with **10.0.22000.0** SDK version.
+The build is done in **Visual Studio 2022** with **10.0.26100.0** SDK version.
 
 Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**.
 
diff --git a/docs/building-win.md b/docs/building-win.md
index 85d76ccae4..be79bfcfc5 100644
--- a/docs/building-win.md
+++ b/docs/building-win.md
@@ -8,7 +8,7 @@
 
 ## Prepare folder
 
-The build is done in **Visual Studio 2022** with **10.0.22000.0** SDK version.
+The build is done in **Visual Studio 2022** with **10.0.26100.0** SDK version.
 
 Choose an empty folder for the future build, for example **D:\\TBuild**. It will be named ***BuildPath*** in the rest of this document. Create two folders there, ***BuildPath*\\ThirdParty** and ***BuildPath*\\Libraries**.
 

From b423dab1520b5a1a95d395021621f76ccbe816b8 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 15 Aug 2025 09:17:18 +0000
Subject: [PATCH 167/341] Fix Windows action execution on SDK update

---
 .github/workflows/win.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 8d7a603b71..ef9360f809 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -4,8 +4,8 @@ on:
   push:
     paths-ignore:
       - 'docs/**'
-      - '!docs/building-win*.md'
       - '**.md'
+      - '!docs/building-win*.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'
@@ -23,8 +23,8 @@ on:
   pull_request:
     paths-ignore:
       - 'docs/**'
-      - '!docs/building-win*.md'
       - '**.md'
+      - '!docs/building-win*.md'
       - 'changelog.txt'
       - 'LEGAL'
       - 'LICENSE'

From 273d5596d76c6ff7d082e381371d4d0e23a76fc3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 15:45:22 +0000
Subject: [PATCH 168/341] Bump endersonmenezes/free-disk-space

Bumps [endersonmenezes/free-disk-space](https://github.com/endersonmenezes/free-disk-space) from 4cae28d0d8e716a770938d92630f23db5184f61f to dd13eb48e709830a7ec4e50692e841be6b400d90.
- [Release notes](https://github.com/endersonmenezes/free-disk-space/releases)
- [Commits](https://github.com/endersonmenezes/free-disk-space/compare/4cae28d0d8e716a770938d92630f23db5184f61f...dd13eb48e709830a7ec4e50692e841be6b400d90)

---
updated-dependencies:
- dependency-name: endersonmenezes/free-disk-space
  dependency-version: dd13eb48e709830a7ec4e50692e841be6b400d90
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/snap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index ffdc0eabba..c67734a1f8 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -61,7 +61,7 @@ jobs:
           sudo lxd waitready
 
       - name: Free up some disk space.
-        uses: endersonmenezes/free-disk-space@4cae28d0d8e716a770938d92630f23db5184f61f
+        uses: endersonmenezes/free-disk-space@dd13eb48e709830a7ec4e50692e841be6b400d90
         with:
           remove_android: true
           remove_dotnet: true

From 2b83c958699d4064b7eea1a65fedaf274c55dff9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Aug 2025 13:05:18 +0300
Subject: [PATCH 169/341] Moved out ui util for channel earn list to static
 function.

---
 .../earn/info_channel_earn_list.cpp           | 70 ++++++++++---------
 .../earn/info_channel_earn_list.h             |  7 ++
 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 2757e22fd1..1f5105e164 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -200,6 +200,8 @@ void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
 		QLocale().toString(date.time(), QLocale::ShortFormat));
 }
 
+constexpr auto kMinus = QChar(0x2212);
+
 } // namespace
 
 InnerWidget::InnerWidget(
@@ -401,7 +403,6 @@ void InnerWidget::fill() {
 		);
 
 	constexpr auto kMinorLength = 3;
-	constexpr auto kMinus = QChar(0x2212);
 	//constexpr auto kApproximately = QChar(0x2248);
 	const auto multiplier = data.usdRate;
 
@@ -412,35 +413,6 @@ void InnerWidget::fill() {
 
 	const auto session = &_peer->session();
 	const auto withdrawalEnabled = WithdrawalEnabled(session);
-	const auto addEmojiToMajor = [=](
-			not_null<Ui::FlatLabel*> label,
-			rpl::producer<CreditsAmount> value,
-			std::optional<bool> isIn,
-			std::optional<QMargins> margins) {
-		const auto &st = label->st();
-		const auto prepended = !isIn
-			? TextWithEntities()
-			: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
-		std::move(
-			value
-		) | rpl::start_with_next([=](CreditsAmount v) {
-			auto helper = Ui::Text::CustomEmojiHelper();
-			auto icon = helper.paletteDependent({ .factory = [=] {
-				return Ui::Earn::IconCurrencyColored(
-					st.style.font,
-					!isIn
-					? st::currencyFg->c
-					: (*isIn)
-					? st::boxTextFgGood->c
-					: st::menuIconAttentionColor->c);
-				}, .margin = margins
-					? *margins
-					: st::channelEarnCurrencyCommonMargins });
-			label->setMarkedText(
-				base::duplicate(prepended).append(icon).append(MajorPart(v)),
-				helper.context());
-		}, label->lifetime());
-	};
 
 	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
 	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
@@ -727,7 +699,7 @@ void InnerWidget::fill() {
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				line,
 				st::channelEarnOverviewMajorLabel);
-			addEmojiToMajor(
+			AddEmojiToMajor(
 				majorLabel,
 				rpl::duplicate(currencyValue),
 				{},
@@ -880,7 +852,7 @@ void InnerWidget::fill() {
 		{
 			const auto &m = st::channelEarnCurrencyCommonMargins;
 			const auto p = QMargins(m.left(), 0, m.right(), m.bottom());
-			addEmojiToMajor(majorLabel, rpl::single(value), {}, p);
+			AddEmojiToMajor(majorLabel, rpl::single(value), {}, p);
 		}
 		majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
 		const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
@@ -1162,7 +1134,7 @@ void InnerWidget::fill() {
 				const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 					wrap,
 					st::channelEarnHistoryMajorLabel);
-				addEmojiToMajor(
+				AddEmojiToMajor(
 					majorLabel,
 					rpl::single(entry.credits),
 					isIn,
@@ -1196,7 +1168,7 @@ void InnerWidget::fill() {
 					const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 						labels,
 						st::channelEarnOverviewMajorLabel);
-					addEmojiToMajor(
+					AddEmojiToMajor(
 						majorLabel,
 						rpl::single(entry.credits),
 						isIn,
@@ -1530,4 +1502,34 @@ not_null<PeerData*> InnerWidget::peer() const {
 	return _peer;
 }
 
+void AddEmojiToMajor(
+		not_null<Ui::FlatLabel*> label,
+		rpl::producer<CreditsAmount> value,
+		std::optional<bool> isIn,
+		std::optional<QMargins> margins) {
+	const auto &st = label->st();
+	const auto prepended = !isIn
+		? TextWithEntities()
+		: TextWithEntities::Simple((*isIn) ? QChar('+') : kMinus);
+	std::move(
+		value
+	) | rpl::start_with_next([=](CreditsAmount v) {
+		auto helper = Ui::Text::CustomEmojiHelper();
+		auto icon = helper.paletteDependent({ .factory = [=] {
+			return Ui::Earn::IconCurrencyColored(
+				st.style.font,
+				!isIn
+				? st::currencyFg->c
+				: (*isIn)
+				? st::boxTextFgGood->c
+				: st::menuIconAttentionColor->c);
+			}, .margin = margins
+				? *margins
+				: st::channelEarnCurrencyCommonMargins });
+		label->setMarkedText(
+			base::duplicate(prepended).append(icon).append(MajorPart(v)),
+			helper.context());
+	}, label->lifetime());
+}
+
 } // namespace Info::ChannelEarn
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
index d67eba3238..0fa417ec72 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.h
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Ui {
 class Show;
+class FlatLabel;
 } // namespace Ui
 
 namespace Info {
@@ -63,4 +64,10 @@ private:
 
 };
 
+void AddEmojiToMajor(
+	not_null<Ui::FlatLabel*> label,
+	rpl::producer<CreditsAmount> value,
+	std::optional<bool> isIn,
+	std::optional<QMargins> margins);
+
 } // namespace Info::ChannelEarn

From 15db1c0c3096ef6217fa373f3483a56f5a9469af Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Aug 2025 13:05:54 +0300
Subject: [PATCH 170/341] Added ability to withdrawal personal currency
 balance.

---
 .../SourceFiles/settings/settings_credits.cpp | 145 +++++++++++++++++-
 1 file changed, 141 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 62b7c6f0a4..6209a4bc94 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -8,10 +8,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits.h"
 
 #include "api/api_credits.h"
+#include "api/api_earn.h"
+#include "api/api_statistics.h"
 #include "base/call_delayed.h"
-#include "boxes/star_gift_box.h"
 #include "boxes/gift_credits_box.h"
 #include "boxes/gift_premium_box.h"
+#include "boxes/star_gift_box.h"
 #include "chat_helpers/stickers_gift_box_pack.h"
 #include "core/click_handler_types.h"
 #include "data/components/credits.h"
@@ -25,23 +27,25 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
 #include "info/channel_statistics/earn/earn_format.h"
 #include "info/channel_statistics/earn/earn_icons.h"
+#include "info/channel_statistics/earn/info_channel_earn_list.h"
+#include "info/info_memento.h"
 #include "info/settings/info_settings_widget.h" // SectionCustomTopBarData.
 #include "info/statistics/info_statistics_list_controllers.h"
-#include "info/info_memento.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "settings/settings_common_session.h"
 #include "settings/settings_credits_graphics.h"
 #include "statistics/widgets/chart_header_widget.h"
 #include "ui/boxes/boost_box.h" // Ui::StartFireworks.
+#include "ui/effects/animation_value_f.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_top_bar.h"
 #include "ui/layers/generic_box.h"
-#include "ui/text/custom_emoji_instance.h"
-#include "ui/text/format_values.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
+#include "ui/text/custom_emoji_instance.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
@@ -592,6 +596,139 @@ void Credits::setupContent() {
 			controller->showSection(Info::BotStarRef::Join::Make(self));
 		});
 	}
+	if (isCurrency) {
+		using namespace Info::ChannelEarn;
+		const auto fill = [=](
+				not_null<Ui::VerticalLayout*> container,
+				CreditsAmount value,
+				float64 multiplier) {
+			Ui::AddSkip(container);
+			{
+				const auto header = container->add(
+					object_ptr<Ui::FlatLabel>(
+						container,
+						tr::lng_channel_earn_balance_title(),
+						st::channelEarnHeaderLabel),
+					st::boxRowPadding);
+				header->resizeToWidth(header->width());
+			}
+			Ui::AddSkip(container);
+
+			const auto labels = container->add(
+				object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
+					container,
+					object_ptr<Ui::RpWidget>(container)))->entity();
+
+			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				labels,
+				st::channelEarnBalanceMajorLabel);
+			{
+				const auto &m = st::channelEarnCurrencyCommonMargins;
+				const auto p = QMargins(m.left(), 0, m.right(), m.bottom());
+				AddEmojiToMajor(majorLabel, rpl::single(value), {}, p);
+			}
+			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+			const auto minorLabel = Ui::CreateChild<Ui::FlatLabel>(
+				labels,
+				MinorPart(value),
+				st::channelEarnBalanceMinorLabel);
+			minorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
+			rpl::combine(
+				majorLabel->sizeValue(),
+				minorLabel->sizeValue()
+			) | rpl::start_with_next([=](
+					const QSize &majorSize,
+					const QSize &minorSize) {
+				labels->resize(
+					majorSize.width() + minorSize.width(),
+					majorSize.height());
+				majorLabel->moveToLeft(0, 0);
+				minorLabel->moveToRight(
+					0,
+					st::channelEarnBalanceMinorLabelSkip);
+			}, labels->lifetime());
+			Ui::ToggleChildrenVisibility(labels, true);
+
+			Ui::AddSkip(container);
+			container->add(
+				object_ptr<Ui::CenterWrap<>>(
+					container,
+					object_ptr<Ui::FlatLabel>(
+						container,
+						ToUsd(value, multiplier, 0),
+						st::channelEarnOverviewSubMinorLabel)));
+
+			Ui::AddSkip(container);
+
+			const auto &stButton = st::defaultActiveButton;
+			const auto button = container->add(
+				object_ptr<Ui::RoundButton>(
+					container,
+					rpl::never<QString>(),
+					stButton),
+				st::boxRowPadding);
+
+			const auto label = Ui::CreateChild<Ui::FlatLabel>(
+				button,
+				tr::lng_channel_earn_balance_button(tr::now),
+				st::channelEarnSemiboldLabel);
+			label->setTextColorOverride(stButton.textFg->c);
+			label->setAttribute(Qt::WA_TransparentForMouseEvents);
+			rpl::combine(
+				button->sizeValue(),
+				label->sizeValue()
+			) | rpl::start_with_next([=](const QSize &b, const QSize &l) {
+				label->moveToLeft(
+					(b.width() - l.width()) / 2,
+					(b.height() - l.height()) / 2);
+			}, label->lifetime());
+
+			const auto colorText = [=](float64 value) {
+				label->setTextColorOverride(
+					anim::with_alpha(
+						stButton.textFg->c,
+						anim::interpolateF(.5, 1., value)));
+			};
+			const auto withdrawalEnabled = true;
+			colorText(withdrawalEnabled ? 1. : 0.);
+			button->setAttribute(
+				Qt::WA_TransparentForMouseEvents,
+				!withdrawalEnabled);
+
+			Api::HandleWithdrawalButton(
+				{ .currencyReceiver = self },
+				button,
+				_controller->uiShow());
+			Ui::ToggleChildrenVisibility(button, true);
+
+			Ui::AddSkip(container);
+			Ui::AddSkip(container);
+			Ui::AddDividerText(
+				container,
+				tr::lng_credits_currency_summary_subtitle());
+			Ui::AddSkip(container);
+		};
+
+		const auto self = _controller->session().user();
+		const auto wrap = content->add(
+			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+				content,
+				object_ptr<Ui::VerticalLayout>(content)));
+		const auto apiLifetime = wrap->lifetime().make_state<rpl::lifetime>();
+		const auto api = apiLifetime->make_state<Api::EarnStatistics>(self);
+		wrap->toggle(false, anim::type::instant);
+		api->request() | rpl::start_with_error_done([] {
+		}, [=] {
+			if (!api->data().availableBalance.empty()) {
+				wrap->toggle(true, anim::type::normal);
+				fill(
+					wrap->entity(),
+					api->data().availableBalance,
+					api->data().usdRate);
+				content->resizeToWidth(content->width());
+			}
+		}, *apiLifetime);
+	}
 
 	if (!isCurrency) {
 		Ui::AddSkip(content, st::lineWidth * 4);

From eb7976a2ef8ee030af8185f3ee1ef51230d81875 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Aug 2025 14:51:21 +0300
Subject: [PATCH 171/341] Replaced alignment of title bar with left side for
 macOS 26.

---
 Telegram/lib_base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index bc8bb88756..0450674146 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit bc8bb88756e607b10564c430dcc626a060a71e80
+Subproject commit 04506741462719a190152c64daa1a9ec4c8ef44f

From a28f113105f62b5396c51611f5d81b8870f55e2f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Aug 2025 18:19:32 +0300
Subject: [PATCH 172/341] Moved FindSearchQueryHighlight to use as util.

---
 .../history/view/history_view_element.cpp     | 109 +++++++++---------
 .../history/view/history_view_element.h       |   8 ++
 2 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 55f7272c41..2e2be66759 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -101,59 +101,6 @@ Element *MousedElement/* = nullptr*/;
 	return session->tryResolveWindow();
 }
 
-[[nodiscard]] TextSelection FindSearchQueryHighlight(
-		const QString &text,
-		const QString &query) {
-	const auto lower = query.toLower();
-	const auto inside = text.toLower();
-	const auto find = [&](QStringView part) {
-		auto skip = 0;
-		if (const auto from = inside.indexOf(part, skip); from >= 0) {
-			if (!from || !inside[from - 1].isLetterOrNumber()) {
-				return int(from);
-			}
-			skip = from + 1;
-		}
-		return -1;
-	};
-	if (const auto from = find(lower); from >= 0) {
-		const auto till = from + query.size();
-		if (till >= inside.size() || !inside[till].isLetterOrNumber()) {
-			return { uint16(from), uint16(till) };
-		}
-	}
-	const auto tillEndOfWord = [&](int from) {
-		for (auto till = from + 1; till != inside.size(); ++till) {
-			if (!inside[till].isLetterOrNumber()) {
-				return TextSelection{ uint16(from), uint16(till) };
-			}
-		}
-		return TextSelection{ uint16(from), uint16(inside.size()) };
-	};
-	const auto words = QStringView(lower).split(
-		QRegularExpression(
-			u"[\\W]"_q,
-			QRegularExpression::UseUnicodePropertiesOption),
-		Qt::SkipEmptyParts);
-	for (const auto &word : words) {
-		const auto length = int(word.size());
-		const auto cut = length / 2;
-		const auto part = word.mid(0, length - cut);
-		const auto offset = find(part);
-		if (offset < 0) {
-			continue;
-		}
-		for (auto i = 0; i != cut; ++i) {
-			const auto part = word.mid(0, length - i);
-			if (const auto from = find(part); from >= 0) {
-				return tillEndOfWord(from);
-			}
-		}
-		return tillEndOfWord(offset);
-	}
-	return {};
-}
-
 [[nodiscard]] TextSelection ApplyModificationsFrom(
 		TextSelection result,
 		const Ui::Text::String &text) {
@@ -2528,4 +2475,60 @@ Window::SessionController *ExtractController(const ClickContext &context) {
 	return nullptr;
 }
 
+TextSelection FindSearchQueryHighlight(
+		const QString &text,
+		const QString &query) {
+	const auto lower = query.toLower();
+	return FindSearchQueryHighlight(text, QStringView(lower));
+}
+
+TextSelection FindSearchQueryHighlight(
+		const QString &text,
+		QStringView lower) {
+	const auto inside = text.toLower();
+	const auto find = [&](QStringView part) {
+		auto skip = 0;
+		if (const auto from = inside.indexOf(part, skip); from >= 0) {
+			if (!from || !inside[from - 1].isLetterOrNumber()) {
+				return int(from);
+			}
+			skip = from + 1;
+		}
+		return -1;
+	};
+	if (const auto from = find(lower); from >= 0) {
+		const auto till = from + lower.size();
+		if (till >= inside.size()
+			|| !(inside.begin() + till)->isLetterOrNumber()) {
+			return { uint16(from), uint16(till) };
+		}
+	}
+	const auto tillEndOfWord = [&](int from) {
+		for (auto till = from + 1; till != inside.size(); ++till) {
+			if (!inside[till].isLetterOrNumber()) {
+				return TextSelection{ uint16(from), uint16(till) };
+			}
+		}
+		return TextSelection{ uint16(from), uint16(inside.size()) };
+	};
+	const auto words = Ui::Text::Words(lower);
+	for (const auto &word : words) {
+		const auto length = int(word.size());
+		const auto cut = length / 2;
+		const auto part = word.mid(0, length - cut);
+		const auto offset = find(part);
+		if (offset < 0) {
+			continue;
+		}
+		for (auto i = 0; i != cut; ++i) {
+			const auto part = word.mid(0, length - i);
+			if (const auto from = find(part); from >= 0) {
+				return tillEndOfWord(from);
+			}
+		}
+		return tillEndOfWord(offset);
+	}
+	return {};
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 34bc8679ce..2e13c7c0c3 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -755,4 +755,12 @@ private:
 [[nodiscard]] Window::SessionController *ExtractController(
 	const ClickContext &context);
 
+[[nodiscard]] TextSelection FindSearchQueryHighlight(
+	const QString &text,
+	const QString &query);
+
+[[nodiscard]] TextSelection FindSearchQueryHighlight(
+	const QString &text,
+	QStringView lower);
+
 } // namespace HistoryView

From 5c33a2bd5c191064ae81acd9fcd13506c95912b5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Aug 2025 19:22:53 +0300
Subject: [PATCH 173/341] Added simple colorizing of query in found messages.

---
 .../dialogs/dialogs_inner_widget.cpp          |  4 ++
 .../SourceFiles/dialogs/ui/dialogs_layout.cpp |  1 +
 .../SourceFiles/dialogs/ui/dialogs_layout.h   |  1 +
 .../dialogs/ui/dialogs_message_view.cpp       | 42 +++++++++++++++++++
 .../history/view/history_view_item_preview.h  |  1 +
 5 files changed, 49 insertions(+)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 683c34e082..7f7c7f8dcb 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1240,6 +1240,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			auto to = ceilclamp(r.y() + r.height() - skip, _st->height, 0, _previewResults.size());
 			p.translate(0, from * _st->height);
 			if (from < _previewResults.size()) {
+				const auto searchLowerText = _searchState.query.toLower();
 				for (; from < to; ++from) {
 					const auto &result = _previewResults[from];
 					const auto active = isSearchResultActive(result.get(), activeEntry);
@@ -1257,6 +1258,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.currentBg = currentBg(),
 						.filter = _filterId,
 						.now = ms,
+						.searchLowerText = QStringView(searchLowerText),
 						.width = fullWidth,
 						.active = active,
 						.selected = selected,
@@ -1284,6 +1286,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 					tr::now,
 					lt_count,
 					_searchedMigratedCount + _searchedCount);
+			const auto searchLowerText = _searchState.query.toLower();
 			p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
 			p.setFont(st::searchedBarFont);
 			p.setPen(st::searchedBarFg);
@@ -1331,6 +1334,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 						.currentBg = currentBg(),
 						.filter = _filterId,
 						.now = ms,
+						.searchLowerText = QStringView(searchLowerText),
 						.width = fullWidth,
 						.active = active,
 						.selected = selected,
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
index 955e8d7801..b4b0c9eb2f 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.cpp
@@ -1137,6 +1137,7 @@ void RowPainter::Paint(
 		return {};
 	}();
 	previewOptions.ignoreGroup = true;
+	previewOptions.searchLowerText = context.searchLowerText;
 
 	const auto badgesState = context.displayUnreadInfo
 		? entry->chatListBadgesState()
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h
index 50002c4847..d3cc032cc3 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_layout.h
@@ -64,6 +64,7 @@ struct PaintContext {
 	FilterId filter = 0;
 	float64 topicsExpanded = 0.;
 	crl::time now = 0;
+	QStringView searchLowerText;
 	int width = 0;
 	bool active = false;
 	bool selected = false;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
index 955377480f..6d1e4426f1 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "history/history.h"
 #include "history/history_item.h"
+#include "history/view/history_view_element.h"
 #include "history/view/history_view_item_preview.h"
 #include "main/main_session.h"
 #include "dialogs/dialogs_three_state_icon.h"
@@ -207,6 +208,47 @@ void MessageView::prepare(
 	}
 	TextUtilities::Trim(preview.text);
 	auto textToCache = DialogsPreviewText(std::move(preview.text));
+
+	if (!options.searchLowerText.isEmpty()) {
+		static constexpr auto kLeftShift = 15;
+		auto minFrom = std::numeric_limits<uint16>::max();
+
+		const auto words = Ui::Text::Words(options.searchLowerText);
+		textToCache.entities.reserve(textToCache.entities.size()
+			+ words.size());
+
+		for (const auto &word : words) {
+			const auto selection = HistoryView::FindSearchQueryHighlight(
+				textToCache.text,
+				word);
+			if (!selection.empty()) {
+				minFrom = std::min(minFrom, selection.from);
+				textToCache.entities.push_back(EntityInText{
+					EntityType::Colorized,
+					selection.from,
+					selection.to - selection.from
+				});
+			}
+		}
+
+		if (!words.empty() && minFrom != std::numeric_limits<uint16>::max()) {
+			std::sort(
+				textToCache.entities.begin(),
+				textToCache.entities.end(),
+				[](const auto &a, const auto &b) {
+					return a.offset() < b.offset();
+				});
+
+			const auto textSize = textToCache.text.size();
+			minFrom = (minFrom > textSize || minFrom < kLeftShift)
+				? 0
+				: minFrom - kLeftShift;
+
+			textToCache = TextWithEntities(
+					minFrom > 0 ? kQEllipsis : QString())
+				.append(Text::Mid(std::move(textToCache), minFrom));
+		}
+	}
 	_hasPlainLinkAtBegin = !textToCache.entities.empty()
 		&& (textToCache.entities.front().type() == EntityType::Colorized);
 	_textCache.setMarkedText(
diff --git a/Telegram/SourceFiles/history/view/history_view_item_preview.h b/Telegram/SourceFiles/history/view/history_view_item_preview.h
index 9656d701ff..79ff2ba631 100644
--- a/Telegram/SourceFiles/history/view/history_view_item_preview.h
+++ b/Telegram/SourceFiles/history/view/history_view_item_preview.h
@@ -41,6 +41,7 @@ struct ItemPreview {
 
 struct ToPreviewOptions {
 	const std::vector<ItemPreviewImage> *existing = nullptr;
+	QStringView searchLowerText;
 	bool hideSender = false;
 	bool hideCaption = false;
 	bool ignoreMessageText = false;

From 2b93fe9a307534201b5537f09dd1558bcdf5846c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 7 Aug 2025 21:09:12 +0300
Subject: [PATCH 174/341] Added simple colorizing of query in found messages
 from compose search.

---
 .../controls/history_view_compose_search.cpp  | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
index 478ccdba89..22d3ecba40 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_search.cpp
@@ -54,7 +54,9 @@ using SearchRequest = Api::MessagesSearchMerged::Request;
 
 class Row final : public PeerListRow {
 public:
-	explicit Row(std::unique_ptr<Dialogs::FakeRow> fakeRow);
+	explicit Row(
+		std::unique_ptr<Dialogs::FakeRow> fakeRow,
+		not_null<QString*> query);
 
 	[[nodiscard]] FullMsgId fullId() const;
 
@@ -73,15 +75,17 @@ public:
 private:
 	const std::unique_ptr<Dialogs::FakeRow> _fakeRow;
 
+	not_null<QString*> _query;
 	int _outerWidth = 0;
 
 };
 
-Row::Row(std::unique_ptr<Dialogs::FakeRow> fakeRow)
+Row::Row(std::unique_ptr<Dialogs::FakeRow> fakeRow, not_null<QString*> query)
 : PeerListRow(
 	fakeRow->searchInChat().history()->peer,
 	fakeRow->item()->fullId().msg.bare)
-, _fakeRow(std::move(fakeRow)) {
+, _fakeRow(std::move(fakeRow))
+, _query(query) {
 }
 
 FullMsgId Row::fullId() const {
@@ -116,9 +120,11 @@ void Row::elementsPaint(
 		.st = &st::defaultDialogRow,
 		.currentBg = st::dialogsBg,
 		.now = crl::now(),
+		.searchLowerText = QStringView(*_query),
 		.width = outerWidth,
 		.selected = selected,
 		.paused = p.inactive(),
+		.search = true,
 	});
 }
 
@@ -134,6 +140,7 @@ public:
 	void loadMoreRows() override;
 
 	void addItems(const MessageIdsList &ids, bool clear);
+	void setQuery(const QString &query);
 
 	[[nodiscard]] rpl::producer<FullMsgId> showItemRequests() const;
 	[[nodiscard]] rpl::producer<> searchMoreRequests() const;
@@ -145,6 +152,8 @@ private:
 	rpl::event_stream<> _searchMoreRequests;
 	rpl::event_stream<> _resetScrollRequests;
 
+	QString _query;
+
 };
 
 ListController::ListController(not_null<History*> history)
@@ -201,7 +210,8 @@ void ListController::addItems(const MessageIdsList &ids, bool clear) {
 				std::make_unique<Dialogs::FakeRow>(
 					key,
 					item,
-					[=] { delegate()->peerListUpdateRow(*shared); }));
+					[=] { delegate()->peerListUpdateRow(*shared); }),
+				&_query);
 			*shared = row.get();
 			delegate()->peerListAppendRow(std::move(row));
 		}
@@ -214,6 +224,10 @@ void ListController::addItems(const MessageIdsList &ids, bool clear) {
 	}
 }
 
+void ListController::setQuery(const QString &query) {
+	_query = query;
+}
+
 struct List {
 	base::unique_qptr<Ui::RpWidget> container;
 	std::unique_ptr<ListController> controller;
@@ -913,6 +927,9 @@ ComposeSearch::Inner::Inner(
 		search.topMsgId = _topMsgId;
 		_apiSearch.clear();
 		_apiSearch.search(search);
+
+		_list.controller->addItems({}, true);
+		_list.controller->setQuery(_apiSearch.request().query);
 	}, _topBar->lifetime());
 
 	_topBar->queryChanges(

From 35d2fff5937752acb3697c35495bd179c0cfda4c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 8 Aug 2025 01:20:34 +0300
Subject: [PATCH 175/341] Added initial support of highlighting for found query
 in quotes.

---
 Telegram/SourceFiles/dialogs/dialogs.style    |  2 +
 .../dialogs/ui/dialogs_message_view.cpp       | 57 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 3484cbce3d..15bda37069 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -838,6 +838,8 @@ dialogsTopBarSuggestionAboutStyle: TextStyle(defaultTextStyle) {
 	font: font(11px);
 }
 
+dialogsMiniQuoteIcon: icon{{ "chat/mini_quote", dialogsTextFg }};
+
 postsSearchIntroTitle: FlatLabel(defaultFlatLabel) {
 	textFg: windowBoldFg;
 	minWidth: 64px;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
index 6d1e4426f1..d209d70d53 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
@@ -16,9 +16,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "dialogs/ui/dialogs_layout.h"
 #include "dialogs/ui/dialogs_topics_view.h"
 #include "ui/effects/spoiler_mess.h"
+#include "ui/text/custom_emoji_helper.h"
 #include "ui/text/text_options.h"
 #include "ui/text/text_utilities.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "core/ui_integration.h"
 #include "lang/lang_keys.h"
@@ -187,7 +189,7 @@ void MessageView::prepare(
 		: nullptr;
 	const auto hasImages = !preview.images.empty();
 	const auto history = item->history();
-	const auto context = Core::TextContext({
+	auto context = Core::TextContext({
 		.session = &history->session(),
 		.repaint = customEmojiRepaint,
 		.customEmojiLoopLimit = kEmojiLoopCount,
@@ -231,6 +233,57 @@ void MessageView::prepare(
 			}
 		}
 
+		if (minFrom == std::numeric_limits<uint16>::max()
+			&& !item->replyTo().quote.empty()) {
+			auto textQuote = TextWithEntities();
+			for (const auto &word : words) {
+				const auto selection = HistoryView::FindSearchQueryHighlight(
+					item->replyTo().quote.text,
+					word);
+				if (!selection.empty()) {
+					minFrom = 0;
+					if (textQuote.empty()) {
+						textQuote = item->replyTo().quote;
+					}
+					textQuote.entities.push_back(EntityInText{
+						EntityType::Colorized,
+						selection.from,
+						selection.to - selection.from
+					});
+				}
+			}
+			if (!textQuote.empty()) {
+				auto helper = Ui::Text::CustomEmojiHelper(context);
+				const auto factory = Ui::Text::PaletteDependentEmoji{
+					.factory = [=] {
+						const auto &icon = st::dialogsMiniQuoteIcon;
+						auto image = QImage(
+							icon.size() * style::DevicePixelRatio(),
+							QImage::Format_ARGB32_Premultiplied);
+						image.setDevicePixelRatio(style::DevicePixelRatio());
+						image.fill(Qt::transparent);
+						{
+							auto p = Painter(&image);
+							icon.paintInCenter(
+								p,
+								Rect(icon.size()),
+								st::dialogsTextFg->c);
+						}
+						return image;
+					},
+					.margin = QMargins(
+						st::lineWidth * 2,
+						0,
+						st::lineWidth * 2,
+						0),
+				};
+				textToCache = textQuote
+					.append(helper.paletteDependent(factory))
+					.append(std::move(textToCache));
+				context = helper.context(customEmojiRepaint);
+			}
+		}
+
 		if (!words.empty() && minFrom != std::numeric_limits<uint16>::max()) {
 			std::sort(
 				textToCache.entities.begin(),
@@ -255,7 +308,7 @@ void MessageView::prepare(
 		st::dialogsTextStyle,
 		std::move(textToCache),
 		DialogTextOptions(),
-		context);
+		std::move(context));
 	_textCachedFor = item;
 	_imagesCache = std::move(preview.images);
 	if (!ranges::any_of(_imagesCache, &ItemPreviewImage::hasSpoiler)) {

From 04479ad660dbda2ca69f304ba9470642c741386a Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Aug 2025 15:37:16 +0300
Subject: [PATCH 176/341] Moved out GroupMembersWidget to correspond file and
 namespace.

---
 Telegram/CMakeLists.txt                                     | 4 ++--
 Telegram/SourceFiles/history/history_widget.cpp             | 4 ++--
 .../view/history_view_group_members_widget.cpp}             | 6 +++---
 .../view/history_view_group_members_widget.h}               | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename Telegram/SourceFiles/{profile/profile_block_group_members.cpp => history/view/history_view_group_members_widget.cpp} (99%)
 rename Telegram/SourceFiles/{profile/profile_block_group_members.h => history/view/history_view_group_members_widget.h} (95%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index e77d098baa..6069e52075 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -876,6 +876,8 @@ PRIVATE
     history/view/history_view_fake_items.h
     history/view/history_view_group_call_bar.cpp
     history/view/history_view_group_call_bar.h
+    history/view/history_view_group_members_widget.cpp
+    history/view/history_view_group_members_widget.h
     history/view/history_view_item_preview.h
     history/view/history_view_list_widget.cpp
     history/view/history_view_list_widget.h
@@ -1427,8 +1429,6 @@ PRIVATE
     platform/platform_window_title.h
     profile/profile_back_button.cpp
     profile/profile_back_button.h
-    profile/profile_block_group_members.cpp
-    profile/profile_block_group_members.h
     profile/profile_block_peer_list.cpp
     profile/profile_block_peer_list.h
     profile/profile_block_widget.cpp
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a077bbd51b..3c54ab621c 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -115,6 +115,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_pinned_section.h"
 #include "history/view/history_view_pinned_bar.h"
 #include "history/view/history_view_group_call_bar.h"
+#include "history/view/history_view_group_members_widget.h"
 #include "history/view/history_view_item_preview.h"
 #include "history/view/history_view_reply.h"
 #include "history/view/history_view_requests_bar.h"
@@ -122,7 +123,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_subsection_tabs.h"
 #include "history/view/history_view_translate_bar.h"
 #include "history/view/media/history_view_media.h"
-#include "profile/profile_block_group_members.h"
 #include "core/click_handler_types.h"
 #include "chat_helpers/field_autocomplete.h"
 #include "chat_helpers/tabbed_panel.h"
@@ -5806,7 +5806,7 @@ void HistoryWidget::showMembersDropdown() {
 	if (!_membersDropdown) {
 		_membersDropdown.create(this, st::membersInnerDropdown);
 		_membersDropdown->setOwnedWidget(
-			object_ptr<Profile::GroupMembersWidget>(
+			object_ptr<HistoryView::GroupMembersWidget>(
 				this,
 				controller(),
 				_peer,
diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.cpp b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
similarity index 99%
rename from Telegram/SourceFiles/profile/profile_block_group_members.cpp
rename to Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
index e155a19f98..d958bd71b6 100644
--- a/Telegram/SourceFiles/profile/profile_block_group_members.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
@@ -5,7 +5,7 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "profile/profile_block_group_members.h"
+#include "history/view/history_view_group_members_widget.h"
 
 #include "api/api_chat_participants.h"
 #include "styles/style_profile.h"
@@ -27,7 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
 
-namespace Profile {
+namespace HistoryView {
 namespace {
 
 using UpdateFlag = Data::PeerUpdate::Flag;
@@ -481,4 +481,4 @@ GroupMembersWidget::~GroupMembersWidget() {
 	}
 }
 
-} // namespace Profile
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/profile/profile_block_group_members.h b/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
similarity index 95%
rename from Telegram/SourceFiles/profile/profile_block_group_members.h
rename to Telegram/SourceFiles/history/view/history_view_group_members_widget.h
index 89ae411594..9098fc4f8e 100644
--- a/Telegram/SourceFiles/profile/profile_block_group_members.h
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
@@ -23,9 +23,9 @@ namespace Window {
 class SessionController;
 } // namespace Window
 
-namespace Profile {
+namespace HistoryView {
 
-class GroupMembersWidget : public PeerListWidget {
+class GroupMembersWidget : public Profile::PeerListWidget {
 
 public:
 	GroupMembersWidget(
@@ -91,4 +91,4 @@ private:
 
 };
 
-} // namespace Profile
+} // namespace HistoryView

From a2847246e669fdee638d27adb5369801c5bcfbec Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Aug 2025 15:50:32 +0300
Subject: [PATCH 177/341] Replaced custom GroupMembersWidget with PeerList.

---
 .../SourceFiles/history/history_widget.cpp    |   6 +-
 .../history_view_group_members_widget.cpp     | 501 +++---------------
 .../view/history_view_group_members_widget.h  | 102 ++--
 Telegram/SourceFiles/ui/chat/chat.style       |  17 +
 4 files changed, 116 insertions(+), 510 deletions(-)

diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index 3c54ab621c..cb534111fd 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -5806,11 +5806,7 @@ void HistoryWidget::showMembersDropdown() {
 	if (!_membersDropdown) {
 		_membersDropdown.create(this, st::membersInnerDropdown);
 		_membersDropdown->setOwnedWidget(
-			object_ptr<HistoryView::GroupMembersWidget>(
-				this,
-				controller(),
-				_peer,
-				st::membersInnerItem));
+			object_ptr<HistoryView::GroupMembersWidget>(this, controller(), _peer));
 		_membersDropdown->resizeToWidth(st::membersInnerWidth);
 
 		_membersDropdown->setMaxHeight(countMembersDropdownHeightMax());
diff --git a/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
index d958bd71b6..63b090d16d 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.cpp
@@ -7,478 +7,107 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "history/view/history_view_group_members_widget.h"
 
-#include "api/api_chat_participants.h"
-#include "styles/style_profile.h"
-#include "ui/widgets/labels.h"
-#include "ui/boxes/confirm_box.h"
-#include "boxes/peers/edit_participant_box.h"
 #include "boxes/peers/edit_participants_box.h"
-#include "base/unixtime.h"
-#include "ui/widgets/popup_menu.h"
-#include "mtproto/mtproto_config.h"
-#include "data/data_peer_values.h"
-#include "data/data_channel.h"
-#include "data/data_chat.h"
-#include "data/data_user.h"
-#include "data/data_changes.h"
-#include "mainwidget.h"
-#include "apiwrap.h"
-#include "main/main_session.h"
-#include "lang/lang_keys.h"
 #include "window/window_session_controller.h"
+#include "styles/style_boxes.h"
+#include "styles/style_chat.h"
 
 namespace HistoryView {
 namespace {
 
-using UpdateFlag = Data::PeerUpdate::Flag;
+class GroupMembersWidgetController : public ParticipantsBoxController {
+public:
+	using ParticipantsBoxController::ParticipantsBoxController;
+
+protected:
+	base::unique_qptr<Ui::PopupMenu> rowContextMenu(
+		QWidget *parent,
+		not_null<PeerListRow*> row) override {
+		return nullptr;
+	}
+
+};
 
 } // namespace
 
-GroupMembersWidget::Member::Member(not_null<UserData*> user) : Item(user) {
-}
-
-not_null<UserData*> GroupMembersWidget::Member::user() const {
-	return static_cast<UserData*>(peer.get());
-}
-
 GroupMembersWidget::GroupMembersWidget(
-	QWidget *parent,
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer,
-	const style::PeerListItem &st)
-: PeerListWidget(parent, peer, QString(), st, tr::lng_profile_kick(tr::now))
-, _controller(controller)
-, _updateOnlineTimer([=] { updateOnlineDisplay(); }) {
-	peer->session().changes().peerUpdates(
-		UpdateFlag::Admins
-		| UpdateFlag::Members
-		| UpdateFlag::OnlineStatus
-	) | rpl::start_with_next([=](const Data::PeerUpdate &update) {
-		notifyPeerUpdated(update);
-	}, lifetime());
-
-	setRemovedCallback([=](PeerData *selectedPeer) {
-		removePeer(selectedPeer);
-	});
-	setSelectedCallback([=](PeerData *selectedPeer) {
-		controller->showPeerInfo(selectedPeer);
-	});
-	setUpdateItemCallback([=](Item *item) {
-		updateItemStatusText(item);
-	});
-	setPreloadMoreCallback([=] {
-		preloadMore();
-	});
-
-	refreshMembers();
+not_null<Ui::RpWidget*> parent,
+not_null<Window::SessionNavigation*> navigation,
+not_null<PeerData*> peer)
+: Ui::RpWidget(parent)
+, _show(navigation->uiShow())
+, _listController(std::make_unique<GroupMembersWidgetController>(
+		navigation,
+		peer,
+		ParticipantsBoxController::Role::Profile)) {
+	_listController->setStoriesShown(true);
+	setupList();
+	setContent(_list.data());
+	_listController->setDelegate(static_cast<PeerListDelegate*>(this));
 }
 
-void GroupMembersWidget::removePeer(PeerData *selectedPeer) {
-	const auto user = selectedPeer->asUser();
-	Assert(user != nullptr);
-
-	const auto text = tr::lng_profile_sure_kick(
-		tr::now,
-		lt_user, user->firstName);
-	const auto currentRestrictedRights = [&]() -> ChatRestrictionsInfo {
-		if (auto channel = peer()->asMegagroup()) {
-			auto it = channel->mgInfo->lastRestricted.find(user);
-			if (it != channel->mgInfo->lastRestricted.cend()) {
-				return it->second.rights;
-			}
+void GroupMembersWidget::setupList() {
+	const auto topSkip = 0;
+	_listController->setStyleOverrides(&st::groupMembersWidgetList);
+	_listController->setStoriesShown(true);
+	_list = object_ptr<PeerListContent>(this, _listController.get());
+	widthValue() | rpl::start_with_next([this](int newWidth) {
+		if (newWidth > 0) {
+			_list->resizeToWidth(newWidth);
 		}
-		return ChatRestrictionsInfo();
-	}();
-
-	const auto peer = this->peer();
-	const auto callback = [=, controller = _controller] {
-		controller->hideLayer();
-		if (const auto chat = peer->asChat()) {
-			chat->session().api().chatParticipants().kick(chat, user);
-			controller->showPeerHistory(
-				chat->id,
-				Window::SectionShow::Way::ClearStack,
-				ShowAtTheEndMsgId);
-		} else if (const auto channel = peer->asChannel()) {
-			channel->session().api().chatParticipants().kick(
-				channel,
-				user,
-				currentRestrictedRights);
+	}, _list->lifetime());
+	_list->heightValue() | rpl::start_with_next([=](int listHeight) {
+		if (const auto newHeight = topSkip + listHeight; newHeight > 0) {
+			resize(width(), newHeight);
 		}
-	};
-	_controller->show(Ui::MakeConfirmBox({
-		.text = text,
-		.confirmed = crl::guard(&peer->session(), callback),
-		.confirmText = tr::lng_box_remove(),
-	}));
+	}, _list->lifetime());
+	_list->moveToLeft(0, topSkip);
 }
 
-void GroupMembersWidget::notifyPeerUpdated(const Data::PeerUpdate &update) {
-	if (update.peer != peer()) {
-		if (update.flags & UpdateFlag::OnlineStatus) {
-			if (auto user = update.peer->asUser()) {
-				refreshUserOnline(user);
-			}
-		}
-		return;
-	}
-
-	if (update.flags & UpdateFlag::Members) {
-		refreshMembers();
-		contentSizeUpdated();
-	}
-	if (update.flags & UpdateFlag::Admins) {
-		if (const auto chat = peer()->asChat()) {
-			for (const auto item : items()) {
-				setItemFlags(getMember(item), chat);
-			}
-		} else if (const auto megagroup = peer()->asMegagroup()) {
-			for (const auto item : items()) {
-				setItemFlags(getMember(item), megagroup);
-			}
-		}
-	}
-	this->update();
+void GroupMembersWidget::peerListSetTitle(rpl::producer<QString> title) {
 }
 
-void GroupMembersWidget::refreshUserOnline(UserData *user) {
-	auto it = _membersByUser.find(user);
-	if (it == _membersByUser.cend()) return;
-
-	_now = base::unixtime::now();
-
-	auto member = getMember(it->second);
-	member->lastseen = user->lastseen();
-	member->statusHasOnlineColor = Data::OnlineTextActive(user, _now);
-	member->onlineForSort = user->isSelf()
-		? std::numeric_limits<TimeId>::max()
-		: Data::SortByOnlineValue(user, _now);
-	member->statusText = QString();
-
-	sortMembers();
-	update();
+void GroupMembersWidget::peerListSetAdditionalTitle(
+	rpl::producer<QString> title) {
 }
 
-void GroupMembersWidget::preloadMore() {
-	//
-	// This can cause a ddos, because lastParticipants may never reach members count.
-	//
-	//if (auto megagroup = peer()->asMegagroup()) {
-	//	auto &megagroupInfo = megagroup->mgInfo;
-	//	if (!megagroupInfo->lastParticipants.isEmpty() && megagroupInfo->lastParticipants.size() < megagroup->membersCount()) {
-	//		peer()->session().api().requestLast(megagroup, false);
-	//	}
-	//}
+bool GroupMembersWidget::peerListIsRowChecked(not_null<PeerListRow*> row) {
+	return false;
 }
 
-void GroupMembersWidget::updateItemStatusText(Item *item) {
-	auto member = getMember(item);
-	auto user = member->user();
-	if (member->statusText.isEmpty() || (member->onlineTextTill <= _now)) {
-		if (user->isBot()) {
-			const auto seesAllMessages = user->botInfo->readsAllHistory
-				|| member->rank.has_value();
-			member->statusText = seesAllMessages
-				? tr::lng_status_bot_reads_all(tr::now)
-				: tr::lng_status_bot_not_reads_all(tr::now);
-			member->onlineTextTill = _now + 86400;
-		} else {
-			member->statusHasOnlineColor = member->lastseen.isOnline(_now);
-			member->statusText = Data::OnlineText(member->lastseen, _now);
-			const auto changeInMs = Data::OnlineChangeTimeout(
-				member->lastseen,
-				_now);
-			member->onlineTextTill = _now + TimeId(changeInMs / 1000);
-		}
-	}
-	if (_updateOnlineAt <= _now || _updateOnlineAt > member->onlineTextTill) {
-		_updateOnlineAt = member->onlineTextTill;
-		_updateOnlineTimer.callOnce((_updateOnlineAt - _now + 1) * 1000);
-	}
+int GroupMembersWidget::peerListSelectedRowsCount() {
+	return 0;
 }
 
-void GroupMembersWidget::refreshMembers() {
-	_now = base::unixtime::now();
-	if (const auto chat = peer()->asChat()) {
-		checkSelfAdmin(chat);
-		if (chat->noParticipantInfo()) {
-			chat->session().api().requestFullPeer(chat);
-		}
-		fillChatMembers(chat);
-	} else if (const auto megagroup = peer()->asMegagroup()) {
-		if (megagroup->lastParticipantsRequestNeeded()) {
-			megagroup->session().api().chatParticipants().requestLast(
-				megagroup);
-		}
-		fillMegagroupMembers(megagroup);
-	}
-	sortMembers();
-
-	refreshVisibility();
+void GroupMembersWidget::peerListScrollToTop() {
 }
 
-void GroupMembersWidget::checkSelfAdmin(not_null<ChatData*> chat) {
-	if (chat->participants.empty()) {
-		return;
-	}
-
-	//const auto self = chat->session().user();
-	//if (chat->amAdmin() && !chat->admins.contains(self)) {
-	//	chat->admins.insert(self);
-	//} else if (!chat->amAdmin() && chat->admins.contains(self)) {
-	//	chat->admins.remove(self);
-	//}
+void GroupMembersWidget::peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) {
+	Unexpected("Item selection in Info::Profile::Members.");
 }
 
-void GroupMembersWidget::sortMembers() {
-	if (!_sortByOnline || !itemsCount()) return;
-
-	sortItems([this](Item *a, Item *b) {
-		return getMember(a)->onlineForSort > getMember(b)->onlineForSort;
-	});
-
-	updateOnlineCount();
+void GroupMembersWidget::peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) {
+	Unexpected("Item selection in Info::Profile::Members.");
 }
 
-void GroupMembersWidget::updateOnlineCount() {
-	bool onlyMe = true;
-	int newOnlineCount = 0;
-	for (const auto item : items()) {
-		auto member = getMember(item);
-		auto user = member->user();
-		auto isOnline = !user->isBot()
-			&& member->lastseen.isOnline(_now);
-		if (member->statusHasOnlineColor != isOnline) {
-			member->statusHasOnlineColor = isOnline;
-			member->statusText = QString();
-		}
-		if (member->statusHasOnlineColor) {
-			++newOnlineCount;
-			if (!user->isSelf()) {
-				onlyMe = false;
-			}
-		}
-	}
-	if (newOnlineCount == 1 && onlyMe) {
-		newOnlineCount = 0;
-	}
-	if (_onlineCount != newOnlineCount) {
-		_onlineCount = newOnlineCount;
-	}
+void GroupMembersWidget::peerListFinishSelectedRowsBunch() {
 }
 
-auto GroupMembersWidget::addUser(
-	not_null<ChatData*> chat,
-	not_null<UserData*> user)
--> not_null<Member*> {
-	const auto member = computeMember(user);
-	setItemFlags(member, chat);
-	addItem(member);
-	return member;
+std::shared_ptr<Main::SessionShow> GroupMembersWidget::peerListUiShow() {
+	return _show;
 }
 
-void GroupMembersWidget::fillChatMembers(not_null<ChatData*> chat) {
-	if (chat->participants.empty()) {
-		return;
-	}
-
-	clearItems();
-	if (!chat->amIn()) {
-		return;
-	}
-
-	_sortByOnline = true;
-
-	reserveItemsForSize(chat->participants.size());
-	addUser(chat, chat->session().user())->onlineForSort
-		= std::numeric_limits<TimeId>::max();
-	for (const auto &user : chat->participants) {
-		if (!user->isSelf()) {
-			addUser(chat, user);
-		}
-	}
+void GroupMembersWidget::peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) {
+	description.destroy();
 }
 
-void GroupMembersWidget::setItemFlags(
-		not_null<Item*> item,
-		not_null<ChatData*> chat) {
-	const auto user = getMember(item)->user();
-	const auto isCreator = (peerFromUser(chat->creator) == item->peer->id);
-	const auto isAdmin = (item->peer->isSelf() && chat->hasAdminRights())
-		|| chat->admins.contains(user);
-	const auto rank = isCreator
-		? tr::lng_owner_badge(tr::now)
-		: isAdmin
-		? tr::lng_admin_badge(tr::now)
-		: std::optional<QString>();
-	item->rank = rank;
-	item->rankWidth = rank ? st::normalFont->width(*rank) : 0;
-	if (item->peer->id == chat->session().userPeerId()) {
-		item->hasRemoveLink = false;
-	} else if (chat->amCreator()
-		|| ((chat->adminRights() & ChatAdminRight::BanUsers)
-			&& !rank.has_value())) {
-		item->hasRemoveLink = true;
-	} else if (chat->invitedByMe.contains(user) && !rank.has_value()) {
-		item->hasRemoveLink = true;
-	} else {
-		item->hasRemoveLink = false;
-	}
-}
-
-auto GroupMembersWidget::addUser(
-	not_null<ChannelData*> megagroup,
-	not_null<UserData*> user)
--> not_null<Member*> {
-	const auto member = computeMember(user);
-	setItemFlags(member, megagroup);
-	addItem(member);
-	return member;
-}
-
-void GroupMembersWidget::fillMegagroupMembers(
-		not_null<ChannelData*> megagroup) {
-	Expects(megagroup->mgInfo != nullptr);
-
-	if (megagroup->mgInfo->lastParticipants.empty()) {
-		return;
-	} else if (!megagroup->canViewMembers()) {
-		clearItems();
-		return;
-	}
-
-	_sortByOnline = (megagroup->membersCount() > 0)
-		&& (megagroup->membersCount()
-			<= megagroup->session().serverConfig().chatSizeMax);
-
-	auto &membersList = megagroup->mgInfo->lastParticipants;
-	if (_sortByOnline) {
-		clearItems();
-		reserveItemsForSize(membersList.size());
-		if (megagroup->amIn()) {
-			addUser(megagroup, megagroup->session().user())->onlineForSort
-				= std::numeric_limits<TimeId>::max();
-		}
-	} else if (membersList.size() >= itemsCount()) {
-		if (addUsersToEnd(megagroup)) {
-			return;
-		}
-	}
-	if (!_sortByOnline) {
-		clearItems();
-		reserveItemsForSize(membersList.size());
-	}
-	for (const auto user : membersList) {
-		if (!_sortByOnline || !user->isSelf()) {
-			addUser(megagroup, user);
-		}
-	}
-}
-
-bool GroupMembersWidget::addUsersToEnd(not_null<ChannelData*> megagroup) {
-	auto &membersList = megagroup->mgInfo->lastParticipants;
-	auto &itemsList = items();
-	for (int i = 0, count = itemsList.size(); i < count; ++i) {
-		if (itemsList[i]->peer != membersList.at(i)) {
-			return false;
-		}
-	}
-	reserveItemsForSize(membersList.size());
-	for (int i = itemsCount(), count = membersList.size(); i < count; ++i) {
-		addUser(megagroup, membersList.at(i));
-	}
-	return true;
-}
-
-void GroupMembersWidget::setItemFlags(
-		not_null<Item*> item,
-		not_null<ChannelData*> megagroup) {
-	const auto amCreator = item->peer->isSelf() && megagroup->amCreator();
-	const auto amAdmin = item->peer->isSelf() && megagroup->hasAdminRights();
-	const auto user = getMember(item)->user();
-	const auto adminIt = megagroup->mgInfo->lastAdmins.find(user);
-	const auto isAdmin = (adminIt != megagroup->mgInfo->lastAdmins.cend());
-	const auto isCreator = (megagroup->mgInfo->creator == item->peer);
-	const auto rankIt = megagroup->mgInfo->admins.find(peerToUser(user->id));
-	const auto adminCanEdit = isAdmin && adminIt->second.canEdit;
-	const auto rank = (amCreator || isCreator)
-		? (!megagroup->mgInfo->creatorRank.isEmpty()
-			? megagroup->mgInfo->creatorRank
-			: tr::lng_owner_badge(tr::now))
-		: (amAdmin || isAdmin)
-		? ((rankIt != megagroup->mgInfo->admins.end()
-			&& !rankIt->second.isEmpty())
-			? rankIt->second
-			: tr::lng_admin_badge(tr::now))
-		: std::optional<QString>();
-	if (item->rank != rank) {
-		item->rank = rank;
-		item->rankWidth = rank ? st::normalFont->width(*rank) : 0;
-		auto user = item->peer->asUser();
-		Assert(user != nullptr);
-		if (user->isBot()) {
-			// Update "has access to messages" status.
-			item->statusText = QString();
-			updateItemStatusText(item);
-		}
-	}
-	if (item->peer->isSelf()) {
-		item->hasRemoveLink = false;
-	} else if (megagroup->amCreator()
-		|| (megagroup->canBanMembers()
-			&& (!rank.has_value() || adminCanEdit))) {
-		item->hasRemoveLink = true;
-	} else {
-		item->hasRemoveLink = false;
-	}
-}
-
-auto GroupMembersWidget::computeMember(not_null<UserData*> user)
--> not_null<Member*> {
-	auto it = _membersByUser.find(user);
-	if (it == _membersByUser.cend()) {
-		auto member = new Member(user);
-		it = _membersByUser.emplace(user, member).first;
-		member->lastseen = user->lastseen();
-		member->statusHasOnlineColor = !user->isBot()
-			&& member->lastseen.isOnline(_now);
-		member->onlineForSort = Data::SortByOnlineValue(user, _now);
-	}
-	return it->second;
-}
-
-void GroupMembersWidget::updateOnlineDisplay() {
-	if (_sortByOnline) {
-		_now = base::unixtime::now();
-
-		bool changed = false;
-		for (const auto item : items()) {
-			if (!item->statusHasOnlineColor) {
-				if (!item->peer->isSelf()) {
-					continue;
-				} else {
-					break;
-				}
-			}
-			auto member = getMember(item);
-			bool isOnline = !member->user()->isBot()
-				&& member->lastseen.isOnline(_now);
-			if (!isOnline) {
-				changed = true;
-			}
-		}
-		if (changed) {
-			updateOnlineCount();
-		}
-	}
-	update();
-}
-
-GroupMembersWidget::~GroupMembersWidget() {
-	auto members = base::take(_membersByUser);
-	for (const auto &[_, member] : members) {
-		delete member;
-	}
+void GroupMembersWidget::peerListShowRowMenu(
+	not_null<PeerListRow*> row,
+	bool highlightRow,
+	Fn<void(not_null<Ui::PopupMenu*>)> destroyed) {
 }
 
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/history_view_group_members_widget.h b/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
index 9098fc4f8e..a16b6d6094 100644
--- a/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
+++ b/Telegram/SourceFiles/history/view/history_view_group_members_widget.h
@@ -7,87 +7,51 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
-#include "base/timer.h"
-#include "data/data_lastseen_status.h"
-#include "profile/profile_block_peer_list.h"
-
-namespace Ui {
-class FlatLabel;
-} // namespace Ui
-
-namespace Data {
-struct PeerUpdate;
-} // namespace Data
+#include "boxes/peer_list_box.h"
 
 namespace Window {
-class SessionController;
+class SessionNavigation;
 } // namespace Window
 
+class ParticipantsBoxController;
+
 namespace HistoryView {
 
-class GroupMembersWidget : public Profile::PeerListWidget {
-
+class GroupMembersWidget
+	: public Ui::RpWidget
+	, public PeerListContentDelegate {
 public:
 	GroupMembersWidget(
-		QWidget *parent,
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer,
-		const style::PeerListItem &st);
-
-	int onlineCount() const {
-		return _onlineCount;
-	}
-
-	~GroupMembersWidget();
+		not_null<Ui::RpWidget*> parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer);
 
 private:
-	void updateOnlineDisplay();
+	void setupList();
 
-	// Observed notifications.
-	void notifyPeerUpdated(const Data::PeerUpdate &update);
+	// PeerListContentDelegate interface.
+	void peerListSetTitle(rpl::producer<QString> title) override;
+	void peerListSetAdditionalTitle(rpl::producer<QString> title) override;
+	bool peerListIsRowChecked(not_null<PeerListRow*> row) override;
+	int peerListSelectedRowsCount() override;
+	void peerListScrollToTop() override;
+	void peerListAddSelectedPeerInBunch(
+		not_null<PeerData*> peer) override;
+	void peerListAddSelectedRowInBunch(
+		not_null<PeerListRow*> row) override;
+	void peerListFinishSelectedRowsBunch() override;
+	void peerListSetDescription(
+		object_ptr<Ui::FlatLabel> description) override;
+	std::shared_ptr<Main::SessionShow> peerListUiShow() override;
+	void peerListShowRowMenu(
+		not_null<PeerListRow*> row,
+		bool highlightRow,
+		Fn<void(not_null<Ui::PopupMenu*>)> destroyed = nullptr) override;
+	// PeerListContentDelegate interface.
 
-	void removePeer(PeerData *selectedPeer);
-	void refreshMembers();
-	void fillChatMembers(not_null<ChatData*> chat);
-	void fillMegagroupMembers(not_null<ChannelData*> megagroup);
-	void sortMembers();
-	void updateOnlineCount();
-	void checkSelfAdmin(not_null<ChatData*> chat);
-	void preloadMore();
-
-	void refreshUserOnline(UserData *user);
-
-	struct Member : public Item {
-		explicit Member(not_null<UserData*> user);
-		not_null<UserData*> user() const;
-
-		TimeId onlineTextTill = 0;
-		Data::LastseenStatus lastseen;
-		TimeId onlineForSort = 0;
-	};
-	Member *getMember(Item *item) {
-		return static_cast<Member*>(item);
-	}
-
-	void updateItemStatusText(Item *item);
-	not_null<Member*> computeMember(not_null<UserData*> user);
-	not_null<Member*> addUser(not_null<ChatData*> chat, not_null<UserData*> user);
-	not_null<Member*> addUser(not_null<ChannelData*> megagroup, not_null<UserData*> user);
-	void setItemFlags(not_null<Item*> item, not_null<ChatData*> chat);
-	void setItemFlags(
-		not_null<Item*> item,
-		not_null<ChannelData*> megagroup);
-	bool addUsersToEnd(not_null<ChannelData*> megagroup);
-
-	const not_null<Window::SessionController*> _controller;
-
-	base::flat_map<UserData*, Member*> _membersByUser;
-	bool _sortByOnline = false;
-	TimeId _now = 0;
-
-	int _onlineCount = 0;
-	TimeId _updateOnlineAt = 0;
-	base::Timer _updateOnlineTimer;
+	std::shared_ptr<Main::SessionShow> _show;
+	object_ptr<PeerListContent> _list = { nullptr };
+	std::unique_ptr<ParticipantsBoxController> _listController;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index cdd1c44431..a2ed0b4544 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1428,3 +1428,20 @@ lowTonText: FlatLabel(defaultFlatLabel) {
 	minWidth: 100px;
 	align: align(top);
 }
+
+groupMembersWidgetList: PeerList(defaultPeerList) {
+	item: PeerListItem(defaultPeerListItem) {
+		photoPosition: point(12px, 6px);
+		namePosition: point(68px, 11px);
+		statusPosition: point(68px, 31px);
+		checkbox: RoundImageCheckbox(defaultPeerListCheckbox) {
+			selectExtendTwice: 1px;
+			imageRadius: 21px;
+			imageSmallRadius: 19px;
+			check: RoundCheckbox(defaultPeerListCheck) {
+				size: 0px;
+			}
+		}
+		nameFgChecked: contactsNameFg;
+	}
+}

From 034740ce46c35f8ed669822b283a95d5cc02f426 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Aug 2025 15:51:37 +0300
Subject: [PATCH 178/341] Removed unused PeerListWidget.

---
 Telegram/CMakeLists.txt                       |   2 -
 .../profile/profile_block_peer_list.cpp       | 279 ------------------
 .../profile/profile_block_peer_list.h         | 142 ---------
 3 files changed, 423 deletions(-)
 delete mode 100644 Telegram/SourceFiles/profile/profile_block_peer_list.cpp
 delete mode 100644 Telegram/SourceFiles/profile/profile_block_peer_list.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 6069e52075..2ec4596238 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1429,8 +1429,6 @@ PRIVATE
     platform/platform_window_title.h
     profile/profile_back_button.cpp
     profile/profile_back_button.h
-    profile/profile_block_peer_list.cpp
-    profile/profile_block_peer_list.h
     profile/profile_block_widget.cpp
     profile/profile_block_widget.h
     profile/profile_cover_drop_area.cpp
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp b/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
deleted file mode 100644
index 130692e474..0000000000
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "profile/profile_block_peer_list.h"
-
-#include "ui/effects/ripple_animation.h"
-#include "ui/text/text_options.h"
-#include "ui/painter.h"
-#include "data/data_peer.h"
-#include "data/data_cloud_file.h"
-#include "main/main_session.h"
-#include "styles/style_profile.h"
-#include "styles/style_widgets.h"
-
-namespace Profile {
-
-PeerListWidget::Item::Item(not_null<PeerData*> peer) : peer(peer) {
-}
-
-PeerListWidget::Item::~Item() = default;
-
-PeerListWidget::PeerListWidget(
-	QWidget *parent,
-	PeerData *peer,
-	const QString &title,
-	const style::PeerListItem &st,
-	const QString &removeText)
-: BlockWidget(parent, peer, title)
-, _st(st)
-, _removeText(removeText)
-, _removeWidth(st::normalFont->width(_removeText)) {
-	setMouseTracking(true);
-
-	peer->session().downloaderTaskFinished(
-	) | rpl::start_with_next([=] {
-		update();
-	}, lifetime());
-}
-
-int PeerListWidget::resizeGetHeight(int newWidth) {
-	auto newHeight = getListTop();
-
-	newHeight += _items.size() * _st.height;
-
-	return newHeight + _st.bottom;
-}
-
-void PeerListWidget::visibleTopBottomUpdated(int visibleTop, int visibleBottom) {
-	_visibleTop = visibleTop;
-	_visibleBottom = visibleBottom;
-
-	if (_preloadMoreCallback) {
-		if (_visibleTop + PreloadHeightsCount * (_visibleBottom - _visibleTop) > height()) {
-			_preloadMoreCallback();
-		}
-	}
-}
-
-void PeerListWidget::paintContents(Painter &p) {
-	auto left = getListLeft();
-	auto top = getListTop();
-
-	const auto count = int(_items.size());
-	auto from = floorclamp(_visibleTop - top, _st.height, 0, count);
-	auto to = ceilclamp(_visibleBottom - top, _st.height, 0, count);
-	for (auto i = from; i < to; ++i) {
-		auto y = top + i * _st.height;
-		auto selected = (_pressed >= 0) ? (i == _pressed) : (i == _selected);
-		auto selectedRemove = selected && _selectedRemove;
-		if (_pressed >= 0 && !_pressedRemove) {
-			selectedRemove = false;
-		}
-		paintItem(p, left, y, _items[i], selected, selectedRemove);
-	}
-}
-
-void PeerListWidget::paintItem(Painter &p, int x, int y, Item *item, bool selected, bool selectedKick) {
-	if (_updateItemCallback) {
-		_updateItemCallback(item);
-	}
-
-	auto memberRowWidth = rowWidth();
-	if (selected) {
-		paintItemRect(p, x, y, memberRowWidth, _st.height);
-	}
-	if (auto &ripple = item->ripple) {
-		ripple->paint(p, x, y, width());
-		if (ripple->empty()) {
-			ripple.reset();
-		}
-	}
-	int skip = _st.photoPosition.x();
-
-	item->peer->paintUserpicLeft(p, item->userpic, x + _st.photoPosition.x(), y + _st.photoPosition.y(), width(), _st.photoSize);
-
-	if (item->name.isEmpty()) {
-		item->name.setText(
-			st::semiboldTextStyle,
-			item->peer->name(),
-			Ui::NameTextOptions());
-	}
-	int nameLeft = x + _st.namePosition.x();
-	int nameTop = y + _st.namePosition.y();
-	int nameWidth = memberRowWidth - _st.namePosition.x() - skip;
-	if (item->hasRemoveLink && selected) {
-		p.setFont(selectedKick ? st::normalFont->underline() : st::normalFont);
-		p.setPen(st::windowActiveTextFg);
-		p.drawTextLeft(nameLeft + nameWidth - _removeWidth, nameTop, width(), _removeText, _removeWidth);
-		nameWidth -= _removeWidth + skip;
-	} else if (item->rank) {
-		p.setFont(st::normalFont);
-		p.setPen(st::windowActiveTextFg);
-		p.drawTextLeft(nameLeft + nameWidth - item->rankWidth, nameTop, width(), *item->rank, item->rankWidth);
-		nameWidth -= item->rankWidth + skip;
-	}
-	p.setPen(st::profileMemberNameFg);
-	item->name.drawLeftElided(p, nameLeft, nameTop, nameWidth, width());
-
-	if (item->statusHasOnlineColor) {
-		p.setPen(_st.statusFgActive);
-	} else {
-		p.setPen(selected ? _st.statusFgOver : _st.statusFg);
-	}
-	p.setFont(st::normalFont);
-	p.drawTextLeft(x + _st.statusPosition.x(), y + _st.statusPosition.y(), width(), item->statusText);
-}
-
-void PeerListWidget::paintItemRect(Painter &p, int x, int y, int w, int h) const {
-	p.fillRect(style::rtlrect(x, y, w, h, width()), _st.button.textBgOver);
-}
-
-void PeerListWidget::mouseMoveEvent(QMouseEvent *e) {
-	_mousePosition = e->globalPos();
-	updateSelection();
-}
-
-void PeerListWidget::mousePressEvent(QMouseEvent *e) {
-	_mousePosition = e->globalPos();
-	updateSelection();
-
-	_pressButton = e->button();
-	_pressed = _selected;
-	_pressedRemove = _selectedRemove;
-	if (_pressed >= 0 && !_pressedRemove) {
-		const auto item = _items[_pressed];
-		if (!item->ripple) {
-			auto memberRowWidth = rowWidth();
-			auto mask = Ui::RippleAnimation::RectMask(QSize(memberRowWidth, _st.height));
-			item->ripple = std::make_unique<Ui::RippleAnimation>(_st.button.ripple, std::move(mask), [this, index = _pressed] {
-				repaintRow(index);
-			});
-		}
-		auto left = getListLeft();
-		auto top = getListTop() + _st.height * _pressed;
-		item->ripple->add(e->pos() - QPoint(left, top));
-	}
-}
-
-void PeerListWidget::mouseReleaseEvent(QMouseEvent *e) {
-	mousePressReleased(e->button());
-}
-
-void PeerListWidget::mousePressReleased(Qt::MouseButton button) {
-	repaintRow(_pressed);
-	auto pressed = std::exchange(_pressed, -1);
-	auto pressedRemove = base::take(_pressedRemove);
-	if (pressed >= 0 && pressed < _items.size()) {
-		if (const auto &ripple = _items[pressed]->ripple) {
-			ripple->lastStop();
-		}
-		if (pressed == _selected && pressedRemove == _selectedRemove && button == Qt::LeftButton) {
-			InvokeQueued(this, [this, pressedRemove, peer = _items[pressed]->peer] {
-				if (auto &callback = (pressedRemove ? _removedCallback : _selectedCallback)) {
-					callback(peer);
-				}
-			});
-		}
-	}
-	setCursor(_selectedRemove ? style::cur_pointer : style::cur_default);
-	repaintSelectedRow();
-}
-
-void PeerListWidget::enterEventHook(QEnterEvent *e) {
-	_mousePosition = QCursor::pos();
-	updateSelection();
-}
-
-void PeerListWidget::leaveEventHook(QEvent *e) {
-	_mousePosition = QPoint(-1, -1);
-	updateSelection();
-}
-
-void PeerListWidget::updateSelection() {
-	auto selected = -1;
-	auto selectedKick = false;
-
-	auto mouse = mapFromGlobal(_mousePosition);
-	if (rtl()) mouse.setX(width() - mouse.x());
-	auto left = getListLeft();
-	auto top = getListTop();
-	auto memberRowWidth = rowWidth();
-	if (mouse.x() >= left && mouse.x() < left + memberRowWidth && mouse.y() >= top) {
-		selected = (mouse.y() - top) / _st.height;
-		if (selected >= _items.size()) {
-			selected = -1;
-		} else if (_items[selected]->hasRemoveLink) {
-			int skip = _st.photoPosition.x();
-			int nameLeft = left + _st.namePosition.x();
-			int nameTop = top + _selected * _st.height + _st.namePosition.y();
-			int nameWidth = memberRowWidth - _st.namePosition.x() - skip;
-			if (mouse.x() >= nameLeft + nameWidth - _removeWidth && mouse.x() < nameLeft + nameWidth) {
-				if (mouse.y() >= nameTop && mouse.y() < nameTop + st::normalFont->height) {
-					selectedKick = true;
-				}
-			}
-		}
-	}
-
-	setSelected(selected, selectedKick);
-}
-
-void PeerListWidget::setSelected(int selected, bool selectedRemove) {
-	if (_selected == selected && _selectedRemove == selectedRemove) {
-		return;
-	}
-
-	repaintSelectedRow();
-	if (_selectedRemove != selectedRemove) {
-		_selectedRemove = selectedRemove;
-		if (_pressed < 0) {
-			setCursor(_selectedRemove ? style::cur_pointer : style::cur_default);
-		}
-	}
-	if (_selected != selected) {
-		_selected = selected;
-		repaintSelectedRow();
-	}
-}
-
-void PeerListWidget::repaintSelectedRow() {
-	repaintRow(_selected);
-}
-
-void PeerListWidget::repaintRow(int index) {
-	if (index >= 0) {
-		auto left = getListLeft();
-		rtlupdate(left, getListTop() + index * _st.height, width() - left, _st.height);
-	}
-}
-
-int PeerListWidget::getListLeft() const {
-	return _st.left;
-}
-
-int PeerListWidget::rowWidth() const {
-	return _st.maximalWidth
-		? qMin(width() - getListLeft(), _st.maximalWidth)
-		: width() - getListLeft();
-}
-
-void PeerListWidget::preloadPhotos() {
-	int top = getListTop();
-	int preloadFor = (_visibleBottom - _visibleTop) * PreloadHeightsCount;
-	int from = floorclamp(_visibleTop - top, _st.height, 0, _items.size());
-	int to = ceilclamp(_visibleBottom + preloadFor - top, _st.height, 0, _items.size());
-	for (int i = from; i < to; ++i) {
-		_items[i]->peer->loadUserpic();
-	}
-}
-
-void PeerListWidget::refreshVisibility() {
-	setVisible(!_items.empty());
-}
-
-} // namespace Profile
diff --git a/Telegram/SourceFiles/profile/profile_block_peer_list.h b/Telegram/SourceFiles/profile/profile_block_peer_list.h
deleted file mode 100644
index 94e6544964..0000000000
--- a/Telegram/SourceFiles/profile/profile_block_peer_list.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-#include "profile/profile_block_widget.h"
-#include "ui/userpic_view.h"
-
-namespace Ui {
-class RippleAnimation;
-class PopupMenu;
-} // namespace Ui
-
-namespace style {
-struct PeerListItem;
-} // namespace style
-
-namespace Profile {
-
-class PeerListWidget : public BlockWidget {
-public:
-	PeerListWidget(QWidget *parent, PeerData *peer, const QString &title, const style::PeerListItem &st, const QString &removeText);
-
-	struct Item {
-		explicit Item(not_null<PeerData*> peer);
-		~Item();
-
-		const not_null<PeerData*> peer;
-		Ui::PeerUserpicView userpic;
-		Ui::Text::String name;
-		QString statusText;
-		bool statusHasOnlineColor = false;
-		std::optional<QString> rank;
-		int rankWidth = 0;
-		bool hasRemoveLink = false;
-		std::unique_ptr<Ui::RippleAnimation> ripple;
-	};
-	int getListTop() const {
-		return contentTop();
-	}
-
-	int getListLeft() const;
-
-	const std::vector<Item*> &items() const {
-		return _items;
-	}
-	int itemsCount() const {
-		return _items.size();
-	}
-
-	// Does not take ownership of item.
-	void addItem(Item *item) {
-		if (!item) return;
-		_items.push_back(item);
-	}
-	void clearItems() {
-		_items.clear();
-	}
-	void reserveItemsForSize(int size) {
-		_items.reserve(size);
-	}
-	template <typename Predicate>
-	void sortItems(Predicate predicate) {
-		std::sort(_items.begin(), _items.end(), std::move(predicate));
-	}
-
-	void setPreloadMoreCallback(Fn<void()> callback) {
-		_preloadMoreCallback = std::move(callback);
-	}
-	void setSelectedCallback(Fn<void(PeerData*)> callback) {
-		_selectedCallback = std::move(callback);
-	}
-	void setRemovedCallback(Fn<void(PeerData*)> callback) {
-		_removedCallback = std::move(callback);
-	}
-	void setUpdateItemCallback(Fn<void(Item*)> callback) {
-		_updateItemCallback = std::move(callback);
-	}
-
-protected:
-	int resizeGetHeight(int newWidth) override;
-	void visibleTopBottomUpdated(
-		int visibleTop,
-		int visibleBottom) override;
-
-	void paintItemRect(Painter &p, int x, int y, int w, int h) const;
-	void refreshVisibility();
-
-	void paintContents(Painter &p) override;
-
-	void mouseMoveEvent(QMouseEvent *e) override;
-	void mousePressEvent(QMouseEvent *e) override;
-	void mouseReleaseEvent(QMouseEvent *e) override;
-	void enterEventHook(QEnterEvent *e) override;
-	void enterFromChildEvent(QEvent *e, QWidget *child) override {
-		enterEventHook(nullptr);
-	}
-	void leaveEventHook(QEvent *e) override;
-	void leaveToChildEvent(QEvent *e, QWidget *child) override {
-		leaveEventHook(e);
-	}
-
-private:
-	void mousePressReleased(Qt::MouseButton button);
-	void updateSelection();
-	void setSelected(int selected, bool selectedRemove);
-	void repaintSelectedRow();
-	void repaintRow(int index);
-	void preloadPhotos();
-	int rowWidth() const;
-
-	void paintItem(Painter &p, int x, int y, Item *item, bool selected, bool selectedRemove);
-
-	const style::PeerListItem &_st;
-
-	Fn<void()> _preloadMoreCallback;
-	Fn<void(PeerData*)> _selectedCallback;
-	Fn<void(PeerData*)> _removedCallback;
-	Fn<void(Item*)> _updateItemCallback;
-
-	std::vector<Item*> _items;
-
-	int _visibleTop = 0;
-	int _visibleBottom = 0;
-
-	int _selected = -1;
-	int _pressed = -1;
-	Qt::MouseButton _pressButton = Qt::LeftButton;
-	bool _selectedRemove = false;
-	bool _pressedRemove = false;
-	QPoint _mousePosition;
-
-	QString _removeText;
-	int _removeWidth = 0;
-
-};
-
-} // namespace Profile

From 5a29a7d2a3116c489bd6353a467f1af0ca5f12c3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 15:15:00 +0300
Subject: [PATCH 179/341] Moved out DefaultNotify to data_peer_notify_settings.

---
 Telegram/SourceFiles/apiwrap.h                              | 2 +-
 Telegram/SourceFiles/boxes/ringtones_box.h                  | 1 +
 Telegram/SourceFiles/data/notify/data_notify_settings.h     | 5 -----
 .../SourceFiles/data/notify/data_peer_notify_settings.h     | 6 ++++++
 Telegram/SourceFiles/menu/menu_mute.h                       | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.h b/Telegram/SourceFiles/apiwrap.h
index 5eabc79096..0a2a728eee 100644
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -28,7 +28,7 @@ namespace Data {
 struct UpdatedFileReferences;
 class WallPaper;
 struct ResolvedForwardDraft;
-enum class DefaultNotify;
+enum class DefaultNotify : uint8_t;
 enum class StickersType : uchar;
 class Forum;
 class ForumTopic;
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.h b/Telegram/SourceFiles/boxes/ringtones_box.h
index 13599efea0..48783ce12e 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.h
+++ b/Telegram/SourceFiles/boxes/ringtones_box.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 struct NotifySound;
 class Thread;
+enum class DefaultNotify : uint8_t;
 } // namespace Data
 
 namespace Main {
diff --git a/Telegram/SourceFiles/data/notify/data_notify_settings.h b/Telegram/SourceFiles/data/notify/data_notify_settings.h
index b1930f45bd..689964299c 100644
--- a/Telegram/SourceFiles/data/notify/data_notify_settings.h
+++ b/Telegram/SourceFiles/data/notify/data_notify_settings.h
@@ -21,11 +21,6 @@ class Thread;
 class Forum;
 class ForumTopic;
 
-enum class DefaultNotify {
-	User,
-	Group,
-	Broadcast,
-};
 [[nodiscard]] DefaultNotify DefaultNotifyType(
 	not_null<const PeerData*> peer);
 
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
index b5de9e1195..49e3c9dc81 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_settings.h
@@ -11,6 +11,12 @@ namespace Data {
 
 class NotifyPeerSettingsValue;
 
+enum class DefaultNotify : uint8_t {
+	User,
+	Group,
+	Broadcast,
+};
+
 struct NotifySound {
 	QString	title;
 	QString data;
diff --git a/Telegram/SourceFiles/menu/menu_mute.h b/Telegram/SourceFiles/menu/menu_mute.h
index a6d8186686..3050126627 100644
--- a/Telegram/SourceFiles/menu/menu_mute.h
+++ b/Telegram/SourceFiles/menu/menu_mute.h
@@ -10,7 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 class Thread;
 struct NotifySound;
-enum class DefaultNotify;
+enum class DefaultNotify : uint8_t;
 } // namespace Data
 
 namespace Main {

From 15e4d86e92215fb9f2feaa27a8ff1427f2957ba1 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 15:24:08 +0300
Subject: [PATCH 180/341] Added ability to override volume in media audio
 tracks.

---
 Telegram/SourceFiles/media/audio/media_audio_track.cpp |  9 +++++++--
 Telegram/SourceFiles/media/audio/media_audio_track.h   | 10 +++++-----
 Telegram/SourceFiles/window/notifications_manager.cpp  |  7 +++++--
 Telegram/SourceFiles/window/notifications_manager.h    |  5 ++++-
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
index bbf2ea5bd7..ab6f33d17c 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
@@ -142,7 +142,7 @@ void Track::fillFromFile(const QString &filePath) {
 	}
 }
 
-void Track::playWithLooping(bool looping) {
+void Track::playWithLooping(bool looping, float64 volumeOverride) {
 	_active = true;
 	if (failed() || _samples.empty()) {
 		finish();
@@ -152,7 +152,12 @@ void Track::playWithLooping(bool looping) {
 	alSourceStop(_alSource);
 	_looping = looping;
 	alSourcei(_alSource, AL_LOOPING, _looping ? 1 : 0);
-	alSourcef(_alSource, AL_GAIN, _volume);
+	alSourcef(
+		_alSource,
+		AL_GAIN,
+		(volumeOverride > 0)
+			? volumeOverride
+			: _volume);
 	alSourcePlay(_alSource);
 	_instance->trackStarted(this);
 }
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.h b/Telegram/SourceFiles/media/audio/media_audio_track.h
index 5016a19c93..5b37fb5e9f 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.h
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.h
@@ -30,11 +30,11 @@ public:
 	void fillFromFile(const Core::FileLocation &location);
 	void fillFromFile(const QString &filePath);
 
-	void playOnce() {
-		playWithLooping(false);
+	void playOnce(float64 volumeOverride = -1) {
+		playWithLooping(false, volumeOverride);
 	}
-	void playInLoop() {
-		playWithLooping(true);
+	void playInLoop(float64 volumeOverride = -1) {
+		playWithLooping(true, volumeOverride);
 	}
 
 	bool isLooping() const {
@@ -61,7 +61,7 @@ public:
 private:
 	void finish();
 	void ensureSourceCreated();
-	void playWithLooping(bool looping);
+	void playWithLooping(bool looping, float64 volumeOverride);
 
 	not_null<Instance*> _instance;
 
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index dddc7a54c7..bad3f2182d 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -967,8 +967,11 @@ void System::notifySettingsChanged(ChangeType type) {
 	return _settingsChanged.fire(std::move(type));
 }
 
-void System::playSound(not_null<Main::Session*> session, DocumentId id) {
-	lookupSound(&session->data(), id)->playOnce();
+void System::playSound(
+		not_null<Main::Session*> session,
+		DocumentId id,
+		float64 volumeOverride) {
+	lookupSound(&session->data(), id)->playOnce(volumeOverride);
 }
 
 Manager::DisplayOptions Manager::getNotificationOptions(
diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h
index b91afcfca0..5ff22fe249 100644
--- a/Telegram/SourceFiles/window/notifications_manager.h
+++ b/Telegram/SourceFiles/window/notifications_manager.h
@@ -124,7 +124,10 @@ public:
 	[[nodiscard]] rpl::producer<ChangeType> settingsChanged() const;
 	void notifySettingsChanged(ChangeType type);
 
-	void playSound(not_null<Main::Session*> session, DocumentId id);
+	void playSound(
+		not_null<Main::Session*> session,
+		DocumentId id,
+		float64 volumeOverride = -1);
 	[[nodiscard]] QByteArray lookupSoundBytes(
 		not_null<Data::Session*> owner,
 		DocumentId id);

From 6ed79f6a0d39916ef507de4c2625a63a5660734b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 15:30:22 +0300
Subject: [PATCH 181/341] Added global settings for master volume of
 notifications.

---
 Telegram/SourceFiles/core/core_settings.cpp          | 12 ++++++++++--
 Telegram/SourceFiles/core/core_settings.h            |  9 +++++++++
 .../SourceFiles/media/audio/media_audio_track.cpp    |  2 +-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 26a88cef8c..aaf7bae18d 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -240,7 +240,8 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 8;
+		+ sizeof(qint32) * 8
+		+ sizeof(ushort);
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -402,7 +403,8 @@ QByteArray Settings::serialize() const {
 			<< SerializeVideoQuality(_videoQuality)
 			<< qint32(_ivZoom.current())
 			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
-			<< qint32(_quickDialogAction);
+			<< qint32(_quickDialogAction)
+			<< _notificationsVolume;
 	}
 
 	Ensures(result.size() == size);
@@ -532,6 +534,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	quint32 videoQuality = SerializeVideoQuality(_videoQuality);
 	quint32 chatFiltersHorizontal = _chatFiltersHorizontal.current() ? 1 : 0;
 	quint32 quickDialogAction = quint32(_quickDialogAction);
+	ushort notificationsVolume = _notificationsVolume;
 
 	stream >> themesAccentColors;
 	if (!stream.atEnd()) {
@@ -863,6 +866,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> quickDialogAction;
 	}
+	if (!stream.atEnd()) {
+		stream >> notificationsVolume;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -1085,6 +1091,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	_videoQuality = DeserializeVideoQuality(videoQuality);
 	_chatFiltersHorizontal = (chatFiltersHorizontal == 1);
 	_quickDialogAction = Dialogs::Ui::QuickDialogAction(quickDialogAction);
+	_notificationsVolume = notificationsVolume;
 }
 
 QString Settings::getSoundPath(const QString &key) const {
@@ -1477,6 +1484,7 @@ void Settings::resetOnLastLogout() {
 	_videoQuality = {};
 	_chatFiltersHorizontal = false;
 	_quickDialogAction = Dialogs::Ui::QuickDialogAction::Disabled;
+	_notificationsVolume = 100;
 
 	_recentEmojiPreload.clear();
 	_recentEmoji.clear();
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 8ce8d72818..9ee26fea74 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -950,6 +950,13 @@ public:
 	[[nodiscard]] Dialogs::Ui::QuickDialogAction quickDialogAction() const;
 	void setQuickDialogAction(Dialogs::Ui::QuickDialogAction);
 
+	[[nodiscard]] ushort notificationsVolume() const {
+		return _notificationsVolume;
+	}
+	void setNotificationsVolume(ushort value) {
+		_notificationsVolume = value;
+	}
+
 	void resetOnLastLogout();
 
 private:
@@ -1093,6 +1100,8 @@ private:
 	Dialogs::Ui::QuickDialogAction _quickDialogAction
 		= Dialogs::Ui::QuickDialogAction::Disabled;
 
+	ushort _notificationsVolume = 100;
+
 	QByteArray _photoEditorBrush;
 
 };
diff --git a/Telegram/SourceFiles/media/audio/media_audio_track.cpp b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
index ab6f33d17c..4cef903464 100644
--- a/Telegram/SourceFiles/media/audio/media_audio_track.cpp
+++ b/Telegram/SourceFiles/media/audio/media_audio_track.cpp
@@ -157,7 +157,7 @@ void Track::playWithLooping(bool looping, float64 volumeOverride) {
 		AL_GAIN,
 		(volumeOverride > 0)
 			? volumeOverride
-			: _volume);
+			: float64(Core::App().settings().notificationsVolume()) / 100.);
 	alSourcePlay(_alSource);
 	_instance->trackStarted(this);
 }

From ced146fc63fa89d882d8fc32217f07f57cd818d9 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 15:30:52 +0300
Subject: [PATCH 182/341] Added session-specific settings for volume of
 notifications for peers.

---
 .../main/main_session_settings.cpp            | 114 +++++++++++++++++-
 .../SourceFiles/main/main_session_settings.h  |  17 +++
 2 files changed, 130 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 7f562e3e48..b4645e0f51 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -44,7 +44,17 @@ QByteArray SessionSettings::serialize() const {
 		+ sizeof(qint32) * 3
 		+ _hiddenPinnedMessages.size() * (sizeof(quint64) * 4)
 		+ sizeof(qint32)
-		+ _verticalSubsectionTabs.size() * sizeof(quint64);
+		+ _verticalSubsectionTabs.size() * sizeof(quint64)
+		+ sizeof(qint32) // _ringtoneDefaultVolumes size
+		+ (_ringtoneDefaultVolumes.size()
+			* (0
+				+ sizeof(uint8_t) * 1 // Data::DefaultNotify
+				+ sizeof(ushort))) // Volume
+		+ sizeof(qint32) // _ringtoneVolumes size
+		+ (_ringtoneVolumes.size()
+			* (0
+				+ sizeof(quint64) * 3 // ThreadId
+				+ sizeof(ushort))); // Volume
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -100,6 +110,18 @@ QByteArray SessionSettings::serialize() const {
 		for (const auto &peerId : _verticalSubsectionTabs) {
 			stream << SerializePeerId(peerId);
 		}
+		stream << qint32(_ringtoneDefaultVolumes.size());
+		for (const auto &[key, value] : _ringtoneDefaultVolumes) {
+			stream << uint8_t(key) << ushort(value);
+		}
+		stream << qint32(_ringtoneVolumes.size());
+		for (const auto &[key, value] : _ringtoneVolumes) {
+			stream
+				<< SerializePeerId(key.peerId)
+				<< qint64(key.topicRootId.bare)
+				<< SerializePeerId(key.monoforumPeerId)
+				<< ushort(value);
+		}
 	}
 
 	Ensures(result.size() == size);
@@ -167,6 +189,8 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 legacySkipPremiumStickersSet = 0;
 	qint32 lastNonPremiumLimitDownload = 0;
 	qint32 lastNonPremiumLimitUpload = 0;
+	base::flat_map<Data::DefaultNotify, ushort> ringtoneDefaultVolumes;
+	base::flat_map<ThreadId, ushort> ringtoneVolumes;
 
 	stream >> versionTag;
 	if (versionTag == kVersionTag) {
@@ -489,6 +513,54 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 			}
 		}
 	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto keyDefaultNotify = uint8_t();
+				auto value = ushort();
+				stream
+					>> keyDefaultNotify
+					>> value;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				ringtoneDefaultVolumes.emplace(
+					static_cast<Data::DefaultNotify>(keyDefaultNotify),
+					value);
+			}
+		}
+	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto keyPeerId = quint64();
+				auto keyTopicRootId = qint64();
+				auto keyMonoforumPeerId = quint64();
+				auto value = ushort();
+				stream
+					>> keyPeerId
+					>> keyTopicRootId
+					>> keyMonoforumPeerId
+					>> value;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"));
+					return;
+				}
+				ringtoneVolumes.emplace(ThreadId{
+					DeserializePeerId(keyPeerId),
+					keyTopicRootId,
+					DeserializePeerId(keyMonoforumPeerId),
+				}, value);
+			}
+		}
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for SessionSettings::addFromSerialized()"));
@@ -536,6 +608,8 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_lastNonPremiumLimitDownload = lastNonPremiumLimitDownload;
 	_lastNonPremiumLimitUpload = lastNonPremiumLimitUpload;
 	_verticalSubsectionTabs = std::move(verticalSubsectionTabs);
+	_ringtoneDefaultVolumes = std::move(ringtoneDefaultVolumes);
+	_ringtoneVolumes = std::move(ringtoneVolumes);
 
 	if (version < 2) {
 		app.setLastSeenWarningSeen(appLastSeenWarningSeen == 1);
@@ -710,4 +784,42 @@ void SessionSettings::addMutePeriod(TimeId period) {
 	}
 }
 
+ushort SessionSettings::ringtoneVolume(
+		Data::DefaultNotify defaultNotify) const {
+	const auto i = _ringtoneDefaultVolumes.find(defaultNotify);
+	return (i != end(_ringtoneDefaultVolumes)) ? i->second : 0;
+}
+
+void SessionSettings::setRingtoneVolume(
+		Data::DefaultNotify defaultNotify,
+		ushort volume) {
+	if (volume > 0 && volume <= 100) {
+		_ringtoneDefaultVolumes[defaultNotify] = volume;
+	} else {
+		_ringtoneDefaultVolumes.remove(defaultNotify);
+	}
+}
+
+ushort SessionSettings::ringtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const {
+	const auto i = _ringtoneVolumes.find(
+		ThreadId{ peerId, topicRootId, monoforumPeerId });
+	return (i != end(_ringtoneVolumes)) ? i->second : 0;
+}
+
+void SessionSettings::setRingtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		ushort volume) {
+	const auto id = ThreadId{ peerId, topicRootId, monoforumPeerId };
+	if (volume > 0 && volume <= 100) {
+		_ringtoneVolumes[id] = volume;
+	} else {
+		_ringtoneVolumes.remove(id);
+	}
+}
+
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/main_session_settings.h b/Telegram/SourceFiles/main/main_session_settings.h
index ee6218e69a..1069af4510 100644
--- a/Telegram/SourceFiles/main/main_session_settings.h
+++ b/Telegram/SourceFiles/main/main_session_settings.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "data/data_auto_download.h"
+#include "data/notify/data_peer_notify_settings.h"
 #include "ui/rect_part.h"
 
 namespace Support {
@@ -146,6 +147,20 @@ public:
 	void setLastNonPremiumLimitUpload(TimeId when) {
 		_lastNonPremiumLimitUpload = when;
 	}
+	void setRingtoneVolume(
+		Data::DefaultNotify defaultNotify,
+		ushort volume);
+	[[nodiscard]] ushort ringtoneVolume(
+		Data::DefaultNotify defaultNotify) const;
+	void setRingtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId,
+		ushort volume);
+	[[nodiscard]] ushort ringtoneVolume(
+		PeerId peerId,
+		MsgId topicRootId,
+		PeerId monoforumPeerId) const;
 
 private:
 	static constexpr auto kDefaultSupportChatsLimitSlice = 7 * 24 * 60 * 60;
@@ -171,6 +186,8 @@ private:
 	rpl::variable<bool> _skipArchiveInSearch = false;
 	base::flat_map<ThreadId, MsgId> _hiddenPinnedMessages;
 	base::flat_set<PeerId> _verticalSubsectionTabs;
+	base::flat_map<Data::DefaultNotify, ushort> _ringtoneDefaultVolumes;
+	base::flat_map<ThreadId, ushort> _ringtoneVolumes;
 	bool _dialogsFiltersEnabled = false;
 	int _photoEditorHintShowsCount = 0;
 	std::vector<TimeId> _mutePeriods;

From a3e8848bc8ae5daab31a1a39208409f623beb1a3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 17:03:16 +0300
Subject: [PATCH 183/341] Added ability to check if OS has support of
 notifications volume.

---
 .../platform/linux/notifications_manager_linux.cpp            | 4 ++++
 .../SourceFiles/platform/mac/notifications_manager_mac.mm     | 4 ++++
 .../SourceFiles/platform/platform_notifications_manager.h     | 1 +
 .../SourceFiles/platform/win/notifications_manager_win.cpp    | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 6c2f4a73f2..5b75b2fdae 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -233,6 +233,10 @@ bool ByDefault() {
 	}, HasCapability);
 }
 
+bool VolumeSupported() {
+	return false;
+}
+
 void Create(Window::Notifications::System *system) {
 	static const auto ServiceWatcher = CreateServiceWatcher();
 
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index b92cd90f55..5ba6462ee8 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -205,6 +205,10 @@ bool ByDefault() {
 	return Supported();
 }
 
+bool VolumeSupported() {
+	return false;
+}
+
 void Create(Window::Notifications::System *system) {
 	system->setManager([=] { return std::make_unique<Manager>(system); });
 }
diff --git a/Telegram/SourceFiles/platform/platform_notifications_manager.h b/Telegram/SourceFiles/platform/platform_notifications_manager.h
index 3ddb70a540..da41f6010e 100644
--- a/Telegram/SourceFiles/platform/platform_notifications_manager.h
+++ b/Telegram/SourceFiles/platform/platform_notifications_manager.h
@@ -20,6 +20,7 @@ void MaybeFlashBounceForCustom(Fn<void()> flashBounce);
 [[nodiscard]] bool Supported();
 [[nodiscard]] bool Enforced();
 [[nodiscard]] bool ByDefault();
+[[nodiscard]] bool VolumeSupported();
 void Create(Window::Notifications::System *system);
 
 } // namespace Notifications
diff --git a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
index d132ed4f32..2692923efd 100644
--- a/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
+++ b/Telegram/SourceFiles/platform/win/notifications_manager_win.cpp
@@ -417,6 +417,10 @@ bool ByDefault() {
 	return false;
 }
 
+bool VolumeSupported() {
+	return true;
+}
+
 void Create(Window::Notifications::System *system) {
 	system->setManager([=] {
 		auto result = std::make_unique<Manager>(system);

From 292296266f5f1d9f1b553d265ee817ac1073afb8 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 15:31:27 +0300
Subject: [PATCH 184/341] Added convenient utils to pass and change
 notifications volume from ui.

---
 Telegram/CMakeLists.txt                       |   2 +
 .../data/notify/data_peer_notify_volume.cpp   | 112 ++++++++++++++++++
 .../data/notify/data_peer_notify_volume.h     |  45 +++++++
 3 files changed, 159 insertions(+)
 create mode 100644 Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
 create mode 100644 Telegram/SourceFiles/data/notify/data_peer_notify_volume.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2ec4596238..13b2d395df 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -523,6 +523,8 @@ PRIVATE
     data/notify/data_notify_settings.h
     data/notify/data_peer_notify_settings.cpp
     data/notify/data_peer_notify_settings.h
+    data/notify/data_peer_notify_volume.cpp
+    data/notify/data_peer_notify_volume.h
     data/stickers/data_custom_emoji.cpp
     data/stickers/data_custom_emoji.h
     data/stickers/data_stickers_set.cpp
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
new file mode 100644
index 0000000000..f9148408e2
--- /dev/null
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
@@ -0,0 +1,112 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/notify/data_peer_notify_volume.h"
+
+#include "data/data_peer.h"
+#include "data/data_thread.h"
+#include "data/notify/data_peer_notify_settings.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
+#include "platform/platform_notifications_manager.h"
+#include "settings/settings_common.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_settings.h"
+
+namespace Data {
+
+Data::VolumeController DefaultRingtonesVolumeController(
+		not_null<Main::Session*> session,
+		Data::DefaultNotify defaultNotify) {
+	return Data::VolumeController{
+		.volume = [=]() -> ushort {
+			const auto volume = session->settings().ringtoneVolume(
+				defaultNotify);
+			return volume ? volume : 100;
+		},
+		.saveVolume = [=](ushort volume) {
+			session->settings().setRingtoneVolume(defaultNotify, volume);
+			session->saveSettingsDelayed();
+		}};
+}
+
+Data::VolumeController ThreadRingtonesVolumeController(
+		not_null<Data::Thread*> thread) {
+	return Data::VolumeController{
+		.volume = [=]() -> ushort {
+			const auto volume = thread->session().settings().ringtoneVolume(
+				thread->peer()->id,
+				thread->topicRootId(),
+				thread->monoforumPeerId());
+			return volume ? volume : 100;
+		},
+		.saveVolume = [=](ushort volume) {
+			thread->session().settings().setRingtoneVolume(
+				thread->peer()->id,
+				thread->topicRootId(),
+				thread->monoforumPeerId(),
+				volume);
+			thread->session().saveSettingsDelayed();
+		}};
+}
+
+} // namespace Data
+
+namespace Ui {
+
+void AddRingtonesVolumeSlider(
+		not_null<Ui::VerticalLayout*> container,
+		rpl::producer<bool> toggleOn,
+		rpl::producer<QString> subtitle,
+		Data::VolumeController volumeController) {
+	if (!Platform::Notifications::VolumeSupported()) {
+		return;
+	}
+	Expects(volumeController.volume && volumeController.saveVolume);
+
+	const auto volumeWrap = container->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			container,
+			object_ptr<Ui::VerticalLayout>(container)));
+	volumeWrap->toggleOn(std::move(toggleOn), anim::type::normal);
+	volumeWrap->finishAnimating();
+
+	Ui::AddSubsectionTitle(volumeWrap->entity(), std::move(subtitle));
+	auto sliderWithLabel = Settings::MakeSliderWithLabel(
+		volumeWrap->entity(),
+		st::settingsScale,
+		st::settingsScaleLabel,
+		st::normalFont->spacew * 2,
+		st::settingsScaleLabel.style.font->width("100%"),
+		true);
+	const auto slider = sliderWithLabel.slider;
+	const auto label = sliderWithLabel.label;
+
+	volumeWrap->entity()->add(
+		std::move(sliderWithLabel.widget),
+		st::settingsBigScalePadding);
+
+	const auto updateLabel = [=](int volume) {
+		label->setText(QString::number(volume) + '%');
+	};
+
+	slider->setPseudoDiscrete(
+		100,
+		[=](int index) { return index + 1; },
+		int(volumeController.volume()),
+		updateLabel,
+		[saveVolume = volumeController.saveVolume](int volume) {
+			saveVolume(volume);
+		});
+	updateLabel(volumeController.volume());
+}
+
+} // namespace Ui
diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_volume.h b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.h
new file mode 100644
index 0000000000..cc6833e7a1
--- /dev/null
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.h
@@ -0,0 +1,45 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace Data {
+
+enum class DefaultNotify : uint8_t;
+class Thread;
+
+struct VolumeController {
+	Fn<ushort()> volume = nullptr;
+	Fn<void(ushort)> saveVolume = nullptr;
+};
+
+[[nodiscard]] VolumeController DefaultRingtonesVolumeController(
+	not_null<Main::Session*> session,
+	Data::DefaultNotify defaultNotify);
+
+[[nodiscard]] VolumeController ThreadRingtonesVolumeController(
+	not_null<Data::Thread*> thread);
+
+} // namespace Data
+
+namespace Ui {
+
+void AddRingtonesVolumeSlider(
+	not_null<Ui::VerticalLayout*> container,
+	rpl::producer<bool> toggleOn,
+	rpl::producer<QString> subtitle,
+	Data::VolumeController volumeController);
+
+} // namespace Ui

From 1c3cd8d44bf2131cc4cbaf0cc513ede9bb4c8948 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 15:43:35 +0300
Subject: [PATCH 185/341] Added ability to change master volume of
 notifications from settings.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../settings/settings_notifications.cpp       | 21 +++++++++++++++++++
 .../settings/settings_notifications_type.cpp  | 10 ++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index c5481df459..50deb411cf 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -512,6 +512,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_notify_global" = "Global settings";
 "lng_settings_notify_title" = "Notifications for chats";
 "lng_settings_desktop_notify" = "Desktop notifications";
+"lng_settings_master_volume_notifications" = "Volume";
 "lng_settings_native_title" = "System integration";
 "lng_settings_use_windows" = "Use Windows notifications";
 "lng_settings_skip_in_focus" = "Respect system Focus mode";
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 97aa4328ce..eb88125327 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -7,10 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "settings/settings_notifications.h"
 
+#include "ui/widgets/continuous_sliders.h"
 #include "settings/settings_notifications_type.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/chat_service_checkbox.h"
 #include "ui/effects/animations.h"
+#include "data/notify/data_peer_notify_volume.h"
 #include "ui/text/text_utilities.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/wrap/slide_wrap.h"
@@ -1017,6 +1019,25 @@ void SetupNotificationsContent(
 		{ &st::menuIconUnmute },
 		soundAllowed->events_starting_with(allowed()));
 
+	Ui::AddRingtonesVolumeSlider(
+		container,
+		soundAllowed->events_starting_with(allowed()),
+		tr::lng_settings_master_volume_notifications(),
+		Data::VolumeController{
+			.volume = []() -> ushort {
+				const auto volume
+					= Core::App().settings().notificationsVolume();
+				return volume ? volume : 100;
+			},
+			.saveVolume = [=](ushort volume) {
+				Core::App().notifications().playSound(
+					session,
+					0,
+					volume / 100.);
+				Core::App().settings().setNotificationsVolume(volume);
+				Core::App().saveSettingsDelayed();
+			}});
+
 	Ui::AddSkip(container);
 
 	const auto checkboxes = SetupNotifyViewOptions(
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.cpp b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
index 391f63babb..a6a6baf2ba 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/ringtones_box.h"
 #include "boxes/peer_list_box.h"
+#include "data/notify/data_peer_notify_volume.h"
 #include "boxes/peer_list_controllers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
@@ -476,6 +477,13 @@ void SetupChecks(
 		st::settingsButton,
 		{ &st::menuIconSoundOn });
 
+	Ui::AddRingtonesVolumeSlider(
+		toneInner,
+		true,
+		rpl::single(true),
+		rpl::single(u"Volume"_q),
+		DefaultRingtonesVolumeController(session, type));
+
 	enabled->toggledValue(
 	) | rpl::filter([=](bool value) {
 		return (value != NotificationsEnabledForType(session, type));
@@ -499,7 +507,7 @@ void SetupChecks(
 		controller->show(Box(RingtonesBox, session, toneValue(), [=](
 				Data::NotifySound sound) {
 			settings->defaultUpdate(type, {}, {}, sound);
-		}));
+		}, DefaultRingtonesVolumeController(session, type)));
 	});
 }
 

From 19195464410eb87da01d4296ea26b1a36b48e6b3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 11 Aug 2025 20:07:25 +0300
Subject: [PATCH 186/341] Added ability to change volume of specific
 notifications from settings.

---
 Telegram/Resources/langs/lang.strings         |  4 ++++
 Telegram/SourceFiles/boxes/ringtones_box.cpp  | 19 +++++++++++++++++--
 Telegram/SourceFiles/boxes/ringtones_box.h    |  4 +++-
 Telegram/SourceFiles/menu/menu_mute.cpp       |  5 ++++-
 Telegram/SourceFiles/menu/menu_mute.h         |  4 ++++
 .../settings/settings_notifications_type.cpp  | 12 ++++++++++--
 .../window/notifications_manager.cpp          | 14 ++++++++++++--
 7 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 50deb411cf..f61c06fa57 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -553,12 +553,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_notification_title_private_chats" = "Notifications for private chats";
 "lng_notification_about_private_chats#one" = "Please note that **{count} chat** is listed as an exception and won't be affected by this change.";
 "lng_notification_about_private_chats#other" = "Please note that **{count} chats** are listed as exceptions and won't be affected by this change.";
+"lng_notification_volume_private_chats" = "Notifications volume for private chats";
 "lng_notification_title_groups" = "Notifications for groups";
 "lng_notification_about_groups#one" = "Please note that **{count} group** is listed as an exception and won't be affected by this change.";
 "lng_notification_about_groups#other" = "Please note that **{count} groups** are listed as exceptions and won't be affected by this change.";
+"lng_notification_volume_groups" = "Notifications volume for groups";
 "lng_notification_title_channels" = "Notifications for channels";
 "lng_notification_about_channels#one" = "Please note that **{count} channel** is listed as an exception and won't be affected by this change.";
 "lng_notification_about_channels#other" = "Please note that **{count} channels** are listed as exceptions and won't be affected by this change.";
+"lng_notification_volume_channel" = "Notifications volume for channels";
 "lng_notification_exceptions_view" = "View exceptions";
 "lng_notification_enable" = "Enable notifications";
 "lng_notification_sound" = "Sound";
@@ -6335,6 +6338,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_ringtones_box_title" = "Notification Sound";
 "lng_ringtones_box_cloud_subtitle" = "Choose your tone";
+"lng_ringtones_box_volume" = "Volume";
 "lng_ringtones_box_upload_choose" = "Choose a tone";
 "lng_ringtones_box_upload_button" = "Upload Sound";
 "lng_ringtones_box_about" = "Right click on any short voice note or MP3 file in chat and select \"Save for Notifications\". It will appear here.";
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp
index 4c299c162b..9ae8685597 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.cpp
+++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp
@@ -7,8 +7,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "boxes/ringtones_box.h"
 
+#include "data/notify/data_peer_notify_volume.h"
+#include "data/notify/data_peer_notify_settings.h"
 #include "api/api_ringtones.h"
 #include "apiwrap.h"
+#include "ui/widgets/continuous_sliders.h"
 #include "base/call_delayed.h"
 #include "base/event_filter.h"
 #include "base/timer_rpl.h"
@@ -21,11 +24,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document_media.h"
 #include "data/data_document_resolver.h"
 #include "data/data_thread.h"
+#include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/notify/data_notify_settings.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "media/audio/media_audio.h"
+#include "ui/wrap/slide_wrap.h"
 #include "platform/platform_notifications_manager.h"
 #include "settings/settings_common.h"
 #include "ui/boxes/confirm_box.h"
@@ -111,7 +117,8 @@ void RingtonesBox(
 		not_null<Ui::GenericBox*> box,
 		not_null<Main::Session*> session,
 		Data::NotifySound selected,
-		Fn<void(Data::NotifySound)> save) {
+		Fn<void(Data::NotifySound)> save,
+		Data::VolumeController volumeController) {
 	box->setTitle(tr::lng_ringtones_box_title());
 
 	const auto container = box->verticalLayout();
@@ -320,6 +327,14 @@ void RingtonesBox(
 		}));
 	});
 
+	Ui::AddRingtonesVolumeSlider(
+		container,
+		state->group->value() | rpl::map([=](int value) {
+			return value != kNoSoundValue;
+		}),
+		tr::lng_ringtones_box_volume(),
+		volumeController);
+
 	box->addSkip(st::ringtonesBoxSkip);
 	Ui::AddDividerText(container, tr::lng_ringtones_box_about());
 
@@ -345,5 +360,5 @@ void ThreadRingtonesBox(
 	const auto now = thread->owner().notifySettings().sound(thread);
 	RingtonesBox(box, &thread->session(), now, [=](Data::NotifySound sound) {
 		thread->owner().notifySettings().update(thread, {}, {}, sound);
-	});
+	}, Data::ThreadRingtonesVolumeController(thread));
 }
diff --git a/Telegram/SourceFiles/boxes/ringtones_box.h b/Telegram/SourceFiles/boxes/ringtones_box.h
index 48783ce12e..bbc9349767 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.h
+++ b/Telegram/SourceFiles/boxes/ringtones_box.h
@@ -13,6 +13,7 @@ namespace Data {
 struct NotifySound;
 class Thread;
 enum class DefaultNotify : uint8_t;
+struct VolumeController;
 } // namespace Data
 
 namespace Main {
@@ -29,7 +30,8 @@ void RingtonesBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Main::Session*> session,
 	Data::NotifySound selected,
-	Fn<void(Data::NotifySound)> save);
+	Fn<void(Data::NotifySound)> save,
+	Data::VolumeController volumeController);
 
 void ThreadRingtonesBox(
 	not_null<Ui::GenericBox*> box,
diff --git a/Telegram/SourceFiles/menu/menu_mute.cpp b/Telegram/SourceFiles/menu/menu_mute.cpp
index 661ef06727..caf5964c18 100644
--- a/Telegram/SourceFiles/menu/menu_mute.cpp
+++ b/Telegram/SourceFiles/menu/menu_mute.cpp
@@ -253,6 +253,7 @@ Descriptor ThreadDescriptor(not_null<Data::Thread*> thread) {
 		.currentSound = currentSound,
 		.updateSound = updateSound,
 		.updateMutePeriod = updateMutePeriod,
+		.volumeController = Data::ThreadRingtonesVolumeController(thread),
 	};
 }
 
@@ -290,6 +291,7 @@ Descriptor DefaultDescriptor(
 		.currentSound = currentSound,
 		.updateSound = updateSound,
 		.updateMutePeriod = updateMutePeriod,
+		.volumeController = DefaultRingtonesVolumeController(session, type),
 	};
 }
 
@@ -304,7 +306,8 @@ void FillMuteMenu(
 				RingtonesBox,
 				session,
 				*currentSound,
-				descriptor.updateSound));
+				descriptor.updateSound,
+				descriptor.volumeController));
 		}
 	};
 	menu->addAction(
diff --git a/Telegram/SourceFiles/menu/menu_mute.h b/Telegram/SourceFiles/menu/menu_mute.h
index 3050126627..9599de209e 100644
--- a/Telegram/SourceFiles/menu/menu_mute.h
+++ b/Telegram/SourceFiles/menu/menu_mute.h
@@ -7,10 +7,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/notify/data_peer_notify_volume.h" // VolumeController
+
 namespace Data {
 class Thread;
 struct NotifySound;
 enum class DefaultNotify : uint8_t;
+struct VolumeController;
 } // namespace Data
 
 namespace Main {
@@ -31,6 +34,7 @@ struct Descriptor {
 	Fn<std::optional<Data::NotifySound>()> currentSound;
 	Fn<void(Data::NotifySound)> updateSound;
 	Fn<void(TimeId)> updateMutePeriod;
+	Data::VolumeController volumeController;
 };
 
 [[nodiscard]] Descriptor ThreadDescriptor(not_null<Data::Thread*> thread);
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.cpp b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
index a6a6baf2ba..84dd876f21 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
@@ -380,6 +380,15 @@ void ExceptionsController::sort() {
 	Unexpected("Type in Title.");
 }
 
+[[nodiscard]] rpl::producer<QString> VolumeSubtitle(Notify type) {
+	switch (type) {
+	case Notify::User: return tr::lng_notification_volume_private_chats();
+	case Notify::Group: return tr::lng_notification_volume_groups();
+	case Notify::Broadcast: return tr::lng_notification_volume_channel();
+	}
+	Unexpected("Type in VolumeSubtitle.");
+}
+
 void SetupChecks(
 		not_null<Ui::VerticalLayout*> container,
 		not_null<Window::SessionController*> controller,
@@ -479,9 +488,8 @@ void SetupChecks(
 
 	Ui::AddRingtonesVolumeSlider(
 		toneInner,
-		true,
 		rpl::single(true),
-		rpl::single(u"Volume"_q),
+		VolumeSubtitle(type),
 		DefaultRingtonesVolumeController(session, type));
 
 	enabled->toggledValue(
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index bad3f2182d..830652168b 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -36,8 +36,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_updates.h"
 #include "apiwrap.h"
 #include "main/main_account.h"
-#include "main/main_session.h"
 #include "main/main_domain.h"
+#include "main/main_session.h"
+#include "main/main_session_settings.h"
 #include "ui/text/text_utilities.h"
 
 #include <QtGui/QWindow>
@@ -695,9 +696,18 @@ void System::showNext() {
 		if (settings.soundNotify()) {
 			const auto owner = &alertThread->owner();
 			const auto id = owner->notifySettings().sound(alertThread).id;
+			auto volume
+				= owner->session().settings().ringtoneVolume(
+					alertThread->peer()->id,
+					alertThread->topicRootId(),
+					alertThread->monoforumPeerId());
+			if (!volume) {
+				volume = owner->session().settings().ringtoneVolume(
+					Data::DefaultNotifyType(alertThread->peer()));
+			}
 			_manager->maybePlaySound(crl::guard(&owner->session(), [=] {
 				const auto track = lookupSound(owner, id);
-				track->playOnce();
+				track->playOnce(volume ? volume * 0.01 : 0);
 				Media::Player::mixer()->suppressAll(track->getLengthMs());
 				Media::Player::mixer()->scheduleFaderCallback();
 			}));

From 5070300050c9da5e97d8805f6d67cc14d633427b Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 12 Aug 2025 18:12:39 +0300
Subject: [PATCH 187/341] Added ability to test on place volume of
 notifications.

---
 Telegram/SourceFiles/boxes/ringtones_box.cpp  | 47 +++++++++++++++----
 .../settings/settings_notifications_type.cpp  | 28 ++++++++---
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/ringtones_box.cpp b/Telegram/SourceFiles/boxes/ringtones_box.cpp
index 9ae8685597..ef945ba793 100644
--- a/Telegram/SourceFiles/boxes/ringtones_box.cpp
+++ b/Telegram/SourceFiles/boxes/ringtones_box.cpp
@@ -135,12 +135,17 @@ void RingtonesBox(
 		QPointer<Ui::Radiobutton> defaultButton;
 		QPointer<Ui::Radiobutton> chosenButton;
 		std::vector<QPointer<Ui::Radiobutton>> buttons;
+		ushort presavedVolume = 0;
 	};
 	const auto state = container->lifetime().make_state<State>(State{
 		.group = std::make_shared<Ui::RadiobuttonGroup>(),
 		.chosen = selected,
 	});
 
+	const auto volumeOverride = [volume = volumeController.volume] {
+		return volume ? (0.01 * volume()) : -1;
+	};
+
 	const auto addToGroup = [=](
 			not_null<Ui::VerticalLayout*> verticalLayout,
 			int value,
@@ -163,7 +168,10 @@ void RingtonesBox(
 		if (value == kDefaultValue) {
 			state->defaultButton = button;
 			button->setClickedCallback([=] {
-				Core::App().notifications().playSound(session, 0);
+				Core::App().notifications().playSound(
+					session,
+					0,
+					volumeOverride());
 			});
 		}
 		if (value < 0) {
@@ -177,7 +185,8 @@ void RingtonesBox(
 			if (media->loaded()) {
 				Core::App().notifications().playSound(
 					session,
-					media->owner()->id);
+					media->owner()->id,
+					volumeOverride());
 			}
 		});
 		base::install_event_filter(button, [=](not_null<QEvent*> e) {
@@ -327,13 +336,30 @@ void RingtonesBox(
 		}));
 	});
 
-	Ui::AddRingtonesVolumeSlider(
-		container,
-		state->group->value() | rpl::map([=](int value) {
-			return value != kNoSoundValue;
-		}),
-		tr::lng_ringtones_box_volume(),
-		volumeController);
+	if (volumeController.volume && volumeController.saveVolume) {
+		auto saveAndTestVolume = [=](ushort currentVolume) {
+			state->presavedVolume = currentVolume;
+			const auto value = state->group->current();
+			if (value != kNoSoundValue) {
+				Core::App().notifications().playSound(
+					session,
+					(value == kDefaultValue)
+						? 0
+						: state->medias[value]->owner()->id,
+					0.01 * currentVolume);
+			}
+		};
+		Ui::AddRingtonesVolumeSlider(
+			container,
+			state->group->value() | rpl::map([=](int value) {
+				return value != kNoSoundValue;
+			}),
+			tr::lng_ringtones_box_volume(),
+			Data::VolumeController{
+				base::take(volumeController.volume),
+				std::move(saveAndTestVolume),
+			});
+	}
 
 	box->addSkip(st::ringtonesBoxSkip);
 	Ui::AddDividerText(container, tr::lng_ringtones_box_about());
@@ -348,6 +374,9 @@ void RingtonesBox(
 			: (value == kNoSoundValue)
 			? Data::NotifySound{ .none = true }
 			: Data::NotifySound{ .id = state->medias[value]->owner()->id };
+		if (state->presavedVolume) {
+			volumeController.saveVolume(state->presavedVolume);
+		}
 		save(sound);
 		box->closeBox();
 	});
diff --git a/Telegram/SourceFiles/settings/settings_notifications_type.cpp b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
index 84dd876f21..4f3f9e9ae0 100644
--- a/Telegram/SourceFiles/settings/settings_notifications_type.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_type.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/unixtime.h"
 #include "boxes/ringtones_box.h"
 #include "boxes/peer_list_box.h"
+#include "core/application.h"
 #include "data/notify/data_peer_notify_volume.h"
 #include "boxes/peer_list_controllers.h"
 #include "data/notify/data_notify_settings.h"
@@ -22,6 +23,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "menu/menu_mute.h"
+#include "platform/platform_notifications_manager.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
@@ -486,11 +488,23 @@ void SetupChecks(
 		st::settingsButton,
 		{ &st::menuIconSoundOn });
 
-	Ui::AddRingtonesVolumeSlider(
-		toneInner,
-		rpl::single(true),
-		VolumeSubtitle(type),
-		DefaultRingtonesVolumeController(session, type));
+	{
+		auto controller = DefaultRingtonesVolumeController(session, type);
+		Ui::AddRingtonesVolumeSlider(
+			toneInner,
+			rpl::single(true),
+			VolumeSubtitle(type),
+			Data::VolumeController{
+				.volume = base::take(controller.volume),
+				.saveVolume = [=](ushort volume) {
+					Core::App().notifications().playSound(
+						session,
+						toneValue().id,
+						0.01 * volume);
+					controller.saveVolume(volume);
+				},
+			});
+	}
 
 	enabled->toggledValue(
 	) | rpl::filter([=](bool value) {
@@ -515,7 +529,9 @@ void SetupChecks(
 		controller->show(Box(RingtonesBox, session, toneValue(), [=](
 				Data::NotifySound sound) {
 			settings->defaultUpdate(type, {}, {}, sound);
-		}, DefaultRingtonesVolumeController(session, type)));
+		}, Data::VolumeController{
+			DefaultRingtonesVolumeController(session, type).volume,
+		}));
 	});
 }
 

From 86b94b4723e312b727b7f7f7932b433c9cf5ef27 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 12 Aug 2025 19:16:37 +0000
Subject: [PATCH 188/341] Change notification volume visibility on support
 change

Cross platform VolumeSupported wrapper
---
 .../data/notify/data_peer_notify_volume.cpp   | 15 +++++---
 .../linux/notifications_manager_linux.cpp     | 19 ++++------
 .../platform/mac/notifications_manager_mac.mm |  5 +--
 .../settings/settings_notifications.cpp       |  2 +-
 .../window/notifications_manager.cpp          | 37 +++++++++++++++++++
 .../window/notifications_manager.h            | 10 +++--
 6 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
index f9148408e2..90ce0856d6 100644
--- a/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
+++ b/Telegram/SourceFiles/data/notify/data_peer_notify_volume.cpp
@@ -12,7 +12,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/notify/data_peer_notify_settings.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
-#include "platform/platform_notifications_manager.h"
+#include "core/application.h"
+#include "window/notifications_manager.h"
 #include "settings/settings_common.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/continuous_sliders.h"
@@ -67,16 +68,20 @@ void AddRingtonesVolumeSlider(
 		rpl::producer<bool> toggleOn,
 		rpl::producer<QString> subtitle,
 		Data::VolumeController volumeController) {
-	if (!Platform::Notifications::VolumeSupported()) {
-		return;
-	}
 	Expects(volumeController.volume && volumeController.saveVolume);
 
 	const auto volumeWrap = container->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			container,
 			object_ptr<Ui::VerticalLayout>(container)));
-	volumeWrap->toggleOn(std::move(toggleOn), anim::type::normal);
+	volumeWrap->toggleOn(
+		rpl::combine(
+			Core::App().notifications().volumeSupportedValue(),
+			std::move(toggleOn)
+		) | rpl::map(
+			rpl::mappers::_1 && rpl::mappers::_2
+		) | rpl::distinct_until_changed(),
+		anim::type::normal);
 	volumeWrap->finishAnimating();
 
 	Ui::AddSubsectionTitle(volumeWrap->entity(), std::move(subtitle));
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index 5b75b2fdae..f2f9b02cac 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "platform/platform_specific.h"
 #include "core/application.h"
 #include "core/sandbox.h"
-#include "core/core_settings.h"
 #include "data/data_forum_topic.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_peer.h"
@@ -234,7 +233,7 @@ bool ByDefault() {
 }
 
 bool VolumeSupported() {
-	return false;
+	return UseGNotification() || !HasCapability("sound");
 }
 
 void Create(Window::Notifications::System *system) {
@@ -242,10 +241,12 @@ void Create(Window::Notifications::System *system) {
 
 	const auto managerSetter = [=](
 			XdgNotifications::NotificationsProxy proxy) {
-		system->setManager([=] {
-			auto manager = std::make_unique<Manager>(system);
-			manager->_private->init(proxy);
-			return manager;
+		Core::Sandbox::Instance().customEnterFromEventLoop([&] {
+			system->setManager([=] {
+				auto manager = std::make_unique<Manager>(system);
+				manager->_private->init(proxy);
+				return manager;
+			});
 		});
 	};
 
@@ -923,11 +924,7 @@ bool Manager::doSkipToast() const {
 }
 
 void Manager::doMaybePlaySound(Fn<void()> playSound) {
-	if (UseGNotification()
-		|| !HasCapability("sound")
-		|| !Core::App().settings().desktopNotify()) {
-		_private->invokeIfNotInhibited(std::move(playSound));
-	}
+	_private->invokeIfNotInhibited(std::move(playSound));
 }
 
 void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) {
diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
index 5ba6462ee8..ded4f852f5 100644
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@@ -579,10 +579,7 @@ bool Manager::doSkipToast() const {
 }
 
 void Manager::doMaybePlaySound(Fn<void()> playSound) {
-	// Play through native notification system if toasts are enabled.
-	if (!Core::App().settings().desktopNotify()) {
-		playSound();
-	}
+	playSound();
 }
 
 void Manager::doMaybeFlashBounce(Fn<void()> flashBounce) {
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index eb88125327..e0ca4c1bf3 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -1021,7 +1021,7 @@ void SetupNotificationsContent(
 
 	Ui::AddRingtonesVolumeSlider(
 		container,
-		soundAllowed->events_starting_with(allowed()),
+		rpl::single(true),
 		tr::lng_settings_master_volume_notifications(),
 		Data::VolumeController{
 			.volume = []() -> ushort {
diff --git a/Telegram/SourceFiles/window/notifications_manager.cpp b/Telegram/SourceFiles/window/notifications_manager.cpp
index 830652168b..3ef6a406cd 100644
--- a/Telegram/SourceFiles/window/notifications_manager.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager.cpp
@@ -189,8 +189,12 @@ void System::createManager() {
 
 void System::setManager(Fn<std::unique_ptr<Manager>()> create) {
 	Expects(_manager != nullptr);
+	const auto oldManager = _manager.get();
 	const auto guard = gsl::finally([&] {
 		Ensures(_manager != nullptr);
+		if (oldManager != _manager.get()) {
+			_managerChanged.fire({});
+		}
 	});
 
 	if ((Core::App().settings().nativeNotifications()
@@ -215,6 +219,15 @@ void System::setManager(Fn<std::unique_ptr<Manager>()> create) {
 	}
 }
 
+Manager &System::manager() const {
+	Expects(_manager != nullptr);
+	return *_manager;
+}
+
+rpl::producer<> System::managerChanged() const {
+	return _managerChanged.events();
+}
+
 Main::Session *System::findSession(uint64 sessionId) const {
 	for (const auto &[index, account] : Core::App().domain().accounts()) {
 		if (const auto session = account->maybeSession()) {
@@ -977,6 +990,24 @@ void System::notifySettingsChanged(ChangeType type) {
 	return _settingsChanged.fire(std::move(type));
 }
 
+bool System::volumeSupported() const {
+	// Play through native notification system if toasts are enabled.
+	return Core::App().settings().soundNotify()
+		&& (!Core::App().settings().desktopNotify()
+			|| _manager->type() != ManagerType::Native
+			|| Platform::Notifications::VolumeSupported());
+}
+
+rpl::producer<bool> System::volumeSupportedValue() const {
+	return rpl::single(
+		rpl::empty_value()
+	) | rpl::then(
+		rpl::merge(settingsChanged() | rpl::to_empty, managerChanged())
+	) | rpl::map([=] {
+		return volumeSupported();
+	}) | rpl::distinct_until_changed();
+}
+
 void System::playSound(
 		not_null<Main::Session*> session,
 		DocumentId id,
@@ -1343,6 +1374,12 @@ void Manager::notificationReplied(
 	}
 }
 
+void Manager::maybePlaySound(Fn<void()> playSound) {
+	if (_system->volumeSupported()) {
+		doMaybePlaySound(std::move(playSound));
+	}
+}
+
 void NativeManager::doShowNotification(NotificationFields &&fields) {
 	const auto options = getNotificationOptions(
 		fields.item,
diff --git a/Telegram/SourceFiles/window/notifications_manager.h b/Telegram/SourceFiles/window/notifications_manager.h
index 5ff22fe249..8092a9d4f9 100644
--- a/Telegram/SourceFiles/window/notifications_manager.h
+++ b/Telegram/SourceFiles/window/notifications_manager.h
@@ -106,6 +106,8 @@ public:
 
 	void createManager();
 	void setManager(Fn<std::unique_ptr<Manager>()> create);
+	[[nodiscard]] Manager &manager() const;
+	[[nodiscard]] rpl::producer<> managerChanged() const;
 
 	void checkDelayed();
 	void schedule(Data::ItemNotification notification);
@@ -124,6 +126,9 @@ public:
 	[[nodiscard]] rpl::producer<ChangeType> settingsChanged() const;
 	void notifySettingsChanged(ChangeType type);
 
+	[[nodiscard]] bool volumeSupported() const;
+	[[nodiscard]] rpl::producer<bool> volumeSupportedValue() const;
+
 	void playSound(
 		not_null<Main::Session*> session,
 		DocumentId id,
@@ -216,6 +221,7 @@ private:
 		crl::time> _sentReactionNotifications;
 
 	std::unique_ptr<Manager> _manager;
+	rpl::event_stream<> _managerChanged;
 
 	rpl::event_stream<ChangeType> _settingsChanged;
 
@@ -334,9 +340,7 @@ public:
 	[[nodiscard]] bool skipToast() const {
 		return doSkipToast();
 	}
-	void maybePlaySound(Fn<void()> playSound) {
-		doMaybePlaySound(std::move(playSound));
-	}
+	void maybePlaySound(Fn<void()> playSound);
 	void maybeFlashBounce(Fn<void()> flashBounce) {
 		doMaybeFlashBounce(std::move(flashBounce));
 	}

From d614de6f5e329a08876bc9ac7f3f6adf78fd46f4 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Aug 2025 15:50:35 +0300
Subject: [PATCH 189/341] Fixed display of error in cloud password section with
 new naturalWidth.

---
 .../settings_cloud_password_common.cpp               | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
index cdc53eb748..8d77e3bb15 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
@@ -211,14 +211,12 @@ not_null<Ui::FlatLabel*> AddError(
 		not_null<Ui::VerticalLayout*> content,
 		Ui::PasswordInput *input) {
 	const auto error = content->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				// Set any text to resize.
-				tr::lng_language_name(tr::now),
-				st::settingLocalPasscodeError)),
-		st::changePhoneDescriptionPadding)->entity();
+			QString(),
+			st::settingLocalPasscodeError),
+		st::changePhoneDescriptionPadding,
+		style::al_top);
 	error->hide();
 	if (input) {
 		QObject::connect(input, &Ui::MaskedInputField::changed, [=] {

From e0fb9ffbb025f2e6f610686ff8d57a18a5c4bd4c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Aug 2025 15:15:26 +0300
Subject: [PATCH 190/341] Added support of setting up of login email from
 intro.

---
 Telegram/CMakeLists.txt                    |   2 +
 Telegram/Resources/langs/lang.strings      |   3 +
 Telegram/SourceFiles/intro/intro_code.cpp  |  33 ++--
 Telegram/SourceFiles/intro/intro_code.h    |   2 +
 Telegram/SourceFiles/intro/intro_email.cpp | 173 +++++++++++++++++++++
 Telegram/SourceFiles/intro/intro_email.h   |  50 ++++++
 Telegram/SourceFiles/intro/intro_phone.cpp |   4 +
 Telegram/SourceFiles/intro/intro_step.cpp  |   2 +-
 Telegram/SourceFiles/intro/intro_widget.h  |   9 ++
 9 files changed, 265 insertions(+), 13 deletions(-)
 create mode 100644 Telegram/SourceFiles/intro/intro_email.cpp
 create mode 100644 Telegram/SourceFiles/intro/intro_email.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 13b2d395df..d01f72ec9f 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1123,6 +1123,8 @@ PRIVATE
     inline_bots/inline_results_widget.h
     intro/intro_code.cpp
     intro/intro_code.h
+    intro/intro_email.cpp
+    intro/intro_email.h
     intro/intro_password_check.cpp
     intro/intro_password_check.h
     intro/intro_phone.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index f61c06fa57..2e10feba15 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -377,6 +377,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_intro_fragment_about" = "Get the code for {phone_number} in the Anonymous Numbers section on Fragment.";
 "lng_intro_fragment_button" = "Open Fragment";
 
+"lng_intro_email_setup_title" = "Choose a login email";
+"lng_intro_email_confirm_subtitle" = "Please check your email {email} (don't forget the spam folder) and enter the code we just sent you.";
+
 "lng_phone_title" = "Your Phone Number";
 "lng_phone_desc" = "Please confirm your country code\nand enter your phone number.";
 "lng_phone_to_qr" = "Quick log in using QR code";
diff --git a/Telegram/SourceFiles/intro/intro_code.cpp b/Telegram/SourceFiles/intro/intro_code.cpp
index f870d52cb6..e41810e8fd 100644
--- a/Telegram/SourceFiles/intro/intro_code.cpp
+++ b/Telegram/SourceFiles/intro/intro_code.cpp
@@ -84,16 +84,19 @@ void CodeWidget::updateDescText() {
 	const auto byTelegram = getData()->codeByTelegram;
 	const auto isFragment = !getData()->codeByFragmentUrl.isEmpty();
 	_isFragment = isFragment;
-	setDescriptionText(
-		isFragment
-			? tr::lng_intro_fragment_about(
-				lt_phone_number,
-				rpl::single(TextWithEntities{
-					.text = Ui::FormatPhone(getData()->phone)
-				}),
-				Ui::Text::RichLangValue)
-			: (byTelegram ? tr::lng_code_from_telegram : tr::lng_code_desc)(
-				Ui::Text::RichLangValue));
+	setDescriptionText(isEmailVerification()
+		? tr::lng_intro_email_confirm_subtitle(
+			lt_email,
+			rpl::single(Ui::Text::WrapEmailPattern(getData()->emailPattern)),
+			Ui::Text::WithEntities)
+		: isFragment
+		? tr::lng_intro_fragment_about(
+			lt_phone_number,
+			rpl::single(
+				TextWithEntities::Simple(Ui::FormatPhone(getData()->phone))),
+			Ui::Text::RichLangValue)
+		: (byTelegram ? tr::lng_code_from_telegram : tr::lng_code_desc)(
+			Ui::Text::RichLangValue));
 	if (getData()->codeByTelegram) {
 		_noTelegramCode->show();
 		_callTimer.cancel();
@@ -350,11 +353,13 @@ void CodeWidget::submitCode(const QString &text) {
 	_code->setEnabled(false);
 	getData()->pwdState = Core::CloudPasswordState();
 	_sentRequest = api().request(MTPauth_SignIn(
-		MTP_flags(MTPauth_SignIn::Flag::f_phone_code),
+		MTP_flags(isEmailVerification()
+			? MTPauth_SignIn::Flag::f_email_verification
+			: MTPauth_SignIn::Flag::f_phone_code),
 		MTP_string(getData()->phone),
 		MTP_bytes(getData()->phoneHash),
 		MTP_string(_sentCode),
-		MTPEmailVerification()
+		MTP_emailVerificationCode(MTP_string(_sentCode))
 	)).done([=](const MTPauth_Authorization &result) {
 		codeSubmitDone(result);
 	}).fail([=](const MTP::Error &error) {
@@ -362,6 +367,10 @@ void CodeWidget::submitCode(const QString &text) {
 	}).handleFloodErrors().send();
 }
 
+bool CodeWidget::isEmailVerification() const {
+	return !getData()->emailPattern.isEmpty();
+}
+
 rpl::producer<QString> CodeWidget::nextButtonText() const {
 	return _isFragment.value(
 	) | rpl::map([=](bool isFragment) {
diff --git a/Telegram/SourceFiles/intro/intro_code.h b/Telegram/SourceFiles/intro/intro_code.h
index 53a94b50dc..a9d22ad31b 100644
--- a/Telegram/SourceFiles/intro/intro_code.h
+++ b/Telegram/SourceFiles/intro/intro_code.h
@@ -54,6 +54,8 @@ private:
 
 	int errorTop() const override;
 
+	[[nodiscard]] bool isEmailVerification() const;
+
 	void updateCallText();
 	void refreshLang();
 	void updateControlsGeometry();
diff --git a/Telegram/SourceFiles/intro/intro_email.cpp b/Telegram/SourceFiles/intro/intro_email.cpp
new file mode 100644
index 0000000000..dacc28cc3f
--- /dev/null
+++ b/Telegram/SourceFiles/intro/intro_email.cpp
@@ -0,0 +1,173 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "intro/intro_email.h"
+
+#include "intro/intro_code.h"
+#include "intro/intro_code_input.h"
+#include "lang/lang_keys.h"
+#include "lottie/lottie_icon.h"
+#include "settings/cloud_password/settings_cloud_password_common.h"
+#include "settings/settings_common.h" // CreateLottieIcon.
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/fields/input_field.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "window/window_controller.h"
+#include "window/window_session_controller.h"
+#include "window/window_session_controller.h"
+#include "styles/style_intro.h"
+#include "styles/style_settings.h"
+
+namespace Intro {
+namespace details {
+
+EmailWidget::EmailWidget(
+	QWidget *parent,
+	not_null<Main::Account*> account,
+	not_null<Data*> data)
+: Step(parent, account, data)
+, _inner(this) {
+	const auto content = _inner.get();
+	widthValue() | rpl::start_with_next([=](int w) {
+		content->resizeToWidth(st::introNextButton.width);
+		content->moveToLeft((w - content->width()) / 2, contentTop());
+	}, content->lifetime());
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_intro_email_setup_title(),
+			st::introTitle),
+		style::margins(),
+		style::al_left);
+	Ui::AddSkip(content, st::lineWidth * 2);
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_settings_cloud_login_email_about(),
+			st::introDescription),
+		style::margins(),
+		style::al_left);
+
+	{
+		const auto lottie = u"cloud_password/email"_q;
+		const auto size = st::settingsCloudPasswordIconSize / 3 * 2;
+		auto icon = Settings::CreateLottieIcon(
+			content,
+			{ .name = lottie, .sizeOverride = Size(size) },
+			style::margins());
+		content->add(std::move(icon.widget));
+		_showFinished.events(
+		) | rpl::start_with_next([animate = std::move(icon.animate)] {
+			animate(anim::repeat::once);
+		}, lifetime());
+	}
+
+	const auto wrap = Settings::CloudPassword::AddWrappedField(
+		content,
+		tr::lng_settings_cloud_login_email_placeholder(),
+		QString());
+	const auto newInput = wrap->entity();
+	Ui::AddSkip(content);
+	const auto error = Settings::CloudPassword::AddError(content, nullptr);
+	newInput->changes() | rpl::start_with_next([=] {
+		error->hide();
+	}, newInput->lifetime());
+	newInput->setText(getData()->email);
+	if (newInput->hasText()) {
+		newInput->selectAll();
+	}
+	_setFocus.events() | rpl::start_with_next([=] {
+		newInput->setFocus();
+	}, newInput->lifetime());
+
+	_submitCallback = [=] {
+		const auto send = [=](const QString &email) {
+			getData()->email = email;
+
+			const auto done = [=](int length, const QString &pattern) {
+				_sentRequest = 0;
+				getData()->codeLength = length;
+				getData()->emailPattern = pattern;
+				goNext<CodeWidget>();
+			};
+			const auto fail = [=](const QString &type) {
+				_sentRequest = 0;
+
+				newInput->setFocus();
+				newInput->showError();
+				newInput->selectAll();
+				error->show();
+
+				if (MTP::IsFloodError(type)) {
+					error->setText(tr::lng_flood_error(tr::now));
+				} else if (type == u"EMAIL_NOT_ALLOWED"_q) {
+					error->setText(
+						tr::lng_settings_error_email_not_alowed(tr::now));
+				} else if (type == u"EMAIL_INVALID"_q) {
+					error->setText(tr::lng_cloud_password_bad_email(tr::now));
+				} else if (type == u"EMAIL_HASH_EXPIRED"_q) {
+					// Show box?
+					error->setText(Lang::Hard::EmailConfirmationExpired());
+				} else {
+					error->setText(Lang::Hard::ServerError());
+				}
+			};
+
+			_sentRequest = api().request(MTPaccount_SendVerifyEmailCode(
+				MTP_emailVerifyPurposeLoginSetup(
+					MTP_string(getData()->phone),
+					MTP_bytes(getData()->phoneHash)),
+				MTP_string(email)
+			)).done([=](const MTPaccount_SentEmailCode &result) {
+				done(
+					result.data().vlength().v,
+					qs(result.data().vemail_pattern()));
+			}).fail([=](const MTP::Error &error) {
+				fail(error.type());
+			}).send();
+		};
+		const auto newText = newInput->getLastText();
+		if (newText.isEmpty()) {
+			newInput->setFocus();
+			newInput->showError();
+		} else {
+			send(newText);
+		}
+	};
+}
+
+void EmailWidget::submit() {
+	if (_submitCallback) {
+		_submitCallback();
+	}
+}
+
+void EmailWidget::setInnerFocus() {
+	_setFocus.fire({});
+}
+
+void EmailWidget::activate() {
+	Step::activate();
+	showChildren();
+	setInnerFocus();
+	_showFinished.fire({});
+}
+
+void EmailWidget::finished() {
+	Step::finished();
+	cancelled();
+}
+
+void EmailWidget::cancelled() {
+	api().request(base::take(_sentRequest)).cancel();
+}
+
+} // namespace details
+} // namespace Intro
diff --git a/Telegram/SourceFiles/intro/intro_email.h b/Telegram/SourceFiles/intro/intro_email.h
new file mode 100644
index 0000000000..aa21da3ab6
--- /dev/null
+++ b/Telegram/SourceFiles/intro/intro_email.h
@@ -0,0 +1,50 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "intro/intro_step.h"
+
+namespace Ui {
+class VerticalLayout;
+} // namespace Ui
+
+namespace MTP {
+class Sender;
+} // namespace MTP
+
+namespace Intro {
+namespace details {
+
+class EmailWidget final : public Step {
+public:
+	EmailWidget(
+		QWidget *parent,
+		not_null<Main::Account*> account,
+		not_null<Data*> data);
+
+	void setInnerFocus() override;
+	void activate() override;
+	void finished() override;
+	void cancelled() override;
+	void submit() override;
+
+	bool hasBack() const override {
+		return true;
+	}
+
+private:
+	object_ptr<Ui::VerticalLayout> _inner;
+	Fn<void()> _submitCallback = nullptr;
+	rpl::event_stream<> _showFinished;
+	rpl::event_stream<> _setFocus;
+	mtpRequestId _sentRequest = 0;
+
+};
+
+} // namespace details
+} // namespace Intro
diff --git a/Telegram/SourceFiles/intro/intro_phone.cpp b/Telegram/SourceFiles/intro/intro_phone.cpp
index 261c533112..21299c41e9 100644
--- a/Telegram/SourceFiles/intro/intro_phone.cpp
+++ b/Telegram/SourceFiles/intro/intro_phone.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "lang/lang_keys.h"
 #include "intro/intro_code.h"
+#include "intro/intro_email.h"
 #include "intro/intro_qr.h"
 #include "styles/style_intro.h"
 #include "ui/widgets/buttons.h"
@@ -237,6 +238,9 @@ void PhoneWidget::phoneSubmitDone(const MTPauth_SentCode &result) {
 		fillSentCodeData(data);
 		getData()->phone = DigitsOnly(_sentPhone);
 		getData()->phoneHash = qba(data.vphone_code_hash());
+		if (getData()->emailStatus == EmailStatus::SetupRequired) {
+			return goNext<EmailWidget>();
+		}
 		const auto next = data.vnext_type();
 		if (next && next->type() == mtpc_auth_codeTypeCall) {
 			getData()->callStatus = CallStatus::Waiting;
diff --git a/Telegram/SourceFiles/intro/intro_step.cpp b/Telegram/SourceFiles/intro/intro_step.cpp
index 969aecbb01..977f0bd758 100644
--- a/Telegram/SourceFiles/intro/intro_step.cpp
+++ b/Telegram/SourceFiles/intro/intro_step.cpp
@@ -375,7 +375,7 @@ void Step::fillSentCodeData(const MTPDauth_sentCode &data) {
 	}, [&](const MTPDauth_sentCodeTypeSmsPhrase &) {
 		bad("SmsPhrase");
 	}, [&](const MTPDauth_sentCodeTypeSetUpEmailRequired &) {
-		bad("SetUpEmailRequired");
+		getData()->emailStatus = EmailStatus::SetupRequired;
 	});
 }
 
diff --git a/Telegram/SourceFiles/intro/intro_widget.h b/Telegram/SourceFiles/intro/intro_widget.h
index 8b804c623c..6227beef9e 100644
--- a/Telegram/SourceFiles/intro/intro_widget.h
+++ b/Telegram/SourceFiles/intro/intro_widget.h
@@ -43,6 +43,11 @@ enum class CallStatus {
 	Disabled,
 };
 
+enum class EmailStatus {
+	None,
+	SetupRequired,
+};
+
 struct Data {
 	// Required for the UserpicButton.
 	const not_null<Window::Controller*> controller;
@@ -58,6 +63,10 @@ struct Data {
 	bool codeByTelegram = false;
 	QString codeByFragmentUrl;
 
+	EmailStatus emailStatus = EmailStatus::None;
+	QString email;
+	QString emailPattern;
+
 	Core::CloudPasswordState pwdState;
 
 	Window::TermsLock termsLock;

From 707af8a29546a09c7cf30ef40091e4e6b4b0cbfc Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Aug 2025 18:10:20 +0300
Subject: [PATCH 191/341] Got rid Ui::CreateLabelWithCustomEmoji.

---
 Telegram/CMakeLists.txt                       |  2 --
 .../SourceFiles/boxes/gift_credits_box.cpp    |  4 +--
 .../info/bot/earn/info_bot_earn_list.cpp      |  1 -
 .../earn/info_channel_earn_list.cpp           | 19 ++++------
 .../inline_bots/bot_attach_web_view.cpp       |  4 +--
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 12 +++----
 .../settings/settings_business.cpp            |  8 ++---
 .../settings/settings_credits_graphics.cpp    | 13 +++----
 .../ui/boxes/edit_invite_link_session.cpp     |  4 +--
 .../ui/widgets/label_with_custom_emoji.cpp    | 31 ----------------
 .../ui/widgets/label_with_custom_emoji.h      | 35 -------------------
 11 files changed, 21 insertions(+), 112 deletions(-)
 delete mode 100644 Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
 delete mode 100644 Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index d01f72ec9f..963205f75a 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1627,8 +1627,6 @@ PRIVATE
     ui/text/format_song_document_name.h
     ui/widgets/expandable_peer_list.cpp
     ui/widgets/expandable_peer_list.h
-    ui/widgets/label_with_custom_emoji.cpp
-    ui/widgets/label_with_custom_emoji.h
     ui/widgets/chat_filters_tabs_strip.cpp
     ui/widgets/chat_filters_tabs_strip.h
     ui/widgets/peer_bubble.cpp
diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index f96069a1b3..e3c915c770 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_channel_earn.h"
@@ -78,7 +77,7 @@ void GiftCreditsBox(
 				u"internal:stars_examples"_q);
 		});
 		content->add(
-			Ui::CreateLabelWithCustomEmoji(
+			object_ptr<Ui::FlatLabel>(
 				content,
 				tr::lng_credits_box_history_entry_gift_out_about(
 					lt_user,
@@ -86,7 +85,6 @@ void GiftCreditsBox(
 					lt_link,
 					std::move(link),
 					Ui::Text::RichLangValue),
-				Core::TextContext({ .session = &peer->session() }),
 				st::creditsBoxAbout),
 			st::boxRowPadding,
 			style::al_top);
diff --git a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
index 620ff8ada9..89747650f5 100644
--- a/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
+++ b/Telegram/SourceFiles/info/bot/earn/info_bot_earn_list.cpp
@@ -35,7 +35,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/slider_natural_width.h"
 #include "ui/wrap/slide_wrap.h"
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 1f5105e164..20445954ce 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -58,7 +58,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/fields/input_field.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/peer_bubble.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/slider_natural_width.h"
@@ -414,21 +413,19 @@ void InnerWidget::fill() {
 	const auto session = &_peer->session();
 	const auto withdrawalEnabled = WithdrawalEnabled(session);
 
-	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
 	const auto addAboutWithLearn = [&](const tr::phrase<lngtag_link> &text) {
-		auto label = Ui::CreateLabelWithCustomEmoji(
+		auto label = object_ptr<Ui::FlatLabel>(
 			container,
 			text(
 				lt_link,
 				tr::lng_channel_earn_about_link(
 					lt_emoji,
-					rpl::single(arrow),
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
 					Ui::Text::RichLangValue
 				) | rpl::map([](TextWithEntities text) {
 					return Ui::Text::Link(std::move(text), 1);
 				}),
 				Ui::Text::RichLangValue),
-			Core::TextContext({ .session = session }),
 			st::boxDividerLabel);
 		label->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 			_show->showBox(Box([=](not_null<Ui::GenericBox*> box) {
@@ -545,7 +542,7 @@ void InnerWidget::fill() {
 					const auto l = box->addRow(
 						object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
 							content,
-							Ui::CreateLabelWithCustomEmoji(
+							object_ptr<Ui::FlatLabel>(
 								content,
 								tr::lng_channel_earn_learn_coin_title(
 									lt_emoji,
@@ -553,7 +550,6 @@ void InnerWidget::fill() {
 										Ui::Text::Link(bigCurrencyIcon, 1)),
 									Ui::Text::RichLangValue
 								),
-								emojiHelper.context(),
 								st::boxTitle)))->entity();
 					const auto diamonds = l->lifetime().make_state<int>(0);
 					l->setLink(1, std::make_shared<LambdaClickHandler>([=] {
@@ -570,20 +566,19 @@ void InnerWidget::fill() {
 				Ui::AddSkip(content);
 				{
 					const auto label = box->addRow(
-						Ui::CreateLabelWithCustomEmoji(
+						object_ptr<Ui::FlatLabel>(
 							content,
 							tr::lng_channel_earn_learn_coin_about(
 								lt_link,
 								tr::lng_channel_earn_about_link(
 									lt_emoji,
-									rpl::single(arrow),
+									rpl::single(Ui::Text::IconEmoji(
+										&st::textMoreIconEmoji)),
 									Ui::Text::RichLangValue
 								) | rpl::map([](TextWithEntities text) {
 									return Ui::Text::Link(std::move(text), 1);
 								}),
-								Ui::Text::RichLangValue
-							),
-							Core::TextContext({ .session = session }),
+								Ui::Text::RichLangValue),
 							st::channelEarnLearnDescription));
 					label->resizeToWidth(box->width()
 						- rect::m::sum::h(st::boxRowPadding));
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index be8fbdbefa..4f21817adc 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -72,7 +72,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/vertical_list.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/dropdown_menu.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_item_base.h"
 #include "ui/widgets/popup_menu.h"
 #include "webview/webview_interface.h"
@@ -384,7 +383,7 @@ void FillBotUsepic(
 		not_null<Ui::GenericBox*> box,
 		not_null<PeerData*> bot,
 		base::weak_ptr<Window::SessionController> weak) {
-	auto aboutLabel = Ui::CreateLabelWithCustomEmoji(
+	auto aboutLabel = object_ptr<Ui::FlatLabel>(
 		box->verticalLayout(),
 		tr::lng_allow_bot_webview_details(
 			lt_emoji,
@@ -393,7 +392,6 @@ void FillBotUsepic(
 		) | rpl::map([](TextWithEntities text) {
 			return Ui::Text::Link(std::move(text), u"internal:"_q);
 		}),
-		Core::TextContext({ .session = &bot->session() }),
 		st::defaultFlatLabel);
 	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 		box->verticalLayout(),
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 2073239170..656d5053a5 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -25,7 +25,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
 #include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/menu/menu_multiline_action.h"
@@ -96,12 +95,10 @@ void AboutBox(
 			tr::lng_sponsored_menu_revenued_about(),
 			st::boxTitle)));
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
+	box->addRow(object_ptr<Ui::FlatLabel>(
 		content,
-		object_ptr<Ui::FlatLabel>(
-			content,
-			tr::lng_sponsored_revenued_subtitle(),
-			st::channelEarnLearnDescription)));
+		tr::lng_sponsored_revenued_subtitle(),
+		st::channelEarnLearnDescription));
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 	{
@@ -224,7 +221,7 @@ void AboutBox(
 		const auto available = box->width()
 			- rect::m::sum::h(st::boxRowPadding);
 		box->addRow(
-			Ui::CreateLabelWithCustomEmoji(
+			object_ptr<Ui::FlatLabel>(
 				content,
 				(isChannel
 					? tr::lng_sponsored_revenued_footer_description
@@ -240,7 +237,6 @@ void AboutBox(
 							return Ui::Text::Link(std::move(t), kUrl.utf16());
 						}),
 						Ui::Text::RichLangValue),
-				Core::TextContext({ .session = session }),
 				st::channelEarnLearnDescription))->resizeToWidth(available);
 	}
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/settings/settings_business.cpp b/Telegram/SourceFiles/settings/settings_business.cpp
index a619971545..384a11faaf 100644
--- a/Telegram/SourceFiles/settings/settings_business.cpp
+++ b/Telegram/SourceFiles/settings/settings_business.cpp
@@ -41,7 +41,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/widgets/checkbox.h" // Ui::RadiobuttonGroup.
 #include "ui/widgets/gradient_round_button.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -524,24 +523,23 @@ void Business::setupContent() {
 
 		const auto session = &_controller->session();
 		{
-			const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
 			inner->add(object_ptr<Ui::DividerLabel>(
 				inner,
-				Ui::CreateLabelWithCustomEmoji(
+				object_ptr<Ui::FlatLabel>(
 					inner,
 					tr::lng_business_about_sponsored(
 						lt_link,
 						rpl::combine(
 							tr::lng_business_about_sponsored_link(
 								lt_emoji,
-								rpl::single(arrow),
+								rpl::single(Ui::Text::IconEmoji(
+									&st::textMoreIconEmoji)),
 								Ui::Text::RichLangValue),
 							tr::lng_business_about_sponsored_url()
 						) | rpl::map([](TextWithEntities text, QString url) {
 							return Ui::Text::Link(text, url);
 						}),
 						Ui::Text::RichLangValue),
-					Core::TextContext({ .session = session }),
 					st::boxDividerLabel),
 				st::defaultBoxDividerLabelPadding,
 				RectPart::Top | RectPart::Bottom));
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 2ef4636fd9..a08d5594d1 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -86,7 +86,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/fields/number_input.h"
 #include "ui/widgets/popup_menu.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/wrap/fade_wrap.h"
@@ -1694,7 +1693,7 @@ void GenericCreditsEntryBox(
 				u"internal:stars_examples"_q);
 		});
 		box->addRow(
-			Ui::CreateLabelWithCustomEmoji(
+			object_ptr<Ui::FlatLabel>(
 				box,
 				(!e.in && peer)
 					? tr::lng_credits_box_history_entry_gift_out_about(
@@ -1707,7 +1706,6 @@ void GenericCreditsEntryBox(
 						lt_link,
 						std::move(link),
 						Ui::Text::RichLangValue),
-				Core::TextContext({ .session = session }),
 				st::creditsBoxAbout),
 			st::boxRowPadding,
 			style::al_top);
@@ -1724,7 +1722,7 @@ void GenericCreditsEntryBox(
 		});
 		const auto percent = 100. - (e.paidMessagesCommission / 10.);
 		box->addRow(
-			Ui::CreateLabelWithCustomEmoji(
+			object_ptr<Ui::FlatLabel>(
 				box,
 				tr::lng_credits_paid_messages_fee_about(
 					lt_percent,
@@ -1733,7 +1731,6 @@ void GenericCreditsEntryBox(
 					lt_link,
 					std::move(link),
 					Ui::Text::RichLangValue),
-				Core::TextContext({ .session = session }),
 				st::creditsBoxAbout),
 			st::boxRowPadding,
 			style::al_top);
@@ -2913,8 +2910,7 @@ void AddWithdrawalWidget(
 	Ui::AddSkip(container);
 	Ui::AddSkip(container);
 
-	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
-	auto about = Ui::CreateLabelWithCustomEmoji(
+	auto about = object_ptr<Ui::FlatLabel>(
 		container,
 		(peer->isSelf()
 			? tr::lng_self_earn_learn_credits_out_about
@@ -2922,7 +2918,7 @@ void AddWithdrawalWidget(
 				lt_link,
 				tr::lng_channel_earn_about_link(
 					lt_emoji,
-					rpl::single(arrow),
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
 					Ui::Text::RichLangValue
 				) | rpl::map([](TextWithEntities text) {
 					return Ui::Text::Link(
@@ -2930,7 +2926,6 @@ void AddWithdrawalWidget(
 						tr::lng_bot_earn_balance_about_url(tr::now));
 				}),
 			Ui::Text::RichLangValue),
-		{},
 		st::boxDividerLabel);
 	Ui::AddSkip(container);
 	container->add(object_ptr<Ui::DividerLabel>(
diff --git a/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp b/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
index f868cc3e97..2f09147979 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_invite_link_session.cpp
@@ -24,7 +24,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/fields/number_input.h"
-#include "ui/widgets/label_with_custom_emoji.h"
 #include "ui/widgets/labels.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
@@ -129,7 +128,7 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 
 	state->usdRate = peer->session().credits().rateValue(peer);
 
-	auto about = Ui::CreateLabelWithCustomEmoji(
+	auto about = object_ptr<Ui::FlatLabel>(
 		container,
 		tr::lng_group_invite_subscription_about(
 			lt_link,
@@ -143,7 +142,6 @@ InviteLinkSubscriptionToggle FillCreateInviteLinkSubscriptionToggle(
 					tr::lng_group_invite_subscription_about_url(tr::now));
 			}),
 			Ui::Text::RichLangValue),
-		Core::TextContext({ .session = &peer->session() }),
 		st::boxDividerLabel);
 	Ui::AddSkip(wrap->entity());
 	Ui::AddSkip(wrap->entity());
diff --git a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
deleted file mode 100644
index 69f1d5f14f..0000000000
--- a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#include "ui/widgets/label_with_custom_emoji.h"
-
-#include "core/ui_integration.h"
-#include "ui/widgets/labels.h"
-#include "styles/style_widgets.h"
-
-namespace Ui {
-
-object_ptr<Ui::FlatLabel> CreateLabelWithCustomEmoji(
-		QWidget *parent,
-		rpl::producer<TextWithEntities> &&text,
-		Text::MarkedContext context,
-		const style::FlatLabel &st) {
-	auto label = object_ptr<Ui::FlatLabel>(parent, st);
-	const auto raw = label.data();
-
-	context.repaint = [=] { raw->update(); };
-	std::move(text) | rpl::start_with_next([=](const TextWithEntities &text) {
-		raw->setMarkedText(text, context);
-	}, label->lifetime());
-	return label;
-}
-
-} // namespace Ui
diff --git a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h b/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h
deleted file mode 100644
index 662ce0fa7b..0000000000
--- a/Telegram/SourceFiles/ui/widgets/label_with_custom_emoji.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop application for the Telegram messaging service.
-
-For license and copyright information please follow this link:
-https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
-*/
-#pragma once
-
-template <typename Object>
-class object_ptr;
-
-namespace Main {
-class Session;
-} // namespace Main
-
-namespace style {
-struct FlatLabel;
-} // namespace style
-
-namespace Ui::Text {
-struct MarkedContext;
-} // namespace Ui::Text
-
-namespace Ui {
-
-class FlatLabel;
-
-[[nodiscard]] object_ptr<Ui::FlatLabel> CreateLabelWithCustomEmoji(
-	QWidget *parent,
-	rpl::producer<TextWithEntities> &&text,
-	Text::MarkedContext context,
-	const style::FlatLabel &st);
-
-} // namespace Ui

From 7defad5d950d373938aefcf81e1153649f450804 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 16 Aug 2025 13:55:59 +0300
Subject: [PATCH 192/341] Added ability to clear history for channels and
 megagroups.

Fixed #28778.
---
 Telegram/Resources/langs/lang.strings         |  1 +
 .../SourceFiles/boxes/delete_messages_box.cpp | 25 ++++++++++---------
 .../SourceFiles/boxes/delete_messages_box.h   |  1 +
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2e10feba15..ac65cc4fde 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2062,6 +2062,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_sure_delete_contact" = "Are you sure you want to delete {contact} from your contact list?";
 "lng_sure_delete_history" = "Are you sure you want to delete all message history with {contact}?\n\nThis action cannot be undone.";
 "lng_sure_delete_group_history" = "Are you sure you want to delete all messages in \"{group}\"?\n\nThis action cannot be undone.";
+"lng_sure_delete_channel_history" = "Are you sure you want to delete all messages in \"{channel}\"?\n\n**This action cannot be undone.**";
 "lng_sure_delete_and_exit" = "Are you sure you want to delete all message history and leave «{group}»?\n\nThis action cannot be undone.";
 "lng_sure_leave_channel" = "Are you sure you want to leave\nthis channel?";
 "lng_sure_delete_channel" = "Are you sure you want to delete this channel? All subscribers will be removed and all messages will be lost.";
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 503720fc27..c4edf1b3fa 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -30,6 +30,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
+#include "ui/rect.h"
 #include "ui/wrap/slide_wrap.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
@@ -111,16 +112,12 @@ void DeleteMessagesBox::prepare() {
 					Ui::Text::RichLangValue);
 			deleteStyle = &st::attentionBoxButton;
 		} else if (_wipeHistoryJustClear) {
-			const auto isChannel = peer->isBroadcast();
-			const auto isPublicGroup = peer->isMegagroup()
-				&& peer->asChannel()->isPublic();
-			if (isChannel || isPublicGroup) {
-				canDelete = false;
-			}
-			details.text = isChannel
-				? tr::lng_no_clear_history_channel(tr::now)
-				: isPublicGroup
-				? tr::lng_no_clear_history_group(tr::now)
+			_revokeJustClearForChannel = true;
+			details.text = (peer->isChannel() && !peer->isMegagroup())
+				? tr::lng_sure_delete_channel_history(
+					tr::now,
+					lt_channel,
+					peer->name())
 				: peer->isSelf()
 				? tr::lng_sure_delete_saved_messages(tr::now)
 				: peer->isUser()
@@ -156,7 +153,8 @@ void DeleteMessagesBox::prepare() {
 			}
 			deleteStyle = &st::attentionBoxButton;
 		}
-		if (auto revoke = revokeText(peer)) {
+		if (_revokeJustClearForChannel) {
+		} else if (auto revoke = revokeText(peer)) {
 			_revoke.create(
 				this,
 				revoke->checkbox,
@@ -285,6 +283,7 @@ void DeleteMessagesBox::prepare() {
 		}
 	}
 	_text.create(this, rpl::single(std::move(details)), st::boxLabel);
+	_text->resizeToWidth(st::boxWidth - rect::m::sum::h(st::boxPadding));
 
 	if (_wipeHistoryJustClear && _wipeHistoryPeer) {
 		const auto validator = TTLMenu::TTLValidator(
@@ -554,7 +553,9 @@ void DeleteMessagesBox::deleteAndClear() {
 			!_revoke->checked());
 		Core::App().saveSettingsDelayed();
 	}
-	const auto revoke = _revoke ? _revoke->checked() : _revokeForBot;
+	const auto revoke = _revoke
+		? _revoke->checked()
+		: (_revokeForBot || _revokeJustClearForChannel);
 	const auto session = _session;
 	const auto invokeCallbackAndClose = [&] {
 		// deleteMessages can initiate closing of the current section,
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.h b/Telegram/SourceFiles/boxes/delete_messages_box.h
index 3762212b0d..29cd403561 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.h
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.h
@@ -75,6 +75,7 @@ private:
 	bool _moderateDeleteAll = false;
 
 	bool _revokeForBot = false;
+	bool _revokeJustClearForChannel = false;
 
 	object_ptr<Ui::FlatLabel> _text = { nullptr };
 	object_ptr<Ui::Checkbox> _revoke = { nullptr };

From 5f930cc4d16a0f55054bc02c668c701e2029afeb Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Aug 2025 20:47:01 +0300
Subject: [PATCH 193/341] Added initial ability to rate voice transcriptions.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   3 +
 Telegram/SourceFiles/api/api_transcribes.cpp  |  27 +++
 Telegram/SourceFiles/api/api_transcribes.h    |   2 +
 .../chat_helpers/chat_helpers.style           |  13 ++
 .../history/history_inner_widget.cpp          |  21 +++
 .../view/history_view_context_menu.cpp        |  12 ++
 .../main/main_session_settings.cpp            |  37 +++-
 .../SourceFiles/main/main_session_settings.h  |   5 +
 .../menu/menu_item_rate_transcribe.cpp        | 166 ++++++++++++++++++
 .../menu/menu_item_rate_transcribe.h          |  41 +++++
 .../menu_item_rate_transcribe_session.cpp     |  46 +++++
 .../menu/menu_item_rate_transcribe_session.h  |  19 ++
 Telegram/cmake/td_ui.cmake                    |   2 +
 14 files changed, 394 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
 create mode 100644 Telegram/SourceFiles/menu/menu_item_rate_transcribe.h
 create mode 100644 Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp
 create mode 100644 Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 963205f75a..e6e6884e4c 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1280,6 +1280,8 @@ PRIVATE
     menu/menu_antispam_validator.h
     menu/menu_item_download_files.cpp
     menu/menu_item_download_files.h
+    menu/menu_item_rate_transcribe_session.cpp
+    menu/menu_item_rate_transcribe_session.h
     menu/menu_mute.cpp
     menu/menu_mute.h
     menu/menu_send.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ac65cc4fde..77f3ead60d 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4310,6 +4310,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_remove_from_group" = "Remove from group";
 "lng_context_add_to_group" = "Add to group";
 
+"lng_context_rate_transcription" = "Rate transcription";
+"lng_toast_sent_rate_transcription" = "Thank you for your feedback!";
+
 "lng_context_copy_link" = "Copy Link";
 "lng_context_copy_message_link" = "Copy Message Link";
 "lng_context_copy_post_link" = "Copy Post Link";
diff --git a/Telegram/SourceFiles/api/api_transcribes.cpp b/Telegram/SourceFiles/api/api_transcribes.cpp
index dd983dc37b..17681cc849 100644
--- a/Telegram/SourceFiles/api/api_transcribes.cpp
+++ b/Telegram/SourceFiles/api/api_transcribes.cpp
@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_helpers.h"
 #include "main/main_app_config.h"
 #include "main/main_session.h"
+#include "main/main_session_settings.h"
 
 namespace Api {
 
@@ -25,6 +26,32 @@ Transcribes::Transcribes(not_null<ApiWrap*> api)
 , _api(&api->instance()) {
 }
 
+bool Transcribes::isRated(not_null<HistoryItem*> item) const {
+	const auto fullId = item->fullId();
+	for (const auto &[transcribeId, id] : _ids) {
+		if (id == fullId) {
+			return _session->settings().isTranscriptionRated(transcribeId);
+		}
+	}
+	return false;
+}
+
+void Transcribes::rate(not_null<HistoryItem*> item, bool isGood) {
+	const auto fullId = item->fullId();
+	for (const auto &[transcribeId, id] : _ids) {
+		if (id == fullId) {
+			_api.request(MTPmessages_RateTranscribedAudio(
+				item->history()->peer->input,
+				MTP_int(item->id),
+				MTP_long(transcribeId),
+				MTP_bool(isGood))).send();
+			_session->settings().markTranscriptionAsRated(transcribeId);
+			_session->saveSettings();
+			return;
+		}
+	}
+}
+
 bool Transcribes::freeFor(not_null<HistoryItem*> item) const {
 	if (const auto channel = item->history()->peer->asMegagroup()) {
 		const auto owner = &channel->owner();
diff --git a/Telegram/SourceFiles/api/api_transcribes.h b/Telegram/SourceFiles/api/api_transcribes.h
index b074e42f13..93b42401df 100644
--- a/Telegram/SourceFiles/api/api_transcribes.h
+++ b/Telegram/SourceFiles/api/api_transcribes.h
@@ -37,6 +37,8 @@ public:
 	void apply(const MTPDupdateTranscribedAudio &update);
 
 	[[nodiscard]] bool freeFor(not_null<HistoryItem*> item) const;
+	[[nodiscard]] bool isRated(not_null<HistoryItem*> item) const;
+	void rate(not_null<HistoryItem*> item, bool isGood);
 
 	[[nodiscard]] bool trialsSupport();
 	[[nodiscard]] TimeId trialsRefreshAt();
diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 252a7dbc94..9025996c95 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1626,4 +1626,17 @@ frozenInfoBox: Box(defaultBox) {
 	shadowIgnoreTopSkip: true;
 }
 
+menuTranscribeItemPadding: margins(0px, 10px, 0px, 10px);
+menuTranscribeDummyButton: IconButton(defaultIconButton) {
+	width: 40px;
+	height: 40px;
+
+	icon: icon {{ "chat/input_attach", historyComposeIconFgOver }};
+	iconOver: icon {{ "chat/input_attach", historyComposeIconFgOver }};
+
+	rippleAreaPosition: point(3px, 3px);
+	rippleAreaSize: 34px;
+	ripple: defaultRippleAnimationBgOver;
+}
+
 roundVideoFont: font(14px semibold);
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index 6ffd488289..dcf365b534 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -73,6 +73,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session_settings.h"
 #include "mainwidget.h"
 #include "menu/menu_item_download_files.h"
+#include "menu/menu_item_rate_transcribe.h"
+#include "menu/menu_item_rate_transcribe_session.h"
 #include "menu/menu_sponsored.h"
 #include "core/application.h"
 #include "apiwrap.h"
@@ -2500,6 +2502,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}, &st::menuIconStickers);
 		}
 	};
+	auto rateTranscriptionItem = (HistoryItem*)(nullptr);
 	const auto addDocumentActions = [&](not_null<DocumentData*> document, HistoryItem *item) {
 		if (document->loading()) {
 			_menu->addAction(tr::lng_context_cancel_download(tr::now), [=] {
@@ -2559,6 +2562,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 					document);
 			}, &st::menuIconStickers);
 		}
+		if (item
+			&& (lnkIsVoice || document->isVideoMessage())
+			&& Menu::HasRateTranscribeItem(item)) {
+			rateTranscriptionItem = item;
+		}
 	};
 
 #ifdef _DEBUG // Sometimes we need to save emoji to files.
@@ -2972,6 +2980,12 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 									&st::menuIconGiftPremium);
 							}
 						}
+					} else if (!rateTranscriptionItem && media->document()) {
+						if ((media->document()->isVoiceMessage()
+								|| media->document()->isVideoMessage())
+							&& Menu::HasRateTranscribeItem(item)) {
+							rateTranscriptionItem = item;
+						}
 					}
 				}
 				if (!item->isService() && view && actionText.isEmpty()) {
@@ -3139,6 +3153,13 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			_controller);
 	}
 
+	if (!_menu->empty() && rateTranscriptionItem) {
+		_menu->insertAction(0, base::make_unique_q<Menu::RateTranscribe>(
+			_menu,
+			_menu->st().menu,
+			Menu::RateTranscribeCallbackFactory(rateTranscriptionItem)));
+	}
+
 	if (_menu->empty()) {
 		_menu = nullptr;
 		return;
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 84e258e2fb..53017e65de 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -44,6 +44,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/boxes/report_box_graphics.h"
 #include "ui/ui_utility.h"
 #include "menu/menu_item_download_files.h"
+#include "menu/menu_item_rate_transcribe.h"
+#include "menu/menu_item_rate_transcribe_session.h"
 #include "menu/menu_send.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/boxes/show_or_premium_box.h"
@@ -338,6 +340,16 @@ void AddDocumentActions(
 		const auto controller = list->controller();
 		AddSaveSoundForNotifications(menu, item, document, controller);
 	}
+	if ((document->isVoiceMessage()
+			|| document->isVideoMessage())
+		&& Menu::HasRateTranscribeItem(item)) {
+		if (!menu->empty()) {
+			menu->insertAction(0, base::make_unique_q<Menu::RateTranscribe>(
+				menu,
+				menu->st().menu,
+				Menu::RateTranscribeCallbackFactory(item)));
+		}
+	}
 	AddSaveDocumentAction(menu, item, document, list);
 	AddCopyFilename(
 		menu,
diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index b4645e0f51..2f5d97a803 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -54,7 +54,9 @@ QByteArray SessionSettings::serialize() const {
 		+ (_ringtoneVolumes.size()
 			* (0
 				+ sizeof(quint64) * 3 // ThreadId
-				+ sizeof(ushort))); // Volume
+				+ sizeof(ushort))) // Volume
+		+ sizeof(qint32) // _ratedTranscriptions size
+		+ (_ratedTranscriptions.size() * sizeof(quint64));
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -122,6 +124,10 @@ QByteArray SessionSettings::serialize() const {
 				<< SerializePeerId(key.monoforumPeerId)
 				<< ushort(value);
 		}
+		stream << qint32(_ratedTranscriptions.size());
+		for (const auto &transcriptionId : _ratedTranscriptions) {
+			stream << quint64(transcriptionId);
+		}
 	}
 
 	Ensures(result.size() == size);
@@ -191,6 +197,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	qint32 lastNonPremiumLimitUpload = 0;
 	base::flat_map<Data::DefaultNotify, ushort> ringtoneDefaultVolumes;
 	base::flat_map<ThreadId, ushort> ringtoneVolumes;
+	base::flat_set<uint64> ratedTranscriptions;
 
 	stream >> versionTag;
 	if (versionTag == kVersionTag) {
@@ -419,7 +426,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 		stream >> count;
 		if (stream.status() == QDataStream::Ok) {
 			for (auto i = 0; i != count; ++i) {
-				quint64 period;
+				auto period = quint64();
 				stream >> period;
 				mutePeriods.emplace_back(period);
 			}
@@ -561,6 +568,23 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 			}
 		}
 	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto transcriptionId = quint64();
+				stream >> transcriptionId;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"
+						"with ratedTranscriptions"));
+					return;
+				}
+				ratedTranscriptions.emplace(transcriptionId);
+			}
+		}
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for SessionSettings::addFromSerialized()"));
@@ -610,6 +634,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_verticalSubsectionTabs = std::move(verticalSubsectionTabs);
 	_ringtoneDefaultVolumes = std::move(ringtoneDefaultVolumes);
 	_ringtoneVolumes = std::move(ringtoneVolumes);
+	_ratedTranscriptions = std::move(ratedTranscriptions);
 
 	if (version < 2) {
 		app.setLastSeenWarningSeen(appLastSeenWarningSeen == 1);
@@ -822,4 +847,12 @@ void SessionSettings::setRingtoneVolume(
 	}
 }
 
+void SessionSettings::markTranscriptionAsRated(uint64 transcriptionId) {
+	_ratedTranscriptions.emplace(transcriptionId);
+}
+
+bool SessionSettings::isTranscriptionRated(uint64 transcriptionId) const {
+	return _ratedTranscriptions.contains(transcriptionId);
+}
+
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/main_session_settings.h b/Telegram/SourceFiles/main/main_session_settings.h
index 1069af4510..bab7c6496c 100644
--- a/Telegram/SourceFiles/main/main_session_settings.h
+++ b/Telegram/SourceFiles/main/main_session_settings.h
@@ -162,6 +162,9 @@ public:
 		MsgId topicRootId,
 		PeerId monoforumPeerId) const;
 
+	void markTranscriptionAsRated(uint64 transcriptionId);
+	[[nodiscard]] bool isTranscriptionRated(uint64 transcriptionId) const;
+
 private:
 	static constexpr auto kDefaultSupportChatsLimitSlice = 7 * 24 * 60 * 60;
 	static constexpr auto kPhotoEditorHintMaxShowsCount = 5;
@@ -202,6 +205,8 @@ private:
 		= kDefaultSupportChatsLimitSlice;
 	rpl::variable<bool> _supportAllSearchResults = false;
 
+	base::flat_set<uint64> _ratedTranscriptions;
+
 };
 
 } // namespace Main
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
new file mode 100644
index 0000000000..75567c7692
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.cpp
@@ -0,0 +1,166 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_item_rate_transcribe.h"
+
+#include "base/call_delayed.h"
+#include "lang/lang_keys.h"
+#include "ui/rect.h"
+#include "ui/toast/toast.h"
+#include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+
+namespace Menu {
+namespace {
+
+constexpr auto kDuration = crl::time(5000);
+
+} // namespace
+
+RateTranscribe::RateTranscribe(
+	not_null<Ui::PopupMenu*> parent,
+	const style::Menu &st,
+	Fn<void(bool)> rate)
+: Ui::Menu::ItemBase(parent, st)
+, _dummyAction(Ui::CreateChild<QAction>(this)) {
+	setAcceptBoth(true);
+
+	initResizeHook(parent->sizeValue());
+
+	enableMouseSelecting();
+
+	const auto content = Ui::CreateChild<Ui::VerticalLayout>(this);
+
+	Ui::AddSkip(content);
+
+	const auto label = content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_context_rate_transcription(),
+			st::boxDividerLabel),
+		style::margins(),
+		style::al_top);
+	setMinWidth(
+		label->st().style.font->width(
+			tr::lng_context_rate_transcription(tr::now)));
+	widthValue() | rpl::start_with_next([=](int w) {
+		content->resizeToWidth(parentWidget()->width());
+	}, content->lifetime());
+	Ui::AddSkip(content);
+
+	// const auto leftButton = Ui::CreateChild<Ui::IconButton>(
+	// 	this,
+	// 	st::menuTranscribeDummyButton);
+	// const auto rightButton = Ui::CreateChild<Ui::IconButton>(
+	// 	this,
+	// 	st::menuTranscribeDummyButton);
+	const auto leftButton = Ui::CreateSimpleCircleButton(
+		this,
+		st::defaultRippleAnimation);
+	{
+		leftButton->resize(Size(st::menuTranscribeDummyButton.width));
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			leftButton,
+			QString::fromUtf8("\U0001F44D"));
+		label->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+		leftButton->sizeValue() | rpl::start_with_next([=](QSize s) {
+			label->moveToLeft(
+				(s.width() - label->width()) / 2,
+				(s.height() - label->height()) / 2);
+		}, label->lifetime());
+	}
+	const auto rightButton = Ui::CreateSimpleCircleButton(
+		this,
+		st::defaultRippleAnimation);
+	{
+		rightButton->resize(Size(st::menuTranscribeDummyButton.width));
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			rightButton,
+			QString::fromUtf8("\U0001F44E"));
+		label->setAttribute(Qt::WA_TransparentForMouseEvents, true);
+		rightButton->sizeValue() | rpl::start_with_next([=](QSize s) {
+			label->moveToLeft(
+				(s.width() - label->width()) / 2,
+				(s.height() - label->height()) / 2);
+		}, label->lifetime());
+	}
+	{
+		const auto showToast = [=,
+				weak = base::make_weak(parent->parentWidget())]{
+			if (const auto strong = weak.get()) {
+				base::call_delayed(
+					st::universalDuration * 1.1,
+					crl::guard(strong, [=] {
+						Ui::Toast::Show(strong->window(), {
+							.text = tr::lng_toast_sent_rate_transcription(
+								tr::now,
+								TextWithEntities::Simple),
+							.duration = kDuration,
+						});
+					}));
+			}
+		};
+		const auto hideMenu = [=, weak = base::make_weak(parent)] {
+			if (const auto strong = weak.get()) {
+				base::call_delayed(
+					st::universalDuration,
+					crl::guard(strong, [=] { strong->hideMenu(false); }));
+			}
+		};
+		leftButton->setClickedCallback([=] {
+			rate(true);
+			showToast();
+			hideMenu();
+		});
+		rightButton->setClickedCallback([=] {
+			rate(false);
+			showToast();
+			hideMenu();
+		});
+	}
+	_desiredHeight = rect::m::sum::v(st::menuTranscribeItemPadding)
+		+ st::menuTranscribeDummyButton.height
+		+ label->st().style.font->height;
+	rpl::combine(
+		content->geometryValue(),
+		label->geometryValue()
+	) | rpl::start_with_next([=](
+			const QRect &contentRect,
+			const QRect &labelRect) {
+		leftButton->moveToLeft(
+			labelRect.x(),
+			rect::bottom(contentRect));
+		rightButton->moveToLeft(
+			rect::right(labelRect) - rightButton->width(),
+			rect::bottom(contentRect));
+		_desiredHeight = rect::m::sum::v(st::menuTranscribeItemPadding)
+			+ leftButton->height()
+			+ labelRect.height();
+	}, leftButton->lifetime());
+	leftButton->show();
+	rightButton->show();
+}
+
+not_null<QAction*> RateTranscribe::action() const {
+	return _dummyAction;
+}
+
+bool RateTranscribe::isEnabled() const {
+	return true;
+}
+
+int RateTranscribe::contentHeight() const {
+	return _desiredHeight;
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe.h b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.h
new file mode 100644
index 0000000000..1a147c2f50
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe.h
@@ -0,0 +1,41 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/menu/menu_item_base.h"
+
+class HistoryItem;
+
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
+namespace Menu {
+
+class RateTranscribe final : public Ui::Menu::ItemBase {
+public:
+	RateTranscribe(
+		not_null<Ui::PopupMenu*> parent,
+		const style::Menu &st,
+		Fn<void(bool)> rate);
+
+	not_null<QAction*> action() const override;
+	bool isEnabled() const override;
+
+protected:
+	int contentHeight() const override;
+
+private:
+	int _desiredHeight = 0;
+	not_null<QAction*> _dummyAction;
+
+};
+
+bool HasRateTranscribeItem(not_null<HistoryItem*>);
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp
new file mode 100644
index 0000000000..95ce62c335
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.cpp
@@ -0,0 +1,46 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "menu/menu_item_rate_transcribe_session.h"
+
+#include "api/api_transcribes.h"
+#include "apiwrap.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "main/main_session.h"
+#include "ui/rect.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_chat_helpers.h"
+#include "styles/style_layers.h"
+
+namespace Menu {
+
+Fn<void(bool)> RateTranscribeCallbackFactory(
+		not_null<HistoryItem*> item) {
+	return [item](bool good) {
+		item->history()->peer->owner().session().api().transcribes().rate(
+			item,
+			good);
+	};
+}
+
+bool HasRateTranscribeItem(not_null<HistoryItem*> item) {
+	const auto &peer = item->history()->peer;
+	if (!peer->owner().session().api().transcribes().entry(
+			item).result.isEmpty()) {
+		return !peer->owner().session().api().transcribes().isRated(item);
+	}
+	return false;
+}
+
+} // namespace Menu
diff --git a/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h
new file mode 100644
index 0000000000..92ce16aeb2
--- /dev/null
+++ b/Telegram/SourceFiles/menu/menu_item_rate_transcribe_session.h
@@ -0,0 +1,19 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class HistoryItem;
+
+namespace Menu {
+
+[[nodiscard]] Fn<void(bool)> RateTranscribeCallbackFactory(
+	not_null<HistoryItem*>);
+
+[[nodiscard]] bool HasRateTranscribeItem(not_null<HistoryItem*>);
+
+} // namespace Menu
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 25d13f8750..b9f54ad843 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -196,6 +196,8 @@ PRIVATE
     menu/gift_resale_filter.h
     menu/menu_check_item.cpp
     menu/menu_check_item.h
+    menu/menu_item_rate_transcribe.cpp
+    menu/menu_item_rate_transcribe.h
     menu/menu_ttl.cpp
     menu/menu_ttl.h
 

From 44843aa9cd24f976e3516b0ace87052366d395d5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 18 Aug 2025 13:23:24 +0300
Subject: [PATCH 194/341] Added hint about archive and its features.

---
 Telegram/Resources/langs/lang.strings         |  13 ++
 Telegram/SourceFiles/boxes/about_box.cpp      | 158 ++++++++++++++++++
 Telegram/SourceFiles/boxes/about_box.h        |   4 +
 .../SourceFiles/window/window_peer_menu.cpp   |  20 ++-
 4 files changed, 193 insertions(+), 2 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 77f3ead60d..db20a2dded 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1245,6 +1245,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_quick_dialog_action_toast_archive_success" = "The chat has been archived.";
 "lng_quick_dialog_action_toast_unarchive_success" = "The chat has been unarchived.";
 
+"lng_archive_hint_title" = "This is your Archive";
+"lng_archive_hint_about" = "Archived chats will remain in the Archive when you receive a new message. {link}";
+"lng_archive_hint_about_unmuted" = "When you receive a new message, muted chats will remain in the Archive, while unmuted chats will be moved to Chats. {link}";
+"lng_archive_hint_about_link" = "Tap to change {emoji}";
+"lng_archive_hint_section_1" = "Archived Chats";
+"lng_archive_hint_section_1_info" = "Move any chat into your Archive and back by swiping on it.";
+"lng_archive_hint_section_2" = "Hiding Archive";
+"lng_archive_hint_section_2_info" = "Hide the Archive from your Main screen by swiping on it.";
+"lng_archive_hint_section_3" = "Stories";
+"lng_archive_hint_section_3_info" = "Archive Stories from your contacts separately from chats with them.";
+"lng_archive_hint_button" = "Got it";
+
 "lng_settings_generic_subscribe" = "Subscribe to {link} to use this setting.";
 "lng_settings_generic_subscribe_link" = "Telegram Premium";
 
@@ -4299,6 +4311,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_archive_to_list" = "Move to chat list";
 "lng_context_archive_to_menu_info" = "Archive moved to the main menu!\nRight click the archive button to return the Archive to your chat list.";
 "lng_context_archive_settings" = "Archive settings";
+"lng_context_archive_how_does_it_work" = "How does it work?";
 
 "lng_context_mute" = "Mute notifications";
 "lng_context_unmute" = "Unmute";
diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index 129d59d076..4f8b666671 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -13,12 +13,20 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/update_checker.h"
 #include "lang/lang_keys.h"
 #include "ui/boxes/confirm_box.h"
+#include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/text/text_utilities.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
 #include "ui/wrap/vertical_layout.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
+#include "styles/style_channel_earn.h"
+#include "styles/style_chat.h"
+#include "styles/style_dialogs.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_premium.h"
+#include "styles/style_settings.h"
 
 #include <QtGui/QGuiApplication>
 #include <QtGui/QClipboard>
@@ -158,3 +166,153 @@ QString currentVersionText() {
 #endif
 	return result;
 }
+
+void ArchiveHintBox(
+		not_null<Ui::GenericBox*> box,
+		bool unarchiveOnNewMessage,
+		Fn<void()> onUnarchive) {
+	box->setNoContentMargin(true);
+
+	const auto content = box->verticalLayout().get();
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &icon = st::dialogsArchiveUserpic;
+		const auto rect = Rect(icon.size() * 2);
+		auto owned = object_ptr<Ui::RpWidget>(content);
+		owned->resize(rect.size());
+		const auto widget = box->addRow(
+			object_ptr<Ui::CenterWrap<>>(
+				content,
+				std::move(owned)))->entity();
+		widget->paintRequest(
+		) | rpl::start_with_next([=] {
+			auto p = Painter(widget);
+			auto hq = PainterHighQualityEnabler(p);
+			p.setPen(Qt::NoPen);
+			p.setBrush(st::activeButtonBg);
+			p.drawEllipse(rect);
+			icon.paintInCenter(p, rect);
+		}, widget->lifetime());
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	box->addRow(object_ptr<Ui::CenterWrap<>>(
+		content,
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_archive_hint_title(),
+			st::boxTitle)));
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto label = box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				content,
+				(unarchiveOnNewMessage
+						? tr::lng_archive_hint_about_unmuted
+						: tr::lng_archive_hint_about)(
+					lt_link,
+					tr::lng_archive_hint_about_link(
+						lt_emoji,
+						rpl::single(
+							Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+						Ui::Text::RichLangValue
+					) | rpl::map([](TextWithEntities text) {
+						return Ui::Text::Link(std::move(text), 1);
+					}),
+					Ui::Text::RichLangValue),
+				st::channelEarnHistoryRecipientLabel));
+		label->resizeToWidth(box->width()
+			- rect::m::sum::h(st::boxRowPadding));
+		label->setLink(
+			1,
+			std::make_shared<GenericClickHandler>([=](ClickContext context) {
+				if (context.button == Qt::LeftButton) {
+					onUnarchive();
+				}
+			}));
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto padding = QMargins(
+			st::settingsButton.padding.left(),
+			st::boxRowPadding.top(),
+			st::boxRowPadding.right(),
+			st::boxRowPadding.bottom());
+		const auto addEntry = [&](
+				rpl::producer<QString> title,
+				rpl::producer<QString> about,
+				const style::icon &icon) {
+			const auto top = content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(title),
+					st::channelEarnSemiboldLabel),
+				padding);
+			Ui::AddSkip(content, st::channelEarnHistoryThreeSkip);
+			content->add(
+				object_ptr<Ui::FlatLabel>(
+					content,
+					std::move(about),
+					st::channelEarnHistoryRecipientLabel),
+				padding);
+			const auto left = Ui::CreateChild<Ui::RpWidget>(
+				box->verticalLayout().get());
+			left->paintRequest(
+			) | rpl::start_with_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) {
+				left->moveToLeft(
+					(g.left() - left->width()) / 2,
+					g.top() + st::channelEarnHistoryThreeSkip);
+			}, left->lifetime());
+		};
+		addEntry(
+			tr::lng_archive_hint_section_1(),
+			tr::lng_archive_hint_section_1_info(),
+			st::menuIconArchive);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_archive_hint_section_2(),
+			tr::lng_archive_hint_section_2_info(),
+			st::menuIconStealth);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+		addEntry(
+			tr::lng_archive_hint_section_3(),
+			tr::lng_archive_hint_section_3_info(),
+			st::menuIconStoriesSavedSection);
+		Ui::AddSkip(content);
+		Ui::AddSkip(content);
+	}
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	{
+		const auto &st = st::premiumPreviewDoubledLimitsBox;
+		box->setStyle(st);
+		auto button = object_ptr<Ui::RoundButton>(
+			box,
+			tr::lng_archive_hint_button(),
+			st::defaultActiveButton);
+		button->setTextTransform(
+			Ui::RoundButton::TextTransform::NoTransform);
+		button->resizeToWidth(box->width()
+			- st.buttonPadding.left()
+			- st.buttonPadding.left());
+		button->setClickedCallback([=] { box->closeBox(); });
+		box->addButton(std::move(button));
+	}
+}
+
diff --git a/Telegram/SourceFiles/boxes/about_box.h b/Telegram/SourceFiles/boxes/about_box.h
index 61cb3fe83f..60953aafd0 100644
--- a/Telegram/SourceFiles/boxes/about_box.h
+++ b/Telegram/SourceFiles/boxes/about_box.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/layers/generic_box.h"
 
 void AboutBox(not_null<Ui::GenericBox*> box);
+void ArchiveHintBox(
+	not_null<Ui::GenericBox*> box,
+	bool unarchiveOnNewMessage,
+	Fn<void()> onUnarchive);
 
 QString telegramFaqLink();
 QString currentVersionText();
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index c9204a1c4e..a5db87a14c 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/call_delayed.h"
 #include "menu/menu_check_item.h"
+#include "boxes/about_box.h"
 #include "boxes/share_box.h"
 #include "boxes/star_gift_box.h"
 #include "chat_helpers/compose/compose_show.h"
@@ -18,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/slide_wrap.h"
 #include "ui/widgets/fields/input_field.h"
 #include "api/api_chat_participants.h"
+#include "api/api_global_privacy.h"
 #include "lang/lang_keys.h"
 #include "ui/boxes/confirm_box.h"
 #include "base/random.h"
@@ -1646,9 +1648,23 @@ void Filler::fillArchiveActions() {
 	_addAction({ .isSeparator = true });
 
 	Settings::PreloadArchiveSettings(&controller->session());
-	_addAction(tr::lng_context_archive_settings(tr::now), [=] {
+	const auto openSettings = [=] {
 		controller->show(Box(Settings::ArchiveSettingsBox, controller));
-	}, &st::menuIconManage);
+	};
+	_addAction(
+		tr::lng_context_archive_settings(tr::now),
+		openSettings,
+		&st::menuIconManage);
+	_addAction(tr::lng_context_archive_how_does_it_work(tr::now), [=] {
+		const auto unarchiveOnNewMessage = controller->session().api(
+			).globalPrivacy().unarchiveOnNewMessageCurrent();
+		controller->show(
+			Box(
+				ArchiveHintBox,
+				unarchiveOnNewMessage != Api::UnarchiveOnNewMessage::None,
+				openSettings),
+			Ui::LayerOption::CloseOther);
+	}, &st::menuIconFaq);
 }
 
 void Filler::fillSavedSublistActions() {

From 596828cf786fecee0f325be5653868ee44a3d01c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Aug 2025 12:14:27 +0400
Subject: [PATCH 195/341] Fix webview blocking popups.

---
 Telegram/lib_webview | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index f0fddc6f74..2a29edd9fc 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit f0fddc6f7486a16c9941347817704fa520c82471
+Subproject commit 2a29edd9fcc98efaecb968eb73667a00ea1c6cdd

From a09f57d908b9c38969cd034c87a3a95783ffefb6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Aug 2025 17:04:42 +0400
Subject: [PATCH 196/341] Fix natural width for LabelWithNumbers.

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 777188f65a..f7bca08f41 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 777188f65aeeca4213321da95ca64919eae74650
+Subproject commit f7bca08f417dd119df4beb7eec5a7bc55d357abf

From a39c0183590500f6cb4aafe3187200596242dd03 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Aug 2025 10:31:28 +0400
Subject: [PATCH 197/341] Scroll to top on global posts search.

---
 Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
index 2b18340e17..33954d2619 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_suggestions.cpp
@@ -1886,6 +1886,7 @@ void Suggestions::setupPostsSearch() {
 				nullptr,
 				{ .posts = true, .start = true },
 				state.totalCount);
+			_postsScroll->scrollToY(0);
 			updatePostsSearchVisibleRange();
 		}
 	}, _postsWrap->lifetime());

From 313ae0f86cbd18da258b22bd8ce734cc9230b740 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Aug 2025 17:23:54 +0400
Subject: [PATCH 198/341] Remove CenterWrap layout.

---
 Telegram/SourceFiles/api/api_chat_invite.cpp  | 18 ++--
 Telegram/SourceFiles/boxes/about_box.cpp      | 12 +--
 .../SourceFiles/boxes/edit_privacy_box.cpp    |  2 +-
 .../SourceFiles/boxes/gift_credits_box.cpp    |  5 +-
 .../SourceFiles/boxes/gift_premium_box.cpp    |  9 +-
 .../boxes/peers/add_participants_box.cpp      |  2 +-
 .../boxes/peers/edit_peer_color_box.cpp       |  2 +-
 .../boxes/peers/edit_peer_invite_link.cpp     | 16 ++--
 .../SourceFiles/boxes/premium_limits_box.cpp  |  8 +-
 .../SourceFiles/boxes/premium_preview_box.cpp |  2 +-
 .../SourceFiles/boxes/send_credits_box.cpp    | 13 +--
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 30 +++---
 Telegram/SourceFiles/boxes/username_box.cpp   |  4 +-
 .../calls/calls_box_controller.cpp            |  7 +-
 .../calls/group/calls_group_common.cpp        | 22 ++---
 .../group/calls_group_invite_controller.cpp   | 11 +--
 .../dialogs/dialogs_inner_widget.cpp          |  3 +-
 .../dialogs/ui/posts_search_intro.cpp         |  1 -
 .../controls/history_view_draft_options.cpp   |  2 +-
 .../controls/history_view_suggest_options.cpp |  1 -
 .../bot/starref/info_bot_starref_common.cpp   | 26 ++---
 .../boosts/create_giveaway_box.cpp            | 11 +--
 .../boosts/giveaway/select_countries_box.cpp  |  9 +-
 .../earn/info_channel_earn_list.cpp           | 94 +++++++++----------
 .../peer_gifts/info_peer_gifts_widget.cpp     | 57 ++++++-----
 .../info/peer_gifts/info_peer_gifts_widget.h  |  3 +-
 .../info/profile/info_profile_actions.cpp     |  3 +-
 .../info_statistics_inner_widget.cpp          | 39 ++++----
 .../stories/info_stories_inner_widget.cpp     | 33 +++----
 .../info/stories/info_stories_widget.cpp      | 20 ++--
 .../info/stories/info_stories_widget.h        |  3 +-
 .../info/userpic/info_userpic_bubble_wrap.cpp |  7 +-
 .../userpic/info_userpic_colors_editor.cpp    |  9 +-
 .../info_userpic_emoji_builder_preview.cpp    |  1 +
 .../info_userpic_emoji_builder_widget.cpp     | 35 ++++---
 .../inline_bots/bot_attach_web_view.cpp       |  3 -
 .../SourceFiles/intro/intro_code_input.cpp    |  1 +
 Telegram/SourceFiles/intro/intro_email.cpp    |  3 +-
 .../media/stories/media_stories_stealth.cpp   |  7 +-
 Telegram/SourceFiles/menu/menu_sponsored.cpp  | 31 +++---
 .../passport/passport_panel_password.cpp      | 22 ++---
 .../payments/ui/payments_form_summary.cpp     |  1 -
 .../payments/ui/payments_reaction_box.cpp     |  8 +-
 .../settings/business/settings_chat_intro.cpp |  2 +-
 .../settings_cloud_password_common.cpp        | 58 +++++-------
 .../settings_cloud_password_common.h          |  6 +-
 .../settings_cloud_password_email.cpp         |  5 +-
 .../settings_cloud_password_email_confirm.cpp | 12 +--
 .../settings_cloud_password_hint.cpp          |  5 +-
 .../settings_cloud_password_input.cpp         | 20 ++--
 .../settings_cloud_password_login_email.cpp   |  3 +-
 ...ngs_cloud_password_login_email_confirm.cpp |  8 +-
 .../settings_cloud_password_validate_icon.cpp |  1 +
 .../settings/settings_blocked_peers.cpp       | 12 +--
 .../SourceFiles/settings/settings_credits.cpp | 77 ++++++++-------
 .../settings/settings_credits_graphics.cpp    | 92 ++++++++----------
 .../settings/settings_local_passcode.cpp      | 59 ++++++------
 .../settings/settings_power_saving.cpp        |  2 +-
 .../settings/settings_websites.cpp            | 11 +--
 .../ui/boxes/show_or_premium_box.cpp          | 13 +--
 .../ui/controls/userpic_button.cpp            |  1 +
 .../SourceFiles/ui/widgets/peer_bubble.cpp    |  6 +-
 Telegram/lib_ui                               |  2 +-
 63 files changed, 456 insertions(+), 535 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_chat_invite.cpp b/Telegram/SourceFiles/api/api_chat_invite.cpp
index afc365c139..415c1a8296 100644
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -142,13 +142,12 @@ void ConfirmSubscriptionBox(
 	const auto content = box->verticalLayout();
 
 	Ui::AddSkip(content, st::confirmInvitePhotoTop);
-	const auto userpicWrap = content->add(
-		object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::RpWidget>(content)));
-	const auto userpic = userpicWrap->entity();
+	const auto userpic = content->add(
+		object_ptr<Ui::RpWidget>(content),
+		style::al_top);
 	const auto photoSize = st::confirmInvitePhotoSize;
 	userpic->resize(Size(photoSize));
+	userpic->setNaturalWidth(photoSize);
 	const auto creditsIconSize = photoSize / 3;
 	const auto creditsIconCallback =
 		Ui::PaintOutlinedColoredCreditsIconCallback(
@@ -188,8 +187,8 @@ void ConfirmSubscriptionBox(
 		}
 		auto p = QPainter(userpic);
 		p.drawImage(0, 0, state->frame);
-	}, userpicWrap->lifetime());
-	userpicWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}, userpic->lifetime());
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (photo) {
 		state->photoMedia = photo->createMediaView();
 		state->photoMedia->wanted(Data::PhotoSize::Small, Data::FileOrigin());
@@ -197,7 +196,7 @@ void ConfirmSubscriptionBox(
 			session->downloaderTaskFinished(
 			) | rpl::start_with_next([=] {
 				userpic->update();
-			}, userpicWrap->entity()->lifetime());
+			}, userpic->lifetime());
 		}
 	} else {
 		state->photoEmpty = std::make_unique<Ui::EmptyUserpic>(
@@ -219,7 +218,6 @@ void ConfirmSubscriptionBox(
 			box,
 			tr::lng_channel_invite_subscription_title(),
 			st::inviteLinkSubscribeBoxTitle),
-		st::boxRowPadding,
 		style::al_top);
 	box->addRow(
 		object_ptr<Ui::FlatLabel>(
@@ -234,7 +232,6 @@ void ConfirmSubscriptionBox(
 					Ui::Text::Bold),
 				Ui::Text::WithEntities),
 			st::inviteLinkSubscribeBoxAbout),
-		st::boxRowPadding,
 		style::al_top);
 	Ui::AddSkip(content);
 	box->addRow(
@@ -250,7 +247,6 @@ void ConfirmSubscriptionBox(
 				}),
 				Ui::Text::RichLangValue),
 			st::inviteLinkSubscribeBoxTerms),
-		st::boxRowPadding,
 		style::al_top);
 
 	{
diff --git a/Telegram/SourceFiles/boxes/about_box.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
index 4f8b666671..f270788877 100644
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -183,10 +183,8 @@ void ArchiveHintBox(
 		const auto rect = Rect(icon.size() * 2);
 		auto owned = object_ptr<Ui::RpWidget>(content);
 		owned->resize(rect.size());
-		const auto widget = box->addRow(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				std::move(owned)))->entity();
+		owned->setNaturalWidth(rect.width());
+		const auto widget = box->addRow(std::move(owned), style::al_top);
 		widget->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = Painter(widget);
@@ -199,12 +197,12 @@ void ArchiveHintBox(
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		content,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			content,
 			tr::lng_archive_hint_title(),
-			st::boxTitle)));
+			st::boxTitle),
+		style::al_top);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 	{
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index 2d6f1e2448..be19114412 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -1293,7 +1293,7 @@ void EditDirectMessagesPriceBox(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			box,
 			object_ptr<Ui::VerticalLayout>(box)),
-		{});
+		style::margins());
 	wrap->toggle(savedValue.has_value(), anim::type::instant);
 	wrap->toggleOn(toggle->toggledChanges());
 
diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index e3c915c770..2fc72502f2 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -52,9 +52,8 @@ void GiftCreditsBox(
 	Ui::AddSkip(content);
 	const auto &stUser = st::premiumGiftsUserpicButton;
 	const auto userpicWrap = content->add(
-		object_ptr<Ui::CenterWrap<>>(
-			content,
-			object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+		object_ptr<Ui::UserpicButton>(content, peer, stUser),
+		style::al_top);
 	userpicWrap->setAttribute(Qt::WA_TransparentForMouseEvents);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index daf79b39d3..c17481e628 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -990,12 +990,11 @@ void GiveawayInfoBox(
 			label->setTextColorOverride(st::windowActiveTextFg->c);
 		}
 		const auto result = box->addRow(
-			object_ptr<Ui::PaddingWrap<Ui::CenterWrap<Ui::FlatLabel>>>(
+			object_ptr<Ui::PaddingWrap<Ui::FlatLabel>>(
 				box.get(),
-				object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
-					box.get(),
-					std::move(label)),
-				QMargins(0, skip, 0, skip)));
+				std::move(label),
+				QMargins(0, skip, 0, skip)),
+			style::al_justify);
 		result->paintRequest() | rpl::start_with_next([=] {
 			auto p = QPainter(result);
 			p.setPen(Qt::NoPen);
diff --git a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
index ed99b06ed5..a5f2ec3c30 100644
--- a/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/add_participants_box.cpp
@@ -513,7 +513,7 @@ void InviteForbiddenController::setComplexCover() {
 			container->add(
 				MakeShowOrLabel(container, tr::lng_invite_upgrade_or()),
 				st::inviteForbiddenOrLabelPadding,
-				style::al_top);
+				style::al_justify);
 		}
 		container->add(
 			object_ptr<Ui::FlatLabel>(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
index 8542e862de..a13b197a6d 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp
@@ -1200,7 +1200,7 @@ void EditPeerColorBox(
 			peer,
 			state->index.value(),
 			state->emojiId.value()
-		), {});
+		), style::margins());
 
 		auto indices = peer->session().api().peerColors().suggestedValue();
 		const auto margin = st::settingsColorRadioMargin;
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index abd6113ad0..5c26012cd6 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -969,9 +969,9 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 
 		const auto photoSize = st::boostReplaceUserpic.photoSize;
 		const auto session = &row->peer()->session();
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			Settings::SubscriptionUserpic(content, channel, photoSize)));
+		content->add(
+			Settings::SubscriptionUserpic(content, channel, photoSize),
+			style::al_top);
 
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
@@ -981,7 +981,6 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				box,
 				tr::lng_credits_box_subscription_title(),
 				st::creditsBoxAboutTitle),
-			st::boxRowPadding,
 			style::al_top);
 
 		Ui::AddSkip(content);
@@ -990,7 +989,6 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 			object_ptr<Ui::FlatLabel>(
 				box,
 				st::creditsTopupPrice),
-			st::boxRowPadding,
 			style::al_top);
 		subtitle1->setMarkedText(
 			tr::lng_credits_subscription_subtitle(
@@ -1002,11 +1000,10 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				Ui::Text::WithEntities),
 			_emojiHelper.context());
 		const auto subtitle2 = box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					st::creditsTopupPrice)))->entity();
+				st::creditsTopupPrice),
+			style::al_top);
 		session->credits().rateValue(
 			channel
 		) | rpl::start_with_next([=, currency = u"USD"_q](float64 rate) {
@@ -1038,7 +1035,6 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 						tr::lng_credits_box_out_about_link(tr::now)),
 					Ui::Text::WithEntities),
 				st::creditsBoxAboutDivider),
-			st::boxRowPadding,
 			style::al_top);
 
 		const auto button = box->addButton(tr::lng_box_ok(), [=] {
diff --git a/Telegram/SourceFiles/boxes/premium_limits_box.cpp b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
index da4120f0f7..f88a525d9f 100644
--- a/Telegram/SourceFiles/boxes/premium_limits_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_limits_box.cpp
@@ -585,14 +585,14 @@ void ChannelsLimitBox(
 
 	const auto content = box->addRow(
 		object_ptr<PeerListContent>(box, controller),
-		{});
+		style::margins());
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
 	const auto count = 100;
 	const auto placeholder = box->addRow(
 		object_ptr<PeerListDummy>(box, count, st::defaultPeerList),
-		{});
+		style::margins());
 
 	using namespace rpl::mappers;
 	controller->countValue(
@@ -676,14 +676,14 @@ void PublicLinksLimitBox(
 
 	const auto content = box->addRow(
 		object_ptr<PeerListContent>(box, controller),
-		{});
+		style::margins());
 	delegate->setContent(content);
 	controller->setDelegate(delegate);
 
 	const auto count = defaultLimit;
 	const auto placeholder = box->addRow(
 		object_ptr<PeerListDummy>(box, count, st::defaultPeerList),
-		{});
+		style::margins());
 
 	using namespace rpl::mappers;
 	controller->countValue(
diff --git a/Telegram/SourceFiles/boxes/premium_preview_box.cpp b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
index e1fef3b9da..53fa77aee0 100644
--- a/Telegram/SourceFiles/boxes/premium_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/premium_preview_box.cpp
@@ -902,7 +902,7 @@ void PreviewBox(
 
 	const auto outer = box->addRow(
 		ChatBackPreview(box, size.height(), back),
-		{});
+		style::margins());
 
 	struct Hiding {
 		not_null<Ui::RpWidget*> widget;
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 9b8fe27847..816d0aecc7 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -348,9 +348,9 @@ void SendCreditsBox(
 		}, ministarsContainer->lifetime());
 	}
 
-	const auto thumb = box->addRow(object_ptr<Ui::CenterWrap<>>(
-		content,
-		SendCreditsThumbnail(content, session, form.get(), photoSize)));
+	const auto thumb = box->addRow(
+		SendCreditsThumbnail(content, session, form.get(), photoSize),
+		style::al_top);
 	thumb->setAttribute(Qt::WA_TransparentForMouseEvents);
 	if (form->invoice.subscriptionPeriod) {
 		const auto badge = SendCreditsBadge(content, form->invoice.amount);
@@ -371,16 +371,14 @@ void SendCreditsBox(
 				? rpl::single(form->title)
 				: tr::lng_credits_box_out_title(),
 			st::settingsPremiumUserTitle),
-		st::boxRowPadding,
 		style::al_top);
 	if (form->invoice.subscriptionPeriod && form->botId && form->photo) {
 		Ui::AddSkip(content);
 		Ui::AddSkip(content);
 		const auto bot = session->data().user(form->botId);
 		box->addRow(
-			object_ptr<Ui::CenterWrap<>>(
-				box,
-				Ui::CreatePeerBubble(box, bot)));
+			Ui::CreatePeerBubble(box, bot),
+			style::al_top);
 		Ui::AddSkip(content);
 	}
 	Ui::AddSkip(content);
@@ -389,7 +387,6 @@ void SendCreditsBox(
 			box,
 			SendCreditsConfirmText(session, form.get()),
 			st::creditsBoxAbout),
-		st::boxRowPadding,
 		style::al_top);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index ca2ce8bbcf..94559edf4f 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -3151,10 +3151,9 @@ void GiftBox(
 		&& uniqueDisallowed;
 
 	content->add(
-		object_ptr<CenterWrap<UserpicButton>>(
-			content,
-			object_ptr<UserpicButton>(content, peer, stUser))
-	)->entity()->setClickedCallback([=] { window->showPeerInfo(peer); });
+		object_ptr<UserpicButton>(content, peer, stUser),
+		style::al_top
+	)->setClickedCallback([=] { window->showPeerInfo(peer); });
 	AddSkip(content);
 	AddSkip(content);
 
@@ -4919,19 +4918,18 @@ void UpgradeBox(
 			object_ptr<PlainShadow>(container),
 			st::boxRowPadding + QMargins(0, skip, 0, skip));
 		const auto checkbox = container->add(
-			object_ptr<CenterWrap<Checkbox>>(
+			object_ptr<Checkbox>(
 				container,
-				object_ptr<Checkbox>(
-					container,
-					(args.canAddComment
-						? tr::lng_gift_upgrade_add_comment(tr::now)
-						: args.canAddSender
-						? tr::lng_gift_upgrade_add_sender(tr::now)
-						: args.canAddMyComment
-						? tr::lng_gift_upgrade_add_my_comment(tr::now)
-						: tr::lng_gift_upgrade_add_my(tr::now)),
-					args.addDetailsDefault)),
-			st::defaultCheckbox.margin)->entity();
+				(args.canAddComment
+					? tr::lng_gift_upgrade_add_comment(tr::now)
+					: args.canAddSender
+					? tr::lng_gift_upgrade_add_sender(tr::now)
+					: args.canAddMyComment
+					? tr::lng_gift_upgrade_add_my_comment(tr::now)
+					: tr::lng_gift_upgrade_add_my(tr::now)),
+				args.addDetailsDefault),
+			st::defaultCheckbox.margin,
+			style::al_top);
 		checkbox->checkedChanges() | rpl::start_with_next([=](bool checked) {
 			state->preserveDetails = checked;
 		}, checkbox->lifetime());
diff --git a/Telegram/SourceFiles/boxes/username_box.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
index 7df856d8db..24635f9074 100644
--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.cpp
@@ -324,7 +324,7 @@ void UsernamesBox(
 
 	const auto editor = box->addRow(
 		object_ptr<UsernameEditor>(box, peer),
-		{});
+		style::margins());
 	editor->setEnabled(!isBot);
 	box->setFocusCallback([=] { editor->setInnerFocus(); });
 
@@ -366,7 +366,7 @@ void UsernamesBox(
 			!isBot
 				? [=] { box->scrollToY(0); editor->setInnerFocus(); }
 				: Fn<void()>(nullptr)),
-		{});
+		style::margins());
 
 	const auto finish = [=] {
 		list->save(
diff --git a/Telegram/SourceFiles/calls/calls_box_controller.cpp b/Telegram/SourceFiles/calls/calls_box_controller.cpp
index a68484c217..794291dc28 100644
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -825,7 +825,7 @@ void ShowCallsBox(not_null<::Window::SessionController*> window) {
 			object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 				box,
 				object_ptr<Ui::VerticalLayout>(box)),
-			{});
+			style::margins());
 		groupCalls->hide(anim::type::instant);
 		groupCalls->toggleOn(state->groupCallsController.shownValue());
 
@@ -833,8 +833,7 @@ void ShowCallsBox(not_null<::Window::SessionController*> window) {
 			groupCalls->entity(),
 			tr::lng_call_box_groupcalls_subtitle());
 		state->groupCallsDelegate.setContent(groupCalls->entity()->add(
-			object_ptr<PeerListContent>(box, &state->groupCallsController),
-			{}));
+			object_ptr<PeerListContent>(box, &state->groupCallsController)));
 		state->groupCallsController.setDelegate(&state->groupCallsDelegate);
 		Ui::AddSkip(groupCalls->entity());
 		Ui::AddDivider(groupCalls->entity());
@@ -853,7 +852,7 @@ void ShowCallsBox(not_null<::Window::SessionController*> window) {
 
 		const auto content = box->addRow(
 			object_ptr<PeerListContent>(box, &state->callsController),
-			{});
+			style::margins());
 		state->callsDelegate.setContent(content);
 		state->callsController.setDelegate(&state->callsDelegate);
 
diff --git a/Telegram/SourceFiles/calls/group/calls_group_common.cpp b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
index 008ca1107d..eabcca6a35 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_common.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
@@ -116,13 +116,12 @@ void ConferenceCallJoinConfirm(
 		st::boxRowPadding + st::confcallLinkHeaderIconPadding);
 
 	box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			object_ptr<Ui::FlatLabel>(
-				box,
-				tr::lng_confcall_join_title(),
-				st::boxTitle)),
-		st::boxRowPadding + st::confcallLinkTitlePadding);
+			tr::lng_confcall_join_title(),
+			st::boxTitle),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top);
 	const auto wrapName = [&](not_null<PeerData*> peer) {
 		return rpl::single(Ui::Text::Bold(peer->shortName()));
 	};
@@ -323,13 +322,12 @@ void ShowConferenceCallLinkBox(
 			Info::BotStarRef::CreateLinkHeaderIcon(box, &call->session()),
 			st::boxRowPadding + st::confcallLinkHeaderIconPadding);
 		box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_confcall_link_title(),
-					st.box ? st.box->title : st::boxTitle)),
-			st::boxRowPadding + st::confcallLinkTitlePadding);
+				tr::lng_confcall_link_title(),
+				st.box ? st.box->title : st::boxTitle),
+			st::boxRowPadding + st::confcallLinkTitlePadding,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
index a79bfa65f3..46fa70f933 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_invite_controller.cpp
@@ -1042,13 +1042,12 @@ not_null<Ui::RpWidget*> CreateReActivateHeader(not_null<QWidget*> parent) {
 		st::boxRowPadding + st::confcallLinkHeaderIconPadding);
 
 	result->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			result,
-			object_ptr<Ui::FlatLabel>(
-				result,
-				tr::lng_confcall_inactive_title(),
-				st::boxTitle)),
-		st::boxRowPadding + st::confcallLinkTitlePadding);
+			tr::lng_confcall_inactive_title(),
+			st::boxTitle),
+		st::boxRowPadding + st::confcallLinkTitlePadding,
+		style::al_top);
 	result->add(
 		object_ptr<Ui::FlatLabel>(
 			result,
diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 7f7c7f8dcb..cfbb770582 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -4151,14 +4151,13 @@ void InnerWidget::refreshEmpty() {
 				.name = u"no_chats"_q,
 				.sizeOverride = Size(st::changePhoneIconSize),
 			});
-		_emptyList->add(std::move(icon.widget), {}, style::al_top);
+		_emptyList->add(std::move(icon.widget), style::al_top);
 		Ui::AddSkip(_emptyList);
 		_emptyList->add(
 			object_ptr<Ui::FlatLabel>(
 				_emptyList,
 				tr::lng_no_conversations(),
 				st::dialogEmptyButtonLabel),
-			{},
 			style::al_top);
 		if (_state == WidgetState::Default) {
 			icon.animate(anim::repeat::once);
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index 8c9c59714d..3ad1f3662e 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -186,7 +186,6 @@ void PostsSearchIntro::setup() {
 			_content.get(),
 			rpl::single(QString()),
 			st::postsSearchIntroButton),
-		{},
 		style::al_top);
 	_button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	_footer = _content->add(
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index 253073f8dc..a1f3d9ae3e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -1075,7 +1075,7 @@ void DraftOptionsBox(
 
 	state->wrap = box->addRow(
 		object_ptr<PreviewWrap>(box, args.history),
-		{});
+		style::margins());
 	state->wrap->draggingScrollDelta(
 	) | rpl::start_with_next([=](int delta) {
 		box->scrollByDraggingDelta(delta);
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index fc4118399b..48125dc169 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -394,7 +394,6 @@ void ChooseSuggestPriceBox(
 				box,
 				std::move(title),
 				st::settingsPremiumUserTitle),
-			st::boxRowPadding,
 			style::al_top);
 	}
 
diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
index 45a539104d..18a9de42aa 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -446,13 +446,12 @@ object_ptr<Ui::BoxContent> StarRefLinkBox(
 			CreateLinkIcon(box, &bot->session(), row.state.users),
 			st::boxRowPadding + st::starrefJoinUserpicsPadding);
 		box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_star_ref_link_title(),
-					st::boxTitle)),
-			st::boxRowPadding + st::starrefJoinTitlePadding);
+				tr::lng_star_ref_link_title(),
+				st::boxTitle),
+			st::boxRowPadding + st::starrefJoinTitlePadding,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
@@ -470,7 +469,6 @@ object_ptr<Ui::BoxContent> StarRefLinkBox(
 						FormatForProgramDuration(program.durationMonths),
 						Ui::Text::WithEntities),
 				st::starrefCenteredText),
-			st::boxRowPadding,
 			style::al_top);
 
 		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
@@ -480,7 +478,6 @@ object_ptr<Ui::BoxContent> StarRefLinkBox(
 				box,
 				tr::lng_star_ref_link_recipient(),
 				st::starrefCenteredText),
-			st::boxRowPadding,
 			style::al_top);
 		Ui::AddSkip(box->verticalLayout());
 		box->addRow(object_ptr<Ui::AbstractButton>::fromRaw(
@@ -579,13 +576,12 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 		}, box->lifetime());
 
 		box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_star_ref_title(),
-					st::boxTitle)),
-			st::boxRowPadding + st::starrefJoinTitlePadding);
+				tr::lng_star_ref_title(),
+				st::boxTitle),
+			st::boxRowPadding + st::starrefJoinTitlePadding,
+			style::al_top);
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
 				box,
@@ -599,7 +595,6 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 					FormatForProgramDuration(program.durationMonths),
 					Ui::Text::WithEntities),
 				st::starrefCenteredText),
-			st::boxRowPadding,
 			style::al_top);
 
 		Ui::AddSkip(box->verticalLayout(), st::defaultVerticalListSkip * 3);
@@ -641,7 +636,6 @@ object_ptr<Ui::BoxContent> JoinStarRefBox(
 					box,
 					tr::lng_star_ref_link_recipient(),
 					st::starrefCenteredText),
-				st::boxRowPadding,
 				style::al_top);
 			Ui::AddSkip(box->verticalLayout());
 			const auto recipientWrap = box->addRow(
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
index 0c219aa2f1..6be47fdd92 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/create_giveaway_box.cpp
@@ -215,7 +215,7 @@ void AddPremiumTopBarWithDefaultTitleBar(
 				+ st::defaultVerticalListSkip,
 			st::boxDividerBg,
 			RectPart::Bottom),
-		{});
+		style::margins());
 	bar->setPaused(true);
 	bar->setRoundEdges(false);
 	bar->setMaximumHeight(st::giveawayGiftCodeTopHeight);
@@ -348,12 +348,11 @@ void CreateGiveawayBox(
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		container->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				box,
-				object_ptr<Ui::FlatLabel>(
-					box,
-					tr::lng_contacts_loading(),
-					st::giveawayLoadingLabel)));
+				tr::lng_contacts_loading(),
+				st::giveawayLoadingLabel),
+			style::al_top);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 	}
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
index 1faa9289d7..d9cb86645c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/select_countries_box.cpp
@@ -177,12 +177,11 @@ void SelectCountriesBox(
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 		container->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				container,
-				object_ptr<Ui::FlatLabel>(
-					container,
-					tr::lng_search_messages_none(),
-					st::membersAbout)));
+				tr::lng_search_messages_none(),
+				st::membersAbout),
+			style::al_top);
 		Ui::AddSkip(container);
 		Ui::AddSkip(container);
 	}
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 20445954ce..b53804c5e8 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -140,14 +140,12 @@ void AddHeader(
 }
 
 void AddRecipient(not_null<Ui::GenericBox*> box, const TextWithEntities &t) {
-	const auto wrap = box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+	const auto container = box->addRow(
+		object_ptr<Ui::RoundButton>(
 			box,
-			object_ptr<Ui::RoundButton>(
-				box,
-				rpl::single(QString()),
-				st::channelEarnHistoryRecipientButton)));
-	const auto container = wrap->entity();
+			rpl::single(QString()),
+			st::channelEarnHistoryRecipientButton),
+		style::al_top);
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		container,
 		rpl::single(t),
@@ -449,10 +447,10 @@ void InnerWidget::fill() {
 					const auto rect = Rect(icon.size() * 1.4);
 					auto owned = object_ptr<Ui::RpWidget>(content);
 					owned->resize(rect.size());
+					owned->setNaturalWidth(rect.width());
 					const auto widget = box->addRow(
-						object_ptr<Ui::CenterWrap<>>(
-							content,
-							std::move(owned)))->entity();
+						std::move(owned),
+						style::al_top);
 					widget->paintRequest(
 					) | rpl::start_with_next([=] {
 						auto p = Painter(widget);
@@ -465,14 +463,13 @@ void InnerWidget::fill() {
 				}
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
-				box->addRow(object_ptr<Ui::CenterWrap<>>(
+				box->addRow(object_ptr<Ui::FlatLabel>(
 					content,
-					object_ptr<Ui::FlatLabel>(
-						content,
-						bot
-							? tr::lng_channel_earn_bot_learn_title()
-							: tr::lng_channel_earn_learn_title(),
-						st::boxTitle)));
+					bot
+						? tr::lng_channel_earn_bot_learn_title()
+						: tr::lng_channel_earn_learn_title(),
+					st::boxTitle),
+					style::al_top);
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
 				Ui::AddSkip(content);
@@ -540,17 +537,17 @@ void InnerWidget::fill() {
 				Ui::AddSkip(content);
 				{
 					const auto l = box->addRow(
-						object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+						object_ptr<Ui::FlatLabel>(
 							content,
-							object_ptr<Ui::FlatLabel>(
-								content,
-								tr::lng_channel_earn_learn_coin_title(
-									lt_emoji,
-									rpl::single(
-										Ui::Text::Link(bigCurrencyIcon, 1)),
-									Ui::Text::RichLangValue
-								),
-								st::boxTitle)))->entity();
+							tr::lng_channel_earn_learn_coin_title(
+								lt_emoji,
+								rpl::single(
+									Ui::Text::Link(bigCurrencyIcon, 1)),
+								Ui::Text::RichLangValue),
+							st::boxTitle,
+							st::defaultPopupMenu,
+							emojiHelper.context()),
+						style::al_top);
 					const auto diamonds = l->lifetime().make_state<int>(0);
 					l->setLink(1, std::make_shared<LambdaClickHandler>([=] {
 						const auto count = (*diamonds);
@@ -837,9 +834,8 @@ void InnerWidget::fill() {
 		Ui::AddSkip(container);
 
 		const auto labels = container->add(
-			object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-				container,
-				object_ptr<Ui::RpWidget>(container)))->entity();
+			object_ptr<Ui::RpWidget>(container),
+			style::al_top);
 
 		const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 			labels,
@@ -864,6 +860,8 @@ void InnerWidget::fill() {
 			labels->resize(
 				majorSize.width() + minorSize.width(),
 				majorSize.height());
+			labels->setNaturalWidth(
+				majorSize.width() + minorSize.width());
 			majorLabel->moveToLeft(0, 0);
 			minorLabel->moveToRight(
 				0,
@@ -873,12 +871,11 @@ void InnerWidget::fill() {
 
 		Ui::AddSkip(container);
 		container->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				container,
-				object_ptr<Ui::FlatLabel>(
-					container,
-					ToUsd(value, multiplier, 0),
-					st::channelEarnOverviewSubMinorLabel)));
+				ToUsd(value, multiplier, 0),
+				st::channelEarnOverviewSubMinorLabel),
+			style::al_top);
 
 		Ui::AddSkip(container);
 
@@ -888,7 +885,8 @@ void InnerWidget::fill() {
 				container,
 				rpl::never<QString>(),
 				stButton),
-			st::boxRowPadding);
+			st::boxRowPadding,
+			style::al_justify);
 
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(
 			button,
@@ -1156,9 +1154,8 @@ void InnerWidget::fill() {
 					Ui::AddSkip(box->verticalLayout());
 					Ui::AddSkip(box->verticalLayout());
 					const auto labels = box->addRow(
-						object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-							box,
-							object_ptr<Ui::RpWidget>(box)))->entity();
+						object_ptr<Ui::RpWidget>(box),
+						style::al_top);
 
 					const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 						labels,
@@ -1187,6 +1184,8 @@ void InnerWidget::fill() {
 						labels->resize(
 							majorSize.width() + minorSize.width(),
 							majorSize.height());
+						labels->setNaturalWidth(
+							majorSize.width() + minorSize.width());
 						majorLabel->moveToLeft(0, 0);
 						minorLabel->moveToRight(
 							0,
@@ -1194,12 +1193,12 @@ void InnerWidget::fill() {
 					}, box->lifetime());
 
 					Ui::AddSkip(box->verticalLayout());
-					box->addRow(object_ptr<Ui::CenterWrap<>>(
-						box,
+					box->addRow(
 						object_ptr<Ui::FlatLabel>(
 							box,
 							dateText,
-							st::channelEarnHistorySubLabel)));
+							st::channelEarnHistorySubLabel),
+						style::al_top);
 					Ui::AddSkip(box->verticalLayout());
 					Ui::AddSkip(box->verticalLayout());
 					AddChannelEarnTable(
@@ -1208,14 +1207,14 @@ void InnerWidget::fill() {
 						entry);
 					Ui::AddSkip(box->verticalLayout());
 					Ui::AddSkip(box->verticalLayout());
-					box->addRow(object_ptr<Ui::CenterWrap<>>(
-						box,
+					box->addRow(
 						object_ptr<Ui::FlatLabel>(
 							box,
 							isIn
 								? tr::lng_channel_earn_history_in_about()
 								: tr::lng_channel_earn_history_out(),
-							st::channelEarnHistoryDescriptionLabel)));
+							st::channelEarnHistoryDescriptionLabel),
+						style::al_top);
 					Ui::AddSkip(box->verticalLayout());
 					if (isIn) {
 						Ui::AddSkip(box->verticalLayout());
@@ -1226,9 +1225,8 @@ void InnerWidget::fill() {
 					}
 					if (isIn) {
 						box->addRow(
-							object_ptr<Ui::CenterWrap<>>(
-								box,
-								Ui::CreatePeerBubble(box, peer)));
+							Ui::CreatePeerBubble(box, peer),
+							style::al_top);
 					}
 					const auto closeBox = [=] { box->closeBox(); };
 					{
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index f89ed3b313..7b4c85d6c5 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -979,30 +979,27 @@ void InnerWidget::refreshAbout() {
 	} else if (collectionCanAdd) {
 		auto about = std::make_unique<Ui::VerticalLayout>(this);
 		about->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				about.get(),
-				object_ptr<Ui::FlatLabel>(
-					about.get(),
-					tr::lng_gift_collection_empty_title(),
-					st::collectionEmptyTitle)),
-			st::collectionEmptyTitleMargin);
+				tr::lng_gift_collection_empty_title(),
+				st::collectionEmptyTitle),
+			st::collectionEmptyTitleMargin,
+			style::al_top);
 		about->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				about.get(),
-				object_ptr<Ui::FlatLabel>(
-					about.get(),
-					tr::lng_gift_collection_empty_text(),
-					st::collectionEmptyText)),
-			st::collectionEmptyTextMargin);
+				tr::lng_gift_collection_empty_text(),
+				st::collectionEmptyText),
+			st::collectionEmptyTextMargin,
+			style::al_top);
 
 		const auto button = about->add(
-			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			object_ptr<Ui::RoundButton>(
 				about.get(),
-				object_ptr<Ui::RoundButton>(
-					about.get(),
-					rpl::single(QString()),
-					st::collectionEmptyButton)),
-			st::collectionEmptyAddMargin)->entity();
+				rpl::single(QString()),
+				st::collectionEmptyButton),
+			st::collectionEmptyAddMargin,
+			style::al_top);
 		button->setText(tr::lng_gift_collection_add_button(
 		) | rpl::map([](const QString &text) {
 			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
@@ -1081,7 +1078,7 @@ void InnerWidget::editCollectionGifts(int id) {
 				state->descriptor.value(),
 				id,
 				(_all.filter == Filter()) ? _all : Entries()),
-			{});
+			style::margins());
 		state->changes = content->changes();
 
 		content->descriptorChanges(
@@ -1505,6 +1502,7 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 			controller->parentController(),
 			controller->giftsPeer(),
 			_descriptor.value()));
+	_emptyCollectionShown = _inner->collectionEmptyValue();
 	_inner->notifyEnabled(
 	) | rpl::take(1) | rpl::start_with_next([=](bool enabled) {
 		_notifyEnabled = enabled;
@@ -1518,7 +1516,10 @@ Widget::Widget(QWidget *parent, not_null<Controller*> controller)
 		scrollTo({ 0, 0 });
 	}, _inner->lifetime());
 
-	_descriptor.value() | rpl::start_with_next([=] {
+	rpl::combine(
+		_descriptor.value(),
+		_emptyCollectionShown.value()
+	) | rpl::start_with_next([=] {
 		refreshBottom();
 	}, _inner->lifetime());
 }
@@ -1527,22 +1528,22 @@ void Widget::refreshBottom() {
 	const auto notify = _notifyEnabled.has_value();
 	const auto descriptor = _descriptor.current();
 	const auto shownId = descriptor.collectionId;
-	const auto withButton = shownId && peer()->canManageGifts();
+	const auto withButton = shownId
+		&& peer()->canManageGifts()
+		&& !_emptyCollectionShown.current();
 	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
 	delete _pinnedToBottom.data();
 	if (!notify && !withButton) {
 		setScrollBottomSkip(0);
 		_hasPinnedToBottom = false;
 	} else if (withButton) {
-		setupBottomButton(wasBottom, _inner->collectionEmptyValue());
+		setupBottomButton(wasBottom);
 	} else {
 		setupNotifyCheckbox(wasBottom, *_notifyEnabled);
 	}
 }
 
-void Widget::setupBottomButton(
-		int wasBottomHeight,
-		rpl::producer<bool> hidden) {
+void Widget::setupBottomButton(int wasBottomHeight) {
 	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
 		this,
 		object_ptr<Ui::RpWidget>(this));
@@ -1561,10 +1562,8 @@ void Widget::setupBottomButton(
 	) | rpl::map([](const QString &text) {
 		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
 	}));
-	std::move(hidden) | rpl::start_with_next([=](bool hidden) {
-		button->setVisible(!hidden);
-		_hasPinnedToBottom = !hidden;
-	}, button->lifetime());
+	button->show();
+	_hasPinnedToBottom = true;
 
 	button->setClickedCallback([=] {
 		if (const auto id = _descriptor.current().collectionId) {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index bf33486e97..5aa3e90fd3 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -105,12 +105,13 @@ private:
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
 
 	void setupNotifyCheckbox(int wasBottomHeight, bool enabled);
-	void setupBottomButton(int wasBottomHeight, rpl::producer<bool> hidden);
+	void setupBottomButton(int wasBottomHeight);
 	void refreshBottom();
 
 	InnerWidget *_inner = nullptr;
 	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
 	rpl::variable<bool> _hasPinnedToBottom;
+	rpl::variable<bool> _emptyCollectionShown;
 	rpl::variable<Descriptor> _descriptor;
 	std::optional<bool> _notifyEnabled;
 	bool _shown = false;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
index 69942551f0..c035c092ae 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp
@@ -1985,7 +1985,8 @@ void DetailsFiller::setupMainApp() {
 			_wrap,
 			tr::lng_profile_open_app(),
 			st::infoOpenApp),
-		st::infoOpenAppMargin);
+		st::infoOpenAppMargin,
+		style::al_justify);
 	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 
 	const auto user = _peer->asUser();
diff --git a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
index f02f2f07c6..2c44348561 100644
--- a/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/statistics/info_statistics_inner_widget.cpp
@@ -590,30 +590,29 @@ void FillLoading(
 	content->add(std::move(icon.widget));
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				(type == LoadingType::Boosts)
-					? tr::lng_stats_boosts_loading()
-					: (type == LoadingType::Earn)
-					? tr::lng_stats_earn_loading()
-					: tr::lng_stats_loading(),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding + st::boxRowPadding);
+			(type == LoadingType::Boosts)
+				? tr::lng_stats_boosts_loading()
+				: (type == LoadingType::Earn)
+				? tr::lng_stats_earn_loading()
+				: tr::lng_stats_loading(),
+			st::changePhoneTitle),
+		st::changePhoneTitlePadding + st::boxRowPadding,
+		style::al_top);
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				(type == LoadingType::Boosts)
-					? tr::lng_stats_boosts_loading_subtext()
-					: (type == LoadingType::Earn)
-					? tr::lng_stats_earn_loading_subtext()
-					: tr::lng_stats_loading_subtext(),
-				st::statisticsLoadingSubtext)),
-		st::changePhoneDescriptionPadding + st::boxRowPadding);
+			(type == LoadingType::Boosts)
+				? tr::lng_stats_boosts_loading_subtext()
+				: (type == LoadingType::Earn)
+				? tr::lng_stats_earn_loading_subtext()
+				: tr::lng_stats_loading_subtext(),
+			st::statisticsLoadingSubtext),
+		st::changePhoneDescriptionPadding + st::boxRowPadding,
+		style::al_top
+	)->setTryMakeSimilarLines(true);
 
 	Ui::AddSkip(content, st::settingsBlockedListIconPadding.top());
 }
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 762f408e3f..75040c96cc 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -586,30 +586,27 @@ void InnerWidget::refreshEmpty() {
 	if (albumCanAdd) {
 		auto empty = object_ptr<Ui::VerticalLayout>(this);
 		empty->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				empty.get(),
-				object_ptr<Ui::FlatLabel>(
-					empty.get(),
-					tr::lng_stories_album_empty_title(),
-					st::collectionEmptyTitle)),
-			st::collectionEmptyTitleMargin);
+				tr::lng_stories_album_empty_title(),
+				st::collectionEmptyTitle),
+			st::collectionEmptyTitleMargin,
+			style::al_top);
 		empty->add(
-			object_ptr<Ui::CenterWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				empty.get(),
-				object_ptr<Ui::FlatLabel>(
-					empty.get(),
-					tr::lng_stories_album_empty_text(),
-					st::collectionEmptyText)),
-			st::collectionEmptyTextMargin);
+				tr::lng_stories_album_empty_text(),
+				st::collectionEmptyText),
+			st::collectionEmptyTextMargin,
+			style::al_top);
 
 		const auto button = empty->add(
-			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			object_ptr<Ui::RoundButton>(
 				empty.get(),
-				object_ptr<Ui::RoundButton>(
-					empty.get(),
-					rpl::single(QString()),
-					st::collectionEmptyButton)),
-			st::collectionEmptyAddMargin)->entity();
+				rpl::single(QString()),
+				st::collectionEmptyButton),
+			st::collectionEmptyAddMargin,
+			style::al_top);
 		button->setText(tr::lng_stories_album_add_button(
 		) | rpl::map([](const QString &text) {
 			return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
index ad33ef4975..203d83cac1 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.cpp
@@ -65,6 +65,7 @@ Widget::Widget(
 		controller,
 		_albumId.value(),
 		controller->key().storiesAddToAlbumId()));
+	_emptyAlbumShown = _inner->albumEmptyValue();
 	_inner->albumIdChanges() | rpl::start_with_next([=](int id) {
 		controller->showSection(
 			Make(controller->storiesPeer(), id),
@@ -76,7 +77,10 @@ Widget::Widget(
 		scrollTo(request);
 	}, _inner->lifetime());
 
-	_albumId.value() | rpl::start_with_next([=] {
+	rpl::combine(
+		_albumId.value(),
+		_emptyAlbumShown.value()
+	) | rpl::start_with_next([=] {
 		refreshBottom();
 	}, _inner->lifetime());
 }
@@ -133,20 +137,19 @@ void Widget::refreshBottom() {
 	const auto albumId = _albumId.current();
 	const auto withButton = (albumId != Data::kStoriesAlbumIdSaved)
 		&& (albumId != Data::kStoriesAlbumIdArchive)
-		&& controller()->storiesPeer()->canEditStories();
+		&& controller()->storiesPeer()->canEditStories()
+		&& !_emptyAlbumShown.current();
 	const auto wasBottom = _pinnedToBottom ? _pinnedToBottom->height() : 0;
 	delete _pinnedToBottom.data();
 	if (!withButton) {
 		setScrollBottomSkip(0);
 		_hasPinnedToBottom = false;
 	} else {
-		setupBottomButton(wasBottom, _inner->albumEmptyValue());
+		setupBottomButton(wasBottom);
 	}
 }
 
-void Widget::setupBottomButton(
-		int wasBottomHeight,
-		rpl::producer<bool> hidden) {
+void Widget::setupBottomButton(int wasBottomHeight) {
 	_pinnedToBottom = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
 		this,
 		object_ptr<Ui::RpWidget>(this));
@@ -166,10 +169,7 @@ void Widget::setupBottomButton(
 		return Ui::Text::IconEmoji(&st::collectionAddIcon).append(text);
 	}));
 	button->show();
-	std::move(hidden) | rpl::start_with_next([=](bool hidden) {
-		button->setVisible(!hidden);
-		_hasPinnedToBottom = !hidden;
-	}, button->lifetime());
+	_hasPinnedToBottom = true;
 
 	button->setClickedCallback([=] {
 		if (const auto id = _albumId.current()) {
diff --git a/Telegram/SourceFiles/info/stories/info_stories_widget.h b/Telegram/SourceFiles/info/stories/info_stories_widget.h
index 9fcbcd7978..e8cb608600 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_widget.h
+++ b/Telegram/SourceFiles/info/stories/info_stories_widget.h
@@ -72,7 +72,7 @@ private:
 	void saveState(not_null<Memento*> memento);
 	void restoreState(not_null<Memento*> memento);
 
-	void setupBottomButton(int wasBottomHeight, rpl::producer<bool> hidden);
+	void setupBottomButton(int wasBottomHeight);
 	void refreshBottom();
 
 	std::shared_ptr<ContentMemento> doCreateMemento() override;
@@ -81,6 +81,7 @@ private:
 	InnerWidget *_inner = nullptr;
 	QPointer<Ui::SlideWrap<Ui::RpWidget>> _pinnedToBottom;
 	rpl::variable<bool> _hasPinnedToBottom;
+	rpl::variable<bool> _emptyAlbumShown;
 	bool _shown = false;
 
 };
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
index ffb0204fce..afeb8584df 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_bubble_wrap.cpp
@@ -52,10 +52,11 @@ QRect BubbleWrapInnerRect(const QRect &r) {
 not_null<Ui::RpWidget*> AddBubbleWrap(
 		not_null<Ui::VerticalLayout*> container,
 		const QSize &size) {
-	const auto bubble = container->add(object_ptr<Ui::CenterWrap<RpWidget>>(
-		container,
-		object_ptr<Ui::RpWidget>(container)))->entity();
+	const auto bubble = container->add(
+		object_ptr<Ui::RpWidget>(container),
+		style::al_top);
 	bubble->resize(size);
+	bubble->setNaturalWidth(size.width());
 
 	auto cached = QImage(
 		size * style::DevicePixelRatio(),
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
index fbfa8fb7f3..d1076d99fe 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
@@ -245,12 +245,11 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 		std::vector<QColor> colors;
 	};
 	const auto preview = container->add(
-		object_ptr<Ui::CenterWrap<EmojiUserpic>>(
+		object_ptr<EmojiUserpic>(
 			container,
-			object_ptr<EmojiUserpic>(
-				container,
-				Size(st::defaultUserpicButton.photoSize),
-				false)))->entity();
+			Size(st::defaultUserpicButton.photoSize),
+			false),
+		style::al_top);
 	preview->setDuration(0);
 	if (document) {
 		preview->setDocument(document);
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
index 5728091459..8ee29755da 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_preview.cpp
@@ -166,6 +166,7 @@ EmojiUserpic::EmojiUserpic(
 , _painter(size.width())
 , _duration(st::slideWrapDuration) {
 	resize(size);
+	setNaturalWidth(size.width());
 }
 
 void EmojiUserpic::setDocument(not_null<DocumentData*> document) {
diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
index 5f77c5512c..2bed5f5620 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_emoji_builder_widget.cpp
@@ -178,7 +178,7 @@ void ShowGradientEditor(
 				},
 			});
 		box->setWidth(content->width());
-		box->addRow(std::move(content), {});
+		box->addRow(std::move(content), style::margins());
 	}));
 }
 
@@ -408,13 +408,12 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 	const auto state = container->lifetime().make_state<State>();
 
 	const auto preview = container->add(
-		object_ptr<Ui::CenterWrap<EmojiUserpic>>(
+		object_ptr<EmojiUserpic>(
 			container,
-			object_ptr<EmojiUserpic>(
-				container,
-				Size(st::settingsInfoPhotoSize),
-				data.isForum)),
-		st::userpicBuilderEmojiPreviewPadding)->entity();
+			Size(st::settingsInfoPhotoSize),
+			data.isForum),
+		st::userpicBuilderEmojiPreviewPadding,
+		style::al_top);
 	if (const auto id = data.documentId) {
 		const auto document = controller->session().data().document(id);
 		if (document && document->sticker()) {
@@ -423,13 +422,12 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 	}
 
 	container->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				tr::lng_userpic_builder_color_subtitle(),
-				st::userpicBuilderEmojiSubtitle)),
-		st::userpicBuilderEmojiSubtitlePadding);
+			tr::lng_userpic_builder_color_subtitle(),
+			st::userpicBuilderEmojiSubtitle),
+		st::userpicBuilderEmojiSubtitlePadding,
+		style::al_top);
 
 	const auto paletteBg = Ui::AddBubbleWrap(
 		container,
@@ -515,13 +513,12 @@ not_null<Ui::VerticalLayout*> CreateUserpicBuilder(
 	}, palette->lifetime());
 
 	container->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				tr::lng_userpic_builder_emoji_subtitle(),
-				st::userpicBuilderEmojiSubtitle)),
-		st::userpicBuilderEmojiSubtitlePadding);
+			tr::lng_userpic_builder_emoji_subtitle(),
+			st::userpicBuilderEmojiSubtitle),
+		st::userpicBuilderEmojiSubtitlePadding,
+		style::al_top);
 
 	const auto selectorBg = Ui::AddBubbleWrap(
 		container,
diff --git a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
index 4f21817adc..18744b0982 100644
--- a/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
+++ b/Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
@@ -519,7 +519,6 @@ void ConfirmEmojiStatusAccessBox(
 				rpl::single(name),
 				Ui::Text::RichLangValue),
 			st::botEmojiStatusText),
-		st::boxRowPadding,
 		style::al_top);
 
 	box->addButton(tr::lng_bot_emoji_status_access_allow(), [=] {
@@ -563,7 +562,6 @@ void ConfirmEmojiStatusBox(
 			box,
 			tr::lng_bot_emoji_status_title(),
 			st::botEmojiStatusTitle),
-		st::boxRowPadding,
 		style::al_top);
 	AddSkip(box->verticalLayout());
 
@@ -575,7 +573,6 @@ void ConfirmEmojiStatusBox(
 				rpl::single(Ui::Text::Bold(bot->name())),
 				Ui::Text::RichLangValue),
 			st::botEmojiStatusText),
-		st::boxRowPadding,
 		style::al_top);
 
 	AddSkip(box->verticalLayout(), 2 * st::defaultVerticalListSkip);
diff --git a/Telegram/SourceFiles/intro/intro_code_input.cpp b/Telegram/SourceFiles/intro/intro_code_input.cpp
index a3964d3cf7..476d7ecf91 100644
--- a/Telegram/SourceFiles/intro/intro_code_input.cpp
+++ b/Telegram/SourceFiles/intro/intro_code_input.cpp
@@ -177,6 +177,7 @@ void CodeInput::setDigitsCountMax(int digitsCount) {
 			+ st::introCodeDigitSkip * (digitsCount - 1)
 			+ padding.right(),
 		st::introCodeDigitHeight);
+	setNaturalWidth(width());
 
 	for (auto i = 0; i < digitsCount; i++) {
 		const auto widget = Ui::CreateChild<CodeDigit>(this);
diff --git a/Telegram/SourceFiles/intro/intro_email.cpp b/Telegram/SourceFiles/intro/intro_email.cpp
index dacc28cc3f..b80077bb17 100644
--- a/Telegram/SourceFiles/intro/intro_email.cpp
+++ b/Telegram/SourceFiles/intro/intro_email.cpp
@@ -69,11 +69,10 @@ EmailWidget::EmailWidget(
 		}, lifetime());
 	}
 
-	const auto wrap = Settings::CloudPassword::AddWrappedField(
+	const auto newInput = Settings::CloudPassword::AddWrappedField(
 		content,
 		tr::lng_settings_cloud_login_email_placeholder(),
 		QString());
-	const auto newInput = wrap->entity();
 	Ui::AddSkip(content);
 	const auto error = Settings::CloudPassword::AddError(content, nullptr);
 	newInput->changes() | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
index 6bde919a7d..0f6dc3569c 100644
--- a/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
+++ b/Telegram/SourceFiles/media/stories/media_stories_stealth.cpp
@@ -327,11 +327,8 @@ struct Feature {
 		box->setWidth(st::boxWideWidth);
 		box->setStyle(st::storiesStealthBox);
 		box->addRow(MakeLogo(box));
-		box->addRow(MakeTitle(box), st::boxRowPadding, style::al_top);
-		box->addRow(
-			MakeAbout(box, data->state.value()),
-			st::boxRowPadding,
-			style::al_top);
+		box->addRow(MakeTitle(box), style::al_top);
+		box->addRow(MakeAbout(box, data->state.value()), style::al_top);
 		box->addRow(MakeFeature(box, FeaturePast()));
 		box->addRow(
 			MakeFeature(box, FeatureNext()),
diff --git a/Telegram/SourceFiles/menu/menu_sponsored.cpp b/Telegram/SourceFiles/menu/menu_sponsored.cpp
index 656d5053a5..f3637a5149 100644
--- a/Telegram/SourceFiles/menu/menu_sponsored.cpp
+++ b/Telegram/SourceFiles/menu/menu_sponsored.cpp
@@ -56,6 +56,7 @@ void AboutBox(
 	constexpr auto kUrl = "https://promote.telegram.org"_cs;
 
 	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
 
 	const auto isChannel = (phrases == SponsoredPhrases::Channel);
 	const auto isSearch = (phrases == SponsoredPhrases::Search);
@@ -73,9 +74,8 @@ void AboutBox(
 		const auto rect = Rect(icon.size() * 1.4);
 		auto owned = object_ptr<Ui::RpWidget>(content);
 		owned->resize(rect.size());
-		const auto widget = box->addRow(object_ptr<Ui::CenterWrap<>>(
-			content,
-			std::move(owned)))->entity();
+		owned->setNaturalWidth(rect.width());
+		const auto widget = box->addRow(std::move(owned), style::al_top);
 		widget->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = Painter(widget);
@@ -88,17 +88,19 @@ void AboutBox(
 	}
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::CenterWrap<>>(
-		content,
+	box->addRow(
 		object_ptr<Ui::FlatLabel>(
 			content,
 			tr::lng_sponsored_menu_revenued_about(),
-			st::boxTitle)));
+			st::boxTitle),
+		style::al_top);
 	Ui::AddSkip(content);
-	box->addRow(object_ptr<Ui::FlatLabel>(
-		content,
-		tr::lng_sponsored_revenued_subtitle(),
-		st::channelEarnLearnDescription));
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_sponsored_revenued_subtitle(),
+			st::channelEarnLearnDescription),
+		style::al_top);
 	Ui::AddSkip(content);
 	Ui::AddSkip(content);
 	{
@@ -208,12 +210,11 @@ void AboutBox(
 	Ui::AddSkip(content);
 	{
 		box->addRow(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_sponsored_revenued_footer_title(),
-					st::boxTitle)));
+				tr::lng_sponsored_revenued_footer_title(),
+				st::boxTitle),
+			style::al_top);
 	}
 	Ui::AddSkip(content);
 	{
diff --git a/Telegram/SourceFiles/passport/passport_panel_password.cpp b/Telegram/SourceFiles/passport/passport_panel_password.cpp
index 322179fa63..15163dcbde 100644
--- a/Telegram/SourceFiles/passport/passport_panel_password.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_password.cpp
@@ -190,14 +190,13 @@ void PanelNoPassword::setupContent() {
 		style::al_top);
 
 	const auto iconWrap = _inner->add(
-		object_ptr<Ui::CenterWrap<Ui::FixedHeightWidget>>(
+		object_ptr<Ui::FixedHeightWidget>(
 			_inner,
-			object_ptr<Ui::FixedHeightWidget>(
-				_inner,
-				st::passportPasswordIconHeight)));
-	iconWrap->entity()->resizeToWidth(st::passportPasswordIcon.width());
+			st::passportPasswordIconHeight),
+		style::al_top);
+	iconWrap->setNaturalWidth(st::passportPasswordIcon.width());
 	Ui::CreateChild<Info::Profile::FloatingIcon>(
-		iconWrap->entity(),
+		iconWrap,
 		st::passportPasswordIcon,
 		QPoint(0, 0));
 
@@ -225,13 +224,12 @@ void PanelNoPassword::refreshBottom() {
 		style::al_top));
 	if (pattern.isEmpty()) {
 		const auto button = _inner->add(
-			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			object_ptr<Ui::RoundButton>(
 				_inner,
-				object_ptr<Ui::RoundButton>(
-					_inner,
-					tr::lng_passport_password_create(),
-					st::defaultBoxButton)));
-		button->entity()->addClickHandler([=] {
+				tr::lng_passport_password_create(),
+				st::defaultBoxButton),
+			style::al_top);
+		button->addClickHandler([=] {
 			_controller->setupPassword();
 		});
 	} else {
diff --git a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
index fd93541786..cd7d8a8e23 100644
--- a/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_form_summary.cpp
@@ -124,7 +124,6 @@ bool FormSummary::showCriticalError(const TextWithEntities &text) {
 			_layout.get(),
 			rpl::single(text),
 			st::paymentsCriticalError),
-		{},
 		style::al_top);
 	return true;
 }
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index eb1366685a..639cd1c70b 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -518,13 +518,13 @@ void PaidReactionsBox(
 			state->shownPeer = state->savedShownPeer = barePeerId;
 		});
 
-	const auto named = box->addRow(object_ptr<CenterWrap<Checkbox>>(
-		box,
+	const auto named = box->addRow(
 		object_ptr<Checkbox>(
 			box,
 			tr::lng_paid_react_show_in_top(tr::now),
-			state->shownPeer.current() != 0)));
-	named->entity()->checkedValue(
+			state->shownPeer.current() != 0),
+		style::al_top);
+	named->checkedValue(
 	) | rpl::start_with_next([=](bool show) {
 		state->shownPeer = show ? state->savedShownPeer : 0;
 	}, named->lifetime());
diff --git a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
index a15e492597..98cffdc6eb 100644
--- a/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
+++ b/Telegram/SourceFiles/settings/business/settings_chat_intro.cpp
@@ -560,7 +560,7 @@ void ChatIntro::setupContent(
 			content,
 			session,
 			IntroWithRandomSticker(session, _intro.value())),
-		{});
+		style::margins());
 
 	const auto title = AddPartInput(
 		content,
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
index 8d77e3bb15..87e0a2a4d0 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.cpp
@@ -126,29 +126,25 @@ void SetupHeader(
 	Ui::AddSkip(content);
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				std::move(subtitle),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding);
+			std::move(subtitle),
+			st::changePhoneTitle),
+		st::changePhoneTitlePadding,
+		style::al_top);
 
 	{
 		const auto &st = st::settingLocalPasscodeDescription;
-		const auto wrap = content->add(
-			object_ptr<Ui::CenterWrap<>>(
+		const auto description = content->add(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					v::text::take_marked(std::move(about)),
-					st,
-					st::defaultPopupMenu)),
-			st::changePhoneDescriptionPadding);
-		wrap->setAttribute(Qt::WA_TransparentForMouseEvents);
-		wrap->resize(
-			wrap->width(),
-			st::settingLocalPasscodeDescriptionHeight);
+				v::text::take_marked(std::move(about)),
+				st,
+				st::defaultPopupMenu),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
+		description->setTryMakeSimilarLines(true);
+		description->setAttribute(Qt::WA_TransparentForMouseEvents);
 	}
 }
 
@@ -174,24 +170,24 @@ not_null<Ui::PasswordInput*> AddPasswordField(
 	return field;
 }
 
-not_null<Ui::CenterWrap<Ui::InputField>*> AddWrappedField(
+not_null<Ui::InputField*> AddWrappedField(
 		not_null<Ui::VerticalLayout*> content,
 		rpl::producer<QString> &&placeholder,
 		const QString &text) {
-	return content->add(object_ptr<Ui::CenterWrap<Ui::InputField>>(
-		content,
+	return content->add(
 		object_ptr<Ui::InputField>(
 			content,
 			st::settingLocalPasscodeInputField,
 			std::move(placeholder),
-			text)));
+			text),
+		style::al_top);
 }
 
 not_null<Ui::LinkButton*> AddLinkButton(
-		not_null<Ui::CenterWrap<Ui::InputField>*> wrap,
+		not_null<Ui::InputField*> input,
 		rpl::producer<QString> &&text) {
 	const auto button = Ui::CreateChild<Ui::LinkButton>(
-		wrap->parentWidget(),
+		input->parentWidget(),
 		QString());
 	std::move(
 		text
@@ -199,9 +195,8 @@ not_null<Ui::LinkButton*> AddLinkButton(
 		button->setText(text);
 	}, button->lifetime());
 
-	wrap->geometryValue(
+	input->geometryValue(
 	) | rpl::start_with_next([=](QRect r) {
-		r.translate(wrap->entity()->pos().x(), 0);
 		button->moveToLeft(r.x(), r.y() + r.height() + st::passcodeTextLine);
 	}, button->lifetime());
 	return button;
@@ -230,13 +225,12 @@ not_null<Ui::RoundButton*> AddDoneButton(
 		not_null<Ui::VerticalLayout*> content,
 		rpl::producer<QString> &&text) {
 	const auto button = content->add(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+		object_ptr<Ui::RoundButton>(
 			content,
-			object_ptr<Ui::RoundButton>(
-				content,
-				std::move(text),
-				st::changePhoneButton)),
-		st::settingLocalPasscodeButtonPadding)->entity();
+			std::move(text),
+			st::changePhoneButton),
+		st::settingLocalPasscodeButtonPadding,
+		style::al_top);
 	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	return button;
 }
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
index cd6a53b85d..b7480ce11c 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_common.h
@@ -11,8 +11,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/box_content_divider.h"
 
 namespace Ui {
-template <typename Widget>
-class CenterWrap;
 class FlatLabel;
 class InputField;
 class LinkButton;
@@ -61,7 +59,7 @@ void SetupHeader(
 	rpl::producer<QString> &&placeholder,
 	const QString &text);
 
-[[nodiscard]] not_null<Ui::CenterWrap<Ui::InputField>*> AddWrappedField(
+[[nodiscard]] not_null<Ui::InputField*> AddWrappedField(
 	not_null<Ui::VerticalLayout*> content,
 	rpl::producer<QString> &&placeholder,
 	const QString &text);
@@ -75,7 +73,7 @@ void SetupHeader(
 	rpl::producer<QString> &&text);
 
 [[nodiscard]] not_null<Ui::LinkButton*> AddLinkButton(
-	not_null<Ui::CenterWrap<Ui::InputField>*> wrap,
+	not_null<Ui::InputField*> input,
 	rpl::producer<QString> &&text);
 
 void AddSkipInsteadOfField(not_null<Ui::VerticalLayout*> content);
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
index f83eb14379..ab1a0fbf8a 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email.cpp
@@ -84,11 +84,10 @@ void Email::setupContent() {
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
-	const auto wrap = AddWrappedField(
+	const auto newInput = AddWrappedField(
 		content,
 		tr::lng_cloud_password_email(),
 		currentStepDataEmail);
-	const auto newInput = wrap->entity();
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
 	) | rpl::start_with_next([=] {
@@ -169,7 +168,7 @@ void Email::setupContent() {
 	};
 
 	const auto skip = AddLinkButton(
-		wrap,
+		newInput,
 		tr::lng_cloud_password_skip_email());
 	skip->setClickedCallback([=] {
 		confirm(QString());
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
index 2e482f7619..e9e5e799c1 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_email_confirm.cpp
@@ -155,11 +155,9 @@ void EmailConfirm::setupContent() {
 		content,
 		st::settingLocalPasscodeInputField,
 		tr::lng_change_phone_code_title());
-	const auto newInput = objectInput.data();
-	const auto wrap = content->add(
-		object_ptr<Ui::CenterWrap<Ui::InputField>>(
-			content,
-			std::move(objectInput)));
+	const auto newInput = content->add(
+		std::move(objectInput),
+		style::al_top);
 
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
@@ -184,7 +182,9 @@ void EmailConfirm::setupContent() {
 		}
 	}, resendInfo->lifetime());
 
-	const auto resend = AddLinkButton(wrap, tr::lng_cloud_password_resend());
+	const auto resend = AddLinkButton(
+		newInput,
+		tr::lng_cloud_password_resend());
 	resend->setClickedCallback([=] {
 		if (_requestLifetime) {
 			return;
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
index 7f59c7a936..b505ffa084 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_hint.cpp
@@ -75,11 +75,10 @@ void Hint::setupContent() {
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
-	const auto wrap = AddWrappedField(
+	const auto newInput = AddWrappedField(
 		content,
 		tr::lng_cloud_password_hint(),
 		currentStepDataHint);
-	const auto newInput = wrap->entity();
 	const auto error = AddError(content, nullptr);
 	newInput->changes(
 	) | rpl::start_with_next([=] {
@@ -122,7 +121,7 @@ void Hint::setupContent() {
 	};
 
 	AddLinkButton(
-		wrap,
+		newInput,
 		tr::lng_settings_cloud_password_skip_hint()
 	)->setClickedCallback([=] {
 		save(QString());
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
index a7dd669b4f..2986c05c4e 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_input.cpp
@@ -170,11 +170,8 @@ void Input::setupValidateGood() {
 	}
 
 	if (auto owned = CreateValidateGoodIcon(&controller()->session())) {
-		owned->setParent(content);
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				std::move(owned)),
+			std::move(owned),
 			QMargins(0, st::lineWidth * 75, 0, 0));
 	}
 
@@ -254,10 +251,10 @@ void Input::setupContent() {
 
 	const auto newInput = AddPasswordField(
 		content,
-		isCheck
+		(isCheck
 			? tr::lng_cloud_password_enter_old()
-			: tr::lng_cloud_password_enter_new(),
-			currentStepDataPassword);
+			: tr::lng_cloud_password_enter_new()),
+		currentStepDataPassword);
 	const auto reenterInput = isCheck
 		? (Ui::PasswordInput*)(nullptr)
 		: AddPasswordField(
@@ -280,9 +277,12 @@ void Input::setupContent() {
 			tr::lng_signin_hint(tr::now, lt_password_hint, hint),
 			st::defaultFlatLabel);
 		hintInfo->setVisible(!hint.isEmpty());
-		error->geometryValue(
-		) | rpl::start_with_next([=](const QRect &r) {
-			hintInfo->setGeometry(r);
+		rpl::combine(
+			error->geometryValue(),
+			newInput->geometryValue()
+		) | rpl::start_with_next([=](QRect r, QRect input) {
+			hintInfo->setGeometry(
+				{ input.x(), r.y(), input.width(), r.height() });
 		}, hintInfo->lifetime());
 		error->shownValue(
 		) | rpl::start_with_next([=](bool shown) {
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
index ee2de55865..eccada08f8 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email.cpp
@@ -63,11 +63,10 @@ void LoginEmail::setupContent() {
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
-	const auto wrap = AddWrappedField(
+	const auto newInput = AddWrappedField(
 		content,
 		tr::lng_settings_cloud_login_email_placeholder(),
 		QString());
-	const auto newInput = wrap->entity();
 	const auto error = AddError(content, nullptr);
 	newInput->changes() | rpl::start_with_next([=] {
 		error->hide();
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
index 31c4c2aeb6..e3213f95a7 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_login_email_confirm.cpp
@@ -106,11 +106,9 @@ void LoginEmailConfirm::setupContent() {
 
 	Ui::AddSkip(content, st::settingLocalPasscodeDescriptionBottomSkip);
 
-	const auto wrap = content->add(
-		object_ptr<Ui::CenterWrap<Ui::CodeInput>>(
-			content,
-			object_ptr<Ui::CodeInput>(content)));
-	const auto newInput = wrap->entity();
+	const auto newInput = content->add(
+		object_ptr<Ui::CodeInput>(content),
+		style::al_top);
 	newInput->setDigitsCountMax(currentStepDataCodeLength);
 
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
index 7ea244e8ff..d8441c5a8f 100644
--- a/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
+++ b/Telegram/SourceFiles/settings/cloud_password/settings_cloud_password_validate_icon.cpp
@@ -67,6 +67,7 @@ object_ptr<Ui::RpWidget> CreateValidateGoodIcon(
 	}, widget->lifetime());
 	const auto padding = st::settingLocalPasscodeIconPadding;
 	widget->resize((Rect(Size(size)) + padding).size());
+	widget->setNaturalWidth(padding.left() + size + padding.right());
 
 	return owned;
 }
diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
index 820e55988d..3ba6000a54 100644
--- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
+++ b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp
@@ -40,15 +40,13 @@ Blocked::Blocked(
 	{
 		auto padding = st::changePhoneIconPadding;
 		padding.setBottom(padding.top());
-		_loading = base::make_unique_q<Ui::CenterWrap<>>(
+		_loading = base::make_unique_q<Ui::PaddingWrap<>>(
 			this,
-			object_ptr<Ui::PaddingWrap<>>(
+			object_ptr<Ui::FlatLabel>(
 				this,
-				object_ptr<Ui::FlatLabel>(
-					this,
-					tr::lng_contacts_loading(),
-					st::changePhoneDescription),
-				std::move(padding)));
+				tr::lng_contacts_loading(),
+				st::changePhoneDescription),
+			std::move(padding));
 		Ui::ResizeFitChild(
 			this,
 			_loading.get(),
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index 6209a4bc94..a11b2dd6cf 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -424,13 +424,12 @@ void Credits::setupContent() {
 
 	{
 		const auto button = content->add(
-			object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+			object_ptr<Ui::RoundButton>(
 				content,
-				object_ptr<Ui::RoundButton>(
-					content,
-					nullptr,
-					st::creditsSettingsBigBalanceButton)),
-			st::boxRowPadding)->entity();
+				nullptr,
+				st::creditsSettingsBigBalanceButton),
+			st::boxRowPadding,
+			style::al_top);
 		button->setContext([&]() -> Ui::Text::MarkedContext {
 			auto customEmojiFactory = [=](const auto &...) {
 				const auto &icon = st::settingsIconAdd;
@@ -507,39 +506,37 @@ void Credits::setupContent() {
 		return { .customEmojiFactory = std::move(customEmojiFactory) };
 	}();
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				tr::lng_credits_balance_me_count(
-					lt_emoji,
-					rpl::single(Ui::MakeCreditsIconEntity()),
-					lt_amount,
-					(isCurrency
-						? _controller->session().credits().tonBalanceValue()
-						: _controller->session().credits().balanceValue()
-					) | rpl::map(
-						Lang::FormatCreditsAmountDecimal
-					) | rpl::map(Ui::Text::Bold),
-					Ui::Text::WithEntities),
-				textSt,
-				st::defaultPopupMenu,
-				std::move(context))));
+			tr::lng_credits_balance_me_count(
+				lt_emoji,
+				rpl::single(Ui::MakeCreditsIconEntity()),
+				lt_amount,
+				(isCurrency
+					? _controller->session().credits().tonBalanceValue()
+					: _controller->session().credits().balanceValue()
+				) | rpl::map(
+					Lang::FormatCreditsAmountDecimal
+				) | rpl::map(Ui::Text::Bold),
+				Ui::Text::WithEntities),
+			textSt,
+			st::defaultPopupMenu,
+			std::move(context)),
+		style::al_top);
 	if (isCurrency) {
 		const auto rate = _controller->session().credits().usdRate();
 		const auto wrap = content->add(
 			object_ptr<Ui::SlideWrap<>>(
 				content,
-				object_ptr<Ui::CenterWrap<>>(
+				object_ptr<Ui::FlatLabel>(
 					content,
-					object_ptr<Ui::FlatLabel>(
-						content,
-						_controller->session().credits().tonBalanceValue(
-						) | rpl::map([=](CreditsAmount value) {
-							using namespace Info::ChannelEarn;
-							return value ? ToUsd(value, rate, 3) : QString();
-						}),
-						st::channelEarnOverviewSubMinorLabel))));
+					_controller->session().credits().tonBalanceValue(
+					) | rpl::map([=](CreditsAmount value) {
+						using namespace Info::ChannelEarn;
+						return value ? ToUsd(value, rate, 3) : QString();
+					}),
+					st::channelEarnOverviewSubMinorLabel)),
+			style::al_top);
 		wrap->toggleOn(_controller->session().credits().tonBalanceValue(
 			) | rpl::map(rpl::mappers::_1 > CreditsAmount(0)));
 		wrap->finishAnimating();
@@ -615,9 +612,8 @@ void Credits::setupContent() {
 			Ui::AddSkip(container);
 
 			const auto labels = container->add(
-				object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-					container,
-					object_ptr<Ui::RpWidget>(container)))->entity();
+				object_ptr<Ui::RpWidget>(container),
+				style::al_top);
 
 			const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 				labels,
@@ -642,6 +638,8 @@ void Credits::setupContent() {
 				labels->resize(
 					majorSize.width() + minorSize.width(),
 					majorSize.height());
+				labels->setNaturalWidth(
+					majorSize.width() + minorSize.width());
 				majorLabel->moveToLeft(0, 0);
 				minorLabel->moveToRight(
 					0,
@@ -651,12 +649,11 @@ void Credits::setupContent() {
 
 			Ui::AddSkip(container);
 			container->add(
-				object_ptr<Ui::CenterWrap<>>(
+				object_ptr<Ui::FlatLabel>(
 					container,
-					object_ptr<Ui::FlatLabel>(
-						container,
-						ToUsd(value, multiplier, 0),
-						st::channelEarnOverviewSubMinorLabel)));
+					ToUsd(value, multiplier, 0),
+					st::channelEarnOverviewSubMinorLabel),
+				style::al_top);
 
 			Ui::AddSkip(container);
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index a08d5594d1..5a4162b2db 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -791,14 +791,13 @@ void BoostCreditsBox(
 		}, widget->lifetime());
 	}
 	content->add(
-		object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				tr::lng_gift_stars_title(
-					lt_count,
-					rpl::single(float64(b.credits))),
-				st::boxTitle)));
+			tr::lng_gift_stars_title(
+				lt_count,
+				rpl::single(float64(b.credits))),
+			st::boxTitle),
+		style::al_top);
 	Ui::AddSkip(content);
 	if (b.multiplier) {
 		const auto &st = st::statisticsDetailsBottomCaptionStyle;
@@ -862,7 +861,6 @@ void BoostCreditsBox(
 					tr::lng_credits_box_out_about_link(tr::now)),
 				Ui::Text::WithEntities),
 			st::creditsBoxAboutDivider),
-		st::boxRowPadding,
 		style::al_top);
 	Ui::AddSkip(content);
 
@@ -1263,10 +1261,10 @@ void GenericCreditsEntryBox(
 			Ui::PreloadUniqueGiftResellPrices(session);
 		}
 	} else if (const auto callback = Ui::PaintPreviewCallback(session, e)) {
-		const auto thumb = content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			GenericEntryPhoto(content, callback, stUser.photoSize)));
-		AddViewMediaHandler(thumb->entity(), show, e);
+		const auto thumb = content->add(
+			GenericEntryPhoto(content, callback, stUser.photoSize),
+			style::al_top);
+		AddViewMediaHandler(thumb, show, e);
 	} else if (s.photoId || (e.photoId && !e.subscriptionUntil.isNull())) {
 		if (!(s.cancelled || s.expired || s.cancelledByBot)) {
 			const auto widget = Ui::CreateChild<Ui::RpWidget>(content);
@@ -1279,21 +1277,21 @@ void GenericCreditsEntryBox(
 				owner->photo(photoId),
 				std::move(update));
 		};
-		content->add(object_ptr<Ui::CenterWrap<>>(
-			content,
-			GenericEntryPhoto(content, callback, stUser.photoSize)));
+		content->add(
+			GenericEntryPhoto(content, callback, stUser.photoSize),
+			style::al_top);
 	} else if (peer
 		&& !e.gift
 		&& !e.premiumMonthsForStars
 		&& !e.postsSearch) {
 		if (e.subscriptionUntil.isNull() && s.until.isNull()) {
-			content->add(object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::UserpicButton>(content, peer, stUser)));
+			content->add(
+				object_ptr<Ui::UserpicButton>(content, peer, stUser),
+				style::al_top);
 		} else {
-			content->add(object_ptr<Ui::CenterWrap<>>(
-				content,
-				SubscriptionUserpic(content, peer, stUser.photoSize)));
+			content->add(
+				SubscriptionUserpic(content, peer, stUser.photoSize),
+				style::al_top);
 		}
 	} else if (e.gift || isPrize || e.premiumMonthsForStars) {
 		struct State final {
@@ -1373,13 +1371,13 @@ void GenericCreditsEntryBox(
 		}, icon->lifetime());
 	} else if (!e.postsSearch) {
 		const auto widget = content->add(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::RpWidget>(content)))->entity();
+			object_ptr<Ui::RpWidget>(content),
+			style::al_top);
 		using Draw = Fn<void(Painter &, int, int, int, int)>;
 		const auto draw = widget->lifetime().make_state<Draw>(
 			Ui::GenerateCreditsPaintUserpicCallback(e));
 		widget->resize(Size(stUser.photoSize));
+		widget->setNaturalWidth(stUser.photoSize);
 		widget->paintRequest(
 		) | rpl::start_with_next([=] {
 			auto p = Painter(widget);
@@ -1434,7 +1432,6 @@ void GenericCreditsEntryBox(
 					? peer->name()
 					: Ui::GenerateEntryName(e).text),
 				st::creditsBoxAboutTitle),
-			st::boxRowPadding,
 			style::al_top);
 
 		Ui::AddSkip(content);
@@ -1442,16 +1439,15 @@ void GenericCreditsEntryBox(
 	if (e.bareGiftReleasedById && !e.uniqueGift) {
 		const auto peer = owner->peer(PeerId(e.bareGiftReleasedById));
 		const auto released = content->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
-				box,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					tr::lng_credits_box_history_entry_gift_released(
-						lt_name,
-						rpl::single(Ui::Text::Link('@' + peer->username())),
-						Ui::Text::WithEntities),
-					st::creditsReleasedByLabel)));
-		released->entity()->setClickHandlerFilter([=](const auto &...) {
+			object_ptr<Ui::FlatLabel>(
+				content,
+				tr::lng_credits_box_history_entry_gift_released(
+					lt_name,
+					rpl::single(Ui::Text::Link('@' + peer->username())),
+					Ui::Text::WithEntities),
+				st::creditsReleasedByLabel),
+			style::al_top);
+		released->setClickHandlerFilter([=](const auto &...) {
 			Ui::GiftReleasedByHandler(peer);
 			return false;
 		});
@@ -1613,7 +1609,6 @@ void GenericCreditsEntryBox(
 				box,
 				rpl::single(e.description),
 				st::creditsBoxAbout),
-			st::boxRowPadding,
 			style::al_top);
 	}
 
@@ -1669,7 +1664,6 @@ void GenericCreditsEntryBox(
 								: tr::lng_action_gift_got_gift_text))(
 									Ui::Text::WithEntities))),
 				st::creditsBoxAbout),
-			st::boxRowPadding,
 			style::al_top);
 		about->setClickHandlerFilter([=](const auto &...) {
 			Core::App().iv().openWithIvPreferred(
@@ -1707,7 +1701,6 @@ void GenericCreditsEntryBox(
 						std::move(link),
 						Ui::Text::RichLangValue),
 				st::creditsBoxAbout),
-			st::boxRowPadding,
 			style::al_top);
 	} else if (e.paidMessagesCommission && e.barePeerId) {
 		Ui::AddSkip(content);
@@ -1732,7 +1725,6 @@ void GenericCreditsEntryBox(
 					std::move(link),
 					Ui::Text::RichLangValue),
 				st::creditsBoxAbout),
-			st::boxRowPadding,
 			style::al_top);
 	}
 
@@ -1876,7 +1868,6 @@ void GenericCreditsEntryBox(
 						tr::lng_credits_box_out_about_link(tr::now)),
 					Ui::Text::WithEntities),
 				st::creditsBoxAboutDivider),
-			st::boxRowPadding,
 			style::al_top);
 	} else if (starGiftCanManage) {
 		const auto hiddenPhrase = giftToChannelCanManage
@@ -1929,7 +1920,6 @@ void GenericCreditsEntryBox(
 				box,
 				std::move(text),
 				st::creditsBoxAboutDivider),
-			st::boxRowPadding,
 			style::al_top);
 		label->setClickHandlerFilter([=](const auto &...) {
 			toggleVisibility(!e.savedToProfile);
@@ -1948,7 +1938,6 @@ void GenericCreditsEntryBox(
 					) | Ui::Text::ToLink(),
 					Ui::Text::WithEntities),
 				st::creditsBoxAboutDivider),
-			st::boxRowPadding,
 			style::al_top);
 		label->setClickHandlerFilter([=](const auto &...) {
 			UrlClickHandler::Open(
@@ -2001,7 +1990,7 @@ void GenericCreditsEntryBox(
 		} else if (s.cancelled || s.cancelledByBot) {
 			label->setTextColorOverride(st::menuIconAttentionColor->c);
 		}
-		box->addRow(std::move(label), st::boxRowPadding, style::al_top);
+		box->addRow(std::move(label), style::al_top);
 	}
 
 	Ui::AddSkip(content);
@@ -2404,6 +2393,7 @@ object_ptr<Ui::RpWidget> GenericEntryPhoto(
 	auto owned = object_ptr<Ui::RpWidget>(parent);
 	const auto widget = owned.data();
 	widget->resize(Size(photoSize));
+	widget->setNaturalWidth(photoSize);
 
 	const auto draw = callback(
 		crl::guard(widget, [=] { widget->update(); }));
@@ -2453,6 +2443,7 @@ object_ptr<Ui::RpWidget> SubscriptionUserpic(
 	auto widget = object_ptr<Ui::RpWidget>(parent);
 	const auto raw = widget.data();
 	widget->resize(photoSize, photoSize);
+	widget->setNaturalWidth(photoSize);
 	const auto userpicMedia = Ui::MakeUserpicThumbnail(peer, false);
 	userpicMedia->subscribeToUpdates([=] { raw->update(); });
 	const auto creditsIconSize = photoSize / 3;
@@ -2642,9 +2633,8 @@ void AddWithdrawalWidget(
 	Ui::AddSkip(container);
 
 	const auto labels = container->add(
-		object_ptr<Ui::CenterWrap<Ui::RpWidget>>(
-			container,
-			object_ptr<Ui::RpWidget>(container)))->entity();
+		object_ptr<Ui::RpWidget>(container),
+		style::al_top);
 
 	const auto majorLabel = Ui::CreateChild<Ui::FlatLabel>(
 		labels,
@@ -2664,18 +2654,18 @@ void AddWithdrawalWidget(
 		labels->resize(
 			majorSize.width() + icon->width() + skip,
 			majorSize.height());
+		labels->setNaturalWidth(majorSize.width() + icon->width() + skip);
 		majorLabel->moveToLeft(icon->width() + skip, 0);
 	}, labels->lifetime());
 	Ui::ToggleChildrenVisibility(labels, true);
 
 	Ui::AddSkip(container);
 	container->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			container,
-			object_ptr<Ui::FlatLabel>(
-				container,
-				std::move(usdValue),
-				st::channelEarnOverviewSubMinorLabel)));
+			std::move(usdValue),
+			st::channelEarnOverviewSubMinorLabel),
+		style::al_top);
 
 	Ui::AddSkip(container);
 
diff --git a/Telegram/SourceFiles/settings/settings_local_passcode.cpp b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
index 75943bcaef..3bab6d26e8 100644
--- a/Telegram/SourceFiles/settings/settings_local_passcode.cpp
+++ b/Telegram/SourceFiles/settings/settings_local_passcode.cpp
@@ -136,25 +136,24 @@ void LocalPasscodeEnter::setupContent() {
 	Ui::AddSkip(content);
 
 	content->add(
-		object_ptr<Ui::CenterWrap<>>(
+		object_ptr<Ui::FlatLabel>(
 			content,
-			object_ptr<Ui::FlatLabel>(
-				content,
-				isCreate
-					? tr::lng_passcode_create_title()
-					: isCheck
-					? tr::lng_passcode_check_title()
-					: tr::lng_passcode_change_title(),
-				st::changePhoneTitle)),
-		st::changePhoneTitlePadding);
+			isCreate
+				? tr::lng_passcode_create_title()
+				: isCheck
+				? tr::lng_passcode_check_title()
+				: tr::lng_passcode_change_title(),
+			st::changePhoneTitle),
+		st::changePhoneTitlePadding,
+		style::al_top);
 
 	const auto addDescription = [&](rpl::producer<QString> &&text) {
 		const auto &st = st::settingLocalPasscodeDescription;
 		content->add(
-			object_ptr<Ui::CenterWrap<>>(
-				content,
-				object_ptr<Ui::FlatLabel>(content, std::move(text), st)),
-			st::changePhoneDescriptionPadding);
+			object_ptr<Ui::FlatLabel>(content, std::move(text), st),
+			st::changePhoneDescriptionPadding,
+			style::al_top
+		)->setTryMakeSimilarLines(true);
 	};
 
 	addDescription(tr::lng_passcode_about1());
@@ -183,14 +182,13 @@ void LocalPasscodeEnter::setupContent() {
 
 	const auto addError = [&](not_null<Ui::PasswordInput*> input) {
 		const auto error = content->add(
-			object_ptr<Ui::CenterWrap<Ui::FlatLabel>>(
+			object_ptr<Ui::FlatLabel>(
 				content,
-				object_ptr<Ui::FlatLabel>(
-					content,
-					// Set any text to resize.
-					tr::lng_language_name(tr::now),
-					st::settingLocalPasscodeError)),
-			st::changePhoneDescriptionPadding)->entity();
+				// Set any text to resize.
+				tr::lng_language_name(tr::now),
+				st::settingLocalPasscodeError),
+			st::changePhoneDescriptionPadding,
+			style::al_top);
 		error->hide();
 		QObject::connect(input.get(), &Ui::MaskedInputField::changed, [=] {
 			error->hide();
@@ -208,17 +206,16 @@ void LocalPasscodeEnter::setupContent() {
 	const auto error = addError(isCheck ? newPasscode : reenterPasscode);
 
 	const auto button = content->add(
-		object_ptr<Ui::CenterWrap<Ui::RoundButton>>(
+		object_ptr<Ui::RoundButton>(
 			content,
-			object_ptr<Ui::RoundButton>(
-				content,
-				(isCreate
-					? tr::lng_passcode_create_button()
-					: isCheck
-					? tr::lng_passcode_check_button()
-					: tr::lng_passcode_change_button()),
-				st::changePhoneButton)),
-		st::settingLocalPasscodeButtonPadding)->entity();
+			(isCreate
+				? tr::lng_passcode_create_button()
+				: isCheck
+				? tr::lng_passcode_check_button()
+				: tr::lng_passcode_change_button()),
+			st::changePhoneButton),
+		st::settingLocalPasscodeButtonPadding,
+		style::al_top);
 	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
 	button->setClickedCallback([=] {
 		const auto newText = newPasscode->text();
diff --git a/Telegram/SourceFiles/settings/settings_power_saving.cpp b/Telegram/SourceFiles/settings/settings_power_saving.cpp
index beaf466134..6c4e7768da 100644
--- a/Telegram/SourceFiles/settings/settings_power_saving.cpp
+++ b/Telegram/SourceFiles/settings/settings_power_saving.cpp
@@ -59,7 +59,7 @@ void PowerSavingBox(not_null<Ui::GenericBox*> box) {
 		state->forceDisabledMessage.value());
 
 	const auto controlsRaw = checkboxes.data();
-	box->addRow(std::move(checkboxes), {});
+	box->addRow(std::move(checkboxes), style::margins());
 
 	auto automatic = (Ui::SettingsButton*)nullptr;
 	if (batterySaving.has_value()) {
diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/settings_websites.cpp
index f74ae4c800..c910a5c4fb 100644
--- a/Telegram/SourceFiles/settings/settings_websites.cpp
+++ b/Telegram/SourceFiles/settings/settings_websites.cpp
@@ -112,13 +112,12 @@ void InfoBox(
 	});
 
 	const auto userpic = box->addRow(
-		object_ptr<Ui::CenterWrap<Ui::UserpicButton>>(
+		object_ptr<Ui::UserpicButton>(
 			box,
-			object_ptr<Ui::UserpicButton>(
-				box,
-				data.bot,
-				st::websiteBigUserpic)),
-		st::sessionBigCoverPadding)->entity();
+			data.bot,
+			st::websiteBigUserpic),
+		st::sessionBigCoverPadding,
+		style::al_top);
 	userpic->overrideShape(Ui::PeerUserpicShape::Forum);
 	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 
diff --git a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
index 00cfa4b789..f99b9ff439 100644
--- a/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/show_or_premium_box.cpp
@@ -57,12 +57,10 @@ constexpr auto kShowOrLineOpacity = 0.3;
 object_ptr<RpWidget> MakeShowOrLabel(
 		not_null<RpWidget*> parent,
 		rpl::producer<QString> text) {
-	auto result = object_ptr<CenterWrap<>>(
+	auto result = object_ptr<FlatLabel>(
 		parent,
-		object_ptr<FlatLabel>(
-			parent,
-			std::move(text),
-			st::showOrLabel));
+		std::move(text),
+		st::showOrLabel);
 	const auto raw = result.data();
 
 	raw->paintRequest(
@@ -71,8 +69,7 @@ object_ptr<RpWidget> MakeShowOrLabel(
 
 		const auto full = st::showOrLineWidth;
 		const auto left = (raw->width() - full) / 2;
-		const auto text = raw->entity()->naturalWidth()
-			+ 2 * st::showOrLabelSkip;
+		const auto text = raw->naturalWidth() + 2 * st::showOrLabelSkip;
 		const auto fill = (full - text) / 2;
 		const auto stroke = st::lineWidth;
 		const auto top = st::showOrLineTop;
@@ -174,7 +171,7 @@ void ShowOrPremiumBox(
 	box->addRow(
 		MakeShowOrLabel(box, std::move(skin.orPremium)),
 		st::showOrLabelPadding + buttonPadding,
-		style::al_top);
+		style::al_justify);
 	box->addRow(
 		object_ptr<FlatLabel>(
 			box,
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index ed382472df..ffd74c3efe 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -221,6 +221,7 @@ UserpicButton::~UserpicButton() = default;
 
 void UserpicButton::prepare() {
 	resize(_st.size);
+	setNaturalWidth(_st.size.width());
 	_notShownYet = _waiting;
 	if (!_waiting) {
 		prepareUserpicPixmap();
diff --git a/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp b/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
index 87ac897d3e..73a7b1bbb8 100644
--- a/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
+++ b/Telegram/SourceFiles/ui/widgets/peer_bubble.cpp
@@ -42,9 +42,9 @@ object_ptr<Ui::RpWidget> CreatePeerBubble(
 	) | rpl::start_with_next([=](
 			const QSize &leftSize,
 			const QSize &rightSize) {
-		peerBubble->resize(
-			leftSize.width() + rightSize.width() + rect::m::sum::h(padding),
-			leftSize.height());
+		peerBubble->setNaturalWidth(
+			leftSize.width() + rightSize.width() + rect::m::sum::h(padding));
+		peerBubble->resize(peerBubble->naturalWidth(), leftSize.height());
 		left->moveToLeft(0, 0);
 		right->moveToRight(padding.right() + st::lineWidth, padding.top());
 		const auto maxRightSize = parent->width()
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index f7bca08f41..96481551eb 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit f7bca08f417dd119df4beb7eec5a7bc55d357abf
+Subproject commit 96481551eb08ed408cee6548673b2d0d7c529df0

From f84181e7a5e868b429ac40b1d7836ac44d312d1c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 12:33:38 +0300
Subject: [PATCH 199/341] Added event for scrolling to bottom to compose
 controls.

---
 .../view/controls/history_view_compose_controls.cpp   | 11 +++++++++++
 .../view/controls/history_view_compose_controls.h     |  1 +
 2 files changed, 12 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index f6f13ba081..7bd49e3177 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1180,6 +1180,17 @@ auto ComposeControls::sendContentRequests(SendRequestType requestType) const {
 		_sendCustomRequests.events());
 }
 
+rpl::producer<> ComposeControls::scrollToMaxRequests() const {
+	return _field->submits() | rpl::filter([=]{
+		if (_mode == Mode::Normal
+			&& !_voiceRecordBar->isListenState()
+			&& getTextWithAppliedMarkdown().text.isEmpty()) {
+			return true;
+		}
+		return false;
+	}) | rpl::to_empty;
+}
+
 rpl::producer<Api::SendOptions> ComposeControls::sendRequests() const {
 	return sendContentRequests(SendRequestType::Text);
 }
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
index 4efc974160..e8436c3178 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h
@@ -183,6 +183,7 @@ public:
 	-> rpl::producer<ReplyNextRequest>;
 	[[nodiscard]] rpl::producer<> focusRequests() const;
 	[[nodiscard]] rpl::producer<> showScheduledRequests() const;
+	[[nodiscard]] rpl::producer<> scrollToMaxRequests() const;
 
 	using MimeDataHook = Fn<bool(
 		not_null<const QMimeData*> data,

From b978bc4876539ee3cb7ed86f4110d14bd77f0f3c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 12:34:46 +0300
Subject: [PATCH 200/341] Added ability to bottom scroll in HistoryView::Chat
 section with submit.

Fixed #29662.
---
 .../SourceFiles/history/view/history_view_chat_section.cpp   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
index 7d96d7e0f9..5fecbc4a56 100644
--- a/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_chat_section.cpp
@@ -810,6 +810,11 @@ void ChatWidget::setupComposeControls() {
 		send(options);
 	}, lifetime());
 
+	_composeControls->scrollToMaxRequests(
+	) | rpl::start_with_next([=] {
+		listScrollTo(_scroll->scrollTopMax());
+	}, lifetime());
+
 	_composeControls->sendVoiceRequests(
 	) | rpl::start_with_next([=](const ComposeControls::VoiceToSend &data) {
 		sendVoice(data);

From feea881e09b335c30a4a0444cdd7589266aab347 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 13:21:51 +0300
Subject: [PATCH 201/341] Slightly improved position of tooltip for voice
 record bar.

---
 Telegram/SourceFiles/chat_helpers/chat_helpers.style             | 1 +
 .../history/view/controls/history_view_voice_record_bar.cpp      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/chat_helpers/chat_helpers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
index 9025996c95..f971206b80 100644
--- a/Telegram/SourceFiles/chat_helpers/chat_helpers.style
+++ b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
@@ -1295,6 +1295,7 @@ historyRecordLockPosition: point(1px, 22px);
 historyRecordCancelButtonWidth: 100px;
 historyRecordCancelButtonFg: lightButtonFg;
 
+historyRecordTooltipSkip: 8px;
 historyRecordTooltip: ImportantTooltip(defaultImportantTooltip) {
 	padding: margins(4px, 4px, 4px, 4px);
 	radius: 11px;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index 8df2628252..ff80cb71c4 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -442,6 +442,7 @@ TTLButton::TTLButton(
 					r.top()
 						+ r.height()
 						- size.height()
+						- st::historyRecordTooltipSkip
 						+ st::historyRecordTooltip.padding.top());
 			});
 		}, _tooltip->lifetime());

From b3c7ce05dc864f0b6b2a130484d41c8b24e1f260 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 15:21:58 +0300
Subject: [PATCH 202/341] Added ability to send recording voice with submit
 key.

---
 .../history_view_voice_record_bar.cpp         | 37 +++++++++++++++++++
 .../controls/history_view_voice_record_bar.h  |  2 +
 Telegram/lib_ui                               |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index ff80cb71c4..bc0352c2a8 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/text/text_utilities.h"
 #include "ui/dynamic_image.h"
 #include "ui/painter.h"
+#include "ui/widgets/fields/input_field.h" // ShouldSubmit.
 #include "ui/widgets/tooltip.h"
 #include "ui/rect.h"
 #include "ui/ui_utility.h"
@@ -1943,6 +1944,40 @@ void VoiceRecordBar::startRecording() {
 			stop(_inField.current());
 		}
 	}, _recordingLifetime);
+
+	_listenChanges.events_starting_with(
+		rpl::empty_value()
+	) | rpl::filter([=] {
+		return _listen == nullptr;
+	}) | rpl::start_with_next([=] {
+		auto keyFilterCallback = [=](not_null<QEvent*> e) {
+			using Result = base::EventFilterResult;
+			if (_send->type() != Ui::SendButton::Type::Record
+				&& _send->type() != Ui::SendButton::Type::Round) {
+				return Result::Continue;
+			}
+			switch(e->type()) {
+			case QEvent::KeyPress: {
+				if (!_warningShown
+					&& isRecordingLocked()
+					&& Ui::ShouldSubmit(
+						static_cast<QKeyEvent*>(e.get()),
+						Core::App().settings().sendSubmitWay())) {
+					stop(true);
+					return Result::Cancel;
+				}
+				return Result::Continue;
+			}
+			default: return Result::Continue;
+			}
+		};
+
+		_keyFilterInRecordingState = base::unique_qptr{
+			base::install_event_filter(
+				QCoreApplication::instance(),
+				std::move(keyFilterCallback)).get()
+		};
+	}, lifetime());
 }
 
 void VoiceRecordBar::checkTipRequired() {
@@ -2016,6 +2051,7 @@ void VoiceRecordBar::hideFast() {
 	_lock->hide();
 	_level->hide();
 	[[maybe_unused]] const auto s = takeTTLState();
+	_keyFilterInRecordingState = nullptr;
 }
 
 void VoiceRecordBar::stopRecording(StopType type, bool ttlBeforeHide) {
@@ -2353,6 +2389,7 @@ void VoiceRecordBar::orderControls() {
 }
 
 void VoiceRecordBar::installListenStateFilter() {
+	_keyFilterInRecordingState = nullptr;
 	auto keyFilterCallback = [=](not_null<QEvent*> e) {
 		using Result = base::EventFilterResult;
 		if (!(_send->type() == Ui::SendButton::Type::Send
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index 7a01c8563e..e0c86f9d7e 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -194,6 +194,8 @@ private:
 	FilterCallback _startRecordingFilter;
 	FilterCallback _hasTTLFilter;
 
+	base::unique_qptr<QObject> _keyFilterInRecordingState;
+
 	bool _warningShown = false;
 	bool _pauseInsteadSend = false;
 
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 96481551eb..fb3270be1b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 96481551eb08ed408cee6548673b2d0d7c529df0
+Subproject commit fb3270be1b33ccfc7c720f32fb2753844dd38349

From fbc1d75e9a5c36227257efd3f580a320f9db579d Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 15:44:00 +0300
Subject: [PATCH 203/341] Added ability to start and lock voice recording
 immediately.

---
 .../history_view_voice_record_bar.cpp         | 32 ++++++++++++++++---
 .../controls/history_view_voice_record_bar.h  |  6 +++-
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index bc0352c2a8..fb3b75e2b5 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -1680,11 +1680,7 @@ void VoiceRecordBar::init() {
 			if (_startRecordingFilter && _startRecordingFilter()) {
 				return;
 			}
-			_recordingTipRequire = crl::now();
-			_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
-			_fullRecord = false;
-			_ttlButton = nullptr;
-			_lock->setRecordingVideo(_recordingVideo);
+			prepareOnSendPress();
 			_startTimer.callOnce(st::universalDuration);
 		} else if (e->type() == QEvent::MouseButtonRelease) {
 			checkTipRequired();
@@ -1714,6 +1710,14 @@ void VoiceRecordBar::init() {
 	initLevelGeometry();
 }
 
+void VoiceRecordBar::prepareOnSendPress() {
+	_recordingTipRequire = crl::now();
+	_recordingVideo = (_send->type() == Ui::SendButton::Type::Round);
+	_fullRecord = false;
+	_ttlButton = nullptr;
+	_lock->setRecordingVideo(_recordingVideo);
+}
+
 void VoiceRecordBar::activeAnimate(bool active) {
 	const auto to = active ? 1. : 0.;
 	if (_activeAnimation.animating()) {
@@ -1804,6 +1808,24 @@ void VoiceRecordBar::initLevelGeometry() {
 	}, lifetime());
 }
 
+void VoiceRecordBar::startRecordingAndLock(bool round) {
+	{
+		auto sendState = _send->state();
+		sendState.type = round
+			? Ui::SendButton::Type::Round
+			: Ui::SendButton::Type::Record;
+		_send->setState(std::move(sendState));
+	}
+	if (_startRecordingFilter && _startRecordingFilter()) {
+		return;
+	}
+	prepareOnSendPress();
+
+	_lock->show();
+	_lock->requestPaintProgress(1.);
+	startRecording();
+}
+
 void VoiceRecordBar::startRecording() {
 	if (isRecording()) {
 		return;
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
index e0c86f9d7e..1b84eea0ec 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.h
@@ -78,7 +78,8 @@ public:
 		Fn<void()> &&callback,
 		anim::type animated = anim::type::instant);
 
-	void startRecording();
+	void startRecordingAndLock(bool round);
+
 	void finishAnimating();
 	void hideAnimated();
 	void hideFast();
@@ -145,6 +146,9 @@ private:
 	void startRedCircleAnimation();
 	void installListenStateFilter();
 
+	void startRecording();
+	void prepareOnSendPress();
+
 	[[nodiscard]] bool isTypeRecord() const;
 	[[nodiscard]] bool hasDuration() const;
 

From 76e814944d2ec5cc265128ecf59bc62bbccd1103 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 16:43:28 +0300
Subject: [PATCH 204/341] Added shortcuts to start recording of voice or round
 message.

Fixed #29633.
---
 Telegram/Resources/langs/lang.strings          |  2 ++
 Telegram/SourceFiles/core/shortcuts.cpp        |  6 ++++++
 Telegram/SourceFiles/core/shortcuts.h          |  3 +++
 .../SourceFiles/history/history_widget.cpp     | 12 ++++++++++++
 .../controls/history_view_compose_controls.cpp | 18 ++++++++++++++++++
 .../settings/settings_shortcuts.cpp            |  3 +++
 6 files changed, 44 insertions(+)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index db20a2dded..87a9b0017f 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -694,6 +694,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_shortcuts_media_fullscreen" = "Toggle video fullscreen";
 "lng_shortcuts_show_chat_menu" = "Show chat menu";
 "lng_shortcuts_show_chat_preview" = "Show chat preview";
+"lng_shortcuts_record_voice_message" = "Record Voice Message";
+"lng_shortcuts_record_round_message" = "Record Round Message";
 
 "lng_settings_chat_reactions_title" = "Quick Reaction";
 "lng_settings_chat_reactions_subtitle" = "Choose your favorite reaction";
diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index fe26109b7c..061120af0d 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -112,6 +112,8 @@ const auto CommandByName = base::flat_map<QString, Command>{
 	{ u"show_chat_menu"_q    , Command::ShowChatMenu },
 	{ u"show_chat_preview"_q , Command::ShowChatPreview },
 
+	{ u"record_voice"_q      , Command::RecordVoice },
+
 	// Shortcuts that have no default values.
 	{ u"message"_q                       , Command::JustSendMessage },
 	{ u"message_silently"_q              , Command::SendSilentMessage },
@@ -119,6 +121,7 @@ const auto CommandByName = base::flat_map<QString, Command>{
 	{ u"media_viewer_video_fullscreen"_q , Command::MediaViewerFullscreen },
 	{ u"show_scheduled"_q                , Command::ShowScheduled },
 	{ u"archive_chat"_q                  , Command::ArchiveChat },
+	{ u"record_round"_q                  , Command::RecordRound },
 	//
 };
 
@@ -140,6 +143,7 @@ const base::flat_map<Command, QString> &CommandNames() {
 	Command::MediaViewerFullscreen,
 	Command::ShowScheduled,
 	Command::ArchiveChat,
+	Command::RecordRound,
 };
 
 class Manager {
@@ -509,6 +513,8 @@ void Manager::fillDefaults() {
 	set(u"ctrl+\\"_q, Command::ShowChatMenu);
 	set(u"ctrl+]"_q, Command::ShowChatPreview);
 
+	set(u"ctrl+r"_q, Command::RecordVoice);
+
 	_defaults = keysCurrents();
 }
 
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index 7be77d4eca..ee832915b0 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -66,6 +66,9 @@ enum class Command {
 	SendSilentMessage,
 	ScheduleMessage,
 
+	RecordVoice,
+	RecordRound,
+
 	ReadChat,
 	ArchiveChat,
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index cb534111fd..a0cdec1702 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -2105,6 +2105,18 @@ void HistoryWidget::setupShortcuts() {
 					std::make_shared<Scheduled>(_history));
 				return true;
 			});
+		if (showRecordButton()) {
+			const auto isVoice = request->check(Command::RecordVoice, 1);
+			const auto isRound = !isVoice
+				&& request->check(Command::RecordRound, 1);
+			(isVoice || isRound) && request->handle([=] {
+				if (_voiceRecordBar) {
+					_voiceRecordBar->startRecordingAndLock(isRound);
+					return true;
+				}
+				return false;
+			});
+		}
 		if (session().supportMode()) {
 			request->check(
 				Command::SupportToggleMuted
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 7bd49e3177..6caddd9ba6 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "chat_helpers/field_autocomplete.h"
 #include "core/application.h"
 #include "core/core_settings.h"
+#include "core/shortcuts.h"
 #include "core/ui_integration.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/data_changes.h"
@@ -2604,6 +2605,23 @@ void ComposeControls::initVoiceRecordBar() {
 	) | rpl::start_with_next([=] {
 		updateSendButtonType();
 	}, _wrap->lifetime());
+
+	Shortcuts::Requests(
+	) | rpl::filter([=] {
+		return Ui::AppInFocus();
+	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
+		using Command = Shortcuts::Command;
+		const auto isVoice = request->check(Command::RecordVoice, 1);
+		const auto isRound = !isVoice
+			&& request->check(Command::RecordRound, 1);
+		(isVoice || isRound) && request->handle([=] {
+			if (_voiceRecordBar) {
+				_voiceRecordBar->startRecordingAndLock(isRound);
+				return true;
+			}
+			return false;
+		});
+	}, _voiceRecordBar->lifetime());
 }
 
 void ComposeControls::updateWrappingVisibility() {
diff --git a/Telegram/SourceFiles/settings/settings_shortcuts.cpp b/Telegram/SourceFiles/settings/settings_shortcuts.cpp
index ecd2f7914c..d65f96b4cd 100644
--- a/Telegram/SourceFiles/settings/settings_shortcuts.cpp
+++ b/Telegram/SourceFiles/settings/settings_shortcuts.cpp
@@ -104,6 +104,9 @@ struct Labeled {
 		{ C::SendSilentMessage, tr::lng_shortcuts_silent_send() },
 		{ C::ScheduleMessage, tr::lng_shortcuts_schedule() },
 		separator,
+		{ C::RecordVoice, tr::lng_shortcuts_record_voice_message() },
+		{ C::RecordRound, tr::lng_shortcuts_record_round_message() },
+		separator,
 		{ C::MediaViewerFullscreen, tr::lng_shortcuts_media_fullscreen() },
 		separator,
 		{ C::MediaPlay, tr::lng_shortcuts_media_play() },

From 958dede3194d5edfde0d35bba3024101ca8d5b19 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 19 Aug 2025 20:51:32 +0300
Subject: [PATCH 205/341] Fixed active color of recording voice button.

---
 .../controls/history_view_voice_record_bar.cpp    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
index fb3b75e2b5..f7f3e7ce6c 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_voice_record_bar.cpp
@@ -131,10 +131,6 @@ void SoundedPreview::subscribeToUpdates(Fn<void()> callback) {
 	_repaint = std::move(callback);
 }
 
-[[nodiscard]] auto InactiveColor(const QColor &c) {
-	return QColor(c.red(), c.green(), c.blue(), kInactiveWaveformBarAlpha);
-}
-
 [[nodiscard]] auto Progress(int low, int high) {
 	return std::clamp(float64(low) / high, 0., 1.);
 }
@@ -608,7 +604,8 @@ ListenWrap::ListenWrap(
 , _playPauseSt(st::mediaPlayerButton)
 , _playPauseButton(base::make_unique_q<Ui::AbstractButton>(parent))
 , _activeWaveformBar(st::historyRecordVoiceFgActiveIcon->c)
-, _inactiveWaveformBar(InactiveColor(_activeWaveformBar))
+, _inactiveWaveformBar(
+	anim::with_alpha(_activeWaveformBar, kInactiveWaveformBarAlpha))
 , _playPause(_playPauseSt, [=] { _playPauseButton->update(); }) {
 	init();
 }
@@ -1657,6 +1654,7 @@ void VoiceRecordBar::init() {
 
 		auto callback = [=](float64 value) {
 			_lock->requestPaintLockToStopProgress(value);
+			_level->requestPaintColor(activeAnimationRatio());
 			update();
 			updateTTLGeometry(TTLAnimationType::RightLeft, value);
 		};
@@ -2204,8 +2202,8 @@ void VoiceRecordBar::startRedCircleAnimation() {
 	if (anim::Disabled()) {
 		return;
 	}
-	const auto animation = _recordingLifetime
-		.make_state<Ui::Animations::Basic>();
+	const auto animation
+		= _recordingLifetime.make_state<Ui::Animations::Basic>();
 	animation->init([=](crl::time now) {
 		const auto diffTime = now - animation->started();
 		_redCircleProgress = std::abs(std::sin(diffTime / 400.));
@@ -2357,6 +2355,9 @@ bool VoiceRecordBar::hasDuration() const {
 }
 
 float64 VoiceRecordBar::activeAnimationRatio() const {
+	if (isRecordingLocked()) {
+		return 1.;
+	}
 	return _activeAnimation.value(_inField.current() ? 1. : 0.);
 }
 

From 7d7df4f749455d5c831b846d1f06e839942798e3 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 20 Aug 2025 12:40:16 +0300
Subject: [PATCH 206/341] Fixed display of about text in low credits balance
 box in some cases.

---
 Telegram/SourceFiles/ui/effects/credits.style | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 4b9fb822b3..1dcc081231 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -41,6 +41,10 @@ creditsPremiumCover: PremiumCover(defaultPremiumCover) {
 creditsLowBalancePremiumCover: PremiumCover(creditsPremiumCover) {
 	starSize: size(64px, 62px);
 	starTopSkip: 30px;
+	about: FlatLabel(userPremiumCoverAbout) {
+		textFg: boxTitleFg;
+		minWidth: 200px;
+	}
 }
 creditsLowBalancePremiumCoverHeight: 162px;
 creditsTopupButton: SettingsButton(settingsButton) {

From 687bfd0f173419de5f7e6177438a1680514e83fa Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 12:56:51 +0400
Subject: [PATCH 207/341] Remove some FixedHeightWidget-s.

---
 .../SourceFiles/boxes/sticker_set_box.cpp     | 13 +----
 .../passport/passport_panel_edit_document.cpp |  5 +-
 .../passport/passport_panel_form.cpp          | 18 ++-----
 .../settings/settings_active_sessions.cpp     | 53 +++++++------------
 .../settings/settings_websites.cpp            | 37 ++++---------
 5 files changed, 39 insertions(+), 87 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/sticker_set_box.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
index 2079fc7108..f9f1e8498c 100644
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -641,20 +641,11 @@ void ChangeSetNameBox(
 		const auto it = sets.find(input.id);
 		return (it == sets.end()) ? QString() : it->second->title;
 	}();
-	const auto wrap = box->addRow(object_ptr<Ui::FixedHeightWidget>(
+	const auto field = box->addRow(object_ptr<Ui::InputField>(
 		box,
-		st::editStickerSetNameField.heightMin));
-	auto owned = object_ptr<Ui::InputField>(
-		wrap,
 		st::editStickerSetNameField,
 		tr::lng_stickers_context_edit_name(),
-		wasName);
-	const auto field = owned.data();
-	wrap->widthValue() | rpl::start_with_next([=](int width) {
-		field->move(0, 0);
-		field->resize(width, field->height());
-		wrap->resize(width, field->height());
-	}, wrap->lifetime());
+		wasName));
 	field->selectAll();
 	constexpr auto kMaxSetNameLength = 50;
 	field->setMaxLength(kMaxSetNameLength);
diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
index bac92c2c80..723e37f146 100644
--- a/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_edit_document.cpp
@@ -488,8 +488,9 @@ not_null<Ui::RpWidget*> PanelEditDocument::setupContent(
 			}, lifetime());
 		}
 
-		inner->add(
-			object_ptr<Ui::FixedHeightWidget>(inner, st::passportDetailsSkip));
+		inner->add(object_ptr<Ui::FixedHeightWidget>(
+			inner,
+			st::passportDetailsSkip));
 	}
 	if (auto text = _controller->deleteValueLabel()) {
 		inner->add(
diff --git a/Telegram/SourceFiles/passport/passport_panel_form.cpp b/Telegram/SourceFiles/passport/passport_panel_form.cpp
index 5cbaa59412..07a673cb28 100644
--- a/Telegram/SourceFiles/passport/passport_panel_form.cpp
+++ b/Telegram/SourceFiles/passport/passport_panel_form.cpp
@@ -64,21 +64,13 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
 		inner->resizeToWidth(width);
 	}, inner->lifetime());
 
-	const auto userpicWrap = inner->add(
-		object_ptr<Ui::FixedHeightWidget>(
-			inner,
-			st::passportFormUserpic.size.height()),
-		st::passportFormUserpicPadding);
-	_userpic = Ui::AttachParentChild(
-		userpicWrap,
+	_userpic = inner->add(
 		object_ptr<Ui::UserpicButton>(
-			userpicWrap,
+			inner,
 			bot,
-			st::passportFormUserpic));
-	userpicWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		_userpic->move((width - _userpic->width()) / 2, _userpic->y());
-	}, _userpic->lifetime());
+			st::passportFormUserpic),
+		st::passportFormUserpicPadding,
+		style::al_top);
 
 	_about1 = inner->add(
 		object_ptr<Ui::FlatLabel>(
diff --git a/Telegram/SourceFiles/settings/settings_active_sessions.cpp b/Telegram/SourceFiles/settings/settings_active_sessions.cpp
index 48150fdeb6..c358456083 100644
--- a/Telegram/SourceFiles/settings/settings_active_sessions.cpp
+++ b/Telegram/SourceFiles/settings/settings_active_sessions.cpp
@@ -418,48 +418,31 @@ void SessionInfoBox(
 		shown->fire({});
 	});
 
-	const auto userpicWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(box, st::sessionBigUserpicSize),
-		st::sessionBigCoverPadding);
 	const auto big = GenerateUserpicBig(
-		userpicWrap,
+		box,
 		shown->events(),
 		TypeFromEntry(data));
-	userpicWrap->sizeValue(
-	) | rpl::start_with_next([=](QSize size) {
-		big->move((size.width() - big->width()) / 2, 0);
-	}, userpicWrap->lifetime());
+	big->setNaturalWidth(big->width());
+	box->addRow(
+		object_ptr<Ui::RpWidget>::fromRaw(big),
+		st::sessionBigCoverPadding,
+		style::al_top);
 
-	const auto nameWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionBigName.maxHeight));
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(
-		nameWrap,
-		rpl::single(data.name),
-		st::sessionBigName);
-	nameWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		name->resizeToWidth(width);
-		name->move((width - name->width()) / 2, 0);
-	}, name->lifetime());
+			rpl::single(data.name),
+			st::sessionBigName),
+		style::al_top);
 
-	const auto dateWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionDateLabel.style.font->height),
-		style::margins(0, 0, 0, st::sessionDateSkip));
-	const auto date = Ui::CreateChild<Ui::FlatLabel>(
-		dateWrap,
-		rpl::single(
-			langDateTimeFull(base::unixtime::parse(data.activeTime))),
-		st::sessionDateLabel);
-	rpl::combine(
-		dateWrap->widthValue(),
-		date->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
-		date->move((outer - inner) / 2, 0);
-	}, date->lifetime());
+			rpl::single(
+				langDateTimeFull(base::unixtime::parse(data.activeTime))),
+			st::sessionDateLabel),
+		style::margins(0, 0, 0, st::sessionDateSkip),
+		style::al_top);
 
 	using namespace Settings;
 	const auto container = box->verticalLayout();
diff --git a/Telegram/SourceFiles/settings/settings_websites.cpp b/Telegram/SourceFiles/settings/settings_websites.cpp
index c910a5c4fb..f772945de9 100644
--- a/Telegram/SourceFiles/settings/settings_websites.cpp
+++ b/Telegram/SourceFiles/settings/settings_websites.cpp
@@ -121,35 +121,20 @@ void InfoBox(
 	userpic->overrideShape(Ui::PeerUserpicShape::Forum);
 	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	const auto nameWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionBigName.maxHeight));
-	const auto name = Ui::CreateChild<Ui::FlatLabel>(
-		nameWrap,
-		rpl::single(data.bot->name()),
-		st::sessionBigName);
-	nameWrap->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		name->resizeToWidth(width);
-		name->move((width - name->width()) / 2, 0);
-	}, name->lifetime());
+			rpl::single(data.bot->name()),
+			st::sessionBigName),
+		style::al_top);
 
-	const auto domainWrap = box->addRow(
-		object_ptr<Ui::FixedHeightWidget>(
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
 			box,
-			st::sessionDateLabel.style.font->height),
-		style::margins(0, 0, 0, st::sessionDateSkip));
-	const auto domain = Ui::CreateChild<Ui::FlatLabel>(
-		domainWrap,
-		rpl::single(data.domain),
-		st::sessionDateLabel);
-	rpl::combine(
-		domainWrap->widthValue(),
-		domain->widthValue()
-	) | rpl::start_with_next([=](int outer, int inner) {
-		domain->move((outer - inner) / 2, 0);
-	}, domain->lifetime());
+			rpl::single(data.domain),
+			st::sessionDateLabel),
+		style::margins(0, 0, 0, st::sessionDateSkip),
+		style::al_top);
 
 	using namespace Settings;
 	const auto container = box->verticalLayout();

From 9e190cee814431be71da68b051170a81260b6cc4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Aug 2025 15:13:25 +0400
Subject: [PATCH 208/341] Show next-level stars in rating.

---
 .../SourceFiles/ui/controls/stars_rating.cpp  | 30 +++++++---
 Telegram/SourceFiles/ui/effects/premium.style |  9 +++
 .../SourceFiles/ui/effects/premium_bubble.cpp | 58 ++++++++++++++-----
 .../SourceFiles/ui/effects/premium_bubble.h   | 10 +++-
 .../ui/effects/premium_graphics.cpp           | 12 ++--
 5 files changed, 88 insertions(+), 31 deletions(-)

diff --git a/Telegram/SourceFiles/ui/controls/stars_rating.cpp b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
index f5c9dce7d8..16a211a231 100644
--- a/Telegram/SourceFiles/ui/controls/stars_rating.cpp
+++ b/Telegram/SourceFiles/ui/controls/stars_rating.cpp
@@ -110,13 +110,23 @@ struct Feature {
 	return data;
 }
 
-[[nodiscard]] Fn<QString(int)> BubbleTextFactory(int countForScale) {
+[[nodiscard]] Fn<Ui::Premium::BubbleText(int)> BubbleTextFactory(
+		int countForScale,
+		int nextLevelCounter) {
 	return [=](int count) {
-		return (countForScale < 10'000)
-			? QString::number(count)
-			: (countForScale < 10'000'000)
-			? (QString::number((count / 100) / 10.) + 'K')
-			: (QString::number((count / 100'000) / 10.) + 'M');
+		const auto counter = [&](int count) {
+			return (countForScale < 10'000)
+				? Lang::FormatCountDecimal(count)
+				: (countForScale < 10'000'000)
+				? (Lang::FormatCountDecimal((count / 100) / 10.) + 'K')
+				: (Lang::FormatCountDecimal((count / 100'000) / 10.) + 'M');
+		};
+		return Ui::Premium::BubbleText{
+			.counter = counter(count),
+			.additional = (nextLevelCounter
+				? (u"/"_q + counter(nextLevelCounter))
+				: QString()),
+		};
 	};
 }
 
@@ -127,6 +137,7 @@ void FillRatingLimit(
 		Premium::BubbleType type,
 		style::margins limitLinePadding,
 		int starsForScale,
+		int nextLevelStars,
 		bool hideCount) {
 	const auto addSkip = [&](int skip) {
 		container->add(object_ptr<Ui::FixedHeightWidget>(container, skip));
@@ -186,13 +197,13 @@ void FillRatingLimit(
 	});
 	Premium::AddBubbleRow(
 		container,
-		(hideCount ? st::iconOnlyPremiumBubble : st::boostBubble),
+		(hideCount ? st::iconOnlyPremiumBubble : st::starRatingBubble),
 		std::move(showFinished),
 		rpl::duplicate(bubbleRowState),
 		type,
 		(hideCount
-			? [](int) { return QString(); }
-			: BubbleTextFactory(starsForScale)),
+			? [](int) { return Ui::Premium::BubbleText(); }
+			: BubbleTextFactory(starsForScale, nextLevelStars)),
 		negative ? &st::levelNegativeBubble : &st::infoStarsCrown,
 		limitLinePadding);
 	addSkip(st::premiumLineTextSkip);
@@ -261,6 +272,7 @@ void AboutRatingBox(
 			: Premium::BubbleType::StarRating),
 		st::boxRowPadding,
 		data.stars,
+		data.nextLevelStars,
 		(data.level < 0 && !data.stars));
 
 	box->setMaxHeight(st::boostBoxMaxHeight);
diff --git a/Telegram/SourceFiles/ui/effects/premium.style b/Telegram/SourceFiles/ui/effects/premium.style
index 584b5509e0..ee65962849 100644
--- a/Telegram/SourceFiles/ui/effects/premium.style
+++ b/Telegram/SourceFiles/ui/effects/premium.style
@@ -25,6 +25,8 @@ PremiumBubble {
 	textSkip: pixels;
 	tailSize: size;
 	font: font;
+	additionalStyle: TextStyle;
+	additionalSkip: pixels;
 }
 PremiumCover {
 	bg: color;
@@ -249,6 +251,13 @@ boostBubble: PremiumBubble(defaultPremiumBubble) {
 	textSkip: 2px;
 	tailSize: size(14px, 6px);
 	font: font(16px);
+	additionalStyle: TextStyle(defaultTextStyle) {
+		font: font(14px semibold);
+	}
+	additionalSkip: 2px;
+}
+starRatingBubble: PremiumBubble(boostBubble) {
+	font: font(16px semibold);
 }
 iconOnlyPremiumBubble: PremiumBubble(boostBubble) {
 	padding: margins(7px, 0px, 7px, 0px);
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index 8d3629ec70..460da991ce 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -35,8 +35,12 @@ constexpr auto kSlideDuration = crl::time(1000);
 TextFactory ProcessTextFactory(
 		std::optional<tr::phrase<lngtag_count>> phrase) {
 	return phrase
-		? TextFactory([=](int n) { return (*phrase)(tr::now, lt_count, n); })
-		: TextFactory([=](int n) { return QString::number(n); });
+		? TextFactory([=](int n) -> BubbleText {
+			return { (*phrase)(tr::now, lt_count, n) };
+		})
+		: TextFactory([=](int n) -> BubbleText {
+			return { QString::number(n) };
+		});
 }
 
 Bubble::Bubble(
@@ -57,8 +61,10 @@ Bubble::Bubble(
 	_numberAnimation.setWidthChangedCallback([=] {
 		_widthChanges.fire({});
 	});
-	_numberAnimation.setText(_textFactory(0), 0);
+	const auto texts = _textFactory(0);
+	_numberAnimation.setText(texts.counter, 0);
 	_numberAnimation.finishAnimating();
+	_additional.setText(_st.additionalStyle, texts.additional);
 }
 
 crl::time Bubble::SlideNoDeflectionDuration() {
@@ -85,23 +91,36 @@ int Bubble::filledWidth() const {
 }
 
 int Bubble::width() const {
-	return filledWidth() + _numberAnimation.countWidth();
+	return filledWidth()
+		+ _numberAnimation.countWidth()
+		+ (_additional.isEmpty()
+			? 0
+			: (_st.additionalSkip + _additional.maxWidth()));
 }
 
 int Bubble::countMaxWidth(int maxPossibleCounter) const {
 	auto numbers = Ui::NumbersAnimation(_st.font, [] {});
 	numbers.setDisabledMonospace(true);
 	numbers.setDuration(0);
-	numbers.setText(_textFactory(0), 0);
-	numbers.setText(_textFactory(maxPossibleCounter), maxPossibleCounter);
+	const auto textsZero = _textFactory(0);
+	const auto textsMax = _textFactory(maxPossibleCounter);
+	numbers.setText(textsZero.counter, 0);
+	numbers.setText(textsMax.counter, maxPossibleCounter);
 	numbers.finishAnimating();
-	return filledWidth() + numbers.maxWidth();
+	return filledWidth()
+		+ numbers.maxWidth()
+		+ (_additional.isEmpty()
+			? 0
+			: (_st.additionalSkip
+				+ _st.additionalStyle.font->width(textsMax.additional)));
 }
 
 void Bubble::setCounter(int value) {
 	if (_counter != value) {
 		_counter = value;
-		_numberAnimation.setText(_textFactory(value), value);
+		const auto texts = _textFactory(value);
+		_numberAnimation.setText(texts.counter, value);
+		_additional.setText(_st.additionalStyle, texts.additional);
 	}
 }
 
@@ -185,11 +204,22 @@ void Bubble::paintBubble(QPainter &p, const QRect &r, const QBrush &brush) {
 	const auto iconTop = bubbleRect.y()
 		+ (bubbleRect.height() - _icon->height()) / 2;
 	_icon->paint(p, iconLeft, iconTop, bubbleRect.width());
-	_numberAnimation.paint(
-		p,
-		iconLeft + _icon->width() + _st.textSkip,
-		r.y() + _textTop,
-		width() / 2);
+	const auto numberLeft = iconLeft + _icon->width() + _st.textSkip;
+	const auto numberTop = r.y() + _textTop;
+	_numberAnimation.paint(p, numberLeft, numberTop, width());
+	if (!_additional.isEmpty()) {
+		p.setOpacity(0.7);
+		const auto additionalLeft = numberLeft
+			+ _numberAnimation.countWidth()
+			+ _st.additionalSkip;
+		const auto additionalTop = numberTop
+			+ _st.font->ascent
+			- _st.additionalStyle.font->ascent;
+		_additional.draw(p, {
+			.position = { additionalLeft, additionalTop },
+			.availableWidth = _additional.maxWidth(),
+		});
+	}
 }
 
 rpl::producer<> Bubble::widthChanges() const {
@@ -461,7 +491,7 @@ void AddBubbleRow(
 		rpl::producer<> showFinishes,
 		rpl::producer<BubbleRowState> state,
 		BubbleType type,
-		Fn<QString(int)> text,
+		TextFactory text,
 		const style::icon *icon,
 		const style::margins &outerPadding) {
 	const auto container = parent->add(
diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.h b/Telegram/SourceFiles/ui/effects/premium_bubble.h
index 4d621a47a4..8bb1ddf487 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.h
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.h
@@ -27,7 +27,12 @@ class VerticalLayout;
 
 namespace Ui::Premium {
 
-using TextFactory = Fn<QString(int)>;
+struct BubbleText {
+	QString counter;
+	QString additional;
+};
+
+using TextFactory = Fn<BubbleText(int)>;
 
 [[nodiscard]] TextFactory ProcessTextFactory(
 	std::optional<tr::phrase<lngtag_count>> phrase);
@@ -68,6 +73,7 @@ private:
 
 	const style::icon *_icon;
 	NumbersAnimation _numberAnimation;
+	Text::String _additional;
 	const int _height;
 	const int _textTop;
 	const bool _hasTail;
@@ -163,7 +169,7 @@ void AddBubbleRow(
 	rpl::producer<> showFinishes,
 	rpl::producer<BubbleRowState> state,
 	BubbleType type,
-	Fn<QString(int)> text,
+	TextFactory text,
 	const style::icon *icon,
 	const style::margins &outerPadding);
 
diff --git a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
index f4d7c4f90d..32c3a9e351 100644
--- a/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_graphics.cpp
@@ -202,8 +202,8 @@ Line::Line(
 : Line(
 	parent,
 	st,
-	max ? textFactory(max) : QString(),
-	min ? textFactory(min) : QString(),
+	max ? textFactory(max).counter : QString(),
+	min ? textFactory(min).counter : QString(),
 	ratio) {
 }
 
@@ -496,8 +496,8 @@ void AddLimitRow(
 	AddLimitRow(
 		parent,
 		st,
-		max ? factory(max) : QString(),
-		min ? factory(min) : QString(),
+		max ? factory(max).counter : QString(),
+		min ? factory(min).counter : QString(),
 		ratio);
 }
 
@@ -785,9 +785,9 @@ void ShowListBox(
 		if (entry.leftNumber || entry.rightNumber) {
 			auto factory = [=, text = ProcessTextFactory({})](int n) {
 				if (entry.customRightText && (n == entry.rightNumber)) {
-					return *entry.customRightText;
+					return Ui::Premium::BubbleText{ *entry.customRightText };
 				} else {
-					return text(n);
+					return Ui::Premium::BubbleText{ text(n) };
 				}
 			};
 			const auto limitRow = content->add(

From 29d77b649b695926b1c95ad21892b6b867c9a48e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Aug 2025 16:14:03 +0400
Subject: [PATCH 209/341] Nice selection of gifts for a collection.

---
 Telegram/CMakeLists.txt                       |  2 +
 .../peer_gifts/info_peer_gifts_common.cpp     | 69 +++++++++++++++----
 .../info/peer_gifts/info_peer_gifts_common.h  | 12 +++-
 .../peer_gifts/info_peer_gifts_widget.cpp     |  8 ++-
 .../overview/overview_checkbox.cpp            | 60 ++++++++++++++++
 .../SourceFiles/overview/overview_checkbox.h  | 54 +++++++++++++++
 .../SourceFiles/overview/overview_layout.cpp  | 63 +----------------
 .../SourceFiles/overview/overview_layout.h    |  6 +-
 .../overview/overview_layout_delegate.h       |  6 +-
 .../SourceFiles/ui/effects/round_checkbox.cpp |  4 ++
 .../SourceFiles/ui/effects/round_checkbox.h   |  1 +
 11 files changed, 201 insertions(+), 84 deletions(-)
 create mode 100644 Telegram/SourceFiles/overview/overview_checkbox.cpp
 create mode 100644 Telegram/SourceFiles/overview/overview_checkbox.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index e6e6884e4c..4de746002d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1315,6 +1315,8 @@ PRIVATE
     mtproto/special_config_request.cpp
     mtproto/special_config_request.h
     mtproto/type_utils.h
+    overview/overview_checkbox.cpp
+    overview/overview_checkbox.h
     overview/overview_layout.cpp
     overview/overview_layout.h
     overview/overview_layout_delegate.h
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index 289ea5844d..bcde4301c2 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -22,6 +22,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "info/channel_statistics/earn/earn_icons.h"
 #include "main/main_session.h"
+#include "overview/overview_checkbox.h"
 #include "settings/settings_credits_graphics.h"
 #include "ui/layers/generic_box.h"
 #include "ui/text/format_values.h"
@@ -34,6 +35,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "styles/style_credits.h"
 #include "styles/style_layers.h"
+#include "styles/style_overview.h"
 #include "styles/style_premium.h"
 
 namespace Info::PeerGifts {
@@ -78,6 +80,18 @@ GiftButton::~GiftButton() {
 	unsubscribe();
 }
 
+void GiftButton::onStateChanged(State was, StateChangeSource source) {
+	if (_check) {
+		const auto diff = state() ^ was;
+		if (diff & State::Enum::Over) {
+			_check->setActive(state() & State::Enum::Over);
+		}
+		if (diff & State::Enum::Down) {
+			_check->setPressed(state() & State::Enum::Down);
+		}
+	}
+}
+
 void GiftButton::unsubscribe() {
 	if (base::take(_subscribed)) {
 		_userpic->subscribeToUpdates(nullptr);
@@ -85,6 +99,16 @@ void GiftButton::unsubscribe() {
 }
 
 void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
+	_mode = mode;
+
+	if (_mode != GiftButtonMode::Selection) {
+		_check = nullptr;
+	} else if (!_check) {
+		_check = std::make_unique<Overview::Layout::Checkbox>(
+			[=] { update(); },
+			st::overviewSmallCheck);
+	}
+
 	const auto unique = v::is<GiftTypeStars>(descriptor)
 		? v::get<GiftTypeStars>(descriptor).info.unique.get()
 		: nullptr;
@@ -106,7 +130,6 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	_descriptor = descriptor;
 	_resalePrice = resalePrice;
 	const auto resale = (_resalePrice > 0);
-	_small = (mode != Mode::Full);
 	v::match(descriptor, [&](const GiftTypePremium &data) {
 		const auto months = data.months;
 		_text = Ui::Text::String(st::giftBoxGiftHeight / 4);
@@ -147,12 +170,12 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 		const auto soldOut = data.info.limitedCount
 			&& !data.userpic
 			&& !data.info.limitedLeft;
-		_userpic = !data.userpic
+		_userpic = (!data.userpic || _mode == GiftButtonMode::Selection)
 			? nullptr
 			: data.from
 			? Ui::MakeUserpicThumbnail(data.from)
 			: Ui::MakeHiddenAuthorThumbnail();
-		if (_small && !resale) {
+		if (small() && !resale) {
 			_price = {};
 			_stars.reset();
 			return;
@@ -169,7 +192,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 								? unique->starsForResale
 								: data.info.starsResellMin)
 						).append(data.info.resellCount > 1 ? "+" : ""))
-				: (_small && unique && unique->starsForResale)
+				: (small() && unique && unique->starsForResale)
 				? Data::FormatGiftResaleAsked(*unique)
 				: unique
 				? tr::lng_gift_transfer_button(
@@ -214,7 +237,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	_uniquePatternEmoji = nullptr;
 	_uniquePatternCache.clear();
 
-	if (_small && !resale) {
+	if (small() && !resale) {
 		_button = QRect();
 		return;
 	}
@@ -225,7 +248,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 		QSize(buttonw, buttonh)
 	).marginsAdded(st::giftBoxButtonPadding);
 	const auto skipy = _delegate->buttonSize().height()
-		- (_small
+		- (small()
 			? st::giftBoxButtonBottomSmall
 			: _byStars.isEmpty()
 			? st::giftBoxButtonBottom
@@ -295,11 +318,17 @@ void GiftButton::setGeometry(QRect inner, QMargins extend) {
 }
 
 QMargins GiftButton::currentExtend() const {
-	const auto progress = _selectedAnimation.value(_selected ? 1. : 0.);
+	const auto progress = (_mode == Mode::Selection)
+		? 0.
+		: _selectedAnimation.value(_selected ? 1. : 0.);
 	const auto added = anim::interpolate(0, st::giftBoxSelectSkip, progress);
 	return _extend + QMargins(added, added, added, added);
 }
 
+bool GiftButton::small() const {
+	return _mode != GiftButtonMode::Full;
+}
+
 void GiftButton::toggleSelected(bool selected, anim::type animated) {
 	if (_selected == selected) {
 		if (animated == anim::type::instant) {
@@ -310,8 +339,14 @@ void GiftButton::toggleSelected(bool selected, anim::type animated) {
 	const auto duration = st::defaultRoundCheckbox.duration;
 	_selected = selected;
 	if (animated == anim::type::instant) {
+		if (_check) {
+			_check->finishAnimating();
+		}
 		_selectedAnimation.stop();
 		return;
+	} else if (_check) {
+		_check->setChecked(selected, animated);
+		return;
 	}
 	_selectedAnimation.start([=] {
 		update();
@@ -358,7 +393,9 @@ void GiftButton::paintBackground(QPainter &p, const QImage &background) {
 	}
 
 	auto hq = PainterHighQualityEnabler(p);
-	const auto progress = _selectedAnimation.value(_selected ? 1. : 0.);
+	const auto progress = (_mode == Mode::Selection)
+		? 0.
+		: _selectedAnimation.value(_selected ? 1. : 0.);
 	if (progress < 0.01) {
 		return;
 	}
@@ -446,7 +483,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 	const auto unique = v::is<GiftTypeStars>(_descriptor)
 		? v::get<GiftTypeStars>(_descriptor).info.unique.get()
 		: nullptr;
-	const auto onsale = (unique && unique->starsForResale && _small);
+	const auto onsale = unique && unique->starsForResale && small();
 	const auto requirePremium = v::is<GiftTypeStars>(_descriptor)
 		&& !v::get<GiftTypeStars>(_descriptor).userpic
 		&& !v::get<GiftTypeStars>(_descriptor).info.unique
@@ -482,6 +519,14 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		const auto image = _userpic->image(st::giftBoxUserpicSize);
 		const auto skip = st::giftBoxUserpicSkip;
 		p.drawImage(extend.left() + skip, extend.top() + skip, image);
+	} else if (_check) {
+		const auto skip = st::giftBoxUserpicSkip;
+		_check->paint(
+			p,
+			QPoint(extend.left() + skip, extend.top() + skip),
+			width,
+			_selected,
+			true);
 	}
 
 	auto frame = QImage();
@@ -502,7 +547,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		p.drawImage(
 			QRect(
 				(width - size.width()) / 2,
-				(_small
+				(small()
 					? st::giftBoxSmallStickerTop
 					: _text.isEmpty()
 					? st::giftBoxStickerStarTop
@@ -516,7 +561,7 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 	if (hidden) {
 		const auto topleft = QPoint(
 			(width - st::giftBoxStickerSize.width()) / 2,
-			(_small
+			(small()
 				? st::giftBoxSmallStickerTop
 				: _text.isEmpty()
 				? st::giftBoxStickerStarTop
@@ -781,7 +826,7 @@ QSize Delegate::buttonSize() {
 	const auto available = width - padding.left() - padding.right();
 	const auto singlew = (available - 2 * st::giftBoxGiftSkip.x())
 		/ kGiftsPerRow;
-	const auto minimal = (_mode == GiftButtonMode::Minimal);
+	const auto minimal = (_mode != GiftButtonMode::Full);
 	_single = QSize(
 		singlew,
 		minimal ? st::giftBoxGiftSmall : st::giftBoxGiftHeight);
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index c227f351d1..97c07b3abb 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -34,6 +34,10 @@ namespace Main {
 class Session;
 } // namespace Main
 
+namespace Overview::Layout {
+class Checkbox;
+} // namespace Overview::Layout
+
 namespace Ui {
 class DynamicImage;
 } // namespace Ui
@@ -118,9 +122,10 @@ struct GiftBadge {
 		const GiftBadge &) = default;
 };
 
-enum class GiftButtonMode {
+enum class GiftButtonMode : uint8 {
 	Full,
 	Minimal,
+	Selection,
 };
 
 class GiftButtonDelegate {
@@ -173,7 +178,9 @@ private:
 
 	void setDocument(not_null<DocumentData*> document);
 	[[nodiscard]] QMargins currentExtend() const;
+	[[nodiscard]] bool small() const;
 
+	void onStateChanged(State was, StateChangeSource source) override;
 	void unsubscribe();
 
 	const not_null<GiftButtonDelegate*> _delegate;
@@ -190,11 +197,12 @@ private:
 	base::flat_map<float64, QImage> _uniquePatternCache;
 	std::optional<Ui::Premium::ColoredMiniStars> _stars;
 	Ui::Animations::Simple _selectedAnimation;
+	std::unique_ptr<Overview::Layout::Checkbox> _check;
 	int _resalePrice = 0;
+	GiftButtonMode _mode = GiftButtonMode::Full;
 	bool _subscribed = false;
 	bool _patterned = false;
 	bool _selected = false;
-	bool _small = false;
 
 	QRect _button;
 	QMargins _extend;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 7b4c85d6c5..48c2ecd56e 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -201,6 +201,7 @@ private:
 	const not_null<Window::SessionController*> _window;
 	const not_null<PeerData*> _peer;
 	const int _addingToCollectionId = 0;
+	const GiftButtonMode _mode;
 
 	rpl::variable<Descriptor> _descriptor;
 	Delegate _delegate;
@@ -267,8 +268,11 @@ InnerWidget::InnerWidget(
 , _window(window)
 , _peer(peer)
 , _addingToCollectionId(addingToCollectionId)
+, _mode(_addingToCollectionId
+	? GiftButtonMode::Selection
+	: GiftButtonMode::Minimal)
 , _descriptor(std::move(descriptor))
-, _delegate(&_window->session(), GiftButtonMode::Minimal)
+, _delegate(&_window->session(), _mode)
 , _all(std::move(all))
 , _entries(&_all)
 , _list(&_entries->list)
@@ -750,7 +754,7 @@ void InnerWidget::validateButtons() {
 		view.button->toggleSelected(
 			_addingToCollectionId && _inCollection.contains(manageId),
 			anim::type::instant);
-		view.button->setDescriptor(descriptor, GiftButton::Mode::Minimal);
+		view.button->setDescriptor(descriptor, _mode);
 		view.button->setClickedCallback(callback);
 		return true;
 	};
diff --git a/Telegram/SourceFiles/overview/overview_checkbox.cpp b/Telegram/SourceFiles/overview/overview_checkbox.cpp
new file mode 100644
index 0000000000..9722aa21fe
--- /dev/null
+++ b/Telegram/SourceFiles/overview/overview_checkbox.cpp
@@ -0,0 +1,60 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "overview/overview_checkbox.h"
+
+#include "styles/style_overview.h"
+#include "styles/style_widgets.h"
+
+namespace Overview::Layout {
+
+void Checkbox::paint(
+		QPainter &p,
+		QPoint position,
+		int outerWidth,
+		bool selected,
+		bool selecting) {
+	_check.setDisplayInactive(selecting);
+	_check.setChecked(selected);
+	const auto pression = _pression.value((_active && _pressed) ? 1. : 0.);
+	const auto scale = 1. - (1. - st::overviewCheckPressedSize) * pression;
+	_check.paint(p, position.x(), position.y(), outerWidth, scale);
+}
+
+void Checkbox::setActive(bool active) {
+	_active = active;
+	if (_pressed) {
+		startAnimation();
+	}
+}
+
+void Checkbox::setPressed(bool pressed) {
+	_pressed = pressed;
+	if (_active) {
+		startAnimation();
+	}
+}
+
+void Checkbox::setChecked(bool checked, anim::type animated) {
+	_check.setChecked(checked, animated);
+}
+
+void Checkbox::startAnimation() {
+	const auto showPressed = (_pressed && _active);
+	_pression.start(
+		_updateCallback,
+		showPressed ? 0. : 1.,
+		showPressed ? 1. : 0.,
+		st::overviewCheck.duration);
+}
+
+void Checkbox::finishAnimating() {
+	_pression.stop();
+	_check.finishAnimating();
+}
+
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_checkbox.h b/Telegram/SourceFiles/overview/overview_checkbox.h
new file mode 100644
index 0000000000..2da919e232
--- /dev/null
+++ b/Telegram/SourceFiles/overview/overview_checkbox.h
@@ -0,0 +1,54 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/effects/round_checkbox.h"
+
+namespace style {
+struct RoundCheckbox;
+} // namespace style
+
+namespace Overview::Layout {
+
+class Checkbox {
+public:
+	template <typename UpdateCallback>
+	Checkbox(UpdateCallback callback, const style::RoundCheckbox &st)
+	: _updateCallback(callback)
+	, _check(st, _updateCallback) {
+	}
+
+	void paint(
+		QPainter &p,
+		QPoint position,
+		int outerWidth,
+		bool selected,
+		bool selecting);
+
+	void setActive(bool active);
+	void setPressed(bool pressed);
+	void setChecked(bool checked, anim::type animated = anim::type::normal);
+	void finishAnimating();
+
+	void invalidateCache() {
+		_check.invalidateCache();
+	}
+
+private:
+	void startAnimation();
+
+	Fn<void()> _updateCallback;
+	Ui::RoundCheckbox _check;
+
+	Ui::Animations::Simple _pression;
+	bool _active = false;
+	bool _pressed = false;
+
+};
+
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index 56468feb63..7f73fddbc9 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "overview/overview_layout.h"
 
+#include "overview/overview_checkbox.h"
 #include "overview/overview_layout_delegate.h"
 #include "core/ui_integration.h" // TextContext
 #include "data/data_document.h"
@@ -49,8 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat_helpers.h"
 #include "styles/style_overview.h"
 
-namespace Overview {
-namespace Layout {
+namespace Overview::Layout {
 namespace {
 
 using TextState = HistoryView::TextState;
@@ -123,62 +123,6 @@ void PaintSensitiveTag(Painter &p, QRect r) {
 
 } // namespace
 
-class Checkbox {
-public:
-	template <typename UpdateCallback>
-	Checkbox(UpdateCallback callback, const style::RoundCheckbox &st)
-	: _updateCallback(callback)
-	, _check(st, _updateCallback) {
-	}
-
-	void paint(Painter &p, QPoint position, int outerWidth, bool selected, bool selecting);
-
-	void setActive(bool active);
-	void setPressed(bool pressed);
-
-	void invalidateCache() {
-		_check.invalidateCache();
-	}
-
-private:
-	void startAnimation();
-
-	Fn<void()> _updateCallback;
-	Ui::RoundCheckbox _check;
-
-	Ui::Animations::Simple _pression;
-	bool _active = false;
-	bool _pressed = false;
-
-};
-
-void Checkbox::paint(Painter &p, QPoint position, int outerWidth, bool selected, bool selecting) {
-	_check.setDisplayInactive(selecting);
-	_check.setChecked(selected);
-	const auto pression = _pression.value((_active && _pressed) ? 1. : 0.);
-	const auto masterScale = 1. - (1. - st::overviewCheckPressedSize) * pression;
-	_check.paint(p, position.x(), position.y(), outerWidth, masterScale);
-}
-
-void Checkbox::setActive(bool active) {
-	_active = active;
-	if (_pressed) {
-		startAnimation();
-	}
-}
-
-void Checkbox::setPressed(bool pressed) {
-	_pressed = pressed;
-	if (_active) {
-		startAnimation();
-	}
-}
-
-void Checkbox::startAnimation() {
-	auto showPressed = (_pressed && _active);
-	_pression.start(_updateCallback, showPressed ? 0. : 1., showPressed ? 1. : 0., st::overviewCheck.duration);
-}
-
 ItemBase::ItemBase(
 	not_null<Delegate*> delegate,
 	not_null<HistoryItem*> parent)
@@ -2501,5 +2445,4 @@ void Gif::updateStatusText() {
 	}
 }
 
-} // namespace Layout
-} // namespace Overview
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_layout.h b/Telegram/SourceFiles/overview/overview_layout.h
index 74402d4985..7a068d1cd1 100644
--- a/Telegram/SourceFiles/overview/overview_layout.h
+++ b/Telegram/SourceFiles/overview/overview_layout.h
@@ -31,8 +31,7 @@ namespace Ui {
 class SpoilerAnimation;
 } // namespace Ui
 
-namespace Overview {
-namespace Layout {
+namespace Overview::Layout {
 
 class Checkbox;
 class ItemBase;
@@ -512,5 +511,4 @@ private:
 
 };
 
-} // namespace Layout
-} // namespace Overview
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/overview/overview_layout_delegate.h b/Telegram/SourceFiles/overview/overview_layout_delegate.h
index 0b81b33583..ff129a2366 100644
--- a/Telegram/SourceFiles/overview/overview_layout_delegate.h
+++ b/Telegram/SourceFiles/overview/overview_layout_delegate.h
@@ -9,8 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class StickerPremiumMark;
 
-namespace Overview {
-namespace Layout {
+namespace Overview::Layout {
 
 class ItemBase;
 
@@ -31,5 +30,4 @@ public:
 
 };
 
-} // namespace Layout
-} // namespace Overview
+} // namespace Overview::Layout
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
index fbd67b220f..f74ecd0d59 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.cpp
@@ -308,6 +308,10 @@ void RoundCheckbox::setChecked(bool newChecked, anim::type animated) {
 	}
 }
 
+void RoundCheckbox::finishAnimating() {
+	_checkedProgress.stop();
+}
+
 void RoundCheckbox::invalidateCache() {
 	if (!_inactiveCacheBg.isNull() || !_inactiveCacheFg.isNull()) {
 		prepareInactiveCache();
diff --git a/Telegram/SourceFiles/ui/effects/round_checkbox.h b/Telegram/SourceFiles/ui/effects/round_checkbox.h
index 49377c0ec4..fa22110596 100644
--- a/Telegram/SourceFiles/ui/effects/round_checkbox.h
+++ b/Telegram/SourceFiles/ui/effects/round_checkbox.h
@@ -34,6 +34,7 @@ public:
 	void setChecked(
 		bool newChecked,
 		anim::type animated = anim::type::normal);
+	void finishAnimating();
 
 	void invalidateCache();
 

From a3cdae1e94062b47517abf889aefb91af1c9eff8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Aug 2025 16:28:52 +0400
Subject: [PATCH 210/341] Fix refreshing story file reference.

---
 Telegram/SourceFiles/apiwrap.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 6a89510329..bb7dde822a 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -2458,7 +2458,16 @@ void ApiWrap::refreshFileReference(
 	v::match(origin.data, [&](Data::FileOriginMessage data) {
 		if (const auto item = _session->data().message(data)) {
 			const auto media = item->media();
-			const auto storyId = media ? media->storyId() : FullStoryId();
+			const auto mediaStory = media ? media->storyId() : FullStoryId();
+			const auto storyId = mediaStory
+				? mediaStory
+				: FullStoryId(
+					(IsStoryMsgId(item->id)
+						? item->history()->peer->id
+						: PeerId()),
+					(IsStoryMsgId(item->id)
+						? StoryIdFromMsgId(item->id)
+						: StoryId()));
 			if (storyId) {
 				request(MTPstories_GetStoriesByID(
 					_session->data().peer(storyId.peer)->input,

From 0d8065fc1f4911548c08d217d06e38aa65486b15 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 2 May 2025 17:34:10 +0400
Subject: [PATCH 211/341] First attempt of Ctrl+Tab/Ctrl+Shift+Tab UI.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/SourceFiles/core/application.cpp     |  14 +-
 Telegram/SourceFiles/core/shortcuts.cpp       |  79 +++++-
 Telegram/SourceFiles/core/shortcuts.h         |  15 +-
 .../data/components/recent_peers.cpp          |  27 +++
 .../data/components/recent_peers.h            |   8 +
 Telegram/SourceFiles/window/window.style      |   8 +
 .../window/window_chat_switch_process.cpp     | 225 ++++++++++++++++++
 .../window/window_chat_switch_process.h       |  82 +++++++
 .../window/window_session_controller.cpp      |  46 +++-
 .../window/window_session_controller.h        |   3 +
 11 files changed, 498 insertions(+), 11 deletions(-)
 create mode 100644 Telegram/SourceFiles/window/window_chat_switch_process.cpp
 create mode 100644 Telegram/SourceFiles/window/window_chat_switch_process.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 4de746002d..76ea20879b 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1663,6 +1663,8 @@ PRIVATE
     window/window_adaptive.h
     window/window_chat_preview.cpp
     window/window_chat_preview.h
+    window/window_chat_switch_process.cpp
+    window/window_chat_switch_process.h
     window/window_connecting_widget.cpp
     window/window_connecting_widget.h
     window/window_controller.cpp
diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 51fa20fcc6..190f4431b4 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -656,8 +656,20 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 		updateNonIdle();
 	} break;
 
+	case QEvent::KeyRelease: {
+		const auto event = static_cast<QKeyEvent*>(e);
+		if (Shortcuts::HandlePossibleChatSwitch(event)) {
+			return true;
+		}
+	} break;
+
 	case QEvent::ShortcutOverride: {
-		// handle shortcuts ourselves
+		// Ctrl+Tab/Ctrl+Shift+Tab chat switch is a special shortcut case,
+		// because it not only does an action on the shortcut activation,
+		// but also keeps the UI visible until you release the Ctrl key.
+		Shortcuts::HandlePossibleChatSwitch(static_cast<QKeyEvent*>(e));
+
+		// Handle all the shortcut management manually.
 		return true;
 	} break;
 
diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 061120af0d..87a186b48d 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -30,6 +30,10 @@ constexpr auto kCountLimit = 256; // How many shortcuts can be in json file.
 rpl::event_stream<not_null<Request*>> RequestsStream;
 bool Paused/* = false*/;
 
+Qt::Key ChatSwitchModifier/* = Qt::Key()*/;
+bool ChatSwitchStarted/* = false*/;
+rpl::event_stream<ChatSwitchRequest> ChatSwitchStream;
+
 const auto AutoRepeatCommands = base::flat_set<Command>{
 	Command::MediaPrevious,
 	Command::MediaNext,
@@ -156,6 +160,7 @@ public:
 	void toggleMedia(bool toggled);
 	void toggleSupport(bool toggled);
 	void listen(not_null<QWidget*> widget);
+	[[nodiscard]] bool handles(const QKeySequence &sequence) const;
 
 	[[nodiscard]] const QStringList &errors() const;
 
@@ -361,6 +366,10 @@ void Manager::listen(not_null<QWidget*> widget) {
 	}
 }
 
+bool Manager::handles(const QKeySequence &sequence) const {
+	return _shortcuts.contains(sequence);
+}
+
 void Manager::pruneListened() {
 	for (auto i = begin(_listened); i != end(_listened);) {
 		if (i->data()) {
@@ -470,10 +479,6 @@ void Manager::fillDefaults() {
 	set(u"ctrl+pgup"_q, Command::ChatPrevious);
 	set(u"alt+up"_q, Command::ChatPrevious);
 
-	set(u"%1+tab"_q.arg(ctrl), Command::ChatNext);
-	set(u"%1+shift+tab"_q.arg(ctrl), Command::ChatPrevious);
-	set(u"%1+backtab"_q.arg(ctrl), Command::ChatPrevious);
-
 	set(u"ctrl+alt+home"_q, Command::ChatFirst);
 	set(u"ctrl+alt+end"_q, Command::ChatLast);
 
@@ -800,6 +805,72 @@ bool HandleEvent(
 	return Launch(Data.lookup(object));
 }
 
+void CancelChatSwitch(Qt::Key result) {
+	ChatSwitchModifier = Qt::Key();
+	if (ChatSwitchStarted) {
+		ChatSwitchStarted = false;
+		ChatSwitchStream.fire({ .action = result });
+	}
+}
+
+rpl::producer<ChatSwitchRequest> ChatSwitchRequests() {
+	return ChatSwitchStream.events();
+}
+
+bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
+	const auto type = event->type();
+	if (Paused) {
+		return false;
+	} else if (type == QEvent::ShortcutOverride) {
+		const auto key = Qt::Key(event->key());
+		if (key == Qt::Key_Escape) {
+			CancelChatSwitch(Qt::Key_Escape);
+			return false;
+		} else if (key == Qt::Key_Return || key == Qt::Key_Enter) {
+			CancelChatSwitch(Qt::Key_Enter);
+			return false;
+		}
+		const auto ctrl = Platform::IsMac()
+			? Qt::MetaModifier
+			: Qt::ControlModifier;
+
+		if (Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)
+			&& Data.handles(QKeySequence(ctrl | Qt::Key_Tab))
+			&& Data.handles(QKeySequence(ctrl | Qt::Key_Backtab))) {
+			return false;
+		} else if (key == Qt::Key_Control || key == Qt::Key_Meta) {
+			ChatSwitchModifier = key;
+		} else if (key == Qt::Key_Tab || key == Qt::Key_Backtab) {
+			const auto modifiers = event->modifiers();
+			if (modifiers & ctrl) {
+				if (Data.handles(modifiers | key)) {
+					return false;
+				}
+				if (ChatSwitchModifier == Qt::Key()) {
+					ChatSwitchModifier = Platform::IsMac()
+						? Qt::Key_Meta
+						: Qt::Key_Control;
+				}
+				const auto action = (modifiers & Qt::ShiftModifier)
+					? Qt::Key_Backtab
+					: key;
+				const auto started = !std::exchange(ChatSwitchStarted, true);
+				ChatSwitchStream.fire({
+					.action = action,
+					.started = started,
+				});
+				return true;
+			}
+		}
+	} else if (type == QEvent::KeyRelease) {
+		const auto key = Qt::Key(event->key());
+		if (key == ChatSwitchModifier) {
+			CancelChatSwitch(Qt::Key_Enter);
+		}
+	}
+	return false;
+}
+
 void ToggleMediaShortcuts(bool toggled) {
 	Data.toggleMedia(toggled);
 }
diff --git a/Telegram/SourceFiles/core/shortcuts.h b/Telegram/SourceFiles/core/shortcuts.h
index ee832915b0..dffb31ec63 100644
--- a/Telegram/SourceFiles/core/shortcuts.h
+++ b/Telegram/SourceFiles/core/shortcuts.h
@@ -7,6 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+class QKeyEvent;
+class QShortcutEvent;
+
 namespace Shortcuts {
 
 enum class Command {
@@ -122,7 +125,7 @@ private:
 
 };
 
-rpl::producer<not_null<Request*>> Requests();
+[[nodiscard]] rpl::producer<not_null<Request*>> Requests();
 
 void Start();
 void Finish();
@@ -132,7 +135,15 @@ void Listen(not_null<QWidget*> widget);
 bool Launch(Command command);
 bool HandleEvent(not_null<QObject*> object, not_null<QShortcutEvent*> event);
 
-const QStringList &Errors();
+bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event);
+
+struct ChatSwitchRequest {
+	Qt::Key action = Qt::Key_Tab; // Key_Tab, Key_Backtab or Key_Escape.
+	bool started = false;
+};
+[[nodiscard]] rpl::producer<ChatSwitchRequest> ChatSwitchRequests();
+
+[[nodiscard]] const QStringList &Errors();
 
 // Media shortcuts are not enabled by default, because other
 // applications also use them. They are enabled only when
diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index 0997cc1507..e397bcbaf1 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -7,6 +7,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/components/recent_peers.h"
 
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "history/history.h"
 #include "main/main_session.h"
 #include "storage/serialize_common.h"
 #include "storage/serialize_peer.h"
@@ -133,4 +136,28 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 		("Suggestions: RecentPeers read OK, count: %1").arg(_list.size()));
 }
 
+std::vector<not_null<Thread*>> RecentPeers::collectChatOpenHistory() const {
+	_session->local().readSearchSuggestions();
+
+	auto result = _opens;
+	result.reserve(result.size() + _list.size());
+	for (const auto &peer : _list) {
+		const auto history = peer->owner().history(peer);
+		const auto thread = not_null<Data::Thread*>(history);
+		if (!ranges::contains(result, thread)) {
+			result.push_back(thread);
+		}
+	}
+	return result;
+}
+
+void RecentPeers::chatOpenPush(not_null<Thread*> thread) {
+	const auto i = ranges::find(_opens, thread);
+	if (i == end(_opens)) {
+		_opens.insert(begin(_opens), thread);
+	} else if (i != begin(_opens)) {
+		ranges::rotate(begin(_opens), i, i + 1);
+	}
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_peers.h b/Telegram/SourceFiles/data/components/recent_peers.h
index e30942720e..4d0fa5dc6a 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.h
+++ b/Telegram/SourceFiles/data/components/recent_peers.h
@@ -13,6 +13,8 @@ class Session;
 
 namespace Data {
 
+class Thread;
+
 class RecentPeers final {
 public:
 	explicit RecentPeers(not_null<Main::Session*> session);
@@ -28,10 +30,16 @@ public:
 	[[nodiscard]] QByteArray serialize() const;
 	void applyLocal(QByteArray serialized);
 
+	[[nodiscard]] auto collectChatOpenHistory() const
+		-> std::vector<not_null<Thread*>>;
+	void chatOpenPush(not_null<Thread*> thread);
+
 private:
 	const not_null<Main::Session*> _session;
 
 	std::vector<not_null<PeerData*>> _list;
+	std::vector<not_null<Thread*>> _opens;
+
 	rpl::event_stream<> _updates;
 
 };
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 26e77ab1f1..63c98b936f 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -331,6 +331,14 @@ ivHeightDefault: 800px;
 
 maxWidthSharedMediaWindow: 419px;
 
+chatSwitchMargins: margins(16px, 16px, 16px, 16px);
+chatSwitchPadding: margins(12px, 12px, 12px, 12px);
+chatSwitchSize: size(72px, 72px);
+chatSwitchUserpic: UserpicButton(defaultUserpicButton) {
+	size: size(56px, 56px);
+	photoSize: 56px;
+}
+
 // Windows specific
 
 winQuitIcon: icon {{ "win_quit", windowFg }};
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
new file mode 100644
index 0000000000..2cdc13dc09
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -0,0 +1,225 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "window/window_chat_switch_process.h"
+
+#include "core/shortcuts.h"
+#include "data/components/recent_peers.h"
+#include "data/data_thread.h"
+#include "main/main_session.h"
+#include "ui/widgets/shadow.h"
+#include "ui/controls/userpic_button.h"
+#include "ui/rp_widget.h"
+#include "styles/style_layers.h"
+#include "styles/style_window.h"
+
+namespace Window {
+
+ChatSwitchProcess::ChatSwitchProcess(
+	not_null<Ui::RpWidget*> geometry,
+	not_null<Main::Session*> session,
+	Data::Thread *opened)
+: _session(session)
+, _widget(std::make_unique<Ui::RpWidget>(
+	geometry->parentWidget() ? geometry->parentWidget() : geometry))
+, _view(Ui::CreateChild<Ui::RpWidget>(_widget.get()))\
+, _bg(st::boxRadius, st::boxBg)
+, _over(st::boxRadius, st::windowBgOver) {
+	setupWidget(geometry);
+	setupContent(opened);
+	setupView();
+}
+
+ChatSwitchProcess::~ChatSwitchProcess() = default;
+
+rpl::producer<not_null<Data::Thread*>> ChatSwitchProcess::chosen() const {
+	return _chosen.events();
+}
+
+rpl::producer<> ChatSwitchProcess::closeRequests() const {
+	return _closeRequests.events();
+}
+
+void ChatSwitchProcess::process(const Request &request) {
+	Expects(_selected < int(_list.size()));
+
+	const auto count = int(_list.size());
+	if (request.action == Qt::Key_Escape) {
+		_closeRequests.fire({});
+	} else if (request.action == Qt::Key_Enter) {
+		if (_selected >= 0) {
+			_chosen.fire_copy(_list[_selected]);
+		} else {
+			_closeRequests.fire({});
+		}
+	} else if (request.action == Qt::Key_Tab) {
+		if (_selected < 0 || _selected + 1 >= count) {
+			setSelected(0);
+		} else {
+			setSelected(_selected + 1);
+		}
+	} else if (request.action == Qt::Key_Backtab) {
+		if (_selected <= 0) {
+			setSelected(count - 1);
+		} else {
+			setSelected(_selected - 1);
+		}
+	}
+}
+
+void ChatSwitchProcess::setSelected(int index) {
+	if (_selected == index || _list.empty()) {
+		return;
+	}
+	if (_selected >= 0) {
+		_entries[_selected].button->update();
+	}
+	_selected = index;
+	if (_selected >= 0) {
+		_entries[_selected].button->update();
+	}
+}
+
+void ChatSwitchProcess::setupWidget(not_null<Ui::RpWidget*> geometry) {
+	geometry->geometryValue(
+	) | rpl::start_with_next([=](QRect value) {
+		const auto parent = geometry->parentWidget();
+		_widget->setGeometry((parent == _widget->parentWidget())
+			? value
+			: QRect(QPoint(), value.size()));
+	}, _widget->lifetime());
+
+	_widget->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			_closeRequests.fire({});
+		}
+	}, _widget->lifetime());
+
+	_widget->show();
+}
+
+void ChatSwitchProcess::setupContent(Data::Thread *opened) {
+	_list = _session->recentPeers().collectChatOpenHistory();
+	if (opened) {
+		const auto i = ranges::find(_list, not_null(opened));
+		if (i == end(_list)) {
+			_list.insert(begin(_list), opened);
+		} else if (i != begin(_list)) {
+			ranges::rotate(begin(_list), i, i + 1);
+		}
+		_selected = 0;
+	}
+
+	auto index = 0;
+	for (const auto &thread : _list) {
+		const auto button = Ui::CreateChild<Ui::AbstractButton>(_view.get());
+		button->resize(st::chatSwitchSize);
+		button->paintRequest() | rpl::start_with_next([=] {
+			if (index == _selected) {
+				auto p = QPainter(button);
+				_over.paint(p, button->rect());
+			}
+		}, button->lifetime());
+		button->setClickedCallback([=] {
+			_chosen.fire_copy(thread);
+		});
+		button->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+			if (e->type() == QEvent::MouseMove) {
+				setSelected(index);
+			}
+		}, button->lifetime());
+		button->show();
+
+		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+			button,
+			thread->peer(),
+			st::chatSwitchUserpic);
+		userpic->show();
+		userpic->move(
+			((button->width() - userpic->width()) / 2),
+			((button->height() - userpic->height()) / 2));
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		_entries.push_back({ .button = button });
+
+		++index;
+	}
+}
+
+void ChatSwitchProcess::setupView() {
+	_widget->sizeValue() | rpl::start_with_next([=](QSize size) {
+		layout(size);
+	}, _view->lifetime());
+	_view->show();
+
+	_view->paintRequest() | rpl::start_with_next([=](QRect clip) {
+		if (_outer.isEmpty()) {
+			return;
+		}
+		auto p = QPainter(_view);
+		p.translate(-_shadowed.topLeft());
+		Ui::Shadow::paint(p, _outer, _view->width(), st::boxRoundShadow);
+		_bg.paint(p, _outer);
+	}, _view->lifetime());
+
+	_view->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			e->accept();
+		}
+	}, _view->lifetime());
+}
+
+void ChatSwitchProcess::layout(QSize size) {
+	const auto full = QRect(QPoint(), size);
+	const auto outer = full.marginsRemoved(st::chatSwitchMargins);
+	auto inner = outer.marginsRemoved(st::chatSwitchPadding);
+	const auto available = inner.width();
+	const auto canPerRow = (available / st::chatSwitchSize.width());
+	if (canPerRow < 1 || _list.empty()) {
+		return;
+	}
+	const auto count = int(_list.size());
+	const auto rows = (count + canPerRow - 1) / canPerRow;
+	const auto minPerRow = count / rows;
+	const auto wideRows = (count - (minPerRow * rows));
+	const auto maxPerRow = wideRows ? (minPerRow + 1) : minPerRow;
+	const auto narrowShift = wideRows ? (st::chatSwitchSize.width() / 2) : 0;
+	const auto width = maxPerRow * st::chatSwitchSize.width();
+	const auto height = rows * st::chatSwitchSize.height();
+
+	size = QSize(width, height);
+	_inner = QRect(
+		(full.width() - width) / 2,
+		(full.height() - height) / 2,
+		width,
+		height);
+	_outer = _inner.marginsAdded(st::chatSwitchPadding);
+
+	const auto padding = st::boxRoundShadow.extend + st::chatSwitchPadding;
+
+	auto index = 0;
+	auto top = padding.top();
+	for (auto row = 0; row != rows; ++row) {
+		const auto columns = (row < wideRows) ? maxPerRow : minPerRow;
+		auto left = padding.left() + ((row < wideRows) ? 0 : narrowShift);
+		for (auto column = 0; column != columns; ++column) {
+			auto &entry = _entries[index++];
+			entry.button->moveToLeft(left, top, _inner.width());
+			left += st::chatSwitchSize.width();
+		}
+		top += st::chatSwitchSize.height();
+	}
+
+	_shadowed = _outer.marginsAdded(st::boxRoundShadow.extend);
+	_view->setGeometry(_shadowed);
+}
+
+rpl::lifetime &ChatSwitchProcess::lifetime() {
+	return _lifetime;
+}
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.h b/Telegram/SourceFiles/window/window_chat_switch_process.h
new file mode 100644
index 0000000000..632bf8137c
--- /dev/null
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.h
@@ -0,0 +1,82 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/round_rect.h"
+
+namespace Data {
+class Thread;
+} // namespace Data
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Shortcuts {
+struct ChatSwitchRequest;
+} // namespace Shortcuts
+
+namespace Ui {
+class AbstractButton;
+class RpWidget;
+} // namespace Ui
+
+namespace Window {
+
+class ChatSwitchProcess final {
+public:
+	// Create widget in geometry->parentWidget() and geometry->geometry().
+	ChatSwitchProcess(
+		not_null<Ui::RpWidget*> geometry,
+		not_null<Main::Session*> session,
+		Data::Thread *opened);
+	~ChatSwitchProcess();
+
+	[[nodiscard]] rpl::producer<not_null<Data::Thread*>> chosen() const;
+	[[nodiscard]] rpl::producer<> closeRequests() const;
+
+	using Request = Shortcuts::ChatSwitchRequest;
+	void process(const Request &request);
+
+	[[nodiscard]] rpl::lifetime &lifetime();
+
+private:
+	struct Entry {
+		not_null<Ui::AbstractButton*> button;
+	};
+	void setupWidget(not_null<Ui::RpWidget*> geometry);
+	void setupContent(Data::Thread *opened);
+	void setupView();
+
+	void layout(QSize size);
+
+	void setSelected(int index);
+
+	const not_null<Main::Session*> _session;
+	const std::unique_ptr<Ui::RpWidget> _widget;
+	const not_null<Ui::RpWidget*> _view;
+
+	QRect _shadowed;
+	QRect _outer;
+	QRect _inner;
+	Ui::RoundRect _bg;
+	Ui::RoundRect _over;
+
+	std::vector<not_null<Data::Thread*>> _list;
+	std::vector<Entry> _entries;
+
+	int _selected = -1;
+
+	rpl::event_stream<not_null<Data::Thread*>> _chosen;
+	rpl::event_stream<> _closeRequests;
+
+	rpl::lifetime _lifetime;
+
+};
+
+} // namespace Window
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 292ceb1fbb..237f39f65b 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/peers/replace_boost_box.h"
 #include "boxes/delete_messages_box.h"
 #include "window/window_chat_preview.h"
+#include "window/window_chat_switch_process.h"
 #include "window/window_controller.h"
 #include "window/window_filters_menu.h"
 #include "window/window_separate_id.h"
@@ -32,6 +33,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_subsection_tabs.h"
 #include "media/player/media_player_instance.h"
 #include "media/view/media_view_open_common.h"
+#include "data/components/recent_peers.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "data/data_document_resolver.h"
 #include "data/data_download_manager.h"
@@ -1735,18 +1737,50 @@ void SessionController::init() {
 }
 
 void SessionController::setupShortcuts() {
-	Shortcuts::Requests(
+	using namespace Shortcuts;
+
+	ChatSwitchRequests(
+	) | rpl::filter([=](const ChatSwitchRequest &request) {
+		return !window().locked()
+			&& (_chatSwitchProcess
+				|| (request.started
+					&& (Core::App().activeWindow() == &window())));
+	}) | rpl::start_with_next([=](const ChatSwitchRequest &request) {
+		if (!_chatSwitchProcess) {
+			_chatSwitchProcess = std::make_unique<ChatSwitchProcess>(
+				widget()->bodyWidget(),
+				&session(),
+				activeChatCurrent().thread());
+			const auto close = [this, raw = _chatSwitchProcess.get()] {
+				if (_chatSwitchProcess.get() == raw) {
+					base::take(_chatSwitchProcess);
+				}
+			};
+
+			_chatSwitchProcess->chosen(
+			) | rpl::start_with_next([=](not_null<Data::Thread*> thread) {
+				close();
+				jumpToChatListEntry({ Dialogs::Key(thread), FullMsgId() });
+			}, _chatSwitchProcess->lifetime());
+
+			_chatSwitchProcess->closeRequests(
+			) | rpl::start_with_next(close, _chatSwitchProcess->lifetime());
+		}
+		_chatSwitchProcess->process(request);
+	}, _lifetime);
+
+	Requests(
 	) | rpl::filter([=] {
 		return (Core::App().activeWindow() == &window())
 			&& !isLayerShown()
 			&& !window().locked();
-	}) | rpl::start_with_next([=](not_null<Shortcuts::Request*> request) {
-		using C = Shortcuts::Command;
+	}) | rpl::start_with_next([=](not_null<Request*> request) {
+		using C = Command;
 
 		const auto app = &Core::App();
 		const auto accountsCount = int(app->domain().accounts().size());
 		auto &&accounts = ranges::views::zip(
-			Shortcuts::kShowAccount,
+			kShowAccount,
 			ranges::views::ints(0, accountsCount));
 		for (const auto &[command, index] : accounts) {
 			request->check(command) && request->handle([=] {
@@ -2033,6 +2067,10 @@ void SessionController::setActiveChatEntry(Dialogs::RowDescriptor row) {
 					{ anim::type::normal, anim::activation::background });
 			}, _activeHistoryLifetime);
 		}
+
+		if (const auto thread = row.key.thread()) {
+			session().recentPeers().chatOpenPush(thread);
+		}
 	}
 	if (session().supportMode()) {
 		pushToChatEntryHistory(row);
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 8ca4819def..7f46a54ffd 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -99,6 +99,7 @@ class SectionMemento;
 class Controller;
 class FiltersMenu;
 class ChatPreviewManager;
+class ChatSwitchProcess;
 
 struct PeerByLinkInfo;
 struct SeparateId;
@@ -784,6 +785,8 @@ private:
 	std::deque<std::shared_ptr<Ui::ChatTheme>> _lastUsedCustomChatThemes;
 	rpl::variable<PeerThemeOverride> _peerThemeOverride;
 
+	std::unique_ptr<ChatSwitchProcess> _chatSwitchProcess;
+
 	base::has_weak_ptr _storyOpenGuard;
 
 	QString _premiumRef;

From fe26594f12fe3231baffc9cb41bb65d80fe41f04 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 21 Aug 2025 18:04:19 +0400
Subject: [PATCH 212/341] Improve Ctrl+Tab switch design.

---
 Telegram/SourceFiles/window/window.style      | 13 ++++-
 .../window/window_chat_switch_process.cpp     | 53 ++++++++++++++++---
 .../window/window_chat_switch_process.h       |  6 +--
 .../window/window_session_controller.cpp      |  7 ++-
 4 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 63c98b936f..cb4c5ba7c2 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -333,11 +333,22 @@ maxWidthSharedMediaWindow: 419px;
 
 chatSwitchMargins: margins(16px, 16px, 16px, 16px);
 chatSwitchPadding: margins(12px, 12px, 12px, 12px);
-chatSwitchSize: size(72px, 72px);
+chatSwitchSize: size(72px, 104px);
 chatSwitchUserpic: UserpicButton(defaultUserpicButton) {
 	size: size(56px, 56px);
 	photoSize: 56px;
 }
+chatSwitchUserpicTop: 8px;
+chatSwitchNameLabel: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+	align: align(top);
+	minWidth: 56px;
+	maxHeight: 36px;
+}
+chatSwitchNameSkip: 6px;
+chatSwitchSelectLine: 3px;
 
 // Windows specific
 
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index 2cdc13dc09..f49f1b26cb 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -11,14 +11,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/components/recent_peers.h"
 #include "data/data_thread.h"
 #include "main/main_session.h"
+#include "ui/widgets/labels.h"
 #include "ui/widgets/shadow.h"
 #include "ui/controls/userpic_button.h"
+#include "ui/painter.h"
 #include "ui/rp_widget.h"
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
 
 namespace Window {
 
+struct ChatSwitchProcess::Entry {
+	not_null<Ui::AbstractButton*> button;
+	Ui::Animations::Simple overAnimation;
+};
+
 ChatSwitchProcess::ChatSwitchProcess(
 	not_null<Ui::RpWidget*> geometry,
 	not_null<Main::Session*> session,
@@ -27,8 +34,7 @@ ChatSwitchProcess::ChatSwitchProcess(
 , _widget(std::make_unique<Ui::RpWidget>(
 	geometry->parentWidget() ? geometry->parentWidget() : geometry))
 , _view(Ui::CreateChild<Ui::RpWidget>(_widget.get()))\
-, _bg(st::boxRadius, st::boxBg)
-, _over(st::boxRadius, st::windowBgOver) {
+, _bg(st::boxRadius, st::boxBg) {
 	setupWidget(geometry);
 	setupContent(opened);
 	setupView();
@@ -76,11 +82,19 @@ void ChatSwitchProcess::setSelected(int index) {
 		return;
 	}
 	if (_selected >= 0) {
-		_entries[_selected].button->update();
+		auto &entry = _entries[_selected];
+		const auto raw = entry.button.get();
+		entry.overAnimation.start([=] {
+			raw->update();
+		}, 1., 0., st::slideWrapDuration);
 	}
 	_selected = index;
 	if (_selected >= 0) {
-		_entries[_selected].button->update();
+		auto &entry = _entries[_selected];
+		const auto raw = entry.button.get();
+		entry.overAnimation.start([=] {
+			raw->update();
+		}, 0., 1., st::slideWrapDuration);
 	}
 }
 
@@ -119,9 +133,19 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 		const auto button = Ui::CreateChild<Ui::AbstractButton>(_view.get());
 		button->resize(st::chatSwitchSize);
 		button->paintRequest() | rpl::start_with_next([=] {
-			if (index == _selected) {
+			const auto selection = _entries[index].overAnimation.value(
+				(index == _selected) ? 1. : 0.);
+			if (selection > 0.) {
 				auto p = QPainter(button);
-				_over.paint(p, button->rect());
+				auto hq = PainterHighQualityEnabler(p);
+				const auto radius = st::boxRadius;
+				const auto line = st::chatSwitchSelectLine;
+				auto pen = st::defaultRoundCheckbox.bgActive->p;
+				pen.setWidthF(line * selection);
+				p.setPen(pen);
+				const auto r = QRectF(button->rect()).marginsRemoved(
+					{ line / 2., line / 2., line / 2., line / 2. });
+				p.drawRoundedRect(r, radius, radius);
 			}
 		}, button->lifetime());
 		button->setClickedCallback([=] {
@@ -141,9 +165,24 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 		userpic->show();
 		userpic->move(
 			((button->width() - userpic->width()) / 2),
-			((button->height() - userpic->height()) / 2));
+			st::chatSwitchUserpicTop);
 		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 
+		const auto label = Ui::CreateChild<Ui::FlatLabel>(
+			button,
+			thread->chatListName(),
+			st::chatSwitchNameLabel);
+		label->setBreakEverywhere(true);
+		label->show();
+		label->resizeToNaturalWidth(
+			button->width() - 2 * st::chatSwitchNameSkip);
+		label->move(
+			(button->width() - label->width()) / 2,
+			(button->height()
+				+ userpic->y()
+				+ userpic->height()
+				- label->height()) / 2);
+
 		_entries.push_back({ .button = button });
 
 		++index;
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.h b/Telegram/SourceFiles/window/window_chat_switch_process.h
index 632bf8137c..5f55768e9e 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.h
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.h
@@ -46,9 +46,8 @@ public:
 	[[nodiscard]] rpl::lifetime &lifetime();
 
 private:
-	struct Entry {
-		not_null<Ui::AbstractButton*> button;
-	};
+	struct Entry;
+
 	void setupWidget(not_null<Ui::RpWidget*> geometry);
 	void setupContent(Data::Thread *opened);
 	void setupView();
@@ -65,7 +64,6 @@ private:
 	QRect _outer;
 	QRect _inner;
 	Ui::RoundRect _bg;
-	Ui::RoundRect _over;
 
 	std::vector<not_null<Data::Thread*>> _list;
 	std::vector<Entry> _entries;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 237f39f65b..32fb9fbca9 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -2067,10 +2067,9 @@ void SessionController::setActiveChatEntry(Dialogs::RowDescriptor row) {
 					{ anim::type::normal, anim::activation::background });
 			}, _activeHistoryLifetime);
 		}
-
-		if (const auto thread = row.key.thread()) {
-			session().recentPeers().chatOpenPush(thread);
-		}
+	}
+	if (const auto thread = row.key.thread()) {
+		session().recentPeers().chatOpenPush(thread);
 	}
 	if (session().supportMode()) {
 		pushToChatEntryHistory(row);

From 57d459b917656ba6c3cf0db7debe7c81b0b3db75 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 09:56:27 +0400
Subject: [PATCH 213/341] Show nice topic/sublist userpics.

---
 .../data/components/recent_peers.cpp          |  4 ++
 Telegram/SourceFiles/window/window.style      |  8 ++++
 .../window/window_chat_switch_process.cpp     | 39 +++++++++++++++++--
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index e397bcbaf1..bd80b28185 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -19,6 +19,7 @@ namespace Data {
 namespace {
 
 constexpr auto kLimit = 48;
+constexpr auto kMaxRememberedOpenChats = 32;
 
 } // namespace
 
@@ -154,6 +155,9 @@ std::vector<not_null<Thread*>> RecentPeers::collectChatOpenHistory() const {
 void RecentPeers::chatOpenPush(not_null<Thread*> thread) {
 	const auto i = ranges::find(_opens, thread);
 	if (i == end(_opens)) {
+		while (_opens.size() >= kMaxRememberedOpenChats) {
+			_opens.pop_back();
+		}
 		_opens.insert(begin(_opens), thread);
 	} else if (i != begin(_opens)) {
 		ranges::rotate(begin(_opens), i, i + 1);
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index cb4c5ba7c2..a18a471533 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -338,6 +338,14 @@ chatSwitchUserpic: UserpicButton(defaultUserpicButton) {
 	size: size(56px, 56px);
 	photoSize: 56px;
 }
+chatSwitchUserpicSublist: UserpicButton(defaultUserpicButton) {
+	size: size(40px, 40px);
+	photoSize: 40px;
+}
+chatSwitchUserpicSmall: UserpicButton(defaultUserpicButton) {
+	size: size(24px, 24px);
+	photoSize: 24px;
+}
 chatSwitchUserpicTop: 8px;
 chatSwitchNameLabel: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index f49f1b26cb..a43b06d22a 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -9,13 +9,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/shortcuts.h"
 #include "data/components/recent_peers.h"
+#include "data/data_saved_sublist.h"
 #include "data/data_thread.h"
+#include "info/profile/info_profile_cover.h"
 #include "main/main_session.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/shadow.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
+#include "styles/style_boxes.h"
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
 
@@ -158,14 +161,44 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 		}, button->lifetime());
 		button->show();
 
+		auto userpicSt = &st::chatSwitchUserpic;
+		const auto userpicSize = userpicSt->size;
+		if (const auto topic = thread->asTopic()) {
+			using namespace Info::Profile;
+			const auto userpic = Ui::CreateChild<TopicIconButton>(
+				button,
+				topic,
+				[] { return true; }); // paused
+			userpic->show();
+			userpic->move(
+				((button->width() - userpic->width()) / 2),
+				st::chatSwitchUserpicTop);
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			userpicSt = &st::chatSwitchUserpicSmall;
+		} else if (const auto sublist = thread->asSublist()) {
+			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+				button,
+				sublist->sublistPeer(),
+				st::chatSwitchUserpicSublist);
+			userpic->show();
+			userpic->move(
+				((button->width() - userpicSize.width()) / 2),
+				st::chatSwitchUserpicTop);
+			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+			userpicSt = &st::chatSwitchUserpicSmall;
+		}
 		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
 			button,
 			thread->peer(),
-			st::chatSwitchUserpic);
+			*userpicSt);
 		userpic->show();
 		userpic->move(
-			((button->width() - userpic->width()) / 2),
-			st::chatSwitchUserpicTop);
+			(((button->width() - userpicSize.width()) / 2)
+				+ (userpicSize.width() - userpicSt->size.width())),
+			(st::chatSwitchUserpicTop
+				+ (userpicSize.height() - userpicSt->size.height())));
 		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 
 		const auto label = Ui::CreateChild<Ui::FlatLabel>(

From 10fe5cdd5df763dd73d3996217e2fc63129f3d60 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 12:17:48 +0400
Subject: [PATCH 214/341] Keep recent peers userpics in memory.

---
 .../data/components/recent_peers.cpp          |   9 +
 .../data/components/recent_peers.h            |   8 +
 Telegram/SourceFiles/data/data_forum.cpp      |   2 +
 .../SourceFiles/data/data_saved_messages.cpp  |   2 +
 .../window/window_chat_switch_process.cpp     | 292 ++++++++++++------
 .../window/window_chat_switch_process.h       |   2 +
 .../window/window_session_controller.cpp      |   6 +
 7 files changed, 227 insertions(+), 94 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index bd80b28185..63d2668a41 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -164,4 +164,13 @@ void RecentPeers::chatOpenPush(not_null<Thread*> thread) {
 	}
 }
 
+void RecentPeers::chatOpenDestroyed(not_null<Thread*> thread) {
+	_opens.erase(ranges::remove(_opens, thread), end(_opens));
+}
+
+void RecentPeers::chatOpenKeepUserpics(
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> userpics) {
+	_chatOpenUserpicsCache = std::move(userpics);
+}
+
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/components/recent_peers.h b/Telegram/SourceFiles/data/components/recent_peers.h
index 4d0fa5dc6a..624b9d3c33 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.h
+++ b/Telegram/SourceFiles/data/components/recent_peers.h
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "ui/userpic_view.h"
+
 namespace Main {
 class Session;
 } // namespace Main
@@ -33,12 +35,18 @@ public:
 	[[nodiscard]] auto collectChatOpenHistory() const
 		-> std::vector<not_null<Thread*>>;
 	void chatOpenPush(not_null<Thread*> thread);
+	void chatOpenDestroyed(not_null<Thread*> thread);
+	void chatOpenKeepUserpics(
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> userpics);
 
 private:
 	const not_null<Main::Session*> _session;
 
 	std::vector<not_null<PeerData*>> _list;
 	std::vector<not_null<Thread*>> _opens;
+	base::flat_map<
+		not_null<PeerData*>,
+		Ui::PeerUserpicView> _chatOpenUserpicsCache;
 
 	rpl::event_stream<> _updates;
 
diff --git a/Telegram/SourceFiles/data/data_forum.cpp b/Telegram/SourceFiles/data/data_forum.cpp
index 0a20f0aeac..0038b189a2 100644
--- a/Telegram/SourceFiles/data/data_forum.cpp
+++ b/Telegram/SourceFiles/data/data_forum.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_forum.h"
 
+#include "data/components/recent_peers.h"
 #include "data/data_channel.h"
 #include "data/data_histories.h"
 #include "data/data_changes.h"
@@ -194,6 +195,7 @@ void Forum::applyTopicDeleted(MsgId rootId) {
 		_activeSubsectionTopic = nullptr;
 	}
 	_topicDestroyed.fire(raw);
+	_history->session().recentPeers().chatOpenDestroyed(raw);
 	session().changes().topicUpdated(
 		raw,
 		Data::TopicUpdate::Flag::Destroyed);
diff --git a/Telegram/SourceFiles/data/data_saved_messages.cpp b/Telegram/SourceFiles/data/data_saved_messages.cpp
index a7ee009257..571a7663da 100644
--- a/Telegram/SourceFiles/data/data_saved_messages.cpp
+++ b/Telegram/SourceFiles/data/data_saved_messages.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "core/application.h"
+#include "data/components/recent_peers.h"
 #include "data/data_changes.h"
 #include "data/data_channel.h"
 #include "data/data_histories.h"
@@ -452,6 +453,7 @@ void SavedMessages::applySublistDeleted(not_null<PeerData*> sublistPeer) {
 	}
 
 	_sublistDestroyed.fire(raw);
+	_owner->session().recentPeers().chatOpenDestroyed(raw);
 	session().changes().sublistUpdated(
 		raw,
 		Data::SublistUpdate::Flag::Destroyed);
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index a43b06d22a..a66b31c6b3 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "core/shortcuts.h"
 #include "data/components/recent_peers.h"
+#include "data/data_forum_topic.h"
+#include "data/data_peer.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_thread.h"
 #include "info/profile/info_profile_cover.h"
@@ -23,10 +25,160 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_window.h"
 
 namespace Window {
+namespace {
+
+class Button final : public Ui::AbstractButton {
+public:
+	Button(
+		QWidget *parent,
+		not_null<Data::Thread*> thread,
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics);
+
+	[[nodiscard]] rpl::producer<> selectRequests() const;
+
+	void setSelected(
+		bool selected,
+		anim::type animated = anim::type::normal);
+
+private:
+	void setup(
+		not_null<Data::Thread*> thread,
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics);
+
+	void paintEvent(QPaintEvent *e) override;
+	void mouseMoveEvent(QMouseEvent *e) override;
+
+	rpl::event_stream<> _selectRequests;
+	Ui::Animations::Simple _overAnimation;
+	bool _selected = false;
+
+};
+
+Button::Button(
+	QWidget *parent,
+	not_null<Data::Thread*> thread,
+	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics)
+: AbstractButton(parent) {
+	setup(thread, userpics);
+}
+
+void Button::setup(
+		not_null<Data::Thread*> thread,
+		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> &userpics) {
+	resize(st::chatSwitchSize);
+
+	auto userpicSt = &st::chatSwitchUserpic;
+	const auto userpicSize = userpicSt->size;
+	if (const auto topic = thread->asTopic()) {
+		using namespace Info::Profile;
+		const auto userpic = Ui::CreateChild<TopicIconButton>(
+			this,
+			topic,
+			[] { return true; }); // paused
+		userpic->show();
+		userpic->move(
+			((width() - userpic->width()) / 2),
+			st::chatSwitchUserpicTop);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		userpicSt = &st::chatSwitchUserpicSmall;
+	} else if (const auto sublist = thread->asSublist()) {
+		const auto sublistPeer = sublist->sublistPeer();
+		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+			this,
+			sublistPeer,
+			st::chatSwitchUserpicSublist);
+		userpic->show();
+		userpic->move(
+			((width() - userpicSize.width()) / 2),
+			st::chatSwitchUserpicTop);
+		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		userpics.emplace(sublistPeer, sublistPeer->createUserpicView());
+
+		userpicSt = &st::chatSwitchUserpicSmall;
+	}
+	const auto peer = thread->peer();
+	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
+		this,
+		peer,
+		*userpicSt);
+	userpic->show();
+	userpic->move(
+		(((width() - userpicSize.width()) / 2)
+			+ (userpicSize.width() - userpicSt->size.width())),
+		(st::chatSwitchUserpicTop
+			+ (userpicSize.height() - userpicSt->size.height())));
+	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+	userpics.emplace(peer, peer->createUserpicView());
+
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		this,
+		thread->chatListName(),
+		st::chatSwitchNameLabel);
+	label->setBreakEverywhere(true);
+	label->show();
+	label->resizeToNaturalWidth(
+		width() - 2 * st::chatSwitchNameSkip);
+	label->move(
+		(width() - label->width()) / 2,
+		(height() + userpic->y() + userpic->height() - label->height()) / 2);
+
+	show();
+}
+
+rpl::producer<> Button::selectRequests() const {
+	return _selectRequests.events();
+}
+
+void Button::setSelected(bool selected, anim::type animated) {
+	if (_selected == selected) {
+		if (animated == anim::type::instant) {
+			_overAnimation.stop();
+		}
+		return;
+	}
+	_selected = selected;
+	if (animated == anim::type::instant) {
+		_overAnimation.stop();
+		update();
+	} else {
+		_overAnimation.start(
+			[=] { update(); },
+			selected ? 0. : 1.,
+			selected ? 1. : 0.,
+			st::slideWrapDuration);
+	}
+}
+
+void Button::paintEvent(QPaintEvent *e) {
+	const auto selected = _selected ? 1. : 0.;
+	const auto selection = _overAnimation.value(selected);
+	if (selection <= 0.) {
+		return;
+	}
+
+	auto p = QPainter(this);
+	auto hq = PainterHighQualityEnabler(p);
+	const auto radius = st::boxRadius;
+	const auto line = st::chatSwitchSelectLine;
+	auto pen = st::defaultRoundCheckbox.bgActive->p;
+	pen.setWidthF(line * selection);
+	p.setPen(pen);
+	const auto r = QRectF(rect()).marginsRemoved(
+		{ line / 2., line / 2., line / 2., line / 2. });
+	p.drawRoundedRect(r, radius, radius);
+}
+
+void Button::mouseMoveEvent(QMouseEvent *e) {
+	if (!_selected) {
+		_selectRequests.fire({});
+	}
+}
+
+} // namespace
 
 struct ChatSwitchProcess::Entry {
-	not_null<Ui::AbstractButton*> button;
-	Ui::Animations::Simple overAnimation;
+	std::unique_ptr<Button> button;
 };
 
 ChatSwitchProcess::ChatSwitchProcess(
@@ -43,7 +195,9 @@ ChatSwitchProcess::ChatSwitchProcess(
 	setupView();
 }
 
-ChatSwitchProcess::~ChatSwitchProcess() = default;
+ChatSwitchProcess::~ChatSwitchProcess() {
+	_session->recentPeers().chatOpenKeepUserpics(std::move(_userpics));
+}
 
 rpl::producer<not_null<Data::Thread*>> ChatSwitchProcess::chosen() const {
 	return _chosen.events();
@@ -85,19 +239,11 @@ void ChatSwitchProcess::setSelected(int index) {
 		return;
 	}
 	if (_selected >= 0) {
-		auto &entry = _entries[_selected];
-		const auto raw = entry.button.get();
-		entry.overAnimation.start([=] {
-			raw->update();
-		}, 1., 0., st::slideWrapDuration);
+		_entries[_selected].button->setSelected(false);
 	}
 	_selected = index;
 	if (_selected >= 0) {
-		auto &entry = _entries[_selected];
-		const auto raw = entry.button.get();
-		entry.overAnimation.start([=] {
-			raw->update();
-		}, 0., 1., st::slideWrapDuration);
+		_entries[_selected].button->setSelected(true);
 	}
 }
 
@@ -121,6 +267,7 @@ void ChatSwitchProcess::setupWidget(not_null<Ui::RpWidget*> geometry) {
 
 void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 	_list = _session->recentPeers().collectChatOpenHistory();
+
 	if (opened) {
 		const auto i = ranges::find(_list, not_null(opened));
 		if (i == end(_list)) {
@@ -131,94 +278,51 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 		_selected = 0;
 	}
 
-	auto index = 0;
+	const auto find = [=](Button *button) {
+		return ranges::find(_entries, button, [](const Entry &entry) {
+			return entry.button.get();
+		});
+	};
 	for (const auto &thread : _list) {
-		const auto button = Ui::CreateChild<Ui::AbstractButton>(_view.get());
-		button->resize(st::chatSwitchSize);
-		button->paintRequest() | rpl::start_with_next([=] {
-			const auto selection = _entries[index].overAnimation.value(
-				(index == _selected) ? 1. : 0.);
-			if (selection > 0.) {
-				auto p = QPainter(button);
-				auto hq = PainterHighQualityEnabler(p);
-				const auto radius = st::boxRadius;
-				const auto line = st::chatSwitchSelectLine;
-				auto pen = st::defaultRoundCheckbox.bgActive->p;
-				pen.setWidthF(line * selection);
-				p.setPen(pen);
-				const auto r = QRectF(button->rect()).marginsRemoved(
-					{ line / 2., line / 2., line / 2., line / 2. });
-				p.drawRoundedRect(r, radius, radius);
-			}
-		}, button->lifetime());
-		button->setClickedCallback([=] {
+		auto button = std::make_unique<Button>(
+			_view.get(),
+			thread,
+			_userpics);
+		const auto raw = button.get();
+
+		raw->selectRequests() | rpl::start_with_next([=] {
+			const auto i = find(raw);
+			setSelected(int(i - begin(_entries)));
+		}, raw->lifetime());
+
+		raw->setClickedCallback([=] {
 			_chosen.fire_copy(thread);
 		});
-		button->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
-			if (e->type() == QEvent::MouseMove) {
-				setSelected(index);
-			}
-		}, button->lifetime());
-		button->show();
 
-		auto userpicSt = &st::chatSwitchUserpic;
-		const auto userpicSize = userpicSt->size;
-		if (const auto topic = thread->asTopic()) {
-			using namespace Info::Profile;
-			const auto userpic = Ui::CreateChild<TopicIconButton>(
-				button,
-				topic,
-				[] { return true; }); // paused
-			userpic->show();
-			userpic->move(
-				((button->width() - userpic->width()) / 2),
-				st::chatSwitchUserpicTop);
-			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		_entries.push_back({ .button = std::move(button) });
 
-			userpicSt = &st::chatSwitchUserpicSmall;
-		} else if (const auto sublist = thread->asSublist()) {
-			const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
-				button,
-				sublist->sublistPeer(),
-				st::chatSwitchUserpicSublist);
-			userpic->show();
-			userpic->move(
-				((button->width() - userpicSize.width()) / 2),
-				st::chatSwitchUserpicTop);
-			userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-			userpicSt = &st::chatSwitchUserpicSmall;
+		auto destroyed = thread->asTopic()
+			? thread->asTopic()->destroyed()
+			: thread->asSublist()
+			? thread->asSublist()->destroyed()
+			: nullptr;
+		if (!destroyed) {
+			continue;
 		}
-		const auto userpic = Ui::CreateChild<Ui::UserpicButton>(
-			button,
-			thread->peer(),
-			*userpicSt);
-		userpic->show();
-		userpic->move(
-			(((button->width() - userpicSize.width()) / 2)
-				+ (userpicSize.width() - userpicSt->size.width())),
-			(st::chatSwitchUserpicTop
-				+ (userpicSize.height() - userpicSt->size.height())));
-		userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
+		std::move(destroyed) | rpl::start_with_next([=] {
+			_list.erase(ranges::remove(_list, thread), end(_list));
+			if (const auto i = find(raw); i != end(_entries)) {
+				const auto index = int(i - begin(_entries));
+				if (_selected > index) {
+					--_selected;
+				} else if (_selected == index) {
+					_selected = -1;
+				}
 
-		const auto label = Ui::CreateChild<Ui::FlatLabel>(
-			button,
-			thread->chatListName(),
-			st::chatSwitchNameLabel);
-		label->setBreakEverywhere(true);
-		label->show();
-		label->resizeToNaturalWidth(
-			button->width() - 2 * st::chatSwitchNameSkip);
-		label->move(
-			(button->width() - label->width()) / 2,
-			(button->height()
-				+ userpic->y()
-				+ userpic->height()
-				- label->height()) / 2);
-
-		_entries.push_back({ .button = button });
-
-		++index;
+				_entries.erase(i);
+				layout(_widget->size());
+			}
+		}, raw->lifetime());
 	}
 }
 
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.h b/Telegram/SourceFiles/window/window_chat_switch_process.h
index 5f55768e9e..77173489ff 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.h
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "ui/round_rect.h"
+#include "ui/userpic_view.h"
 
 namespace Data {
 class Thread;
@@ -65,6 +66,7 @@ private:
 	QRect _inner;
 	Ui::RoundRect _bg;
 
+	base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> _userpics;
 	std::vector<not_null<Data::Thread*>> _list;
 	std::vector<Entry> _entries;
 
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 32fb9fbca9..f31e3b8057 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1760,6 +1760,12 @@ void SessionController::setupShortcuts() {
 			_chatSwitchProcess->chosen(
 			) | rpl::start_with_next([=](not_null<Data::Thread*> thread) {
 				close();
+
+				const auto id = SeparateId(thread);
+				if (const auto window = Core::App().separateWindowFor(id)) {
+					window->activate();
+					return;
+				}
 				jumpToChatListEntry({ Dialogs::Key(thread), FullMsgId() });
 			}, _chatSwitchProcess->lifetime());
 

From 03770c52fe3ec93e327178b8c48bbf16c9fedb1d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 19 Aug 2025 20:09:39 +0400
Subject: [PATCH 215/341] Support floating topic bars in forums.

---
 .../boxes/peers/edit_forum_topic_box.cpp      |   4 +-
 Telegram/SourceFiles/data/data_channel.cpp    |   6 +-
 .../SourceFiles/data/data_forum_topic.cpp     |  11 +
 Telegram/SourceFiles/data/data_forum_topic.h  |   1 +
 Telegram/SourceFiles/history/history.cpp      |  20 ++
 Telegram/SourceFiles/history/history.h        |   2 +
 .../history/history_inner_widget.cpp          | 106 +++++++---
 .../history/history_inner_widget.h            |   8 +-
 .../history/view/history_view_element.cpp     | 189 +++++++++++++-----
 .../history/view/history_view_element.h       |  18 +-
 .../history/view/history_view_message.cpp     |  15 +-
 .../view/history_view_service_message.cpp     |   8 +-
 .../window/window_session_controller.cpp      |  27 +++
 .../window/window_session_controller.h        |  15 ++
 14 files changed, 325 insertions(+), 105 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
index f1de1444ad..e651ae7d05 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_forum_topic_box.cpp
@@ -77,7 +77,9 @@ DefaultIconEmoji::DefaultIconEmoji(
 	std::move(value) | rpl::start_with_next([=](DefaultIcon value) {
 		_icon = value;
 		_image = QImage();
-		repaint();
+		if (repaint) {
+			repaint();
+		}
 	}, _lifetime);
 }
 
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index 50bb186787..d9016fb7ed 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -235,7 +235,8 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 		| Flag::CallNotEmpty
 		| Flag::SimilarExpanded
 		| Flag::Signatures
-		| Flag::SignatureProfiles)) {
+		| Flag::SignatureProfiles
+		| Flag::ForumTabs)) {
 		if (const auto history = this->owner().historyLoaded(this)) {
 			if (diff & Flag::CallNotEmpty) {
 				history->updateChatListEntry();
@@ -262,6 +263,9 @@ void ChannelData::setFlags(ChannelDataFlags which) {
 			if (diff & (Flag::Signatures | Flag::SignatureProfiles)) {
 				session().changes().peerUpdated(this, UpdateFlag::Rights);
 			}
+			if (diff & Flag::ForumTabs) {
+				history->forumTabsChanged(which & Flag::ForumTabs);
+			}
 		}
 	}
 	if (const auto raw = takenForum.get()) {
diff --git a/Telegram/SourceFiles/data/data_forum_topic.cpp b/Telegram/SourceFiles/data/data_forum_topic.cpp
index 799190714d..a8d05913e0 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.cpp
+++ b/Telegram/SourceFiles/data/data_forum_topic.cpp
@@ -32,6 +32,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/painter.h"
 #include "ui/color_int_conversion.h"
 #include "ui/text/text_custom_emoji.h"
+#include "ui/text/text_utilities.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_chat_helpers.h"
 
@@ -756,6 +757,16 @@ TextWithEntities ForumTopic::titleWithIcon() const {
 	return ForumTopicIconWithTitle(_rootId, _iconId, _title);
 }
 
+TextWithEntities ForumTopic::titleWithIconOrLogo() const {
+	if (_iconId || isGeneral()) {
+		return titleWithIcon();
+	}
+	return Ui::Text::SingleCustomEmoji(Data::TopicIconEmojiEntity({
+		.title = _title,
+		.colorId = _colorId,
+	})).append(' ').append(_title);
+}
+
 int ForumTopic::titleVersion() const {
 	return _titleVersion;
 }
diff --git a/Telegram/SourceFiles/data/data_forum_topic.h b/Telegram/SourceFiles/data/data_forum_topic.h
index aafa12a788..6b8d81ff0a 100644
--- a/Telegram/SourceFiles/data/data_forum_topic.h
+++ b/Telegram/SourceFiles/data/data_forum_topic.h
@@ -148,6 +148,7 @@ public:
 
 	[[nodiscard]] QString title() const;
 	[[nodiscard]] TextWithEntities titleWithIcon() const;
+	[[nodiscard]] TextWithEntities titleWithIconOrLogo() const;
 	[[nodiscard]] int titleVersion() const;
 	void applyTitle(const QString &title);
 	[[nodiscard]] DocumentId iconId() const;
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 88a786f38a..69e0ed7600 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -3464,6 +3464,26 @@ bool History::suggestDraftAllowed() const {
 	return peer->isMonoforum() && !peer->amMonoforumAdmin();
 }
 
+bool History::hasForumThreadBars() const {
+	if (amMonoforumAdmin()) {
+		return true;
+	} else if (const auto channel = peer->asChannel()) {
+		return channel->forum() && channel->useSubsectionTabs();
+	}
+	return false;
+}
+
+void History::forumTabsChanged(bool forumTabs) {
+	for (auto &block : blocks) {
+		for (auto &view : block->messages) {
+			view->setPendingResize();
+			if (forumTabs || view->Has<HistoryView::ForumThreadBar>()) {
+				view->previousInBlocksChanged();
+			}
+		}
+	}
+}
+
 not_null<History*> History::migrateToOrMe() const {
 	if (const auto to = peer->migrateTo()) {
 		return owner().history(to);
diff --git a/Telegram/SourceFiles/history/history.h b/Telegram/SourceFiles/history/history.h
index 40ee83ceef..d93b8d0614 100644
--- a/Telegram/SourceFiles/history/history.h
+++ b/Telegram/SourceFiles/history/history.h
@@ -80,6 +80,8 @@ public:
 	void monoforumChanged(Data::SavedMessages *old);
 	[[nodiscard]] bool amMonoforumAdmin() const;
 	[[nodiscard]] bool suggestDraftAllowed() const;
+	[[nodiscard]] bool hasForumThreadBars() const;
+	void forumTabsChanged(bool forumTabs);
 
 	[[nodiscard]] not_null<History*> migrateToOrMe() const;
 	[[nodiscard]] History *migrateFrom() const;
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index dcf365b534..ee963abd0c 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -928,8 +928,8 @@ void HistoryInner::enumerateDates(Method method) {
 }
 
 template <typename Method>
-void HistoryInner::enumerateMonoforumSenders(Method method) {
-	if (!_history->amMonoforumAdmin()) {
+void HistoryInner::enumerateForumThreadBars(Method method) {
+	if (!_history->hasForumThreadBars()) {
 		return;
 	}
 
@@ -946,28 +946,28 @@ void HistoryInner::enumerateMonoforumSenders(Method method) {
 	// -1 means we didn't find a same-day with previous message yet.
 	auto lowestInOneBunchItemBottom = -1;
 
-	auto senderCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
+	auto barCallback = [&](not_null<Element*> view, int itemtop, int itembottom) {
 		const auto item = view->data();
 		if (lowestInOneBunchItemBottom < 0 && view->isInOneBunchWithPrevious()) {
 			lowestInOneBunchItemBottom = itembottom - view->marginBottom();
 		}
 
-		// Call method on a sender for all messages that have it and for those who are not showing it
+		// Call method on a bar for all messages that have it and for those who are not showing it
 		// because they are in a one day together with the previous message if they are top-most visible.
-		if (view->displayMonoforumSender() || (!item->isEmpty() && itemtop <= _visibleAreaTop)) {
+		if (view->displayForumThreadBar() || (!item->isEmpty() && itemtop <= _visibleAreaTop)) {
 			if (lowestInOneBunchItemBottom < 0) {
 				lowestInOneBunchItemBottom = itembottom - view->marginBottom();
 			}
-			// Attach sender to the top of the visible area with the same margin as it has in service message.
-			int senderTop = qMax(itemtop + view->displayedDateHeight(), _visibleAreaTop + skip) + st::msgServiceMargin.top();
+			// Attach bar to the top of the visible area with the same margin as it has in service message.
+			int barTop = qMax(itemtop + view->displayedDateHeight(), _visibleAreaTop + skip) + st::msgServiceMargin.top();
 
-			// Do not let the sender go below the single-sender messages pack bottom line.
-			int senderHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
-			senderTop = qMin(senderTop, lowestInOneBunchItemBottom - senderHeight);
+			// Do not let the bar go below the single-bar messages pack bottom line.
+			int barHeight = st::msgServicePadding.bottom() + st::msgServiceFont->height + st::msgServicePadding.top();
+			barTop = qMin(barTop, lowestInOneBunchItemBottom - barHeight);
 
 			// Call the template callback function that was passed
 			// and return if it finished everything it needed.
-			if (!method(view, itemtop, senderTop)) {
+			if (!method(view, itemtop, barTop)) {
 				return false;
 			}
 		}
@@ -980,7 +980,7 @@ void HistoryInner::enumerateMonoforumSenders(Method method) {
 		return true;
 	};
 
-	enumerateItems<EnumItemsDirection::BottomToTop>(senderCallback);
+	enumerateItems<EnumItemsDirection::BottomToTop>(barCallback);
 }
 
 TextSelection HistoryInner::computeRenderSelection(
@@ -1395,31 +1395,31 @@ void HistoryInner::paintEvent(QPaintEvent *e) {
 	});
 	p.setOpacity(1.);
 
-	enumerateMonoforumSenders([&](not_null<Element*> view, int itemtop, int senderTop) {
-		// stop the enumeration if the sender is above the painted rect
-		if (senderTop + dateHeight <= clip.top()) {
+	enumerateForumThreadBars([&](not_null<Element*> view, int itemtop, int barTop) {
+		// stop the enumeration if the bar is above the painted rect
+		if (barTop + dateHeight <= clip.top()) {
 			return false;
 		}
 
-		const auto displaySender = view->displayMonoforumSender();
-		auto senderInPlace = displaySender;
-		if (senderInPlace) {
-			const auto correctSenderTop = itemtop + view->displayedDateHeight() + st::msgServiceMargin.top();
-			senderInPlace = (senderTop < correctSenderTop + st::msgServiceMargin.top());
+		const auto displayBar = view->displayForumThreadBar();
+		auto barInPlace = displayBar;
+		if (barInPlace) {
+			const auto correctBarTop = itemtop + view->displayedDateHeight() + st::msgServiceMargin.top();
+			barInPlace = (barTop < correctBarTop + st::msgServiceMargin.top());
 		}
 
-		// paint the sender if it intersects the painted rect
-		if (senderTop < clip.top() + clip.height()) {
-			const auto senderY = senderTop - st::msgServiceMargin.top();
-			if (const auto sender = view->Get<HistoryView::MonoforumSenderBar>()) {
-				sender->paint(p, context.st, senderY, _contentWidth, _isChatWide, !senderInPlace);
+		// paint the bar if it intersects the painted rect
+		if (barTop < clip.top() + clip.height()) {
+			const auto barY = barTop - st::msgServiceMargin.top();
+			if (const auto bar = view->Get<HistoryView::ForumThreadBar>()) {
+				bar->paint(p, context.st, barY, _contentWidth, _isChatWide, !barInPlace);
 			} else {
-				HistoryView::MonoforumSenderBar::PaintFor(
+				_forumThreadBarWidth = HistoryView::ForumThreadBar::PaintForGetWidth(
 					p,
 					context.st,
 					view,
-					_monoforumSenderUserpicView,
-					senderY,
+					_forumThreadBarUserpicView,
+					barY,
 					_contentWidth,
 					_isChatWide);
 			}
@@ -3698,7 +3698,7 @@ void HistoryInner::toggleScrollDateShown() {
 void HistoryInner::repaintScrollDateCallback() {
 	int updateTop = _visibleAreaTop;
 	int updateHeight = st::msgServiceMargin.top() + st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
-	if (_history->amMonoforumAdmin()) {
+	if (_history->hasForumThreadBars()) {
 		updateHeight *= 2;
 	}
 	update(0, updateTop, width(), updateHeight);
@@ -4261,6 +4261,54 @@ void HistoryInner::mouseActionUpdate() {
 			}
 			return true;
 		});
+		if (!dragState.link) {
+			enumerateForumThreadBars([&](not_null<Element*> view, int itemtop, int barTop) {
+				// stop the enumeration if the bar is above our point
+				if (barTop + dateHeight <= point.y()) {
+					return false;
+				}
+
+				const auto displayBar = view->displayForumThreadBar();
+				auto barInPlace = displayBar;
+				if (barInPlace) {
+					const auto correctBarTop = itemtop + view->displayedDateHeight() + st::msgServiceMargin.top();
+					barInPlace = (barTop < correctBarTop + st::msgServiceMargin.top());
+				}
+
+				// stop enumeration if we've found a bar under the cursor
+				if (barTop <= point.y()) {
+					const auto item = view->data();
+					auto barWidth = 0;
+					if (const auto bar = view->Get<HistoryView::ForumThreadBar>()) {
+						barWidth = bar->width;
+					} else {
+						barWidth = _forumThreadBarWidth;
+					}
+					auto barLeft = st::msgServiceMargin.left();
+					auto maxwidth = _contentWidth;
+					if (_isChatWide) {
+						maxwidth = qMin(maxwidth, int32(st::msgMaxWidth + 2 * st::msgPhotoSkip + 2 * st::msgMargin.left()));
+					}
+					auto widthForBar = maxwidth - st::msgServiceMargin.left() - st::msgServiceMargin.left();
+
+					barLeft += (widthForBar - barWidth) / 2;
+
+					if (point.x() >= barLeft && point.x() < barLeft + barWidth) {
+						if (!_forumThreadBarLink) {
+							_forumThreadBarLink = std::make_shared<Window::ForumThreadClickHandler>(item);
+						} else {
+							static_cast<Window::ForumThreadClickHandler*>(_forumThreadBarLink.get())->update(item);
+						}
+						dragState = TextState(
+							nullptr,
+							_forumThreadBarLink);
+						_dragStateItem = session().data().message(dragState.itemId);
+						lnkhost = view;
+					}
+				}
+				return true;
+			});
+		}
 		if (!dragState.link) {
 			StateRequest request;
 			if (_mouseAction == MouseAction::Selecting) {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.h b/Telegram/SourceFiles/history/history_inner_widget.h
index c3e256c3f9..4e30c5d168 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.h
+++ b/Telegram/SourceFiles/history/history_inner_widget.h
@@ -315,13 +315,13 @@ private:
 	template <typename Method>
 	void enumerateDates(Method method);
 
-	// This function finds all monoforum sender elements that are displayed and calls template method
+	// This function finds all forum thread bar elements that are displayed and calls template method
 	// for each found date element (from the bottom to the top) using enumerateItems() method.
 	//
 	// Method has "bool (*Method)(not_null<Element*> view, int itemtop, int dateTop)" signature
 	// if it returns false the enumeration stops immediately.
 	template <typename Method>
-	void enumerateMonoforumSenders(Method method);
+	void enumerateForumThreadBars(Method method);
 
 	void scrollDateCheck();
 	void scrollDateHideByTimer();
@@ -470,7 +470,8 @@ private:
 	int _contentWidth = 0;
 	int _historyPaddingTop = 0;
 	int _revealHeight = 0;
-	Ui::PeerUserpicView _monoforumSenderUserpicView;
+	int _forumThreadBarWidth = 0;
+	Ui::PeerUserpicView _forumThreadBarUserpicView;
 
 	// Save visible area coords for painting / pressing userpics.
 	int _visibleAreaTop = 0;
@@ -572,6 +573,7 @@ private:
 	Element *_scrollDateLastItem = nullptr;
 	int _scrollDateLastItemTop = 0;
 	ClickHandlerPtr _scrollDateLink;
+	ClickHandlerPtr _forumThreadBarLink;
 
 };
 
diff --git a/Telegram/SourceFiles/history/view/history_view_element.cpp b/Telegram/SourceFiles/history/view/history_view_element.cpp
index 2e2be66759..8a1a260ca4 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_element.cpp
@@ -427,20 +427,37 @@ void DateBadge::paint(
 	ServiceMessagePainter::PaintDate(p, st, text, width, y, w, chatWide);
 }
 
-void MonoforumSenderBar::init(
+void ForumThreadBar::init(
 		not_null<PeerData*> parentChat,
-		not_null<PeerData*> peer) {
-	sender = peer;
-	text.setText(st::semiboldTextStyle, peer->name());
+		not_null<Data::Thread*> thread) {
+	this->thread = thread;
+	const auto sublist = thread->asSublist();
+	if (sublist) {
+		text.setText(st::semiboldTextStyle, sublist->sublistPeer()->name());
+	} else if (const auto topic = thread->asTopic()) {
+		text.setMarkedText(
+			st::semiboldTextStyle,
+			topic->titleWithIconOrLogo(),
+			kMarkupTextOptions,
+			Core::TextContext({ .session = &topic->session() }));
+	}
 	const auto skip = st::monoforumBarUserpicSkip;
-	const auto userpic = st::msgServicePadding.top()
-		+ st::msgServiceFont->height
-		+ st::msgServicePadding.bottom()
-		- 2 * skip;
-	width = skip + userpic + skip * 2 + text.maxWidth() + st::msgServicePadding.right();
+	const auto userpic = sublist
+		? (st::msgServicePadding.top()
+			+ st::msgServiceFont->height
+			+ st::msgServicePadding.bottom()
+			- 2 * skip)
+		: (st::msgServicePadding.left() - 3 * skip);
+
+	width = skip
+		+ userpic
+		+ skip * 2
+		+ text.maxWidth()
+		+ st::topicButtonArrowSkip
+		+ st::msgServicePadding.right();
 }
 
-int MonoforumSenderBar::height() const {
+int ForumThreadBar::height() const {
 	return st::msgServiceMargin.top()
 		+ st::msgServicePadding.top()
 		+ st::msgServiceFont->height
@@ -448,17 +465,29 @@ int MonoforumSenderBar::height() const {
 		+ st::msgServiceMargin.bottom();
 }
 
-void MonoforumSenderBar::paint(
+void ForumThreadBar::paint(
 		Painter &p,
 		not_null<const Ui::ChatStyle*> st,
 		int y,
 		int w,
 		bool chatWide,
 		bool skipPatternLine) const {
-	Paint(p, st, sender, text, width, view, y, w, chatWide, skipPatternLine);
+	if (const auto strong = thread.get()) {
+		Paint(
+			p,
+			st,
+			strong,
+			text,
+			width,
+			view,
+			y,
+			w,
+			chatWide,
+			skipPatternLine);
+	}
 }
 
-void MonoforumSenderBar::PaintFor(
+int ForumThreadBar::PaintForGetWidth(
 		Painter &p,
 		not_null<const Ui::ChatStyle*> st,
 		not_null<Element*> itemView,
@@ -466,31 +495,49 @@ void MonoforumSenderBar::PaintFor(
 		int y,
 		int w,
 		bool chatWide) {
-	const auto sublist = itemView->data()->savedSublist();
-	const auto sender = (sublist && sublist->parentChat())
-		? sublist->sublistPeer().get()
+	const auto item = itemView->data();
+	const auto topic = item->topic();
+	const auto sublist = item->savedSublist();
+	const auto sender = topic
+		? (Data::Thread*)topic
+		: (sublist && sublist->parentChat())
+		? (Data::Thread*)sublist
 		: nullptr;
-	if (!sender || sender->isMonoforum()) {
-		return;
+	auto text = Ui::Text::String();
+	if (!sender
+		|| !topic
+		|| (sublist && sublist->sublistPeer()->isMonoforum())) {
+		return 0;
+	} else if (topic) {
+		text.setMarkedText(
+			st::semiboldTextStyle,
+			topic->titleWithIconOrLogo(),
+			kMarkupTextOptions,
+			Core::TextContext({ .session = &topic->session() }));
+	} else {
+		text.setText(st::semiboldTextStyle, sublist->sublistPeer()->name());
 	}
-	auto text = Ui::Text::String(st::semiboldTextStyle, sender->name());
 	const auto skip = st::monoforumBarUserpicSkip;
-	const auto userpic = st::msgServicePadding.top()
-		+ st::msgServiceFont->height
-		+ st::msgServicePadding.bottom()
-		- 2 * skip;
+	const auto userpic = sublist
+		? (st::msgServicePadding.top()
+			+ st::msgServiceFont->height
+			+ st::msgServicePadding.bottom()
+			- 2 * skip)
+		: (st::msgServicePadding.left() - 3 * skip);
 	const auto width = skip
 		+ userpic
 		+ skip * 2
 		+ text.maxWidth()
+		+ st::topicButtonArrowSkip
 		+ st::msgServicePadding.right();
 	Paint(p, st, sender, text, width, userpicView, y, w, chatWide, true);
+	return width;
 }
 
-void MonoforumSenderBar::Paint(
+void ForumThreadBar::Paint(
 		Painter &p,
 		not_null<const Ui::ChatStyle*> st,
-		not_null<PeerData*> sender,
+		not_null<Data::Thread*> thread,
 		const Ui::Text::String &text,
 		int width,
 		Ui::PeerUserpicView &view,
@@ -498,8 +545,6 @@ void MonoforumSenderBar::Paint(
 		int w,
 		bool chatWide,
 		bool skipPatternLine) {
-	Expects(sender != nullptr);
-
 	int left = st::msgServiceMargin.left();
 	const auto maxwidth = chatWide
 		? std::min(w, WideChatWidth())
@@ -528,24 +573,47 @@ void MonoforumSenderBar::Paint(
 		p.drawLine(left + use, top, 2 * w, top);
 	}
 
-	const auto userpic = st::msgServicePadding.top()
-		+ st::msgServiceFont->height
-		+ st::msgServicePadding.bottom()
-		- 2 * skip;
-	const auto available = use - (skip + userpic + skip * 2 + st::msgServicePadding.right());
+	const auto sublist = thread->asSublist();
+	const auto userpic = sublist
+		? (st::msgServicePadding.top()
+			+ st::msgServiceFont->height
+			+ st::msgServicePadding.bottom()
+			- 2 * skip)
+		: (st::msgServicePadding.left() - 3 * skip);
+	const auto available = use
+		- (skip
+			+ userpic
+			+ skip * 2
+			+ st::topicButtonArrowSkip
+			+ st::msgServicePadding.right());
 
-	sender->paintUserpic(p, view, left + skip, y + st::msgServiceMargin.top() + skip, userpic);
+	if (sublist) {
+		sublist->sublistPeer()->paintUserpic(
+			p,
+			view,
+			left + skip,
+			y + st::msgServiceMargin.top() + skip,
+			userpic);
+	}
 
+	const auto textLeft = left + skip + userpic + skip * 2;
+	const auto textTop = y
+		+ st::msgServiceMargin.top()
+		+ st::msgServicePadding.top();
 	p.setFont(st::msgServiceFont);
 	p.setPen(st->msgServiceFg());
 	text.draw(p, {
-		.position = {
-			left + skip + userpic + skip * 2,
-			y + st::msgServiceMargin.top() + st::msgServicePadding.top(),
-		},
+		.position = { textLeft, textTop },
 		.availableWidth = available,
 		.elisionLines = 1,
 	});
+
+	st::topicButtonArrow.paint(
+		p,
+		textLeft + available + st::topicButtonArrowPosition.x(),
+		textTop + st::topicButtonArrowPosition.y(),
+		w,
+		st->msgServiceFg()->c);
 }
 
 void ServicePreMessage::init(
@@ -1367,7 +1435,7 @@ void Element::validateTextSkipBlock(bool has, int width, int height) {
 }
 
 void Element::previousInBlocksChanged() {
-	recountMonoforumSenderBarInBlocks();
+	recountThreadBarInBlocks();
 	recountDisplayDateInBlocks();
 	recountAttachToPreviousInBlocks();
 }
@@ -1404,7 +1472,7 @@ bool Element::computeIsAttachToPrevious(not_null<Element*> previous) {
 	if (!Has<DateBadge>()
 		&& !Has<UnreadBar>()
 		&& !Has<ServicePreMessage>()
-		&& !Has<MonoforumSenderBar>()) {
+		&& !Has<ForumThreadBar>()) {
 		const auto prev = previous->data();
 		const auto previousMarkup = prev->inlineReplyMarkup();
 		const auto possible = (std::abs(prev->date() - item->date())
@@ -1516,12 +1584,12 @@ bool Element::isInOneDayWithPrevious() const {
 	return !data()->isEmpty() && !displayDate();
 }
 
-bool Element::displayMonoforumSender() const {
-	return Has<MonoforumSenderBar>();
+bool Element::displayForumThreadBar() const {
+	return Has<ForumThreadBar>();
 }
 
 bool Element::isInOneBunchWithPrevious() const {
-	return !data()->isEmpty() && !displayMonoforumSender();
+	return !data()->isEmpty() && !displayForumThreadBar();
 }
 
 void Element::recountAttachToPreviousInBlocks() {
@@ -1542,34 +1610,49 @@ void Element::recountAttachToPreviousInBlocks() {
 	setAttachToPrevious(attachToPrevious, previous);
 }
 
-void Element::recountMonoforumSenderBarInBlocks() {
+void Element::recountThreadBarInBlocks() {
 	const auto item = data();
+	const auto topic = item->topic();
 	const auto sublist = item->savedSublist();
-	const auto parentChat = sublist ? sublist->parentChat() : nullptr;
-	const auto barPeer = [&]() -> PeerData* {
+	const auto parentChat = (topic && topic->channel()->useSubsectionTabs())
+		? topic->channel().get()
+		: sublist
+		? sublist->parentChat()
+		: nullptr;
+	const auto barThread = [&]() -> Data::Thread* {
 		if (!parentChat
 			|| isHidden()
 			|| item->isEmpty()
 			|| item->isSponsored()) {
 			return nullptr;
 		}
-		const auto sublistPeer = sublist->sublistPeer();
 		if (const auto previous = previousDisplayedInBlocks()) {
 			const auto prev = previous->data();
-			if (const auto prevSublist = prev->savedSublist()) {
+			if (const auto prevTopic = prev->topic()) {
+				Assert(prevTopic->channel() == parentChat);
+				const auto topicRootId = topic->rootId();
+				if (prevTopic->rootId() == topicRootId) {
+					return nullptr;
+				}
+			} else if (const auto prevSublist = prev->savedSublist()) {
 				Assert(prevSublist->parentChat() == parentChat);
+				const auto sublistPeer = sublist->sublistPeer();
 				if (prevSublist->sublistPeer() == sublistPeer) {
 					return nullptr;
 				}
 			}
 		}
-		return (sublistPeer == parentChat) ? nullptr : sublistPeer.get();
+		return topic
+			? (Data::Thread*)topic
+			: (sublist && sublist->sublistPeer() != parentChat)
+			? (Data::Thread*)sublist
+			: nullptr;
 	}();
-	if (barPeer && !Has<MonoforumSenderBar>()) {
-		AddComponents(MonoforumSenderBar::Bit());
-		Get<MonoforumSenderBar>()->init(parentChat, barPeer);
-	} else if (!barPeer && Has<MonoforumSenderBar>()) {
-		RemoveComponents(MonoforumSenderBar::Bit());
+	if (barThread && !Has<ForumThreadBar>()) {
+		AddComponents(ForumThreadBar::Bit());
+		Get<ForumThreadBar>()->init(parentChat, barThread);
+	} else if (!barThread && Has<ForumThreadBar>()) {
+		RemoveComponents(ForumThreadBar::Bit());
 	}
 }
 
diff --git a/Telegram/SourceFiles/history/view/history_view_element.h b/Telegram/SourceFiles/history/view/history_view_element.h
index 2e13c7c0c3..14453f3324 100644
--- a/Telegram/SourceFiles/history/view/history_view_element.h
+++ b/Telegram/SourceFiles/history/view/history_view_element.h
@@ -20,6 +20,7 @@ struct HistoryMessageReply;
 struct PreparedServiceText;
 
 namespace Data {
+class Thread;
 struct Reaction;
 struct ReactionId;
 } // namespace Data
@@ -265,8 +266,10 @@ struct DateBadge : RuntimeComponent<DateBadge, Element> {
 
 };
 
-struct MonoforumSenderBar : RuntimeComponent<MonoforumSenderBar, Element> {
-	void init(not_null<PeerData*> parentChat, not_null<PeerData*> peer);
+struct ForumThreadBar : RuntimeComponent<ForumThreadBar, Element> {
+	void init(
+		not_null<PeerData*> parentChat,
+		not_null<Data::Thread*> thread);
 
 	int height() const;
 	void paint(
@@ -276,7 +279,7 @@ struct MonoforumSenderBar : RuntimeComponent<MonoforumSenderBar, Element> {
 		int w,
 		bool chatWide,
 		bool skipPatternLine) const;
-	static void PaintFor(
+	static int PaintForGetWidth(
 		Painter &p,
 		not_null<const Ui::ChatStyle*> st,
 		not_null<Element*> itemView,
@@ -285,9 +288,8 @@ struct MonoforumSenderBar : RuntimeComponent<MonoforumSenderBar, Element> {
 		int w,
 		bool chatWide);
 
-	PeerData *sender = nullptr;
+	base::weak_ptr<Data::Thread> thread;
 	Ui::Text::String text;
-	ClickHandlerPtr link;
 	mutable Ui::PeerUserpicView view;
 	int width = 0;
 
@@ -295,7 +297,7 @@ private:
 	static void Paint(
 		Painter &p,
 		not_null<const Ui::ChatStyle*> st,
-		not_null<PeerData*> sender,
+		not_null<Data::Thread*> thread,
 		const Ui::Text::String &text,
 		int width,
 		Ui::PeerUserpicView &view,
@@ -475,7 +477,7 @@ public:
 	[[nodiscard]] bool displayDate() const;
 	[[nodiscard]] bool isInOneDayWithPrevious() const;
 
-	[[nodiscard]] bool displayMonoforumSender() const;
+	[[nodiscard]] bool displayForumThreadBar() const;
 	[[nodiscard]] bool isInOneBunchWithPrevious() const;
 
 	virtual void draw(Painter &p, const PaintContext &context) const = 0;
@@ -688,7 +690,7 @@ protected:
 	std::unique_ptr<Reactions::InlineList> _reactions;
 
 private:
-	void recountMonoforumSenderBarInBlocks();
+	void recountThreadBarInBlocks();
 
 	// This should be called only from previousInBlocksChanged()
 	// to add required bits to the Composer mask
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index c32f444ddd..4391982912 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -1092,10 +1092,13 @@ QSize Message::performCountOptimalSize() {
 
 void Message::refreshTopicButton() {
 	const auto item = data();
-	if (isAttachedToPrevious()
-		|| delegate()->elementHideTopicButton(this)) {
+	if (isAttachedToPrevious() || delegate()->elementHideTopicButton(this)) {
 		_topicButton = nullptr;
 	} else if (const auto topic = item->topic()) {
+		if (topic->channel()->useSubsectionTabs()) {
+			_topicButton = nullptr;
+			return;
+		}
 		if (!_topicButton) {
 			_topicButton = std::make_unique<TopicButton>();
 		}
@@ -1132,8 +1135,8 @@ int Message::marginTop() const {
 	if (const auto bar = Get<UnreadBar>()) {
 		result += bar->height();
 	}
-	if (const auto monoforumBar = Get<MonoforumSenderBar>()) {
-		result += monoforumBar->height();
+	if (const auto bar = Get<ForumThreadBar>()) {
+		result += bar->height();
 	}
 	if (const auto service = Get<ServicePreMessage>()) {
 		result += service->height;
@@ -1181,8 +1184,8 @@ void Message::draw(Painter &p, const PaintContext &context) const {
 		if (const auto date = Get<DateBadge>()) {
 			aboveh += date->height();
 		}
-		if (const auto sender = Get<MonoforumSenderBar>()) {
-			aboveh += sender->height();
+		if (const auto bar = Get<ForumThreadBar>()) {
+			aboveh += bar->height();
 		}
 		if (context.clip.intersects(QRect(0, aboveh, width(), unreadbarh))) {
 			p.translate(0, aboveh);
diff --git a/Telegram/SourceFiles/history/view/history_view_service_message.cpp b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
index ce283943a0..5c96ee4980 100644
--- a/Telegram/SourceFiles/history/view/history_view_service_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_service_message.cpp
@@ -527,8 +527,8 @@ int Service::marginTop() const {
 	if (const auto bar = Get<UnreadBar>()) {
 		result += bar->height();
 	}
-	if (const auto monoforumBar = Get<MonoforumSenderBar>()) {
-		result += monoforumBar->height();
+	if (const auto bar = Get<ForumThreadBar>()) {
+		result += bar->height();
 	}
 	if (const auto service = Get<ServicePreMessage>()) {
 		result += service->height;
@@ -553,8 +553,8 @@ void Service::draw(Painter &p, const PaintContext &context) const {
 		if (const auto date = Get<DateBadge>()) {
 			aboveh += date->height();
 		}
-		if (const auto sender = Get<MonoforumSenderBar>()) {
-			aboveh += sender->height();
+		if (const auto bar = Get<ForumThreadBar>()) {
+			aboveh += bar->height();
 		}
 		if (context.clip.intersects(QRect(0, aboveh, width(), unreadbarh))) {
 			p.translate(0, aboveh);
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index f31e3b8057..db44cea1ce 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -348,6 +348,33 @@ void DateClickHandler::onClick(ClickContext context) const {
 	}
 }
 
+ForumThreadClickHandler::ForumThreadClickHandler(not_null<HistoryItem*> item)
+: _thread(resolveThread(item)) {
+}
+
+void ForumThreadClickHandler::update(not_null<HistoryItem*> item) {
+	_thread = resolveThread(item);
+}
+
+void ForumThreadClickHandler::onClick(ClickContext context) const {
+	const auto my = context.other.value<ClickHandlerContext>();
+	if (const auto window = my.sessionWindow.get()) {
+		if (const auto strong = _thread.get()) {
+			window->showThread(strong, 0, SectionShow::Way::ClearStack);
+		}
+	}
+}
+
+base::weak_ptr<Data::Thread> ForumThreadClickHandler::resolveThread(
+		not_null<HistoryItem*> item) const {
+	if (const auto sublist = item->savedSublist()) {
+		return sublist;
+	} else if (const auto topic = item->topic()) {
+		return topic;
+	}
+	return nullptr;
+}
+
 MessageHighlightId SearchHighlightId(const QString &query) {
 	auto result = MessageHighlightId{ .quote = { query } };
 	if (!result.quote.empty()) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 7f46a54ffd..80a2fbaea2 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -126,6 +126,21 @@ private:
 
 };
 
+class ForumThreadClickHandler : public ClickHandler {
+public:
+	explicit ForumThreadClickHandler(not_null<HistoryItem*> item);
+
+	void update(not_null<HistoryItem*> item);
+	void onClick(ClickContext context) const override;
+
+private:
+	[[nodiscard]] base::weak_ptr<Data::Thread> resolveThread(
+		not_null<HistoryItem*> item) const;
+
+	base::weak_ptr<Data::Thread> _thread;
+
+};
+
 struct SectionShow {
 	enum class Way {
 		Forward,

From b4bca16109d933847db31a0aa7b8a9b887f6b71f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Thu, 21 Aug 2025 23:41:47 +0000
Subject: [PATCH 216/341] Get rid of wayland-scanner downgrade

---
 Telegram/build/docker/centos_env/Dockerfile | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index fe58d9d358..5e1c627796 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -497,23 +497,6 @@ RUN git clone -b libXcomposite-0.4.6 --depth=1 https://github.com/gitlab-freedes
 	&& cd .. \
 	&& rm -rf libxcomposite
 
-FROM builder AS wayland
-RUN git clone -b 1.19.0 --depth=1 https://github.com/gitlab-freedesktop-mirrors/wayland.git \
-	&& cd wayland \
-	&& sed -i "/subdir('tests')/d" meson.build \
-	&& meson build \
-		--buildtype=plain \
-		--default-library=static \
-		-Ddocumentation=false \
-		-Ddtd_validation=false \
-		-Dicon_directory=/usr/share/icons \
-	&& meson compile -C build src/wayland-scanner \
-	&& mkdir -p "/usr/src/wayland-cache/usr/local/bin" "/usr/src/wayland-cache/usr/local/lib64/pkgconfig" \
-	&& cp build/src/wayland-scanner "/usr/src/wayland-cache/usr/local/bin" \
-	&& sed 's@bindir=${prefix}/bin@bindir=${prefix}/local/bin@;s/1.21.0/1.19.0/' /usr/lib64/pkgconfig/wayland-scanner.pc > "/usr/src/wayland-cache/usr/local/lib64/pkgconfig/wayland-scanner.pc" \
-	&& cd .. \
-	&& rm -rf wayland
-
 FROM builder AS nv-codec-headers
 RUN git clone -b n12.1.14.0 --depth=1 https://github.com/FFmpeg/nv-codec-headers.git \
 	&& DESTDIR=/usr/src/nv-codec-headers-cache make -C nv-codec-headers install \
@@ -744,7 +727,6 @@ COPY --link --from=xcb-image /usr/src/xcb-image-cache /
 COPY --link --from=xcb-keysyms /usr/src/xcb-keysyms-cache /
 COPY --link --from=xcb-render-util /usr/src/xcb-render-util-cache /
 COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
-COPY --link --from=wayland /usr/src/wayland-cache /
 COPY --link --from=openssl /usr/src/openssl-cache /
 COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
 
@@ -875,7 +857,6 @@ COPY --link --from=xrandr /usr/src/xrandr-cache /
 COPY --link --from=xrender /usr/src/xrender-cache /
 COPY --link --from=xdamage /usr/src/xdamage-cache /
 COPY --link --from=xcomposite /usr/src/xcomposite-cache /
-COPY --link --from=wayland /usr/src/wayland-cache /
 COPY --link --from=ffmpeg /usr/src/ffmpeg-cache /
 COPY --link --from=openal /usr/src/openal-cache /
 COPY --link --from=openssl /usr/src/openssl-cache /

From 063085a6bb90d2d2b94cc78fd9623094b1f3f840 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 19 Aug 2025 02:16:12 +0400
Subject: [PATCH 217/341] Format Linux webview socket path using std::format

---
 Telegram/SourceFiles/platform/linux/specific_linux.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 1710805359..60985f80f7 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -712,11 +712,10 @@ void start() {
 	GLib::set_prgname(cExeName().toStdString());
 	GLib::set_application_name(AppName.data());
 
-	Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-%4"_q.arg(
+	Webview::WebKitGTK::SetSocketPath(u"%1/%2-%3-webview-{}"_q.arg(
 		QDir::tempPath(),
 		HashForSocketPath(),
-		u"TD"_q,//QCoreApplication::applicationName(), - make path smaller.
-		u"%1"_q).toStdString());
+		u"TD"_q).toStdString());
 
 	InstallLauncher();
 }

From b352c97479f8fb0e05fc4d993d16129799c7dafd Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Tue, 19 Aug 2025 02:16:55 +0400
Subject: [PATCH 218/341] Switch from custom URI scheme to local HTTP server
 for webview on Linux

---
 Telegram/Resources/picker_html/picker.js            |  4 ++--
 .../SourceFiles/ui/controls/location_picker.cpp     | 13 +------------
 Telegram/lib_webview                                |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/picker_html/picker.js b/Telegram/Resources/picker_html/picker.js
index e44fd51a95..628a224637 100644
--- a/Telegram/Resources/picker_html/picker.js
+++ b/Telegram/Resources/picker_html/picker.js
@@ -51,8 +51,8 @@ var LocationPicker = {
 	},
 	init: function (params) {
 		mapboxgl.accessToken = params.token;
-		if (params.protocol) {
-			mapboxgl.config.API_URL = params.protocol + '://domain/api.mapbox.com';
+		if (location.hostname != 'desktop-app-resource') {
+			mapboxgl.config.API_URL = location.protocol + '//' + location.host + '/api.mapbox.com';
 		}
 
 		var options = { container: 'map', config: {
diff --git a/Telegram/SourceFiles/ui/controls/location_picker.cpp b/Telegram/SourceFiles/ui/controls/location_picker.cpp
index 6d69efebd3..1ce682318e 100644
--- a/Telegram/SourceFiles/ui/controls/location_picker.cpp
+++ b/Telegram/SourceFiles/ui/controls/location_picker.cpp
@@ -58,12 +58,6 @@ namespace {
 constexpr auto kResolveAddressDelay = 3 * crl::time(1000);
 constexpr auto kSearchDebounceDelay = crl::time(900);
 
-#if defined Q_OS_MAC || defined Q_OS_LINUX
-const auto kProtocolOverride = "mapboxapihelper";
-#else // Q_OS_MAC
-const auto kProtocolOverride = "";
-#endif // Q_OS_MAC
-
 Core::GeoLocation LastExactLocation;
 
 using VenueData = Data::InputVenue;
@@ -923,7 +917,6 @@ void LocationPicker::setupWebview() {
 		Webview::WindowConfig{
 			.opaqueBg = st::windowBg->c,
 			.storageId = _webviewStorageId,
-			.dataProtocolOverride = kProtocolOverride,
 		});
 	const auto raw = _webview.get();
 
@@ -1104,13 +1097,9 @@ void LocationPicker::mapReady() {
 	const auto token = _config.mapsToken.toUtf8();
 	const auto center = DefaultCenter(_initialProvided);
 	const auto bounds = DefaultBounds();
-	const auto protocol = *kProtocolOverride
-		? "'"_q + kProtocolOverride + "'"
-		: "null";
 	const auto params = "token: '" + token + "'"
 		+ ", center: " + center
-		+ ", bounds: " + bounds
-		+ ", protocol: " + protocol;
+		+ ", bounds: " + bounds;
 	_webview->eval("LocationPicker.init({ " + params + " });");
 
 	const auto handle = _window->window()->windowHandle();
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 2a29edd9fc..24764a61d4 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 2a29edd9fcc98efaecb968eb73667a00ea1c6cdd
+Subproject commit 24764a61d4cb6575e775af044af3824dff30b01a

From d05ad44b84f6eb04503f3b4f36cb018731a0d71e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 21:15:14 +0400
Subject: [PATCH 219/341] Fix build with GCC.

---
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 5a4162b2db..d36c2c70bd 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1886,7 +1886,7 @@ void GenericCreditsEntryBox(
 				Ui::Text::WithEntities)
 		) | rpl::map([=](QString &&hint, const TextWithEntities &hide) {
 			return TextWithEntities{ std::move(hint) }.append(' ').append(
-				Ui::Text::Link(std::move(hide)));
+				Ui::Text::Link(hide));
 		});
 		auto withHide = rpl::combine(
 			visiblePhrase(),
@@ -1896,7 +1896,7 @@ void GenericCreditsEntryBox(
 				Ui::Text::WithEntities)
 		) | rpl::map([](QString &&hint, const TextWithEntities &hide) {
 			return TextWithEntities{ std::move(hint) }.append(' ').append(
-				Ui::Text::Link(std::move(hide)));
+				Ui::Text::Link(hide));
 		});
 		auto text = (!e.savedToProfile && canToggle && canUpgrade)
 			? std::move(withShow)

From 719c209c7b8447815356d8ff740893a86ce4141b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 21:17:17 +0400
Subject: [PATCH 220/341] Fix build with Xcode.

---
 Telegram/lib_ui | 2 +-
 cmake           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index fb3270be1b..962581d1bf 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit fb3270be1b33ccfc7c720f32fb2753844dd38349
+Subproject commit 962581d1bf8b97323d0bd67dc06a8e4ff56757b5
diff --git a/cmake b/cmake
index f3d6471bd5..483a10954b 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit f3d6471bd58dbad727d4f8fbccd0fb36632eee9e
+Subproject commit 483a10954b0fafa7f759a82847b066c44466074c

From 7e15722eabe0bfe61f3056843990b10bda448cb3 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 18:08:54 +0400
Subject: [PATCH 221/341] Beta version 6.0.3.

- Ctrl+Tab / Ctrl+Shift+Tab for last opened chats switching.
- New topic dividers for groups with topics and tabs.
- Adjust volume of notification sounds.
- Show stars required for the next rating level.
- IV support on Linux (in case WebView works).
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 10 +++++-----
 changelog.txt                                |  8 ++++++++
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 2bcd1762c5..ccd26ab448 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.0.2.0" />
+    Version="6.0.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 771c9f04c6..0c4b76c874 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,2,0
- PRODUCTVERSION 6,0,2,0
+ FILEVERSION 6,0,3,0
+ PRODUCTVERSION 6,0,3,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.0.2.0"
+            VALUE "FileVersion", "6.0.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.2.0"
+            VALUE "ProductVersion", "6.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 52da953ba8..d26bfffd6c 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,2,0
- PRODUCTVERSION 6,0,2,0
+ FILEVERSION 6,0,3,0
+ PRODUCTVERSION 6,0,3,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.0.2.0"
+            VALUE "FileVersion", "6.0.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.2.0"
+            VALUE "ProductVersion", "6.0.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 6a25561deb..329078f2c4 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6000002;
-constexpr auto AppVersionStr = "6.0.2";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 6000003;
+constexpr auto AppVersionStr = "6.0.3";
+constexpr auto AppBetaVersion = true;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f6da1d233b..04a1268f87 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6000002
+AppVersion         6000003
 AppVersionStrMajor 6.0
-AppVersionStrSmall 6.0.2
-AppVersionStr      6.0.2
-BetaChannel        0
+AppVersionStrSmall 6.0.3
+AppVersionStr      6.0.3
+BetaChannel        1
 AlphaVersion       0
-AppVersionOriginal 6.0.2
+AppVersionOriginal 6.0.3.beta
diff --git a/changelog.txt b/changelog.txt
index 5a260449b1..f4a64a77d5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+6.0.3 beta (22.08.25)
+
+- Ctrl+Tab / Ctrl+Shift+Tab for last opened chats switching.
+- New topic dividers for groups with topics and tabs.
+- Adjust volume of notification sounds.
+- Show stars required for the next rating level.
+- IV support on Linux (in case WebView works).
+
 6.0.2 (01.08.25)
 
 - Improve design of profile stars rating.

From 48525de714e5c8bc92d04f1f218bd866019bce60 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 23 Aug 2025 21:03:28 +0000
Subject: [PATCH 222/341] Restore icon key in snapcraft.yaml

Looks like it didn't help with themed icon after all and snapcraft chooses a 64x64 icon without it which looks blurry with HiDPI
---
 snap/snapcraft.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index cd6f96ddb0..09b20c35d1 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,5 +1,6 @@
 name: telegram-desktop
 adopt-info: telegram
+icon: Telegram/Resources/art/icon512@2x.png
 
 base: core24
 grade: stable

From 0cf3325655173a04764d58eb50b6639d295eca62 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 25 Aug 2025 06:18:38 +0000
Subject: [PATCH 223/341] Fix macOS action

---
 Telegram/SourceFiles/apiwrap.cpp                         | 5 +++--
 Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index bb7dde822a..fdf8e04512 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -2461,13 +2461,14 @@ void ApiWrap::refreshFileReference(
 			const auto mediaStory = media ? media->storyId() : FullStoryId();
 			const auto storyId = mediaStory
 				? mediaStory
-				: FullStoryId(
+				: FullStoryId{
 					(IsStoryMsgId(item->id)
 						? item->history()->peer->id
 						: PeerId()),
 					(IsStoryMsgId(item->id)
 						? StoryIdFromMsgId(item->id)
-						: StoryId()));
+						: StoryId())
+				};
 			if (storyId) {
 				request(MTPstories_GetStoriesByID(
 					_session->data().peer(storyId.peer)->input,
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
index d209d70d53..448160e0bc 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp
@@ -297,9 +297,9 @@ void MessageView::prepare(
 				? 0
 				: minFrom - kLeftShift;
 
-			textToCache = TextWithEntities(
-					minFrom > 0 ? kQEllipsis : QString())
-				.append(Text::Mid(std::move(textToCache), minFrom));
+			textToCache = (TextWithEntities{
+				minFrom > 0 ? kQEllipsis : QString()
+			}).append(Text::Mid(std::move(textToCache), minFrom));
 		}
 	}
 	_hasPlainLinkAtBegin = !textToCache.entities.empty()

From 05c10e3f57c1c10c8d70327e6a3212646ce706fa Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 27 Aug 2025 10:41:00 +0000
Subject: [PATCH 224/341] Switch patches to nil plugin in snap

---
 snap/snapcraft.yaml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 09b20c35d1..a798477149 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -108,13 +108,12 @@ parts:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
     source-commit: e15b5d87c565e516aad5bcafdfe40315f84e5459
-    plugin: dump
+    plugin: nil
     override-pull: |
       craftctl default
       cp -r . "$CRAFT_STAGE/patches"
     override-prime: |
       rm -rf patches
-    stage: [-./*]
 
   ada:
     source: https://github.com/ada-url/ada.git

From 1eb9b40607794990319e984097f9629caac70c04 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 27 Aug 2025 02:49:41 +0000
Subject: [PATCH 225/341] Update Qt to 6.9.2

---
 Telegram/build/docker/centos_env/Dockerfile | 4 ++--
 Telegram/build/prepare/prepare.py           | 2 +-
 Telegram/build/qt_version.py                | 2 +-
 snap/snapcraft.yaml                         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile
index 5e1c627796..9eb1907ee6 100644
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -91,7 +91,7 @@ FROM builder AS patches
 RUN git init patches \
 	&& cd patches \
 	&& git remote add origin https://github.com/desktop-app/patches.git \
-	&& git fetch --depth=1 origin e15b5d87c565e516aad5bcafdfe40315f84e5459 \
+	&& git fetch --depth=1 origin a25a212644a8e42d9a5b1c7ba6489e11e92df813 \
 	&& git reset --hard FETCH_HEAD \
 	&& rm -rf .git
 
@@ -730,7 +730,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache /
 COPY --link --from=openssl /usr/src/openssl-cache /
 COPY --link --from=xkbcommon /usr/src/xkbcommon-cache /
 
-ENV QT=6.9.1
+ENV QT=6.9.2
 RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \
 	&& cd qt5 \
 	&& git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 26ec22b16d..1ec58782ac 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -456,7 +456,7 @@ if customRunCommand:
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout 1ffcb17817a2cab167061d530703842395291e69
+    git checkout a25a212644a8e42d9a5b1c7ba6489e11e92df813
 """)
 
 stage('msys64', """
diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py
index e551364ce3..329a746c9d 100644
--- a/Telegram/build/qt_version.py
+++ b/Telegram/build/qt_version.py
@@ -6,7 +6,7 @@ def resolve(arch):
     elif sys.platform == 'win32':
         if arch == 'arm' or 'qt6' in sys.argv:
             print('Choosing Qt 6.')
-            os.environ['QT'] = '6.9.1'
+            os.environ['QT'] = '6.9.2'
         else:
             print('Choosing Qt 5.')
             os.environ['QT'] = '5.15.17'
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index a798477149..bb2b093ea4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -107,7 +107,7 @@ parts:
   patches:
     source: https://github.com/desktop-app/patches.git
     source-depth: 1
-    source-commit: e15b5d87c565e516aad5bcafdfe40315f84e5459
+    source-commit: a25a212644a8e42d9a5b1c7ba6489e11e92df813
     plugin: nil
     override-pull: |
       craftctl default
@@ -398,7 +398,7 @@ parts:
   qt:
     source: https://github.com/qt/qt5.git
     source-depth: 1
-    source-tag: v6.9.1
+    source-tag: v6.9.2
     source-submodules:
       - qtbase
       - qtdeclarative

From 36a40d97a7dce68e175019b5cb0ad862a5396b63 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 29 Aug 2025 22:03:17 +0000
Subject: [PATCH 226/341] Update submodules

---
 Telegram/lib_base    | 2 +-
 Telegram/lib_webview | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/lib_base b/Telegram/lib_base
index 0450674146..eb8564e087 160000
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
@@ -1 +1 @@
-Subproject commit 04506741462719a190152c64daa1a9ec4c8ef44f
+Subproject commit eb8564e08735533b996780946fd819f24c333ac5
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 24764a61d4..55af106a52 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 24764a61d4cb6575e775af044af3824dff30b01a
+Subproject commit 55af106a525cfe9e1001ab36cbe09bf487fa2545

From 8c77baca6f1eb59205d5cd676127ecef305821cd Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 22 Aug 2025 19:37:19 +0300
Subject: [PATCH 227/341] Fixed wrong focus while recording voice in sections.

---
 .../history/view/controls/history_view_compose_controls.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index 6caddd9ba6..d5d3a7ae90 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -1122,9 +1122,13 @@ const HistoryItemsList &ComposeControls::forwardItems() const {
 }
 
 bool ComposeControls::focus() {
-	if (_wrap->isHidden() || _field->isHidden() || isRecording()) {
+	if (_wrap->isHidden() || _field->isHidden()) {
 		return false;
 	}
+	if (isRecording()) {
+		_wrap->setFocus();
+		return true;
+	}
 	_field->setFocus();
 	return true;
 }

From f1b3db89fba940336da194e737d36ecfcafec718 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Aug 2025 14:27:13 +0300
Subject: [PATCH 228/341] Fixed hover rect of entry item in channel earn
 history.

---
 .../channel_statistics/earn/info_channel_earn_list.cpp     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index b53804c5e8..4ebddf83ed 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -1278,9 +1278,10 @@ void InnerWidget::fill() {
 					const auto rightWrapPadding = rect::m::sum::h(padding)
 						+ minorLabel->width()
 						+ majorLabel->width();
-					wrap->setPadding(st::channelEarnHistoryOuter
-						+ QMargins(padding.left(), 0, rightWrapPadding, 0));
-					button->resize(g.size());
+					const auto additional = st::channelEarnHistoryOuter
+						+ QMargins(padding.left(), 0, rightWrapPadding, 0);
+					wrap->setPadding(additional);
+					button->resize((g + additional).size());
 					button->lower();
 				}, wrap->lifetime());
 			};

From 1c1d13545b6a0c6f99764e01e589ce19357f260f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Aug 2025 14:29:05 +0300
Subject: [PATCH 229/341] Added special check of balance on channel earn out
 just in case.

---
 .../info/channel_statistics/earn/info_channel_earn_list.cpp   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 4ebddf83ed..50cb210ad0 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -910,11 +910,9 @@ void InnerWidget::fill() {
 					anim::interpolateF(.5, 1., value)));
 		};
 		colorText(withdrawalEnabled ? 1. : 0.);
-#ifndef _DEBUG
 		button->setAttribute(
 			Qt::WA_TransparentForMouseEvents,
-			!withdrawalEnabled);
-#endif
+			!withdrawalEnabled && (value.value() > 0.01));
 
 		Api::HandleWithdrawalButton(
 			{ .currencyReceiver = _peer },

From 3549c001417369c1d91e1a68564828f9205e0a1e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Aug 2025 14:54:58 +0300
Subject: [PATCH 230/341] Added ability to forward to Saved Messages on fast
 action with Ctrl.

---
 Telegram/SourceFiles/boxes/share_box.cpp      | 23 +++++++++++++++++++
 Telegram/SourceFiles/boxes/share_box.h        |  3 +++
 .../history/view/history_view_message.cpp     |  3 +++
 3 files changed, 29 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/share_box.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
index 5f9e018a28..4c6eb01e0b 100644
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.cpp
@@ -1935,6 +1935,29 @@ void FastShareMessage(
 	}), Ui::LayerOption::CloseOther);
 }
 
+void FastShareMessageToSelf(
+		std::shared_ptr<Main::SessionShow> show,
+		not_null<HistoryItem*> item) {
+	const auto self = show->session().user();
+	const auto donePhraseArgs = ChatHelpers::ForwardedMessagePhraseArgs{
+		.toCount = 1,
+		.singleMessage = true,
+		.to1 = self,
+		.to2 = nullptr,
+	};
+	auto sendAction = Api::SendAction(self->owner().history(self));
+	sendAction.clearDraft = false;
+	show->session().api().forwardMessages(
+		Data::ResolvedForwardDraft{ .items = {item} },
+		std::move(sendAction),
+		[=] {
+			auto phrase = rpl::variable<TextWithEntities>(
+				ChatHelpers::ForwardedMessagePhrase(
+					donePhraseArgs)).current();
+			show->showToast(std::move(phrase));
+		});
+}
+
 void FastShareMessage(
 		not_null<Window::SessionController*> controller,
 		not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/boxes/share_box.h b/Telegram/SourceFiles/boxes/share_box.h
index 5cbfb794d7..ec31a835b5 100644
--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@@ -71,6 +71,9 @@ struct ShareBoxStyleOverrides {
 };
 [[nodiscard]] ShareBoxStyleOverrides DarkShareBoxStyle();
 
+void FastShareMessageToSelf(
+	std::shared_ptr<Main::SessionShow> show,
+	not_null<HistoryItem*> item);
 void FastShareMessage(
 	std::shared_ptr<Main::SessionShow> show,
 	not_null<HistoryItem*> item,
diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp
index 4391982912..1a82ad8cf2 100644
--- a/Telegram/SourceFiles/history/view/history_view_message.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_message.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_message.h"
 
 #include "api/api_suggest_post.h"
+#include "base/qt/qt_key_modifiers.h"
 #include "base/unixtime.h"
 #include "core/click_handler_types.h" // ClickHandlerContext
 #include "core/ui_integration.h"
@@ -4214,6 +4215,8 @@ ClickHandlerPtr Message::prepareRightActionLink() const {
 					savedFromPeer,
 					Window::SectionShow::Way::Forward,
 					savedFromMsgId);
+			} else if (base::IsCtrlPressed()) {
+				FastShareMessageToSelf(controller->uiShow(), item);
 			} else {
 				FastShareMessage(controller, item);
 			}

From 90473957cb0d7edaa9b786fe9fe42be1ae149d3c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Aug 2025 16:16:25 +0300
Subject: [PATCH 231/341] Added process of error when collectible info can't be
 revealed.

---
 Telegram/SourceFiles/core/local_url_handlers.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 0cc0ff3fc1..e386bcc9fe 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -1089,7 +1089,17 @@ bool ShowCollectibleUsername(
 	}
 	const auto username = match->captured(1);
 	const auto peerId = PeerId(match->captured(2).toULongLong());
-	controller->resolveCollectible(peerId, username);
+	const auto weak = base::make_weak(controller);
+	controller->resolveCollectible(peerId, username, [=](const QString &e) {
+		if (e == u"COLLECTIBLE_NOT_FOUND"_q) {
+			if (const auto strong = weak.get()) {
+				TextUtilities::SetClipboardText({
+					strong->session().createInternalLinkFull(username)
+				});
+				strong->showToast(tr::lng_username_copied(tr::now));
+			}
+		}
+	});
 	return true;
 }
 

From 86daf2a9dc09d480c098cd6064153003061a2260 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Aug 2025 16:59:27 +0300
Subject: [PATCH 232/341] Removed ability to clear history from replies chat.

---
 Telegram/SourceFiles/window/window_peer_menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index a5db87a14c..5cd4f54051 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -759,7 +759,7 @@ void Filler::addToggleArchive() {
 }
 
 void Filler::addClearHistory() {
-	if (_topic || _peer->isMonoforum()) {
+	if (_topic || _peer->isMonoforum() || _peer->isRepliesChat()) {
 		return;
 	}
 	const auto channel = _peer->asChannel();

From 90d21375c8b9c98a256c56a2e1d689942fbd6b80 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 23 Aug 2025 16:59:46 +0300
Subject: [PATCH 233/341] Removed ability to create todo lists in replies chat.

---
 Telegram/SourceFiles/window/window_peer_menu.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 5cd4f54051..e15f6a33cb 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -1185,6 +1185,9 @@ void Filler::addViewStatistics() {
 }
 
 bool Filler::skipCreateActions() const {
+	if (_peer && _peer->isRepliesChat()) {
+		return true;
+	}
 	const auto isJoinChannel = [&] {
 		if (_request.section != Section::Replies) {
 			if (const auto c = _peer->asChannel(); c && !c->amIn()) {

From 838796946723bacaaa18c53672be66eea3949ea0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Aug 2025 13:48:26 +0300
Subject: [PATCH 234/341] Removed unused trigger for Github CI that updates
 user-agent for DNS.

---
 .github/workflows/user_agent_updater.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/user_agent_updater.yml b/.github/workflows/user_agent_updater.yml
index c1713b357f..1e3dae8182 100644
--- a/.github/workflows/user_agent_updater.yml
+++ b/.github/workflows/user_agent_updater.yml
@@ -6,8 +6,6 @@ on:
   schedule:
     # At 00:00 on day-of-month 1.
     - cron: "0 0 1 * *"
-  pull_request_target:
-    types: [closed]
 
 jobs:
   User-agent:

From 691c55bedd9e5cde4a5dc8050a87d5818182eb79 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Aug 2025 14:04:32 +0300
Subject: [PATCH 235/341] Simplified master branch updater Github Action.

---
 .github/workflows/master_updater.yml | 30 +++-------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/master_updater.yml b/.github/workflows/master_updater.yml
index c59f62e29a..58d1b9c5a2 100644
--- a/.github/workflows/master_updater.yml
+++ b/.github/workflows/master_updater.yml
@@ -5,33 +5,9 @@ on:
     types: released
 
 jobs:
-  updater:
+  User-agent:
     runs-on: ubuntu-latest
-    env:
-      SKIP: "0"
-      to_branch: "master"
     steps:
-      - uses: actions/checkout@v4
+      - uses: desktop-app/action_code_updater@master
         with:
-          fetch-depth: 0
-        if: env.SKIP == '0'
-      - name: Push the code to the master branch.
-        if: env.SKIP == '0'
-        run: |
-          token=${{ secrets.TOKEN_FOR_MASTER_UPDATER }}
-          if [ -z "${token}" ]; then
-              echo "Token is unset. Nothing to do."
-              exit 0
-          fi
-
-          url=https://x-access-token:$token@github.com/$GITHUB_REPOSITORY
-          latest_tag=$(git describe --tags --abbrev=0)
-          echo "Latest tag: $latest_tag"
-
-          git remote set-url origin $url
-          git remote -v
-          git checkout master
-          git merge $latest_tag
-
-          git push origin HEAD:refs/heads/$to_branch
-          echo "Done!"
+          type: "dev-to-master"

From 946b597471723194053c60588a30d8479008b34e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Aug 2025 15:36:49 +0300
Subject: [PATCH 236/341] Added support of custom bg to loading element for
 peer list.

---
 Telegram/SourceFiles/boxes/peer_list_box.cpp        | 3 ++-
 Telegram/SourceFiles/ui/effects/loading_element.cpp | 9 +++++++--
 Telegram/SourceFiles/ui/effects/loading_element.h   | 3 ++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index d57ba16954..657c647fe6 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -1460,7 +1460,8 @@ void PeerListContent::setSearchMode(PeerListSearchMode mode) {
 					_loadingAnimation = Ui::CreateLoadingPeerListItemWidget(
 						this,
 						_st.item,
-						2);
+						2,
+						_controller->computeListSt().bg->c);
 				}
 			}
 		} else {
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.cpp b/Telegram/SourceFiles/ui/effects/loading_element.cpp
index 5cc2e5e909..344a31ec34 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.cpp
+++ b/Telegram/SourceFiles/ui/effects/loading_element.cpp
@@ -142,6 +142,7 @@ template <typename Element, typename ...ElementArgs>
 object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 		not_null<Ui::RpWidget*> parent,
 		int lines,
+		QColor bg,
 		rpl::producer<bool> rtl,
 		ElementArgs &&...args) {
 	auto widget = object_ptr<Ui::RpWidget>(parent);
@@ -203,7 +204,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 	) | rpl::start_with_next([=](int width) {
 		state->glare.width = width;
 		state->glare.validate(
-			st::dialogsBg->c,
+			bg,
 			[=] { raw->update(); },
 			kTimeout,
 			kDuration);
@@ -225,6 +226,7 @@ object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 	return CreateLoadingElementWidget<LoadingText>(
 		parent,
 		lines,
+		st::dialogsBg->c,
 		std::move(rtl),
 		st);
 }
@@ -232,10 +234,12 @@ object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 object_ptr<Ui::RpWidget> CreateLoadingPeerListItemWidget(
 		not_null<Ui::RpWidget*> parent,
 		const style::PeerListItem &st,
-		int lines) {
+		int lines,
+		std::optional<QColor> bgOverride) {
 	return CreateLoadingElementWidget<LoadingPeerListItem>(
 		parent,
 		lines,
+		bgOverride.value_or(st::dialogsBg->c),
 		rpl::single(false),
 		st);
 }
@@ -247,6 +251,7 @@ object_ptr<Ui::RpWidget> CreateLoadingDialogRowWidget(
 	return CreateLoadingElementWidget<LoadingPeerListItem>(
 		parent,
 		lines,
+		st::dialogsBg->c,
 		rpl::single(false),
 		st);
 }
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.h b/Telegram/SourceFiles/ui/effects/loading_element.h
index 757250f0a9..08280ead27 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.h
+++ b/Telegram/SourceFiles/ui/effects/loading_element.h
@@ -29,7 +29,8 @@ object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 object_ptr<Ui::RpWidget> CreateLoadingPeerListItemWidget(
 	not_null<Ui::RpWidget*> parent,
 	const style::PeerListItem &st,
-	int lines);
+	int lines,
+	std::optional<QColor> bgOverride);
 
 object_ptr<Ui::RpWidget> CreateLoadingDialogRowWidget(
 	not_null<Ui::RpWidget*> parent,

From 62613e7da1947b9d9438196daaf21c91504c3f52 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Aug 2025 16:30:12 +0300
Subject: [PATCH 237/341] Added support of custom brush to loading element for
 peer list.

---
 Telegram/SourceFiles/ui/effects/loading_element.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/ui/effects/loading_element.cpp b/Telegram/SourceFiles/ui/effects/loading_element.cpp
index 344a31ec34..94a4c34f5e 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.cpp
+++ b/Telegram/SourceFiles/ui/effects/loading_element.cpp
@@ -68,6 +68,9 @@ void LoadingText::paint(QPainter &p, int width) {
 		rpl::lifetime &lifetime,
 		const style::DialogRow &st) {
 	using namespace style;
+	const auto button = lifetime.make_state<OutlineButton>(OutlineButton{
+		.textBgOver = st::windowBgOver,
+	});
 	const auto item = lifetime.make_state<PeerListItem>(PeerListItem{
 		.height = st.height,
 		.photoPosition = QPoint(st.padding.left(), st.padding.top()),
@@ -75,6 +78,7 @@ void LoadingText::paint(QPainter &p, int width) {
 		.nameStyle = st::semiboldTextStyle,
 		.statusPosition = QPoint(st.textLeft, st.textTop),
 		.photoSize = st.photoSize,
+		.button = { *button },
 	});
 	return *item;
 }
@@ -98,7 +102,7 @@ public:
 			- (style.lineHeight - style.font->height);
 
 		p.setPen(Qt::NoPen);
-		p.setBrush(st::windowBgOver);
+		p.setBrush(_st.button.textBgOver);
 
 		p.drawEllipse(
 			_st.photoPosition.x(),

From c710e9a54d052272fc451ad8feae3cb233614296 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Aug 2025 23:33:52 +0300
Subject: [PATCH 238/341] Fixed display of label in self destruction box.

Fixed #29694.
---
 Telegram/SourceFiles/boxes/self_destruction_box.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/self_destruction_box.cpp b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
index f65cd54b17..e9946c9f5a 100644
--- a/Telegram/SourceFiles/boxes/self_destruction_box.cpp
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/passcode_box.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "ui/rect.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/labels.h"
 #include "ui/text/text_utilities.h"
@@ -148,6 +149,8 @@ void SelfDestructionBox::showContent() {
 			: tr::lng_self_destruct_sessions_description(tr::now)),
 		st::boxLabel);
 	_description->moveToLeft(st::boxPadding.left(), y);
+	_description->resizeToWidth(st::boxWidth
+		- rect::m::sum::h(st::boxPadding));
 	y += _description->height() + st::boxMediumSkip;
 
 	for (const auto value : _ttlValues) {
@@ -200,6 +203,8 @@ void SelfDestructionBox::prepare() {
 			? tr::lng_self_destruct_description(tr::now)
 			: tr::lng_self_destruct_sessions_description(tr::now)),
 		st::boxLabel);
+	fake->resizeToWidth(st::boxWidth
+		- rect::m::sum::h(st::boxPadding));
 	const auto boxHeight = st::boxOptionListPadding.top()
 		+ fake->height() + st::boxMediumSkip
 		+ (_ttlValues.size()

From eeea9932ed914aace1e161f0251e9a2139aa5c0c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 24 Aug 2025 23:46:18 +0300
Subject: [PATCH 239/341] Removed simple colorizing of query of hash or cashtag
 in found messages.

---
 Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index cfbb770582..43cc854c31 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1240,7 +1240,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 			auto to = ceilclamp(r.y() + r.height() - skip, _st->height, 0, _previewResults.size());
 			p.translate(0, from * _st->height);
 			if (from < _previewResults.size()) {
-				const auto searchLowerText = _searchState.query.toLower();
+				const auto searchLowerText = (_searchHashOrCashtag == HashOrCashtag::None)
+					? _searchState.query.toLower()
+					: QString();
 				for (; from < to; ++from) {
 					const auto &result = _previewResults[from];
 					const auto active = isSearchResultActive(result.get(), activeEntry);
@@ -1286,7 +1288,9 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
 					tr::now,
 					lt_count,
 					_searchedMigratedCount + _searchedCount);
-			const auto searchLowerText = _searchState.query.toLower();
+			const auto searchLowerText = (_searchHashOrCashtag == HashOrCashtag::None)
+				? _searchState.query.toLower()
+				: QString();
 			p.fillRect(0, 0, fullWidth, st::searchedBarHeight, st::searchedBarBg);
 			p.setFont(st::searchedBarFont);
 			p.setPen(st::searchedBarFg);

From db25b111e007dbee367097c62cf0635f14fcb4ca Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Aug 2025 08:53:47 +0300
Subject: [PATCH 240/341] Fixed display of currency minor part from earn stats
 in some cases.

---
 .../info/channel_statistics/earn/earn_format.cpp  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index 9e1ba75d52..b45fd87c51 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -51,7 +51,20 @@ QString MinorPart(EarnInt value) {
 }
 
 QString MinorPart(CreditsAmount value) {
-	return QString::number(value.value(), 'f', 2).right(3);
+	static const auto DecimalPoint = QLocale().decimalPoint();
+	static const int DecimalPointLength = DecimalPoint.length();
+
+	const auto fractional = std::abs(int(value.value() * 100)) % 100;
+	auto result = QString(DecimalPointLength + 2, Qt::Uninitialized);
+
+	for (int i = 0; i < DecimalPointLength; ++i) {
+		result[i] = DecimalPoint[i];
+	}
+
+	result[DecimalPointLength] = QChar('0' + fractional / 10);
+	result[DecimalPointLength + 1] = QChar('0' + fractional % 10);
+
+	return result;
 }
 
 QString ToUsd(

From b15305bc69ba31dc517be29f9b4eb0f95f8bc199 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Aug 2025 09:05:38 +0300
Subject: [PATCH 241/341] Respected localized number format in statistics.

---
 .../info/channel_statistics/earn/earn_format.cpp      | 11 +++++------
 Telegram/SourceFiles/statistics/chart_rulers_data.cpp |  4 +++-
 .../SourceFiles/statistics/view/chart_rulers_view.cpp |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index b45fd87c51..99ca5dcb62 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -14,7 +14,7 @@ using EarnInt = Data::EarnInt;
 constexpr auto kMinorPartLength = 9;
 constexpr auto kMaxChoppedZero = kMinorPartLength - 2;
 constexpr auto kZero = QChar('0');
-constexpr auto kDot = QChar('.');
+static const auto DecimalPoint = QLocale().decimalPoint();
 
 QString MajorPart(EarnInt value) {
 	const auto string = QString::number(value);
@@ -28,13 +28,13 @@ QString MajorPart(CreditsAmount value) {
 
 QString MinorPart(EarnInt value) {
 	if (!value) {
-		return QString(kDot) + kZero + kZero;
+		return DecimalPoint + kZero + kZero;
 	}
 	const auto string = QString::number(value);
 	const auto diff = int(string.size()) - kMinorPartLength;
 	const auto result = (diff < 0)
-		? kDot + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
-		: kDot + string.mid(diff);
+		? DecimalPoint + u"%1"_q.arg(0, std::abs(diff), 10, kZero) + string
+		: DecimalPoint + string.mid(diff);
 	const auto begin = (result.constData());
 	const auto end = (begin + result.size());
 	auto ch = end - 1;
@@ -51,7 +51,6 @@ QString MinorPart(EarnInt value) {
 }
 
 QString MinorPart(CreditsAmount value) {
-	static const auto DecimalPoint = QLocale().decimalPoint();
 	static const int DecimalPointLength = DecimalPoint.length();
 
 	const auto fractional = std::abs(int(value.value() * 100)) % 100;
@@ -82,7 +81,7 @@ QString ToUsd(
 
 	return QString(kApproximately)
 		+ QChar('$')
-		+ QString::number(
+		+ QLocale().toString(
 			value.value() * rate,
 			'f',
 			afterFloat ? afterFloat : 2);
diff --git a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
index 6241901804..c559a23684 100644
--- a/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
+++ b/Telegram/SourceFiles/statistics/chart_rulers_data.cpp
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "lang/lang_tag.h"
 
+#include <QLocale>
+
 namespace Statistic {
 namespace {
 
@@ -25,7 +27,7 @@ constexpr auto kStep = 5.;
 	static constexpr auto kTooMuch = ChartValue(10'000);
 	return (absoluteValue >= kTooMuch)
 		? Lang::FormatCountToShort(absoluteValue).string
-		: QString::number(absoluteValue);
+		: QLocale().toString(absoluteValue);
 }
 
 } // namespace
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index cdc8dc29f2..5093766b17 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -25,7 +25,7 @@ namespace {
 		? u"0"_q
 		: (absoluteValue >= kTooMuch)
 		? Lang::FormatCountToShort(absoluteValue).string
-		: QString::number(absoluteValue);
+		: QLocale().toString(absoluteValue);
 }
 
 } // namespace

From 1420714caea2d652a3b97cff7c673930760047e6 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Aug 2025 09:59:41 +0300
Subject: [PATCH 242/341] Fixed display of "Show more" button in channel
 currency earn list.

---
 .../earn/info_channel_earn_list.cpp            | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index 50cb210ad0..ae4349346d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -1063,7 +1063,8 @@ void InnerWidget::fill() {
 		if (hasCurrencyTab) {
 			Ui::AddSkip(listsContainer);
 
-			const auto historyList = tabCurrencyList->entity();
+			const auto historyList = tabCurrencyList->entity()->add(
+				object_ptr<Ui::VerticalLayout>(tabCurrencyList->entity()));
 			const auto addHistoryEntry = [=](
 					const Data::CreditsHistoryEntry &entry,
 					const tr::phrase<> &text) {
@@ -1312,22 +1313,17 @@ void InnerWidget::fill() {
 				state->token = firstSlice.token;
 				state->showed = firstSlice.list.size();
 				const auto max = firstSlice.total;
-				const auto wrap = listsContainer->add(
+				const auto wrap = tabCurrencyList->entity()->add(
 					object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-						listsContainer,
+						tabCurrencyList->entity(),
 						object_ptr<Ui::SettingsButton>(
-							listsContainer,
-							tr::lng_channel_earn_history_show_more(
-								lt_count,
-								state->showed.value(
-								) | rpl::map(
-									max - rpl::mappers::_1
-								) | tr::to_count()),
+							tabCurrencyList->entity(),
+							tr::lng_channels_your_more(),
 							st::statisticsShowMoreButton)));
 				const auto button = wrap->entity();
 				Ui::AddToggleUpDownArrowToMoreButton(button);
 
-				wrap->toggle(true, anim::type::instant);
+				wrap->toggle(!firstSlice.allLoaded, anim::type::instant);
 				const auto handleReceived = [=](
 						Data::EarnHistorySlice slice) {
 					state->loading = false;

From de55be397b11fae6fd689c043f7739cd8039851c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Aug 2025 11:05:00 +0300
Subject: [PATCH 243/341] Improved style of withdrawal button in credits
 settings.

---
 .../SourceFiles/settings/settings_credits.cpp | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index a11b2dd6cf..d2056ce4b5 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -600,15 +600,6 @@ void Credits::setupContent() {
 				CreditsAmount value,
 				float64 multiplier) {
 			Ui::AddSkip(container);
-			{
-				const auto header = container->add(
-					object_ptr<Ui::FlatLabel>(
-						container,
-						tr::lng_channel_earn_balance_title(),
-						st::channelEarnHeaderLabel),
-					st::boxRowPadding);
-				header->resizeToWidth(header->width());
-			}
 			Ui::AddSkip(container);
 
 			const auto labels = container->add(
@@ -620,7 +611,11 @@ void Credits::setupContent() {
 				st::channelEarnBalanceMajorLabel);
 			{
 				const auto &m = st::channelEarnCurrencyCommonMargins;
-				const auto p = QMargins(m.left(), 0, m.right(), m.bottom());
+				const auto p = QMargins(
+					m.left(),
+					-m.top(),
+					m.right(),
+					m.bottom());
 				AddEmojiToMajor(majorLabel, rpl::single(value), {}, p);
 			}
 			majorLabel->setAttribute(Qt::WA_TransparentForMouseEvents);
@@ -657,13 +652,14 @@ void Credits::setupContent() {
 
 			Ui::AddSkip(container);
 
-			const auto &stButton = st::defaultActiveButton;
+			const auto &stButton = st::creditsSettingsBigBalanceButton;
 			const auto button = container->add(
 				object_ptr<Ui::RoundButton>(
 					container,
 					rpl::never<QString>(),
 					stButton),
-				st::boxRowPadding);
+				st::boxRowPadding,
+				style::al_top);
 
 			const auto label = Ui::CreateChild<Ui::FlatLabel>(
 				button,
@@ -698,6 +694,7 @@ void Credits::setupContent() {
 				_controller->uiShow());
 			Ui::ToggleChildrenVisibility(button, true);
 
+			Ui::AddSkip(container);
 			Ui::AddSkip(container);
 			Ui::AddSkip(container);
 			Ui::AddDividerText(

From c96ce890d610b79b00e9a65f0412d8f575674e9e Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Aug 2025 17:01:08 +0300
Subject: [PATCH 244/341] Added initial struct data for unreviewed
 authorizations.

---
 .../SourceFiles/data/data_authorization.h     | 20 +++++++++++++++++++
 Telegram/cmake/td_ui.cmake                    |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 Telegram/SourceFiles/data/data_authorization.h

diff --git a/Telegram/SourceFiles/data/data_authorization.h b/Telegram/SourceFiles/data/data_authorization.h
new file mode 100644
index 0000000000..8f4add2e1d
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_authorization.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Data {
+
+struct UnreviewedAuth {
+	uint64 hash = 0;
+	bool unconfirmed = false;
+	TimeId date = 0;
+	QString device;
+	QString location;
+};
+
+} // namespace Data
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index b9f54ad843..230cb0caf2 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -88,6 +88,7 @@ PRIVATE
 
     data/raw/raw_countries_bounds.cpp
     data/raw/raw_countries_bounds.h
+    data/data_authorization.h
     data/data_birthday.cpp
     data/data_birthday.h
     data/data_channel_earn.h

From 94ccd8f8b63a342acfca24429b08689e3c9a66d2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Aug 2025 17:01:35 +0300
Subject: [PATCH 245/341] Added ability to store unconfirmed authorizations.

---
 .../main/main_session_settings.cpp            | 55 ++++++++++++++++++-
 .../SourceFiles/main/main_session_settings.h  |  6 ++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/main/main_session_settings.cpp b/Telegram/SourceFiles/main/main_session_settings.cpp
index 2f5d97a803..543bb26d5e 100644
--- a/Telegram/SourceFiles/main/main_session_settings.cpp
+++ b/Telegram/SourceFiles/main/main_session_settings.cpp
@@ -33,7 +33,7 @@ SessionSettings::SessionSettings()
 
 QByteArray SessionSettings::serialize() const {
 	const auto autoDownload = _autoDownload.serialize();
-	const auto size = sizeof(qint32) * 4
+	auto size = sizeof(qint32) * 4
 		+ _groupStickersSectionHidden.size() * sizeof(quint64)
 		+ sizeof(qint32) * 4
 		+ Serialize::bytearraySize(autoDownload)
@@ -56,7 +56,13 @@ QByteArray SessionSettings::serialize() const {
 				+ sizeof(quint64) * 3 // ThreadId
 				+ sizeof(ushort))) // Volume
 		+ sizeof(qint32) // _ratedTranscriptions size
-		+ (_ratedTranscriptions.size() * sizeof(quint64));
+		+ (_ratedTranscriptions.size() * sizeof(quint64))
+		+ sizeof(qint32); // _unreviewed size
+	for (const auto &auth : _unreviewed) {
+		size += sizeof(quint64) + sizeof(qint32) + sizeof(qint32)
+			+ Serialize::stringSize(auth.device)
+			+ Serialize::stringSize(auth.location);
+	}
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -128,6 +134,15 @@ QByteArray SessionSettings::serialize() const {
 		for (const auto &transcriptionId : _ratedTranscriptions) {
 			stream << quint64(transcriptionId);
 		}
+		stream << qint32(_unreviewed.size());
+		for (const auto &auth : _unreviewed) {
+			stream
+				<< quint64(auth.hash)
+				<< qint32(auth.unconfirmed ? 1 : 0)
+				<< qint32(auth.date)
+				<< auth.device
+				<< auth.location;
+		}
 	}
 
 	Ensures(result.size() == size);
@@ -198,6 +213,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	base::flat_map<Data::DefaultNotify, ushort> ringtoneDefaultVolumes;
 	base::flat_map<ThreadId, ushort> ringtoneVolumes;
 	base::flat_set<uint64> ratedTranscriptions;
+	std::vector<Data::UnreviewedAuth> unreviewed;
 
 	stream >> versionTag;
 	if (versionTag == kVersionTag) {
@@ -585,6 +601,32 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 			}
 		}
 	}
+	if (!stream.atEnd()) {
+		auto count = qint32(0);
+		stream >> count;
+		if (stream.status() == QDataStream::Ok) {
+			for (auto i = 0; i != count; ++i) {
+				auto hash = quint64();
+				auto unconfirmed = qint32();
+				auto date = qint32();
+				QString device, location;
+				stream >> hash >> unconfirmed >> date >> device >> location;
+				if (stream.status() != QDataStream::Ok) {
+					LOG(("App Error: "
+						"Bad data for SessionSettings::addFromSerialized()"
+						"with unreviewed"));
+					return;
+				}
+				unreviewed.emplace_back(Data::UnreviewedAuth{
+					.hash = hash,
+					.unconfirmed = (unconfirmed == 1),
+					.date = TimeId(date),
+					.device = device,
+					.location = location,
+				});
+			}
+		}
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for SessionSettings::addFromSerialized()"));
@@ -635,6 +677,7 @@ void SessionSettings::addFromSerialized(const QByteArray &serialized) {
 	_ringtoneDefaultVolumes = std::move(ringtoneDefaultVolumes);
 	_ringtoneVolumes = std::move(ringtoneVolumes);
 	_ratedTranscriptions = std::move(ratedTranscriptions);
+	_unreviewed = std::move(unreviewed);
 
 	if (version < 2) {
 		app.setLastSeenWarningSeen(appLastSeenWarningSeen == 1);
@@ -855,4 +898,12 @@ bool SessionSettings::isTranscriptionRated(uint64 transcriptionId) const {
 	return _ratedTranscriptions.contains(transcriptionId);
 }
 
+void SessionSettings::setUnreviewed(std::vector<Data::UnreviewedAuth> auths) {
+	_unreviewed = std::move(auths);
+}
+
+const std::vector<Data::UnreviewedAuth> &SessionSettings::unreviewed() const {
+	return _unreviewed;
+}
+
 } // namespace Main
diff --git a/Telegram/SourceFiles/main/main_session_settings.h b/Telegram/SourceFiles/main/main_session_settings.h
index bab7c6496c..24996b8191 100644
--- a/Telegram/SourceFiles/main/main_session_settings.h
+++ b/Telegram/SourceFiles/main/main_session_settings.h
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_auto_download.h"
 #include "data/notify/data_peer_notify_settings.h"
+#include "data/data_authorization.h"
 #include "ui/rect_part.h"
 
 namespace Support {
@@ -165,6 +166,9 @@ public:
 	void markTranscriptionAsRated(uint64 transcriptionId);
 	[[nodiscard]] bool isTranscriptionRated(uint64 transcriptionId) const;
 
+	void setUnreviewed(std::vector<Data::UnreviewedAuth> auths);
+	[[nodiscard]] const std::vector<Data::UnreviewedAuth> &unreviewed() const;
+
 private:
 	static constexpr auto kDefaultSupportChatsLimitSlice = 7 * 24 * 60 * 60;
 	static constexpr auto kPhotoEditorHintMaxShowsCount = 5;
@@ -207,6 +211,8 @@ private:
 
 	base::flat_set<uint64> _ratedTranscriptions;
 
+	std::vector<Data::UnreviewedAuth> _unreviewed;
+
 };
 
 } // namespace Main

From f09d2d22ebaeea089d79f77972277bdd80d4c1c2 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Tue, 26 Aug 2025 17:00:32 +0300
Subject: [PATCH 246/341] Added api support of new unconfirmed authorizations.

---
 .../SourceFiles/api/api_authorizations.cpp    | 145 +++++++++++++++++-
 Telegram/SourceFiles/api/api_authorizations.h |  15 ++
 Telegram/SourceFiles/api/api_updates.cpp      |   4 +
 3 files changed, 162 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_authorizations.cpp b/Telegram/SourceFiles/api/api_authorizations.cpp
index 78e463c116..01caa44e61 100644
--- a/Telegram/SourceFiles/api/api_authorizations.cpp
+++ b/Telegram/SourceFiles/api/api_authorizations.cpp
@@ -9,10 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "base/unixtime.h"
-#include "core/changelogs.h"
 #include "core/application.h"
+#include "core/changelogs.h"
 #include "core/core_settings.h"
 #include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session_settings.h"
+#include "main/main_session.h"
 
 namespace Api {
 namespace {
@@ -83,7 +86,19 @@ Authorizations::Entry ParseEntry(const MTPDauthorization &data) {
 } // namespace
 
 Authorizations::Authorizations(not_null<ApiWrap*> api)
-: _api(&api->instance()) {
+: _api(&api->instance())
+, _autoconfirmPeriod([=] {
+	constexpr auto kFallbackCount = 604800;
+	return api->session().appConfig().get<int>(
+		u"authorization_autoconfirm_period"_q,
+		kFallbackCount);
+})
+, _saveUnreviewed([=] {
+	api->session().settings().setUnreviewed(_unreviewed);
+	api->session().saveSettingsDelayed();
+}) {
+	_unreviewed = api->session().settings().unreviewed();
+	removeExpiredUnreviewed();
 	Core::App().settings().deviceModelChanges(
 	) | rpl::start_with_next([=](const QString &model) {
 		auto changed = false;
@@ -119,6 +134,7 @@ void Authorizations::reload() {
 		) | ranges::views::transform([](const MTPAuthorization &auth) {
 			return ParseEntry(auth.data());
 		}) | ranges::to<List>;
+		removeExpiredUnreviewed();
 		refreshCallsDisabledHereFromCloud();
 		_listChanges.fire({});
 	}).fail([=] {
@@ -261,4 +277,129 @@ crl::time Authorizations::lastReceivedTime() {
 	return _lastReceived;
 }
 
+const std::vector<Data::UnreviewedAuth> &Authorizations::unreviewed() {
+	removeExpiredUnreviewed();
+	return _unreviewed;
+}
+
+void Authorizations::removeExpiredUnreviewed() {
+	const auto now = base::unixtime::now();
+	const auto period = _autoconfirmPeriod();
+
+	const auto oldSize = _unreviewed.size();
+	_unreviewed.erase(
+		std::remove_if(_unreviewed.begin(), _unreviewed.end(),
+			[=](const auto &auth) {
+				return (now - auth.date) >= period;
+			}),
+		_unreviewed.end());
+
+	if (_unreviewed.size() != oldSize) {
+		_saveUnreviewed();
+	}
+}
+
+void Authorizations::review(const std::vector<uint64> &hashes, bool confirm) {
+	for (const auto hash : hashes) {
+		if (const auto sent = _reviewRequests.take(hash)) {
+			_api.request(*sent).cancel();
+		}
+	}
+
+	const auto checkComplete = [=] {
+		if (_reviewRequests.empty()) {
+			_saveUnreviewed();
+			_unreviewedChanges.fire({});
+		}
+	};
+
+	for (const auto hash : hashes) {
+		const auto removeFromUnreviewed = [=] {
+			_unreviewed.erase(
+				std::remove_if(_unreviewed.begin(), _unreviewed.end(),
+					[hash](const auto &auth) { return auth.hash == hash; }),
+				_unreviewed.end());
+			_reviewRequests.remove(hash);
+			checkComplete();
+		};
+
+		if (confirm) {
+			using Flag = MTPaccount_ChangeAuthorizationSettings::Flag;
+			const auto id = _api.request(MTPaccount_ChangeAuthorizationSettings(
+				MTP_flags(Flag::f_confirmed),
+				MTP_long(hash),
+				MTPBool(), // encrypted_requests_disabled
+				MTPBool() // call_requests_disabled
+			)).done([=] {
+				removeFromUnreviewed();
+			}).fail([=] {
+				removeFromUnreviewed();
+			}).send();
+			_reviewRequests.emplace(hash, id);
+		} else {
+			const auto id = _api.request(MTPaccount_ResetAuthorization(
+				MTP_long(hash)
+			)).done([=](const MTPBool &result) {
+				if (mtpIsTrue(result)) {
+					_list.erase(
+						ranges::remove(_list, hash, &Entry::hash),
+						end(_list));
+					_listChanges.fire({});
+				}
+				removeFromUnreviewed();
+			}).fail([=] {
+				removeFromUnreviewed();
+			}).send();
+			_reviewRequests.emplace(hash, id);
+		}
+	}
+}
+
+rpl::producer<> Authorizations::unreviewedChanges() const {
+	return _unreviewedChanges.events();
+}
+
+void Authorizations::apply(const MTPUpdate &update) {
+	removeExpiredUnreviewed();
+	update.match([&](const MTPDupdateNewAuthorization &data) {
+		auto unreviewed = Data::UnreviewedAuth{
+			.hash = data.vhash().v,
+			.unconfirmed = data.is_unconfirmed(),
+			.date = data.vdate().value_or_empty(),
+			.device = qs(data.vdevice().value_or_empty()),
+			.location = qs(data.vlocation().value_or_empty())
+		};
+		if (!unreviewed.unconfirmed) {
+			const auto hash = unreviewed.hash;
+			const auto was = _unreviewed.size();
+			_unreviewed.erase(
+				std::remove_if(
+					_unreviewed.begin(),
+					_unreviewed.end(),
+					[hash](const auto &auth) { return auth.hash == hash; }),
+				_unreviewed.end());
+			if (was != _unreviewed.size()) {
+				_saveUnreviewed();
+				_unreviewedChanges.fire({});
+			}
+			return;
+		}
+
+		for (auto &auth : _unreviewed) {
+			if (auth.hash == unreviewed.hash) {
+				auth = std::move(unreviewed);
+				_saveUnreviewed();
+				_unreviewedChanges.fire({});
+				return;
+			}
+		}
+
+		_unreviewed.push_back(std::move(unreviewed));
+		_saveUnreviewed();
+		_unreviewedChanges.fire({});
+	}, [](auto&&) {
+		Unexpected("Update in Authorizations::apply.");
+	});
+}
+
 } // namespace Api
diff --git a/Telegram/SourceFiles/api/api_authorizations.h b/Telegram/SourceFiles/api/api_authorizations.h
index 5e2a41c9f9..25c97f3945 100644
--- a/Telegram/SourceFiles/api/api_authorizations.h
+++ b/Telegram/SourceFiles/api/api_authorizations.h
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once
 
+#include "data/data_authorization.h"
 #include "mtproto/sender.h"
 
 class ApiWrap;
@@ -35,6 +36,8 @@ public:
 		Fn<void(const MTP::Error &error)> &&fail,
 		std::optional<uint64> hash = std::nullopt);
 
+	void apply(const MTPUpdate &update);
+
 	[[nodiscard]] crl::time lastReceivedTime();
 
 	[[nodiscard]] List list() const;
@@ -42,6 +45,11 @@ public:
 	[[nodiscard]] int total() const;
 	[[nodiscard]] rpl::producer<int> totalValue() const;
 
+	[[nodiscard]] const std::vector<Data::UnreviewedAuth> &unreviewed();
+	[[nodiscard]] rpl::producer<> unreviewedChanges() const;
+
+	void review(const std::vector<uint64> &hashes, bool confirm);
+
 	void updateTTL(int days);
 	[[nodiscard]] rpl::producer<int> ttlDays() const;
 
@@ -57,6 +65,7 @@ public:
 
 private:
 	void refreshCallsDisabledHereFromCloud();
+	void removeExpiredUnreviewed();
 
 	MTP::Sender _api;
 	mtpRequestId _requestId = 0;
@@ -64,10 +73,16 @@ private:
 	List _list;
 	rpl::event_stream<> _listChanges;
 
+	Fn<int()> _autoconfirmPeriod;
+	std::vector<Data::UnreviewedAuth> _unreviewed;
+	rpl::event_stream<> _unreviewedChanges;
+	Fn<void()> _saveUnreviewed;
+
 	mtpRequestId _ttlRequestId = 0;
 	rpl::variable<int> _ttlDays = 0;
 
 	base::flat_map<uint64, mtpRequestId> _toggleCallsDisabledRequests;
+	base::flat_map<uint64, mtpRequestId> _reviewRequests;
 	rpl::variable<bool> _callsDisabledHere;
 
 	crl::time _lastReceived = 0;
diff --git a/Telegram/SourceFiles/api/api_updates.cpp b/Telegram/SourceFiles/api/api_updates.cpp
index d2a19a7420..893476bfe4 100644
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -2213,6 +2213,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;
 
+	case mtpc_updateNewAuthorization: {
+		session().api().authorizations().apply(update);
+	} break;
+
 	case mtpc_updateServiceNotification: {
 		const auto &d = update.c_updateServiceNotification();
 		const auto text = TextWithEntities {

From 5d3d8640e393e9508c95e15237e6bc85f3677e49 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Mon, 25 Aug 2025 13:16:57 +0300
Subject: [PATCH 247/341] Added unconfirmed authorizations to top bar
 suggestions in dialogs.

---
 Telegram/Resources/langs/lang.strings         |   9 ++
 Telegram/SourceFiles/dialogs/dialogs.style    |  35 +++++
 .../dialogs/dialogs_top_bar_suggestion.cpp    |  59 ++++++--
 .../SourceFiles/dialogs/dialogs_widget.cpp    |   8 +-
 .../ui/dialogs_top_bar_suggestion_content.cpp | 131 ++++++++++++++++++
 .../ui/dialogs_top_bar_suggestion_content.h   |  10 ++
 6 files changed, 243 insertions(+), 9 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 87a9b0017f..415752d203 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4146,6 +4146,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_dialogs_suggestions_credits_sub_low_title#other" = "{emoji} {count} Stars needed for {channels}";
 "lng_dialogs_suggestions_credits_sub_low_about" = "Insufficient funds to cover your subscription.";
 
+"lng_unconfirmed_auth_title" = "Someone just got access to your messages!";
+"lng_unconfirmed_auth_confirm" = "Yes, it’s me";
+"lng_unconfirmed_auth_deny" = "No, it’s not me!";
+"lng_unconfirmed_auth_single" = "We detected a new login to your account from {from}, {country}. Is it you?";
+"lng_unconfirmed_auth_multiple#one" = "We detected new {count} login to your account. Is it you?";
+"lng_unconfirmed_auth_multiple#other" = "We detected new {count} logins to your account. Is it you?";
+"lng_unconfirmed_auth_multiple_from#one" = "We detected new {count} login to your account from {country}. Is it you?";
+"lng_unconfirmed_auth_multiple_from#other" = "We detected new {count} logins to your account from {country}. Is it you?";
+
 "lng_about_random" = "Send a {emoji} emoji to any chat to try your luck.";
 "lng_about_random_send" = "Send";
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 15bda37069..fd9a620c3c 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -874,3 +874,38 @@ postsSearchIcon: icon {{ "box_search", windowFgActive }};
 postsSearchIconPadding: margins(12px, 1px, 6px, 0px);
 postsSearchArrow: icon {{ "dialogs/mini_arrow", windowFgActive }};
 postsSearchArrowPadding: margins(2px, 1px, 8px, 0px);
+
+dialogsUnconfirmedAuthPadding: margins(10px, 0px, 10px, 0px);
+dialogsUnconfirmedAuthTitle: FlatLabel(boxLabel) {
+	minWidth: 70px;
+	align: align(top);
+	style: TextStyle(defaultTextStyle) {
+		font: font(12px);
+	}
+}
+dialogsUnconfirmedAuthAbout: FlatLabel(boxLabel) {
+	minWidth: 70px;
+	align: align(top);
+	textFg: windowSubTextFg;
+	style: TextStyle(defaultTextStyle) {
+		font: font(11px);
+	}
+}
+dialogsUnconfirmedAuthButton: RoundButton(defaultBoxButton) {
+	width: -16px;
+	height: 26px;
+	textTop: 5px;
+	radius: 10px;
+	style: TextStyle(semiboldTextStyle) {
+		font: font(11px semibold);
+	}
+}
+dialogsUnconfirmedAuthButtonNo: RoundButton(dialogsUnconfirmedAuthButton) {
+	textFg: attentionButtonFg;
+	textFgOver: attentionButtonFgOver;
+	textBgOver: attentionButtonBgOver;
+
+	ripple: RippleAnimation(defaultRippleAnimation) {
+		color: attentionButtonBgRipple;
+	}
+}
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
index 90b31e5d67..5a51750a00 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/dialogs_top_bar_suggestion.h"
 
+#include "api/api_authorizations.h"
 #include "api/api_credits.h"
 #include "api/api_peer_photo.h"
 #include "api/api_premium.h"
@@ -16,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/application.h"
 #include "core/click_handler_types.h"
 #include "core/ui_integration.h"
+#include "data/components/promo_suggestions.h"
 #include "data/data_birthday.h"
 #include "data/data_changes.h"
 #include "data/data_peer_values.h" // Data::AmPremiumValue.
@@ -25,16 +27,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/history_view_group_call_bar.h"
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
-#include "data/components/promo_suggestions.h"
 #include "main/main_session.h"
 #include "settings/settings_credits_graphics.h"
 #include "settings/settings_premium.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/layers/generic_box.h"
+#include "ui/rect.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/ui_utility.h"
+#include "ui/vertical_list.h"
+#include "ui/wrap/fade_wrap.h"
 #include "ui/wrap/slide_wrap.h"
 #include "window/window_controller.h"
 #include "window/window_session_controller.h"
@@ -42,6 +46,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
+#include "styles/style_layers.h"
 
 namespace Dialogs {
 namespace {
@@ -62,6 +67,7 @@ constexpr auto kSugPremiumGrace = "PREMIUM_GRACE"_cs;
 constexpr auto kSugSetUserpic = "USERPIC_SETUP"_cs;
 constexpr auto kSugLowCreditsSubs = "STARS_SUBSCRIPTION_LOW_BALANCE"_cs;
 
+
 } // namespace
 
 rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
@@ -79,7 +85,8 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 
 		struct State {
 			TopBarSuggestionContent *content = nullptr;
-			Ui::SlideWrap<Ui::RpWidget> *wrap = nullptr;
+			Ui::RpWidget *unconfirmedWarning = nullptr;
+			base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> wrap;
 			rpl::variable<int> leftPadding;
 			rpl::variable<Toggle> desiredWrapToggle;
 			rpl::variable<bool> outerWrapToggle;
@@ -95,7 +102,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 		state->outerWrapToggle = rpl::duplicate(outerWrapToggleValue);
 		state->leftPadding = rpl::variable<int>(
 			rpl::single(st::dialogsTopBarLeftPadding));
-		const auto ensureWrap = [=] {
+		const auto ensureContent = [=] {
 			if (!state->content) {
 				state->content = Ui::CreateChild<TopBarSuggestionContent>(
 					parent);
@@ -106,10 +113,12 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 					state->content->resize(width, height);
 				}, state->content->lifetime());
 			}
+		};
+		const auto ensureWrap = [=](not_null<Ui::RpWidget*> child) {
 			if (!state->wrap) {
-				state->wrap = Ui::CreateChild<Ui::SlideWrap<Ui::RpWidget>>(
+				state->wrap = base::make_unique_q<Ui::SlideWrap<Ui::RpWidget>>(
 					parent,
-					object_ptr<Ui::RpWidget>::fromRaw(state->content));
+					object_ptr<Ui::RpWidget>::fromRaw(child));
 				state->desiredWrapToggle.force_assign(
 					Toggle{ false, anim::type::instant });
 			}
@@ -131,9 +140,42 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			state->giftsLifetime.destroy();
 			state->creditsLifetime.destroy();
 
-			ensureWrap();
+			if (!session->api().authorizations().unreviewed().empty()) {
+				state->content = nullptr;
+				state->wrap = nullptr;
+				const auto list = session->api().authorizations().unreviewed();
+				const auto hashes = list
+					| ranges::views::transform([](const auto &auth) {
+						return auth.hash;
+					})
+					| ranges::to<std::vector>();
+				const auto content = CreateUnconfirmedAuthContent(
+					parent,
+					list,
+					[=](bool confirmed) {
+						session->api().authorizations().review(hashes, confirmed);
+					});
+				ensureWrap(content);
+				const auto wasUnconfirmedWarning = state->unconfirmedWarning;
+				state->unconfirmedWarning = content;
+				state->desiredWrapToggle.force_assign(Toggle{
+					true,
+					(state->unconfirmedWarning != wasUnconfirmedWarning)
+						? anim::type::instant
+						: anim::type::normal,
+				});
+				return;
+			} else {
+				if (state->unconfirmedWarning) {
+					state->unconfirmedWarning = nullptr;
+					state->wrap = nullptr;
+				}
+			}
+
+			ensureContent();
+			ensureWrap(state->content);
 			const auto content = state->content;
-			const auto wrap = state->wrap;
+			const auto wrap = state->wrap.get();
 			using RightIcon = TopBarSuggestionContent::RightIcon;
 			const auto promo = &session->promoSuggestions();
 			if (const auto custom = promo->custom()) {
@@ -595,9 +637,10 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 
 		rpl::merge(
 			session->promoSuggestions().value(),
+			session->api().authorizations().unreviewedChanges(),
 			Data::AmPremiumValue(session) | rpl::skip(1) | rpl::to_empty
 		) | rpl::start_with_next([=] {
-			const auto was = state->wrap;
+			const auto was = state->wrap.get();
 			processCurrentSuggestion(processCurrentSuggestion);
 			if (was != state->wrap) {
 				consumer.put_next_copy(state->wrap);
diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 4aa3c7dca4..d559c17406 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -50,6 +50,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_domain.h"
 #include "main/main_session.h"
 #include "main/main_session_settings.h"
+#include "api/api_authorizations.h"
 #include "api/api_chat_filters.h"
 #include "apiwrap.h"
 #include "chat_helpers/message_field.h"
@@ -1061,6 +1062,10 @@ void Widget::setupTopBarSuggestions(not_null<Ui::VerticalLayout*> dialogs) {
 	}
 	using namespace rpl::mappers;
 	crl::on_main(&session(), [=, session = &session()] {
+		session->api().authorizations().unreviewedChanges(
+		) | rpl::start_with_next([=] {
+			updateForceDisplayWide();
+		}, lifetime());
 		(session->data().chatsListLoaded(nullptr)
 			? rpl::single<Data::Folder*>(nullptr)
 			: session->data().chatsListLoadedEvents()
@@ -3313,7 +3318,8 @@ void Widget::updateForceDisplayWide() {
 		|| (_subsectionTopBar && _subsectionTopBar->searchHasFocus())
 		|| _searchSuggestionsLocked
 		|| !_searchState.query.isEmpty()
-		|| _searchState.inChat);
+		|| _searchState.inChat
+		|| !session().api().authorizations().unreviewed().empty());
 }
 
 void Widget::showForum(
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
index d6db29a927..6f9291277c 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
@@ -6,16 +6,147 @@ For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "dialogs/ui/dialogs_top_bar_suggestion_content.h"
+
+#include "base/call_delayed.h"
+#include "data/data_authorization.h"
+#include "lang/lang_keys.h"
+#include "ui/rect.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_custom_emoji.h"
 #include "ui/ui_rpl_filter.h"
+#include "ui/vertical_list.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/fade_wrap.h"
+#include "ui/wrap/padding_wrap.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "styles/style_boxes.h"
 #include "styles/style_chat.h"
 #include "styles/style_chat_helpers.h"
 #include "styles/style_dialogs.h"
 #include "styles/style_settings.h"
+#include "styles/style_layers.h"
 
 namespace Dialogs {
 
+not_null<Ui::RpWidget*> CreateUnconfirmedAuthContent(
+		not_null<Ui::RpWidget*> parent,
+		const std::vector<Data::UnreviewedAuth> &list,
+		Fn<void(bool)> callback) {
+	const auto wrap = Ui::CreateChild<Ui::SlideWrap<Ui::VerticalLayout>>(
+		parent,
+		object_ptr<Ui::VerticalLayout>(parent));
+	const auto content = wrap->entity();
+	content->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(content);
+		p.fillRect(content->rect(), st::dialogsBg);
+	}, content->lifetime());
+
+	parent->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		content->resizeToWidth(width);
+	}, content->lifetime());
+
+	const auto padding = st::dialogsUnconfirmedAuthPadding;
+
+	Ui::AddSkip(content);
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			tr::lng_unconfirmed_auth_title(),
+			st::dialogsUnconfirmedAuthTitle),
+		padding,
+		style::al_top);
+
+	Ui::AddSkip(content);
+
+	auto messageText = QString();
+	if (list.size() == 1) {
+		const auto &auth = list.at(0);
+		messageText = tr::lng_unconfirmed_auth_single(
+			tr::now,
+			lt_from,
+			auth.device,
+			lt_country,
+			auth.location);
+	} else {
+		auto commonLocation = list.at(0).location;
+		for (auto i = 1; i < list.size(); ++i) {
+			if (commonLocation != list.at(i).location) {
+				commonLocation.clear();
+				break;
+			}
+		}
+		if (commonLocation.isEmpty()) {
+			messageText = tr::lng_unconfirmed_auth_multiple(
+				tr::now,
+				lt_count,
+				list.size());
+		} else {
+			messageText = tr::lng_unconfirmed_auth_multiple_from(
+				tr::now,
+				lt_count,
+				list.size(),
+				lt_country,
+				commonLocation);
+		}
+	}
+
+	content->add(
+		object_ptr<Ui::FlatLabel>(
+			content,
+			rpl::single(messageText),
+			st::dialogsUnconfirmedAuthAbout),
+		padding,
+		style::al_top)->setTryMakeSimilarLines(true);
+
+	Ui::AddSkip(content);
+	const auto buttons = content->add(object_ptr<Ui::FixedHeightWidget>(
+		content,
+		st::dialogsUnconfirmedAuthButton.height));
+	const auto yes = Ui::CreateChild<Ui::RoundButton>(
+		buttons,
+		tr::lng_unconfirmed_auth_confirm(),
+		st::dialogsUnconfirmedAuthButton);
+	const auto no = Ui::CreateChild<Ui::RoundButton>(
+		buttons,
+		tr::lng_unconfirmed_auth_deny(),
+		st::dialogsUnconfirmedAuthButtonNo);
+	yes->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	no->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	yes->setClickedCallback([=] {
+		wrap->toggle(false, anim::type::normal);
+		base::call_delayed(st::universalDuration, wrap, [=] {
+			callback(true);
+		});
+	});
+	no->setClickedCallback([=] {
+		wrap->toggle(false, anim::type::normal);
+		base::call_delayed(st::universalDuration, wrap, [=] {
+			callback(false);
+		});
+	});
+	buttons->sizeValue(
+	) | rpl::filter_size(
+	) | rpl::start_with_next([=](const QSize &s) {
+		const auto halfWidth = (s.width() - rect::m::sum::h(padding)) / 2;
+		yes->moveToLeft(
+			padding.left() + (halfWidth - yes->width()) / 2,
+			0);
+		no->moveToLeft(
+			padding.left() + halfWidth + (halfWidth - no->width()) / 2,
+			0);
+	}, buttons->lifetime());
+	Ui::AddSkip(content);
+	content->add(object_ptr<Ui::FadeShadow>(content));
+
+	return wrap;
+}
+
 TopBarSuggestionContent::TopBarSuggestionContent(not_null<Ui::RpWidget*> p)
 : Ui::RippleButton(p, st::defaultRippleAnimationBgOver)
 , _titleSt(st::semiboldTextStyle)
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
index 50923025e3..b68682855e 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
@@ -12,14 +12,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 class DynamicImage;
 class IconButton;
+class VerticalLayout;
 } // namespace Ui
 
 namespace Ui::Text {
 struct MarkedContext;
 } // namespace Ui::Text
 
+namespace Data {
+struct UnreviewedAuth;
+} // namespace Data
+
 namespace Dialogs {
 
+not_null<Ui::RpWidget*> CreateUnconfirmedAuthContent(
+		not_null<Ui::RpWidget*> parent,
+		const std::vector<Data::UnreviewedAuth> &list,
+		Fn<void(bool)> callback);
+
 class TopBarSuggestionContent : public Ui::RippleButton {
 public:
 	enum class RightIcon {

From 6a114e1275ce9d824e80020dc83e4cc88e694e23 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 27 Aug 2025 23:17:28 +0300
Subject: [PATCH 248/341] Added ability to provide to loading text element
 style::TextStyle.

---
 Telegram/SourceFiles/boxes/translate_box.cpp       |  2 +-
 .../SourceFiles/ui/effects/loading_element.cpp     | 14 +++++++-------
 Telegram/SourceFiles/ui/effects/loading_element.h  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/translate_box.cpp b/Telegram/SourceFiles/boxes/translate_box.cpp
index 027b9d7467..e805793b96 100644
--- a/Telegram/SourceFiles/boxes/translate_box.cpp
+++ b/Telegram/SourceFiles/boxes/translate_box.cpp
@@ -208,7 +208,7 @@ void TranslateBox(
 		box,
 		CreateLoadingTextWidget(
 			box,
-			st::aboutLabel,
+			st::aboutLabel.style,
 			std::min(original->entity()->height() / lineHeight, kMaxLines),
 			state->to.value() | rpl::map([=](LanguageId id) {
 				return id.locale().textDirection() == Qt::RightToLeft;
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.cpp b/Telegram/SourceFiles/ui/effects/loading_element.cpp
index 94a4c34f5e..bb31210602 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.cpp
+++ b/Telegram/SourceFiles/ui/effects/loading_element.cpp
@@ -31,21 +31,21 @@ public:
 
 class LoadingText final : public LoadingElement {
 public:
-	LoadingText(const style::FlatLabel &st);
+	LoadingText(const style::TextStyle &st);
 
 	[[nodiscard]] int height() const override;
 	void paint(QPainter &p, int width) override;
 
 private:
-	const style::FlatLabel &_st;
+	const style::TextStyle &_st;
 
 };
 
-LoadingText::LoadingText(const style::FlatLabel &st) : _st(st) {
+LoadingText::LoadingText(const style::TextStyle &st) : _st(st) {
 }
 
 int LoadingText::height() const {
-	return _st.style.lineHeight;
+	return _st.lineHeight;
 }
 
 void LoadingText::paint(QPainter &p, int width) {
@@ -54,10 +54,10 @@ void LoadingText::paint(QPainter &p, int width) {
 	p.setPen(Qt::NoPen);
 
 	p.setBrush(st::windowBgOver);
-	const auto h = _st.style.font->ascent;
+	const auto h = _st.font->ascent;
 	p.drawRoundedRect(
 		0,
-		height() - h - (height() - _st.style.font->height),
+		height() - h - (height() - _st.font->height),
 		width,
 		h,
 		h / 2,
@@ -224,7 +224,7 @@ object_ptr<Ui::RpWidget> CreateLoadingElementWidget(
 
 object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 		not_null<Ui::RpWidget*> parent,
-		const style::FlatLabel &st,
+		const style::TextStyle &st,
 		int lines,
 		rpl::producer<bool> rtl) {
 	return CreateLoadingElementWidget<LoadingText>(
diff --git a/Telegram/SourceFiles/ui/effects/loading_element.h b/Telegram/SourceFiles/ui/effects/loading_element.h
index 08280ead27..3faa3a187a 100644
--- a/Telegram/SourceFiles/ui/effects/loading_element.h
+++ b/Telegram/SourceFiles/ui/effects/loading_element.h
@@ -11,7 +11,7 @@ template <typename Object>
 class object_ptr;
 
 namespace style {
-struct FlatLabel;
+struct TextStyle;
 struct PeerListItem;
 struct DialogRow;
 } // namespace style
@@ -22,7 +22,7 @@ class RpWidget;
 
 object_ptr<Ui::RpWidget> CreateLoadingTextWidget(
 	not_null<Ui::RpWidget*> parent,
-	const style::FlatLabel &st,
+	const style::TextStyle &st,
 	int lines,
 	rpl::producer<bool> rtl);
 

From b8f4d4877e87b55b5be5b3bae6b9745004c16e39 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Aug 2025 09:30:54 +0300
Subject: [PATCH 249/341] Added loading animation to list of options for low
 credits balance.

---
 .../SourceFiles/boxes/gift_credits_box.cpp    |  1 +
 .../SourceFiles/settings/settings_credits.cpp |  2 +-
 .../settings/settings_credits_graphics.cpp    | 63 ++++++++++++++++---
 .../settings/settings_credits_graphics.h      |  1 +
 4 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_credits_box.cpp b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
index 2fc72502f2..da7aef097f 100644
--- a/Telegram/SourceFiles/boxes/gift_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_credits_box.cpp
@@ -97,6 +97,7 @@ void GiftCreditsBox(
 		peer,
 		CreditsAmount(),
 		[=] { gifted(); box->uiShow()->hideLayer(); },
+		box->showFinishes(),
 		tr::lng_credits_summary_options_subtitle(),
 		{});
 
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index d2056ce4b5..cae52cec73 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -939,7 +939,7 @@ Fn<void()> BuyStarsHandler::handler(
 			if (const auto onstack = paid) {
 				onstack();
 			}
-		}, nullptr, options);
+		}, box->showFinishes(), nullptr, options);
 
 		const auto button = box->addButton(tr::lng_close(), [=] {
 			box->closeBox();
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index d36c2c70bd..a5b340ea0c 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -69,6 +69,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
 #include "ui/effects/credits_graphics.h"
+#include "ui/effects/loading_element.h"
 #include "ui/effects/premium_graphics.h"
 #include "ui/effects/premium_stars_colored.h"
 #include "ui/effects/premium_top_bar.h"
@@ -513,6 +514,7 @@ void FillCreditOptions(
 		not_null<PeerData*> peer,
 		CreditsAmount minimumCredits,
 		Fn<void()> paid,
+		rpl::producer<> showFinishes,
 		rpl::producer<QString> subtitle,
 		std::vector<Data::CreditTopupOption> preloadedTopupOptions) {
 	const auto options = container->add(
@@ -521,16 +523,59 @@ void FillCreditOptions(
 			object_ptr<Ui::VerticalLayout>(container)));
 	const auto content = options->entity();
 
-	Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
-
 	const auto singleStarWidth = Ui::GenerateStars(
 		st::creditsTopupButton.height,
 		1).width() / style::DevicePixelRatio();
 
+	const auto loadingContainer = content->add(
+		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
+			content,
+			object_ptr<Ui::VerticalLayout>(content)));
+	loadingContainer->toggle(true, anim::type::instant);
+	const auto fillLoading = [=] {
+		Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
+		if (subtitle) {
+			Ui::AddSubsectionTitle(content, std::move(subtitle));
+		}
+		const auto &st = st::creditsTopupButton;
+		const auto loadingList = content;
+		const auto isRtl = QLocale().textDirection() == Qt::RightToLeft;
+		using WidgetPtr = object_ptr<Ui::RpWidget>;
+		for (auto i = 0; i < 4; i++) {
+			auto owned = object_ptr<Ui::SettingsButton>(
+				loadingList,
+				rpl::never<QString>(),
+				st);
+			owned->setAttribute(Qt::WA_TransparentForMouseEvents);
+			auto loadingLeft = Ui::CreateLoadingTextWidget(
+				owned,
+				st.style,
+				1,
+				rpl::single(isRtl));
+			content->widthValue(
+			) | rpl::start_with_next([=, raw = loadingLeft.get()](int w) {
+				if (w > 0) {
+					const auto availableWidth = w
+						- st.iconLeft
+						- st::boxRowPadding.right();
+					raw->resize(availableWidth, st.style.font->height);
+				}
+			}, loadingLeft->lifetime());
+			loadingLeft->moveToLeft(
+				st.iconLeft,
+				st.padding.top() - st::lineWidth * 2);
+			owned->lifetime().make_state<WidgetPtr>(std::move(loadingLeft));
+			Ui::ToggleChildrenVisibility(owned, true);
+			loadingList->add(std::move(owned));
+		}
+		content->resizeToWidth(container->width());
+	};
+
 	const auto fill = [=](Data::CreditTopupOptions options) {
 		while (content->count()) {
 			delete content->widgetAt(0);
 		}
+		Ui::AddSkip(content, st::settingsPremiumOptionsPadding.top());
 		if (subtitle) {
 			Ui::AddSubsectionTitle(content, std::move(subtitle));
 		}
@@ -668,11 +713,14 @@ void FillCreditOptions(
 
 	if (show->session().premiumPossible()) {
 		if (preloadedTopupOptions.empty()) {
-			apiCredits->request(
-			) | rpl::start_with_error_done([=](const QString &error) {
-				show->showToast(error);
-			}, [=] {
-				fill(apiCredits->options());
+			fillLoading();
+			std::move(showFinishes) | rpl::start_with_next([=] {
+				apiCredits->request(
+				) | rpl::start_with_error_done([=](const QString &error) {
+					show->showToast(error);
+				}, [=] {
+					fill(apiCredits->options());
+				}, content->lifetime());
 			}, content->lifetime());
 		} else {
 			fill(std::move(preloadedTopupOptions));
@@ -2578,6 +2626,7 @@ void SmallBalanceBox(
 		show->session().user(),
 		credits - show->session().credits().balance(),
 		[=] { show->session().credits().load(true); },
+		box->showFinishes(),
 		tr::lng_credits_summary_options_subtitle(),
 		{});
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index 8dd4e12504..c51481e5d9 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -74,6 +74,7 @@ void FillCreditOptions(
 	not_null<PeerData*> peer,
 	CreditsAmount minCredits,
 	Fn<void()> paid,
+	rpl::producer<> showFinishes,
 	rpl::producer<QString> subtitle,
 	std::vector<Data::CreditTopupOption> preloadedTopupOptions);
 

From 600b7d1d5459030993f93696ac2859c4019c274c Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Aug 2025 10:00:59 +0300
Subject: [PATCH 250/341] Slightly improved generation of stars in low credits
 balance list.

---
 .../settings/settings_credits_graphics.cpp    | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index a5b340ea0c..b1421265ed 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -527,6 +527,24 @@ void FillCreditOptions(
 		st::creditsTopupButton.height,
 		1).width() / style::DevicePixelRatio();
 
+	struct StarsState {
+		base::flat_map<int, QImage> cache;
+		rpl::variable<bool> ready = false;
+	};
+	const auto starsState = content->lifetime().make_state<StarsState>();
+	const auto weak = base::make_weak(content);
+	crl::async([=]() mutable {
+		constexpr auto kPreloadCount = 10;
+		auto cache = base::flat_map<int, QImage>();
+		for (auto i = 1; i <= kPreloadCount; ++i) {
+			cache[i] = Ui::GenerateStars(st::creditsTopupButton.height, i);
+		}
+		crl::on_main(weak, [=, result = std::move(cache)]() mutable {
+			starsState->cache = std::move(result);
+			starsState->ready = true;
+		});
+	});
+
 	const auto loadingContainer = content->add(
 		object_ptr<Ui::SlideWrap<Ui::VerticalLayout>>(
 			content,
@@ -639,7 +657,14 @@ void FillCreditOptions(
 				Ui::FillAmountAndCurrency(option.amount, option.currency),
 				st::creditsTopupPrice);
 			const auto inner = Ui::CreateChild<Ui::RpWidget>(button);
-			const auto stars = Ui::GenerateStars(st.height, (i + 1));
+			const auto getStars = [=] {
+				const auto starIndex = i + 1;
+				if (starsState->cache.contains(starIndex)) {
+					return starsState->cache[starIndex];
+				}
+				return Ui::GenerateStars(st.height, starIndex);
+			};
+			const auto stars = getStars();
 			const auto textLeft = diffBetweenTextAndStar
 				+ stars.width() / style::DevicePixelRatio();
 			inner->paintRequest(
@@ -719,7 +744,11 @@ void FillCreditOptions(
 				) | rpl::start_with_error_done([=](const QString &error) {
 					show->showToast(error);
 				}, [=] {
-					fill(apiCredits->options());
+					starsState->ready.value() | rpl::filter(
+						rpl::mappers::_1
+					) | rpl::start_with_next([=] {
+						fill(apiCredits->options());
+					}, content->lifetime());
 				}, content->lifetime());
 			}, content->lifetime());
 		} else {

From 65fd47a082075d2eff0f5d132bd3344bedfd5111 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Aug 2025 11:13:14 +0300
Subject: [PATCH 251/341] Fixed handle of dialogs resize for unconfirmed
 authorizations.

---
 .../dialogs/dialogs_top_bar_suggestion.cpp    | 24 +++++++++++--------
 .../ui/dialogs_top_bar_suggestion_content.cpp | 22 +++++++++++------
 .../ui/dialogs_top_bar_suggestion_content.h   |  4 +++-
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
index 5a51750a00..d40de08aa0 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
@@ -85,7 +85,7 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 
 		struct State {
 			TopBarSuggestionContent *content = nullptr;
-			Ui::RpWidget *unconfirmedWarning = nullptr;
+			Ui::SlideWrap<Ui::VerticalLayout> *unconfirmedWarning = nullptr;
 			base::unique_qptr<Ui::SlideWrap<Ui::RpWidget>> wrap;
 			rpl::variable<int> leftPadding;
 			rpl::variable<Toggle> desiredWrapToggle;
@@ -116,9 +116,10 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 		};
 		const auto ensureWrap = [=](not_null<Ui::RpWidget*> child) {
 			if (!state->wrap) {
-				state->wrap = base::make_unique_q<Ui::SlideWrap<Ui::RpWidget>>(
-					parent,
-					object_ptr<Ui::RpWidget>::fromRaw(child));
+				state->wrap
+					= base::make_unique_q<Ui::SlideWrap<Ui::RpWidget>>(
+						parent,
+						object_ptr<Ui::RpWidget>::fromRaw(child));
 				state->desiredWrapToggle.force_assign(
 					Toggle{ false, anim::type::instant });
 			}
@@ -143,17 +144,20 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 			if (!session->api().authorizations().unreviewed().empty()) {
 				state->content = nullptr;
 				state->wrap = nullptr;
-				const auto list = session->api().authorizations().unreviewed();
-				const auto hashes = list
-					| ranges::views::transform([](const auto &auth) {
+				const auto &list
+					= session->api().authorizations().unreviewed();
+				const auto hashes = ranges::views::all(
+						list
+					) | ranges::views::transform([](const auto &auth) {
 						return auth.hash;
-					})
-					| ranges::to<std::vector>();
+					}) | ranges::to_vector;
 				const auto content = CreateUnconfirmedAuthContent(
 					parent,
 					list,
 					[=](bool confirmed) {
-						session->api().authorizations().review(hashes, confirmed);
+						session->api().authorizations().review(
+							hashes,
+							confirmed);
 					});
 				ensureWrap(content);
 				const auto wasUnconfirmedWarning = state->unconfirmedWarning;
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
index 6f9291277c..6e53d71a0d 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.cpp
@@ -32,11 +32,24 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace Dialogs {
 
-not_null<Ui::RpWidget*> CreateUnconfirmedAuthContent(
+class UnconfirmedAuthWrap : public Ui::SlideWrap<Ui::VerticalLayout> {
+public:
+	UnconfirmedAuthWrap(
+		not_null<Ui::RpWidget*> parent,
+		object_ptr<Ui::VerticalLayout> &&child)
+	: Ui::SlideWrap<Ui::VerticalLayout>(parent, std::move(child)) {
+	}
+
+	rpl::producer<int> desiredHeightValue() const override {
+		return entity()->heightValue();
+	}
+};
+
+not_null<Ui::SlideWrap<Ui::VerticalLayout>*> CreateUnconfirmedAuthContent(
 		not_null<Ui::RpWidget*> parent,
 		const std::vector<Data::UnreviewedAuth> &list,
 		Fn<void(bool)> callback) {
-	const auto wrap = Ui::CreateChild<Ui::SlideWrap<Ui::VerticalLayout>>(
+	const auto wrap = Ui::CreateChild<UnconfirmedAuthWrap>(
 		parent,
 		object_ptr<Ui::VerticalLayout>(parent));
 	const auto content = wrap->entity();
@@ -45,11 +58,6 @@ not_null<Ui::RpWidget*> CreateUnconfirmedAuthContent(
 		p.fillRect(content->rect(), st::dialogsBg);
 	}, content->lifetime());
 
-	parent->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		content->resizeToWidth(width);
-	}, content->lifetime());
-
 	const auto padding = st::dialogsUnconfirmedAuthPadding;
 
 	Ui::AddSkip(content);
diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
index b68682855e..432f29fcc2 100644
--- a/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
+++ b/Telegram/SourceFiles/dialogs/ui/dialogs_top_bar_suggestion_content.h
@@ -13,6 +13,8 @@ namespace Ui {
 class DynamicImage;
 class IconButton;
 class VerticalLayout;
+template<typename Widget>
+class SlideWrap;
 } // namespace Ui
 
 namespace Ui::Text {
@@ -25,7 +27,7 @@ struct UnreviewedAuth;
 
 namespace Dialogs {
 
-not_null<Ui::RpWidget*> CreateUnconfirmedAuthContent(
+not_null<Ui::SlideWrap<Ui::VerticalLayout>*> CreateUnconfirmedAuthContent(
 		not_null<Ui::RpWidget*> parent,
 		const std::vector<Data::UnreviewedAuth> &list,
 		Fn<void(bool)> callback);

From a226f0b58cac5e999b80fdc50bcc65a4d477309f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 29 Aug 2025 14:14:00 +0300
Subject: [PATCH 252/341] Added toasts after review of unconfirmed
 authorizations.

---
 Telegram/Resources/langs/lang.strings         |  7 ++
 .../dialogs/dialogs_top_bar_suggestion.cpp    | 99 ++++++++++++++++++-
 2 files changed, 102 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 415752d203..b00244a962 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4154,6 +4154,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_unconfirmed_auth_multiple#other" = "We detected new {count} logins to your account. Is it you?";
 "lng_unconfirmed_auth_multiple_from#one" = "We detected new {count} login to your account from {country}. Is it you?";
 "lng_unconfirmed_auth_multiple_from#other" = "We detected new {count} logins to your account from {country}. Is it you?";
+"lng_unconfirmed_auth_denied_title#one" = "New Login Prevented";
+"lng_unconfirmed_auth_denied_title#other" = "New Logins Prevented";
+"lng_unconfirmed_auth_denied_single" = "We have terminated the login attempt from {country}.";
+"lng_unconfirmed_auth_denied_multiple" = "We have terminated the login attempts from: {country}";
+"lng_unconfirmed_auth_denied_warning" = "Never send your login code to anyone or you can lose your Telegram account!";
+"lng_unconfirmed_auth_confirmed" = "New Login Allowed";
+"lng_unconfirmed_auth_confirmed_message" = "You can check the list of your active logins in {link}.";
 
 "lng_about_random" = "Send a {emoji} emoji to any chat to try your luck.";
 "lng_about_random_send" = "Send";
diff --git a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
index d40de08aa0..8d25e709f7 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_top_bar_suggestion.cpp
@@ -28,14 +28,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
+#include "settings/settings_active_sessions.h"
 #include "settings/settings_credits_graphics.h"
 #include "settings/settings_premium.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/controls/userpic_button.h"
 #include "ui/effects/credits_graphics.h"
 #include "ui/layers/generic_box.h"
 #include "ui/rect.h"
 #include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
 #include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
 #include "ui/wrap/fade_wrap.h"
@@ -58,6 +61,92 @@ namespace {
 	return window->sessionController();
 }
 
+[[nodiscard]] QString FormatAuthInfo(const Data::UnreviewedAuth &auth) {
+	const auto location = auth.location.isEmpty()
+		? QString()
+		: "\U0001F30D " + auth.location;
+	const auto device = auth.device.isEmpty()
+		? QString()
+		: "\U0001F4F1 " + auth.device;
+
+	if (!location.isEmpty() && !device.isEmpty()) {
+		return location + " (" + device + ")";
+	} else if (!location.isEmpty()) {
+		return location;
+	} else if (!device.isEmpty()) {
+		return device;
+	}
+	return QString();
+}
+
+void ShowAuthToast(
+		not_null<Ui::RpWidget*> parent,
+		not_null<Main::Session*> session,
+		const std::vector<Data::UnreviewedAuth> &list,
+		bool confirmed) {
+	if (confirmed) {
+		auto text = tr::lng_unconfirmed_auth_confirmed_message(
+			tr::now,
+			lt_link,
+			Ui::Text::Link(tr::lng_settings_sessions_title(tr::now)),
+			Ui::Text::RichLangValue);
+		auto filter = [=](
+				ClickHandlerPtr handler,
+				Qt::MouseButton button) {
+			if (const auto controller = FindSessionController(parent)) {
+				session->api().authorizations().reload();
+				controller->showSettings(Settings::Sessions::Id());
+				return false;
+			}
+			return true;
+		};
+		Ui::Toast::Show(parent->window(), Ui::Toast::Config{
+			.title = tr::lng_unconfirmed_auth_confirmed(tr::now),
+			.text = std::move(text),
+			.filter = std::move(filter),
+			.duration = crl::time(5000),
+		});
+	} else {
+		auto messageText = QString();
+		if (list.size() == 1) {
+			messageText = tr::lng_unconfirmed_auth_denied_single(
+				tr::now,
+				lt_country,
+				FormatAuthInfo(list.front()));
+		} else {
+			auto authList = QString('\n');
+			for (auto i = 0; i < std::min(int(list.size()), 10); ++i) {
+				const auto info = FormatAuthInfo(list[i]);
+				if (!info.isEmpty()) {
+					authList += "• " + info + "\n";
+				}
+			}
+			messageText = tr::lng_unconfirmed_auth_denied_multiple(
+				tr::now,
+				lt_country,
+				authList);
+		}
+		if (const auto controller = FindSessionController(parent)) {
+			const auto count = float64(list.size());
+			controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+				box->setTitle(tr::lng_unconfirmed_auth_denied_title(
+					lt_count,
+					rpl::single(count)));
+				Ui::InformBox(box, {
+					.text = TextWithEntities()
+						.append(messageText)
+						.append('\n')
+						.append(
+							tr::lng_unconfirmed_auth_denied_warning(
+								tr::now,
+								Ui::Text::Bold)),
+					.confirmText = tr::lng_archive_hint_button(tr::now),
+				});
+			}));
+		}
+	}
+}
+
 constexpr auto kSugSetBirthday = "BIRTHDAY_SETUP"_cs;
 constexpr auto kSugBirthdayContacts = "BIRTHDAY_CONTACTS_TODAY"_cs;
 constexpr auto kSugPremiumAnnual = "PREMIUM_ANNUAL"_cs;
@@ -147,14 +236,16 @@ rpl::producer<Ui::SlideWrap<Ui::RpWidget>*> TopBarSuggestionValue(
 				const auto &list
 					= session->api().authorizations().unreviewed();
 				const auto hashes = ranges::views::all(
-						list
-					) | ranges::views::transform([](const auto &auth) {
-						return auth.hash;
-					}) | ranges::to_vector;
+					list
+				) | ranges::views::transform([](const auto &auth) {
+					return auth.hash;
+				}) | ranges::to_vector;
+
 				const auto content = CreateUnconfirmedAuthContent(
 					parent,
 					list,
 					[=](bool confirmed) {
+						ShowAuthToast(parent, session, list, confirmed);
 						session->api().authorizations().review(
 							hashes,
 							confirmed);

From 7e48cb97b059c890c32b51dd509cb2aed02af5e0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 30 Aug 2025 15:37:42 +0300
Subject: [PATCH 253/341] Fixed first frame animation of opening schedule
 section for send button.

---
 .../view/controls/history_view_compose_controls.cpp  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
index d5d3a7ae90..b820f575ff 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp
@@ -2240,6 +2240,12 @@ void ComposeControls::initSendButton() {
 		updateSendButtonType();
 	}, _send->lifetime());
 
+	Core::App().mediaDevices().recordAvailabilityValue(
+	) | rpl::start_with_next([=](Webrtc::RecordAvailability value) {
+		_recordAvailability = value;
+		updateSendButtonType();
+	}, _send->lifetime());
+
 	_send->finishAnimating();
 
 	_send->clicks(
@@ -2271,12 +2277,6 @@ void ComposeControls::initSendButton() {
 		[=] { return sendButtonMenuDetails(); },
 		sendAction);
 
-	Core::App().mediaDevices().recordAvailabilityValue(
-	) | rpl::start_with_next([=](Webrtc::RecordAvailability value) {
-		_recordAvailability = value;
-		updateSendButtonType();
-	}, _send->lifetime());
-
 	_send->widthValue() | rpl::skip(1) | rpl::start_with_next([=] {
 		updateControlsGeometry(_wrap->size());
 	}, _send->lifetime());

From 9ef54d121846eb1ba3ca57a596fffbaf32e7658f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 30 Aug 2025 21:26:22 +0300
Subject: [PATCH 254/341] Added LottieCustomEmoji.

---
 .../ui/text/text_lottie_custom_emoji.cpp      | 122 ++++++++++++++++++
 .../ui/text/text_lottie_custom_emoji.h        |  47 +++++++
 Telegram/cmake/td_ui.cmake                    |   2 +
 3 files changed, 171 insertions(+)
 create mode 100644 Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp
 create mode 100644 Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h

diff --git a/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp
new file mode 100644
index 0000000000..e78a264c76
--- /dev/null
+++ b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.cpp
@@ -0,0 +1,122 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "ui/text/text_lottie_custom_emoji.h"
+
+#include "lottie/lottie_icon.h"
+#include "ui/text/text_utilities.h"
+
+namespace Ui::Text {
+
+LottieCustomEmoji::LottieCustomEmoji(Lottie::IconDescriptor &&descriptor)
+: LottieCustomEmoji(std::move(descriptor), nullptr) {
+}
+
+LottieCustomEmoji::LottieCustomEmoji(
+		Lottie::IconDescriptor &&descriptor,
+		Fn<void()> repaint)
+: _entityData(!descriptor.name.isEmpty()
+	? descriptor.name
+	: !descriptor.path.isEmpty()
+	? descriptor.path
+	: (Unexpected("LottieCustomEmoji: descriptor.name or descriptor.path"),
+		QString()))
+, _width(descriptor.sizeOverride.width())
+, _icon(Lottie::MakeIcon(std::move(descriptor)))
+, _repaint(std::move(repaint)) {
+	if (!_width && _icon && _icon->valid()) {
+		_width = _icon->width();
+		startAnimation();
+	}
+}
+
+int LottieCustomEmoji::width() {
+	return _width;
+}
+
+QString LottieCustomEmoji::entityData() {
+	return _entityData;
+}
+
+void LottieCustomEmoji::paint(QPainter &p, const Context &context) {
+	if (!_icon || !_icon->valid()) {
+		return;
+	}
+
+	const auto paused = context.paused
+		|| context.internal.forceFirstFrame
+		|| context.internal.overrideFirstWithLastFrame;
+
+	if (paused) {
+		const auto frame = context.internal.forceLastFrame
+			? _icon->framesCount() - 1
+			: 0;
+		_icon->jumpTo(frame, _repaint);
+	} else if (!_icon->animating()) {
+		startAnimation();
+	}
+
+	_icon->paint(
+		p,
+		context.position.x(),
+		context.position.y(),
+		context.textColor);
+}
+
+void LottieCustomEmoji::unload() {
+	if (_icon) {
+		_icon->jumpTo(0, nullptr);
+	}
+}
+
+bool LottieCustomEmoji::ready() {
+	return _icon && _icon->valid();
+}
+
+bool LottieCustomEmoji::readyInDefaultState() {
+	return _icon && _icon->valid() && _icon->frameIndex() == 0;
+}
+
+void LottieCustomEmoji::startAnimation() {
+	if (!_icon || !_icon->valid() || _icon->framesCount() <= 1) {
+		return;
+	}
+
+	_icon->animate(
+		_repaint,
+		0,
+		_icon->framesCount() - 1);
+}
+
+QString LottieEmojiData(Lottie::IconDescriptor descriptor) {
+	return !descriptor.name.isEmpty()
+		? descriptor.name
+		: !descriptor.path.isEmpty()
+		? descriptor.path
+		: QString();
+}
+
+TextWithEntities LottieEmoji(Lottie::IconDescriptor descriptor) {
+	return SingleCustomEmoji(LottieEmojiData(std::move(descriptor)));
+}
+
+MarkedContext LottieEmojiContext(Lottie::IconDescriptor descriptor) {
+	auto customEmojiFactory = [descriptor = std::move(descriptor)](
+			QStringView data,
+			const MarkedContext &context
+		) mutable -> std::unique_ptr<CustomEmoji> {
+		if (data == LottieEmojiData(descriptor)) {
+			return std::make_unique<LottieCustomEmoji>(
+				std::move(descriptor),
+				context.repaint);
+		}
+		return nullptr;
+	};
+	return { .customEmojiFactory = std::move(customEmojiFactory) };
+}
+
+} // namespace Ui::Text
\ No newline at end of file
diff --git a/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h
new file mode 100644
index 0000000000..c39e49958c
--- /dev/null
+++ b/Telegram/SourceFiles/ui/text/text_lottie_custom_emoji.h
@@ -0,0 +1,47 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/text/text_custom_emoji.h"
+
+namespace Lottie {
+struct IconDescriptor;
+class Icon;
+} // namespace Lottie
+
+namespace Ui::Text {
+
+class LottieCustomEmoji final : public CustomEmoji {
+public:
+	explicit LottieCustomEmoji(Lottie::IconDescriptor &&descriptor);
+	LottieCustomEmoji(
+		Lottie::IconDescriptor &&descriptor,
+		Fn<void()> repaint);
+
+	int width() override;
+	QString entityData() override;
+	void paint(QPainter &p, const Context &context) override;
+	void unload() override;
+	bool ready() override;
+	bool readyInDefaultState() override;
+
+private:
+	void startAnimation();
+
+	QString _entityData;
+	int _width = 0;
+	std::unique_ptr<Lottie::Icon> _icon;
+	Fn<void()> _repaint;
+
+};
+
+[[nodiscard]] QString LottieEmojiData(Lottie::IconDescriptor);
+[[nodiscard]] TextWithEntities LottieEmoji(Lottie::IconDescriptor);
+[[nodiscard]] MarkedContext LottieEmojiContext(Lottie::IconDescriptor);
+
+} // namespace Ui::Text
\ No newline at end of file
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 230cb0caf2..672205f2bb 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -448,6 +448,8 @@ PRIVATE
     ui/text/format_song_name.h
     ui/text/format_values.cpp
     ui/text/format_values.h
+    ui/text/text_lottie_custom_emoji.cpp
+    ui/text/text_lottie_custom_emoji.h
     ui/text/text_options.cpp
     ui/text/text_options.h
 

From 8bc2d3184a631cea181ff9b635449aeb0a40b6fe Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 30 Aug 2025 22:39:46 +0300
Subject: [PATCH 255/341] Added lottie icon to transcribe voices while loading.

---
 .../animations/transcribe_loading.tgs         | Bin 0 -> 1343 bytes
 .../Resources/qrc/telegram/animations.qrc     |   1 +
 .../view/media/history_view_document.cpp      |  22 ++++++++++++++----
 Telegram/SourceFiles/ui/chat/chat.style       |   1 +
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 Telegram/Resources/animations/transcribe_loading.tgs

diff --git a/Telegram/Resources/animations/transcribe_loading.tgs b/Telegram/Resources/animations/transcribe_loading.tgs
new file mode 100644
index 0000000000000000000000000000000000000000..f63b6e9a0282ce376f89348b9f7477b725c0bfd0
GIT binary patch
literal 1343
zcmV-F1;F|riwFp_wn1b717vS>b6;$4VPt7;XD(`UZ*BnX9LtWIK<vI>fjBoP!y}L0
z`c`k1TJ=(`Dw<82Xp;~DeW}`iFEf)87~3!dWS_$!0-G7zV|#4uz~2kUaeunc9XIl3
z9&?}Z>s49+CS!5FITYveG&!8WzlzgvCQjEU=zhm%S}fw%NuJ5MuCA`i3F0hU7VziJ
zm*UEC{)%5t<4O!mc89NHF-kz?WUmUS!%ol&Z{m6z|5>J|Iji#ue1(1q+w3`v)nNG_
zE>R668TgQF_IZT^fyz=a!8K>1N}8`20P$5&`H{o<gkuQb{N@N&1K-r|a#J%h6p?Ww
zkpo49p+vqYKnDz#l#yAFD9+Q^o2s)Pv0PmYLET{Yql(ZbGu9@PbEbS0m7#0G55{KR
z1SjuD1Oj8}5@#tP36I7U-4SE+-h?+aVdjOwj37Pty>Mbe9l#LXbhEwic5E*|EvA$4
z;ZrpjpC3iuoYI9qjSO{RYJy-ZY6cHsd;^f|Y;jyg;jk*=$e!+^K){O1@Br9$w;b9S
zGh(yA1mz#Gv5&bSqAgWeLJSzK+Qop8-B1i9u+u<2Il#`1$x*qg$>hcfNQ$y`d{{y&
z1agZ+$^D+Xkgwbz?(acbrclV%fPx%}YEht&6s*Ld>iR#99CnNnxMT8z#&F}EdXs5@
z6O{+%q4GfYwRW0>h&6_Wrg`7QY?G3}kgT|L{Nl%BTAFSoAD*Ebo50T=y8s@-Dt83_
z;2N2d*{eJT*GIdUXONNwVP`RoO<+-&K%V|sqIfhVFH<M&9R65xi1W2laVYQD?fD%q
zUcY?fd|oc{By~RW!0n8jcWLtDfDc;pV7rR98Dw5NbrnH*wZ#c6x(8lL!K8zmBd}*R
zQqxjpp|;8z9`D*jM>D_^50N$xpc++TzU{~~OWNAo&33DAYwyzdu-+^RYvbe2Y-~Bq
zF$ET@L>*DX8=JZ5=zBZ%cvL~%wIKQ>jvje8B?##o*fWwm8im1<0os{53e)J$lY6kG
zO!ZYtKNR&_2K}8i>){^*ZLD&S{FKJ~Y?Y)t7w%{Z1U{|HDMWBa_E~p-Kx-=tqUM6{
z=TvC}+rY6Tf!edH($yrZw1rBLXb-WOQdP*oeNu!HQdxM-#!YQi+8Q^$ZQR(#O)D8-
zr6s1RE_)|k8|F<TeEJb%=PaC$BG0EN&jZglY8iD-4cnVGP2H3syEcOvo^NV-0bg!H
z75;Q$*bp!^z$e(V2?o{B<8Ikttr-NQCxPwOIJR4(j<emGJ~Z!}n6_Kf!q3noAD*Eb
zn?Uz&O*5mzw=k&x{v5fvRXv=cLDN}0W0l+PjP1@Kx7+TFGRk&mAjWoQFr4kq*zQad
z3${B0;I=zcxN;5F(wzxxcjj)oGq?3>Lj#%fc4v46mJss1{h23N9uG~G!(VxdCd9Mh
zBd?F!HyUh>Tp4L=<V_RyDjjyCdEdmeHS!jIh9>#&4BglSy4T3>;)RAj|Mc%j@%G<m
z=<(8qvHESj+}6vH+iksE8D;C`5M%4*7|zzqZN0pS1zRr%@JCoLKc2~ij9&>#>SwC{
z+ksj~S3gZ9W5)@Ne-kTRuHK`c(5lzd)oKFpOlXIg7lPV(#n`}hLrjTHh&CNScqAsQ
zZ@j*eMu*CiTy@92gsjwGFsWCes=TQlt;d^MeFlIQ?wBTbY8cbvZtf}nS_Xi6yh8Y!
zH1T(#@Tt`8#CPSQ(<ijV$K|Tmbx#Fes(5JCJ5Rp2i_`0)GhSZY`~waNzb^t$002c!
BoizXe

literal 0
HcmV?d00001

diff --git a/Telegram/Resources/qrc/telegram/animations.qrc b/Telegram/Resources/qrc/telegram/animations.qrc
index cc9c2313ed..4e206e01ca 100644
--- a/Telegram/Resources/qrc/telegram/animations.qrc
+++ b/Telegram/Resources/qrc/telegram/animations.qrc
@@ -39,6 +39,7 @@
     <file alias="topics_list.tgs">../../animations/edit_peers/topics_list.tgs</file>
     <file alias="direct_messages.tgs">../../animations/edit_peers/direct_messages.tgs</file>
     <file alias="no_chats.tgs">../../animations/no_chats.tgs</file>
+    <file alias="transcribe_loading.tgs">../../animations/transcribe_loading.tgs</file>
 
     <file alias="dice_idle.tgs">../../animations/dice/dice_idle.tgs</file>
     <file alias="dart_idle.tgs">../../animations/dice/dart_idle.tgs</file>
diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 2f0030cdec..2a14dd78e6 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "lottie/lottie_icon.h"
 #include "storage/localstorage.h"
+#include "lottie/lottie_icon.h"
 #include "main/main_session.h"
 #include "media/player/media_player_float.h" // Media::Player::RoundPainter.
 #include "media/audio/media_audio.h"
@@ -25,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/media/history_view_media_common.h"
 #include "ui/text/format_values.h"
 #include "ui/text/format_song_document_name.h"
+#include "ui/text/text_lottie_custom_emoji.h"
 #include "ui/text/text_utilities.h"
 #include "ui/chat/chat_style.h"
 #include "ui/painter.h"
@@ -440,15 +442,23 @@ QSize Document::countOptimalSize() {
 			voice->transcribe->setLoading(
 				entry.shown && (entry.requestId || entry.pending),
 				update);
+			const auto pending = entry.pending;
+			auto descriptor = pending
+				? Lottie::IconDescriptor{
+					.name = u"transcribe_loading"_q,
+					.sizeOverride = Size(st::historyTranscribeLoadingSize),
+				}
+				: Lottie::IconDescriptor();
 			auto text = (entry.requestId || !entry.shown)
 				? TextWithEntities()
 				: entry.toolong
 				? Ui::Text::Italic(tr::lng_audio_transcribe_long(tr::now))
 				: entry.failed
 				? Ui::Text::Italic(tr::lng_attach_failed(tr::now))
-				: TextWithEntities{
-					entry.result + (entry.pending ? " [...]" : ""),
-				};
+				: TextWithEntities(entry.result).append(
+					pending
+						? Ui::Text::LottieEmoji(descriptor)
+						: TextWithEntities());
 			voice->transcribe->setOpened(
 				!text.empty(),
 				creating ? Fn<void()>() : update);
@@ -461,7 +471,11 @@ QSize Document::countOptimalSize() {
 				voice->transcribeText = Ui::Text::String(minResizeWidth);
 				voice->transcribeText.setMarkedText(
 					st::messageTextStyle,
-					text);
+					text,
+					kMarkupTextOptions,
+					pending
+						? Ui::Text::LottieEmojiContext(std::move(descriptor))
+						: Ui::Text::MarkedContext());
 				hasTranscribe = true;
 				if (const auto skipBlockWidth = _parent->hasVisibleText()
 					? 0
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index a2ed0b4544..dd4c670b74 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -528,6 +528,7 @@ historyVoiceMessageOutTTLSelected: icon {{ "chat/mini_media_once", historyFileOu
 historyTranscribeSkip: 10px;
 historyTranscribeSize: size(28px, 22px);
 historyTranscribeRadius: 4px;
+historyTranscribeLoadingSize: 24px;
 historyTranscribeInIcon: icon {{ "chat/voice_to_text", msgFileInBg }};
 historyTranscribeInIconSelected: icon {{ "chat/voice_to_text", msgFileInBgSelected }};
 historyTranscribeOutIcon: icon {{ "chat/voice_to_text", msgFileOutBg }};

From 1f9e532fbcebb0f0412097e79bb6f3f0155ac123 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 31 Aug 2025 00:34:07 +0300
Subject: [PATCH 256/341] Added link to info to box about sponsored messages.

---
 Telegram/Resources/langs/lang.strings            |  4 +++-
 .../SourceFiles/boxes/about_sponsored_box.cpp    | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index b00244a962..abc04c26ab 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -6339,7 +6339,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 "lng_sponsored_hide_ads" = "Hide";
 "lng_sponsored_title" = "What are sponsored messages?";
-"lng_sponsored_info_description1" = "Unlike other apps, Telegram never uses your private data to target ads. Sponsored messages on Telegram are based solely on the topic of the public channels in which they are shown. This means that no user data is mined or analyzed to display ads, and every user viewing a channel on Telegram sees the same sponsored messages.\n\nUnlike other apps, Telegram doesn't track whether you tapped on a sponsored message and doesn't profile you based on your activity. We also prevent external links in sponsored messages to ensure that third parties can’t spy on our users. We believe that everyone has the right to privacy, and technological platforms should respect that.\n\nTelegram offers a free and unlimited service to hundreds of millions of users, which involves significant server and traffic costs. In order to remain independent and stay true to its values, Telegram developed a paid tool to promote messages with user privacy in mind. We welcome responsible advertisers at:";
+"lng_sponsored_info_description1_linked" = "Unlike other apps, Telegram never uses your private data to target ads. {link}\n\nUnlike other apps, Telegram doesn't track whether you tapped on a sponsored message and doesn't profile you based on your activity. We also prevent external links in sponsored messages to ensure that third parties can’t spy on our users. We believe that everyone has the right to privacy, and technological platforms should respect that.\n\nTelegram offers free and unlimited service to hundreds of millions of users, which involves significant server and traffic costs. In order to remain independent and stay true to its values, Telegram developed a paid tool to promote messages with user privacy in mind. We welcome responsible advertisers at:";
+"lng_sponsored_info_description1_link" = "Learn more in the Privacy Policy";
+"lng_sponsored_info_description1_url" = "https://telegram.org/privacy#5-6-no-ads-based-on-user-data";
 "lng_sponsored_info_description2" = "Sponsored Messages are currently in test mode. Once they are fully launched and allow Telegram to cover its basic costs, we will start sharing ad revenue with the owners of public channels in which sponsored messages are displayed.\n\nOnline ads should no longer be synonymous with abuse of user privacy. Let us redefine how a tech company should operate – together.";
 "lng_sponsored_info_menu" = "Advertiser info";
 "lng_sponsored_info_submenu" = "Advertiser: {text}";
diff --git a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
index 8c932df6af..1603820ff1 100644
--- a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/file_utilities.h"
 #include "lang/lang_keys.h"
 #include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "styles/style_boxes.h"
@@ -18,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Ui {
 namespace {
 
-constexpr auto kUrl = "https://promote.telegram.org"_cs;
+constexpr auto kUrl = "https://ads.telegram.org"_cs;
 
 } // namespace
 
@@ -54,8 +55,17 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 	};
 
 	const auto &stLabel = st::aboutLabel;
-	const auto info1 = box->addRow(object_ptr<FlatLabel>(box, stLabel));
-	info1->setText(tr::lng_sponsored_info_description1(tr::now));
+	auto text1 = tr::lng_sponsored_info_description1_linked(
+		lt_link,
+		rpl::combine(
+			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);
+		}),
+		Ui::Text::RichLangValue);
+	const auto info1 = box->addRow(
+		object_ptr<FlatLabel>(box, std::move(text1), stLabel));
 
 	box->addSkip(st::sponsoredUrlButtonSkip);
 	addUrl();

From 235456e18e41e1bfec8c0ed205056f085e955ad5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 10:09:13 +0400
Subject: [PATCH 257/341] Update API scheme to layer 212.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  4 +++-
 .../peer_gifts/info_peer_gifts_widget.cpp     | 20 ++++++++++++++++---
 .../info/peer_gifts/info_peer_gifts_widget.h  |  2 ++
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  4 ++--
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index abc04c26ab..1e12c91a0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2361,6 +2361,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_peer_gifts_filter_by_value" = "Sort by Value";
 "lng_peer_gifts_filter_by_date" = "Sort by Date";
 "lng_peer_gifts_filter_unlimited" = "Unlimited";
+"lng_peer_gifts_filter_upgradable" = "Upgradeable";
 "lng_peer_gifts_filter_limited" = "Limited";
 "lng_peer_gifts_filter_unique" = "Unique";
 "lng_peer_gifts_filter_saved" = "Displayed";
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 94559edf4f..76f44d9598 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -1160,7 +1160,9 @@ void PreviewWrap::paintEvent(QPaintEvent *e) {
 		const auto user = session->user();
 		const auto requestId = session->api().request(
 			MTPpayments_GetSavedStarGifts(
-			MTP_flags(Flag::f_exclude_limited | Flag::f_exclude_unlimited),
+			MTP_flags(Flag::f_exclude_upgradable
+				| Flag::f_exclude_unupgradable
+				| Flag::f_exclude_unlimited),
 			user->input,
 			MTP_int(0), // collection_id
 			MTP_string(offset),
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 48c2ecd56e..829951c4ae 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -561,7 +561,8 @@ void InnerWidget::loadMore() {
 	const auto collectionId = descriptor.collectionId;
 	_loadMoreRequestId = _api.request(MTPpayments_GetSavedStarGifts(
 		MTP_flags((filter.sortByValue ? Flag::f_sort_by_value : Flag())
-			| (filter.skipLimited ? Flag::f_exclude_limited : Flag())
+			| (filter.skipLimited ? Flag::f_exclude_unupgradable : Flag())
+			| (filter.skipUpgradable ? Flag::f_exclude_upgradable : Flag())
 			| (filter.skipUnlimited ? Flag::f_exclude_unlimited : Flag())
 			| (filter.skipUnique ? Flag::f_exclude_unique : Flag())
 			| (filter.skipSaved ? Flag::f_exclude_saved : Flag())
@@ -1422,17 +1423,30 @@ void InnerWidget::fillMenu(const Ui::Menu::MenuCallback &addAction) {
 	addAction(tr::lng_peer_gifts_filter_limited(tr::now), [=] {
 		change([](Filter &filter) {
 			filter.skipLimited = !filter.skipLimited;
-			if (filter.skipUnlimited
+			if (filter.skipUpgradable
+				&& filter.skipUnlimited
 				&& filter.skipLimited
 				&& filter.skipUnique) {
 				filter.skipUnlimited = false;
 			}
 		});
 	}, filter.skipLimited ? nullptr : &st::mediaPlayerMenuCheck);
+	addAction(tr::lng_peer_gifts_filter_upgradable(tr::now), [=] {
+		change([](Filter &filter) {
+			filter.skipUpgradable = !filter.skipUpgradable;
+			if (filter.skipUpgradable
+				&& filter.skipUnlimited
+				&& filter.skipLimited
+				&& filter.skipUnique) {
+				filter.skipUnlimited = false;
+			}
+		});
+	}, filter.skipUpgradable ? nullptr: &st::mediaPlayerMenuCheck);
 	addAction(tr::lng_peer_gifts_filter_unique(tr::now), [=] {
 		change([](Filter &filter) {
 			filter.skipUnique = !filter.skipUnique;
-			if (filter.skipUnlimited
+			if (filter.skipUpgradable
+				&& filter.skipUnlimited
 				&& filter.skipLimited
 				&& filter.skipUnique) {
 				filter.skipUnlimited = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
index 5aa3e90fd3..754069ebb3 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.h
@@ -30,6 +30,7 @@ struct Filter {
 	bool sortByValue : 1 = false;
 	bool skipUnlimited : 1 = false;
 	bool skipLimited : 1 = false;
+	bool skipUpgradable : 1 = false;
 	bool skipUnique : 1 = false;
 	bool skipSaved : 1 = false;
 	bool skipUnsaved : 1 = false;
@@ -39,6 +40,7 @@ struct Filter {
 			|| skipUnlimited
 			|| skipSaved
 			|| skipUnsaved
+			|| skipUpgradable
 			|| skipUnique;
 	}
 
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 97d329dcbe..5612c29328 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -2606,7 +2606,7 @@ payments.getStarGiftUpgradePreview#9c9abcb1 gift_id:long = payments.StarGiftUpgr
 payments.upgradeStarGift#aed6e4f5 flags:# keep_original_details:flags.0?true stargift:InputSavedStarGift = Updates;
 payments.transferStarGift#7f18176a stargift:InputSavedStarGift to_id:InputPeer = Updates;
 payments.getUniqueStarGift#a1974d72 slug:string = payments.UniqueStarGift;
-payments.getSavedStarGifts#a319e569 flags:# exclude_unsaved:flags.0?true exclude_saved:flags.1?true exclude_unlimited:flags.2?true exclude_limited:flags.3?true exclude_unique:flags.4?true sort_by_value:flags.5?true peer:InputPeer collection_id:flags.6?int offset:string limit:int = payments.SavedStarGifts;
+payments.getSavedStarGifts#a319e569 flags:# exclude_unsaved:flags.0?true exclude_saved:flags.1?true exclude_unlimited:flags.2?true exclude_unique:flags.4?true sort_by_value:flags.5?true exclude_upgradable:flags.7?true exclude_unupgradable:flags.8?true peer:InputPeer collection_id:flags.6?int offset:string limit:int = payments.SavedStarGifts;
 payments.getSavedStarGift#b455a106 stargift:Vector<InputSavedStarGift> = payments.SavedStarGifts;
 payments.getStarGiftWithdrawalUrl#d06e93a8 stargift:InputSavedStarGift password:InputCheckPasswordSRP = payments.StarGiftWithdrawalUrl;
 payments.toggleChatStarGiftNotifications#60eaefa1 flags:# enabled:flags.0?true peer:InputPeer = Bool;
@@ -2747,4 +2747,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 211
+// LAYER 212

From 4a33d3227e9b70d398366dae7af8fb4070c4b691 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 15:53:14 +0400
Subject: [PATCH 258/341] Suggest upgrading next gift.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../SourceFiles/boxes/gift_premium_box.cpp    |  22 +--
 .../boxes/peers/edit_peer_invite_link.cpp     |   9 +-
 .../SourceFiles/boxes/send_credits_box.cpp    |   8 --
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  12 +-
 Telegram/SourceFiles/data/data_credits.h      |   2 +
 Telegram/SourceFiles/data/data_session.cpp    |  53 +++++++
 Telegram/SourceFiles/data/data_session.h      |  16 +++
 .../view/media/history_view_premium_gift.cpp  |  16 +--
 .../boosts/giveaway/giveaway.style            |   6 +-
 .../peer_gifts/info_peer_gifts_widget.cpp     |   6 +-
 .../info/profile/info_levels.style            |   2 +-
 .../SourceFiles/settings/settings_credits.cpp |   9 +-
 .../settings/settings_credits_graphics.cpp    | 131 +++++++++++++-----
 .../settings/settings_credits_graphics.h      |   8 +-
 Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp |  14 --
 16 files changed, 195 insertions(+), 120 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 1e12c91a0a..bc504f4c56 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3656,6 +3656,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_unique_status" = "Status";
 "lng_gift_unique_status_non" = "Non-Unique";
 "lng_gift_unique_upgrade" = "Upgrade";
+"lng_gift_unique_upgrade_next" = "Upgrade Next Gift";
 "lng_gift_unique_number" = "Collectible #{index}";
 "lng_gift_unique_number_by" = "Collectible #{index} by {name}";
 "lng_gift_unique_model" = "Model";
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index c17481e628..f4567e7961 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -759,7 +759,7 @@ void GiftCodeBox(
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
-	const auto button = box->addButton(rpl::conditional(
+	box->addButton(rpl::conditional(
 		state->used.value(),
 		tr::lng_box_ok(),
 		tr::lng_gift_link_use()
@@ -788,15 +788,6 @@ void GiftCodeBox(
 			controller->session().api().premium().applyGiftCode(slug, done);
 		}
 	});
-	const auto buttonPadding = st::giveawayGiftCodeBox.buttonPadding;
-	const auto buttonWidth = st::boxWideWidth
-		- buttonPadding.left()
-		- buttonPadding.right();
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
 }
 
 void GiftCodePendingBox(
@@ -897,16 +888,7 @@ void GiftCodePendingBox(
 		close->moveToRight(0, 0);
 	}, box->lifetime());
 
-	const auto button = box->addButton(tr::lng_close(), closeCallback);
-	const auto buttonPadding = st::giveawayGiftCodeBox.buttonPadding;
-	const auto buttonWidth = st::boxWideWidth
-		- buttonPadding.left()
-		- buttonPadding.right();
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
+	box->addButton(tr::lng_close(), closeCallback);
 }
 
 void ResolveGiftCode(
diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
index 5c26012cd6..3058d4c815 100644
--- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp
@@ -1037,16 +1037,9 @@ void Controller::rowClicked(not_null<PeerListRow*> row) {
 				st::creditsBoxAboutDivider),
 			style::al_top);
 
-		const auto button = box->addButton(tr::lng_box_ok(), [=] {
+		box->addButton(tr::lng_box_ok(), [=] {
 			box->closeBox();
 		});
-		const auto buttonWidth = st::boxWidth
-			- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-		button->widthValue() | rpl::filter([=] {
-			return (button->widthNoMargins() != buttonWidth);
-		}) | rpl::start_with_next([=] {
-			button->resizeToWidth(buttonWidth);
-		}, button->lifetime());
 	}));
 }
 
diff --git a/Telegram/SourceFiles/boxes/send_credits_box.cpp b/Telegram/SourceFiles/boxes/send_credits_box.cpp
index 816d0aecc7..8cfcdc1deb 100644
--- a/Telegram/SourceFiles/boxes/send_credits_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_credits_box.cpp
@@ -464,14 +464,6 @@ void SendCreditsBox(
 		st::creditsBoxButtonLabel,
 		&box->getDelegate()->style().button.textFg);
 
-	const auto buttonWidth = st::boxWidth
-		- rect::m::sum::h(stBox.buttonPadding);
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
-
 	{
 		const auto close = Ui::CreateChild<Ui::IconButton>(
 			content,
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 76f44d9598..961171463e 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2130,9 +2130,17 @@ void UpgradeGift(
 	auto formDone = [=](
 			Payments::CheckoutResult result,
 			const MTPUpdates *updates) {
-		if (result == Payments::CheckoutResult::Paid && updates) {
+		if (result == Payments::CheckoutResult::Paid) {
 			if (const auto strong = weak.get()) {
-				ShowGiftUpgradedToast(strong, session, *updates);
+				const auto owner = savedId.isUser()
+					? strong->session().user().get()
+					: savedId.chat();
+				if (owner) {
+					owner->owner().nextForUpgradeGiftInvalidate(owner);
+				}
+				if (updates) {
+					ShowGiftUpgradedToast(strong, session, *updates);
+				}
 			}
 		}
 		done(result);
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index aa7e29837b..7a82c49f93 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -73,6 +73,8 @@ struct CreditsHistoryEntry final {
 	uint64 stargiftId = 0;
 	std::shared_ptr<UniqueGift> uniqueGift;
 	Fn<std::vector<CreditsHistoryEntry>()> pinnedSavedGifts;
+	uint64 nextToUpgradeStickerId = 0;
+	Fn<void()> nextToUpgradeShow;
 	CreditsAmount starrefAmount;
 	int starrefCommission = 0;
 	uint64 starrefRecipientId = 0;
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index bef5a20e52..228840c06b 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -85,6 +85,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 namespace {
 
+constexpr auto kNextForUpgradeGiftTimeout = 5 * crl::time(1000);
+
 using ViewElement = HistoryView::Element;
 
 // s: box 100x100
@@ -2155,6 +2157,57 @@ rpl::producer<> Session::pinnedDialogsOrderUpdated() const {
 	return _pinnedDialogsOrderUpdated.events();
 }
 
+void Session::nextForUpgradeGiftInvalidate(not_null<PeerData*> owner) {
+	_nextForUpgradeGifts.remove(owner);
+}
+
+void Session::nextForUpgradeGiftRequest(
+		not_null<PeerData*> owner,
+		Fn<void(std::optional<Data::SavedStarGift>)> done) {
+	auto &entry = _nextForUpgradeGifts[owner];
+	if (entry.requestId) {
+		entry.done = std::move(done);
+		return;
+	} else if (crl::now() - entry.received < kNextForUpgradeGiftTimeout) {
+		done(entry.gift);
+		return;
+	}
+	entry.done = std::move(done);
+
+	const auto finishWith = [=](std::optional<Data::SavedStarGift> gift) {
+		auto &entry = _nextForUpgradeGifts[owner];
+		entry.requestId = 0;
+		entry.gift = std::move(gift);
+		entry.received = crl::now();
+		base::take(entry.done)(entry.gift);
+	};
+	using Flag = MTPpayments_GetSavedStarGifts::Flag;
+	entry.requestId = _session->api().request(
+		MTPpayments_GetSavedStarGifts(
+			MTP_flags(Flag::f_exclude_unique
+				| Flag::f_exclude_unlimited
+				| Flag::f_exclude_unupgradable),
+			owner->input,
+			MTPint(), // collection_id
+			MTP_string(), // offset
+			MTP_int(1)) // limit
+	).done([=](const MTPpayments_SavedStarGifts &result) {
+		const auto &data = result.data();
+		processUsers(data.vusers());
+		processChats(data.vchats());
+		const auto &list = data.vgifts().v;
+		if (list.empty()) {
+			finishWith(std::nullopt);
+		} else if (auto parsed = Api::FromTL(owner, list[0])) {
+			finishWith(std::move(*parsed));
+		} else {
+			finishWith(std::nullopt);
+		}
+	}).fail([=](const MTP::Error &error) {
+		finishWith(std::nullopt);
+	}).send();
+}
+
 Session::CreditsSubsRebuilderPtr Session::createCreditsSubsRebuilder() {
 	if (auto result = activeCreditsSubsRebuilder()) {
 		return result;
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index cdcbb5cd4b..6daa540e5f 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -376,6 +376,11 @@ public:
 	void notifyPinnedDialogsOrderUpdated();
 	[[nodiscard]] rpl::producer<> pinnedDialogsOrderUpdated() const;
 
+	void nextForUpgradeGiftInvalidate(not_null<PeerData*> owner);
+	void nextForUpgradeGiftRequest(
+		not_null<PeerData*> owner,
+		Fn<void(std::optional<Data::SavedStarGift>)> done);
+
 	using CreditsSubsRebuilder = rpl::event_stream<CreditsStatusSlice>;
 	using CreditsSubsRebuilderPtr = std::shared_ptr<CreditsSubsRebuilder>;
 	[[nodiscard]] CreditsSubsRebuilderPtr createCreditsSubsRebuilder();
@@ -881,6 +886,13 @@ public:
 private:
 	using Messages = std::unordered_map<MsgId, not_null<HistoryItem*>>;
 
+	struct NextToUpgradeGift {
+		std::optional<Data::SavedStarGift> gift;
+		Fn<void(std::optional<Data::SavedStarGift>)> done;
+		crl::time received = 0;
+		mtpRequestId requestId = 0;
+	};
+
 	void suggestStartExport();
 
 	void setupMigrationViewer();
@@ -1232,6 +1244,10 @@ private:
 
 	std::unique_ptr<StarsRatingPending> _pendingStarsRating;
 
+	base::flat_map<
+		not_null<PeerData*>,
+		NextToUpgradeGift> _nextForUpgradeGifts;
+
 	rpl::lifetime _lifetime;
 
 };
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index bcbcaf70e2..d5bf83f519 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -518,14 +518,7 @@ ClickHandlerPtr OpenStarGiftLink(not_null<HistoryItem*> item) {
 			return;
 		}
 		const auto quick = [=](not_null<Window::SessionController*> window) {
-			const auto item = window->session().data().message(itemId);
-			if (item) {
-				window->show(Box(
-					Settings::StarGiftViewBox,
-					window,
-					data,
-					item));
-			}
+			Settings::ShowStarGiftViewBox(window, data, itemId);
 		};
 		if (!openInsteadId) {
 			quick(controller);
@@ -551,12 +544,7 @@ ClickHandlerPtr OpenStarGiftLink(not_null<HistoryItem*> item) {
 				if (list.empty()) {
 					quick(window);
 				} else if (auto parsed = Api::FromTL(owner, list[0])) {
-					window->show(Box(
-						Settings::SavedStarGiftBox,
-						window,
-						owner,
-						*parsed,
-						nullptr));
+					Settings::ShowSavedStarGiftBox(window, owner, *parsed);
 				}
 			}
 		}).fail([=](const MTP::Error &error) {
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index 445337d33d..6a2472a955 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -153,6 +153,7 @@ giveawayGiftCodeFooterMargin: margins(0px, 9px, 0px, 4px);
 giveawayGiftCodeBox: Box(defaultBox) {
 	buttonPadding: margins(22px, 11px, 22px, 22px);
 	buttonHeight: 42px;
+	buttonWide: true;
 	button: RoundButton(defaultActiveButton) {
 		height: 42px;
 		textTop: 12px;
@@ -205,11 +206,6 @@ starConvertButtonLoading: InfiniteRadialAnimation(startGiveawayButtonLoading) {
 
 starGiftSmallButton: defaultTableSmallButton;
 darkGiftCodeBox: Box(giveawayGiftCodeBox) {
-	button: RoundButton(defaultActiveButton) {
-		height: 42px;
-		textTop: 12px;
-		style: semiboldTextStyle;
-	}
 	bg: groupCallMembersBg;
 	title: FlatLabel(boxTitle) {
 		textFg: groupCallMembersFg;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
index 829951c4ae..d3a649be30 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp
@@ -941,13 +941,11 @@ void InnerWidget::showGift(int index) {
 		}
 		return;
 	}
-
-	_window->show(Box(
-		::Settings::SavedStarGiftBox,
+	::Settings::ShowSavedStarGiftBox(
 		_window,
 		_peer,
 		(*_list)[index].gift,
-		pinnedSavedGifts()));
+		pinnedSavedGifts());
 }
 
 void InnerWidget::refreshAbout() {
diff --git a/Telegram/SourceFiles/info/profile/info_levels.style b/Telegram/SourceFiles/info/profile/info_levels.style
index 9a545eb325..861b31e7fd 100644
--- a/Telegram/SourceFiles/info/profile/info_levels.style
+++ b/Telegram/SourceFiles/info/profile/info_levels.style
@@ -76,6 +76,6 @@ level90: LevelShape(levelBase) {
 	icon: icon {{ "levels/level90_inner-26x26", windowBgActive }};
 }
 levelNegative: LevelShape(levelBase) {
-	icon: icon {{ "levels/level_warning-18x18", attentionButtonFg, point(6px, 7px) }};
+	icon: icon {{ "levels/level_warning-18x18", attentionButtonFg, point(6px, 5px) }};
 }
 levelNegativeBubble: icon {{ "levels/level_warning-28x28", windowFgActive }};
diff --git a/Telegram/SourceFiles/settings/settings_credits.cpp b/Telegram/SourceFiles/settings/settings_credits.cpp
index cae52cec73..2fd4e114d2 100644
--- a/Telegram/SourceFiles/settings/settings_credits.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits.cpp
@@ -941,16 +941,9 @@ Fn<void()> BuyStarsHandler::handler(
 			}
 		}, box->showFinishes(), nullptr, options);
 
-		const auto button = box->addButton(tr::lng_close(), [=] {
+		box->addButton(tr::lng_close(), [=] {
 			box->closeBox();
 		});
-		const auto buttonWidth = st::boxWideWidth
-			- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-		button->widthValue() | rpl::filter([=] {
-			return (button->widthNoMargins() != buttonWidth);
-		}) | rpl::start_with_next([=] {
-			button->resizeToWidth(buttonWidth);
-		}, button->lifetime());
 	};
 	return crl::guard(this, [=] {
 		if (_api && !_api->options().empty()) {
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index b1421265ed..0d60b20c62 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -941,16 +941,9 @@ void BoostCreditsBox(
 		style::al_top);
 	Ui::AddSkip(content);
 
-	const auto button = box->addButton(tr::lng_box_ok(), [=] {
+	box->addButton(tr::lng_box_ok(), [=] {
 		box->closeBox();
 	});
-	const auto buttonWidth = st::boxWidth
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
 }
 
 void ProcessReceivedSubscriptions(
@@ -1934,6 +1927,7 @@ void GenericCreditsEntryBox(
 
 	Ui::AddSkip(content);
 
+	const auto showNextToUpgrade = e.nextToUpgradeShow;
 	if (!isStarGift && e.credits.stars()) {
 		box->addRow(
 			object_ptr<Ui::FlatLabel>(
@@ -1975,7 +1969,9 @@ void GenericCreditsEntryBox(
 			return TextWithEntities{ std::move(hint) }.append(' ').append(
 				Ui::Text::Link(hide));
 		});
-		auto text = (!e.savedToProfile && canToggle && canUpgrade)
+		auto text = (!e.savedToProfile
+			&& canToggle
+			&& (canUpgrade || showNextToUpgrade))
 			? std::move(withShow)
 			: !e.savedToProfile
 			? hiddenPhrase(Ui::Text::WithEntities)
@@ -2087,6 +2083,9 @@ void GenericCreditsEntryBox(
 	const auto toRejoin = (s.cancelled || s.expired)
 		&& rejoinBySlug
 		&& !s.cancelledByBot;
+	//const auto suggestUpgradeNext = uniqueGift
+	//	&& canToggle
+	//	&& e.savedToProfile;
 	auto confirmText = rpl::conditional(
 		state->confirmButtonBusy.value(),
 		rpl::single(QString()),
@@ -2149,7 +2148,10 @@ void GenericCreditsEntryBox(
 	}
 
 	const auto button = box->addButton(std::move(confirmText), [=] {
-		if (state->confirmButtonBusy.current()
+		if (showNextToUpgrade) {
+			showNextToUpgrade();
+			return;
+		} else if (state->confirmButtonBusy.current()
 			|| state->convertButtonBusy.current()) {
 			return;
 		}
@@ -2174,7 +2176,9 @@ void GenericCreditsEntryBox(
 		} else {
 			box->closeBox();
 		}
-	});
+	}, showNextToUpgrade
+		? st::defaultLightButton
+		: st::giveawayGiftCodeBox.button);
 	if (canBuyResold) {
 		if (uniqueGift->onlyAcceptTon || e.giftResaleForceTon) {
 			button->setText(rpl::single(QString()));
@@ -2200,6 +2204,23 @@ void GenericCreditsEntryBox(
 					Lang::FormatCountDecimal(uniqueGift->starsForResale))),
 				Ui::Text::WithEntities));
 		}
+	} else if (showNextToUpgrade) {
+		const auto session = &show->session();
+		const auto sticker = e.nextToUpgradeStickerId
+			? session->data().document(e.nextToUpgradeStickerId).get()
+			: nullptr;
+		const auto document = (sticker && sticker->sticker())
+			? sticker
+			: nullptr;
+		button->setContext(Core::TextContext({ .session = session }));
+		button->setText(tr::lng_gift_unique_upgrade_next(
+		) | rpl::map([=](const QString &text) {
+			auto result = TextWithEntities{ text };
+			if (document) {
+				result.append(' ').append(Data::SingleCustomEmoji(document));
+			}
+			return result;
+		}));
 	}
 	{
 		using namespace Info::Statistics;
@@ -2358,19 +2379,20 @@ Data::SavedStarGiftId EntryToSavedStarGiftId(
 		: Data::SavedStarGiftId::User(MsgId(entry.bareMsgId));
 }
 
-void SavedStarGiftBox(
-		not_null<Ui::GenericBox*> box,
+void ShowSavedStarGiftBox(
 		not_null<Window::SessionController*> controller,
 		not_null<PeerData*> owner,
 		const Data::SavedStarGift &data,
 		Fn<std::vector<Data::CreditsHistoryEntry>()> pinned) {
-	auto entry = SavedStarGiftEntry(owner, data);
-	entry.pinnedSavedGifts = std::move(pinned);
-	Settings::ReceiptCreditsBox(
-		box,
-		controller,
-		std::move(entry),
-		Data::SubscriptionEntry());
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		auto entry = SavedStarGiftEntry(owner, data);
+		entry.pinnedSavedGifts = std::move(pinned);
+		Settings::ReceiptCreditsBox(
+			box,
+			controller,
+			std::move(entry),
+			Data::SubscriptionEntry());
+	}));
 }
 
 void FillSavedStarGiftMenu(
@@ -2382,17 +2404,31 @@ void FillSavedStarGiftMenu(
 	FillUniqueGiftMenu(show, menu, e, type, st);
 }
 
-void StarGiftViewBox(
-		not_null<Ui::GenericBox*> box,
+void ShowStarGiftViewBox(
 		not_null<Window::SessionController*> controller,
 		const Data::GiftCode &data,
-		not_null<HistoryItem*> item) {
+		FullMsgId itemId,
+		std::optional<Data::SavedStarGift> upgradeNext) {
+	const auto item = controller->session().data().message(itemId);
+	if (!item) {
+		return;
+	}
 	const auto peer = item->history()->peer;
 	const auto toChannel = peer->isServiceUser() && data.channel;
 	const auto incoming = !toChannel
 		&& (data.upgrade ? item->out() : !item->out());
 	const auto fromId = incoming ? peer->id : peer->session().userPeerId();
 	const auto toId = incoming ? peer->session().userPeerId() : peer->id;
+	const auto ownerId = data.unique ? data.unique->ownerId : toId;
+	const auto nextToUpgradeStickerId = upgradeNext
+		? upgradeNext->info.document->id
+		: uint64();
+	const auto nextToUpgradeShow = upgradeNext
+		? [=] { ShowSavedStarGiftBox(
+			controller,
+			controller->session().data().peer(ownerId),
+			*upgradeNext); }
+		: Fn<void()>();
 	const auto entry = Data::CreditsHistoryEntry{
 		.id = data.slug,
 		.description = data.message,
@@ -2401,9 +2437,7 @@ void StarGiftViewBox(
 		.bareMsgId = uint64(item->id.bare),
 		.barePeerId = fromId.value,
 		.bareGiftStickerId = data.document ? data.document->id : 0,
-		.bareGiftOwnerId = (data.unique
-			? data.unique->ownerId.value
-			: toId.value),
+		.bareGiftOwnerId = ownerId.value,
 		.bareGiftReleasedById = (data.stargiftReleasedBy
 			? data.stargiftReleasedBy->id.value
 			: 0),
@@ -2412,6 +2446,8 @@ void StarGiftViewBox(
 		.giftChannelSavedId = data.channelSavedId,
 		.stargiftId = data.stargiftId,
 		.uniqueGift = data.unique,
+		.nextToUpgradeStickerId = nextToUpgradeStickerId,
+		.nextToUpgradeShow = std::move(nextToUpgradeShow),
 		.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
 		.limitedCount = data.limitedCount,
 		.limitedLeft = data.limitedLeft,
@@ -2429,11 +2465,44 @@ void StarGiftViewBox(
 		.in = incoming,
 		.gift = true,
 	};
-	Settings::ReceiptCreditsBox(
-		box,
-		controller,
-		entry,
-		Data::SubscriptionEntry());
+	controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+		Settings::ReceiptCreditsBox(
+			box,
+			controller,
+			entry,
+			Data::SubscriptionEntry());
+	}));
+}
+
+void ShowStarGiftViewBox(
+		not_null<Window::SessionController*> controller,
+		const Data::GiftCode &data,
+		FullMsgId itemId) {
+	const auto item = controller->session().data().message(itemId);
+	if (!item) {
+		return;
+	}
+	const auto peer = item->history()->peer;
+	const auto toChannel = peer->isServiceUser() && data.channel;
+	const auto incoming = !toChannel
+		&& (data.upgrade ? item->out() : !item->out());
+	const auto fromId = incoming ? peer->id : peer->session().userPeerId();
+	const auto toId = incoming ? peer->session().userPeerId() : peer->id;
+	const auto ownerId = data.unique ? data.unique->ownerId : toId;
+	const auto owner = peer->owner().peer(ownerId);
+	if (data.unique && owner->canManageGifts()) {
+		const auto weak = base::make_weak(controller);
+		owner->owner().nextForUpgradeGiftRequest(owner, crl::guard(weak, [=](
+				std::optional<Data::SavedStarGift> nextToUpgrade) {
+			ShowStarGiftViewBox(
+				controller,
+				data,
+				itemId,
+				std::move(nextToUpgrade));
+		}));
+	} else {
+		ShowStarGiftViewBox(controller, data, itemId, std::nullopt);
+	}
 }
 
 void ShowRefundInfoBox(
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index c51481e5d9..46c408c5af 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -174,8 +174,7 @@ void GlobalStarGiftBox(
 [[nodiscard]] Data::SavedStarGiftId EntryToSavedStarGiftId(
 	not_null<Main::Session*> session,
 	const Data::CreditsHistoryEntry &entry);
-void SavedStarGiftBox(
-	not_null<Ui::GenericBox*> box,
+void ShowSavedStarGiftBox(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> owner,
 	const Data::SavedStarGift &data,
@@ -191,11 +190,10 @@ void FillSavedStarGiftMenu(
 	SavedStarGiftMenuType type,
 	CreditsEntryBoxStyleOverrides st = {});
 
-void StarGiftViewBox(
-	not_null<Ui::GenericBox*> box,
+void ShowStarGiftViewBox(
 	not_null<Window::SessionController*> controller,
 	const Data::GiftCode &data,
-	not_null<HistoryItem*> item);
+	FullMsgId itemId);
 void ShowRefundInfoBox(
 	not_null<Window::SessionController*> controller,
 	FullMsgId refundItemId);
diff --git a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
index 0585a18f21..37f3913584 100644
--- a/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/peer_qr_box.cpp
@@ -843,14 +843,7 @@ void FillPeerQrBox(
 		if (state->saveButtonBusy.current()) {
 			return;
 		}
-		const auto buttonWidth = state->saveButton
-			? state->saveButton->width()
-			: 0;
 		state->saveButtonBusy = true;
-		if (state->saveButton) {
-			state->saveButton->resizeToWidth(buttonWidth);
-		}
-
 		const auto userpicToggled = state->userpicToggled.current();
 		const auto backgroundToggled = state->backgroundToggled.current();
 		const auto scale = style::kScaleDefault
@@ -973,13 +966,6 @@ void FillPeerQrBox(
 		loadingAnimation->showOn(state->saveButtonBusy.value());
 	}
 
-	const auto buttonWidth = box->width()
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
-	state->saveButton->widthValue() | rpl::filter([=] {
-		return (state->saveButton->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		state->saveButton->resizeToWidth(buttonWidth);
-	}, state->saveButton->lifetime());
 	box->addTopButton(st::boxTitleClose, [=] { box->closeBox(); });
 }
 

From eb824733953a9aebee09102be5f6e4af8a749807 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 8 Aug 2025 13:31:43 +0400
Subject: [PATCH 259/341] Update API scheme on layer 212, gift upgrades.

---
 Telegram/Resources/langs/lang.strings         |  18 +++
 Telegram/SourceFiles/api/api_premium.cpp      |   2 +
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  95 ++++++++++--
 Telegram/SourceFiles/boxes/star_gift_box.h    |   1 +
 Telegram/SourceFiles/data/data_credits.h      |   1 +
 Telegram/SourceFiles/data/data_star_gift.h    |   1 +
 Telegram/SourceFiles/history/history_item.cpp | 138 +++++++++++++++---
 Telegram/SourceFiles/mtproto/scheme/api.tl    |   9 +-
 .../settings/settings_credits_graphics.cpp    |  21 ++-
 9 files changed, 242 insertions(+), 44 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index bc504f4c56..2374510777 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2205,6 +2205,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_gift_upgraded_self_channel" = "You turned this gift to {channel} into a unique collectible";
 "lng_action_gift_upgraded_mine" = "You turned the gift from {user} into a unique collectible";
 "lng_action_gift_upgraded_self" = "You turned this gift into a unique collectible";
+"lng_action_gift_sent_upgrade_other" = "{from} sent an upgrade worth {cost} for the gift you received from {user}.";
+"lng_action_gift_sent_upgrade_self_other" = "You sent an upgrade worth {cost} for the gift {name} received from {user}.";
+"lng_action_gift_sent_upgrade" = "{from} sent an upgrade worth {cost} for your gift.";
+"lng_action_gift_sent_upgrade_self" = "You sent an upgrade worth {cost} for this gift.";
+"lng_action_gift_sent_upgrade_self_channel" = "You sent an upgrade worth {cost} for your gift to {name}.";
+"lng_action_gift_upgraded_helped" = "{user} unpacked the gift that you helped to upgrade.";
+"lng_action_gift_upgraded_helped_self" = "You unpacked the gift that {user} helped to upgrade.";
 "lng_action_gift_transferred" = "{user} transferred you a gift";
 "lng_action_gift_transferred_channel" = "{user} transferred a gift to {channel}";
 "lng_action_gift_transferred_unknown" = "Someone transferred you a gift";
@@ -3657,6 +3664,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_unique_status_non" = "Non-Unique";
 "lng_gift_unique_upgrade" = "Upgrade";
 "lng_gift_unique_upgrade_next" = "Upgrade Next Gift";
+"lng_gift_unique_gift_upgrade" = "Gift an Upgrade";
+"lng_gift_unique_gift_pay_upgrade" = "Pay {amount} for Upgrade";
 "lng_gift_unique_number" = "Collectible #{index}";
 "lng_gift_unique_number_by" = "Collectible #{index} by {name}";
 "lng_gift_unique_model" = "Model";
@@ -3709,10 +3718,16 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_upgrade_preview_about_channel" = "Let the admins of {name} turn your gift into a unique collectible.";
 "lng_gift_upgrade_unique_title" = "Unique";
 "lng_gift_upgrade_unique_about" = "Get a unique number, model, backdrop and symbol for your gift.";
+"lng_gift_upgrade_unique_about_user" = "{name} will get a unique number, model, backdrop and symbol for your gift.";
+"lng_gift_upgrade_unique_about_channel" = "Admins of {name} will get a unique number, model, backdrop and symbol for your gift.";
 "lng_gift_upgrade_transferable_title" = "Transferable";
 "lng_gift_upgrade_transferable_about" = "Send your upgraded gift to any of your friends on Telegram.";
+"lng_gift_upgrade_transferable_about_user" = "{name} will be able to send the gift to anyone on Telegram.";
+"lng_gift_upgrade_transferable_about_channel" = "Admins of {name} will be able to send the gift to anyone on Telegram.";
 "lng_gift_upgrade_tradable_title" = "Tradable";
 "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_button" = "Upgrade for {price}";
 "lng_gift_upgrade_free" = "Upgrade for Free";
 "lng_gift_upgrade_confirm" = "Confirm";
@@ -3722,6 +3737,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_upgrade_add_comment" = "Add sender's name and comment";
 "lng_gift_upgraded_title" = "Gift Upgraded";
 "lng_gift_upgraded_about" = "Your gift {name} now has unique attributes and can be transferred to others";
+"lng_gift_upgrade_gifted_title" = "Upgrade Gifted";
+"lng_gift_upgrade_gifted_about" = "Now {name} can turn your gift into a unique collectible.";
+"lng_gift_upgrade_gifted_about_channel" = "Now the admins of {name} can turn your gift into a unique collectible.";
 "lng_gift_transferred_title" = "Gift Transferred";
 "lng_gift_transferred_about" = "{name} was successfully transferred to {recipient}.";
 "lng_gift_transfer_title" = "Transfer {name}";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index c8380d62d7..309f20261c 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -967,6 +967,8 @@ std::optional<Data::SavedStarGift> FromTL(
 		.starsConverted = int64(data.vconvert_stars().value_or_empty()),
 		.starsUpgradedBySender = int64(
 			data.vupgrade_stars().value_or_empty()),
+		.giftPrepayUpgradeHash = qs(
+			data.vprepaid_upgrade_hash().value_or_empty()),
 		.fromId = (data.vfrom_id()
 			? peerFromMTP(*data.vfrom_id())
 			: PeerId()),
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 961171463e..31c5df9afe 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2086,6 +2086,23 @@ void ShowGiftUpgradedToast(
 	}
 }
 
+void ShowUpgradeGiftedToast(
+		base::weak_ptr<Window::SessionController> weak,
+		not_null<PeerData*> peer) {
+	if (const auto strong = weak.get()) {
+		strong->showToast({
+			.title = tr::lng_gift_upgrade_gifted_title(tr::now),
+			.text = (peer->isBroadcast()
+				? tr::lng_gift_upgrade_gifted_about_channel
+				: tr::lng_gift_upgrade_gifted_about)(
+					tr::now,
+					lt_name,
+					peer->shortName()),
+			.duration = kUpgradeDoneToastDuration,
+		});
+	}
+}
+
 void SendStarsFormRequest(
 		std::shared_ptr<Main::SessionShow> show,
 		Settings::SmallBalanceResult result,
@@ -2138,9 +2155,9 @@ void UpgradeGift(
 				if (owner) {
 					owner->owner().nextForUpgradeGiftInvalidate(owner);
 				}
-				if (updates) {
-					ShowGiftUpgradedToast(strong, session, *updates);
-				}
+			}
+			if (updates) {
+				ShowGiftUpgradedToast(weak, session, *updates);
 			}
 		}
 		done(result);
@@ -2170,6 +2187,30 @@ void UpgradeGift(
 		std::move(formDone));
 }
 
+void GiftUpgrade(
+		not_null<Window::SessionController*> window,
+		not_null<PeerData*> peer,
+		QString giftPrepayUpgradeHash,
+		int stars,
+		Fn<void(Payments::CheckoutResult)> done) {
+	const auto weak = base::make_weak(window);
+	auto formDone = [=](
+			Payments::CheckoutResult result,
+			const MTPUpdates *updates) {
+		if (result == Payments::CheckoutResult::Paid) {
+			ShowUpgradeGiftedToast(weak, peer);
+		}
+		done(result);
+	};
+	using Flag = MTPDinputInvoiceStarGiftUpgrade::Flag;
+	RequestStarsFormAndSubmit(
+		window->uiShow(),
+		MTP_inputInvoiceStarGiftPrepaidUpgrade(
+			peer->input,
+			MTP_string(giftPrepayUpgradeHash)),
+		std::move(formDone));
+}
+
 void SoldOutBox(
 		not_null<GenericBox*> box,
 		not_null<Window::SessionController*> window,
@@ -4904,15 +4945,33 @@ void UpgradeBox(
 
 	infoRow(
 		tr::lng_gift_upgrade_unique_title(),
-		tr::lng_gift_upgrade_unique_about(),
+		(args.savedId
+			? tr::lng_gift_upgrade_unique_about()
+			: (args.peer->isBroadcast()
+				? tr::lng_gift_upgrade_unique_about_channel
+				: tr::lng_gift_upgrade_unique_about_user)(
+					lt_name,
+					rpl::single(args.peer->shortName()))),
 		&st::menuIconUnique);
 	infoRow(
 		tr::lng_gift_upgrade_transferable_title(),
-		tr::lng_gift_upgrade_transferable_about(),
+		(args.savedId
+			? tr::lng_gift_upgrade_transferable_about()
+			: (args.peer->isBroadcast()
+				? tr::lng_gift_upgrade_transferable_about_channel
+				: tr::lng_gift_upgrade_transferable_about_user)(
+					lt_name,
+					rpl::single(args.peer->shortName()))),
 		&st::menuIconReplace);
 	infoRow(
 		tr::lng_gift_upgrade_tradable_title(),
-		tr::lng_gift_upgrade_tradable_about(),
+		(args.savedId
+			? tr::lng_gift_upgrade_tradable_about()
+			: (args.peer->isBroadcast()
+				? tr::lng_gift_upgrade_tradable_about_channel
+				: tr::lng_gift_upgrade_tradable_about_user)(
+					lt_name,
+					rpl::single(args.peer->shortName()))),
 		&st::menuIconTradable);
 
 	struct State {
@@ -4920,9 +4979,11 @@ void UpgradeBox(
 		bool preserveDetails = false;
 	};
 	const auto state = std::make_shared<State>();
-	const auto preview = !args.savedId;
+	const auto gifting = !args.savedId
+		&& !args.giftPrepayUpgradeHash.isEmpty();
+	const auto preview = !args.savedId && !gifting;
 
-	if (!preview) {
+	if (!preview && !gifting) {
 		const auto skip = st::defaultVerticalListSkip;
 		container->add(
 			object_ptr<PlainShadow>(container),
@@ -4946,6 +5007,9 @@ void UpgradeBox(
 	}
 
 	box->setStyle(preview ? st::giftBox : st::upgradeGiftBox);
+	if (gifting) {
+		box->setWidth(st::boxWideWidth);
+	}
 
 	const auto cost = args.cost;
 	auto buttonText = preview ? tr::lng_box_ok() : rpl::single(QString());
@@ -4969,11 +5033,18 @@ void UpgradeBox(
 				}
 			}
 		};
-		UpgradeGift(controller, args.savedId, keepDetails, cost, done);
+		if (gifting) {
+			GiftUpgrade(
+				controller,
+				args.peer,
+				args.giftPrepayUpgradeHash,
+				cost,
+				done);
+		} else {
+			UpgradeGift(controller, args.savedId, keepDetails, cost, done);
+		}
 	});
 	if (!preview) {
-		auto helper = Ui::Text::CustomEmojiHelper();
-		auto star = helper.paletteDependent(Ui::Earn::IconCreditsEmoji());
 		SetButtonMarkedLabel(
 			button,
 			(cost
@@ -4985,7 +5056,7 @@ void UpgradeBox(
 						CreditsAmount{ cost }))),
 					Ui::Text::WithEntities)
 				: tr::lng_gift_upgrade_confirm(Ui::Text::WithEntities)),
-			helper.context(),
+			{},
 			st::creditsBoxButtonLabel,
 			&st::giftBox.button.textFg);
 	}
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index 39698139c5..5f0e305f19 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -110,6 +110,7 @@ struct StarGiftUpgradeArgs {
 	Fn<void(bool)> ready;
 	not_null<PeerData*> peer;
 	Data::SavedStarGiftId savedId;
+	QString giftPrepayUpgradeHash;
 	int cost = 0;
 	bool canAddSender = false;
 	bool canAddComment = false;
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 7a82c49f93..45d1f9d9bd 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -71,6 +71,7 @@ struct CreditsHistoryEntry final {
 	uint64 bareEntryOwnerId = 0;
 	uint64 giftChannelSavedId = 0;
 	uint64 stargiftId = 0;
+	QString giftPrepayUpgradeHash;
 	std::shared_ptr<UniqueGift> uniqueGift;
 	Fn<std::vector<CreditsHistoryEntry>()> pinnedSavedGifts;
 	uint64 nextToUpgradeStickerId = 0;
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index b44707aaf9..becf3777c6 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -154,6 +154,7 @@ struct SavedStarGift {
 	TextWithEntities message;
 	int64 starsConverted = 0;
 	int64 starsUpgradedBySender = 0;
+	QString giftPrepayUpgradeHash;
 	PeerId fromId = 0;
 	TimeId date = 0;
 	bool upgradable = false;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 788456e7da..783121f7f8 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -5839,12 +5839,17 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 	auto prepareStarGift = [&](
 			const MTPDmessageActionStarGift &action) {
 		auto result = PreparedServiceText();
+		const auto upgradeGifted = action.is_prepaid_upgrade();
 		const auto isSelf = _from->isSelf();
 		const auto peer = isSelf ? _history->peer : _from;
 		const auto stars = action.vgift().match([&](
 				const MTPDstarGift &data) {
-			return uint64(data.vstars().v)
-				+ uint64(action.vupgrade_stars().value_or_empty());
+			return upgradeGifted
+				? uint64(action.vupgrade_stars().value_or_empty())
+				: action.is_upgrade_separate()
+				? uint64(data.vstars().v)
+				: (uint64(data.vstars().v)
+					+ uint64(action.vupgrade_stars().value_or_empty()));
 		}, [](const MTPDstarGiftUnique &) {
 			return uint64();
 		});
@@ -5876,30 +5881,54 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			const auto fromId = action.vfrom_id()
 				? peerFromMTP(*action.vfrom_id())
 				: PeerId();
-			const auto from = fromId ? peer->owner().peer(fromId) : peer;
+			const auto from = fromId
+				? peer->owner().peer(fromId).get()
+				: nullptr;
 			const auto channel = peer->owner().channel(
 				peerToChannel(giftPeer));
-			if (from->isSelf()) {
+			if (!from || from->isSelf()) {
 				result.links.push_back(channel->createOpenLink());
-				result.text = tr::lng_action_gift_sent_self_channel(
-					tr::now,
-					lt_name,
-					Ui::Text::Link(channel->name(), 1),
-					lt_cost,
-					cost,
-					Ui::Text::WithEntities);
+				if (upgradeGifted) {
+					result.text = tr::lng_action_gift_sent_upgrade_self_channel(
+						tr::now,
+						lt_cost,
+						cost,
+						lt_name,
+						Ui::Text::Link(channel->name(), 1),
+						Ui::Text::WithEntities);
+				} else {
+					result.text = tr::lng_action_gift_sent_self_channel(
+						tr::now,
+						lt_name,
+						Ui::Text::Link(channel->name(), 1),
+						lt_cost,
+						cost,
+						Ui::Text::WithEntities);
+				}
 			} else {
 				result.links.push_back(from->createOpenLink());
 				result.links.push_back(channel->createOpenLink());
-				result.text = tr::lng_action_gift_sent_channel(
-					tr::now,
-					lt_user,
-					Ui::Text::Link(from->shortName(), 1),
-					lt_name,
-					Ui::Text::Link(channel->name(), 2),
-					lt_cost,
-					cost,
-					Ui::Text::WithEntities);
+				if (upgradeGifted) {
+					result.text = tr::lng_action_gift_sent_upgrade_self_other(
+						tr::now,
+						lt_cost,
+						cost,
+						lt_name,
+						Ui::Text::Link(channel->name(), 2),
+						lt_user,
+						Ui::Text::Link(from->shortName(), 1),
+						Ui::Text::WithEntities);
+				} else {
+					result.text = tr::lng_action_gift_sent_channel(
+						tr::now,
+						lt_user,
+						Ui::Text::Link(from->shortName(), 1),
+						lt_name,
+						Ui::Text::Link(channel->name(), 2),
+						lt_cost,
+						cost,
+						Ui::Text::WithEntities);
+				}
 			}
 		} else if (anonymous || _history->peer->isSelf()) {
 			result.text = (anonymous
@@ -5909,6 +5938,57 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 					lt_cost,
 					cost,
 					Ui::Text::WithEntities);
+		} else if (upgradeGifted) {
+			// Who sent the gift.
+			const auto fromId = action.vfrom_id()
+				? peerFromMTP(*action.vfrom_id())
+				: PeerId();
+			const auto from = fromId
+				? peer->owner().peer(fromId).get()
+				: nullptr;
+			if (isSelf) {
+				result.links.push_back(peer->createOpenLink());
+				if (!from || from->isSelf()) {
+					result.text = tr::lng_action_gift_sent_upgrade_self(
+						tr::now,
+						lt_cost,
+						cost,
+						Ui::Text::WithEntities);
+				} else {
+					result.links.push_back(from->createOpenLink());
+					result.text = tr::lng_action_gift_sent_upgrade_self_other(
+						tr::now,
+						lt_cost,
+						cost,
+						lt_name,
+						Ui::Text::Link(peer->shortName(), 1),
+						lt_user,
+						Ui::Text::Link(from->shortName(), 2),
+						Ui::Text::WithEntities);
+				}
+			} else {
+				result.links.push_back(peer->createOpenLink());
+				if (from && from != peer && !from->isSelf()) {
+					result.links.push_back(from->createOpenLink());
+					result.text = tr::lng_action_gift_sent_upgrade_other(
+						tr::now,
+						lt_from,
+						Ui::Text::Link(peer->shortName(), 1),
+						lt_cost,
+						cost,
+						lt_user,
+						Ui::Text::Link(from->shortName(), 2),
+						Ui::Text::WithEntities);
+				} else {
+					result.text = tr::lng_action_gift_sent_upgrade(
+						tr::now,
+						lt_from,
+						Ui::Text::Link(peer->shortName(), 1),
+						lt_cost,
+						cost,
+						Ui::Text::WithEntities);
+				}
+			}
 		} else {
 			if (!isSelf) {
 				result.links.push_back(peer->createOpenLink());
@@ -5950,6 +6030,7 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			: PeerId();
 		const auto service = _from->isServiceUser();
 		const auto toChannel = service && peerIsChannel(giftPeer);
+		const auto upgradeHelped = action.is_prepaid_upgrade();
 		const auto peer = isSelf ? _history->peer : _from;
 		const auto fromId = action.vfrom_id()
 			? peerFromMTP(*action.vfrom_id())
@@ -6003,7 +6084,22 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			}
 			result.links.push_back(channel->createOpenLink());
 		} else {
-			if (!from->isServiceUser() && !_history->peer->isSelf()) {
+			if (upgradeHelped) {
+				result.links.push_back(peer->createOpenLink());
+				if (isSelf) {
+					result.text = tr::lng_action_gift_upgraded_helped_self(
+						tr::now,
+						lt_user,
+						Ui::Text::Link(peer->shortName(), 1),
+						Ui::Text::WithEntities);
+				} else {
+					result.text = tr::lng_action_gift_upgraded_helped(
+						tr::now,
+						lt_user,
+						Ui::Text::Link(peer->shortName(), 1),
+						Ui::Text::WithEntities);
+				}
+			} else if (!from->isServiceUser() && !_history->peer->isSelf()) {
 				if (!resale || !isSelf) {
 					result.links.push_back(from->createOpenLink());
 				}
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 5612c29328..d3264e2c0d 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -185,8 +185,8 @@ messageActionRequestedPeerSentMe#93b31848 button_id:int peers:Vector<RequestedPe
 messageActionPaymentRefunded#41b3e202 flags:# peer:Peer currency:string total_amount:long payload:flags.0?bytes charge:PaymentCharge = MessageAction;
 messageActionGiftStars#45d5b021 flags:# currency:string amount:long stars:long crypto_currency:flags.0?string crypto_amount:flags.0?long transaction_id:flags.1?string = MessageAction;
 messageActionPrizeStars#b00c47a2 flags:# unclaimed:flags.0?true stars:long transaction_id:string boost_peer:Peer giveaway_msg_id:int = MessageAction;
-messageActionStarGift#4717e8a4 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long = MessageAction;
-messageActionStarGiftUnique#34f762f3 flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_amount:flags.8?StarsAmount can_transfer_at:flags.9?int can_resell_at:flags.10?int = MessageAction;
+messageActionStarGift#4717e8a4 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true prepaid_upgrade:flags.13?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long = MessageAction;
+messageActionStarGiftUnique#34f762f3 flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true prepaid_upgrade:flags.11?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_amount:flags.8?StarsAmount can_transfer_at:flags.9?int can_resell_at:flags.10?int = MessageAction;
 messageActionPaidMessagesRefunded#ac1f1fcd count:int stars:long = MessageAction;
 messageActionPaidMessagesPrice#84b88578 flags:# broadcast_messages_allowed:flags.0?true stars:long = MessageAction;
 messageActionConferenceCall#2ffe2f7a flags:# missed:flags.0?true active:flags.1?true video:flags.4?true call_id:long duration:flags.2?int other_participants:flags.3?Vector<Peer> = MessageAction;
@@ -1504,6 +1504,7 @@ inputInvoiceStarGiftTransfer#4a5f5bd9 stargift:InputSavedStarGift to_id:InputPee
 inputInvoicePremiumGiftStars#dabab2ef flags:# user_id:InputUser months:int message:flags.0?TextWithEntities = InputInvoice;
 inputInvoiceBusinessBotTransferStars#f4997e42 bot:InputUser stars:long = InputInvoice;
 inputInvoiceStarGiftResale#c39f5324 flags:# ton:flags.0?true slug:string to_id:InputPeer = InputInvoice;
+inputInvoiceStarGiftPrepaidUpgrade#9a0b48b8 peer:InputPeer hash:string = InputInvoice;
 
 payments.exportedInvoice#aed0cbd9 url:string = payments.ExportedInvoice;
 
@@ -1853,7 +1854,7 @@ starsTransactionPeerAPI#f9677aad = StarsTransactionPeer;
 
 starsTopupOption#bd915c0 flags:# extended:flags.1?true stars:long store_product:flags.0?string currency:string amount:long = StarsTopupOption;
 
-starsTransaction#13659eb0 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true stargift_upgrade:flags.18?true business_transfer:flags.21?true stargift_resale:flags.22?true posts_search:flags.24?true id:string amount:StarsAmount date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift floodskip_number:flags.15?int starref_commission_permille:flags.16?int starref_peer:flags.17?Peer starref_amount:flags.17?StarsAmount paid_messages:flags.19?int premium_gift_months:flags.20?int ads_proceeds_from_date:flags.23?int ads_proceeds_to_date:flags.23?int = StarsTransaction;
+starsTransaction#13659eb0 flags:# refund:flags.3?true pending:flags.4?true failed:flags.6?true gift:flags.10?true reaction:flags.11?true stargift_upgrade:flags.18?true business_transfer:flags.21?true stargift_resale:flags.22?true posts_search:flags.24?true stargift_prepaid_upgrade:flags.25?true id:string amount:StarsAmount date:int peer:StarsTransactionPeer title:flags.0?string description:flags.1?string photo:flags.2?WebDocument transaction_date:flags.5?int transaction_url:flags.5?string bot_payload:flags.7?bytes msg_id:flags.8?int extended_media:flags.9?Vector<MessageMedia> subscription_period:flags.12?int giveaway_post_id:flags.13?int stargift:flags.14?StarGift floodskip_number:flags.15?int starref_commission_permille:flags.16?int starref_peer:flags.17?Peer starref_amount:flags.17?StarsAmount paid_messages:flags.19?int premium_gift_months:flags.20?int ads_proceeds_from_date:flags.23?int ads_proceeds_to_date:flags.23?int = StarsTransaction;
 
 payments.starsStatus#6c9ce8ed flags:# balance:StarsAmount subscriptions:flags.1?Vector<StarsSubscription> subscriptions_next_offset:flags.2?string subscriptions_missing_balance:flags.4?long history:flags.3?Vector<StarsTransaction> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.StarsStatus;
 
@@ -1941,7 +1942,7 @@ payments.uniqueStarGift#caa2f60b gift:StarGift users:Vector<User> = payments.Uni
 
 messages.webPagePreview#b53e8b21 media:MessageMedia users:Vector<User> = messages.WebPagePreview;
 
-savedStarGift#1ea646df flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int collection_id:flags.15?Vector<int> = SavedStarGift;
+savedStarGift#19a9b572 flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int collection_id:flags.15?Vector<int> prepaid_upgrade_hash:flags.16?string = SavedStarGift;
 
 payments.savedStarGifts#95f389b1 flags:# count:int chat_notifications_enabled:flags.1?Bool gifts:Vector<SavedStarGift> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.SavedStarGifts;
 
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 0d60b20c62..e1845fc39f 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1832,6 +1832,14 @@ void GenericCreditsEntryBox(
 		ToggleStarGiftSaved(show, savedId, save, done);
 	};
 
+	const auto canUpgrade = e.stargiftId
+		&& e.canUpgradeGift
+		&& (e.in || giftToSelf || giftToChannelCanManage)
+		&& !e.uniqueGift;
+	const auto canUpgradeFree = canUpgrade && (e.starsUpgradedBySender > 0);
+	const auto canGiftUpgrade = !e.uniqueGift
+		&& !e.in
+		&& !e.giftPrepayUpgradeHash.isEmpty();
 	const auto upgradeGuard = std::make_shared<bool>();
 	const auto upgrade = [=] {
 		const auto window = show->resolveWindow();
@@ -1840,7 +1848,7 @@ void GenericCreditsEntryBox(
 		}
 		*upgradeGuard = true;
 		const auto savedId = EntryToSavedStarGiftId(&window->session(), e);
-		const auto openWhenDone = giftToChannel
+		const auto openWhenDone = (giftToChannel || canGiftUpgrade)
 			? window->session().data().peer(PeerId(e.bareGiftOwnerId)).get()
 			: starGiftSender;
 		using namespace Ui;
@@ -1850,6 +1858,7 @@ void GenericCreditsEntryBox(
 			.ready = [=](bool) { *upgradeGuard = false; },
 			.peer = openWhenDone,
 			.savedId = savedId,
+			.giftPrepayUpgradeHash = e.giftPrepayUpgradeHash,
 			.cost = e.starsUpgradedBySender ? 0 : e.starsToUpgrade,
 			.canAddSender = !giftToSelf && !e.anonymous,
 			.canAddComment = (!giftToSelf
@@ -1860,11 +1869,6 @@ void GenericCreditsEntryBox(
 				|| (e.starsUpgradedBySender && !e.anonymous)),
 		});
 	};
-	const auto canUpgrade = e.stargiftId
-		&& e.canUpgradeGift
-		&& (e.in || giftToSelf || giftToChannelCanManage)
-		&& !e.uniqueGift;
-	const auto canUpgradeFree = canUpgrade && (e.starsUpgradedBySender > 0);
 
 	if (isStarGift && e.id.isEmpty()) {
 		const auto convert = [=, weak = base::make_weak(box)] {
@@ -2097,6 +2101,8 @@ void GenericCreditsEntryBox(
 			? tr::lng_gift_upgrade_free()
 			: canUpgrade
 			? tr::lng_gift_unique_upgrade()
+			: canGiftUpgrade
+			? tr::lng_gift_unique_gift_upgrade()
 			: (canToggle && !e.savedToProfile)
 			? (e.giftChannelSavedId
 				? tr::lng_gift_show_on_channel
@@ -2169,7 +2175,7 @@ void GenericCreditsEntryBox(
 				e.giftResaleForceTon,
 				to,
 				crl::guard(box, [=] { box->closeBox(); }));
-		} else if (canUpgrade) {
+		} else if (canUpgrade || canGiftUpgrade) {
 			upgrade();
 		} else if (canToggle && !e.savedToProfile) {
 			toggleVisibility(true);
@@ -2348,6 +2354,7 @@ Data::CreditsHistoryEntry SavedStarGiftEntry(
 		.bareEntryOwnerId = chatGiftPeer ? chatGiftPeer->id.value : 0,
 		.giftChannelSavedId = data.manageId.chatSavedId(),
 		.stargiftId = data.info.id,
+		.giftPrepayUpgradeHash = data.giftPrepayUpgradeHash,
 		.uniqueGift = data.info.unique,
 		.peerType = Data::CreditsHistoryEntry::PeerType::Peer,
 		.limitedCount = data.info.limitedCount,

From 2834a83eec5a3be7027b70160002c8c6a1dee0c1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 11 Aug 2025 10:37:42 +0400
Subject: [PATCH 260/341] Update API scheme on layer 212.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index d3264e2c0d..1e89dce893 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -185,7 +185,7 @@ messageActionRequestedPeerSentMe#93b31848 button_id:int peers:Vector<RequestedPe
 messageActionPaymentRefunded#41b3e202 flags:# peer:Peer currency:string total_amount:long payload:flags.0?bytes charge:PaymentCharge = MessageAction;
 messageActionGiftStars#45d5b021 flags:# currency:string amount:long stars:long crypto_currency:flags.0?string crypto_amount:flags.0?long transaction_id:flags.1?string = MessageAction;
 messageActionPrizeStars#b00c47a2 flags:# unclaimed:flags.0?true stars:long transaction_id:string boost_peer:Peer giveaway_msg_id:int = MessageAction;
-messageActionStarGift#4717e8a4 flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true prepaid_upgrade:flags.13?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long = MessageAction;
+messageActionStarGift#f24de7fa flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true prepaid_upgrade:flags.13?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long prepaid_upgrade_hash:flags.14?string gift_msg_id:flags.15?int = MessageAction;
 messageActionStarGiftUnique#34f762f3 flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true prepaid_upgrade:flags.11?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_amount:flags.8?StarsAmount can_transfer_at:flags.9?int can_resell_at:flags.10?int = MessageAction;
 messageActionPaidMessagesRefunded#ac1f1fcd count:int stars:long = MessageAction;
 messageActionPaidMessagesPrice#84b88578 flags:# broadcast_messages_allowed:flags.0?true stars:long = MessageAction;
@@ -1893,7 +1893,7 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
 starGift#bcff5b flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int = StarGift;
-starGiftUnique#3a274d50 flags:# require_premium:flags.6?true resale_ton_only:flags.7?true id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer = StarGift;
+starGiftUnique#26a5553e flags:# require_premium:flags.6?true resale_ton_only:flags.7?true id:long gift_id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer value_amount:flags.8?long value_currency:flags.8?string = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
 payments.starGifts#2ed82995 hash:int gifts:Vector<StarGift> chats:Vector<Chat> users:Vector<User> = payments.StarGifts;
@@ -2005,6 +2005,8 @@ stories.albums#c3987a3a hash:long albums:Vector<StoryAlbum> = stories.Albums;
 
 searchPostsFlood#3e0b5b6a flags:# query_is_free:flags.0?true total_daily:int remains:int wait_till:flags.1?int stars_amount:long = SearchPostsFlood;
 
+payments.uniqueStarGiftValueInfo#512fe446 flags:# last_sale_on_fragment:flags.1?true value_is_average:flags.6?true currency:string value:long initial_sale_date:int initial_sale_stars:long initial_sale_price:long last_sale_date:flags.0?int last_sale_price:flags.0?long floor_price:flags.2?long average_price:flags.3?long listed_count:flags.4?int fragment_listed_count:flags.5?int fragment_listed_url:flags.5?string = payments.UniqueStarGiftValueInfo;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2620,6 +2622,7 @@ payments.updateStarGiftCollection#4fddbee7 flags:# peer:InputPeer collection_id:
 payments.reorderStarGiftCollections#c32af4cc peer:InputPeer order:Vector<int> = Bool;
 payments.deleteStarGiftCollection#ad5648e8 peer:InputPeer collection_id:int = Bool;
 payments.getStarGiftCollections#981b91dd peer:InputPeer hash:long = payments.StarGiftCollections;
+payments.getUniqueStarGiftValueInfo#4365af6b slug:string = payments.UniqueStarGiftValueInfo;
 
 stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true emojis:flags.5?true text_color:flags.6?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
 stickers.removeStickerFromSet#f7760f51 sticker:InputDocument = messages.StickerSet;

From 9f5d24bbc91ca207c0b01fb59762f67c4698f027 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Aug 2025 09:30:36 +0400
Subject: [PATCH 261/341] Start gift value information display.

---
 Telegram/Resources/langs/lang.strings         |  17 ++
 Telegram/SourceFiles/api/api_premium.cpp      |   9 +
 .../SourceFiles/boxes/gift_premium_box.cpp    | 230 +++++++++++++++++-
 Telegram/SourceFiles/boxes/gift_premium_box.h |   6 +
 Telegram/SourceFiles/data/data_credits.h      |   1 +
 Telegram/SourceFiles/data/data_star_gift.h    |  17 ++
 .../dialogs/ui/posts_search_intro.cpp         |   2 +-
 .../settings/settings_credits_graphics.cpp    | 148 ++++++++++-
 .../settings/settings_credits_graphics.h      |   5 +
 .../ui/boxes/edit_birthday_box.cpp            |   2 +-
 Telegram/SourceFiles/ui/effects/credits.style |  12 +
 11 files changed, 429 insertions(+), 20 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2374510777..ade5b22f81 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3675,6 +3675,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_unique_availability_label" = "Quantity";
 "lng_gift_unique_availability#one" = "{count} of {amount} issued";
 "lng_gift_unique_availability#other" = "{count} of {amount} issued";
+"lng_gift_unique_value" = "Value";
+"lng_gift_unique_value_learn_more" = "learn more";
 "lng_gift_unique_info" = "Gifted to {recipient} on {date}.";
 "lng_gift_unique_info_sender" = "Gifted by {from} to {recipient} on {date}.";
 "lng_gift_unique_info_sender_comment" = "Gifted by {from} to {recipient} on {date} with the comment \"{text}\".";
@@ -3683,6 +3685,21 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_availability_left#one" = "{count} of {amount} left";
 "lng_gift_availability_left#other" = "{count} of {amount} left";
 "lng_gift_availability_none" = "None of {amount} left";
+"lng_gift_value_about_average" = "This is the average sale price of {gift} gifts on Telegram and Fragment over the past month.";
+"lng_gift_value_about_last" = "This is the price at which {gift} was last sold on {platform}.";
+"lng_gift_value_initial_sale" = "Initial Sale";
+"lng_gift_value_initial_price" = "Initial Price";
+"lng_gift_value_initial_price_value" = "{stars} ({amount})";
+"lng_gift_value_last_sale" = "Last Sale";
+"lng_gift_value_last_price" = "Last Price";
+"lng_gift_value_minimum_price" = "Minimum Price";
+"lng_gift_value_minimum_price_tooltip" = "{amount} is the floor price for {gift} gifts listed on Telegram and Fragment.";
+"lng_gift_vlaue_average_price" = "Average Price";
+"lng_gift_value_average_price_tooltip" = "{amount} is the average sale price of {gift} gifts on Telegram and Fragment over the past month.";
+"lng_gift_value_availability#one" = "{count} {emoji} for sale on {platform} {arrow}";
+"lng_gift_value_availability#other" = "{count} {emoji} for sale on {platform} {arrow}";
+"lng_gift_value_telegram" = "Telegram";
+"lng_gift_value_fragment" = "Fragment";
 "lng_gift_convert_to_stars#one" = "Convert to {count} Star";
 "lng_gift_convert_to_stars#other" = "Convert to {count} Stars";
 "lng_gift_convert_sure_title" = "Convert Gift to Stars";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 309f20261c..49109afebe 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -911,6 +911,15 @@ std::optional<Data::StarGift> FromTL(
 				.onlyAcceptTon = data.is_resale_ton_only(),
 				.model = *model,
 				.pattern = *pattern,
+				.value = (data.vvalue_amount()
+					? std::make_shared<Data::UniqueGiftValue>(
+						Data::UniqueGiftValue{
+							.currency = qs(
+								data.vvalue_currency().value_or_empty()),
+							.valuePrice = int64(
+								data.vvalue_amount().value_or_empty()),
+						})
+					: nullptr),
 			}),
 			.document = model->document,
 			.releasedBy = releasedBy,
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index f4567e7961..71ee3719c2 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -31,6 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "data/stickers/data_custom_emoji.h"
 #include "info/channel_statistics/boosts/giveaway/boost_badge.h" // InfiniteRadialAnimationWidget.
+#include "info/channel_statistics/earn/earn_icons.h"
 #include "info/profile/info_profile_badge.h"
 #include "info/profile/info_profile_values.h"
 #include "lang/lang_keys.h"
@@ -54,6 +55,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/rect.h"
 #include "ui/ui_utility.h"
 #include "ui/vertical_list.h"
+#include "ui/text/custom_emoji_helper.h"
+#include "ui/text/format_values.h"
 #include "ui/text/text_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/checkbox.h"
@@ -110,6 +113,33 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 	};
 }
 
+[[nodiscard]] TextWithEntities FormatValuePrice(
+		int64 price,
+		QString currency,
+		bool approximately = false) {
+	auto result = TextWithEntities();
+	if (approximately) {
+		result.append('~');
+	}
+	return result.append(Ui::FillAmountAndCurrency(price, currency));
+}
+
+[[nodiscard]] TextWithEntities FormatValueDate(TimeId date) {
+	const auto parsed = base::unixtime::parse(date).date();
+	const auto day = parsed.day();
+	const auto month = parsed.month();
+	const auto year = parsed.year();
+	return { tr::lng_month_day_year(
+			tr::now,
+			lt_month,
+			Lang::MonthDay(month)(tr::now),
+			lt_day,
+			QString::number(day),
+			lt_year,
+			QString::number(year))
+	};
+}
+
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeLinkCopyIcon(
 		not_null<QWidget*> parent) {
 	auto result = object_ptr<Ui::RpWidget>(parent);
@@ -465,21 +495,75 @@ void AddTableRow(
 	return result;
 }
 
-[[nodiscard]] object_ptr<Ui::RpWidget> MakeNonUniqueStatusTableValue(
-		not_null<Ui::TableLayout*> table) {
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeUniqueGiftValueValue(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &entry,
+		Settings::CreditsEntryBoxStyleOverrides st) {
 	auto result = object_ptr<Ui::RpWidget>(table);
 	const auto raw = result.data();
 
+	const auto unique = entry.uniqueGift;
+	const auto value = unique ? unique->value : nullptr;
+	const auto loading = std::make_shared<bool>(false);
+
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
 		raw,
-		tr::lng_gift_unique_status_non(),
+		rpl::single(
+			FormatValuePrice(value->valuePrice, value->currency, true)),
 		table->st().defaultValue,
 		st::defaultPopupMenu);
 
-	raw->widthValue(
-	) | rpl::start_with_next([=](int width) {
-		label->resizeToNaturalWidth(width);
+	const auto learn = Ui::CreateChild<Ui::RoundButton>(
+		raw,
+		tr::lng_gift_unique_value_learn_more(),
+		table->st().smallButton);
+	learn->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	learn->setClickedCallback([=] {
+		if (value->initialPriceStars) {
+			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
+		} else if (*loading) {
+			return;
+		}
+		*loading = true;
+		show->session().api().request(MTPpayments_GetUniqueStarGiftValueInfo(
+			MTP_string(unique->slug)
+		)).done([=](const MTPpayments_UniqueStarGiftValueInfo &result) {
+			*loading = false;
+
+			const auto &data = result.data();
+			value->currency = qs(data.vcurrency());
+			value->valuePrice = data.vvalue().v;
+			value->initialSaleDate = data.vinitial_sale_date().v;
+			value->initialPriceStars = CreditsAmount(
+				data.vinitial_sale_stars().v);
+			value->initialSalePrice = data.vinitial_sale_price().v;
+			value->lastSaleDate = data.vlast_sale_date().value_or_empty();
+			value->lastSalePrice = data.vlast_sale_price().value_or_empty();
+			value->lastSaleFragment = data.is_last_sale_on_fragment();
+			value->minimumPrice = data.vfloor_price().value_or_empty();
+			value->averagePrice = data.vaverage_price().value_or_empty();
+			value->forSaleOnTelegram = data.vlisted_count().value_or_empty();
+			value->forSaleOnFragment = int(
+				data.vfragment_listed_count().value_or_empty());
+			value->fragmentUrl = qs(
+				data.vfragment_listed_url().value_or_empty());
+
+			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
+		}).send();
+	});
+	rpl::combine(
+		raw->widthValue(),
+		learn->widthValue()
+	) | rpl::start_with_next([=](int width, int learnWidth) {
+		const auto learnSkip = st::normalFont->spacew + learnWidth;
+		label->resizeToNaturalWidth(width - learnSkip);
 		label->moveToLeft(0, 0, width);
+		learn->moveToLeft(
+			rect::right(label) + st::normalFont->spacew,
+			(table->st().defaultValue.style.font->ascent
+				- table->st().smallButton.style.font->ascent),
+			width);
 	}, label->lifetime());
 
 	label->heightValue() | rpl::start_with_next([=](int height) {
@@ -1484,10 +1568,16 @@ void AddStarGiftTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_status(),
-			MakeNonUniqueStatusTableValue(table),
-			marginWithButton);
+			tr::lng_gift_unique_status_non(Ui::Text::WithEntities));
 	}
 	if (unique) {
+		if (unique->value) {
+			AddTableRow(
+				table,
+				tr::lng_gift_unique_value(),
+				MakeUniqueGiftValueValue(table, show, entry, st),
+				marginWithButton);
+		}
 		const auto &original = unique->originalDetails;
 		if (original.recipientId) {
 			const auto owner = &show->session().data();
@@ -1973,3 +2063,127 @@ void AddChannelEarnTable(
 			st::giveawayGiftCodeValueMargin);
 	}
 }
+
+void AddUniqueGiftValueTable(
+		std::shared_ptr<ChatHelpers::Show> show,
+		not_null<Ui::VerticalLayout*> container,
+		Settings::CreditsEntryBoxStyleOverrides st,
+		const Data::CreditsHistoryEntry &entry) {
+	const auto value = entry.uniqueGift ? entry.uniqueGift->value : nullptr;
+	auto table = container->add(
+		object_ptr<Ui::TableLayout>(
+			container,
+			st.table ? *st.table : st::giveawayGiftCodeTable),
+		st::giveawayGiftCodeTableMargin);
+	const auto raw = std::make_shared<Ui::ImportantTooltip*>(nullptr);
+	const auto showTooltip = [=](
+			not_null<Ui::RpWidget*> widget,
+			rpl::producer<TextWithEntities> text) {
+		if (*raw) {
+			(*raw)->toggleAnimated(false);
+		}
+		const auto tooltip = Ui::CreateChild<Ui::ImportantTooltip>(
+			container,
+			Ui::MakeNiceTooltipLabel(
+				container,
+				std::move(text),
+				st::boxWideWidth,
+				st::defaultImportantTooltipLabel),
+			st::defaultImportantTooltip);
+		tooltip->toggleFast(false);
+
+		const auto update = [=] {
+			const auto geometry = Ui::MapFrom(
+				container,
+				widget,
+				widget->rect());
+			const auto countPosition = [=](QSize size) {
+				const auto left = geometry.x()
+					+ (geometry.width() - size.width()) / 2;
+				const auto right = container->width()
+					- st::normalFont->spacew;
+				return QPoint(
+					std::max(std::min(left, right - size.width()), 0),
+					geometry.y() - size.height() - st::normalFont->descent);
+			};
+			tooltip->pointAt(geometry, RectPart::Top, countPosition);
+		};
+		container->widthValue(
+		) | rpl::start_with_next(update, tooltip->lifetime());
+
+		update();
+		tooltip->toggleAnimated(true);
+
+		*raw = tooltip;
+		tooltip->shownValue() | rpl::filter(
+			!rpl::mappers::_1
+		) | rpl::start_with_next([=] {
+			crl::on_main(tooltip, [=] {
+				if (tooltip->isHidden()) {
+					if (*raw == tooltip) {
+						*raw = nullptr;
+					}
+					delete tooltip;
+				}
+			});
+		}, tooltip->lifetime());
+
+		base::timer_once(
+			kRarityTooltipDuration
+		) | rpl::start_with_next([=] {
+			tooltip->toggleAnimated(false);
+		}, tooltip->lifetime());
+	};
+
+	if (value->initialSaleDate) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_initial_sale(),
+			rpl::single(FormatValueDate(value->initialSaleDate)));
+	}
+	auto helper = Ui::Text::CustomEmojiHelper();
+	auto starIcon = helper.paletteDependent(
+		Ui::Earn::IconCreditsEmoji());
+	AddTableRow(
+		table,
+		tr::lng_gift_value_initial_price(),
+		tr::lng_gift_value_initial_price_value(
+			lt_stars,
+			rpl::single(starIcon.append(
+				Lang::FormatCreditsAmountDecimal(value->initialPriceStars)
+			)),
+			lt_amount,
+			rpl::single(FormatValuePrice(
+				value->initialSalePrice,
+				value->currency,
+				true)),
+			Ui::Text::WithEntities),
+		helper.context());
+	if (value->lastSaleDate) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_last_sale(),
+			rpl::single(FormatValueDate(value->lastSaleDate)));
+	}
+	if (value->lastSalePrice) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_last_price(),
+			rpl::single(
+				FormatValuePrice(value->lastSalePrice, value->currency)));
+	}
+	if (value->minimumPrice) {
+		AddTableRow(
+			table,
+			tr::lng_gift_value_minimum_price(),
+			rpl::single(
+				FormatValuePrice(value->minimumPrice, value->currency)));
+	}
+	if (value->averagePrice) {
+		AddTableRow(
+			table,
+			tr::lng_gift_vlaue_average_price(),
+			rpl::single(
+				FormatValuePrice(value->averagePrice, value->currency)));
+	}
+}
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.h b/Telegram/SourceFiles/boxes/gift_premium_box.h
index df0c17c1c1..a46bf92c64 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.h
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.h
@@ -106,3 +106,9 @@ void AddChannelEarnTable(
 	std::shared_ptr<Ui::Show> show,
 	not_null<Ui::VerticalLayout*> container,
 	const Data::CreditsHistoryEntry &entry);
+
+void AddUniqueGiftValueTable(
+	std::shared_ptr<ChatHelpers::Show> show,
+	not_null<Ui::VerticalLayout*> container,
+	Settings::CreditsEntryBoxStyleOverrides st,
+	const Data::CreditsHistoryEntry &entry);
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 45d1f9d9bd..1cf1670408 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Data {
 
 struct UniqueGift;
+struct UniqueGiftValue;
 
 struct CreditTopupOption final {
 	uint64 credits = 0;
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index becf3777c6..bf6b02bcb8 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -37,6 +37,22 @@ struct UniqueGiftOriginalDetails {
 	TextWithEntities message;
 };
 
+struct UniqueGiftValue {
+	QString currency;
+	int64 valuePrice = 0;
+	CreditsAmount initialPriceStars;
+	int64 initialSalePrice = 0;
+	TimeId initialSaleDate = 0;
+	int64 lastSalePrice = 0;
+	TimeId lastSaleDate = 0;
+	int64 averagePrice = 0;
+	int64 minimumPrice = 0;
+	int forSaleOnTelegram = 0;
+	int forSaleOnFragment = 0;
+	QString fragmentUrl;
+	bool lastSaleFragment = false;
+};
+
 struct UniqueGift {
 	CollectibleId id = 0;
 	QString slug;
@@ -57,6 +73,7 @@ struct UniqueGift {
 	UniqueGiftPattern pattern;
 	UniqueGiftBackdrop backdrop;
 	UniqueGiftOriginalDetails originalDetails;
+	std::shared_ptr<UniqueGiftValue> value;
 };
 
 [[nodiscard]] QString UniqueGiftName(const UniqueGift &gift);
diff --git a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
index 3ad1f3662e..87bda8fe71 100644
--- a/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
+++ b/Telegram/SourceFiles/dialogs/ui/posts_search_intro.cpp
@@ -199,7 +199,7 @@ void PostsSearchIntro::setup() {
 
 	_state.value(
 	) | rpl::start_with_next([=](const PostsSearchIntroState &state) {
-		if (state.query.trimmed().isEmpty()) {
+		if (state.query.trimmed().isEmpty() && !state.needsPremium) {
 			_button->resize(_button->width(), 0);
 			_content->resizeToWidth(width());
 			return;
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index e1845fc39f..cb71bf5a10 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2087,9 +2087,6 @@ void GenericCreditsEntryBox(
 	const auto toRejoin = (s.cancelled || s.expired)
 		&& rejoinBySlug
 		&& !s.cancelledByBot;
-	//const auto suggestUpgradeNext = uniqueGift
-	//	&& canToggle
-	//	&& e.savedToProfile;
 	auto confirmText = rpl::conditional(
 		state->confirmButtonBusy.value(),
 		rpl::single(QString()),
@@ -2236,14 +2233,145 @@ void GenericCreditsEntryBox(
 		AddChildToWidgetCenter(button, loadingAnimation);
 		loadingAnimation->showOn(state->confirmButtonBusy.value());
 	}
-	const auto buttonWidth = st::boxWideWidth
-		- rect::m::sum::h(st::giveawayGiftCodeBox.buttonPadding);
+}
 
-	button->widthValue() | rpl::filter([=] {
-		return (button->widthNoMargins() != buttonWidth);
-	}) | rpl::start_with_next([=] {
-		button->resizeToWidth(buttonWidth);
-	}, button->lifetime());
+void UniqueGiftValueBox(
+		not_null<Ui::GenericBox*> box,
+		std::shared_ptr<ChatHelpers::Show> show,
+		const Data::CreditsHistoryEntry &e,
+		CreditsEntryBoxStyleOverrides st) {
+	box->setStyle(st.box ? *st.box : st::giveawayGiftCodeBox);
+	box->setWidth(st::boxWideWidth);
+	box->setNoContentMargin(true);
+
+	const auto unique = e.uniqueGift;
+	const auto value = unique ? unique->value : nullptr;
+	Assert(unique && value);
+
+	const auto showLastPrice = (value->lastSalePrice > value->averagePrice);
+
+	const auto content = box->verticalLayout();
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	struct State final {
+		DocumentData *sticker = nullptr;
+		std::shared_ptr<Data::DocumentMedia> media;
+		std::unique_ptr<Lottie::SinglePlayer> lottie;
+		rpl::lifetime downloadLifetime;
+	};
+	Ui::AddSkip(content, st::creditsHistoryEntryStarGiftSpace);
+
+	const auto icon = Ui::CreateChild<Ui::RpWidget>(content);
+	icon->resize(Size(st::creditsHistoryEntryStarGiftSize));
+	const auto state = icon->lifetime().make_state<State>();
+	const auto document = unique->model.document;
+	if (document && document->sticker()) {
+		const auto origin = document->stickerOrGifOrigin();
+		state->sticker = document;
+		state->media = document->createMediaView();
+		state->media->thumbnailWanted(origin);
+		state->media->automaticLoad(origin, nullptr);
+		rpl::single() | rpl::then(
+			document->session().downloaderTaskFinished()
+		) | rpl::filter([=] {
+			return state->media->loaded();
+		}) | rpl::start_with_next([=] {
+			state->lottie = ChatHelpers::LottiePlayerFromDocument(
+				state->media.get(),
+				ChatHelpers::StickerLottieSize::MessageHistory,
+				icon->size(),
+				Lottie::Quality::High);
+			state->lottie->updates() | rpl::start_with_next([=] {
+				icon->update();
+			}, icon->lifetime());
+			state->downloadLifetime.destroy();
+		}, state->downloadLifetime);
+	}
+	icon->paintRequest(
+	) | rpl::start_with_next([=] {
+		auto p = Painter(icon);
+		const auto &lottie = state->lottie;
+		const auto factor = style::DevicePixelRatio();
+		const auto request = Lottie::FrameRequest{
+			.box = icon->size() * factor,
+		};
+		const auto frame = (lottie && lottie->ready())
+			? lottie->frameInfo(request)
+			: Lottie::Animation::FrameInfo();
+		if (!frame.image.isNull()) {
+			p.drawImage(
+				QRect(QPoint(), frame.image.size() / factor),
+				frame.image);
+			if (lottie->frameIndex() < lottie->framesCount() - 1) {
+				lottie->markFrameShown();
+			}
+		}
+	}, icon->lifetime());
+	content->sizeValue(
+	) | rpl::start_with_next([=](const QSize &size) {
+		icon->move(
+			(size.width() - icon->width()) / 2,
+			st::creditsHistoryEntryStarGiftSkip);
+	}, icon->lifetime());
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	const auto bubble = box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			rpl::single(
+				Ui::FillAmountAndCurrency(value->valuePrice, value->currency)),
+			st::uniqueGiftValuePrice),
+		style::al_top);
+	bubble->paintRequest() | rpl::start_with_next([=] {
+		auto p = QPainter(bubble);
+		auto hq = PainterHighQualityEnabler(p);
+		p.setBrush(st::windowBgActive);
+		p.setPen(Qt::NoPen);
+		const auto rect = bubble->rect();
+		const auto radius = std::min(rect.width(), rect.height()) / 2.;
+		p.drawRoundedRect(rect, radius, radius);
+	}, bubble->lifetime());
+
+	Ui::AddSkip(content);
+
+	const auto arrow = Ui::Text::IconEmoji(&st::textMoreIconEmoji);
+	Ui::AddSkip(content);
+	box->addRow(
+		object_ptr<Ui::FlatLabel>(
+			box,
+			(showLastPrice
+				? tr::lng_gift_value_about_last(
+					lt_gift,
+					rpl::single(Ui::Text::Bold(
+						Data::UniqueGiftName(*unique))),
+					lt_platform,
+					(value->lastSaleFragment
+						? tr::lng_gift_value_fragment
+						: tr::lng_gift_value_telegram)(
+							Ui::Text::WithEntities),
+					Ui::Text::RichLangValue)
+				: tr::lng_gift_value_about_average(
+					lt_gift,
+					rpl::single(Ui::Text::Bold(unique->title)),
+					Ui::Text::RichLangValue)),
+			st::uniqueGiftValueAbout)
+	)->setTryMakeSimilarLines(true);
+
+	Ui::AddSkip(content);
+	Ui::AddSkip(content);
+
+	AddUniqueGiftValueTable(show, content, st, e);
+
+	Ui::AddSkip(content);
+
+	box->addButton(tr::lng_box_ok(), [=] {
+		box->closeBox();
+	});
 }
 
 void ReceiptCreditsBox(
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index 46c408c5af..db7cdbe066 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -135,6 +135,11 @@ void GenericCreditsEntryBox(
 	const Data::CreditsHistoryEntry &e,
 	const Data::SubscriptionEntry &s,
 	CreditsEntryBoxStyleOverrides st = {});
+void UniqueGiftValueBox(
+	not_null<Ui::GenericBox*> box,
+	std::shared_ptr<ChatHelpers::Show> show,
+	const Data::CreditsHistoryEntry &e,
+	CreditsEntryBoxStyleOverrides st = {});
 void ReceiptCreditsBox(
 	not_null<Ui::GenericBox*> box,
 	not_null<Window::SessionController*> controller,
diff --git a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
index 94d63e6fe6..e217bb1a19 100644
--- a/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
+++ b/Telegram/SourceFiles/ui/boxes/edit_birthday_box.cpp
@@ -161,7 +161,7 @@ void EditBirthdayBox(
 		const auto daysCount = (year == maxYear && month == max.month())
 			? max.day()
 			: (month == 2)
-			? ((!year || ((year % 4) && (!(year % 100) || (year % 400))))
+			? ((!year || (!(year % 4) && ((year % 100) || !(year % 400))))
 				? 29
 				: 28)
 			: ((month == 4) || (month == 6) || (month == 9) || (month == 11))
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 1dcc081231..3dc7336307 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -359,3 +359,15 @@ resaleConfirmTonOnly: FlatLabel(boxLabel) {
 	textFg: windowSubTextFg;
 }
 resaleConfirmTonOnlyMargin: margins(0px, 12px, 0px, 12px);
+
+uniqueGiftValuePrice: FlatLabel(defaultFlatLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(20px semibold);
+	}
+	margin: margins(12px, 6px, 12px, 6px);
+	textFg: windowFgActive;
+}
+uniqueGiftValueAbout: FlatLabel(defaultFlatLabel) {
+	minWidth: 128px;
+	align: align(top);
+}

From 700797789136eb0426ddf28282f765c7902de06b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 11:30:45 +0400
Subject: [PATCH 262/341] Reuse some table values in gift table.

---
 .../SourceFiles/boxes/gift_premium_box.cpp    | 303 +++++++-----------
 1 file changed, 116 insertions(+), 187 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 71ee3719c2..53dbe0bddb 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -186,6 +186,49 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 			: st::giveawayGiftCodeValueMultiline));
 }
 
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeValueWithSmallButton(
+		not_null<Ui::TableLayout*> table,
+		not_null<Ui::RpWidget*> value,
+		rpl::producer<QString> buttonText,
+		Fn<void(not_null<Ui::RpWidget*> button)> handler,
+		int topSkip = 0) {
+	auto result = object_ptr<Ui::RpWidget>(table);
+	const auto raw = result.data();
+
+	value->setParent(raw);
+	value->show();
+
+	const auto button = Ui::CreateChild<Ui::RoundButton>(
+		raw,
+		std::move(buttonText),
+		table->st().smallButton);
+	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
+	button->setClickedCallback([button, handler = std::move(handler)] {
+		handler(button);
+	});
+	rpl::combine(
+		raw->widthValue(),
+		button->widthValue(),
+		value->naturalWidthValue()
+	) | rpl::start_with_next([=](int width, int buttonWidth, int) {
+		const auto buttonSkip = st::normalFont->spacew + buttonWidth;
+		value->resizeToNaturalWidth(width - buttonSkip);
+		value->moveToLeft(0, 0, width);
+		button->moveToLeft(
+			rect::right(value) + st::normalFont->spacew,
+			(topSkip
+				+ (table->st().defaultValue.style.font->ascent
+					- table->st().smallButton.style.font->ascent)),
+			width);
+	}, value->lifetime());
+
+	value->heightValue() | rpl::start_with_next([=](int height) {
+		raw->resize(raw->width(), height);
+	}, raw->lifetime());
+
+	return result;
+}
+
 [[nodiscard]] object_ptr<Ui::RpWidget> MakePeerTableValue(
 		not_null<Ui::TableLayout*> table,
 		std::shared_ptr<ChatHelpers::Show> show,
@@ -204,38 +247,18 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 		raw,
 		(button && handler) ? peer->shortName() : peer->name(),
 		table->st().defaultValue);
-	const auto send = (button && handler)
-		? Ui::CreateChild<Ui::RoundButton>(
-			raw,
-			std::move(button),
-			table->st().smallButton)
-		: nullptr;
-	if (send) {
-		send->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-		send->setClickedCallback(std::move(handler));
-	}
-	rpl::combine(
-		raw->widthValue(),
-		send ? send->widthValue() : rpl::single(0)
-	) | rpl::start_with_next([=](int width, int sendWidth) {
+
+	raw->widthValue() | rpl::start_with_next([=](int width) {
 		const auto position = st::giveawayGiftCodeNamePosition;
-		const auto sendSkip = sendWidth
-			? (st::normalFont->spacew + sendWidth)
-			: 0;
-		label->resizeToNaturalWidth(width - position.x() - sendSkip);
+		label->resizeToNaturalWidth(width - position.x());
 		label->moveToLeft(position.x(), position.y(), width);
 		const auto top = (raw->height() - userpic->height()) / 2;
 		userpic->moveToLeft(0, top, width);
-		if (send) {
-			send->moveToLeft(
-				position.x() + label->width() + st::normalFont->spacew,
-				(position.y()
-					+ table->st().defaultValue.style.font->ascent
-					- table->st().smallButton.style.font->ascent),
-				width);
-		}
 	}, label->lifetime());
 
+	label->naturalWidthValue() | rpl::start_with_next([=](int width) {
+		raw->setNaturalWidth(st::giveawayGiftCodeNamePosition.x() + width);
+	}, label->lifetime());
 	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 	label->setTextColorOverride(table->st().defaultValue.palette.linkFg->c);
@@ -244,7 +267,15 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 		show->showBox(PrepareShortInfoBox(peer, show));
 	});
 
-	return result;
+	if (!button || !handler) {
+		return result;
+	}
+	return MakeValueWithSmallButton(
+		table,
+		result.release(),
+		std::move(button),
+		[=](not_null<Ui::RpWidget*> button) { handler(); },
+		st::giveawayGiftCodeNamePosition.y());
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakePeerWithStatusValue(
@@ -252,24 +283,21 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 		std::shared_ptr<ChatHelpers::Show> show,
 		PeerId id,
 		Fn<void(not_null<Ui::RpWidget*>, EmojiStatusId)> pushStatusId) {
-	auto result = object_ptr<Ui::AbstractButton>(table);
+	auto result = object_ptr<Ui::RpWidget>(table);
 	const auto raw = result.data();
 
-	const auto &st = st::giveawayGiftCodeUserpic;
-	raw->resize(raw->width(), st.photoSize);
+	const auto peerLabel = MakePeerTableValue(table, show, id).release();
+	peerLabel->setParent(raw);
+	peerLabel->show();
 
-	const auto peer = show->session().data().peer(id);
-	const auto userpic = Ui::CreateChild<Ui::UserpicButton>(raw, peer, st);
-	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
-		peer->name(),
-		table->st().defaultValue);
+	raw->resize(raw->width(), peerLabel->height());
 
 	using namespace Info::Profile;
 	struct State {
 		rpl::variable<Badge::Content> content;
 	};
-	const auto state = label->lifetime().make_state<State>();
+	const auto peer = show->session().data().peer(id);
+	const auto state = peerLabel->lifetime().make_state<State>();
 	state->content = EmojiStatusIdValue(
 		peer
 	) | rpl::map([=](EmojiStatusId emojiStatusId) {
@@ -282,7 +310,7 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 			.emojiStatusId = emojiStatusId,
 		};
 	});
-	const auto badge = label->lifetime().make_state<Badge>(
+	const auto badge = peerLabel->lifetime().make_state<Badge>(
 		raw,
 		st::infoPeerBadge,
 		&peer->session(),
@@ -300,32 +328,19 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 		raw->widthValue(),
 		rpl::single(rpl::empty) | rpl::then(badge->updated())
 	) | rpl::start_with_next([=](int width, const auto &) {
-		const auto position = st::giveawayGiftCodeNamePosition;
 		const auto badgeWidget = badge->widget();
 		const auto badgeSkip = badgeWidget
 			? (st::normalFont->spacew + badgeWidget->width())
 			: 0;
-		label->resizeToNaturalWidth(width - position.x() - badgeSkip);
-		label->moveToLeft(position.x(), position.y(), width);
-		const auto top = (raw->height() - userpic->height()) / 2;
-		userpic->moveToLeft(0, top, width);
+		peerLabel->resizeToNaturalWidth(width - badgeSkip);
+		peerLabel->moveToLeft(0, 0, width);
 		if (badgeWidget) {
 			badgeWidget->moveToLeft(
-				position.x() + label->width() + st::normalFont->spacew,
-				(position.y()
-					+ table->st().defaultValue.style.font->ascent
-					- table->st().smallButton.style.font->ascent),
+				peerLabel->width() + st::normalFont->spacew,
+				st::giftBoxByStarsStarTop,
 				width);
 		}
-	}, label->lifetime());
-
-	userpic->setAttribute(Qt::WA_TransparentForMouseEvents);
-	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-	label->setTextColorOverride(table->st().defaultValue.palette.linkFg->c);
-
-	raw->setClickedCallback([=] {
-		show->showBox(PrepareShortInfoBox(peer, show));
-	});
+	}, raw->lifetime());
 
 	return result;
 }
@@ -387,51 +402,19 @@ void AddTableRow(
 		not_null<Ui::TableLayout*> table,
 		const Data::UniqueGiftAttribute &attribute,
 		Fn<void(not_null<Ui::RpWidget*>, int)> showTooltip) {
-	auto result = object_ptr<Ui::RpWidget>(table);
-	const auto raw = result.data();
-
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
+		table,
 		attribute.name,
 		table->st().defaultValue);
-	const auto permille = attribute.rarityPermille;
-
-	const auto text = QString::number(permille / 10.) + '%';
-	const auto rarity = Ui::CreateChild<Ui::RoundButton>(
-		raw,
-		rpl::single(text),
-		table->st().smallButton);
-	rarity->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-
-	rpl::combine(
-		raw->widthValue(),
-		rarity->widthValue()
-	) | rpl::start_with_next([=](int width, int convertWidth) {
-		const auto convertSkip = convertWidth
-			? (st::normalFont->spacew + convertWidth)
-			: 0;
-		label->resizeToNaturalWidth(width - convertSkip);
-		label->moveToLeft(0, 0, width);
-		rarity->moveToLeft(
-			label->width() + st::normalFont->spacew,
-			(table->st().defaultValue.style.font->ascent
-				- table->st().smallButton.style.font->ascent),
-			width);
-	}, label->lifetime());
-
-	label->heightValue() | rpl::start_with_next([=](int height) {
-		raw->resize(
-			raw->width(),
-			height + st::giveawayGiftCodeValueMargin.bottom());
-	}, raw->lifetime());
-
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	rarity->setClickedCallback([=] {
-		showTooltip(rarity, permille);
-	});
+	const auto permille = attribute.rarityPermille;
+	auto text = rpl::single(QString::number(permille / 10.) + '%');
 
-	return result;
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
+		showTooltip(button, permille);
+	};
+	return MakeValueWithSmallButton(table, label, std::move(text), handler);
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeStarGiftStarsValue(
@@ -439,60 +422,33 @@ void AddTableRow(
 		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::CreditsHistoryEntry &entry,
 		Fn<void()> convertToStars) {
-	auto result = object_ptr<Ui::RpWidget>(table);
-	const auto raw = result.data();
-
-	const auto star = Ui::CreateSingleStarWidget(
-		raw,
-		table->st().defaultValue.style.font->height);
-	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
-		Lang::FormatCreditsAmountDecimal(entry.credits),
+	auto helper = Ui::Text::CustomEmojiHelper();
+	const auto price = helper.paletteDependent(Ui::Earn::IconCreditsEmoji({
+		.size = table->st().defaultValue.style.font->height,
+		.margin = QMargins(0, st::giftBoxByStarsSkip, 0, 0),
+	})).append(' ').append(Lang::FormatCreditsAmountDecimal(entry.credits));
+	auto label = object_ptr<Ui::FlatLabel>(
+		table,
+		rpl::single(price),
 		table->st().defaultValue,
-		st::defaultPopupMenu);
-
-	const auto convert = convertToStars
-		? Ui::CreateChild<Ui::RoundButton>(
-			raw,
-			tr::lng_gift_sell_small(
-				lt_count_decimal,
-				rpl::single(entry.starsConverted * 1.)),
-			table->st().smallButton)
-		: nullptr;
-	if (convert) {
-		using namespace Ui;
-		convert->setTextTransform(RoundButton::TextTransform::NoTransform);
-		convert->setClickedCallback(std::move(convertToStars));
-	}
-	rpl::combine(
-		raw->widthValue(),
-		convert ? convert->widthValue() : rpl::single(0)
-	) | rpl::start_with_next([=](int width, int convertWidth) {
-		const auto convertSkip = convertWidth
-			? (st::normalFont->spacew + convertWidth)
-			: 0;
-		const auto labelLeft = rect::right(star) + st::normalFont->spacew;
-		label->resizeToNaturalWidth(width - convertSkip - labelLeft);
-		star->moveToLeft(0, 0, width);
-		label->moveToLeft(labelLeft, 0, width);
-		if (convert) {
-			convert->moveToLeft(
-				rect::right(label) + st::normalFont->spacew,
-				(table->st().defaultValue.style.font->ascent
-					- table->st().smallButton.style.font->ascent),
-				width);
-		}
-	}, label->lifetime());
-
-	label->heightValue() | rpl::start_with_next([=](int height) {
-		raw->resize(
-			raw->width(),
-			height + st::giveawayGiftCodeValueMargin.bottom());
-	}, raw->lifetime());
-
+		st::defaultPopupMenu,
+		helper.context());
 	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	return result;
+	if (!convertToStars) {
+		return label;
+	}
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
+		convertToStars();
+	};
+	auto text = tr::lng_gift_sell_small(
+		lt_count_decimal,
+		rpl::single(entry.starsConverted * 1.));
+	return MakeValueWithSmallButton(
+		table,
+		label.release(),
+		std::move(text),
+		handler);
 }
 
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeUniqueGiftValueValue(
@@ -500,26 +456,19 @@ void AddTableRow(
 		std::shared_ptr<ChatHelpers::Show> show,
 		const Data::CreditsHistoryEntry &entry,
 		Settings::CreditsEntryBoxStyleOverrides st) {
-	auto result = object_ptr<Ui::RpWidget>(table);
-	const auto raw = result.data();
-
 	const auto unique = entry.uniqueGift;
 	const auto value = unique ? unique->value : nullptr;
 	const auto loading = std::make_shared<bool>(false);
 
 	const auto label = Ui::CreateChild<Ui::FlatLabel>(
-		raw,
+		table,
 		rpl::single(
 			FormatValuePrice(value->valuePrice, value->currency, true)),
 		table->st().defaultValue,
 		st::defaultPopupMenu);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
 
-	const auto learn = Ui::CreateChild<Ui::RoundButton>(
-		raw,
-		tr::lng_gift_unique_value_learn_more(),
-		table->st().smallButton);
-	learn->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	learn->setClickedCallback([=] {
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
 		if (value->initialPriceStars) {
 			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
 		} else if (*loading) {
@@ -551,30 +500,12 @@ void AddTableRow(
 
 			show->show(Box(Settings::UniqueGiftValueBox, show, entry, st));
 		}).send();
-	});
-	rpl::combine(
-		raw->widthValue(),
-		learn->widthValue()
-	) | rpl::start_with_next([=](int width, int learnWidth) {
-		const auto learnSkip = st::normalFont->spacew + learnWidth;
-		label->resizeToNaturalWidth(width - learnSkip);
-		label->moveToLeft(0, 0, width);
-		learn->moveToLeft(
-			rect::right(label) + st::normalFont->spacew,
-			(table->st().defaultValue.style.font->ascent
-				- table->st().smallButton.style.font->ascent),
-			width);
-	}, label->lifetime());
-
-	label->heightValue() | rpl::start_with_next([=](int height) {
-		raw->resize(
-			raw->width(),
-			height + st::giveawayGiftCodeValueMargin.bottom());
-	}, raw->lifetime());
-
-	label->setAttribute(Qt::WA_TransparentForMouseEvents);
-
-	return result;
+	};
+	return MakeValueWithSmallButton(
+		table,
+		label,
+		tr::lng_gift_unique_value_learn_more(),
+		handler);
 }
 
 not_null<Ui::FlatLabel*> AddTableRow(
@@ -1500,8 +1431,6 @@ void AddStarGiftTable(
 			tr::lng_gift_link_label_date(),
 			rpl::single(Ui::Text::WithEntities(langDateTime(entry.date))));
 	}
-	const auto marginWithButton = st::giveawayGiftCodeValueMargin
-		- QMargins(0, 0, 0, st::giveawayGiftCodeValueMargin.bottom());
 	if (unique) {
 		const auto showRarity = [=](
 				not_null<Ui::RpWidget*> widget,
@@ -1516,17 +1445,17 @@ void AddStarGiftTable(
 			table,
 			tr::lng_gift_unique_model(),
 			MakeAttributeValue(table, unique->model, showRarity),
-			marginWithButton);
+			st::giveawayGiftCodeValueMargin);
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_backdrop(),
 			MakeAttributeValue(table, unique->backdrop, showRarity),
-			marginWithButton);
+			st::giveawayGiftCodeValueMargin);
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_symbol(),
 			MakeAttributeValue(table, unique->pattern, showRarity),
-			marginWithButton);
+			st::giveawayGiftCodeValueMargin);
 	} else {
 		AddTableRow(
 			table,
@@ -1536,7 +1465,7 @@ void AddStarGiftTable(
 				show,
 				entry,
 				std::move(convertToStars)),
-			marginWithButton);
+			st::giveawayGiftCodeValueMargin);
 	}
 	if (entry.limitedCount > 0 && !entry.giftRefunded) {
 		auto amount = rpl::single(TextWithEntities{
@@ -1576,7 +1505,7 @@ void AddStarGiftTable(
 				table,
 				tr::lng_gift_unique_value(),
 				MakeUniqueGiftValueValue(table, show, entry, st),
-				marginWithButton);
+				st::giveawayGiftCodeValueMargin);
 		}
 		const auto &original = unique->originalDetails;
 		if (original.recipientId) {

From 92d9c3c92bd3bf5947fd579715ce4b32137bda8e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 14 Aug 2025 14:42:24 +0400
Subject: [PATCH 263/341] Finish gift value display.

---
 Telegram/SourceFiles/api/api_premium.cpp      |   3 +-
 .../SourceFiles/boxes/gift_premium_box.cpp    | 351 ++++++++++--------
 Telegram/SourceFiles/boxes/star_gift_box.cpp  |  63 ++--
 Telegram/SourceFiles/boxes/star_gift_box.h    |   7 +
 Telegram/SourceFiles/data/data_star_gift.h    |   1 +
 .../channel_statistics/earn/earn_icons.cpp    |   7 +-
 .../settings/settings_credits_graphics.cpp    |  49 +++
 Telegram/SourceFiles/ui/effects/credits.style |   6 +
 8 files changed, 293 insertions(+), 194 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 49109afebe..35894d3e6a 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -894,9 +894,10 @@ std::optional<Data::StarGift> FromTL(
 			? session->data().peer(releasedById).get()
 			: nullptr;
 		auto result = Data::StarGift{
-			.id = uint64(data.vid().v),
+			.id = data.vid().v,
 			.unique = std::make_shared<Data::UniqueGift>(Data::UniqueGift{
 				.id = data.vid().v,
+				.initialGiftId = data.vgift_id().v,
 				.slug = qs(data.vslug()),
 				.title = qs(data.vtitle()),
 				.ownerAddress = qs(data.vowner_address().value_or_empty()),
diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index 53dbe0bddb..af7077662a 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -78,9 +78,74 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace {
 
-constexpr auto kRarityTooltipDuration = 3 * crl::time(1000);
+constexpr auto kTooltipDuration = 3 * crl::time(1000);
+constexpr auto kPriceTooltipDuration = 6 * crl::time(1000);
 constexpr auto kHorizontalBar = QChar(0x2015);
 
+struct InfoTooltipData {
+	not_null<Ui::RpWidget*> parent;
+	Ui::ImportantTooltip *raw = nullptr;
+};
+
+void ShowInfoTooltip(
+		std::shared_ptr<InfoTooltipData> data,
+		not_null<QWidget*> target,
+		rpl::producer<TextWithEntities> text,
+		int duration) {
+	if (data->raw) {
+		data->raw->toggleAnimated(false);
+	}
+	const auto parent = data->parent;
+	const auto tooltip = Ui::CreateChild<Ui::ImportantTooltip>(
+		parent,
+		Ui::MakeNiceTooltipLabel(
+			parent,
+			std::move(text),
+			st::boxWideWidth,
+			st::defaultImportantTooltipLabel),
+		st::defaultImportantTooltip);
+	tooltip->toggleFast(false);
+
+	const auto update = [=] {
+		const auto geometry = Ui::MapFrom(parent, target, target->rect());
+		const auto countPosition = [=](QSize size) {
+			const auto left = geometry.x()
+				+ (geometry.width() - size.width()) / 2;
+			const auto right = parent->width()
+				- st::normalFont->spacew;
+			return QPoint(
+				std::max(std::min(left, right - size.width()), 0),
+				geometry.y() - size.height() - st::normalFont->descent);
+		};
+		tooltip->pointAt(geometry, RectPart::Top, countPosition);
+	};
+	parent->widthValue(
+	) | rpl::start_with_next(update, tooltip->lifetime());
+
+	update();
+	tooltip->toggleAnimated(true);
+
+	data->raw = tooltip;
+	tooltip->shownValue() | rpl::filter(
+		!rpl::mappers::_1
+	) | rpl::start_with_next([=] {
+		crl::on_main(tooltip, [=] {
+			if (tooltip->isHidden()) {
+				if (data->raw == tooltip) {
+					data->raw = nullptr;
+				}
+				delete tooltip;
+			}
+		});
+	}, tooltip->lifetime());
+
+	base::timer_once(
+		duration
+	) | rpl::start_with_next([=] {
+		tooltip->toggleAnimated(false);
+	}, tooltip->lifetime());
+}
+
 [[nodiscard]] QString CreateMessageLink(
 		not_null<Main::Session*> session,
 		PeerId peerId,
@@ -190,9 +255,16 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 		not_null<Ui::TableLayout*> table,
 		not_null<Ui::RpWidget*> value,
 		rpl::producer<QString> buttonText,
-		Fn<void(not_null<Ui::RpWidget*> button)> handler,
+		Fn<void(not_null<Ui::RpWidget*> button)> handler = nullptr,
 		int topSkip = 0) {
-	auto result = object_ptr<Ui::RpWidget>(table);
+	class MarginedWidget final : public Ui::RpWidget {
+	public:
+		using RpWidget::RpWidget;
+		QMargins getMargins() const override {
+			return { 0, 0, 0, st::giveawayGiftCodePeerMargin.bottom() };
+		}
+	};
+	auto result = object_ptr<MarginedWidget>(table);
 	const auto raw = result.data();
 
 	value->setParent(raw);
@@ -203,9 +275,13 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 		std::move(buttonText),
 		table->st().smallButton);
 	button->setTextTransform(Ui::RoundButton::TextTransform::NoTransform);
-	button->setClickedCallback([button, handler = std::move(handler)] {
-		handler(button);
-	});
+	if (handler) {
+		button->setClickedCallback([button, handler = std::move(handler)] {
+			handler(button);
+		});
+	} else {
+		button->setAttribute(Qt::WA_TransparentForMouseEvents);
+	}
 	rpl::combine(
 		raw->widthValue(),
 		button->widthValue(),
@@ -223,7 +299,8 @@ constexpr auto kHorizontalBar = QChar(0x2015);
 	}, value->lifetime());
 
 	value->heightValue() | rpl::start_with_next([=](int height) {
-		raw->resize(raw->width(), height);
+		const auto bottom = st::giveawayGiftCodePeerMargin.bottom();
+		raw->resize(raw->width(), height + bottom);
 	}, raw->lifetime());
 
 	return result;
@@ -385,7 +462,7 @@ void AddTableRow(
 		not_null<Ui::TableLayout*> table,
 		rpl::producer<QString> label,
 		object_ptr<Ui::RpWidget> value,
-		style::margins valueMargins) {
+		style::margins valueMargins = st::giveawayGiftCodeValueMargin) {
 	table->addRow(
 		(label
 			? object_ptr<Ui::FlatLabel>(
@@ -398,6 +475,91 @@ void AddTableRow(
 		valueMargins);
 }
 
+[[nodiscard]] object_ptr<Ui::RpWidget> MakePriceWithChangePercentValue(
+		not_null<Ui::TableLayout*> table,
+		const std::shared_ptr<Data::UniqueGiftValue> &value) {
+	auto label = object_ptr<Ui::FlatLabel>(
+		table,
+		rpl::single(FormatValuePrice(value->lastSalePrice, value->currency)),
+		table->st().defaultValue);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto initial = value->initialSalePrice;
+	if (!initial) {
+		return label;
+	}
+
+	const auto diff = (100 * (value->lastSalePrice - initial))
+		/ float64(initial);
+	const auto use = (std::abs(diff) >= 10.)
+		? base::SafeRound(diff)
+		: (int(base::SafeRound(diff * 100)) / 100.);
+	const auto prefix = (use > 0) ? u"+"_q : QString();
+	const auto percent = Lang::FormatExactCountDecimal(use) + '%';
+	auto text = rpl::single(prefix + percent);
+	return MakeValueWithSmallButton(table, label, std::move(text));
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakePriceValueWithTooltip(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<InfoTooltipData> data,
+		TextWithEntities price,
+		TextWithEntities tooltip) {
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		table,
+		rpl::single(price),
+		table->st().defaultValue);
+	label->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	const auto handler = [=](not_null<Ui::RpWidget*> button) {
+		ShowInfoTooltip(
+			data,
+			button,
+			rpl::single(tooltip),
+			kPriceTooltipDuration);
+	};
+	auto text = rpl::single(u"?"_q);
+	return MakeValueWithSmallButton(table, label, std::move(text), handler);
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeMinimumPriceValue(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<InfoTooltipData> tooltip,
+		const std::shared_ptr<Data::UniqueGift> &unique) {
+	const auto &value = unique->value;
+	const auto text = FormatValuePrice(value->minimumPrice, value->currency);
+	return MakePriceValueWithTooltip(
+		table,
+		std::move(tooltip),
+		text,
+		tr::lng_gift_value_minimum_price_tooltip(
+			tr::now,
+			lt_amount,
+			Ui::Text::Bold(text.text),
+			lt_gift,
+			Ui::Text::Bold(unique->title),
+			Ui::Text::WithEntities));
+}
+
+[[nodiscard]] object_ptr<Ui::RpWidget> MakeAveragePriceValue(
+		not_null<Ui::TableLayout*> table,
+		std::shared_ptr<InfoTooltipData> tooltip,
+		const std::shared_ptr<Data::UniqueGift> &unique) {
+	const auto &value = unique->value;
+	const auto text = FormatValuePrice(value->averagePrice, value->currency);
+	return MakePriceValueWithTooltip(
+		table,
+		std::move(tooltip),
+		text,
+		tr::lng_gift_value_average_price_tooltip(
+			tr::now,
+			lt_amount,
+			Ui::Text::Bold(text.text),
+			lt_gift,
+			Ui::Text::Bold(unique->title),
+			Ui::Text::WithEntities));
+}
+
 [[nodiscard]] object_ptr<Ui::RpWidget> MakeAttributeValue(
 		not_null<Ui::TableLayout*> table,
 		const Data::UniqueGiftAttribute &attribute,
@@ -423,10 +585,8 @@ void AddTableRow(
 		const Data::CreditsHistoryEntry &entry,
 		Fn<void()> convertToStars) {
 	auto helper = Ui::Text::CustomEmojiHelper();
-	const auto price = helper.paletteDependent(Ui::Earn::IconCreditsEmoji({
-		.size = table->st().defaultValue.style.font->height,
-		.margin = QMargins(0, st::giftBoxByStarsSkip, 0, 0),
-	})).append(' ').append(Lang::FormatCreditsAmountDecimal(entry.credits));
+	const auto price = helper.paletteDependent(Ui::Earn::IconCreditsEmoji(
+	)).append(' ').append(Lang::FormatCreditsAmountDecimal(entry.credits));
 	auto label = object_ptr<Ui::FlatLabel>(
 		table,
 		rpl::single(price),
@@ -520,11 +680,7 @@ not_null<Ui::FlatLabel*> AddTableRow(
 		st::defaultPopupMenu,
 		context);
 	const auto result = widget.data();
-	AddTableRow(
-		table,
-		std::move(label),
-		std::move(widget),
-		st::giveawayGiftCodeValueMargin);
+	AddTableRow(table, std::move(label), std::move(widget));
 	return result;
 }
 
@@ -1255,64 +1411,13 @@ void AddStarGiftTable(
 	const auto giftToChannel = entry.giftChannelSavedId
 		&& peerIsChannel(PeerId(entry.bareEntryOwnerId));
 
-	const auto raw = std::make_shared<Ui::ImportantTooltip*>(nullptr);
+	const auto tooltip = std::make_shared<InfoTooltipData>(InfoTooltipData{
+		.parent = container,
+	});
 	const auto showTooltip = [=](
 			not_null<Ui::RpWidget*> widget,
 			rpl::producer<TextWithEntities> text) {
-		if (*raw) {
-			(*raw)->toggleAnimated(false);
-		}
-		const auto tooltip = Ui::CreateChild<Ui::ImportantTooltip>(
-			container,
-			Ui::MakeNiceTooltipLabel(
-				container,
-				std::move(text),
-				st::boxWideWidth,
-				st::defaultImportantTooltipLabel),
-			st::defaultImportantTooltip);
-		tooltip->toggleFast(false);
-
-		const auto update = [=] {
-			const auto geometry = Ui::MapFrom(
-				container,
-				widget,
-				widget->rect());
-			const auto countPosition = [=](QSize size) {
-				const auto left = geometry.x()
-					+ (geometry.width() - size.width()) / 2;
-				const auto right = container->width()
-					- st::normalFont->spacew;
-				return QPoint(
-					std::max(std::min(left, right - size.width()), 0),
-					geometry.y() - size.height() - st::normalFont->descent);
-			};
-			tooltip->pointAt(geometry, RectPart::Top, countPosition);
-		};
-		container->widthValue(
-		) | rpl::start_with_next(update, tooltip->lifetime());
-
-		update();
-		tooltip->toggleAnimated(true);
-
-		*raw = tooltip;
-		tooltip->shownValue() | rpl::filter(
-			!rpl::mappers::_1
-		) | rpl::start_with_next([=] {
-			crl::on_main(tooltip, [=] {
-				if (tooltip->isHidden()) {
-					if (*raw == tooltip) {
-						*raw = nullptr;
-					}
-					delete tooltip;
-				}
-			});
-		}, tooltip->lifetime());
-
-		base::timer_once(
-			kRarityTooltipDuration
-		) | rpl::start_with_next([=] {
-			tooltip->toggleAnimated(false);
-		}, tooltip->lifetime());
+		ShowInfoTooltip(tooltip, widget, std::move(text), kTooltipDuration);
 	};
 
 	if (unique && entry.bareGiftResaleRecipientId) {
@@ -1369,8 +1474,7 @@ void AddStarGiftTable(
 			AddTableRow(
 				table,
 				tr::lng_gift_unique_owner(),
-				std::move(label),
-				st::giveawayGiftCodeValueMargin);
+				std::move(label));
 		}
 	} else if (giftToChannel) {
 		AddTableRow(
@@ -1444,18 +1548,15 @@ void AddStarGiftTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_model(),
-			MakeAttributeValue(table, unique->model, showRarity),
-			st::giveawayGiftCodeValueMargin);
+			MakeAttributeValue(table, unique->model, showRarity));
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_backdrop(),
-			MakeAttributeValue(table, unique->backdrop, showRarity),
-			st::giveawayGiftCodeValueMargin);
+			MakeAttributeValue(table, unique->backdrop, showRarity));
 		AddTableRow(
 			table,
 			tr::lng_gift_unique_symbol(),
-			MakeAttributeValue(table, unique->pattern, showRarity),
-			st::giveawayGiftCodeValueMargin);
+			MakeAttributeValue(table, unique->pattern, showRarity));
 	} else {
 		AddTableRow(
 			table,
@@ -1464,8 +1565,7 @@ void AddStarGiftTable(
 				table,
 				show,
 				entry,
-				std::move(convertToStars)),
-			st::giveawayGiftCodeValueMargin);
+				std::move(convertToStars)));
 	}
 	if (entry.limitedCount > 0 && !entry.giftRefunded) {
 		auto amount = rpl::single(TextWithEntities{
@@ -1504,8 +1604,7 @@ void AddStarGiftTable(
 			AddTableRow(
 				table,
 				tr::lng_gift_unique_value(),
-				MakeUniqueGiftValueValue(table, show, entry, st),
-				st::giveawayGiftCodeValueMargin);
+				MakeUniqueGiftValueValue(table, show, entry, st));
 		}
 		const auto &original = unique->originalDetails;
 		if (original.recipientId) {
@@ -1691,8 +1790,7 @@ void AddCreditsHistoryEntryTable(
 				(entry.reaction
 					? tr::lng_credits_box_history_entry_message
 					: tr::lng_credits_box_history_entry_media)(),
-				std::move(label),
-				st::giveawayGiftCodeValueMargin);
+				std::move(label));
 		}
 	}
 	using Type = Data::CreditsHistoryEntry::PeerType;
@@ -1799,8 +1897,7 @@ void AddCreditsHistoryEntryTable(
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_id(),
-			std::move(label),
-			st::giveawayGiftCodeValueMargin);
+			std::move(label));
 	}
 	if (entry.floodSkip) {
 		AddTableRow(
@@ -1988,8 +2085,7 @@ void AddChannelEarnTable(
 		AddTableRow(
 			table,
 			tr::lng_credits_box_history_entry_id(),
-			std::move(label),
-			st::giveawayGiftCodeValueMargin);
+			std::move(label));
 	}
 }
 
@@ -2004,66 +2100,6 @@ void AddUniqueGiftValueTable(
 			container,
 			st.table ? *st.table : st::giveawayGiftCodeTable),
 		st::giveawayGiftCodeTableMargin);
-	const auto raw = std::make_shared<Ui::ImportantTooltip*>(nullptr);
-	const auto showTooltip = [=](
-			not_null<Ui::RpWidget*> widget,
-			rpl::producer<TextWithEntities> text) {
-		if (*raw) {
-			(*raw)->toggleAnimated(false);
-		}
-		const auto tooltip = Ui::CreateChild<Ui::ImportantTooltip>(
-			container,
-			Ui::MakeNiceTooltipLabel(
-				container,
-				std::move(text),
-				st::boxWideWidth,
-				st::defaultImportantTooltipLabel),
-			st::defaultImportantTooltip);
-		tooltip->toggleFast(false);
-
-		const auto update = [=] {
-			const auto geometry = Ui::MapFrom(
-				container,
-				widget,
-				widget->rect());
-			const auto countPosition = [=](QSize size) {
-				const auto left = geometry.x()
-					+ (geometry.width() - size.width()) / 2;
-				const auto right = container->width()
-					- st::normalFont->spacew;
-				return QPoint(
-					std::max(std::min(left, right - size.width()), 0),
-					geometry.y() - size.height() - st::normalFont->descent);
-			};
-			tooltip->pointAt(geometry, RectPart::Top, countPosition);
-		};
-		container->widthValue(
-		) | rpl::start_with_next(update, tooltip->lifetime());
-
-		update();
-		tooltip->toggleAnimated(true);
-
-		*raw = tooltip;
-		tooltip->shownValue() | rpl::filter(
-			!rpl::mappers::_1
-		) | rpl::start_with_next([=] {
-			crl::on_main(tooltip, [=] {
-				if (tooltip->isHidden()) {
-					if (*raw == tooltip) {
-						*raw = nullptr;
-					}
-					delete tooltip;
-				}
-			});
-		}, tooltip->lifetime());
-
-		base::timer_once(
-			kRarityTooltipDuration
-		) | rpl::start_with_next([=] {
-			tooltip->toggleAnimated(false);
-		}, tooltip->lifetime());
-	};
-
 	if (value->initialSaleDate) {
 		AddTableRow(
 			table,
@@ -2078,7 +2114,7 @@ void AddUniqueGiftValueTable(
 		tr::lng_gift_value_initial_price(),
 		tr::lng_gift_value_initial_price_value(
 			lt_stars,
-			rpl::single(starIcon.append(
+			rpl::single(starIcon.append(' ').append(
 				Lang::FormatCreditsAmountDecimal(value->initialPriceStars)
 			)),
 			lt_amount,
@@ -2098,21 +2134,22 @@ void AddUniqueGiftValueTable(
 		AddTableRow(
 			table,
 			tr::lng_gift_value_last_price(),
-			rpl::single(
-				FormatValuePrice(value->lastSalePrice, value->currency)));
+			MakePriceWithChangePercentValue(table, value));
 	}
+
+	const auto tooltip = std::make_shared<InfoTooltipData>(InfoTooltipData{
+		.parent = container,
+	});
 	if (value->minimumPrice) {
 		AddTableRow(
 			table,
 			tr::lng_gift_value_minimum_price(),
-			rpl::single(
-				FormatValuePrice(value->minimumPrice, value->currency)));
+			MakeMinimumPriceValue(table, tooltip, entry.uniqueGift));
 	}
 	if (value->averagePrice) {
 		AddTableRow(
 			table,
 			tr::lng_gift_vlaue_average_price(),
-			rpl::single(
-				FormatValuePrice(value->averagePrice, value->currency)));
+			MakeAveragePriceValue(table, tooltip, entry.uniqueGift));
 	}
 }
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 31c5df9afe..56ac674373 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -1258,7 +1258,7 @@ struct ResaleTabs {
 	object_ptr<RpWidget> widget;
 };
 [[nodiscard]] ResaleTabs MakeResaleTabs(
-		not_null<Window::SessionController*> window,
+		std::shared_ptr<ChatHelpers::Show> show,
 		not_null<PeerData*> peer,
 		const ResaleGiftsDescriptor &info,
 		rpl::producer<ResaleFilter> filter) {
@@ -1340,7 +1340,7 @@ struct ResaleTabs {
 			action->setClickedCallback(std::move(callback));
 			menu->addAction(std::move(action));
 		};
-		auto context = Core::TextContext({ .session = &window->session() });
+		auto context = Core::TextContext({ .session = &show->session() });
 		context.customEmojiFactory = [original = context.customEmojiFactory](
 				QStringView data,
 				const Ui::Text::MarkedContext &context) {
@@ -2738,13 +2738,6 @@ void SendGiftBox(
 	};
 }
 
-[[nodiscard]] rpl::lifetime ShowStarGiftResale(
-	not_null<Window::SessionController*> controller,
-	not_null<PeerData*> peer,
-	uint64 giftId,
-	QString title,
-	Fn<void()> finishRequesting);
-
 [[nodiscard]] object_ptr<RpWidget> MakeGiftsList(
 		not_null<Window::SessionController*> window,
 		not_null<PeerData*> peer,
@@ -3362,7 +3355,7 @@ void GiftResaleBox(
 	}, content->lifetime());
 
 	auto tabs = MakeResaleTabs(
-		window,
+		window->uiShow(),
 		peer,
 		state->data,
 		state->filter.value());
@@ -3448,30 +3441,6 @@ void GiftResaleBox(
 	}));
 }
 
-[[nodiscard]] rpl::lifetime ShowStarGiftResale(
-		not_null<Window::SessionController*> controller,
-		not_null<PeerData*> peer,
-		uint64 giftId,
-		QString title,
-		Fn<void()> finishRequesting) {
-	const auto weak = base::make_weak(controller);
-	const auto session = &controller->session();
-	return ResaleGiftsSlice(
-		session,
-		giftId
-	) | rpl::start_with_next([=](ResaleGiftsDescriptor &&info) {
-		if (const auto onstack = finishRequesting) {
-			onstack();
-		}
-		if (!info.giftId || !info.count) {
-			return;
-		}
-		info.title = title;
-		controller->show(
-			Box(GiftResaleBox, controller, peer, std::move(info)));
-	});
-}
-
 struct CustomList {
 	object_ptr<Ui::RpWidget> content = { nullptr };
 	Fn<bool(int, int, int)> overrideKey;
@@ -5420,4 +5389,30 @@ void ShowResaleGiftBoughtToast(
 		.duration = kUpgradeDoneToastDuration,
 	});
 }
+
+rpl::lifetime ShowStarGiftResale(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		uint64 giftId,
+		QString title,
+		Fn<void()> finishRequesting) {
+	const auto weak = base::make_weak(controller);
+	const auto session = &controller->session();
+	return ResaleGiftsSlice(
+		session,
+		giftId
+	) | rpl::start_with_next([=](ResaleGiftsDescriptor &&info) {
+		if (const auto onstack = finishRequesting) {
+			onstack();
+		}
+		if (!info.giftId || !info.count) {
+			return;
+		}
+		info.title = title;
+		if (const auto strong = weak.get()) {
+			strong->show(Box(GiftResaleBox, strong, peer, std::move(info)));
+		}
+	});
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index 5f0e305f19..520b1278d4 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -158,4 +158,11 @@ void ShowResaleGiftBoughtToast(
 	not_null<PeerData*> to,
 	const Data::UniqueGift &gift);
 
+[[nodiscard]] rpl::lifetime ShowStarGiftResale(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	uint64 giftId,
+	QString title,
+	Fn<void()> finishRequesting);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index bf6b02bcb8..cde5609b33 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -55,6 +55,7 @@ struct UniqueGiftValue {
 
 struct UniqueGift {
 	CollectibleId id = 0;
+	uint64 initialGiftId = 0;
 	QString slug;
 	QString title;
 	QString ownerAddress;
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
index 3ffe9d7905..80bfdc845c 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -155,9 +155,12 @@ Ui::Text::PaletteDependentEmoji IconCreditsEmoji(
 		IconDescriptor descriptor) {
 	return { .factory = [=] {
 		return Ui::GenerateStars(
-			descriptor.size ? descriptor.size : st::normalFont->height,
+			(descriptor.size
+				? descriptor.size
+				: st::defaultTableLabel.style.font->height),
 			1);
-	}, .margin = descriptor.margin.value_or(QMargins()) };
+	}, .margin = descriptor.margin.value_or(
+		{ 0, st::giftBoxByStarsSkip, 0, 0 }) };
 }
 
 Ui::Text::PaletteDependentEmoji IconCurrencyEmoji(
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index cb71bf5a10..cd39281bfe 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2261,6 +2261,7 @@ void UniqueGiftValueBox(
 		std::shared_ptr<Data::DocumentMedia> media;
 		std::unique_ptr<Lottie::SinglePlayer> lottie;
 		rpl::lifetime downloadLifetime;
+		rpl::lifetime buyLifetime;
 	};
 	Ui::AddSkip(content, st::creditsHistoryEntryStarGiftSpace);
 
@@ -2369,6 +2370,54 @@ void UniqueGiftValueBox(
 
 	Ui::AddSkip(content);
 
+	const auto addAvailability = [&](int count, tr::phrase<> platform) {
+		return box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box,
+				tr::lng_gift_value_availability(
+					lt_count_decimal,
+					rpl::single(count * 1.),
+					lt_emoji,
+					rpl::single(Data::SingleCustomEmoji(document)),
+					lt_platform,
+					platform(Ui::Text::WithEntities),
+					lt_arrow,
+					rpl::single(Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
+					[](const QString &text) { return Ui::Text::Link(text); }),
+				st::uniqueGiftValueAvailableLink,
+				st::defaultPopupMenu,
+				Core::TextContext({ .session = &show->session() })),
+			st::boxRowPadding + st::uniqueGiftValueAvailableMargin,
+			style::al_top);
+	};
+
+	if (const auto count = value->forSaleOnTelegram; count > 0) {
+		addAvailability(
+			count,
+			tr::lng_gift_value_telegram
+		)->setClickHandlerFilter([=](const auto &...) {
+			if (const auto window = show->resolveWindow()) {
+				state->buyLifetime = Ui::ShowStarGiftResale(
+					window,
+					window->session().user(),
+					unique->initialGiftId,
+					unique->title,
+					crl::guard(box, [=] { state->buyLifetime.destroy(); }));
+			}
+			return false;
+		});
+	}
+	if (const auto count = value->forSaleOnFragment; count > 0) {
+		const auto url = value->fragmentUrl;
+		addAvailability(
+			count,
+			tr::lng_gift_value_fragment
+		)->setClickHandlerFilter([=](const auto &...) {
+			UrlClickHandler::Open(url);
+			return false;
+		});
+	}
+
 	box->addButton(tr::lng_box_ok(), [=] {
 		box->closeBox();
 	});
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 3dc7336307..630e90409d 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -371,3 +371,9 @@ uniqueGiftValueAbout: FlatLabel(defaultFlatLabel) {
 	minWidth: 128px;
 	align: align(top);
 }
+uniqueGiftValueAvailableLink: FlatLabel(boxLabel) {
+	style: TextStyle(defaultTextStyle) {
+		font: font(14px);
+	}
+}
+uniqueGiftValueAvailableMargin: margins(0px, 4px, 0px, 4px);

From 7d701d3e9cc4b5c8f687f141f1dbd0a43b5c4168 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 11 Aug 2025 12:23:20 +0400
Subject: [PATCH 264/341] Fix upgrading of gifts with gifted upgrade.

---
 Telegram/SourceFiles/data/data_media_types.h               | 3 ++-
 Telegram/SourceFiles/history/history_item.cpp              | 6 +++++-
 .../history/view/media/history_view_premium_gift.cpp       | 4 ++--
 .../SourceFiles/settings/settings_credits_graphics.cpp     | 7 +++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index bf5d003830..a05ddd96cd 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -150,8 +150,9 @@ struct GiftCode {
 	ChannelData *channel = nullptr;
 	PeerData *channelFrom = nullptr;
 	uint64 channelSavedId = 0;
+	QString giftPrepayUpgradeHash;
 	MsgId giveawayMsgId = 0;
-	MsgId upgradeMsgId = 0;
+	MsgId realGiftMsgId = 0;
 	int starsConverted = 0;
 	int starsToUpgrade = 0;
 	int starsUpgradedBySender = 0;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 783121f7f8..ae2f738165 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -6437,6 +6437,8 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 		const auto to = data.vpeer()
 			? peerFromMTP(*data.vpeer())
 			: PeerId();
+		const auto upgradeMsgId = data.vupgrade_msg_id().value_or_empty();
+		const auto realGiftMsgId = data.vgift_msg_id().value_or_empty();
 		using Fields = Data::GiftCode;
 		auto fields = Fields{
 			.message = (data.vmessage()
@@ -6451,7 +6453,9 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 				? history()->owner().peer(from).get()
 				: nullptr),
 			.channelSavedId = data.vsaved_id().value_or_empty(),
-			.upgradeMsgId = data.vupgrade_msg_id().value_or_empty(),
+			.giftPrepayUpgradeHash = qs(
+				data.vprepaid_upgrade_hash().value_or_empty()),
+			.realGiftMsgId = (upgradeMsgId ? upgradeMsgId : realGiftMsgId),
 			.starsConverted = int(data.vconvert_stars().value_or_empty()),
 			.starsUpgradedBySender = int(
 				data.vupgrade_stars().value_or_empty()),
diff --git a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
index d5bf83f519..68ac6ee543 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_premium_gift.cpp
@@ -504,8 +504,8 @@ ClickHandlerPtr OpenStarGiftLink(not_null<HistoryItem*> item) {
 	}
 	const auto data = *gift;
 	const auto itemId = item->fullId();
-	const auto openInsteadId = data.upgradeMsgId
-		? Data::SavedStarGiftId::User(data.upgradeMsgId)
+	const auto openInsteadId = data.realGiftMsgId
+		? Data::SavedStarGiftId::User(data.realGiftMsgId)
 		: (data.channel && data.channelSavedId)
 		? Data::SavedStarGiftId::Chat(data.channel, data.channelSavedId)
 		: Data::SavedStarGiftId();
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index cd39281bfe..873ac0bd34 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2554,7 +2554,7 @@ Data::CreditsHistoryEntry SavedStarGiftEntry(
 Data::SavedStarGiftId EntryToSavedStarGiftId(
 		not_null<Main::Session*> session,
 		const Data::CreditsHistoryEntry &entry) {
-	return !entry.stargift
+	return (!entry.stargift || (!entry.in && !entry.giftChannelSavedId))
 		? Data::SavedStarGiftId()
 		: (entry.bareEntryOwnerId && entry.giftChannelSavedId)
 		? Data::SavedStarGiftId::Chat(
@@ -2618,7 +2618,9 @@ void ShowStarGiftViewBox(
 		.description = data.message,
 		.date = base::unixtime::parse(item->date()),
 		.credits = CreditsAmount(data.count),
-		.bareMsgId = uint64(item->id.bare),
+		.bareMsgId = uint64(data.realGiftMsgId
+			? data.realGiftMsgId.bare
+			: item->id.bare),
 		.barePeerId = fromId.value,
 		.bareGiftStickerId = data.document ? data.document->id : 0,
 		.bareGiftOwnerId = ownerId.value,
@@ -2629,6 +2631,7 @@ void ShowStarGiftViewBox(
 		.bareEntryOwnerId = (toChannel ? data.channel->id.value : 0),
 		.giftChannelSavedId = data.channelSavedId,
 		.stargiftId = data.stargiftId,
+		.giftPrepayUpgradeHash = data.giftPrepayUpgradeHash,
 		.uniqueGift = data.unique,
 		.nextToUpgradeStickerId = nextToUpgradeStickerId,
 		.nextToUpgradeShow = std::move(nextToUpgradeShow),

From b9c6e595d742518fc61a7ce556f0c0bb6f5f797b Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 13:15:44 +0400
Subject: [PATCH 265/341] Update API scheme on layer 213.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl    | 37 +++++++++++++++----
 .../SourceFiles/payments/payments_form.cpp    |  4 +-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 1e89dce893..293d245054 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -104,7 +104,7 @@ channel#fe685355 flags:# creator:flags.0?true left:flags.2?true broadcast:flags.
 channelForbidden#17d493d5 flags:# broadcast:flags.5?true megagroup:flags.8?true id:long access_hash:long title:string until_date:flags.16?int = Chat;
 
 chatFull#2633421b flags:# can_set_username:flags.7?true has_scheduled:flags.8?true translations_disabled:flags.19?true id:long about:string participants:ChatParticipants chat_photo:flags.2?Photo notify_settings:PeerNotifySettings exported_invite:flags.13?ExportedChatInvite bot_info:flags.3?Vector<BotInfo> pinned_msg_id:flags.6?int folder_id:flags.11?int call:flags.12?InputGroupCall ttl_period:flags.14?int groupcall_default_join_as:flags.15?Peer theme_emoticon:flags.16?string requests_pending:flags.17?int recent_requesters:flags.17?Vector<long> available_reactions:flags.18?ChatReactions reactions_limit:flags.20?int = ChatFull;
-channelFull#e07429de flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true paid_media_allowed:flags2.14?true can_view_stars_revenue:flags2.15?true paid_reactions_available:flags2.16?true stargifts_available:flags2.19?true paid_messages_available:flags2.20?true id:long about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?long location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions reactions_limit:flags2.13?int stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet bot_verification:flags2.17?BotVerification stargifts_count:flags2.18?int send_paid_messages_stars:flags2.21?long = ChatFull;
+channelFull#e4e0b29d flags:# can_view_participants:flags.3?true can_set_username:flags.6?true can_set_stickers:flags.7?true hidden_prehistory:flags.10?true can_set_location:flags.16?true has_scheduled:flags.19?true can_view_stats:flags.20?true blocked:flags.22?true flags2:# can_delete_channel:flags2.0?true antispam:flags2.1?true participants_hidden:flags2.2?true translations_disabled:flags2.3?true stories_pinned_available:flags2.5?true view_forum_as_messages:flags2.6?true restricted_sponsored:flags2.11?true can_view_revenue:flags2.12?true paid_media_allowed:flags2.14?true can_view_stars_revenue:flags2.15?true paid_reactions_available:flags2.16?true stargifts_available:flags2.19?true paid_messages_available:flags2.20?true id:long about:string participants_count:flags.0?int admins_count:flags.1?int kicked_count:flags.2?int banned_count:flags.2?int online_count:flags.13?int read_inbox_max_id:int read_outbox_max_id:int unread_count:int chat_photo:Photo notify_settings:PeerNotifySettings exported_invite:flags.23?ExportedChatInvite bot_info:Vector<BotInfo> migrated_from_chat_id:flags.4?long migrated_from_max_id:flags.4?int pinned_msg_id:flags.5?int stickerset:flags.8?StickerSet available_min_id:flags.9?int folder_id:flags.11?int linked_chat_id:flags.14?long location:flags.15?ChannelLocation slowmode_seconds:flags.17?int slowmode_next_send_date:flags.18?int stats_dc:flags.12?int pts:int call:flags.21?InputGroupCall ttl_period:flags.24?int pending_suggestions:flags.25?Vector<string> groupcall_default_join_as:flags.26?Peer theme_emoticon:flags.27?string requests_pending:flags.28?int recent_requesters:flags.28?Vector<long> default_send_as:flags.29?Peer available_reactions:flags.30?ChatReactions reactions_limit:flags2.13?int stories:flags2.4?PeerStories wallpaper:flags2.7?WallPaper boosts_applied:flags2.8?int boosts_unrestrict:flags2.9?int emojiset:flags2.10?StickerSet bot_verification:flags2.17?BotVerification stargifts_count:flags2.18?int send_paid_messages_stars:flags2.21?long main_tab:flags2.22?ProfileTab = ChatFull;
 
 chatParticipant#c02d4007 user_id:long inviter_id:long date:int = ChatParticipant;
 chatParticipantCreator#e46bcee4 user_id:long = ChatParticipant;
@@ -185,7 +185,7 @@ messageActionRequestedPeerSentMe#93b31848 button_id:int peers:Vector<RequestedPe
 messageActionPaymentRefunded#41b3e202 flags:# peer:Peer currency:string total_amount:long payload:flags.0?bytes charge:PaymentCharge = MessageAction;
 messageActionGiftStars#45d5b021 flags:# currency:string amount:long stars:long crypto_currency:flags.0?string crypto_amount:flags.0?long transaction_id:flags.1?string = MessageAction;
 messageActionPrizeStars#b00c47a2 flags:# unclaimed:flags.0?true stars:long transaction_id:string boost_peer:Peer giveaway_msg_id:int = MessageAction;
-messageActionStarGift#f24de7fa flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true prepaid_upgrade:flags.13?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long prepaid_upgrade_hash:flags.14?string gift_msg_id:flags.15?int = MessageAction;
+messageActionStarGift#f24de7fa flags:# name_hidden:flags.0?true saved:flags.2?true converted:flags.3?true upgraded:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true prepaid_upgrade:flags.13?true upgrade_separate:flags.16?true gift:StarGift message:flags.1?TextWithEntities convert_stars:flags.4?long upgrade_msg_id:flags.5?int upgrade_stars:flags.8?long from_id:flags.11?Peer peer:flags.12?Peer saved_id:flags.12?long prepaid_upgrade_hash:flags.14?string gift_msg_id:flags.15?int = MessageAction;
 messageActionStarGiftUnique#34f762f3 flags:# upgrade:flags.0?true transferred:flags.1?true saved:flags.2?true refunded:flags.5?true prepaid_upgrade:flags.11?true gift:StarGift can_export_at:flags.3?int transfer_stars:flags.4?long from_id:flags.6?Peer peer:flags.7?Peer saved_id:flags.7?long resale_amount:flags.8?StarsAmount can_transfer_at:flags.9?int can_resell_at:flags.10?int = MessageAction;
 messageActionPaidMessagesRefunded#ac1f1fcd count:int stars:long = MessageAction;
 messageActionPaidMessagesPrice#84b88578 flags:# broadcast_messages_allowed:flags.0?true stars:long = MessageAction;
@@ -248,7 +248,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#7e63ce1f flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating stars_my_pending_rating:flags2.18?StarsRating stars_my_pending_rating_date:flags2.18?int = UserFull;
+userFull#3fd81e28 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating stars_my_pending_rating:flags2.18?StarsRating stars_my_pending_rating_date:flags2.18?int main_tab:flags2.20?ProfileTab saved_music:flags2.21?Document = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -1516,7 +1516,7 @@ inputStorePaymentPremiumSubscription#a6751e66 flags:# restore:flags.0?true upgra
 inputStorePaymentGiftPremium#616f7fe8 user_id:InputUser currency:string amount:long = InputStorePaymentPurpose;
 inputStorePaymentPremiumGiftCode#fb790393 flags:# users:Vector<InputUser> boost_peer:flags.0?InputPeer currency:string amount:long message:flags.1?TextWithEntities = InputStorePaymentPurpose;
 inputStorePaymentPremiumGiveaway#160544ca flags:# only_new_subscribers:flags.0?true winners_are_visible:flags.3?true boost_peer:InputPeer additional_peers:flags.1?Vector<InputPeer> countries_iso2:flags.2?Vector<string> prize_description:flags.4?string random_id:long until_date:int currency:string amount:long = InputStorePaymentPurpose;
-inputStorePaymentStarsTopup#dddd0f56 stars:long currency:string amount:long = InputStorePaymentPurpose;
+inputStorePaymentStarsTopup#f9a2a6cb flags:# stars:long currency:string amount:long spend_purpose_peer:flags.0?InputPeer = InputStorePaymentPurpose;
 inputStorePaymentStarsGift#1d741ef7 user_id:InputUser stars:long currency:string amount:long = InputStorePaymentPurpose;
 inputStorePaymentStarsGiveaway#751f08fa flags:# only_new_subscribers:flags.0?true winners_are_visible:flags.3?true stars:long boost_peer:InputPeer additional_peers:flags.1?Vector<InputPeer> countries_iso2:flags.2?Vector<string> prize_description:flags.4?string random_id:long until_date:int currency:string amount:long users:int = InputStorePaymentPurpose;
 inputStorePaymentAuthCode#9bb2636d flags:# restore:flags.0?true phone_number:string phone_code_hash:string currency:string amount:long = InputStorePaymentPurpose;
@@ -1938,11 +1938,11 @@ payments.starGiftUpgradePreview#167bd90b sample_attributes:Vector<StarGiftAttrib
 users.users#62d706b8 users:Vector<User> = users.Users;
 users.usersSlice#315a4974 count:int users:Vector<User> = users.Users;
 
-payments.uniqueStarGift#caa2f60b gift:StarGift users:Vector<User> = payments.UniqueStarGift;
+payments.uniqueStarGift#416c56e8 gift:StarGift chats:Vector<Chat> users:Vector<User> = payments.UniqueStarGift;
 
-messages.webPagePreview#b53e8b21 media:MessageMedia users:Vector<User> = messages.WebPagePreview;
+messages.webPagePreview#8c9a88ac media:MessageMedia chats:Vector<Chat> users:Vector<User> = messages.WebPagePreview;
 
-savedStarGift#19a9b572 flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int collection_id:flags.15?Vector<int> prepaid_upgrade_hash:flags.16?string = SavedStarGift;
+savedStarGift#19a9b572 flags:# name_hidden:flags.0?true unsaved:flags.5?true refunded:flags.9?true can_upgrade:flags.10?true pinned_to_top:flags.12?true upgrade_separate:flags.17?true from_id:flags.1?Peer date:int gift:StarGift message:flags.2?TextWithEntities msg_id:flags.3?int saved_id:flags.11?long convert_stars:flags.4?long upgrade_stars:flags.6?long can_export_at:flags.7?int transfer_stars:flags.8?long can_transfer_at:flags.13?int can_resell_at:flags.14?int collection_id:flags.15?Vector<int> prepaid_upgrade_hash:flags.16?string = SavedStarGift;
 
 payments.savedStarGifts#95f389b1 flags:# count:int chat_notifications_enabled:flags.1?Bool gifts:Vector<SavedStarGift> next_offset:flags.0?string chats:Vector<Chat> users:Vector<User> = payments.SavedStarGifts;
 
@@ -2007,6 +2007,21 @@ searchPostsFlood#3e0b5b6a flags:# query_is_free:flags.0?true total_daily:int rem
 
 payments.uniqueStarGiftValueInfo#512fe446 flags:# last_sale_on_fragment:flags.1?true value_is_average:flags.6?true currency:string value:long initial_sale_date:int initial_sale_stars:long initial_sale_price:long last_sale_date:flags.0?int last_sale_price:flags.0?long floor_price:flags.2?long average_price:flags.3?long listed_count:flags.4?int fragment_listed_count:flags.5?int fragment_listed_url:flags.5?string = payments.UniqueStarGiftValueInfo;
 
+profileTabPosts#b98cd696 = ProfileTab;
+profileTabGifts#4d4bd46a = ProfileTab;
+profileTabMedia#72c64955 = ProfileTab;
+profileTabFiles#ab339c00 = ProfileTab;
+profileTabMusic#9f27d26e = ProfileTab;
+profileTabVoice#e477092e = ProfileTab;
+profileTabLinks#d3656499 = ProfileTab;
+profileTabGifs#a2c0f695 = ProfileTab;
+
+users.savedMusicNotModified#e3878aa4 count:int = users.SavedMusic;
+users.savedMusic#34a2f297 count:int documents:Vector<Document> = users.SavedMusic;
+
+account.savedMusicIdsNotModified#4fc81d6e = account.SavedMusicIds;
+account.savedMusicIds#998d6636 ids:Vector<long> = account.SavedMusicIds;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2160,11 +2175,16 @@ account.setReactionsNotifySettings#316ce548 settings:ReactionsNotifySettings = R
 account.getCollectibleEmojiStatuses#2e7b4543 hash:long = account.EmojiStatuses;
 account.getPaidMessagesRevenue#19ba4a67 flags:# parent_peer:flags.0?InputPeer user_id:InputUser = account.PaidMessagesRevenue;
 account.toggleNoPaidMessagesException#fe2eda76 flags:# refund_charged:flags.0?true require_payment:flags.2?true parent_peer:flags.1?InputPeer user_id:InputUser = Bool;
+account.setMainProfileTab#5dee78b0 tab:ProfileTab = Bool;
+account.saveMusic#b26732a9 flags:# unsave:flags.0?true id:InputDocument after_id:flags.1?InputDocument = Bool;
+account.getSavedMusicIds#e09d5faf hash:long = account.SavedMusicIds;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
 users.setSecureValueErrors#90c894b5 id:InputUser errors:Vector<SecureValueError> = Bool;
 users.getRequirementsToContact#d89a83a3 id:Vector<InputUser> = Vector<RequirementToContact>;
+users.getSavedMusic#788d7fe3 id:InputUser offset:int limit:int hash:long = users.SavedMusic;
+users.getSavedMusicByID#7573a4e9 id:InputUser documents:Vector<InputDocument> = users.SavedMusic;
 
 contacts.getContactIDs#7adc669d hash:long = Vector<int>;
 contacts.getStatuses#c4a353ee = Vector<ContactStatus>;
@@ -2535,6 +2555,7 @@ channels.updatePaidMessagesPrice#4b12327b flags:# broadcast_messages_allowed:fla
 channels.toggleAutotranslation#167fc0a1 channel:InputChannel enabled:Bool = Updates;
 channels.getMessageAuthor#ece2a0e6 channel:InputChannel id:int = User;
 channels.checkSearchPostsFlood#22567115 flags:# query:flags.0?string = SearchPostsFlood;
+channels.setMainProfileTab#3583fcb1 channel:InputChannel tab:ProfileTab = Bool;
 
 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
@@ -2751,4 +2772,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 212
+// LAYER 213
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index 20bebbef6e..f0b46dd21d 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -383,9 +383,11 @@ MTPInputInvoice Form::inputInvoice() const {
 		}
 		return MTP_inputInvoiceStars(
 			MTP_inputStorePaymentStarsTopup(
+				MTP_flags(0),
 				MTP_long(credits->credits),
 				MTP_string(credits->currency),
-				MTP_long(credits->amount)));
+				MTP_long(credits->amount),
+				MTPInputPeer()));
 	} else if (const auto gift = std::get_if<InvoiceStarGift>(&_id.value)) {
 		using Flag = MTPDinputInvoiceStarGift::Flag;
 		return MTP_inputInvoiceStarGift(

From b8e10fb34b1b7273810f33019d3e5c09b3441dc1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 12 Aug 2025 19:40:39 +0400
Subject: [PATCH 266/341] Proof-of-concept saved music API support.

---
 Telegram/CMakeLists.txt                       |   7 +
 .../SourceFiles/data/data_saved_music.cpp     | 269 ++++++++++
 Telegram/SourceFiles/data/data_saved_music.h  |  65 +++
 Telegram/SourceFiles/data/data_session.cpp    |   2 +
 Telegram/SourceFiles/data/data_session.h      |   5 +
 Telegram/SourceFiles/data/data_stories.cpp    |   2 +-
 .../history/history_inner_widget.cpp          |  15 +
 .../SourceFiles/info/info_content_widget.cpp  |   7 +
 .../SourceFiles/info/info_content_widget.h    |   9 +
 Telegram/SourceFiles/info/info_controller.cpp |  11 +
 Telegram/SourceFiles/info/info_controller.h   |   8 +
 .../info/media/info_media_buttons.cpp         |  41 ++
 .../info/media/info_media_buttons.h           |   5 +
 .../info/media/info_media_list_widget.cpp     |   6 +
 .../profile/info_profile_inner_widget.cpp     |   9 +
 .../info/saved/info_saved_music_common.h      |  20 +
 .../info/saved/info_saved_music_provider.cpp  | 462 ++++++++++++++++++
 .../info/saved/info_saved_music_provider.h    | 141 ++++++
 .../info/saved/info_saved_music_widget.cpp    | 339 +++++++++++++
 .../info/saved/info_saved_music_widget.h      |  81 +++
 .../stories/info_stories_inner_widget.cpp     |  10 +
 .../info/stories/info_stories_provider.cpp    |   1 -
 22 files changed, 1513 insertions(+), 2 deletions(-)
 create mode 100644 Telegram/SourceFiles/data/data_saved_music.cpp
 create mode 100644 Telegram/SourceFiles/data/data_saved_music.h
 create mode 100644 Telegram/SourceFiles/info/saved/info_saved_music_common.h
 create mode 100644 Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
 create mode 100644 Telegram/SourceFiles/info/saved/info_saved_music_provider.h
 create mode 100644 Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
 create mode 100644 Telegram/SourceFiles/info/saved/info_saved_music_widget.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 76ea20879b..ed133b857f 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -636,6 +636,8 @@ PRIVATE
     data/data_report.h
     data/data_saved_messages.cpp
     data/data_saved_messages.h
+    data/data_saved_music.cpp
+    data/data_saved_music.h
     data/data_saved_sublist.cpp
     data/data_saved_sublist.h
     data/data_search_controller.cpp
@@ -1050,6 +1052,11 @@ PRIVATE
     info/reactions_list/info_reactions_list_widget.h
     info/requests_list/info_requests_list_widget.cpp
     info/requests_list/info_requests_list_widget.h
+    info/saved/info_saved_music_common.h
+    info/saved/info_saved_music_provider.cpp
+    info/saved/info_saved_music_provider.h
+    info/saved/info_saved_music_widget.cpp
+    info/saved/info_saved_music_widget.h
     info/saved/info_saved_sublists_widget.cpp
     info/saved/info_saved_sublists_widget.h
     info/settings/info_settings_widget.cpp
diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
new file mode 100644
index 0000000000..5b1e07d43e
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -0,0 +1,269 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "data/data_saved_music.h"
+
+#include "api/api_hash.h"
+#include "apiwrap.h"
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+#include "ui/ui_utility.h"
+
+namespace Data {
+namespace {
+
+constexpr auto kPerPage = 50;
+
+} // namespace
+
+SavedMusic::SavedMusic(not_null<Session*> owner)
+: _owner(owner) {
+}
+
+bool SavedMusic::Supported(PeerId peerId) {
+	return peerId && peerIsUser(peerId);
+}
+
+bool SavedMusic::has(not_null<DocumentData*> document) const {
+	const auto entry = lookupEntry(_owner->session().userPeerId());
+	return entry && ranges::contains(entry->list, document);
+}
+
+void SavedMusic::save(not_null<DocumentData*> document) {
+	const auto peerId = _owner->session().userPeerId();
+	auto &entry = _entries[peerId];
+	if (entry.list.empty() && !entry.loaded) {
+		loadMore(peerId);
+	}
+	if (ranges::contains(entry.list, document)) {
+		return;
+	}
+	entry.list.insert(begin(entry.list), document);
+	if (entry.total >= 0) {
+		++entry.total;
+	}
+	_owner->session().api().request(MTPaccount_SaveMusic(
+		MTP_flags(0),
+		document->mtpInput(),
+		MTPInputDocument()
+	)).send();
+	_changed.fire_copy(peerId);
+}
+
+void SavedMusic::remove(not_null<DocumentData*> document) {
+	const auto peerId = _owner->session().userPeerId();
+	auto &entry = _entries[peerId];
+	const auto i = ranges::remove(entry.list, document);
+	if (const auto removed = int(end(entry.list) - i)) {
+		entry.list.erase(i, end(entry.list));
+		if (entry.total >= 0) {
+			entry.total = std::max(entry.total - removed, 0);
+		}
+	}
+	_owner->session().api().request(MTPaccount_SaveMusic(
+		MTP_flags(MTPaccount_SaveMusic::Flag::f_unsave),
+		document->mtpInput(),
+		MTPInputDocument()
+	)).send();
+	_changed.fire_copy(peerId);
+}
+
+bool SavedMusic::countKnown(PeerId peerId) const {
+	if (!Supported(peerId)) {
+		return true;
+	}
+	const auto entry = lookupEntry(peerId);
+	return entry && entry->total >= 0;
+}
+
+int SavedMusic::count(PeerId peerId) const {
+	if (!Supported(peerId)) {
+		return 0;
+	}
+	const auto entry = lookupEntry(peerId);
+	return entry ? std::max(entry->total, 0) : 0;
+}
+
+const std::vector<not_null<DocumentData*>> &SavedMusic::list(
+		PeerId peerId) const {
+	static const auto empty = std::vector<not_null<DocumentData*>>();
+	if (!Supported(peerId)) {
+		return empty;
+	}
+
+	const auto entry = lookupEntry(peerId);
+	return entry ? entry->list : empty;
+}
+
+void SavedMusic::loadMore(PeerId peerId) {
+	loadMore(peerId, false);
+}
+
+void SavedMusic::loadMore(PeerId peerId, bool reload) {
+	if (!Supported(peerId)) {
+		return;
+	}
+
+	auto &entry = _entries[peerId];
+	if (!entry.reloading && reload) {
+		_owner->session().api().request(
+			base::take(entry.requestId)).cancel();
+	}
+	if ((!reload && entry.loaded) || entry.requestId) {
+		return;
+	}
+	const auto user = _owner->peer(peerId)->asUser();
+	Assert(user != nullptr);
+
+	entry.reloading = reload;
+	entry.requestId = _owner->session().api().request(MTPusers_GetSavedMusic(
+		user->inputUser,
+		MTP_int(reload ? 0 : entry.list.size()),
+		MTP_int(kPerPage),
+		MTP_long(reload ? firstPageHash(entry) : 0)
+	)).done([=](const MTPusers_SavedMusic &result) {
+		auto &entry = _entries[peerId];
+		entry.requestId = 0;
+		const auto reloaded = base::take(entry.reloading);
+		result.match([&](const MTPDusers_savedMusicNotModified &) {
+		}, [&](const MTPDusers_savedMusic &data) {
+			const auto list = data.vdocuments().v;
+			const auto count = int(list.size());
+			entry.total = std::max(count, data.vcount().v);
+			if (reloaded) {
+				entry.list.clear();
+			}
+			for (const auto &item : list) {
+				const auto document = _owner->processDocument(item);
+				if (!ranges::contains(entry.list, document)) {
+					entry.list.push_back(document);
+				}
+			}
+			entry.loaded = list.empty() || (count == entry.list.size());
+		});
+		_changed.fire_copy(peerId);
+	}).fail([=](const MTP::Error &error) {
+		auto &entry = _entries[peerId];
+		entry.requestId = 0;
+		entry.total = int(entry.list.size());
+		entry.loaded = true;
+		_changed.fire_copy(peerId);
+	}).send();
+}
+
+uint64 SavedMusic::firstPageHash(const Entry &entry) const {
+	return Api::CountHash(entry.list
+		| ranges::views::transform(&DocumentData::id)
+		| ranges::views::take(kPerPage));
+}
+
+rpl::producer<PeerId> SavedMusic::changed() const {
+	return _changed.events();
+}
+
+SavedMusic::Entry *SavedMusic::lookupEntry(PeerId peerId) {
+	if (!Supported(peerId)) {
+		return nullptr;
+	}
+
+	auto it = _entries.find(peerId);
+	if (it == end(_entries)) {
+		return nullptr;
+	}
+	return &it->second;
+}
+
+const SavedMusic::Entry *SavedMusic::lookupEntry(PeerId peerId) const {
+	return const_cast<SavedMusic*>(this)->lookupEntry(peerId);
+}
+
+rpl::producer<SavedMusicSlice> SavedMusicList(
+		not_null<PeerData*> peer,
+		DocumentData *aroundId,
+		int limit) {
+	if (!peer->isUser()) {
+		return rpl::single(SavedMusicSlice({}, 0, 0, 0));
+	}
+	return [=](auto consumer) {
+		auto lifetime = rpl::lifetime();
+
+		struct State {
+			SavedMusicSlice slice;
+			base::has_weak_ptr guard;
+			bool scheduled = false;
+		};
+		const auto state = lifetime.make_state<State>();
+
+		const auto push = [=] {
+			state->scheduled = false;
+
+			const auto peerId = peer->id;
+			const auto savedMusic = &peer->owner().savedMusic();
+			if (!savedMusic->countKnown(peerId)) {
+				return;
+			}
+			const auto &loaded = savedMusic->list(peerId);
+			const auto count = savedMusic->count(peerId);
+			auto i = aroundId
+				? ranges::find(loaded, not_null(aroundId))
+				: begin(loaded);
+			if (i == end(loaded)) {
+				i = begin(loaded);
+			}
+			const auto hasBefore = int(i - begin(loaded));
+			const auto hasAfter = int(end(loaded) - i);
+			if (hasAfter < limit) {
+				savedMusic->loadMore(peerId);
+			}
+			const auto takeBefore = std::min(hasBefore, limit);
+			const auto takeAfter = std::min(hasAfter, limit);
+			auto ids = std::vector<not_null<DocumentData*>>();
+			ids.reserve(takeBefore + takeAfter);
+			for (auto j = i - takeBefore; j != i + takeAfter; ++j) {
+				ids.push_back(*j);
+			}
+			const auto added = int(ids.size());
+			state->slice = SavedMusicSlice(
+				std::move(ids),
+				count,
+				(hasBefore - takeBefore),
+				count - hasBefore - added);
+			consumer.put_next_copy(state->slice);
+		};
+		const auto schedule = [=] {
+			if (state->scheduled) {
+				return;
+			}
+			state->scheduled = true;
+			Ui::PostponeCall(&state->guard, [=] {
+				if (state->scheduled) {
+					push();
+				}
+			});
+		};
+
+		const auto peerId = peer->id;
+		const auto savedMusic = &peer->owner().savedMusic();
+		savedMusic->changed(
+		) | rpl::filter(
+			rpl::mappers::_1 == peerId
+		) | rpl::start_with_next(schedule, lifetime);
+
+		if (!savedMusic->countKnown(peerId)) {
+			savedMusic->loadMore(peerId);
+		}
+
+		push();
+
+		return lifetime;
+	};
+}
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_saved_music.h b/Telegram/SourceFiles/data/data_saved_music.h
new file mode 100644
index 0000000000..8d2ab338bd
--- /dev/null
+++ b/Telegram/SourceFiles/data/data_saved_music.h
@@ -0,0 +1,65 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "data/data_abstract_sparse_ids.h"
+
+class PeerData;
+
+namespace Data {
+
+class Session;
+
+class SavedMusic final {
+public:
+	explicit SavedMusic(not_null<Session*> owner);
+
+	[[nodiscard]] static bool Supported(PeerId peerId);
+
+	[[nodiscard]] bool countKnown(PeerId peerId) const;
+	[[nodiscard]] int count(PeerId peerId) const;
+	[[nodiscard]] const std::vector<not_null<DocumentData*>> &list(
+		PeerId peerId) const;
+	void loadMore(PeerId peerId);
+
+	[[nodiscard]] rpl::producer<PeerId> changed() const;
+
+	[[nodiscard]] bool has(not_null<DocumentData*> document) const;
+	void save(not_null<DocumentData*> document);
+	void remove(not_null<DocumentData*> document);
+
+private:
+	struct Entry {
+		std::vector<not_null<DocumentData*>> list;
+		mtpRequestId requestId = 0;
+		int total = -1;
+		bool loaded = false;
+		bool reloading = false;
+	};
+
+	void loadMore(PeerId peerId, bool reload);
+	[[nodiscard]] Entry *lookupEntry(PeerId peerId);
+	[[nodiscard]] const Entry *lookupEntry(PeerId peerId) const;
+	[[nodiscard]] uint64 firstPageHash(const Entry &entry) const;
+
+	const not_null<Session*> _owner;
+
+	std::unordered_map<PeerId, Entry> _entries;
+	rpl::event_stream<PeerId> _changed;
+
+};
+
+using SavedMusicSlice = AbstractSparseIds<
+	std::vector<not_null<DocumentData*>>>;
+
+[[nodiscard]] rpl::producer<SavedMusicSlice> SavedMusicList(
+	not_null<PeerData*> peer,
+	DocumentData *aroundId,
+	int limit);
+
+} // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 228840c06b..a7009dfb68 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -66,6 +66,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_icons.h"
 #include "data/data_cloud_themes.h"
 #include "data/data_saved_messages.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_stories.h"
 #include "data/data_streaming.h"
@@ -250,6 +251,7 @@ Session::Session(not_null<Main::Session*> session)
 , _notifySettings(std::make_unique<NotifySettings>(this))
 , _customEmojiManager(std::make_unique<CustomEmojiManager>(this))
 , _stories(std::make_unique<Stories>(this))
+, _savedMusic(std::make_unique<SavedMusic>(this))
 , _savedMessages(std::make_unique<SavedMessages>(this))
 , _chatbots(std::make_unique<Chatbots>(this))
 , _businessInfo(std::make_unique<BusinessInfo>(this))
diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h
index 6daa540e5f..fba78f17ba 100644
--- a/Telegram/SourceFiles/data/data_session.h
+++ b/Telegram/SourceFiles/data/data_session.h
@@ -66,6 +66,7 @@ class GroupCall;
 class NotifySettings;
 class CustomEmojiManager;
 class Stories;
+class SavedMusic;
 class SavedMessages;
 class Chatbots;
 class BusinessInfo;
@@ -184,6 +185,9 @@ public:
 	[[nodiscard]] Stories &stories() const {
 		return *_stories;
 	}
+	[[nodiscard]] SavedMusic &savedMusic() const {
+		return *_savedMusic;
+	}
 	[[nodiscard]] SavedMessages &savedMessages() const {
 		return *_savedMessages;
 	}
@@ -1235,6 +1239,7 @@ private:
 	const std::unique_ptr<NotifySettings> _notifySettings;
 	const std::unique_ptr<CustomEmojiManager> _customEmojiManager;
 	const std::unique_ptr<Stories> _stories;
+	const std::unique_ptr<SavedMusic> _savedMusic;
 	const std::unique_ptr<SavedMessages> _savedMessages;
 	const std::unique_ptr<Chatbots> _chatbots;
 	const std::unique_ptr<BusinessInfo> _businessInfo;
diff --git a/Telegram/SourceFiles/data/data_stories.cpp b/Telegram/SourceFiles/data/data_stories.cpp
index c792aa0826..5d7c335194 100644
--- a/Telegram/SourceFiles/data/data_stories.cpp
+++ b/Telegram/SourceFiles/data/data_stories.cpp
@@ -1721,7 +1721,7 @@ rpl::producer<StoryAlbumIdsKey> Stories::albumIdsChanged() const {
 
 int Stories::albumIdsCount(PeerId peerId, int albumId) const {
 	const auto set = albumIdsSet(peerId, albumId);
-	return set ? set->total : 0;
+	return set ? std::max(set->total, 0) : 0;
 }
 
 bool Stories::albumIdsCountKnown(PeerId peerId, int albumId) const {
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index ee963abd0c..be9932b6d5 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -86,6 +86,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "data/components/factchecks.h"
 #include "data/components/sponsored_messages.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
 #include "data/data_document.h"
@@ -2550,6 +2551,20 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				saveDocumentToFile(itemId, document);
 			}), &st::menuIconDownload);
 
+			if (document->isSong()) {
+				if (document->owner().savedMusic().has(document)) {
+					_menu->addAction(u"remove muzlo :("_q, [=] {
+						document->owner().savedMusic().remove(document);
+						_controller->showToast(u"removed from muzlo!"_q);
+					}, &st::menuIconUnfave);
+				} else {
+					_menu->addAction(u"to muzlo!"_q, [=] {
+						document->owner().savedMusic().save(document);
+						_controller->showToast(u"added to muzlo! :)"_q);
+					}, &st::menuIconFave);
+				}
+			}
+
 			HistoryView::AddCopyFilename(
 				_menu,
 				document,
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index c696a6973e..075bd6a7e2 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -18,6 +18,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_widget.h"
 #include "info/common_groups/info_common_groups_widget.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/saved/info_saved_music_common.h"
 #include "info/stories/info_stories_common.h"
 #include "info/info_layer_widget.h"
 #include "info/info_section_widget.h"
@@ -489,6 +490,8 @@ Key ContentMemento::key() const {
 			storiesAlbumId(),
 			storiesAddToAlbumId(),
 		};
+	} else if (const auto music = musicPeer()) {
+		return Saved::MusicTag{ music };
 	} else if (statisticsTag().peer) {
 		return statisticsTag();
 	} else if (const auto starref = starrefPeer()) {
@@ -536,6 +539,10 @@ ContentMemento::ContentMemento(Stories::Tag stories)
 , _storiesAddToAlbumId(stories.addingToAlbumId) {
 }
 
+ContentMemento::ContentMemento(Saved::MusicTag music)
+: _musicPeer(music.peer) {
+}
+
 ContentMemento::ContentMemento(PeerGifts::Tag gifts)
 : _giftsPeer(gifts.peer)
 , _giftsCollectionId(gifts.collectionId) {
diff --git a/Telegram/SourceFiles/info/info_content_widget.h b/Telegram/SourceFiles/info/info_content_widget.h
index 647124d0b7..148d20ae39 100644
--- a/Telegram/SourceFiles/info/info_content_widget.h
+++ b/Telegram/SourceFiles/info/info_content_widget.h
@@ -68,6 +68,10 @@ namespace Info::Stories {
 struct Tag;
 } // namespace Info::Stories
 
+namespace Info::Saved {
+struct MusicTag;
+} // namespace Info::Saved
+
 namespace Info {
 
 class ContentMemento;
@@ -219,6 +223,7 @@ public:
 	explicit ContentMemento(Settings::Tag settings);
 	explicit ContentMemento(Downloads::Tag downloads);
 	explicit ContentMemento(Stories::Tag stories);
+	explicit ContentMemento(Saved::MusicTag music);
 	explicit ContentMemento(Statistics::Tag statistics);
 	explicit ContentMemento(BotStarRef::Tag starref);
 	explicit ContentMemento(GlobalMedia::Tag global);
@@ -261,6 +266,9 @@ public:
 	[[nodiscard]] int storiesAddToAlbumId() const {
 		return _storiesAddToAlbumId;
 	}
+	[[nodiscard]] PeerData *musicPeer() const {
+		return _musicPeer;
+	}
 	[[nodiscard]] PeerData *giftsPeer() const {
 		return _giftsPeer;
 	}
@@ -333,6 +341,7 @@ private:
 	PeerData * const _storiesPeer = nullptr;
 	int _storiesAlbumId = 0;
 	int _storiesAddToAlbumId = 0;
+	PeerData * const _musicPeer = nullptr;
 	PeerData * const _giftsPeer = nullptr;
 	int _giftsCollectionId = 0;
 	Statistics::Tag _statisticsTag;
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 64b171919c..42f8972a0a 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -49,6 +49,9 @@ Key::Key(Downloads::Tag downloads) : _value(downloads) {
 Key::Key(Stories::Tag stories) : _value(stories) {
 }
 
+Key::Key(Saved::MusicTag music) : _value(music) {
+}
+
 Key::Key(Statistics::Tag statistics) : _value(statistics) {
 }
 
@@ -135,6 +138,13 @@ int Key::storiesAddToAlbumId() const {
 	return 0;
 }
 
+PeerData *Key::musicPeer() const {
+	if (const auto tag = std::get_if<Saved::MusicTag>(&_value)) {
+		return tag->peer;
+	}
+	return nullptr;
+}
+
 PeerData *Key::giftsPeer() const {
 	if (const auto tag = std::get_if<PeerGifts::Tag>(&_value)) {
 		return tag->peer;
@@ -392,6 +402,7 @@ bool Controller::validateMementoPeer(
 		&& memento->migratedPeerId() == migratedPeerId()
 		&& memento->settingsSelf() == settingsSelf()
 		&& memento->storiesPeer() == storiesPeer()
+		&& memento->musicPeer() == musicPeer()
 		&& memento->statisticsTag().peer == statisticsTag().peer
 		&& memento->starrefPeer() == starrefPeer()
 		&& memento->starrefType() == starrefType();
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 5c3bfe46a0..14ad24d686 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_message_reaction_id.h"
 #include "data/data_search_controller.h"
 #include "info/peer_gifts/info_peer_gifts_common.h"
+#include "info/saved/info_saved_music_common.h"
 #include "info/statistics/info_statistics_tag.h"
 #include "info/stories/info_stories_common.h"
 #include "window/window_session_controller.h"
@@ -82,6 +83,7 @@ public:
 	Key(Settings::Tag settings);
 	Key(Downloads::Tag downloads);
 	Key(Stories::Tag stories);
+	Key(Saved::MusicTag music);
 	Key(Statistics::Tag statistics);
 	Key(PeerGifts::Tag gifts);
 	Key(BotStarRef::Tag starref);
@@ -101,6 +103,7 @@ public:
 	[[nodiscard]] PeerData *storiesPeer() const;
 	[[nodiscard]] int storiesAlbumId() const;
 	[[nodiscard]] int storiesAddToAlbumId() const;
+	[[nodiscard]] PeerData *musicPeer() const;
 	[[nodiscard]] PeerData *giftsPeer() const;
 	[[nodiscard]] int giftsCollectionId() const;
 	[[nodiscard]] Statistics::Tag statisticsTag() const;
@@ -130,6 +133,7 @@ private:
 		Settings::Tag,
 		Downloads::Tag,
 		Stories::Tag,
+		Saved::MusicTag,
 		Statistics::Tag,
 		PeerGifts::Tag,
 		BotStarRef::Tag,
@@ -160,6 +164,7 @@ public:
 		Settings,
 		Downloads,
 		Stories,
+		SavedMusic,
 		PollResults,
 		Statistics,
 		BotStarRef,
@@ -239,6 +244,9 @@ public:
 	[[nodiscard]] int storiesAddToAlbumId() const {
 		return key().storiesAddToAlbumId();
 	}
+	[[nodiscard]] PeerData *musicPeer() const {
+		return key().musicPeer();
+	}
 	[[nodiscard]] PeerData *giftsPeer() const {
 		return key().giftsPeer();
 	}
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.cpp b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
index 473a9558bd..f83ece49cc 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
@@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/ui_integration.h"
 #include "data/components/recent_shared_media_gifts.h"
 #include "data/data_channel.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
@@ -25,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/info_memento.h"
 #include "info/peer_gifts/info_peer_gifts_widget.h"
 #include "info/profile/info_profile_values.h"
+#include "info/saved/info_saved_music_widget.h"
 #include "info/stories/info_stories_widget.h"
 #include "main/main_session.h"
 #include "ui/text/text_utilities.h"
@@ -392,4 +394,43 @@ not_null<Ui::SettingsButton*> AddPeerGiftsButton(
 	return wrap->entity();
 }
 
+not_null<Ui::SettingsButton*> AddMusicButton(
+		Ui::VerticalLayout *parent,
+		not_null<Window::SessionNavigation*> navigation,
+		not_null<PeerData*> peer) {
+	auto count = rpl::single(0) | rpl::then(Data::SavedMusicList(
+		peer,
+		nullptr,
+		0
+	) | rpl::map([](const Data::SavedMusicSlice &slice) {
+		return slice.fullCount().value_or(0);
+	}));
+
+	using namespace ::Settings;
+	auto forked = std::move(count)
+		| start_spawning(parent->lifetime());
+	auto text = rpl::duplicate(
+		forked
+	) | rpl::map([](int count) {
+		AssertIsDebug();
+		return QString::number(count) + u" muzla"_q;
+	});
+	auto button = parent->add(object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
+		parent,
+		object_ptr<Ui::SettingsButton>(
+			parent,
+			std::move(text),
+			st::infoSharedMediaButton))
+	)->setDuration(
+		st::infoSlideDuration
+	)->toggleOn(
+		rpl::duplicate(forked) | rpl::map(rpl::mappers::_1 > 0)
+	)->entity();
+
+	button->addClickHandler([=] {
+		navigation->showSection(Info::Saved::MakeMusic(peer));
+	});
+	return button;
+}
+
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index a8a24feb47..161e59a573 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -77,4 +77,9 @@ using Type = Storage::SharedMediaType;
 	not_null<PeerData*> peer,
 	Ui::MultiSlideTracker &tracker);
 
+[[nodiscard]] not_null<Ui::SettingsButton*> AddMusicButton(
+	Ui::VerticalLayout *parent,
+	not_null<Window::SessionNavigation*> navigation,
+	not_null<PeerData*> peer);
+
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 3c62d16368..95c93ba3e4 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "info/media/info_media_provider.h"
 #include "info/media/info_media_list_section.h"
 #include "info/downloads/info_downloads_provider.h"
+#include "info/saved/info_saved_music_provider.h"
 #include "info/stories/info_stories_provider.h"
 #include "info/info_controller.h"
 #include "layout/layout_mosaic.h"
@@ -98,6 +99,8 @@ struct ListWidget::DateBadge {
 		not_null<AbstractController*> controller) {
 	if (controller->isDownloads()) {
 		return std::make_unique<Downloads::Provider>(controller);
+	} else if (controller->musicPeer()) {
+		return std::make_unique<Saved::MusicProvider>(controller);
 	} else if (controller->storiesPeer()) {
 		return std::make_unique<Stories::Provider>(controller);
 	} else if (controller->section().type() == Section::Type::GlobalMedia) {
@@ -196,6 +199,9 @@ void ListWidget::start() {
 		setupStoriesTrackIds();
 		trackSession(&session());
 		restart();
+	} else if (_controller->musicPeer()) {
+		trackSession(&session());
+		restart();
 	} else {
 		trackSession(&session());
 
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index 5fe27a2eb7..a8faadb1e3 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -21,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo.h"
 #include "data/data_file_origin.h"
 #include "data/data_user.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_sublist.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
@@ -80,6 +81,14 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 	_cover = AddCover(result, _controller, _peer, _topic, _sublist);
 	if (_topic && _topic->creating()) {
 		return result;
+	} else if (Data::SavedMusic::Supported(_peer->id)) {
+		object_ptr<Profile::FloatingIcon>(
+			Media::AddMusicButton(
+				result,
+				_controller,
+				_peer),
+			st::infoIconMediaAudio,
+			st::infoSharedMediaButtonIconPosition);
 	}
 
 	AddDetails(result, _controller, _peer, _topic, _sublist, origin);
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_common.h b/Telegram/SourceFiles/info/saved/info_saved_music_common.h
new file mode 100644
index 0000000000..f40ffae8bc
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_common.h
@@ -0,0 +1,20 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Info::Saved {
+
+struct MusicTag {
+	explicit MusicTag(not_null<PeerData*> peer)
+	: peer(peer) {
+	}
+
+	not_null<PeerData*> peer;
+};
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
new file mode 100644
index 0000000000..99fe45ba40
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -0,0 +1,462 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/saved/info_saved_music_provider.h"
+
+#include "base/unixtime.h"
+#include "core/application.h"
+#include "data/data_changes.h"
+#include "data/data_channel.h"
+#include "data/data_document.h"
+#include "data/data_media_types.h"
+#include "data/data_saved_music.h"
+#include "data/data_session.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
+#include "history/history.h"
+#include "info/media/info_media_widget.h"
+#include "info/media/info_media_list_section.h"
+#include "info/info_controller.h"
+#include "main/main_account.h"
+#include "main/main_session.h"
+#include "layout/layout_selection.h"
+#include "storage/storage_shared_media.h"
+#include "styles/style_info.h"
+#include "styles/style_overview.h"
+
+namespace Info::Saved {
+namespace {
+
+using namespace Media;
+
+constexpr auto kPreloadedScreensCount = 4;
+constexpr auto kPreloadedScreensCountFull
+	= kPreloadedScreensCount + 1 + kPreloadedScreensCount;
+
+[[nodiscard]] int MinStoryHeight(int width) {
+	auto itemsLeft = st::infoMediaSkip;
+	auto itemsInRow = (width - itemsLeft)
+		/ (st::infoMediaMinGridSize + st::infoMediaSkip);
+	return (st::infoMediaMinGridSize + st::infoMediaSkip) / itemsInRow;
+}
+
+} // namespace
+
+MusicProvider::MusicProvider(not_null<AbstractController*> controller)
+: _controller(controller)
+, _peer(controller->key().musicPeer())
+, _history(_peer->owner().history(_peer)) {
+	style::PaletteChanged(
+	) | rpl::start_with_next([=] {
+		for (auto &layout : _layouts) {
+			layout.second.item->invalidateCache();
+		}
+	}, _lifetime);
+}
+
+MusicProvider::~MusicProvider() {
+	clear();
+}
+
+Type MusicProvider::type() {
+	return Type::MusicFile;
+}
+
+bool MusicProvider::hasSelectRestriction() {
+	if (_peer->session().frozen()) {
+		return true;
+	}
+	return !_peer->isSelf();
+}
+
+rpl::producer<bool> MusicProvider::hasSelectRestrictionChanges() {
+	return rpl::never<bool>();
+}
+
+bool MusicProvider::sectionHasFloatingHeader() {
+	return false;
+}
+
+not_null<DocumentData*> MusicProvider::musicIdFromMsgId(MsgId itemId) const {
+	const auto i = _musicIdFromMsgId.find(itemId);
+	Assert(i != end(_musicIdFromMsgId));
+
+	return i->second;
+}
+
+not_null<HistoryItem*> MusicProvider::musicIdToMsg(
+		not_null<DocumentData*> id) const {
+	const auto i = _musicIdToMsg.find(id);
+	if (i != end(_musicIdToMsg)) {
+		return i->second.get();
+	}
+	return _musicIdToMsg.emplace(id, _history->makeMessage({
+		.id = _history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem | MessageFlag::HasFromId),
+		.from = _peer->id,
+		.date = base::unixtime::now(),
+	}, id, TextWithEntities())).first->second.get();
+}
+
+MsgId MusicProvider::musicIdToMsgId(not_null<DocumentData*> id) const {
+	return musicIdToMsg(id)->id;
+}
+
+QString MusicProvider::sectionTitle(not_null<const BaseLayout*> item) {
+	return QString();
+}
+
+bool MusicProvider::sectionItemBelongsHere(
+		not_null<const BaseLayout*> item,
+		not_null<const BaseLayout*> previous) {
+	return true;
+}
+
+bool MusicProvider::isPossiblyMyItem(not_null<const HistoryItem*> item) {
+	return true;
+}
+
+std::optional<int> MusicProvider::fullCount() {
+	return _slice.fullCount();
+}
+
+void MusicProvider::clear() {
+	_layouts.clear();
+	_aroundId = nullptr;
+	_idsLimit = kMinimalIdsLimit;
+	_slice = Data::SavedMusicSlice();
+}
+
+void MusicProvider::restart() {
+	clear();
+	refreshViewer();
+}
+
+void MusicProvider::checkPreload(
+		QSize viewport,
+		not_null<BaseLayout*> topLayout,
+		not_null<BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) {
+	const auto visibleWidth = viewport.width();
+	const auto visibleHeight = viewport.height();
+	const auto preloadedHeight = kPreloadedScreensCountFull * visibleHeight;
+	const auto minItemHeight = MinStoryHeight(visibleWidth);
+	const auto preloadedCount = preloadedHeight / minItemHeight;
+	const auto preloadIdsLimitMin = (preloadedCount / 2) + 1;
+	const auto preloadIdsLimit = preloadIdsLimitMin
+		+ (visibleHeight / minItemHeight);
+	const auto after = _slice.skippedAfter();
+	const auto topLoaded = after && (*after == 0);
+	const auto before = _slice.skippedBefore();
+	const auto bottomLoaded = before && (*before == 0);
+
+	const auto minScreenDelta = kPreloadedScreensCount
+		- kPreloadIfLessThanScreens;
+	const auto minIdDelta = (minScreenDelta * visibleHeight)
+		/ minItemHeight;
+	const auto preloadAroundItem = [&](not_null<BaseLayout*> layout) {
+		auto preloadRequired = false;
+		const auto id = musicIdFromMsgId(layout->getItem()->id);
+		if (!preloadRequired) {
+			preloadRequired = (_idsLimit < preloadIdsLimitMin);
+		}
+		if (!preloadRequired) {
+			auto delta = _slice.distance(_aroundId, id);
+			Assert(delta != std::nullopt);
+			preloadRequired = (qAbs(*delta) >= minIdDelta);
+		}
+		if (preloadRequired) {
+			_idsLimit = preloadIdsLimit;
+			_aroundId = id;
+			refreshViewer();
+		}
+	};
+
+	if (preloadTop && !topLoaded) {
+		preloadAroundItem(topLayout);
+	} else if (preloadBottom && !bottomLoaded) {
+		preloadAroundItem(bottomLayout);
+	}
+}
+
+void MusicProvider::setSearchQuery(QString query) {
+}
+
+void MusicProvider::refreshViewer() {
+	_viewerLifetime.destroy();
+	const auto aroundId = _aroundId;
+	auto ids = Data::SavedMusicList(_peer, aroundId, _idsLimit);
+	std::move(
+		ids
+	) | rpl::start_with_next([=](Data::SavedMusicSlice &&slice) {
+		if (!slice.fullCount()) {
+			// Don't display anything while full count is unknown.
+			return;
+		}
+		_slice = std::move(slice);
+
+		auto nearestId = (DocumentData*)nullptr;
+		for (auto i = 0; i != _slice.size(); ++i) {
+			if (_slice[i] == aroundId) {
+				nearestId = aroundId;
+				break;
+			}
+		}
+		if (!nearestId && _slice.size() > 0) {
+			_aroundId = _slice[_slice.size() / 2];
+		}
+		_refreshed.fire({});
+	}, _viewerLifetime);
+}
+
+rpl::producer<> MusicProvider::refreshed() {
+	return _refreshed.events();
+}
+
+std::vector<ListSection> MusicProvider::fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) {
+	markLayoutsStale();
+	const auto guard = gsl::finally([&] { clearStaleLayouts(); });
+
+	auto result = std::vector<ListSection>();
+	auto section = ListSection(Type::MusicFile, sectionDelegate());
+	auto count = _slice.size();
+	for (auto i = 0; i != count; ++i) {
+		const auto musicId = _slice[i];
+		if (const auto layout = getLayout(musicId, delegate)) {
+			if (!section.addItem(layout)) {
+				section.finishSection();
+				result.push_back(std::move(section));
+				section = ListSection(Type::MusicFile, sectionDelegate());
+				section.addItem(layout);
+			}
+		}
+	}
+	if (!section.empty()) {
+		section.finishSection();
+		result.push_back(std::move(section));
+	}
+	return result;
+}
+
+void MusicProvider::markLayoutsStale() {
+	for (auto &layout : _layouts) {
+		layout.second.stale = true;
+	}
+}
+
+void MusicProvider::clearStaleLayouts() {
+	for (auto i = _layouts.begin(); i != _layouts.end();) {
+		if (i->second.stale) {
+			_layoutRemoved.fire(i->second.item.get());
+			i = _layouts.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+rpl::producer<not_null<BaseLayout*>> MusicProvider::layoutRemoved() {
+	return _layoutRemoved.events();
+}
+
+BaseLayout *MusicProvider::lookupLayout(const HistoryItem *item) {
+	return nullptr;
+}
+
+bool MusicProvider::isMyItem(not_null<const HistoryItem*> item) {
+	return IsStoryMsgId(item->id) && (item->history()->peer == _peer);
+}
+
+bool MusicProvider::isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) {
+	return (a->id < b->id);
+}
+
+BaseLayout *MusicProvider::getLayout(
+		not_null<DocumentData*> id,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	auto it = _layouts.find(id);
+	if (it == _layouts.end()) {
+		if (auto layout = createLayout(id, delegate)) {
+			layout->initDimensions();
+			it = _layouts.emplace(id, std::move(layout)).first;
+		} else {
+			return nullptr;
+		}
+	}
+	it->second.stale = false;
+	return it->second.item.get();
+}
+
+std::unique_ptr<BaseLayout> MusicProvider::createLayout(
+		not_null<DocumentData*> id,
+		not_null<Overview::Layout::Delegate*> delegate) {
+	const auto item = musicIdToMsg(id);
+	if (!item) {
+		return nullptr;
+	}
+	const auto getPhoto = [&]() -> PhotoData* {
+		if (const auto media = item->media()) {
+			return media->photo();
+		}
+		return nullptr;
+	};
+	const auto getFile = [&]() -> DocumentData* {
+		if (const auto media = item->media()) {
+			return media->document();
+		}
+		return nullptr;
+	};
+
+	const auto peer = item->history()->peer;
+
+	using namespace Overview::Layout;
+	const auto options = MediaOptions{
+	};
+	if (const auto file = getFile()) {
+		return std::make_unique<Document>(
+			delegate,
+			item,
+			DocumentFields{ file },
+			st::overviewFileLayout);
+	}
+	return nullptr;
+}
+
+ListItemSelectionData MusicProvider::computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) {
+	auto result = ListItemSelectionData(selection);
+	const auto id = item->id;
+	if (!_musicIdFromMsgId.contains(id)) {
+		return result;
+	}
+	AssertIsDebug();
+	//const auto peer = item->history()->peer;
+	//const auto channel = peer->asChannel();
+	//const auto maybeStory = peer->owner().stories().lookup(
+	//	{ peer->id, StoryIdFromMsgId(id) });
+	//if (maybeStory) {
+	//	const auto story = *maybeStory;
+	//	result.canForward = peer->isSelf() && story->canShare();
+	//	result.canDelete = story->canDelete();
+	//	result.canUnpinStory = story->pinnedToTop();
+	//	result.storyInProfile = story->inProfile();
+	//}
+	//result.canToggleStoryPin = peer->isSelf()
+	//	|| (channel && channel->canEditStories());
+	return result;
+}
+
+void MusicProvider::applyDragSelection(
+		ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) {
+	const auto fromId = fromItem->id - (skipFrom ? 1 : 0);
+	const auto tillId = tillItem->id - (skipTill ? 0 : 1);
+	for (auto i = selected.begin(); i != selected.end();) {
+		const auto itemId = i->first->id;
+		if (itemId > fromId || itemId <= tillId) {
+			i = selected.erase(i);
+		} else {
+			++i;
+		}
+	}
+	for (auto &layoutItem : _layouts) {
+		const auto musicId = layoutItem.first;
+		const auto item = musicIdToMsg(musicId);
+		if (item->id <= fromId && item->id > tillId) {
+			ChangeItemSelection(
+				selected,
+				item,
+				computeSelectionData(item, FullSelection));
+		}
+	}
+}
+
+bool MusicProvider::allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return false;
+}
+
+QString MusicProvider::showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) {
+	return QString();
+}
+
+int64 MusicProvider::scrollTopStatePosition(not_null<HistoryItem*> item) {
+	return StoryIdFromMsgId(item->id);
+}
+
+HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {
+	if (state.item && _slice.indexOf(musicIdFromMsgId(state.item->id))) {
+		return state.item;
+	//} else if (const auto id = _slice.nearest(state.position)) {
+	//	const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*id));
+	//	if (const auto item = _controller->session().data().message(full)) {
+	//		return item;
+	//	}
+	}
+
+	auto nearestId = (DocumentData*)nullptr; AssertIsDebug();
+	//for (auto i = 0; i != _slice.size(); ++i) {
+	//	if (!nearestId
+	//		|| std::abs(*nearestId - state.position)
+	//			> std::abs(_slice[i] - state.position)) {
+	//		nearestId = _slice[i];
+	//	}
+	//}
+	if (nearestId) {
+		const auto full = FullMsgId(_peer->id, musicIdToMsgId(nearestId));
+		if (const auto item = _controller->session().data().message(full)) {
+			return item;
+		}
+	}
+
+	return state.item;
+}
+
+void MusicProvider::saveState(
+		not_null<Media::Memento*> memento,
+		ListScrollTopState scrollState) {
+	if (_aroundId != nullptr && scrollState.item) {
+		AssertIsDebug();
+		//memento->setAroundId({ _peer->id, StoryIdToMsgId(_aroundId) });
+		//memento->setIdsLimit(_idsLimit);
+		//memento->setScrollTopItem(scrollState.item->globalId());
+		//memento->setScrollTopItemPosition(scrollState.position);
+		//memento->setScrollTopShift(scrollState.shift);
+	}
+}
+
+void MusicProvider::restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(ListScrollTopState)> restoreScrollState) {
+	if (const auto limit = memento->idsLimit()) {
+		const auto wasAroundId = memento->aroundId();
+		if (wasAroundId.peer == _peer->id) {
+			_idsLimit = limit;
+			AssertIsDebug();
+			//_aroundId = StoryIdFromMsgId(wasAroundId.msg);
+			restoreScrollState({
+				.position = memento->scrollTopItemPosition(),
+				.item = MessageByGlobalId(memento->scrollTopItem()),
+				.shift = memento->scrollTopShift(),
+			});
+			refreshViewer();
+		}
+	}
+}
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.h b/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
new file mode 100644
index 0000000000..483d6e6a0e
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
@@ -0,0 +1,141 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "base/weak_ptr.h"
+#include "data/data_saved_music.h"
+#include "info/media/info_media_common.h"
+#include "info/saved/info_saved_music_common.h"
+#include "history/history_item.h"
+
+class DocumentData;
+class HistoryItem;
+class PeerData;
+class History;
+
+namespace Info {
+class AbstractController;
+} // namespace Info
+
+namespace Info::Saved {
+
+class MusicProvider final
+	: public Media::ListProvider
+	, private Media::ListSectionDelegate
+	, public base::has_weak_ptr {
+public:
+	explicit MusicProvider(not_null<AbstractController*> controller);
+	~MusicProvider();
+
+	Media::Type type() override;
+	bool hasSelectRestriction() override;
+	rpl::producer<bool> hasSelectRestrictionChanges() override;
+	bool isPossiblyMyItem(not_null<const HistoryItem*> item) override;
+
+	std::optional<int> fullCount() override;
+
+	void restart() override;
+	void checkPreload(
+		QSize viewport,
+		not_null<Media::BaseLayout*> topLayout,
+		not_null<Media::BaseLayout*> bottomLayout,
+		bool preloadTop,
+		bool preloadBottom) override;
+	void refreshViewer() override;
+	rpl::producer<> refreshed() override;
+
+	void setSearchQuery(QString query) override;
+
+	std::vector<Media::ListSection> fillSections(
+		not_null<Overview::Layout::Delegate*> delegate) override;
+	rpl::producer<not_null<Media::BaseLayout*>> layoutRemoved() override;
+	Media::BaseLayout *lookupLayout(const HistoryItem *item) override;
+	bool isMyItem(not_null<const HistoryItem*> item) override;
+	bool isAfter(
+		not_null<const HistoryItem*> a,
+		not_null<const HistoryItem*> b) override;
+
+	Media::ListItemSelectionData computeSelectionData(
+		not_null<const HistoryItem*> item,
+		TextSelection selection) override;
+	void applyDragSelection(
+		Media::ListSelectedMap &selected,
+		not_null<const HistoryItem*> fromItem,
+		bool skipFrom,
+		not_null<const HistoryItem*> tillItem,
+		bool skipTill) override;
+
+	bool allowSaveFileAs(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+	QString showInFolderPath(
+		not_null<const HistoryItem*> item,
+		not_null<DocumentData*> document) override;
+
+	int64 scrollTopStatePosition(not_null<HistoryItem*> item) override;
+	HistoryItem *scrollTopStateItem(
+		Media::ListScrollTopState state) override;
+	void saveState(
+		not_null<Media::Memento*> memento,
+		Media::ListScrollTopState scrollState) override;
+	void restoreState(
+		not_null<Media::Memento*> memento,
+		Fn<void(Media::ListScrollTopState)> restoreScrollState) override;
+
+private:
+	static constexpr auto kMinimalIdsLimit = 16;
+
+	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
+
+	[[nodiscard]] not_null<DocumentData*> musicIdFromMsgId(
+		MsgId itemId) const;
+	[[nodiscard]] not_null<HistoryItem*> musicIdToMsg(
+		not_null<DocumentData*> id) const;
+	[[nodiscard]] MsgId musicIdToMsgId(not_null<DocumentData*> id) const;
+
+	bool sectionHasFloatingHeader() override;
+	QString sectionTitle(not_null<const Media::BaseLayout*> item) override;
+	bool sectionItemBelongsHere(
+		not_null<const Media::BaseLayout*> item,
+		not_null<const Media::BaseLayout*> previous) override;
+
+	void markLayoutsStale();
+	void clearStaleLayouts();
+	void clear();
+
+	[[nodiscard]] HistoryItem *ensureItem(not_null<DocumentData*> id);
+	[[nodiscard]] Media::BaseLayout *getLayout(
+		not_null<DocumentData*> id,
+		not_null<Overview::Layout::Delegate*> delegate);
+	[[nodiscard]] std::unique_ptr<Media::BaseLayout> createLayout(
+		not_null<DocumentData*> musicId,
+		not_null<Overview::Layout::Delegate*> delegate);
+
+	const not_null<AbstractController*> _controller;
+	const not_null<PeerData*> _peer;
+	const not_null<History*> _history;
+
+	DocumentData *_aroundId = nullptr;
+	int _idsLimit = kMinimalIdsLimit;
+	Data::SavedMusicSlice _slice;
+
+	std::unordered_map<not_null<DocumentData*>, Media::CachedItem> _layouts;
+	rpl::event_stream<not_null<Media::BaseLayout*>> _layoutRemoved;
+	rpl::event_stream<> _refreshed;
+
+	mutable base::flat_map<MsgId, not_null<DocumentData*>> _musicIdFromMsgId;
+	mutable base::flat_map<not_null<DocumentData*>, OwnedItem> _musicIdToMsg;
+
+	bool _started = false;
+
+	rpl::lifetime _lifetime;
+	rpl::lifetime _viewerLifetime;
+
+};
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
new file mode 100644
index 0000000000..762e252aed
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
@@ -0,0 +1,339 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/saved/info_saved_music_widget.h"
+
+#include "data/data_document.h"
+#include "data/data_peer.h"
+#include "data/data_saved_music.h"
+#include "data/data_session.h"
+#include "info/media/info_media_list_widget.h"
+#include "info/info_controller.h"
+#include "info/info_memento.h"
+#include "main/main_session.h"
+#include "ui/text/text_utilities.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/labels.h"
+#include "ui/widgets/scroll_area.h"
+#include "ui/wrap/slide_wrap.h"
+#include "ui/wrap/vertical_layout.h"
+#include "lang/lang_keys.h"
+#include "ui/ui_utility.h"
+#include "styles/style_credits.h" // giftListAbout
+#include "styles/style_info.h"
+#include "styles/style_layers.h"
+
+namespace Info::Saved {
+
+class MusicInner final : public Ui::RpWidget {
+public:
+	MusicInner(QWidget *parent, not_null<Controller*> controller);
+	~MusicInner();
+
+	bool showInternal(not_null<MusicMemento*> memento);
+	void setIsStackBottom(bool isStackBottom) {
+		_isStackBottom = isStackBottom;
+	}
+
+	void saveState(not_null<MusicMemento*> memento);
+	void restoreState(not_null<MusicMemento*> memento);
+
+	void setScrollHeightValue(rpl::producer<int> value);
+
+	rpl::producer<Ui::ScrollToRequest> scrollToRequests() const;
+	rpl::producer<SelectedItems> selectedListValue() const;
+	void selectionAction(SelectionAction action);
+
+protected:
+	int resizeGetHeight(int newWidth) override;
+	void visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) override;
+
+private:
+	int recountHeight();
+	void refreshHeight();
+	void refreshEmpty();
+
+	void setupList();
+	void setupEmpty();
+
+	const not_null<Controller*> _controller;
+	const not_null<PeerData*> _peer;
+
+	base::unique_qptr<Ui::PopupMenu> _menu;
+
+	object_ptr<Media::ListWidget> _list = { nullptr };
+	object_ptr<Ui::RpWidget> _empty = { nullptr };
+	int _lastNonLoadingHeight = 0;
+	bool _emptyLoading = false;
+
+	bool _inResize = false;
+	bool _isStackBottom = false;
+
+	rpl::event_stream<Ui::ScrollToRequest> _scrollToRequests;
+	rpl::event_stream<rpl::producer<SelectedItems>> _selectedLists;
+	rpl::event_stream<rpl::producer<int>> _listTops;
+	rpl::variable<int> _topHeight;
+	rpl::variable<bool> _albumEmpty;
+
+};
+
+MusicInner::MusicInner(QWidget *parent, not_null<Controller*> controller)
+: RpWidget(parent)
+, _controller(controller)
+, _peer(controller->key().musicPeer()) {
+	setupList();
+	setupEmpty();
+}
+
+MusicInner::~MusicInner() = default;
+
+void MusicInner::visibleTopBottomUpdated(
+		int visibleTop,
+		int visibleBottom) {
+	setChildVisibleTopBottom(_list, visibleTop, visibleBottom);
+}
+
+bool MusicInner::showInternal(not_null<MusicMemento*> memento) {
+	if (memento->section().type() == Section::Type::SavedMusic) {
+		restoreState(memento);
+		return true;
+	}
+	return false;
+}
+
+void MusicInner::setupList() {
+	Expects(!_list);
+
+	_list = object_ptr<Media::ListWidget>(this, _controller);
+	const auto raw = _list.data();
+
+	using namespace rpl::mappers;
+	raw->scrollToRequests(
+	) | rpl::map([=](int to) {
+		return Ui::ScrollToRequest {
+			raw->y() + to,
+			-1
+		};
+	}) | rpl::start_to_stream(_scrollToRequests, raw->lifetime());
+	_selectedLists.fire(raw->selectedListValue());
+	_listTops.fire(raw->topValue());
+
+	raw->show();
+}
+
+void MusicInner::setupEmpty() {
+	_list->resizeToWidth(width());
+
+	const auto savedMusic = &_controller->session().data().savedMusic();
+	rpl::combine(
+		rpl::single(
+			rpl::empty
+		) | rpl::then(
+			savedMusic->changed() | rpl::filter(
+				rpl::mappers::_1 == _peer->id
+			) | rpl::to_empty
+		),
+		_list->heightValue()
+	) | rpl::start_with_next([=](auto, int listHeight) {
+		const auto padding = st::infoMediaMargin;
+		if (const auto raw = _empty.release()) {
+			raw->hide();
+			raw->deleteLater();
+		}
+		_emptyLoading = false;
+		if (listHeight <= padding.bottom() + padding.top()) {
+			refreshEmpty();
+		} else {
+			_albumEmpty = false;
+		}
+		refreshHeight();
+	}, _list->lifetime());
+}
+
+void MusicInner::refreshEmpty() {
+	const auto savedMusic = &_controller->session().data().savedMusic();
+	const auto knownEmpty = savedMusic->countKnown(_peer->id);
+	_empty = object_ptr<Ui::FlatLabel>(
+		this,
+		(!knownEmpty AssertIsDebug()
+			? tr::lng_contacts_loading(Ui::Text::WithEntities)
+			: rpl::single(TextWithEntities{ u"no muzlo found :("_q })),
+		st::giftListAbout);
+	_empty->show();
+	_emptyLoading = !knownEmpty;
+	resizeToWidth(width());
+}
+
+void MusicInner::saveState(not_null<MusicMemento*> memento) {
+	_list->saveState(&memento->media());
+}
+
+void MusicInner::restoreState(not_null<MusicMemento*> memento) {
+	_list->restoreState(&memento->media());
+}
+
+rpl::producer<SelectedItems> MusicInner::selectedListValue() const {
+	return _selectedLists.events_starting_with(
+		_list->selectedListValue()
+	) | rpl::flatten_latest();
+}
+
+void MusicInner::selectionAction(SelectionAction action) {
+	_list->selectionAction(action);
+}
+
+int MusicInner::resizeGetHeight(int newWidth) {
+	if (!newWidth) {
+		return 0;
+	}
+	_inResize = true;
+	auto guard = gsl::finally([this] { _inResize = false; });
+
+	if (_list) {
+		_list->resizeToWidth(newWidth);
+	}
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->resizeToWidth(newWidth - margin.left() - margin.right());
+	}
+
+	return recountHeight();
+}
+
+void MusicInner::refreshHeight() {
+	if (_inResize) {
+		return;
+	}
+	resize(width(), recountHeight());
+}
+
+int MusicInner::recountHeight() {
+	auto top = 0;
+	auto listHeight = 0;
+	if (_list) {
+		_list->moveToLeft(0, top);
+		listHeight = _list->heightNoMargins();
+		top += listHeight;
+	}
+	if (const auto empty = _empty.get()) {
+		const auto margin = st::giftListAboutMargin;
+		empty->moveToLeft(margin.left(), top + margin.top());
+		top += margin.top() + empty->height() + margin.bottom();
+	}
+	if (_emptyLoading) {
+		top = std::max(top, _lastNonLoadingHeight);
+	} else {
+		_lastNonLoadingHeight = top;
+	}
+	return top;
+}
+
+void MusicInner::setScrollHeightValue(rpl::producer<int> value) {
+}
+
+rpl::producer<Ui::ScrollToRequest> MusicInner::scrollToRequests() const {
+	return _scrollToRequests.events();
+}
+
+MusicMemento::MusicMemento(not_null<Controller*> controller)
+: ContentMemento(MusicTag{ controller->musicPeer() })
+, _media(controller) {
+}
+
+MusicMemento::MusicMemento(not_null<PeerData*> peer)
+: ContentMemento(MusicTag{ peer })
+, _media(peer, 0, Media::Type::MusicFile) {
+}
+
+MusicMemento::~MusicMemento() = default;
+
+Section MusicMemento::section() const {
+	return Section(Section::Type::SavedMusic);
+}
+
+object_ptr<ContentWidget> MusicMemento::createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) {
+	auto result = object_ptr<MusicWidget>(parent, controller);
+	result->setInternalState(geometry, this);
+	return result;
+}
+
+MusicWidget::MusicWidget(
+	QWidget *parent,
+	not_null<Controller*> controller)
+: ContentWidget(parent, controller) {
+	_inner = setInnerWidget(object_ptr<MusicInner>(this, controller));
+	_inner->setScrollHeightValue(scrollHeightValue());
+	_inner->scrollToRequests(
+	) | rpl::start_with_next([this](Ui::ScrollToRequest request) {
+		scrollTo(request);
+	}, _inner->lifetime());
+}
+
+void MusicWidget::setIsStackBottom(bool isStackBottom) {
+	ContentWidget::setIsStackBottom(isStackBottom);
+	_inner->setIsStackBottom(isStackBottom);
+}
+
+bool MusicWidget::showInternal(not_null<ContentMemento*> memento) {
+	if (!controller()->validateMementoPeer(memento)) {
+		return false;
+	}
+	return true;
+}
+
+void MusicWidget::setInternalState(
+		const QRect &geometry,
+		not_null<MusicMemento*> memento) {
+		setGeometry(geometry);
+	Ui::SendPendingMoveResizeEvents(this);
+	restoreState(memento);
+}
+
+std::shared_ptr<ContentMemento> MusicWidget::doCreateMemento() {
+	auto result = std::make_shared<MusicMemento>(controller());
+	saveState(result.get());
+	return result;
+}
+
+void MusicWidget::saveState(not_null<MusicMemento*> memento) {
+	memento->setScrollTop(scrollTopSave());
+	_inner->saveState(memento);
+}
+
+void MusicWidget::restoreState(not_null<MusicMemento*> memento) {
+	_inner->restoreState(memento);
+	scrollTopRestore(memento->scrollTop());
+}
+
+rpl::producer<SelectedItems> MusicWidget::selectedListValue() const {
+	return _inner->selectedListValue();
+}
+
+void MusicWidget::selectionAction(SelectionAction action) {
+	_inner->selectionAction(action);
+}
+
+rpl::producer<QString> MusicWidget::title() {
+	//const auto peer = controller()->key().musicPeer();
+	AssertIsDebug();
+	return rpl::single(u"muzlo"_q);
+}
+
+std::shared_ptr<Info::Memento> MakeMusic(not_null<PeerData*> peer) {
+	return std::make_shared<Info::Memento>(
+		std::vector<std::shared_ptr<ContentMemento>>(
+			1,
+			std::make_shared<MusicMemento>(peer)));
+}
+
+} // namespace Info::Saved
+
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.h b/Telegram/SourceFiles/info/saved/info_saved_music_widget.h
new file mode 100644
index 0000000000..5ecef46511
--- /dev/null
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.h
@@ -0,0 +1,81 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "info/info_content_widget.h"
+#include "info/media/info_media_widget.h"
+#include "info/stories/info_stories_common.h"
+
+namespace Ui {
+template <typename Widget>
+class SlideWrap;
+} // namespace Ui
+
+namespace Info::Saved {
+
+class MusicInner;
+
+class MusicMemento final : public ContentMemento {
+public:
+	MusicMemento(not_null<Controller*> controller);
+	MusicMemento(not_null<PeerData*> peer);
+	~MusicMemento();
+
+	object_ptr<ContentWidget> createWidget(
+		QWidget *parent,
+		not_null<Controller*> controller,
+		const QRect &geometry) override;
+
+	Section section() const override;
+
+	[[nodiscard]] Media::Memento &media() {
+		return _media;
+	}
+	[[nodiscard]] const Media::Memento &media() const {
+		return _media;
+	}
+
+private:
+	Media::Memento _media;
+	int _addingToAlbumId = 0;
+
+};
+
+class MusicWidget final : public ContentWidget {
+public:
+	MusicWidget(QWidget *parent, not_null<Controller*> controller);
+
+	void setIsStackBottom(bool isStackBottom) override;
+
+	bool showInternal(
+		not_null<ContentMemento*> memento) override;
+
+	void setInternalState(
+		const QRect &geometry,
+		not_null<MusicMemento*> memento);
+
+	rpl::producer<SelectedItems> selectedListValue() const override;
+	void selectionAction(SelectionAction action) override;
+
+	rpl::producer<QString> title() override;
+
+private:
+	void saveState(not_null<MusicMemento*> memento);
+	void restoreState(not_null<MusicMemento*> memento);
+
+	std::shared_ptr<ContentMemento> doCreateMemento() override;
+
+	MusicInner *_inner = nullptr;
+	bool _shown = false;
+
+};
+
+[[nodiscard]] std::shared_ptr<Info::Memento> MakeMusic(
+	not_null<PeerData*> peer);
+
+} // namespace Info::Saved
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 75040c96cc..67e4515d9a 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "boxes/share_box.h"
 #include "data/data_peer.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
 #include "data/data_stories.h"
 #include "data/data_user.h"
@@ -291,6 +292,15 @@ void InnerWidget::createProfileTop() {
 
 	using namespace Profile;
 	AddCover(_top, _controller, _peer, nullptr, nullptr);
+	if (Data::SavedMusic::Supported(_peer->id)) {
+		object_ptr<Profile::FloatingIcon>(
+			Media::AddMusicButton(
+				_top,
+				_controller,
+				_peer),
+			st::infoIconMediaAudio,
+			st::infoSharedMediaButtonIconPosition);
+	}
 	AddDetails(_top, _controller, _peer, nullptr, nullptr, { v::null });
 
 	auto tracker = Ui::MultiSlideTracker();
diff --git a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
index 844ece18a0..e0e07fdadd 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_provider.cpp
@@ -23,7 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_helpers.h"
 #include "history/history.h"
 #include "core/application.h"
-#include "storage/storage_shared_media.h"
 #include "layout/layout_selection.h"
 #include "styles/style_info.h"
 

From 0d6ea0845e6e352532f35227c291f22cf8e66d20 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Aug 2025 14:30:23 +0400
Subject: [PATCH 267/341] Make nice music button in profile.

---
 .../SourceFiles/data/data_saved_music.cpp     | 29 ++++++
 Telegram/SourceFiles/data/data_saved_music.h  |  2 +
 Telegram/SourceFiles/data/data_user.cpp       |  2 +
 Telegram/SourceFiles/info/info.style          | 14 +++
 .../info/media/info_media_buttons.cpp         | 40 --------
 .../info/media/info_media_buttons.h           |  5 -
 .../info/profile/info_profile_cover.cpp       | 66 ++++++++++++-
 .../info/profile/info_profile_cover.h         |  4 +
 .../profile/info_profile_inner_widget.cpp     |  8 --
 .../profile/info_profile_music_button.cpp     | 98 +++++++++++++++++++
 .../info/profile/info_profile_music_button.h  | 39 ++++++++
 .../stories/info_stories_inner_widget.cpp     |  9 --
 Telegram/cmake/td_ui.cmake                    |  2 +
 13 files changed, 252 insertions(+), 66 deletions(-)
 create mode 100644 Telegram/SourceFiles/info/profile/info_profile_music_button.cpp
 create mode 100644 Telegram/SourceFiles/info/profile/info_profile_music_button.h

diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
index 5b1e07d43e..d7c4d88afa 100644
--- a/Telegram/SourceFiles/data/data_saved_music.cpp
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -75,6 +75,35 @@ void SavedMusic::remove(not_null<DocumentData*> document) {
 	_changed.fire_copy(peerId);
 }
 
+void SavedMusic::apply(not_null<UserData*> user, const MTPDocument *last) {
+	const auto peerId = user->id;
+	auto &entry = _entries[peerId];
+	if (!last) {
+		if (const auto requestId = base::take(entry.requestId)) {
+			_owner->session().api().request(requestId).cancel();
+		}
+		entry = Entry{ .total = 0, .loaded = true };
+		_changed.fire_copy(peerId);
+		return;
+	}
+	const auto document = _owner->processDocument(*last);
+	const auto i = ranges::find(entry.list, document);
+	if (i != end(entry.list)) {
+		if (i == begin(entry.list)) {
+			return;
+		}
+		ranges::rotate(begin(entry.list), i, i + 1);
+		_changed.fire_copy(peerId);
+		loadMore(peerId, true);
+		return;
+	}
+	entry.list.insert(begin(entry.list), document);
+	_changed.fire_copy(peerId);
+	if (entry.loaded) {
+		loadMore(peerId, true);
+	}
+}
+
 bool SavedMusic::countKnown(PeerId peerId) const {
 	if (!Supported(peerId)) {
 		return true;
diff --git a/Telegram/SourceFiles/data/data_saved_music.h b/Telegram/SourceFiles/data/data_saved_music.h
index 8d2ab338bd..3b4c0563f0 100644
--- a/Telegram/SourceFiles/data/data_saved_music.h
+++ b/Telegram/SourceFiles/data/data_saved_music.h
@@ -33,6 +33,8 @@ public:
 	void save(not_null<DocumentData*> document);
 	void remove(not_null<DocumentData*> document);
 
+	void apply(not_null<UserData*> user, const MTPDocument *last);
+
 private:
 	struct Entry {
 		std::vector<not_null<DocumentData*>> list;
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index 967d7b5669..e0b00b1963 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/business/data_business_common.h"
 #include "data/business/data_business_info.h"
 #include "data/components/credits.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
 #include "data/data_peer_bot_command.h"
@@ -907,6 +908,7 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	}
 
 	user->owner().stories().apply(user, update.vstories());
+	user->owner().savedMusic().apply(user, update.vsaved_music());
 
 	user->fullUpdated();
 }
diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style
index 8049b8cc5c..1984f057fe 100644
--- a/Telegram/SourceFiles/info/info.style
+++ b/Telegram/SourceFiles/info/info.style
@@ -1282,3 +1282,17 @@ collectionEditMenuToggle: IconButton(infoTopBarMenu) {
 
 earnTonIconSize: 16px;
 earnTonIconMargin: margins(0px, 2px, 0px, 0px);
+
+infoMusicButtonRipple: defaultRippleAnimation;
+infoMusicButtonPerformer: FlatLabel(defaultFlatLabel) {
+	textFg: windowSubTextFg;
+	maxHeight: 20px;
+}
+infoMusicButtonTitle: FlatLabel(defaultFlatLabel) {
+	textFg: windowBoldFg;
+	style: semiboldTextStyle;
+	maxHeight: 20px;
+}
+infoMusicButtonPadding: margins(48px, 6px, 12px, 6px);
+infoMusicButtonBottom: 8px;
+infoMusicButtonLine: 2px;
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.cpp b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
index f83ece49cc..fda15a1820 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.cpp
@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "core/ui_integration.h"
 #include "data/components/recent_shared_media_gifts.h"
 #include "data/data_channel.h"
-#include "data/data_saved_music.h"
 #include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_session.h"
@@ -394,43 +393,4 @@ not_null<Ui::SettingsButton*> AddPeerGiftsButton(
 	return wrap->entity();
 }
 
-not_null<Ui::SettingsButton*> AddMusicButton(
-		Ui::VerticalLayout *parent,
-		not_null<Window::SessionNavigation*> navigation,
-		not_null<PeerData*> peer) {
-	auto count = rpl::single(0) | rpl::then(Data::SavedMusicList(
-		peer,
-		nullptr,
-		0
-	) | rpl::map([](const Data::SavedMusicSlice &slice) {
-		return slice.fullCount().value_or(0);
-	}));
-
-	using namespace ::Settings;
-	auto forked = std::move(count)
-		| start_spawning(parent->lifetime());
-	auto text = rpl::duplicate(
-		forked
-	) | rpl::map([](int count) {
-		AssertIsDebug();
-		return QString::number(count) + u" muzla"_q;
-	});
-	auto button = parent->add(object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
-		parent,
-		object_ptr<Ui::SettingsButton>(
-			parent,
-			std::move(text),
-			st::infoSharedMediaButton))
-	)->setDuration(
-		st::infoSlideDuration
-	)->toggleOn(
-		rpl::duplicate(forked) | rpl::map(rpl::mappers::_1 > 0)
-	)->entity();
-
-	button->addClickHandler([=] {
-		navigation->showSection(Info::Saved::MakeMusic(peer));
-	});
-	return button;
-}
-
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/media/info_media_buttons.h b/Telegram/SourceFiles/info/media/info_media_buttons.h
index 161e59a573..a8a24feb47 100644
--- a/Telegram/SourceFiles/info/media/info_media_buttons.h
+++ b/Telegram/SourceFiles/info/media/info_media_buttons.h
@@ -77,9 +77,4 @@ using Type = Storage::SharedMediaType;
 	not_null<PeerData*> peer,
 	Ui::MultiSlideTracker &tracker);
 
-[[nodiscard]] not_null<Ui::SettingsButton*> AddMusicButton(
-	Ui::VerticalLayout *parent,
-	not_null<Window::SessionNavigation*> navigation,
-	not_null<PeerData*> peer);
-
 } // namespace Info::Media
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 6a79eca9c7..280d6d6d51 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -18,13 +18,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_document.h"
 #include "data/data_document_media.h"
 #include "data/data_changes.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
 #include "data/data_forum_topic.h"
 #include "data/stickers/data_custom_emoji.h"
-#include "info/profile/info_profile_values.h"
 #include "info/profile/info_profile_badge.h"
 #include "info/profile/info_profile_emoji_status_panel.h"
+#include "info/profile/info_profile_music_button.h"
+#include "info/profile/info_profile_values.h"
+#include "info/saved/info_saved_music_widget.h"
 #include "info/info_controller.h"
+#include "info/info_memento.h"
 #include "boxes/peers/edit_forum_topic_box.h"
 #include "boxes/report_messages_box.h"
 #include "history/view/media/history_view_sticker_player.h"
@@ -62,15 +66,18 @@ constexpr auto kGiftBadgeGlares = 3;
 constexpr auto kGlareDurationStep = crl::time(320);
 constexpr auto kGlareTimeout = crl::time(1000);
 
-auto MembersStatusText(int count) {
+[[nodiscard]] auto MembersStatusText(int count) {
 	return tr::lng_chat_status_members(tr::now, lt_count_decimal, count);
 };
 
-auto OnlineStatusText(int count) {
+[[nodiscard]] auto OnlineStatusText(int count) {
 	return tr::lng_chat_status_online(tr::now, lt_count_decimal, count);
 };
 
-auto ChatStatusText(int fullCount, int onlineCount, bool isGroup) {
+[[nodiscard]] auto ChatStatusText(
+		int fullCount,
+		int onlineCount,
+		bool isGroup) {
 	if (onlineCount > 1 && onlineCount <= fullCount) {
 		return tr::lng_chat_status_members_online(
 			tr::now,
@@ -117,6 +124,22 @@ auto ChatStatusText(int fullCount, int onlineCount, bool isGroup) {
 	return { left, left, right, right };
 }
 
+[[nodiscard]] MusicButtonData DocumentMusicButtonData(
+		not_null<DocumentData*> document) {
+	if (const auto song = document->song()) {
+		if (!song->performer.isEmpty() || !song->title.isEmpty()) {
+			return {
+				.performer = song->performer,
+				.title = song->title,
+			};
+		}
+	}
+	const auto name = document->filename();
+	return {
+		.title = !name.isEmpty() ? name : tr::lng_all_music(tr::now),
+	};
+}
+
 } // namespace
 
 class Cover::BadgeTooltip final : public Ui::RpWidget {
@@ -699,6 +722,7 @@ Cover::Cover(
 	initViewers(std::move(title));
 	setupChildGeometry();
 	setupUniqueBadgeTooltip();
+	setupSavedMusic();
 
 	if (_userpic) {
 	} else if (topic->canEdit()) {
@@ -801,6 +825,40 @@ void Cover::setupChildGeometry() {
 	}, lifetime());
 }
 
+void Cover::setupSavedMusic() {
+	if (!Data::SavedMusic::Supported(_peer->id)) {
+		return;
+	}
+	Data::SavedMusicList(
+		_peer,
+		nullptr,
+		1
+	) | rpl::map([=](const Data::SavedMusicSlice &data) {
+		return data.size() ? data[0].get() : nullptr;
+	}) | rpl::start_with_next([=](DocumentData *document) {
+		if (!document) {
+			_musicButton = nullptr;
+			resize(width(), _st.height);
+		} else if (!_musicButton) {
+			using namespace Info::Saved;
+			_musicButton = std::make_unique<MusicButton>(
+				this,
+				DocumentMusicButtonData(document),
+				[=] { _controller->showSection(MakeMusic(_peer)); });
+
+			widthValue(
+			) | rpl::start_with_next([=](int newWidth) {
+				_musicButton->resizeToWidth(newWidth);
+				const auto skip = st::infoMusicButtonBottom;
+				_musicButton->moveToLeft(0, _st.height - skip, newWidth);
+				resize(width(), _st.height + _musicButton->height());
+			}, _musicButton->lifetime());
+		} else {
+			_musicButton->updateData(DocumentMusicButtonData(document));
+		}
+	}, lifetime());
+}
+
 Cover *Cover::setOnlineCount(rpl::producer<int> &&count) {
 	_onlineCount = std::move(count);
 	return this;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.h b/Telegram/SourceFiles/info/profile/info_profile_cover.h
index 7e45160788..2fa48867b2 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.h
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.h
@@ -45,6 +45,7 @@ struct InfoProfileCover;
 namespace Info::Profile {
 
 class EmojiStatusPanel;
+class MusicButton;
 class Badge;
 
 class TopicIconView final {
@@ -140,6 +141,7 @@ private:
 
 	void setupShowLastSeen();
 	void setupChildGeometry();
+	void setupSavedMusic();
 	void initViewers(rpl::producer<QString> title);
 	void refreshStatusText();
 	void refreshNameGeometry(int newWidth);
@@ -179,6 +181,8 @@ private:
 	//object_ptr<CoverDropArea> _dropArea = { nullptr };
 	base::Timer _refreshStatusTimer;
 
+	std::unique_ptr<MusicButton> _musicButton;
+
 	rpl::event_stream<Section> _showSection;
 
 };
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index a8faadb1e3..b4c27bc20b 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -81,14 +81,6 @@ object_ptr<Ui::RpWidget> InnerWidget::setupContent(
 	_cover = AddCover(result, _controller, _peer, _topic, _sublist);
 	if (_topic && _topic->creating()) {
 		return result;
-	} else if (Data::SavedMusic::Supported(_peer->id)) {
-		object_ptr<Profile::FloatingIcon>(
-			Media::AddMusicButton(
-				result,
-				_controller,
-				_peer),
-			st::infoIconMediaAudio,
-			st::infoSharedMediaButtonIconPosition);
 	}
 
 	AddDetails(result, _controller, _peer, _topic, _sublist, origin);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_music_button.cpp b/Telegram/SourceFiles/info/profile/info_profile_music_button.cpp
new file mode 100644
index 0000000000..3a9433f0d0
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_music_button.cpp
@@ -0,0 +1,98 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "info/profile/info_profile_music_button.h"
+
+#include "ui/widgets/labels.h"
+#include "ui/painter.h"
+#include "styles/style_info.h"
+
+namespace Info::Profile {
+
+MusicButton::MusicButton(
+	QWidget *parent,
+	MusicButtonData data,
+	Fn<void()> handler)
+: RippleButton(parent, st::infoMusicButtonRipple)
+, _performer(std::make_unique<Ui::FlatLabel>(
+	this,
+	u"- "_q + data.performer,
+	st::infoMusicButtonPerformer))
+, _title(std::make_unique<Ui::FlatLabel>(
+		this,
+		data.title,
+		st::infoMusicButtonTitle)) {
+	rpl::combine(
+		_title->naturalWidthValue(),
+		_performer->naturalWidthValue()
+	) | rpl::start_with_next([=] {
+		resizeToWidth(widthNoMargins());
+	}, lifetime());
+
+	_title->setAttribute(Qt::WA_TransparentForMouseEvents);
+	_performer->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+	setClickedCallback(std::move(handler));
+}
+
+MusicButton::~MusicButton() = default;
+
+void MusicButton::updateData(MusicButtonData data) {
+	_performer->setText(u"- "_q + data.performer);
+	_title->setText(data.title);
+	resizeToWidth(widthNoMargins());
+}
+
+void MusicButton::paintEvent(QPaintEvent *e) {
+	auto p = QPainter(this);
+
+	p.fillRect(e->rect(), st::windowBgOver);
+	paintRipple(p, QPoint());
+
+	auto pen = st::windowBoldFg->p;
+	pen.setCapStyle(Qt::RoundCap);
+	pen.setWidthF(st::infoMusicButtonLine);
+	p.setPen(pen);
+
+	const auto line = st::infoMusicButtonLine;
+	const auto length = height() / 4.;
+	const auto half = height() / 2.;
+	const auto left = st::infoProfileCover.photoLeft + (line / 2.);
+
+	auto hq = PainterHighQualityEnabler(p);
+	p.drawLine(
+		left, half - length / 2.,
+		left, half + length / 2.);
+	p.drawLine(
+		left + 2.5 * line, half - length,
+		left + 2.5 * line, half + length);
+	p.drawLine(
+		left + 5 * line, half - length * 3 / 4.,
+		left + 5 * line, half + length * 3 / 4.);
+}
+
+int MusicButton::resizeGetHeight(int newWidth) {
+	const auto padding = st::infoMusicButtonPadding;
+	const auto &font = st::infoMusicButtonTitle.style.font;
+
+	const auto top = padding.top();
+	const auto skip = st::normalFont->spacew;
+	const auto available = newWidth - padding.left() - padding.right();
+	_title->resizeToNaturalWidth(available);
+	_title->moveToLeft(padding.left(), top);
+	if (const auto left = available - _title->width() - skip; left > 0) {
+		_performer->show();
+		_performer->resizeToNaturalWidth(left);
+		_performer->moveToLeft(padding.left() + _title->width() + skip, top);
+	} else {
+		_performer->hide();
+	}
+
+	return padding.top() + font->height + padding.bottom();
+}
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/profile/info_profile_music_button.h b/Telegram/SourceFiles/info/profile/info_profile_music_button.h
new file mode 100644
index 0000000000..2e909478d5
--- /dev/null
+++ b/Telegram/SourceFiles/info/profile/info_profile_music_button.h
@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+#include "ui/widgets/buttons.h"
+
+namespace Ui {
+class FlatLabel;
+} // namespace Ui
+
+namespace Info::Profile {
+
+struct MusicButtonData {
+	QString performer;
+	QString title;
+};
+
+class MusicButton final : public Ui::RippleButton {
+public:
+	MusicButton(QWidget *parent, MusicButtonData data, Fn<void()> handler);
+	~MusicButton();
+
+	void updateData(MusicButtonData data);
+
+private:
+	void paintEvent(QPaintEvent *e) override;
+	int resizeGetHeight(int newWidth) override;
+
+	std::unique_ptr<Ui::FlatLabel> _performer;
+	std::unique_ptr<Ui::FlatLabel> _title;
+
+};
+
+} // namespace Info::Profile
diff --git a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
index 67e4515d9a..8dc057a5ed 100644
--- a/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/stories/info_stories_inner_widget.cpp
@@ -292,15 +292,6 @@ void InnerWidget::createProfileTop() {
 
 	using namespace Profile;
 	AddCover(_top, _controller, _peer, nullptr, nullptr);
-	if (Data::SavedMusic::Supported(_peer->id)) {
-		object_ptr<Profile::FloatingIcon>(
-			Media::AddMusicButton(
-				_top,
-				_controller,
-				_peer),
-			st::infoIconMediaAudio,
-			st::infoSharedMediaButtonIconPosition);
-	}
 	AddDetails(_top, _controller, _peer, nullptr, nullptr, { v::null });
 
 	auto tracker = Ui::MultiSlideTracker();
diff --git a/Telegram/cmake/td_ui.cmake b/Telegram/cmake/td_ui.cmake
index 672205f2bb..9d648e679d 100644
--- a/Telegram/cmake/td_ui.cmake
+++ b/Telegram/cmake/td_ui.cmake
@@ -146,6 +146,8 @@ PRIVATE
 
     info/profile/info_profile_icon.cpp
     info/profile/info_profile_icon.h
+    info/profile/info_profile_music_button.cpp
+    info/profile/info_profile_music_button.h
     info/userpic/info_userpic_bubble_wrap.cpp
     info/userpic/info_userpic_bubble_wrap.h
     info/userpic/info_userpic_color_circle_button.cpp

From 6211b7733d931d783aa85e23e70ef04231ba8dfb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Aug 2025 17:05:03 +0400
Subject: [PATCH 268/341] Support saved music playlist.

---
 .../SourceFiles/data/data_saved_music.cpp     | 74 +++++++++++----
 Telegram/SourceFiles/data/data_saved_music.h  | 22 ++++-
 Telegram/SourceFiles/data/data_session.cpp    |  1 +
 .../SourceFiles/data/data_shared_media.cpp    | 58 ++++++++++--
 Telegram/SourceFiles/data/data_shared_media.h |  8 ++
 Telegram/SourceFiles/data/data_sparse_ids.h   |  1 +
 Telegram/SourceFiles/data/data_types.h        |  1 +
 Telegram/SourceFiles/history/history_item.cpp |  4 +
 Telegram/SourceFiles/history/history_item.h   |  1 +
 .../info/profile/info_profile_cover.cpp       |  5 +-
 .../info/saved/info_saved_music_provider.cpp  | 93 +++++--------------
 .../info/saved/info_saved_music_provider.h    | 20 +---
 .../info/saved/info_saved_music_widget.cpp    |  4 +-
 .../media/player/media_player_instance.cpp    | 16 +++-
 .../media/player/media_player_panel.cpp       | 41 +++++---
 .../media/player/media_player_panel.h         |  1 +
 16 files changed, 223 insertions(+), 127 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
index d7c4d88afa..273e876101 100644
--- a/Telegram/SourceFiles/data/data_saved_music.cpp
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -9,10 +9,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "api/api_hash.h"
 #include "apiwrap.h"
+#include "base/unixtime.h"
 #include "data/data_document.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
+#include "history/history.h"
 #include "main/main_session.h"
 #include "ui/ui_utility.h"
 
@@ -21,19 +23,52 @@ namespace {
 
 constexpr auto kPerPage = 50;
 
+[[nodiscard]] not_null<DocumentData*> ItemDocument(
+		not_null<HistoryItem*> item) {
+	return item->media()->document();
+}
+
 } // namespace
 
 SavedMusic::SavedMusic(not_null<Session*> owner)
 : _owner(owner) {
 }
 
+SavedMusic::~SavedMusic() {
+	Expects(_entries.empty());
+}
+
+void SavedMusic::clear() {
+	base::take(_entries);
+}
+
 bool SavedMusic::Supported(PeerId peerId) {
 	return peerId && peerIsUser(peerId);
 }
 
+not_null<HistoryItem*> SavedMusic::musicIdToMsg(
+		PeerId peerId,
+		Entry &entry,
+		not_null<DocumentData*> id) {
+	const auto i = entry.musicIdToMsg.find(id);
+	if (i != end(entry.musicIdToMsg)) {
+		return i->second.get();
+	} else if (!entry.history) {
+		entry.history = _owner->history(peerId);
+	}
+	return entry.musicIdToMsg.emplace(id, entry.history->makeMessage({
+		.id = entry.history->nextNonHistoryEntryId(),
+		.flags = (MessageFlag::FakeHistoryItem
+			| MessageFlag::HasFromId
+			| MessageFlag::SavedMusicItem),
+		.from = entry.history->peer->id,
+		.date = base::unixtime::now(),
+	}, id, TextWithEntities())).first->second.get();
+}
+
 bool SavedMusic::has(not_null<DocumentData*> document) const {
 	const auto entry = lookupEntry(_owner->session().userPeerId());
-	return entry && ranges::contains(entry->list, document);
+	return entry && ranges::contains(entry->list, document, ItemDocument);
 }
 
 void SavedMusic::save(not_null<DocumentData*> document) {
@@ -42,10 +77,11 @@ void SavedMusic::save(not_null<DocumentData*> document) {
 	if (entry.list.empty() && !entry.loaded) {
 		loadMore(peerId);
 	}
-	if (ranges::contains(entry.list, document)) {
+	if (ranges::contains(entry.list, document, ItemDocument)) {
 		return;
 	}
-	entry.list.insert(begin(entry.list), document);
+	const auto item = musicIdToMsg(peerId, entry, document);
+	entry.list.insert(begin(entry.list), item);
 	if (entry.total >= 0) {
 		++entry.total;
 	}
@@ -60,13 +96,15 @@ void SavedMusic::save(not_null<DocumentData*> document) {
 void SavedMusic::remove(not_null<DocumentData*> document) {
 	const auto peerId = _owner->session().userPeerId();
 	auto &entry = _entries[peerId];
-	const auto i = ranges::remove(entry.list, document);
-	if (const auto removed = int(end(entry.list) - i)) {
-		entry.list.erase(i, end(entry.list));
-		if (entry.total >= 0) {
-			entry.total = std::max(entry.total - removed, 0);
+	const auto i = ranges::find(entry.list, document, ItemDocument);
+	if (i != end(entry.list)) {
+		entry.musicIdFromMsgId.remove((*i)->id);
+		entry.list.erase(i);
+		if (entry.total > 0) {
+			entry.total = std::max(entry.total - 1, 0);
 		}
 	}
+	entry.musicIdToMsg.remove(document);
 	_owner->session().api().request(MTPaccount_SaveMusic(
 		MTP_flags(MTPaccount_SaveMusic::Flag::f_unsave),
 		document->mtpInput(),
@@ -87,7 +125,7 @@ void SavedMusic::apply(not_null<UserData*> user, const MTPDocument *last) {
 		return;
 	}
 	const auto document = _owner->processDocument(*last);
-	const auto i = ranges::find(entry.list, document);
+	const auto i = ranges::find(entry.list, document, ItemDocument);
 	if (i != end(entry.list)) {
 		if (i == begin(entry.list)) {
 			return;
@@ -97,7 +135,9 @@ void SavedMusic::apply(not_null<UserData*> user, const MTPDocument *last) {
 		loadMore(peerId, true);
 		return;
 	}
-	entry.list.insert(begin(entry.list), document);
+	entry.list.insert(
+		begin(entry.list),
+		musicIdToMsg(peerId, entry, document));
 	_changed.fire_copy(peerId);
 	if (entry.loaded) {
 		loadMore(peerId, true);
@@ -120,9 +160,9 @@ int SavedMusic::count(PeerId peerId) const {
 	return entry ? std::max(entry->total, 0) : 0;
 }
 
-const std::vector<not_null<DocumentData*>> &SavedMusic::list(
+const std::vector<not_null<HistoryItem*>> &SavedMusic::list(
 		PeerId peerId) const {
-	static const auto empty = std::vector<not_null<DocumentData*>>();
+	static const auto empty = std::vector<not_null<HistoryItem*>>();
 	if (!Supported(peerId)) {
 		return empty;
 	}
@@ -171,8 +211,9 @@ void SavedMusic::loadMore(PeerId peerId, bool reload) {
 			}
 			for (const auto &item : list) {
 				const auto document = _owner->processDocument(item);
-				if (!ranges::contains(entry.list, document)) {
-					entry.list.push_back(document);
+				if (!ranges::contains(entry.list, document, ItemDocument)) {
+					entry.list.push_back(
+						musicIdToMsg(peerId, entry, document));
 				}
 			}
 			entry.loaded = list.empty() || (count == entry.list.size());
@@ -189,6 +230,7 @@ void SavedMusic::loadMore(PeerId peerId, bool reload) {
 
 uint64 SavedMusic::firstPageHash(const Entry &entry) const {
 	return Api::CountHash(entry.list
+		| ranges::views::transform(ItemDocument)
 		| ranges::views::transform(&DocumentData::id)
 		| ranges::views::take(kPerPage));
 }
@@ -215,7 +257,7 @@ const SavedMusic::Entry *SavedMusic::lookupEntry(PeerId peerId) const {
 
 rpl::producer<SavedMusicSlice> SavedMusicList(
 		not_null<PeerData*> peer,
-		DocumentData *aroundId,
+		HistoryItem *aroundId,
 		int limit) {
 	if (!peer->isUser()) {
 		return rpl::single(SavedMusicSlice({}, 0, 0, 0));
@@ -253,7 +295,7 @@ rpl::producer<SavedMusicSlice> SavedMusicList(
 			}
 			const auto takeBefore = std::min(hasBefore, limit);
 			const auto takeAfter = std::min(hasAfter, limit);
-			auto ids = std::vector<not_null<DocumentData*>>();
+			auto ids = std::vector<not_null<HistoryItem*>>();
 			ids.reserve(takeBefore + takeAfter);
 			for (auto j = i - takeBefore; j != i + takeAfter; ++j) {
 				ids.push_back(*j);
diff --git a/Telegram/SourceFiles/data/data_saved_music.h b/Telegram/SourceFiles/data/data_saved_music.h
index 3b4c0563f0..fe31a5d788 100644
--- a/Telegram/SourceFiles/data/data_saved_music.h
+++ b/Telegram/SourceFiles/data/data_saved_music.h
@@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "data/data_abstract_sparse_ids.h"
 
+#include "history/history_item.h"
+
 class PeerData;
 
 namespace Data {
@@ -18,12 +20,13 @@ class Session;
 class SavedMusic final {
 public:
 	explicit SavedMusic(not_null<Session*> owner);
+	~SavedMusic();
 
 	[[nodiscard]] static bool Supported(PeerId peerId);
 
 	[[nodiscard]] bool countKnown(PeerId peerId) const;
 	[[nodiscard]] int count(PeerId peerId) const;
-	[[nodiscard]] const std::vector<not_null<DocumentData*>> &list(
+	[[nodiscard]] const std::vector<not_null<HistoryItem*>> &list(
 		PeerId peerId) const;
 	void loadMore(PeerId peerId);
 
@@ -35,9 +38,16 @@ public:
 
 	void apply(not_null<UserData*> user, const MTPDocument *last);
 
+	void clear();
+
 private:
+	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
+
 	struct Entry {
-		std::vector<not_null<DocumentData*>> list;
+		base::flat_map<MsgId, not_null<DocumentData*>> musicIdFromMsgId;
+		base::flat_map<not_null<DocumentData*>, OwnedItem> musicIdToMsg;
+		std::vector<not_null<HistoryItem*>> list;
+		History *history = nullptr;
 		mtpRequestId requestId = 0;
 		int total = -1;
 		bool loaded = false;
@@ -48,6 +58,10 @@ private:
 	[[nodiscard]] Entry *lookupEntry(PeerId peerId);
 	[[nodiscard]] const Entry *lookupEntry(PeerId peerId) const;
 	[[nodiscard]] uint64 firstPageHash(const Entry &entry) const;
+	[[nodiscard]] not_null<HistoryItem*> musicIdToMsg(
+		PeerId peerId,
+		Entry &entry,
+		not_null<DocumentData*> id);
 
 	const not_null<Session*> _owner;
 
@@ -57,11 +71,11 @@ private:
 };
 
 using SavedMusicSlice = AbstractSparseIds<
-	std::vector<not_null<DocumentData*>>>;
+	std::vector<not_null<HistoryItem*>>>;
 
 [[nodiscard]] rpl::producer<SavedMusicSlice> SavedMusicList(
 	not_null<PeerData*> peer,
-	DocumentData *aroundId,
+	HistoryItem *aroundId,
 	int limit);
 
 } // namespace Data
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index a7009dfb68..367e0c54c1 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -409,6 +409,7 @@ void Session::clear() {
 		channel->setFlags(channel->flags()
 			& ~(ChannelDataFlag::Forum | ChannelDataFlag::MonoforumAdmin));
 	}
+	_savedMusic->clear();
 	_savedMessages->clear();
 
 	_sendActionManager->clear();
diff --git a/Telegram/SourceFiles/data/data_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
index 5e0c3735d2..3ee5f54785 100644
--- a/Telegram/SourceFiles/data/data_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -7,18 +7,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_shared_media.h"
 
-#include <rpl/combine.h>
-#include "main/main_session.h"
 #include "apiwrap.h"
-#include "storage/storage_facade.h"
-#include "history/history.h"
-#include "history/history_item.h"
+#include "core/crash_reports.h"
 #include "data/components/scheduled_messages.h"
 #include "data/data_document.h"
 #include "data/data_media_types.h"
 #include "data/data_photo.h"
+#include "data/data_saved_music.h"
 #include "data/data_session.h"
-#include "core/crash_reports.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "main/main_session.h"
+#include "storage/storage_facade.h"
 
 namespace {
 
@@ -233,6 +233,39 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 	});
 }
 
+rpl::producer<SparseIdsMergedSlice> SavedMusicMediaViewer(
+		not_null<Main::Session*> session,
+		SharedMediaMergedKey key,
+		int limitBefore,
+		int limitAfter) {
+	Expects((key.mergedKey.universalId != 0)
+		|| (limitBefore == 0 && limitAfter == 0));
+
+	const auto peerId = key.mergedKey.peerId;
+	const auto item = key.mergedKey.universalId
+		? session->data().message(peerId, key.mergedKey.universalId)
+		: nullptr;
+
+	return Data::SavedMusicList(
+		session->data().peer(peerId),
+		item,
+		std::max(limitBefore, limitAfter)
+	) | rpl::map([=](const Data::SavedMusicSlice &slice) {
+		auto list = std::vector<MsgId>();
+		list.reserve(slice.size());
+		for (auto i = 0, count = int(slice.size()); i != count; ++i) {
+			list.push_back(slice[i]->id);
+		}
+		return SparseIdsMergedSlice(
+			key.mergedKey,
+			SparseUnsortedIdsSlice(
+				std::move(list),
+				slice.fullCount(),
+				slice.skippedBefore(),
+				slice.skippedAfter()));
+	});
+}
+
 rpl::producer<SparseIdsMergedSlice> SharedMediaMergedViewer(
 		not_null<Main::Session*> session,
 		SharedMediaMergedKey key,
@@ -490,6 +523,19 @@ rpl::producer<SharedMediaWithLastSlice> SharedMediaWithLastViewer(
 					std::move(update),
 					std::nullopt));
 			});
+		} else if (key.topicRootId == SharedMediaWithLastSlice::kSavedMusicTopicId) {
+			return SavedMusicMediaViewer(
+				session,
+				std::move(viewerKey),
+				limitBefore,
+				limitAfter
+			) | rpl::start_with_next([=](SparseIdsMergedSlice &&update) {
+				consumer.put_next(SharedMediaWithLastSlice(
+					session,
+					key,
+					std::move(update),
+					std::nullopt));
+			});
 		}
 		return rpl::combine(
 			SharedMediaMergedViewer(
diff --git a/Telegram/SourceFiles/data/data_shared_media.h b/Telegram/SourceFiles/data/data_shared_media.h
index 8f53b4026c..cb01f14f46 100644
--- a/Telegram/SourceFiles/data/data_shared_media.h
+++ b/Telegram/SourceFiles/data/data_shared_media.h
@@ -52,6 +52,12 @@ rpl::producer<SparseIdsMergedSlice> SharedScheduledMediaViewer(
 	int limitBefore,
 	int limitAfter);
 
+rpl::producer<SparseIdsMergedSlice> SavedMusicMediaViewer(
+	not_null<Main::Session*> session,
+	SharedMediaMergedKey key,
+	int limitBefore,
+	int limitAfter);
+
 rpl::producer<SparseIdsMergedSlice> SharedMediaMergedViewer(
 	not_null<Main::Session*> session,
 	SharedMediaMergedKey key,
@@ -70,6 +76,8 @@ public:
 
 	static constexpr auto kScheduledTopicId
 		= SparseIdsMergedSlice::kScheduledTopicId;
+	static constexpr auto kSavedMusicTopicId
+		= SparseIdsMergedSlice::kSavedMusicTopicId;
 	struct Key {
 		Key(
 			PeerId peerId,
diff --git a/Telegram/SourceFiles/data/data_sparse_ids.h b/Telegram/SourceFiles/data/data_sparse_ids.h
index 3328ee5a40..10dbe9037e 100644
--- a/Telegram/SourceFiles/data/data_sparse_ids.h
+++ b/Telegram/SourceFiles/data/data_sparse_ids.h
@@ -28,6 +28,7 @@ class SparseIdsMergedSlice {
 public:
 	using UniversalMsgId = MsgId;
 	static constexpr MsgId kScheduledTopicId = ScheduledMaxMsgId;
+	static constexpr MsgId kSavedMusicTopicId = ScheduledMaxMsgId + 1;
 
 	struct Key {
 		Key(
diff --git a/Telegram/SourceFiles/data/data_types.h b/Telegram/SourceFiles/data/data_types.h
index ebc6958c41..e2850df79a 100644
--- a/Telegram/SourceFiles/data/data_types.h
+++ b/Telegram/SourceFiles/data/data_types.h
@@ -358,6 +358,7 @@ enum class MessageFlag : uint64 {
 	TonPaidSuggested      = (1ULL << 53),
 
 	StoryInProfile        = (1ULL << 54),
+	SavedMusicItem        = (1ULL << 55),
 };
 inline constexpr bool is_flag_type(MessageFlag) { return true; }
 using MessageFlags = base::flags<MessageFlag>;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index ae2f738165..5207443627 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -1831,6 +1831,10 @@ bool HistoryItem::isUserpicSuggestion() const {
 	return (_flags & MessageFlag::IsUserpicSuggestion);
 }
 
+bool HistoryItem::isSavedMusicItem() const {
+	return (_flags & MessageFlag::SavedMusicItem);
+}
+
 BusinessShortcutId HistoryItem::shortcutId() const {
 	return _shortcutId;
 }
diff --git a/Telegram/SourceFiles/history/history_item.h b/Telegram/SourceFiles/history/history_item.h
index 1f65b0c6a8..743112461b 100644
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -192,6 +192,7 @@ public:
 	[[nodiscard]] bool canLookupMessageAuthor() const;
 	[[nodiscard]] bool skipNotification() const;
 	[[nodiscard]] bool isUserpicSuggestion() const;
+	[[nodiscard]] bool isSavedMusicItem() const;
 	[[nodiscard]] BusinessShortcutId shortcutId() const;
 	[[nodiscard]] bool isBusinessShortcut() const;
 	void setRealShortcutId(BusinessShortcutId id);
diff --git a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
index 280d6d6d51..96b0b3320e 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_cover.cpp
@@ -835,7 +835,9 @@ void Cover::setupSavedMusic() {
 		1
 	) | rpl::map([=](const Data::SavedMusicSlice &data) {
 		return data.size() ? data[0].get() : nullptr;
-	}) | rpl::start_with_next([=](DocumentData *document) {
+	}) | rpl::start_with_next([=](HistoryItem *item) {
+		const auto media = item ? item->media() : nullptr;
+		const auto document = media ? media->document() : nullptr;
 		if (!document) {
 			_musicButton = nullptr;
 			resize(width(), _st.height);
@@ -845,6 +847,7 @@ void Cover::setupSavedMusic() {
 				this,
 				DocumentMusicButtonData(document),
 				[=] { _controller->showSection(MakeMusic(_peer)); });
+			_musicButton->show();
 
 			widthValue(
 			) | rpl::start_with_next([=](int newWidth) {
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
index 99fe45ba40..04510fc78c 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -81,31 +81,6 @@ bool MusicProvider::sectionHasFloatingHeader() {
 	return false;
 }
 
-not_null<DocumentData*> MusicProvider::musicIdFromMsgId(MsgId itemId) const {
-	const auto i = _musicIdFromMsgId.find(itemId);
-	Assert(i != end(_musicIdFromMsgId));
-
-	return i->second;
-}
-
-not_null<HistoryItem*> MusicProvider::musicIdToMsg(
-		not_null<DocumentData*> id) const {
-	const auto i = _musicIdToMsg.find(id);
-	if (i != end(_musicIdToMsg)) {
-		return i->second.get();
-	}
-	return _musicIdToMsg.emplace(id, _history->makeMessage({
-		.id = _history->nextNonHistoryEntryId(),
-		.flags = (MessageFlag::FakeHistoryItem | MessageFlag::HasFromId),
-		.from = _peer->id,
-		.date = base::unixtime::now(),
-	}, id, TextWithEntities())).first->second.get();
-}
-
-MsgId MusicProvider::musicIdToMsgId(not_null<DocumentData*> id) const {
-	return musicIdToMsg(id)->id;
-}
-
 QString MusicProvider::sectionTitle(not_null<const BaseLayout*> item) {
 	return QString();
 }
@@ -161,18 +136,18 @@ void MusicProvider::checkPreload(
 		/ minItemHeight;
 	const auto preloadAroundItem = [&](not_null<BaseLayout*> layout) {
 		auto preloadRequired = false;
-		const auto id = musicIdFromMsgId(layout->getItem()->id);
+		const auto item = layout->getItem();
 		if (!preloadRequired) {
 			preloadRequired = (_idsLimit < preloadIdsLimitMin);
 		}
 		if (!preloadRequired) {
-			auto delta = _slice.distance(_aroundId, id);
+			auto delta = _slice.distance(_aroundId, item);
 			Assert(delta != std::nullopt);
 			preloadRequired = (qAbs(*delta) >= minIdDelta);
 		}
 		if (preloadRequired) {
 			_idsLimit = preloadIdsLimit;
-			_aroundId = id;
+			_aroundId = item;
 			refreshViewer();
 		}
 	};
@@ -200,7 +175,7 @@ void MusicProvider::refreshViewer() {
 		}
 		_slice = std::move(slice);
 
-		auto nearestId = (DocumentData*)nullptr;
+		auto nearestId = (HistoryItem*)nullptr;
 		for (auto i = 0; i != _slice.size(); ++i) {
 			if (_slice[i] == aroundId) {
 				nearestId = aroundId;
@@ -227,8 +202,8 @@ std::vector<ListSection> MusicProvider::fillSections(
 	auto section = ListSection(Type::MusicFile, sectionDelegate());
 	auto count = _slice.size();
 	for (auto i = 0; i != count; ++i) {
-		const auto musicId = _slice[i];
-		if (const auto layout = getLayout(musicId, delegate)) {
+		const auto item = _slice[i];
+		if (const auto layout = getLayout(item, delegate)) {
 			if (!section.addItem(layout)) {
 				section.finishSection();
 				result.push_back(std::move(section));
@@ -280,13 +255,13 @@ bool MusicProvider::isAfter(
 }
 
 BaseLayout *MusicProvider::getLayout(
-		not_null<DocumentData*> id,
+		not_null<HistoryItem*> item,
 		not_null<Overview::Layout::Delegate*> delegate) {
-	auto it = _layouts.find(id);
+	auto it = _layouts.find(item);
 	if (it == _layouts.end()) {
-		if (auto layout = createLayout(id, delegate)) {
+		if (auto layout = createLayout(item, delegate)) {
 			layout->initDimensions();
-			it = _layouts.emplace(id, std::move(layout)).first;
+			it = _layouts.emplace(item, std::move(layout)).first;
 		} else {
 			return nullptr;
 		}
@@ -296,36 +271,22 @@ BaseLayout *MusicProvider::getLayout(
 }
 
 std::unique_ptr<BaseLayout> MusicProvider::createLayout(
-		not_null<DocumentData*> id,
+		not_null<HistoryItem*> item,
 		not_null<Overview::Layout::Delegate*> delegate) {
-	const auto item = musicIdToMsg(id);
-	if (!item) {
-		return nullptr;
-	}
-	const auto getPhoto = [&]() -> PhotoData* {
-		if (const auto media = item->media()) {
-			return media->photo();
-		}
-		return nullptr;
-	};
-	const auto getFile = [&]() -> DocumentData* {
-		if (const auto media = item->media()) {
-			return media->document();
-		}
-		return nullptr;
-	};
-
 	const auto peer = item->history()->peer;
 
 	using namespace Overview::Layout;
 	const auto options = MediaOptions{
 	};
-	if (const auto file = getFile()) {
-		return std::make_unique<Document>(
-			delegate,
-			item,
-			DocumentFields{ file },
-			st::overviewFileLayout);
+
+	if (const auto media = item->media()) {
+		if (const auto file = media->document()) {
+			return std::make_unique<Document>(
+				delegate,
+				item,
+				DocumentFields{ file },
+				st::overviewFileLayout);
+		}
 	}
 	return nullptr;
 }
@@ -334,11 +295,8 @@ ListItemSelectionData MusicProvider::computeSelectionData(
 		not_null<const HistoryItem*> item,
 		TextSelection selection) {
 	auto result = ListItemSelectionData(selection);
-	const auto id = item->id;
-	if (!_musicIdFromMsgId.contains(id)) {
-		return result;
-	}
 	AssertIsDebug();
+	//const auto id = item->id;
 	//const auto peer = item->history()->peer;
 	//const auto channel = peer->asChannel();
 	//const auto maybeStory = peer->owner().stories().lookup(
@@ -372,8 +330,7 @@ void MusicProvider::applyDragSelection(
 		}
 	}
 	for (auto &layoutItem : _layouts) {
-		const auto musicId = layoutItem.first;
-		const auto item = musicIdToMsg(musicId);
+		const auto item = layoutItem.first;
 		if (item->id <= fromId && item->id > tillId) {
 			ChangeItemSelection(
 				selected,
@@ -400,7 +357,7 @@ int64 MusicProvider::scrollTopStatePosition(not_null<HistoryItem*> item) {
 }
 
 HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {
-	if (state.item && _slice.indexOf(musicIdFromMsgId(state.item->id))) {
+	if (state.item && _slice.indexOf(state.item)) {
 		return state.item;
 	//} else if (const auto id = _slice.nearest(state.position)) {
 	//	const auto full = FullMsgId(_peer->id, StoryIdToMsgId(*id));
@@ -409,7 +366,7 @@ HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {
 	//	}
 	}
 
-	auto nearestId = (DocumentData*)nullptr; AssertIsDebug();
+	auto nearestId = (HistoryItem*)nullptr; AssertIsDebug();
 	//for (auto i = 0; i != _slice.size(); ++i) {
 	//	if (!nearestId
 	//		|| std::abs(*nearestId - state.position)
@@ -418,7 +375,7 @@ HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {
 	//	}
 	//}
 	if (nearestId) {
-		const auto full = FullMsgId(_peer->id, musicIdToMsgId(nearestId));
+		const auto full = nearestId->fullId();
 		if (const auto item = _controller->session().data().message(full)) {
 			return item;
 		}
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.h b/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
index 483d6e6a0e..77e4e33d0f 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.h
@@ -90,14 +90,6 @@ public:
 private:
 	static constexpr auto kMinimalIdsLimit = 16;
 
-	using OwnedItem = std::unique_ptr<HistoryItem, HistoryItem::Destroyer>;
-
-	[[nodiscard]] not_null<DocumentData*> musicIdFromMsgId(
-		MsgId itemId) const;
-	[[nodiscard]] not_null<HistoryItem*> musicIdToMsg(
-		not_null<DocumentData*> id) const;
-	[[nodiscard]] MsgId musicIdToMsgId(not_null<DocumentData*> id) const;
-
 	bool sectionHasFloatingHeader() override;
 	QString sectionTitle(not_null<const Media::BaseLayout*> item) override;
 	bool sectionItemBelongsHere(
@@ -108,29 +100,25 @@ private:
 	void clearStaleLayouts();
 	void clear();
 
-	[[nodiscard]] HistoryItem *ensureItem(not_null<DocumentData*> id);
 	[[nodiscard]] Media::BaseLayout *getLayout(
-		not_null<DocumentData*> id,
+		not_null<HistoryItem*> item,
 		not_null<Overview::Layout::Delegate*> delegate);
 	[[nodiscard]] std::unique_ptr<Media::BaseLayout> createLayout(
-		not_null<DocumentData*> musicId,
+		not_null<HistoryItem*> item,
 		not_null<Overview::Layout::Delegate*> delegate);
 
 	const not_null<AbstractController*> _controller;
 	const not_null<PeerData*> _peer;
 	const not_null<History*> _history;
 
-	DocumentData *_aroundId = nullptr;
+	HistoryItem *_aroundId = nullptr;
 	int _idsLimit = kMinimalIdsLimit;
 	Data::SavedMusicSlice _slice;
 
-	std::unordered_map<not_null<DocumentData*>, Media::CachedItem> _layouts;
+	std::unordered_map<not_null<HistoryItem*>, Media::CachedItem> _layouts;
 	rpl::event_stream<not_null<Media::BaseLayout*>> _layoutRemoved;
 	rpl::event_stream<> _refreshed;
 
-	mutable base::flat_map<MsgId, not_null<DocumentData*>> _musicIdFromMsgId;
-	mutable base::flat_map<not_null<DocumentData*>, OwnedItem> _musicIdToMsg;
-
 	bool _started = false;
 
 	rpl::lifetime _lifetime;
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
index 762e252aed..458d71b2e3 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
@@ -323,9 +323,7 @@ void MusicWidget::selectionAction(SelectionAction action) {
 }
 
 rpl::producer<QString> MusicWidget::title() {
-	//const auto peer = controller()->key().musicPeer();
-	AssertIsDebug();
-	return rpl::single(u"muzlo"_q);
+	return tr::lng_media_type_songs();
 }
 
 std::shared_ptr<Info::Memento> MakeMusic(not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/media/player/media_player_instance.cpp b/Telegram/SourceFiles/media/player/media_player_instance.cpp
index c73c34e5ef..51e30ce824 100644
--- a/Telegram/SourceFiles/media/player/media_player_instance.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_instance.cpp
@@ -88,6 +88,7 @@ struct Instance::ShuffleData {
 	PeerId monoforumPeerId = 0;
 	History *migrated = nullptr;
 	bool scheduled = false;
+	bool savedMusic = false;
 	int indexInPlayedIds = 0;
 	bool allLoaded = false;
 	rpl::lifetime nextSliceLifetime;
@@ -387,6 +388,8 @@ void Instance::validatePlaylist(not_null<Data*> data) {
 		const auto sharedMediaViewer = (key->topicRootId
 			== SparseIdsMergedSlice::kScheduledTopicId)
 			? SharedScheduledMediaViewer
+			: (key->topicRootId == SparseIdsMergedSlice::kSavedMusicTopicId)
+			? SavedMusicMediaViewer
 			: SharedMediaMergedViewer;
 		sharedMediaViewer(
 			&data->history->session(),
@@ -413,7 +416,10 @@ auto Instance::playlistKey(not_null<const Data*> data) const
 		return {};
 	}
 	const auto item = data->history->owner().message(contextId);
-	if (!item || (!item->isRegular() && !item->isScheduled())) {
+	if (!item
+		|| (!item->isRegular()
+			&& !item->isScheduled()
+			&& !item->isSavedMusicItem())) {
 		return {};
 	}
 
@@ -424,6 +430,8 @@ auto Instance::playlistKey(not_null<const Data*> data) const
 		data->history->peer->id,
 		(item->isScheduled()
 			? SparseIdsMergedSlice::kScheduledTopicId
+			: item->isSavedMusicItem()
+			? SparseIdsMergedSlice::kSavedMusicTopicId
 			: data->topicRootId),
 		data->monoforumPeerId,
 		data->migrated ? data->migrated->peer->id : 0,
@@ -908,14 +916,18 @@ void Instance::validateShuffleData(not_null<Data*> data) {
 	const auto key = playlistKey(data);
 	const auto scheduled = key
 		&& (key->topicRootId == SparseIdsMergedSlice::kScheduledTopicId);
+	const auto savedMusic = key
+		&& (key->topicRootId == SparseIdsMergedSlice::kSavedMusicTopicId);
 	if (raw->history != data->history
 		|| raw->topicRootId != data->topicRootId
 		|| raw->monoforumPeerId != data->monoforumPeerId
 		|| raw->migrated != data->migrated
-		|| raw->scheduled != scheduled) {
+		|| raw->scheduled != scheduled
+		|| raw->savedMusic != savedMusic) {
 		raw->history = data->history;
 		raw->migrated = data->migrated;
 		raw->scheduled = scheduled;
+		raw->savedMusic = savedMusic;
 		raw->nextSliceLifetime.destroy();
 		raw->allLoaded = false;
 		raw->playlist.clear();
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.cpp b/Telegram/SourceFiles/media/player/media_player_panel.cpp
index 9da485b116..73c9556d44 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.cpp
+++ b/Telegram/SourceFiles/media/player/media_player_panel.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "media/player/media_player_instance.h"
 #include "info/media/info_media_list_widget.h"
+#include "info/saved/info_saved_music_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "data/data_session.h"
@@ -227,6 +228,7 @@ void Panel::ensureCreated() {
 void Panel::refreshList() {
 	const auto current = instance()->current(AudioMsgId::Type::Song);
 	const auto contextId = current.contextId();
+	auto savedMusicItem = false;
 	const auto peer = [&]() -> PeerData* {
 		if (const auto document = current.audio()) {
 			if (&document->session() != &session()) {
@@ -241,9 +243,12 @@ void Panel::refreshList() {
 		const auto document = media ? media->document() : nullptr;
 		if (!document
 			|| !document->isSharedMediaMusic()
-			|| (!item->isRegular() && !item->isScheduled())) {
+			|| (!item->isRegular()
+				&& !item->isScheduled()
+				&& !item->isSavedMusicItem())) {
 			return nullptr;
 		}
+		savedMusicItem = item->isSavedMusicItem();
 		const auto result = item->history()->peer;
 		if (const auto migrated = result->migrateTo()) {
 			return migrated;
@@ -251,13 +256,19 @@ void Panel::refreshList() {
 		return result;
 	}();
 	const auto migrated = peer ? peer->migrateFrom() : nullptr;
-	if (_listPeer != peer || _listMigratedPeer != migrated) {
+	const auto listPeer = savedMusicItem ? nullptr : peer;
+	const auto listMusicPeer = savedMusicItem ? peer : nullptr;
+	const auto listMigratedPeer = savedMusicItem ? nullptr : migrated;
+	if (_listPeer != listPeer
+		|| _listMusicPeer != listMusicPeer
+		|| _listMigratedPeer != listMigratedPeer) {
 		_scroll->takeWidget<QWidget>().destroy();
-		_listPeer = _listMigratedPeer = nullptr;
+		_listPeer = _listMusicPeer = _listMigratedPeer = nullptr;
 	}
-	if (peer && !_listPeer) {
-		_listPeer = peer;
-		_listMigratedPeer = migrated;
+	if ((listPeer && !_listPeer) || (listMusicPeer && !_listMusicPeer)) {
+		_listPeer = listPeer;
+		_listMusicPeer = listMusicPeer;
+		_listMigratedPeer = listMigratedPeer;
 		auto list = object_ptr<ListWidget>(this, infoController());
 
 		const auto weak = _scroll->setOwnedWidget(std::move(list));
@@ -292,10 +303,14 @@ void Panel::refreshList() {
 			weak->setVisibleTopBottom(top, bottom);
 		}, weak->lifetime());
 
-		auto memento = Info::Media::Memento(
+		auto musicMemento = Info::Saved::MusicMemento(peer);
+		auto mediaMemento = Info::Media::Memento(
 			peer,
 			migratedPeerId(),
-			section().mediaType());
+			(listMusicPeer
+				? Storage::SharedMediaType::MusicFile
+				: section().mediaType()));
+		auto &memento = listMusicPeer ? musicMemento.media() : mediaMemento;
 		memento.setAroundId(contextId);
 		memento.setIdsLimit(kPlaylistIdsLimit);
 		memento.setScrollTopItem({ contextId, peer->session().uniqueId() });
@@ -308,12 +323,14 @@ void Panel::performDestroy() {
 	if (!_scroll->widget()) return;
 
 	_scroll->takeWidget<QWidget>().destroy();
-	_listPeer = _listMigratedPeer = nullptr;
+	_listPeer = _listMusicPeer = _listMigratedPeer = nullptr;
 	_refreshListLifetime.destroy();
 }
 
 Info::Key Panel::key() const {
-	return Info::Key(_listPeer);
+	return _listMusicPeer
+		? Info::Key(Info::Saved::MusicTag{ _listMusicPeer })
+		: Info::Key(_listPeer);
 }
 
 PeerData *Panel::migrated() const {
@@ -321,7 +338,9 @@ PeerData *Panel::migrated() const {
 }
 
 Info::Section Panel::section() const {
-	return Info::Section(Info::Section::MediaType::MusicFile);
+	return _listMusicPeer
+		? Info::Section(Info::Section::Type::SavedMusic)
+		: Info::Section(Info::Section::MediaType::MusicFile);
 }
 
 void Panel::startShow() {
diff --git a/Telegram/SourceFiles/media/player/media_player_panel.h b/Telegram/SourceFiles/media/player/media_player_panel.h
index 9123834cee..c46b499c3a 100644
--- a/Telegram/SourceFiles/media/player/media_player_panel.h
+++ b/Telegram/SourceFiles/media/player/media_player_panel.h
@@ -101,6 +101,7 @@ private:
 
 	rpl::lifetime _refreshListLifetime;
 	PeerData *_listPeer = nullptr;
+	PeerData *_listMusicPeer = nullptr;
 	PeerData *_listMigratedPeer = nullptr;
 
 };

From dbaa7b5e674fe500600369076349929638dc8262 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Aug 2025 19:26:23 +0400
Subject: [PATCH 269/341] Allow forward / delete saved music.

---
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/apiwrap.cpp              | 18 ++++-
 .../SourceFiles/boxes/delete_messages_box.cpp | 65 ++++++++++++-------
 .../SourceFiles/boxes/delete_messages_box.h   |  1 +
 Telegram/SourceFiles/data/data_histories.cpp  | 23 +++++--
 .../controls/history_view_draft_options.cpp   |  2 +-
 .../controls/history_view_forward_panel.cpp   | 11 +++-
 .../controls/history_view_forward_panel.h     |  1 +
 .../info/media/info_media_list_widget.cpp     |  4 ++
 .../info/saved/info_saved_music_provider.cpp  | 29 +++------
 10 files changed, 102 insertions(+), 53 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index ade5b22f81..e46c793933 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -4814,6 +4814,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_selected_delete_sure_this" = "Do you want to delete this message?";
 "lng_selected_delete_sure#one" = "Do you want to delete {count} message?";
 "lng_selected_delete_sure#other" = "Do you want to delete {count} messages?";
+"lng_selected_remove_saved_music" = "Do you want to remove this file from your profile?";
 "lng_delete_photo_sure" = "Do you want to delete this photo?";
 "lng_delete_for_everyone_hint#one" = "This will delete it for everyone in this chat.";
 "lng_delete_for_everyone_hint#other" = "This will delete them for everyone in this chat.";
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index fdf8e04512..bc13e0774a 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3350,8 +3350,8 @@ void ApiWrap::finishForwarding(const SendAction &action) {
 			return;
 		}
 
-		forwardMessages(std::move(toForward), action);
 		history->setForwardDraft(topicRootId, monoforumPeerId, {});
+		forwardMessages(std::move(toForward), action);
 	}
 
 	_session->data().sendHistoryChangeNotifications();
@@ -3372,6 +3372,22 @@ void ApiWrap::forwardMessages(
 
 	auto &histories = _session->data().histories();
 
+	for (auto i = begin(draft.items); i != end(draft.items);) {
+		const auto item = *i;
+		if (item->isSavedMusicItem()) {
+			SendExistingDocument(MessageToSend(action), item->media()->document());
+			i = draft.items.erase(i);
+		} else {
+			++i;
+		}
+	}
+	if (draft.items.empty()) {
+		if (successCallback) {
+			successCallback();
+		}
+		return;
+	}
+
 	struct SharedCallback {
 		int requestsLeft = 0;
 		FnMut<void()> callback;
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index c4edf1b3fa..20f5136512 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -224,12 +224,14 @@ void DeleteMessagesBox::prepare() {
 			search->searchMessages({ .from = _moderateFrom });
 		}
 	} else {
-		details.text = (_ids.size() == 1)
+		details.text = hasSavedMusicMessages()
+			? tr::lng_selected_remove_saved_music(tr::now)
+			: (_ids.size() == 1)
 			? tr::lng_selected_delete_sure_this(tr::now)
 			: tr::lng_selected_delete_sure(tr::now, lt_count, _ids.size());
 		if (const auto peer = checkFromSinglePeer()) {
 			auto count = int(_ids.size());
-			if (hasScheduledMessages()) {
+			if (hasScheduledMessages() || hasSavedMusicMessages()) {
 			} else if (auto revoke = revokeText(peer)) {
 				const auto &settings = Core::App().settings();
 				const auto revokeByDefault
@@ -313,28 +315,36 @@ void DeleteMessagesBox::prepare() {
 		addButton(tr::lng_about_done(), [=] { closeBox(); });
 	}
 
-	auto fullHeight = st::boxPadding.top()
-		+ _text->height()
-		+ st::boxPadding.bottom();
-	if (_moderateFrom) {
-		fullHeight += st::boxMediumSkip;
-		if (_banUser) {
-			fullHeight += _banUser->heightNoMargins() + st::boxLittleSkip;
+	const auto &padding = st::boxPadding;
+	rpl::combine(
+		widthValue(),
+		_text->naturalWidthValue()
+	) | rpl::start_with_next([=](int full, int) {
+		_text->resizeToNaturalWidth(full - padding.left() - padding.right());
+
+		auto fullHeight = st::boxPadding.top()
+			+ _text->height()
+			+ st::boxPadding.bottom();
+		if (_moderateFrom) {
+			fullHeight += st::boxMediumSkip;
+			if (_banUser) {
+				fullHeight += _banUser->heightNoMargins() + st::boxLittleSkip;
+			}
+			fullHeight += _reportSpam->heightNoMargins();
+			if (_deleteAll) {
+				fullHeight += st::boxLittleSkip + _deleteAll->heightNoMargins();
+			}
+		} else if (_revoke) {
+			fullHeight += st::boxMediumSkip + _revoke->heightNoMargins();
 		}
-		fullHeight += _reportSpam->heightNoMargins();
-		if (_deleteAll) {
-			fullHeight += st::boxLittleSkip + _deleteAll->heightNoMargins();
+		if (_autoDeleteSettings) {
+			fullHeight += st::boxMediumSkip
+				+ _autoDeleteSettings->height()
+				+ st::boxLittleSkip;
 		}
-	} else if (_revoke) {
-		fullHeight += st::boxMediumSkip + _revoke->heightNoMargins();
-	}
-	if (_autoDeleteSettings) {
-		fullHeight += st::boxMediumSkip
-			+ _autoDeleteSettings->height()
-			+ st::boxLittleSkip;
-	}
-	setDimensions(st::boxWidth, fullHeight);
-	_fullHeight = fullHeight;
+		setDimensions(st::boxWidth, fullHeight);
+		_fullHeight = fullHeight;
+	}, lifetime());
 }
 
 bool DeleteMessagesBox::hasScheduledMessages() const {
@@ -348,6 +358,17 @@ bool DeleteMessagesBox::hasScheduledMessages() const {
 	return false;
 }
 
+bool DeleteMessagesBox::hasSavedMusicMessages() const {
+	for (const auto &fullId : _ids) {
+		if (const auto item = _session->data().message(fullId)) {
+			if (item->isSavedMusicItem()) {
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 PeerData *DeleteMessagesBox::checkFromSinglePeer() const {
 	auto result = (PeerData*)nullptr;
 	for (const auto &fullId : _ids) {
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.h b/Telegram/SourceFiles/boxes/delete_messages_box.h
index 29cd403561..635a1fd362 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.h
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.h
@@ -58,6 +58,7 @@ private:
 	void deleteAndClear();
 	[[nodiscard]] PeerData *checkFromSinglePeer() const;
 	[[nodiscard]] bool hasScheduledMessages() const;
+	[[nodiscard]] bool hasSavedMusicMessages() const;
 	[[nodiscard]] std::optional<RevokeConfig> revokeText(
 		not_null<PeerData*> peer) const;
 	[[nodiscard]] PaidPostType paidPostType() const;
diff --git a/Telegram/SourceFiles/data/data_histories.cpp b/Telegram/SourceFiles/data/data_histories.cpp
index 30983b9347..047f1ba9bd 100644
--- a/Telegram/SourceFiles/data/data_histories.cpp
+++ b/Telegram/SourceFiles/data/data_histories.cpp
@@ -10,13 +10,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_text_entities.h"
 #include "data/business/data_shortcut_messages.h"
 #include "data/components/scheduled_messages.h"
-#include "data/data_saved_sublist.h"
-#include "data/data_session.h"
 #include "data/data_channel.h"
 #include "data/data_chat.h"
+#include "data/data_document.h"
 #include "data/data_folder.h"
 #include "data/data_forum.h"
 #include "data/data_forum_topic.h"
+#include "data/data_saved_music.h"
+#include "data/data_saved_sublist.h"
+#include "data/data_session.h"
 #include "data/data_user.h"
 #include "base/unixtime.h"
 #include "base/random.h"
@@ -885,10 +887,10 @@ void Histories::deleteMessagesByDates(
 }
 
 void Histories::deleteMessagesByDates(
-		not_null<History*> history,
-		TimeId minDate,
-		TimeId maxDate,
-		bool revoke) {
+	not_null<History*> history,
+	TimeId minDate,
+	TimeId maxDate,
+	bool revoke) {
 	sendRequest(history, RequestType::Delete, [=](Fn<void()> finish) {
 		const auto peer = history->peer;
 		using Flag = MTPmessages_DeleteHistory::Flag;
@@ -921,10 +923,14 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
 	base::flat_map<not_null<History*>, QVector<MTPint>> idsByPeer;
 	base::flat_map<not_null<PeerData*>, QVector<MTPint>> scheduledIdsByPeer;
 	base::flat_map<BusinessShortcutId, QVector<MTPint>> quickIdsByShortcut;
+	base::flat_set<not_null<DocumentData*>> savedMusic;
 	for (const auto &itemId : ids) {
 		if (const auto item = _owner->message(itemId)) {
 			const auto history = item->history();
-			if (item->isScheduled()) {
+			if (item->isSavedMusicItem()) {
+				savedMusic.emplace(item->media()->document());
+				continue;
+			} else if (item->isScheduled()) {
 				const auto wasOnServer = !item->isSending()
 					&& !item->hasFailed();
 				auto &scheduled = _owner->session().scheduledMessages();
@@ -973,6 +979,9 @@ void Histories::deleteMessages(const MessageIdsList &ids, bool revoke) {
 			api->applyUpdates(result);
 		}).send();
 	}
+	for (const auto &document : savedMusic) {
+		document->owner().savedMusic().remove(document);
+	}
 
 	for (const auto item : remove) {
 		const auto history = item->history();
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
index a1f3d9ae3e..417548f20d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp
@@ -949,7 +949,7 @@ void DraftOptionsBox(
 		AddFilledSkip(bottom);
 
 		if (!hasOnlyForcedForwardedInfo
-			&& !HasOnlyDroppedForwardedInfo(items)) {
+			&& HasDropForwardedInfoSetting(items)) {
 			Settings::AddButtonWithIcon(
 				bottom,
 				(dropNames
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
index 8a8b30fff8..5d01148138 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.cpp
@@ -463,11 +463,20 @@ bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list) {
 
 bool HasOnlyDroppedForwardedInfo(const HistoryItemsList &list) {
 	for (const auto &item : list) {
-		if (!item->computeDropForwardedInfo()) {
+		if (item->isSavedMusicItem() || !item->computeDropForwardedInfo()) {
 			return false;
 		}
 	}
 	return true;
 }
 
+bool HasDropForwardedInfoSetting(const HistoryItemsList &list) {
+	for (const auto &item : list) {
+		if (!item->computeDropForwardedInfo()) {
+			return true;
+		}
+	}
+	return false;
+}
+
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
index 2e8dcc36d5..b29204047d 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
+++ b/Telegram/SourceFiles/history/view/controls/history_view_forward_panel.h
@@ -87,5 +87,6 @@ void EditWebPageOptions(
 
 [[nodiscard]] bool HasOnlyForcedForwardedInfo(const HistoryItemsList &list);
 [[nodiscard]] bool HasOnlyDroppedForwardedInfo(const HistoryItemsList &list);
+[[nodiscard]] bool HasDropForwardedInfoSetting(const HistoryItemsList &list);
 
 } // namespace HistoryView::Controls
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 95c93ba3e4..1df9f6e459 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1308,6 +1308,10 @@ void ListWidget::showContextMenu(
 		}
 	}
 
+	if (_contextMenu->empty()) {
+		_contextMenu = nullptr;
+		return;
+	}
 	_contextMenu->setDestroyedCallback(crl::guard(
 		this,
 		[=] {
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
index 04510fc78c..ef8378b139 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -67,10 +67,10 @@ Type MusicProvider::type() {
 }
 
 bool MusicProvider::hasSelectRestriction() {
-	if (_peer->session().frozen()) {
-		return true;
-	}
-	return !_peer->isSelf();
+	//if (_peer->session().frozen()) {
+	//	return true;
+	//}
+	return true;
 }
 
 rpl::producer<bool> MusicProvider::hasSelectRestrictionChanges() {
@@ -295,21 +295,8 @@ ListItemSelectionData MusicProvider::computeSelectionData(
 		not_null<const HistoryItem*> item,
 		TextSelection selection) {
 	auto result = ListItemSelectionData(selection);
-	AssertIsDebug();
-	//const auto id = item->id;
-	//const auto peer = item->history()->peer;
-	//const auto channel = peer->asChannel();
-	//const auto maybeStory = peer->owner().stories().lookup(
-	//	{ peer->id, StoryIdFromMsgId(id) });
-	//if (maybeStory) {
-	//	const auto story = *maybeStory;
-	//	result.canForward = peer->isSelf() && story->canShare();
-	//	result.canDelete = story->canDelete();
-	//	result.canUnpinStory = story->pinnedToTop();
-	//	result.storyInProfile = story->inProfile();
-	//}
-	//result.canToggleStoryPin = peer->isSelf()
-	//	|| (channel && channel->canEditStories());
+	result.canDelete = item->history()->peer->isSelf();
+	result.canForward = true;// item->allowsForward();
 	return result;
 }
 
@@ -343,13 +330,13 @@ void MusicProvider::applyDragSelection(
 bool MusicProvider::allowSaveFileAs(
 		not_null<const HistoryItem*> item,
 		not_null<DocumentData*> document) {
-	return false;
+	return true;
 }
 
 QString MusicProvider::showInFolderPath(
 		not_null<const HistoryItem*> item,
 		not_null<DocumentData*> document) {
-	return QString();
+	return document->filepath(true);
 }
 
 int64 MusicProvider::scrollTopStatePosition(not_null<HistoryItem*> item) {

From 4f1c2788b8203a29bd4e341b896e33b1e7a4ad01 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Aug 2025 13:43:33 +0400
Subject: [PATCH 270/341] Improve phrasing for saved music.

---
 Telegram/CMakeLists.txt                       |   2 +
 Telegram/Resources/langs/lang.strings         |   9 ++
 .../SourceFiles/boxes/delete_messages_box.cpp |   3 +
 Telegram/SourceFiles/data/data_document.cpp   |   4 +
 Telegram/SourceFiles/data/data_document.h     |   1 +
 .../SourceFiles/data/data_saved_music.cpp     |  31 +++++-
 Telegram/SourceFiles/data/data_saved_music.h  |   5 +
 Telegram/SourceFiles/data/data_session.cpp    |   3 +
 .../history/history_inner_widget.cpp          |  37 ++++---
 .../media/history_view_save_audio_action.cpp  | 101 ++++++++++++++++++
 .../media/history_view_save_audio_action.h    |  29 +++++
 .../info/saved/info_saved_music_widget.cpp    |   9 +-
 Telegram/SourceFiles/ui/chat/chat.style       |   6 ++
 .../SourceFiles/window/window_peer_menu.cpp   |  52 ++++-----
 .../SourceFiles/window/window_peer_menu.h     |   8 ++
 15 files changed, 251 insertions(+), 49 deletions(-)
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp
 create mode 100644 Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index ed133b857f..2d75c61ad5 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -817,6 +817,8 @@ PRIVATE
     history/view/media/history_view_poll.h
     history/view/media/history_view_premium_gift.cpp
     history/view/media/history_view_premium_gift.h
+    history/view/media/history_view_save_audio_action.cpp
+    history/view/media/history_view_save_audio_action.h
     history/view/media/history_view_service_box.cpp
     history/view/media/history_view_service_box.h
     history/view/media/history_view_similar_channels.cpp
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e46c793933..2c84d7b8ba 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1659,6 +1659,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_type_audios" = "Voice messages";
 "lng_media_type_links" = "Shared links";
 "lng_media_type_rounds" = "Video messages";
+"lng_media_saved_music_your" = "Your playlist";
+"lng_media_saved_music_title" = "Playlist";
 "lng_profile_common_groups_section" = "Groups in common";
 "lng_info_edit_contact" = "Edit contact";
 "lng_info_delete_contact" = "Delete contact";
@@ -4400,6 +4402,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_pack_info" = "View Sticker Set";
 "lng_context_pack_add" = "Add Stickers";
 "lng_context_save_file" = "Save As...";
+"lng_context_save_music_to" = "Save to...";
+"lng_context_save_music_profile" = "... Profile";
+"lng_context_save_music_saved" = "... Saved Messages";
+"lng_context_save_music_folder" = "... Downloads";
+"lng_context_save_music_about" = "Choose where you want this audio to be saved.";
 "lng_context_copy_text" = "Copy Text";
 "lng_context_open_gif" = "Open GIF";
 "lng_context_save_gif" = "Add to GIFs";
@@ -4815,6 +4822,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_selected_delete_sure#one" = "Do you want to delete {count} message?";
 "lng_selected_delete_sure#other" = "Do you want to delete {count} messages?";
 "lng_selected_remove_saved_music" = "Do you want to remove this file from your profile?";
+"lng_saved_music_added" = "Audio added to your Profile.";
+"lng_saved_music_removed" = "Audio removed from your Profile.";
 "lng_delete_photo_sure" = "Do you want to delete this photo?";
 "lng_delete_for_everyone_hint#one" = "This will delete it for everyone in this chat.";
 "lng_delete_for_everyone_hint#other" = "This will delete them for everyone in this chat.";
diff --git a/Telegram/SourceFiles/boxes/delete_messages_box.cpp b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
index 20f5136512..9a04827223 100644
--- a/Telegram/SourceFiles/boxes/delete_messages_box.cpp
+++ b/Telegram/SourceFiles/boxes/delete_messages_box.cpp
@@ -582,6 +582,9 @@ void DeleteMessagesBox::deleteAndClear() {
 		// deleteMessages can initiate closing of the current section,
 		// which will cause this box to be destroyed.
 		const auto weak = base::make_weak(this);
+		if (hasSavedMusicMessages()) {
+			uiShow()->showToast(tr::lng_saved_music_removed(tr::now));
+		}
 		if (const auto callback = _deleteConfirmedCallback) {
 			callback();
 		}
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index bbb5ae1058..0d8a7799d4 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1712,6 +1712,10 @@ void DocumentData::forceIsStreamedAnimation() {
 	setMaybeSupportsStreaming(true);
 }
 
+bool DocumentData::isMusicForProfile() const {
+	return isSong();
+}
+
 bool DocumentData::isVoiceMessage() const {
 	return (type == VoiceDocument);
 }
diff --git a/Telegram/SourceFiles/data/data_document.h b/Telegram/SourceFiles/data/data_document.h
index f91f828a1b..b0918a37c8 100644
--- a/Telegram/SourceFiles/data/data_document.h
+++ b/Telegram/SourceFiles/data/data_document.h
@@ -182,6 +182,7 @@ public:
 	[[nodiscard]] const VideoData *video() const;
 
 	void forceIsStreamedAnimation();
+	[[nodiscard]] bool isMusicForProfile() const;
 	[[nodiscard]] bool isVoiceMessage() const;
 	[[nodiscard]] bool isVideoMessage() const;
 	[[nodiscard]] bool isSong() const;
diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
index 273e876101..4ae5963ab9 100644
--- a/Telegram/SourceFiles/data/data_saved_music.cpp
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -22,6 +22,7 @@ namespace Data {
 namespace {
 
 constexpr auto kPerPage = 50;
+constexpr auto kReloadIdsEvery = 30 * crl::time(1000);
 
 [[nodiscard]] not_null<DocumentData*> ItemDocument(
 		not_null<HistoryItem*> item) {
@@ -66,9 +67,31 @@ not_null<HistoryItem*> SavedMusic::musicIdToMsg(
 	}, id, TextWithEntities())).first->second.get();
 }
 
+void SavedMusic::loadIds() {
+	if (_loadIdsRequest
+		|| (_lastReceived
+			&& (crl::now() - _lastReceived < kReloadIdsEvery))) {
+		return;
+	}
+	_loadIdsRequest = _owner->session().api().request(
+		MTPaccount_GetSavedMusicIds(MTP_long(Api::CountHash(_myIds)))
+	).done([=](const MTPaccount_SavedMusicIds &result) {
+		_loadIdsRequest = 0;
+		_lastReceived = crl::now();
+		result.match([&](const MTPDaccount_savedMusicIds &data) {
+			_myIds = data.vids().v
+				| ranges::views::transform(&MTPlong::v)
+				| ranges::to_vector;
+		}, [](const MTPDaccount_savedMusicIdsNotModified &) {
+		});
+	}).fail([=] {
+		_loadIdsRequest = 0;
+		_lastReceived = crl::now();
+	}).send();
+}
+
 bool SavedMusic::has(not_null<DocumentData*> document) const {
-	const auto entry = lookupEntry(_owner->session().userPeerId());
-	return entry && ranges::contains(entry->list, document, ItemDocument);
+	return ranges::contains(_myIds, document->id);
 }
 
 void SavedMusic::save(not_null<DocumentData*> document) {
@@ -77,7 +100,7 @@ void SavedMusic::save(not_null<DocumentData*> document) {
 	if (entry.list.empty() && !entry.loaded) {
 		loadMore(peerId);
 	}
-	if (ranges::contains(entry.list, document, ItemDocument)) {
+	if (has(document)) {
 		return;
 	}
 	const auto item = musicIdToMsg(peerId, entry, document);
@@ -85,6 +108,7 @@ void SavedMusic::save(not_null<DocumentData*> document) {
 	if (entry.total >= 0) {
 		++entry.total;
 	}
+	_myIds.insert(begin(_myIds), document->id);
 	_owner->session().api().request(MTPaccount_SaveMusic(
 		MTP_flags(0),
 		document->mtpInput(),
@@ -105,6 +129,7 @@ void SavedMusic::remove(not_null<DocumentData*> document) {
 		}
 	}
 	entry.musicIdToMsg.remove(document);
+	_myIds.erase(ranges::remove(_myIds, document->id), end(_myIds));
 	_owner->session().api().request(MTPaccount_SaveMusic(
 		MTP_flags(MTPaccount_SaveMusic::Flag::f_unsave),
 		document->mtpInput(),
diff --git a/Telegram/SourceFiles/data/data_saved_music.h b/Telegram/SourceFiles/data/data_saved_music.h
index fe31a5d788..28c77d11f2 100644
--- a/Telegram/SourceFiles/data/data_saved_music.h
+++ b/Telegram/SourceFiles/data/data_saved_music.h
@@ -32,6 +32,7 @@ public:
 
 	[[nodiscard]] rpl::producer<PeerId> changed() const;
 
+	void loadIds();
 	[[nodiscard]] bool has(not_null<DocumentData*> document) const;
 	void save(not_null<DocumentData*> document);
 	void remove(not_null<DocumentData*> document);
@@ -65,6 +66,10 @@ private:
 
 	const not_null<Session*> _owner;
 
+	std::vector<DocumentId> _myIds;
+	crl::time _lastReceived = 0;
+	mtpRequestId _loadIdsRequest = 0;
+
 	std::unordered_map<PeerId, Entry> _entries;
 	rpl::event_stream<PeerId> _changed;
 
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index 367e0c54c1..c2dce9a9df 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -4391,6 +4391,9 @@ void Session::unregisterPhotoItem(
 void Session::registerDocumentItem(
 		not_null<const DocumentData*> document,
 		not_null<HistoryItem*> item) {
+	if (document->isMusicForProfile()) {
+		document->owner().savedMusic().loadIds();
+	}
 	_documentItems[document].insert(item);
 }
 
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index be9932b6d5..cc87f6f5b3 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -15,6 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
 #include "history/view/controls/history_view_suggest_options.h"
+#include "history/view/media/history_view_save_audio_action.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/reactions/history_view_reactions.h"
@@ -2547,24 +2548,26 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				item,
 				document,
 				controller);
-			_menu->addAction(lnkIsVideo ? tr::lng_context_save_video(tr::now) : (lnkIsVoice ? tr::lng_context_save_audio(tr::now) : (lnkIsAudio ? tr::lng_context_save_audio_file(tr::now) : tr::lng_context_save_file(tr::now))), base::fn_delayed(st::defaultDropdownMenu.menu.ripple.hideDuration, this, [=] {
-				saveDocumentToFile(itemId, document);
-			}), &st::menuIconDownload);
-
-			if (document->isSong()) {
-				if (document->owner().savedMusic().has(document)) {
-					_menu->addAction(u"remove muzlo :("_q, [=] {
-						document->owner().savedMusic().remove(document);
-						_controller->showToast(u"removed from muzlo!"_q);
-					}, &st::menuIconUnfave);
-				} else {
-					_menu->addAction(u"to muzlo!"_q, [=] {
-						document->owner().savedMusic().save(document);
-						_controller->showToast(u"added to muzlo! :)"_q);
-					}, &st::menuIconFave);
-				}
+			if (lnkIsAudio) {
+				HistoryView::AddSaveAudioAction(
+					Ui::Menu::CreateAddActionCallback(_menu),
+					item,
+					document,
+					controller);
+			} else {
+				const auto text = lnkIsVideo
+					? tr::lng_context_save_video(tr::now)
+					: lnkIsVoice
+					? tr::lng_context_save_audio(tr::now)
+					: lnkIsAudio
+					? tr::lng_context_save_audio_file(tr::now)
+					: tr::lng_context_save_file(tr::now);
+				const auto &ripple = st::defaultDropdownMenu.menu.ripple;
+				const auto duration = ripple.hideDuration;
+				_menu->addAction(text, base::fn_delayed(duration, this, [=] {
+					saveDocumentToFile(itemId, document);
+				}), &st::menuIconDownload);
 			}
-
 			HistoryView::AddCopyFilename(
 				_menu,
 				document,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp b/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp
new file mode 100644
index 0000000000..7fd4de444a
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp
@@ -0,0 +1,101 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "history/view/media/history_view_save_audio_action.h"
+
+#include "base/call_delayed.h"
+#include "data/data_document.h"
+#include "data/data_file_click_handler.h"
+#include "data/data_peer.h"
+#include "data/data_saved_music.h"
+#include "data/data_session.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "lang/lang_keys.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_multiline_action.h"
+#include "ui/widgets/popup_menu.h"
+#include "window/window_peer_menu.h"
+#include "window/window_session_controller.h"
+#include "styles/style_chat.h"
+#include "styles/style_menu_icons.h"
+#include "styles/style_widgets.h"
+
+namespace HistoryView {
+
+void AddSaveAudioAction(
+		const Ui::Menu::MenuCallback &addAction,
+		not_null<HistoryItem*> item,
+		not_null<DocumentData*> document,
+		not_null<Window::SessionController*> controller) {
+	const auto contextId = item->fullId();
+	const auto fromSaved = item->history()->peer->isSelf();
+	const auto savedMusic = &document->owner().savedMusic();
+	const auto show = controller->uiShow();
+	const auto inProfile = savedMusic->has(document);
+	const auto &ripple = st::defaultDropdownMenu.menu.ripple;
+	const auto duration = ripple.hideDuration;
+	const auto saveAs = base::fn_delayed(duration, controller, [=] {
+		DocumentSaveClickHandler::SaveAndTrack(
+			contextId,
+			document,
+			DocumentSaveClickHandler::Mode::ToNewFile);
+	});
+	if (!document->isMusicForProfile() || (fromSaved && inProfile)) {
+		addAction(
+			tr::lng_context_save_audio_file(tr::now),
+			saveAs,
+			&st::menuIconDownload);
+		return;
+	}
+	const auto fill = [&](not_null<Ui::PopupMenu*> menu) {
+		if (!inProfile) {
+			const auto saved = [=] {
+				savedMusic->save(document);
+				show->showToast(tr::lng_saved_music_added(tr::now));
+			};
+			menu->addAction(
+				tr::lng_context_save_music_profile(tr::now),
+				saved,
+				&st::menuIconProfile);
+		}
+		if (!fromSaved) {
+			menu->addAction(
+				tr::lng_context_save_music_saved(tr::now),
+				[=] { Window::ForwardToSelf(show, { { contextId } }); },
+				&st::menuIconSavedMessages);
+		}
+		menu->addAction(
+			tr::lng_context_save_music_folder(tr::now),
+			saveAs,
+			&st::menuIconDownload);
+
+		menu->addSeparator(&st::expandedMenuSeparator);
+
+		auto item = base::make_unique_q<Ui::Menu::MultilineAction>(
+			menu,
+			st::saveMusicInfoMenu,
+			st::historyHasCustomEmoji,
+			QPoint(
+				st::saveMusicInfoMenu.itemPadding.left(),
+				st::saveMusicInfoMenu.itemPadding.top()),
+			TextWithEntities{ tr::lng_context_save_music_about(tr::now) });
+		item->setAttribute(Qt::WA_TransparentForMouseEvents);
+
+		item->setPointerCursor(false);
+		menu->addAction(std::move(item));
+	};
+	addAction(Ui::Menu::MenuCallback::Args{
+		.text = tr::lng_context_save_music_to(tr::now),
+		.handler = nullptr,
+		.icon = &st::menuIconSoundAdd,
+		.fillSubmenu = fill,
+		.submenuSt = &st::popupMenuWithIcons,
+	});
+}
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h b/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h
new file mode 100644
index 0000000000..103ac6ae95
--- /dev/null
+++ b/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h
@@ -0,0 +1,29 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+class DocumentData;
+class HistoryItem;
+
+namespace Ui::Menu {
+struct MenuCallback;
+} // namespace Ui::Menu
+
+namespace Window {
+class SessionController;
+} // namespace Window
+
+namespace HistoryView {
+
+void AddSaveAudioAction(
+	const Ui::Menu::MenuCallback &addAction,
+	not_null<HistoryItem*> item,
+	not_null<DocumentData*> document,
+	not_null<Window::SessionController*> controller);
+
+} // namespace HistoryView
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
index 458d71b2e3..208b6ec680 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_widget.cpp
@@ -161,9 +161,10 @@ void MusicInner::refreshEmpty() {
 	const auto knownEmpty = savedMusic->countKnown(_peer->id);
 	_empty = object_ptr<Ui::FlatLabel>(
 		this,
-		(!knownEmpty AssertIsDebug()
+		(!knownEmpty
 			? tr::lng_contacts_loading(Ui::Text::WithEntities)
-			: rpl::single(TextWithEntities{ u"no muzlo found :("_q })),
+			: rpl::single(
+				tr::lng_media_song_empty(tr::now, Ui::Text::WithEntities))),
 		st::giftListAbout);
 	_empty->show();
 	_emptyLoading = !knownEmpty;
@@ -323,7 +324,9 @@ void MusicWidget::selectionAction(SelectionAction action) {
 }
 
 rpl::producer<QString> MusicWidget::title() {
-	return tr::lng_media_type_songs();
+	return controller()->key().musicPeer()->isSelf()
+		? tr::lng_media_saved_music_your()
+		: tr::lng_media_saved_music_title();
 }
 
 std::shared_ptr<Info::Memento> MakeMusic(not_null<PeerData*> peer) {
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index dd4c670b74..8f1373b45b 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -1446,3 +1446,9 @@ groupMembersWidgetList: PeerList(defaultPeerList) {
 		nameFgChecked: contactsNameFg;
 	}
 }
+
+saveMusicInfoMenu: Menu(defaultMenu) {
+	itemBgOver: windowBg;
+	itemFgOver: windowFg;
+	itemPadding: margins(17px, 4px, 17px, 3px);
+}
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index e15f6a33cb..9a38fa0ef9 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -240,32 +240,6 @@ void PeerMenuAddMuteSubmenuAction(
 	}
 }
 
-void ForwardToSelf(
-		std::shared_ptr<Main::SessionShow> show,
-		const Data::ForwardDraft &draft) {
-	const auto session = &show->session();
-	const auto history = session->data().history(session->user());
-	auto resolved = history->resolveForwardDraft(draft);
-	if (!resolved.items.empty()) {
-		const auto count = resolved.items.size();
-		auto action = Api::SendAction(history);
-		action.clearDraft = false;
-		action.generateLocal = false;
-		session->api().forwardMessages(
-			std::move(resolved),
-			action,
-			[=] {
-				auto phrase = rpl::variable<TextWithEntities>(
-					ChatHelpers::ForwardedMessagePhrase({
-					.toCount = 1,
-					.singleMessage = (count == 1),
-					.to1 = session->user(),
-				})).current();
-				show->showToast(std::move(phrase));
-			});
-	}
-}
-
 class Filler {
 public:
 	Filler(
@@ -3894,4 +3868,30 @@ void PeerMenuConfirmToggleFee(
 	}));
 }
 
+void ForwardToSelf(
+		std::shared_ptr<Main::SessionShow> show,
+		const Data::ForwardDraft &draft) {
+	const auto session = &show->session();
+	const auto history = session->data().history(session->user());
+	auto resolved = history->resolveForwardDraft(draft);
+	if (!resolved.items.empty()) {
+		const auto count = resolved.items.size();
+		auto action = Api::SendAction(history);
+		action.clearDraft = false;
+		action.generateLocal = false;
+		session->api().forwardMessages(
+			std::move(resolved),
+			action,
+			[=] {
+				auto phrase = rpl::variable<TextWithEntities>(
+					ChatHelpers::ForwardedMessagePhrase({
+					.toCount = 1,
+					.singleMessage = (count == 1),
+					.to1 = session->user(),
+				})).current();
+				show->showToast(std::move(phrase));
+			});
+	}
+}
+
 } // namespace Window
diff --git a/Telegram/SourceFiles/window/window_peer_menu.h b/Telegram/SourceFiles/window/window_peer_menu.h
index a39b2ba3ac..31d1a9b9fe 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.h
+++ b/Telegram/SourceFiles/window/window_peer_menu.h
@@ -54,6 +54,10 @@ enum class PeerType : uint8;
 using PeerTypes = base::flags<PeerType>;
 } // namespace InlineBots
 
+namespace Main {
+class SessionShow;
+} // namespace Main
+
 namespace Window {
 
 class Controller;
@@ -260,4 +264,8 @@ void PeerMenuConfirmToggleFee(
 	not_null<UserData*> user,
 	bool removeFee);
 
+void ForwardToSelf(
+	std::shared_ptr<Main::SessionShow> show,
+	const Data::ForwardDraft &draft);
+
 } // namespace Window

From 10448bcc3d8e7da93152d318274f5e4f3d6699cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 18 Aug 2025 17:23:41 +0400
Subject: [PATCH 271/341] Support fileref refresh in saved music.

---
 Telegram/CMakeLists.txt                       |  4 +-
 Telegram/SourceFiles/apiwrap.cpp              | 12 ++++++
 .../SourceFiles/data/data_file_origin.cpp     | 10 +++++
 Telegram/SourceFiles/data/data_file_origin.h  |  1 +
 .../SourceFiles/data/data_saved_music.cpp     | 31 ++++++++++++---
 Telegram/SourceFiles/data/data_saved_music.h  |  3 +-
 .../history/history_inner_widget.cpp          | 32 ++++-----------
 .../view/history_view_context_menu.cpp        | 34 +---------------
 ... => history_view_save_document_action.cpp} | 39 +++++++++++++++----
 ....h => history_view_save_document_action.h} | 14 ++++++-
 .../info/media/info_media_list_widget.cpp     | 24 ++++++------
 11 files changed, 116 insertions(+), 88 deletions(-)
 rename Telegram/SourceFiles/history/view/media/{history_view_save_audio_action.cpp => history_view_save_document_action.cpp} (73%)
 rename Telegram/SourceFiles/history/view/media/{history_view_save_audio_action.h => history_view_save_document_action.h} (72%)

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 2d75c61ad5..96fc51d133 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -817,8 +817,8 @@ PRIVATE
     history/view/media/history_view_poll.h
     history/view/media/history_view_premium_gift.cpp
     history/view/media/history_view_premium_gift.h
-    history/view/media/history_view_save_audio_action.cpp
-    history/view/media/history_view_save_audio_action.h
+    history/view/media/history_view_save_document_action.cpp
+    history/view/media/history_view_save_document_action.h
     history/view/media/history_view_service_box.cpp
     history/view/media/history_view_service_box.h
     history/view/media/history_view_similar_channels.cpp
diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index bc13e0774a..256dbdbfd3 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -44,6 +44,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_forum_topic.h"
 #include "data/data_forum.h"
 #include "data/data_saved_messages.h"
+#include "data/data_saved_music.h"
 #include "data/data_saved_sublist.h"
 #include "data/data_search_controller.h"
 #include "data/data_session.h"
@@ -2479,6 +2480,17 @@ void ApiWrap::refreshFileReference(
 				request(MTPmessages_GetScheduledMessages(
 					item->history()->peer->input,
 					MTP_vector<MTPint>(1, MTP_int(realId))));
+			} else if (item->isSavedMusicItem()) {
+				const auto user = item->history()->peer->asUser();
+				const auto media = item->media();
+				const auto document = media ? media->document() : nullptr;
+				if (user && document) {
+					request(MTPusers_GetSavedMusicByID(
+						user->inputUser,
+						MTP_vector<MTPInputDocument>(1, document->mtpInput())));
+				} else {
+					fail();
+				}
 			} else if (item->isBusinessShortcut()) {
 				const auto &shortcuts = _session->data().shortcutMessages();
 				const auto realId = shortcuts.lookupId(item);
diff --git a/Telegram/SourceFiles/data/data_file_origin.cpp b/Telegram/SourceFiles/data/data_file_origin.cpp
index db84988af0..a543c601f9 100644
--- a/Telegram/SourceFiles/data/data_file_origin.cpp
+++ b/Telegram/SourceFiles/data/data_file_origin.cpp
@@ -204,6 +204,12 @@ struct FileReferenceAccumulator {
 	void push(const MTPstories_Stories &data) {
 		push(data.data().vstories());
 	}
+	void push(const MTPusers_SavedMusic &data) {
+		data.match([&](const MTPDusers_savedMusic &data) {
+			push(data.vdocuments());
+		}, [](const MTPDusers_savedMusicNotModified &data) {
+		});
+	}
 
 	UpdatedFileReferences result;
 };
@@ -273,6 +279,10 @@ UpdatedFileReferences GetFileReferences(const MTPstories_Stories &data) {
 	return GetFileReferencesHelper(data);
 }
 
+UpdatedFileReferences GetFileReferences(const MTPusers_SavedMusic &data) {
+	return GetFileReferencesHelper(data);
+}
+
 UpdatedFileReferences GetFileReferences(const MTPMessageMedia &data) {
 	return GetFileReferencesHelper(data);
 }
diff --git a/Telegram/SourceFiles/data/data_file_origin.h b/Telegram/SourceFiles/data/data_file_origin.h
index 33e6a3f0d7..283a0fe034 100644
--- a/Telegram/SourceFiles/data/data_file_origin.h
+++ b/Telegram/SourceFiles/data/data_file_origin.h
@@ -221,6 +221,7 @@ UpdatedFileReferences GetFileReferences(
 UpdatedFileReferences GetFileReferences(const MTPhelp_PremiumPromo &data);
 UpdatedFileReferences GetFileReferences(const MTPmessages_WebPage &data);
 UpdatedFileReferences GetFileReferences(const MTPstories_Stories &data);
+UpdatedFileReferences GetFileReferences(const MTPusers_SavedMusic &data);
 
 // Admin Log Event.
 UpdatedFileReferences GetFileReferences(const MTPMessageMedia &data);
diff --git a/Telegram/SourceFiles/data/data_saved_music.cpp b/Telegram/SourceFiles/data/data_saved_music.cpp
index 4ae5963ab9..0d0e9d325e 100644
--- a/Telegram/SourceFiles/data/data_saved_music.cpp
+++ b/Telegram/SourceFiles/data/data_saved_music.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "apiwrap.h"
 #include "base/unixtime.h"
 #include "data/data_document.h"
+#include "data/data_file_origin.h"
 #include "data/data_peer.h"
 #include "data/data_session.h"
 #include "data/data_user.h"
@@ -94,7 +95,9 @@ bool SavedMusic::has(not_null<DocumentData*> document) const {
 	return ranges::contains(_myIds, document->id);
 }
 
-void SavedMusic::save(not_null<DocumentData*> document) {
+void SavedMusic::save(
+		not_null<DocumentData*> document,
+		Data::FileOrigin origin) {
 	const auto peerId = _owner->session().userPeerId();
 	auto &entry = _entries[peerId];
 	if (entry.list.empty() && !entry.loaded) {
@@ -109,11 +112,27 @@ void SavedMusic::save(not_null<DocumentData*> document) {
 		++entry.total;
 	}
 	_myIds.insert(begin(_myIds), document->id);
-	_owner->session().api().request(MTPaccount_SaveMusic(
-		MTP_flags(0),
-		document->mtpInput(),
-		MTPInputDocument()
-	)).send();
+
+	const auto send = [=](auto resend) -> void {
+		const auto usedFileReference = document->fileReference();
+		_owner->session().api().request(MTPaccount_SaveMusic(
+			MTP_flags(0),
+			document->mtpInput(),
+			MTPInputDocument()
+		)).fail([=](const MTP::Error &error) {
+			if (error.code() == 400
+				&& error.type().startsWith(u"FILE_REFERENCE_"_q)) {
+				document->session().api().refreshFileReference(origin, [=](
+						const auto &) {
+					if (document->fileReference() != usedFileReference) {
+						resend(resend);
+					}
+				});
+			}
+		}).send();
+	};
+	send(send);
+
 	_changed.fire_copy(peerId);
 }
 
diff --git a/Telegram/SourceFiles/data/data_saved_music.h b/Telegram/SourceFiles/data/data_saved_music.h
index 28c77d11f2..e3711f901e 100644
--- a/Telegram/SourceFiles/data/data_saved_music.h
+++ b/Telegram/SourceFiles/data/data_saved_music.h
@@ -16,6 +16,7 @@ class PeerData;
 namespace Data {
 
 class Session;
+struct FileOrigin;
 
 class SavedMusic final {
 public:
@@ -34,7 +35,7 @@ public:
 
 	void loadIds();
 	[[nodiscard]] bool has(not_null<DocumentData*> document) const;
-	void save(not_null<DocumentData*> document);
+	void save(not_null<DocumentData*> document, FileOrigin origin);
 	void remove(not_null<DocumentData*> document);
 
 	void apply(not_null<UserData*> user, const MTPDocument *last);
diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp
index cc87f6f5b3..2a938e5bff 100644
--- a/Telegram/SourceFiles/history/history_inner_widget.cpp
+++ b/Telegram/SourceFiles/history/history_inner_widget.cpp
@@ -15,7 +15,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/view/controls/history_view_forward_panel.h"
 #include "history/view/controls/history_view_draft_options.h"
 #include "history/view/controls/history_view_suggest_options.h"
-#include "history/view/media/history_view_save_audio_action.h"
+#include "history/view/media/history_view_save_document_action.h"
 #include "history/view/media/history_view_sticker.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/reactions/history_view_reactions.h"
@@ -2513,9 +2513,6 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			return;
 		}
 		const auto itemId = item ? item->fullId() : FullMsgId();
-		const auto lnkIsVideo = document->isVideoFile();
-		const auto lnkIsVoice = document->isVoiceMessage();
-		const auto lnkIsAudio = document->isAudioFile();
 		if (document->isGifv()) {
 			const auto notAutoplayedGif = [&] {
 				return item
@@ -2548,26 +2545,11 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 				item,
 				document,
 				controller);
-			if (lnkIsAudio) {
-				HistoryView::AddSaveAudioAction(
-					Ui::Menu::CreateAddActionCallback(_menu),
-					item,
-					document,
-					controller);
-			} else {
-				const auto text = lnkIsVideo
-					? tr::lng_context_save_video(tr::now)
-					: lnkIsVoice
-					? tr::lng_context_save_audio(tr::now)
-					: lnkIsAudio
-					? tr::lng_context_save_audio_file(tr::now)
-					: tr::lng_context_save_file(tr::now);
-				const auto &ripple = st::defaultDropdownMenu.menu.ripple;
-				const auto duration = ripple.hideDuration;
-				_menu->addAction(text, base::fn_delayed(duration, this, [=] {
-					saveDocumentToFile(itemId, document);
-				}), &st::menuIconDownload);
-			}
+			HistoryView::AddSaveDocumentAction(
+				Ui::Menu::CreateAddActionCallback(_menu),
+				item,
+				document,
+				controller);
 			HistoryView::AddCopyFilename(
 				_menu,
 				document,
@@ -2581,7 +2563,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
 			}, &st::menuIconStickers);
 		}
 		if (item
-			&& (lnkIsVoice || document->isVideoMessage())
+			&& (document->isVoiceMessage() || document->isVideoMessage())
 			&& Menu::HasRateTranscribeItem(item)) {
 			rateTranscriptionItem = item;
 		}
diff --git a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
index 53017e65de..476e8b5f8b 100644
--- a/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_context_menu.cpp
@@ -26,6 +26,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "history/history_item_text.h"
 #include "history/view/history_view_schedule_box.h"
 #include "history/view/media/history_view_media.h"
+#include "history/view/media/history_view_save_document_action.h"
 #include "history/view/media/history_view_web_page.h"
 #include "history/view/reactions/history_view_reactions_list.h"
 #include "info/info_memento.h"
@@ -236,39 +237,6 @@ void ShowInFolder(not_null<DocumentData*> document) {
 	}
 }
 
-void AddSaveDocumentAction(
-		not_null<Ui::PopupMenu*> menu,
-		HistoryItem *item,
-		not_null<DocumentData*> document,
-		not_null<ListWidget*> list) {
-	if (list->hasCopyMediaRestriction(item) || ItemHasTtl(item)) {
-		return;
-	}
-	const auto origin = item ? item->fullId() : FullMsgId();
-	const auto save = [=] {
-		DocumentSaveClickHandler::SaveAndTrack(
-			origin,
-			document,
-			DocumentSaveClickHandler::Mode::ToNewFile);
-	};
-
-	menu->addAction(
-		(document->isVideoFile()
-			? tr::lng_context_save_video(tr::now)
-			: (document->isVoiceMessage()
-				? tr::lng_context_save_audio(tr::now)
-				: (document->isAudioFile()
-					? tr::lng_context_save_audio_file(tr::now)
-					: (document->sticker()
-						? tr::lng_context_save_image(tr::now)
-						: tr::lng_context_save_file(tr::now))))),
-		base::fn_delayed(
-			st::defaultDropdownMenu.menu.ripple.hideDuration,
-			&document->session(),
-			save),
-		&st::menuIconDownload);
-}
-
 void AddDocumentActions(
 		not_null<Ui::PopupMenu*> menu,
 		not_null<DocumentData*> document,
diff --git a/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.cpp
similarity index 73%
rename from Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp
rename to Telegram/SourceFiles/history/view/media/history_view_save_document_action.cpp
index 7fd4de444a..7e9e41c495 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.cpp
@@ -5,18 +5,22 @@ the official desktop application for the Telegram messaging service.
 For license and copyright information please follow this link:
 https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
-#include "history/view/media/history_view_save_audio_action.h"
+#include "history/view/media/history_view_save_document_action.h"
 
 #include "base/call_delayed.h"
 #include "data/data_document.h"
 #include "data/data_file_click_handler.h"
+#include "data/data_file_origin.h"
 #include "data/data_peer.h"
 #include "data/data_saved_music.h"
 #include "data/data_session.h"
+#include "history/view/history_view_context_menu.h"
+#include "history/view/history_view_list_widget.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "lang/lang_keys.h"
 #include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/menu/menu_multiline_action.h"
 #include "ui/widgets/popup_menu.h"
 #include "window/window_peer_menu.h"
@@ -27,7 +31,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 namespace HistoryView {
 
-void AddSaveAudioAction(
+void AddSaveDocumentAction(
 		const Ui::Menu::MenuCallback &addAction,
 		not_null<HistoryItem*> item,
 		not_null<DocumentData*> document,
@@ -46,16 +50,22 @@ void AddSaveAudioAction(
 			DocumentSaveClickHandler::Mode::ToNewFile);
 	});
 	if (!document->isMusicForProfile() || (fromSaved && inProfile)) {
-		addAction(
-			tr::lng_context_save_audio_file(tr::now),
-			saveAs,
-			&st::menuIconDownload);
+		const auto text = document->isVideoFile()
+			? tr::lng_context_save_video(tr::now)
+			: document->isVoiceMessage()
+			? tr::lng_context_save_audio(tr::now)
+			: document->isAudioFile()
+			? tr::lng_context_save_audio_file(tr::now)
+			: document->sticker()
+			? tr::lng_context_save_image(tr::now)
+			: tr::lng_context_save_file(tr::now);
+		addAction(text, saveAs, &st::menuIconDownload);
 		return;
 	}
 	const auto fill = [&](not_null<Ui::PopupMenu*> menu) {
 		if (!inProfile) {
 			const auto saved = [=] {
-				savedMusic->save(document);
+				savedMusic->save(document, contextId);
 				show->showToast(tr::lng_saved_music_added(tr::now));
 			};
 			menu->addAction(
@@ -98,4 +108,19 @@ void AddSaveAudioAction(
 	});
 }
 
+void AddSaveDocumentAction(
+		not_null<Ui::PopupMenu*> menu,
+		HistoryItem *item,
+		not_null<DocumentData*> document,
+		not_null<ListWidget*> list) {
+	if (!item || list->hasCopyMediaRestriction(item) || ItemHasTtl(item)) {
+		return;
+	}
+	AddSaveDocumentAction(
+		Ui::Menu::CreateAddActionCallback(menu),
+		item,
+		document,
+		list->controller());
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.h
similarity index 72%
rename from Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h
rename to Telegram/SourceFiles/history/view/media/history_view_save_document_action.h
index 103ac6ae95..d4893fc571 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_save_audio_action.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_save_document_action.h
@@ -10,6 +10,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 class DocumentData;
 class HistoryItem;
 
+namespace Ui {
+class PopupMenu;
+} // namespace Ui
+
 namespace Ui::Menu {
 struct MenuCallback;
 } // namespace Ui::Menu
@@ -20,10 +24,18 @@ class SessionController;
 
 namespace HistoryView {
 
-void AddSaveAudioAction(
+class ListWidget;
+
+void AddSaveDocumentAction(
 	const Ui::Menu::MenuCallback &addAction,
 	not_null<HistoryItem*> item,
 	not_null<DocumentData*> document,
 	not_null<Window::SessionController*> controller);
 
+void AddSaveDocumentAction(
+	not_null<Ui::PopupMenu*> menu,
+	HistoryItem *item,
+	not_null<DocumentData*> document,
+	not_null<ListWidget*> list);
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 1df9f6e459..8dcd58bc87 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -30,15 +30,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_download_manager.h"
 #include "data/data_forum_topic.h"
 #include "data/data_saved_sublist.h"
-#include "history/history_item.h"
-#include "history/history_item_helpers.h"
-#include "history/history.h"
+#include "history/view/media/history_view_save_document_action.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/history_view_service_message.h"
+#include "history/history.h"
+#include "history/history_item.h"
+#include "history/history_item_helpers.h"
 #include "media/stories/media_stories_controller.h" // ...TogglePinnedToast.
 #include "media/stories/media_stories_share.h" // PrepareShareBox.
 #include "window/window_session_controller.h"
 #include "window/window_peer_menu.h"
+#include "ui/widgets/menu/menu_add_action_callback.h"
+#include "ui/widgets/menu/menu_add_action_callback_factory.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/controls/delete_message_context_action.h"
@@ -1150,16 +1153,11 @@ void ListWidget::showContextMenu(
 							DocumentSaveClickHandler::Mode::ToNewFile);
 					});
 				if (_provider->allowSaveFileAs(item, lnkDocument)) {
-					_contextMenu->addAction(
-						(isVideo
-							? tr::lng_context_save_video(tr::now)
-							: isVoice
-							? tr::lng_context_save_audio(tr::now)
-							: isAudio
-							? tr::lng_context_save_audio_file(tr::now)
-							: tr::lng_context_save_file(tr::now)),
-						std::move(handler),
-						&st::menuIconDownload);
+					HistoryView::AddSaveDocumentAction(
+						Ui::Menu::CreateAddActionCallback(_contextMenu),
+						item,
+						lnkDocument,
+						_controller->parentController());
 				}
 			}
 		}

From 0e43fd4d00ec6aed1a84304797ddbb358b2d7dfb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 14:29:10 +0400
Subject: [PATCH 272/341] Update API scheme on layer 213.

---
 Telegram/SourceFiles/mtproto/scheme/api.tl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index 293d245054..cdb5dfd39b 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1892,7 +1892,7 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
-starGift#bcff5b flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int = StarGift;
+starGift#80ac53c3 flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int locked_until_date:flags.9?int = StarGift;
 starGiftUnique#26a5553e flags:# require_premium:flags.6?true resale_ton_only:flags.7?true id:long gift_id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer value_amount:flags.8?long value_currency:flags.8?string = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
@@ -2022,6 +2022,9 @@ users.savedMusic#34a2f297 count:int documents:Vector<Document> = users.SavedMusi
 account.savedMusicIdsNotModified#4fc81d6e = account.SavedMusicIds;
 account.savedMusicIds#998d6636 ids:Vector<long> = account.SavedMusicIds;
 
+payments.checkCanSendGiftResultOk#374fa7ad = payments.CheckCanSendGiftResult;
+payments.checkCanSendGiftResultFail#d5e58274 reason:TextWithEntities = payments.CheckCanSendGiftResult;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2644,6 +2647,7 @@ payments.reorderStarGiftCollections#c32af4cc peer:InputPeer order:Vector<int> =
 payments.deleteStarGiftCollection#ad5648e8 peer:InputPeer collection_id:int = Bool;
 payments.getStarGiftCollections#981b91dd peer:InputPeer hash:long = payments.StarGiftCollections;
 payments.getUniqueStarGiftValueInfo#4365af6b slug:string = payments.UniqueStarGiftValueInfo;
+payments.checkCanSendGift#c0c4edc9 gift_id:long = payments.CheckCanSendGiftResult;
 
 stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true emojis:flags.5?true text_color:flags.6?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
 stickers.removeStickerFromSet#f7760f51 sticker:InputDocument = messages.StickerSet;

From 1e2531f0b13c7751b662505a458f0cbe998dd4e2 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 16:16:58 +0400
Subject: [PATCH 273/341] Support locked gifts.

---
 .../Resources/icons/limits/mini_gift_lock.svg |  7 ++
 Telegram/Resources/langs/lang.strings         |  1 +
 Telegram/SourceFiles/api/api_premium.cpp      |  1 +
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 68 +++++++++++++++----
 Telegram/SourceFiles/data/data_star_gift.h    |  1 +
 .../peer_gifts/info_peer_gifts_common.cpp     | 30 +++++++-
 .../info/peer_gifts/info_peer_gifts_common.h  |  6 ++
 Telegram/SourceFiles/ui/effects/credits.style |  2 +
 8 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 Telegram/Resources/icons/limits/mini_gift_lock.svg

diff --git a/Telegram/Resources/icons/limits/mini_gift_lock.svg b/Telegram/Resources/icons/limits/mini_gift_lock.svg
new file mode 100644
index 0000000000..2887a84d4c
--- /dev/null
+++ b/Telegram/Resources/icons/limits/mini_gift_lock.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>Mini / mini_gift_lock</title>
+    <g id="Mini-/-mini_gift_lock" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M34.6666667,26.3333333 C40.1895142,26.3333333 44.6666667,30.8104858 44.6666667,36.3333333 C44.6666667,41.8561808 40.1895142,46.3333333 34.6666667,46.3333333 C29.1438192,46.3333333 24.6666667,41.8561808 24.6666667,36.3333333 C24.6666667,30.8104858 29.1438192,26.3333333 34.6666667,26.3333333 Z M22,3.06666667 C27.8542183,3.06666667 32.6,7.81244832 32.6,13.6666667 L32.5999548,19.4672746 C34.7232323,19.9235567 36.4292218,21.5034006 37.0650949,23.5539779 C36.287246,23.4090943 35.4858038,23.3333333 34.6666667,23.3333333 C27.4869649,23.3333333 21.6666667,29.1536316 21.6666667,36.3333333 C21.6666667,38.3649522 22.1326999,40.2877232 22.9636948,42.0005746 L12.6666667,42 C9.35295817,42 6.66666667,39.3137085 6.66666667,36 L6.66666667,25.3333333 C6.66666667,22.454169 8.69461762,20.048658 11.4000452,19.4672746 L11.4,13.6666667 C11.4,7.81244832 16.1457817,3.06666667 22,3.06666667 Z M34.6666667,29.3061633 C33.7052821,29.3061633 32.9259259,30.0855195 32.9259259,31.0469041 L32.9259259,36.9308449 C32.9259259,37.7182476 33.2996271,38.4589206 33.9329602,38.9267797 L37.3333333,41.3922119 C38.1066056,41.9634476 39.1965447,41.7996646 39.7677804,41.0263923 L39.8381314,40.9238035 C40.323622,40.1593232 40.1416125,39.1383445 39.4019608,38.5919452 L36.4074074,36.4264726 L36.4074074,31.0469041 C36.4074074,30.0855195 35.6280512,29.3061633 34.6666667,29.3061633 Z M22,7.6 C18.6494725,7.6 15.9333333,10.3161392 15.9333333,13.6666667 L15.9326667,19.3326667 L28.0666667,19.3326667 L28.0666667,13.6666667 C28.0666667,10.3161392 25.3505275,7.6 22,7.6 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2c84d7b8ba..7fc646fa0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3867,6 +3867,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_collection_delete_sure" = "Are you sure you want to delete this collection?";
 "lng_gift_collection_delete_button" = "Delete";
 "lng_gift_collection_add_to" = "Add to Collection";
+"lng_gift_locked_title" = "Gift Locked";
 
 "lng_accounts_limit_title" = "Limit Reached";
 "lng_accounts_limit1#one" = "You have reached the limit of **{count}** connected account.";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 35894d3e6a..b05355d24b 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -863,6 +863,7 @@ std::optional<Data::StarGift> FromTL(
 			.perUserRemains = data.vper_user_remains().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(),
 			.requirePremium = data.is_require_premium(),
 			.upgradable = data.vupgrade_stars().has_value(),
 			.birthday = data.is_birthday(),
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 56ac674373..4d1d16f1c9 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_credits.h"
 #include "api/api_global_privacy.h"
 #include "api/api_premium.h"
+#include "api/api_text_entities.h"
 #include "base/event_filter.h"
 #include "base/qt_signal_producer.h"
 #include "base/random.h"
@@ -70,6 +71,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "settings/settings_credits_graphics.h"
 #include "settings/settings_premium.h"
 #include "ui/boxes/boost_box.h"
+#include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
 #include "ui/controls/emoji_button.h"
@@ -2365,6 +2367,27 @@ void AddSoldLeftSlider(
 	}, slider->lifetime());
 }
 
+void CheckMaybeGiftLocked(
+		not_null<Window::SessionController*> window,
+		uint64 giftId,
+		Fn<void()> send) {
+	const auto session = &window->session();
+	session->api().request(MTPpayments_CheckCanSendGift(
+		MTP_long(giftId)
+	)).done(crl::guard(window, [=](
+			const MTPpayments_CheckCanSendGiftResult &result) {
+		result.match([&](const MTPDpayments_checkCanSendGiftResultOk &) {
+			send();
+		}, [&](const MTPDpayments_checkCanSendGiftResultFail &data) {
+			window->show(Ui::MakeInformBox({
+				.text = Api::ParseTextWithEntities(session, data.vreason()),
+				.title = tr::lng_gift_locked_title(),
+			}));
+		});
+	})).fail(crl::guard(window, [=] {
+	})).send();
+}
+
 void SendGiftBox(
 		not_null<GenericBox*> box,
 		not_null<Window::SessionController*> window,
@@ -2828,21 +2851,41 @@ void SendGiftBox(
 					raw,
 					&state->delegate);
 			}
+			const auto raw = button.get();
 			if (validated[index]) {
 				return;
 			}
-			button->show();
+			raw->show();
 			validated[index] = true;
 			const auto &descriptor = state->list[state->order[index]];
-			button->setDescriptor(descriptor, GiftButton::Mode::Full);
-			button->setClickedCallback([=] {
+			raw->setDescriptor(descriptor, GiftButton::Mode::Full);
+			raw->setClickedCallback([=] {
 				const auto star = std::get_if<GiftTypeStars>(&descriptor);
+				const auto send = crl::guard(raw, [=] {
+					window->show(Box(
+						SendGiftBox,
+						window,
+						peer,
+						state->api,
+						descriptor));
+				});
 				const auto unique = star ? star->info.unique : nullptr;
-				if (star
-					&& star->info.requirePremium
-					&& !peer->session().premium()) {
+				const auto premiumNeeded = star && star->info.requirePremium;
+				if (premiumNeeded && !peer->session().premium()) {
 					Settings::ShowPremiumGiftPremium(window, star->info);
-					return;
+				} else if (star
+					&& star->info.lockedUntilDate
+					&& star->info.lockedUntilDate > base::unixtime::now()) {
+					const auto ready = crl::guard(raw, [=] {
+						if (premiumNeeded && !peer->session().premium()) {
+							Settings::ShowPremiumGiftPremium(
+								window,
+								v::get<GiftTypeStars>(descriptor).info);
+						} else {
+							send();
+						}
+					});
+					CheckMaybeGiftLocked(window, star->info.id, ready);
 				} else if (unique && star->mine && !peer->isSelf()) {
 					if (ShowTransferGiftLater(window->uiShow(), unique)) {
 						return;
@@ -2886,7 +2929,7 @@ void SendGiftBox(
 							Api::InputSavedStarGiftId(savedId, unique),
 							peer->input),
 						formReady);
-				} else if (star && star->info.unique && star->resale) {
+				} else if (unique && star->resale) {
 					window->show(Box(
 						Settings::GlobalStarGiftBox,
 						window->uiShow(),
@@ -2911,15 +2954,10 @@ void SendGiftBox(
 				} else if (star && IsSoldOut(star->info)) {
 					window->show(Box(SoldOutBox, window, *star));
 				} else {
-					window->show(Box(
-						SendGiftBox,
-						window,
-						peer,
-						state->api,
-						descriptor));
+					send();
 				}
 			});
-			button->setGeometry(QRect(QPoint(x, y), single), extend);
+			raw->setGeometry(QRect(QPoint(x, y), single), extend);
 		};
 		y += rowFrom * singleh;
 		for (auto row = rowFrom; row != rowTill; ++row) {
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index cde5609b33..86dc5b132a 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -104,6 +104,7 @@ struct StarGift {
 	int perUserRemains = 0;
 	TimeId firstSaleDate = 0;
 	TimeId lastSaleDate = 0;
+	TimeId lockedUntilDate = 0;
 	bool resellTonOnly : 1 = false;
 	bool requirePremium : 1 = false;
 	bool upgradable : 1 = false;
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
index bcde4301c2..940f1c2671 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/peer_gifts/info_peer_gifts_common.h"
 
+#include "base/unixtime.h"
 #include "boxes/send_credits_box.h" // SetButtonMarkedLabel
 #include "boxes/star_gift_box.h"
 #include "boxes/sticker_set_box.h"
@@ -73,7 +74,8 @@ GiftButton::GiftButton(
 	QWidget *parent,
 	not_null<GiftButtonDelegate*> delegate)
 : AbstractButton(parent)
-, _delegate(delegate) {
+, _delegate(delegate)
+, _lockedTimer([=] { refreshLocked(); }) {
 }
 
 GiftButton::~GiftButton() {
@@ -166,6 +168,7 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 			{ 0., anim::with_alpha(st::windowActiveTextFg->c, .3) },
 			{ 1., st::windowActiveTextFg->c },
 		});
+		_lockedUntilDate = 0;
 	}, [&](const GiftTypeStars &data) {
 		const auto soldOut = data.info.limitedCount
 			&& !data.userpic
@@ -219,8 +222,11 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 			_stars->setColorOverride(
 				Ui::Premium::CreditsIconGradientStops());
 		}
+		_lockedUntilDate = data.info.lockedUntilDate;
 	});
 
+	refreshLocked();
+
 	_resolvedDocument = nullptr;
 	_documentLifetime = _delegate->sticker(
 		descriptor
@@ -263,6 +269,22 @@ void GiftButton::setDescriptor(const GiftDescriptor &descriptor, Mode mode) {
 	}
 }
 
+void GiftButton::refreshLocked() {
+	_lockedTimer.cancel();
+
+	const auto lockedFor = _lockedUntilDate
+		? std::max(_lockedUntilDate - base::unixtime::now(), TimeId())
+		: TimeId();
+	const auto locked = (lockedFor > 0);
+	if (locked) {
+		_lockedTimer.callOnce(std::min(lockedFor, 86'400) * crl::time(1000));
+	}
+	if (_locked != locked) {
+		_locked = locked;
+		update();
+	}
+}
+
 void GiftButton::setDocument(not_null<DocumentData*> document) {
 	_resolvedDocument = document;
 	if (_playerDocument == document) {
@@ -510,6 +532,12 @@ void GiftButton::paintEvent(QPaintEvent *e) {
 		const auto radius = st::giftBoxGiftRadius;
 		p.drawRoundedRect(outer.marginsRemoved(extend), radius, radius);
 	}
+	if (_locked) {
+		st::giftBoxLockIcon.paint(
+			p,
+			position + st::giftBoxLockIconPosition,
+			width);
+	}
 
 	if (_userpic) {
 		if (!_subscribed) {
diff --git a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
index 97c07b3abb..5f02908e7a 100644
--- a/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
+++ b/Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #pragma once
 
 #include "base/qt/qt_compare.h"
+#include "base/timer.h"
 #include "data/data_star_gift.h"
 #include "ui/abstract_button.h"
 #include "ui/effects/premium_stars_colored.h"
@@ -176,6 +177,7 @@ private:
 		int width,
 		int height);
 
+	void refreshLocked();
 	void setDocument(not_null<DocumentData*> document);
 	[[nodiscard]] QMargins currentExtend() const;
 	[[nodiscard]] bool small() const;
@@ -203,6 +205,10 @@ private:
 	bool _subscribed = false;
 	bool _patterned = false;
 	bool _selected = false;
+	bool _locked = false;
+
+	base::Timer _lockedTimer;
+	TimeId _lockedUntilDate = 0;
 
 	QRect _button;
 	QMargins _extend;
diff --git a/Telegram/SourceFiles/ui/effects/credits.style b/Telegram/SourceFiles/ui/effects/credits.style
index 630e90409d..ad72d685cc 100644
--- a/Telegram/SourceFiles/ui/effects/credits.style
+++ b/Telegram/SourceFiles/ui/effects/credits.style
@@ -246,6 +246,8 @@ giftBoxLock: IconEmoji {
 	padding: margins(-2px, 1px, 0px, 0px);
 }
 giftBoxPinIcon: icon {{ "dialogs/dialogs_pinned", premiumButtonFg }};
+giftBoxLockIcon: icon{{ "limits/mini_gift_lock-18x18", attentionButtonFg }};
+giftBoxLockIconPosition: point(4px, 4px);
 
 creditsHistoryEntriesList: PeerList(defaultPeerList) {
 	padding: margins(0px, 7px, 0px, 7px);

From 46886b4dcc4ef01d10ae852a928342cf88280bf0 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 22 Aug 2025 17:08:46 +0400
Subject: [PATCH 274/341] Support channel direct messages links.

---
 .../SourceFiles/core/local_url_handlers.cpp   |  4 +++-
 .../window/window_session_controller.cpp      | 19 +++++++++++++++++++
 .../window/window_session_controller.h        |  4 ++++
 .../window_session_controller_link_info.h     |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index e386bcc9fe..65d423a245 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -646,7 +646,9 @@ bool ResolveUsernameOrPhone(
 	const auto threadId = topicId ? topicId : threadParam.toInt();
 	const auto gameParam = params.value(u"game"_q);
 	const auto videot = params.value(u"t"_q);
-
+	if (params.contains(u"direct"_q)) {
+		resolveType = ResolveType::ChannelDirect;
+	}
 	if (!gameParam.isEmpty() && validDomain(gameParam)) {
 		startToken = gameParam;
 		resolveType = ResolveType::ShareGame;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index db44cea1ce..4d3bf4b03f 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -431,6 +431,15 @@ void SessionNavigation::showPeerByLink(const PeerByLinkInfo &info) {
 	}
 }
 
+void SessionNavigation::fullInfoLoadedHook(not_null<PeerData*> peer) {
+	if (!_waitingDirectChannel || _waitingDirectChannel != peer) {
+		return;
+	}
+	const auto monoforum = peer->broadcastMonoforum();
+	const auto open = monoforum ? monoforum : peer.get();
+	showPeerHistory(open, SectionShow::Way::Forward, ShowAtUnreadMsgId);
+}
+
 void SessionNavigation::resolvePhone(
 		const QString &phone,
 		Fn<void(not_null<PeerData*>)> done) {
@@ -725,6 +734,13 @@ void SessionNavigation::showPeerByLinkResolved(
 		}
 	} else if (resolveType == ResolveType::Boost && peer->isChannel()) {
 		resolveBoostState(peer->asChannel());
+	} else if (resolveType == ResolveType::ChannelDirect
+		&& !peer->isFullLoaded()) {
+		_waitingDirectChannel = peer;
+		peer->updateFull();
+	} else if (const auto monoforum = peer->broadcastMonoforum()
+		; monoforum && resolveType == ResolveType::ChannelDirect) {
+		showPeerHistory(peer, params, ShowAtUnreadMsgId);
 	} else {
 		// Show specific posts only in channels / supergroups.
 		const auto msgId = peer->isChannel()
@@ -1554,6 +1570,9 @@ SessionController::SessionController(
 				}
 			}
 		}
+		if (update.flags & Data::PeerUpdate::Flag::FullInfo) {
+			fullInfoLoadedHook(update.peer);
+		}
 		return (update.flags & Data::PeerUpdate::Flag::FullInfo)
 			&& (update.peer == _showEditPeer);
 	}) | rpl::start_with_next([=] {
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index 80a2fbaea2..b20da580bc 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -316,6 +316,9 @@ public:
 
 	[[nodiscard]] virtual std::shared_ptr<ChatHelpers::Show> uiShow();
 
+protected:
+	void fullInfoLoadedHook(not_null<PeerData*> peer);
+
 private:
 	void resolvePhone(
 		const QString &phone,
@@ -362,6 +365,7 @@ private:
 	MTP::Sender _api;
 
 	mtpRequestId _resolveRequestId = 0;
+	PeerData *_waitingDirectChannel = nullptr;
 
 	History *_showingRepliesHistory = nullptr;
 	MsgId _showingRepliesRootId = 0;
diff --git a/Telegram/SourceFiles/window/window_session_controller_link_info.h b/Telegram/SourceFiles/window/window_session_controller_link_info.h
index 7608a07b9c..71590b4221 100644
--- a/Telegram/SourceFiles/window/window_session_controller_link_info.h
+++ b/Telegram/SourceFiles/window/window_session_controller_link_info.h
@@ -23,6 +23,7 @@ enum class ResolveType {
 	ShareGame,
 	Mention,
 	Boost,
+	ChannelDirect,
 	Profile,
 };
 

From 4ed266780adf1e9b33cb6d5702020050f8f278f9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Aug 2025 18:02:34 +0400
Subject: [PATCH 275/341] Fix emoji status texts.

---
 Telegram/SourceFiles/settings/settings_premium.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp
index c7e520188a..c1f8f49c0c 100644
--- a/Telegram/SourceFiles/settings/settings_premium.cpp
+++ b/Telegram/SourceFiles/settings/settings_premium.cpp
@@ -669,7 +669,7 @@ TopBarWithSticker::TopBarWithSticker(
 }, std::move(showFinished)) {
 }
 
-TopBarWithSticker::	TopBarWithSticker(
+TopBarWithSticker::TopBarWithSticker(
 	not_null<QWidget*> parent,
 	not_null<Window::SessionController*> controller,
 	TopBarWithStickerArgs args,
@@ -732,6 +732,14 @@ TopBarWithSticker::	TopBarWithSticker(
 		update();
 	}, lifetime());
 
+	_title->naturalWidthValue() | rpl::start_with_next([=] {
+		_title->resizeToNaturalWidth(st::settingsPremiumUserTitle.minWidth);
+	}, _title->lifetime());
+
+	_about->naturalWidthValue() | rpl::start_with_next([=] {
+		_about->resizeToNaturalWidth(st::userPremiumCover.about.minWidth);
+	}, _about->lifetime());
+
 	rpl::combine(
 		_title->sizeValue(),
 		_about->sizeValue(),

From 9e8ae54821fdec4fb5feb2f4be15e8ce3f18ba68 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Aug 2025 18:03:15 +0400
Subject: [PATCH 276/341] Update API scheme to layer 214. Start themes.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 Telegram/SourceFiles/boxes/background_box.cpp |   6 +-
 .../boxes/background_preview_box.cpp          |   2 +-
 .../SourceFiles/core/local_url_handlers.cpp   |   5 +-
 Telegram/SourceFiles/data/data_changes.h      |   2 +-
 Telegram/SourceFiles/data/data_channel.cpp    |   2 +-
 Telegram/SourceFiles/data/data_chat.cpp       |   2 +-
 .../SourceFiles/data/data_cloud_themes.cpp    | 170 +++++++++++++++++-
 Telegram/SourceFiles/data/data_cloud_themes.h |  27 ++-
 Telegram/SourceFiles/data/data_peer.cpp       |  24 ++-
 Telegram/SourceFiles/data/data_peer.h         |   6 +-
 Telegram/SourceFiles/data/data_user.cpp       |  12 +-
 .../export/data/export_data_types.cpp         |  10 +-
 Telegram/SourceFiles/history/history.cpp      |   8 +-
 Telegram/SourceFiles/history/history_item.cpp |  85 +++++----
 .../SourceFiles/history/history_widget.cpp    |   8 +-
 .../channel_statistics/earn/earn_format.cpp   |  11 +-
 .../earn/info_channel_earn_list.cpp           |   1 -
 Telegram/SourceFiles/mtproto/scheme/api.tl    |  21 ++-
 .../statistics/view/chart_rulers_view.cpp     |   2 +
 .../ui/chat/choose_theme_controller.cpp       | 109 +++++++++--
 .../SourceFiles/window/section_widget.cpp     |  14 +-
 22 files changed, 426 insertions(+), 103 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 7fc646fa0a..e178713532 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -2191,6 +2191,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_action_you_proximity_reached" = "You are now within {distance} from {user}";
 "lng_action_you_theme_changed" = "You changed the chat theme to {emoji}";
 "lng_action_theme_changed" = "{from} changed the chat theme to {emoji}";
+"lng_action_you_gift_theme_changed" = "You set {name} as a new theme for this chat.";
+"lng_action_gift_theme_changed" = "{from} set {name} as a new theme for this chat.";
 "lng_action_you_theme_disabled" = "You disabled the chat theme";
 "lng_action_theme_disabled" = "{from} disabled the chat theme";
 "lng_action_proximity_distance_m#one" = "{count} meter";
diff --git a/Telegram/SourceFiles/boxes/background_box.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
index f2e2f647b3..8723572da2 100644
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -451,12 +451,12 @@ auto BackgroundBox::Inner::resolveResetCustomPaper() const
 		return {};
 	}
 	const auto nonCustom = Window::Theme::Background()->paper();
-	const auto themeEmoji = _forPeer->themeEmoji();
-	if (forChannel() || themeEmoji.isEmpty()) {
+	const auto themeToken = _forPeer->themeToken();
+	if (forChannel() || themeToken.isEmpty()) {
 		return nonCustom;
 	}
 	const auto &themes = _forPeer->owner().cloudThemes();
-	const auto theme = themes.themeForEmoji(themeEmoji);
+	const auto theme = themes.themeForToken(themeToken);
 	if (!theme) {
 		return nonCustom;
 	}
diff --git a/Telegram/SourceFiles/boxes/background_preview_box.cpp b/Telegram/SourceFiles/boxes/background_preview_box.cpp
index 0fc02e2efc..24d4fd1835 100644
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -161,7 +161,7 @@ constexpr auto kMaxWallPaperSlugLength = 255;
 		return paper;
 	}
 	const auto &themes = session->data().cloudThemes();
-	if (const auto theme = themes.themeForEmoji(paper.emojiId())) {
+	if (const auto theme = themes.themeForToken(paper.emojiId())) {
 		using Type = Data::CloudThemeType;
 		const auto type = dark ? Type::Dark : Type::Light;
 		const auto i = theme->settings.find(type);
diff --git a/Telegram/SourceFiles/core/local_url_handlers.cpp b/Telegram/SourceFiles/core/local_url_handlers.cpp
index 65d423a245..7e313dab5a 100644
--- a/Telegram/SourceFiles/core/local_url_handlers.cpp
+++ b/Telegram/SourceFiles/core/local_url_handlers.cpp
@@ -1320,8 +1320,9 @@ bool ResolveTestChatTheme(
 		qthelp::UrlParamNameTransform::ToLower);
 	if (const auto history = controller->activeChatCurrent().history()) {
 		controller->clearCachedChatThemes();
-		const auto theme = history->owner().cloudThemes().updateThemeFromLink(
-			history->peer->themeEmoji(),
+		const auto owner = &history->owner();
+		const auto theme = owner->cloudThemes().updateThemeFromLink(
+			history->peer->themeToken(),
 			params);
 		if (theme) {
 			if (!params["export"].isEmpty()) {
diff --git a/Telegram/SourceFiles/data/data_changes.h b/Telegram/SourceFiles/data/data_changes.h
index 86dc7f2bf4..443d242cb9 100644
--- a/Telegram/SourceFiles/data/data_changes.h
+++ b/Telegram/SourceFiles/data/data_changes.h
@@ -66,7 +66,7 @@ struct PeerUpdate {
 		Notifications       = (1ULL << 4),
 		Migration           = (1ULL << 5),
 		UnavailableReason   = (1ULL << 6),
-		ChatThemeEmoji      = (1ULL << 7),
+		ChatThemeToken      = (1ULL << 7),
 		ChatWallPaper       = (1ULL << 8),
 		IsBlocked           = (1ULL << 9),
 		MessagesTTL         = (1ULL << 10),
diff --git a/Telegram/SourceFiles/data/data_channel.cpp b/Telegram/SourceFiles/data/data_channel.cpp
index d9016fb7ed..08321386f9 100644
--- a/Telegram/SourceFiles/data/data_channel.cpp
+++ b/Telegram/SourceFiles/data/data_channel.cpp
@@ -1406,7 +1406,7 @@ void ApplyChannelUpdate(
 			update.vboosts_applied().value_or_empty(),
 			update.vboosts_unrestrict().value_or_empty());
 	}
-	channel->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
+	channel->setThemeToken(qs(update.vtheme_emoticon().value_or_empty()));
 	channel->setTranslationDisabled(update.is_translations_disabled());
 
 	const auto reactionsLimit = update.vreactions_limit().value_or_empty();
diff --git a/Telegram/SourceFiles/data/data_chat.cpp b/Telegram/SourceFiles/data/data_chat.cpp
index fc33c01708..288e0807c9 100644
--- a/Telegram/SourceFiles/data/data_chat.cpp
+++ b/Telegram/SourceFiles/data/data_chat.cpp
@@ -486,7 +486,7 @@ void ApplyChatUpdate(not_null<ChatData*> chat, const MTPDchatFull &update) {
 		SetTopPinnedMessageId(chat, pinned->v);
 	}
 	chat->checkFolder(update.vfolder_id().value_or_empty());
-	chat->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
+	chat->setThemeToken(qs(update.vtheme_emoticon().value_or_empty()));
 	chat->setTranslationDisabled(update.is_translations_disabled());
 	const auto reactionsLimit = update.vreactions_limit().value_or_empty();
 	if (const auto allowed = update.vavailable_reactions()) {
diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp
index 56c7647dac..929bca7247 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "data/data_cloud_themes.h"
 
+#include "api/api_premium.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_preview.h"
 #include "window/themes/window_theme_editor_box.h"
@@ -26,6 +27,7 @@ namespace {
 
 constexpr auto kFirstReloadTimeout = 10 * crl::time(1000);
 constexpr auto kReloadTimeout = 3600 * crl::time(1000);
+constexpr auto kGiftThemesLimit = 24;
 
 bool IsTestingColors/* = false*/;
 
@@ -111,6 +113,77 @@ CloudTheme CloudTheme::Parse(
 	};
 }
 
+CloudTheme CloudTheme::Parse(
+		not_null<Main::Session*> session,
+		const MTPDchatThemeUniqueGift &data,
+		bool parseSettings) {
+	const auto gift = Api::FromTL(session, data.vgift());
+	if (!gift || !gift->unique) {
+		return {};
+	}
+	const auto paper = [&](const MTPThemeSettings &settings) {
+		return settings.match([&](const MTPDthemeSettings &data) {
+			return data.vwallpaper()
+				? WallPaper::Create(session, *data.vwallpaper())
+				: std::nullopt;
+		});
+	};
+	const auto outgoingMessagesColors = [&](
+			const MTPThemeSettings &settings) {
+		auto result = std::vector<QColor>();
+		settings.match([&](const MTPDthemeSettings &data) {
+			if (const auto colors = data.vmessage_colors()) {
+				for (const auto &color : colors->v) {
+					result.push_back(Ui::ColorFromSerialized(color));
+				}
+			}
+		});
+		return result;
+	};
+	const auto accentColor = [&](const MTPThemeSettings &settings) {
+		return settings.match([&](const MTPDthemeSettings &data) {
+			return Ui::ColorFromSerialized(data.vaccent_color());
+		});
+	};
+	const auto outgoingAccentColor = [&](const MTPThemeSettings &settings) {
+		return settings.match([&](const MTPDthemeSettings &data) {
+			return Ui::MaybeColorFromSerialized(data.voutbox_accent_color());
+		});
+	};
+	const auto basedOnDark = [&](const MTPThemeSettings &settings) {
+		return settings.match([&](const MTPDthemeSettings &data) {
+			return data.vbase_theme().match([](
+					const MTPDbaseThemeNight &) {
+				return true;
+			}, [](const MTPDbaseThemeTinted &) {
+				return true;
+			}, [](const auto &) {
+				return false;
+			});
+		});
+	};
+	const auto settings = [&] {
+		auto result = base::flat_map<Type, Settings>();
+		for (const auto &fields : data.vtheme_settings().v) {
+			const auto type = basedOnDark(fields) ? Type::Dark : Type::Light;
+			result.emplace(type, Settings{
+				.paper = paper(fields),
+				.accentColor = accentColor(fields),
+				.outgoingAccentColor = outgoingAccentColor(fields),
+				.outgoingMessagesColors = outgoingMessagesColors(fields),
+			});
+		}
+		return result;
+	};
+	return {
+		.id = gift->unique->id,
+		.unique = gift->unique,
+		.settings = (parseSettings
+			? settings()
+			: base::flat_map<Type, Settings>()),
+	};
+}
+
 CloudTheme CloudTheme::Parse(
 		not_null<Main::Session*> session,
 		const MTPTheme &data,
@@ -382,9 +455,16 @@ rpl::producer<> CloudThemes::chatThemesUpdated() const {
 	return _chatThemesUpdates.events();
 }
 
-std::optional<CloudTheme> CloudThemes::themeForEmoji(
-		const QString &emoticon) const {
-	const auto emoji = Ui::Emoji::Find(emoticon);
+std::optional<CloudTheme> CloudThemes::themeForToken(
+		const QString &token) const {
+	if (token.startsWith(u"gift:"_q)) {
+		const auto id = QStringView(token).mid(5).toULongLong();
+		const auto i = _giftThemes.find(id);
+		return (i != end(_giftThemes))
+			? i->second
+			: std::optional<CloudTheme>();
+	}
+	const auto emoji = Ui::Emoji::Find(token);
 	if (!emoji) {
 		return {};
 	}
@@ -394,18 +474,21 @@ std::optional<CloudTheme> CloudThemes::themeForEmoji(
 	return (i != end(_chatThemes)) ? std::make_optional(*i) : std::nullopt;
 }
 
-rpl::producer<std::optional<CloudTheme>> CloudThemes::themeForEmojiValue(
-		const QString &emoticon) {
+rpl::producer<std::optional<CloudTheme>> CloudThemes::themeForTokenValue(
+		const QString &token) {
+	if (token.startsWith(u"gift:"_q)) {
+		return rpl::single(themeForToken(token));
+	}
 	const auto testing = TestingColors();
-	if (!Ui::Emoji::Find(emoticon)) {
+	if (!Ui::Emoji::Find(token)) {
 		return rpl::single<std::optional<CloudTheme>>(std::nullopt);
-	} else if (auto result = themeForEmoji(emoticon)) {
+	} else if (auto result = themeForToken(token)) {
 		if (testing) {
 			return rpl::single(
 				std::move(result)
 			) | rpl::then(chatThemesUpdated(
 			) | rpl::map([=] {
-				return themeForEmoji(emoticon);
+				return themeForToken(token);
 			}) | rpl::filter([](const std::optional<CloudTheme> &theme) {
 				return theme.has_value();
 			}));
@@ -418,12 +501,81 @@ rpl::producer<std::optional<CloudTheme>> CloudThemes::themeForEmojiValue(
 		std::nullopt
 	) | rpl::then(chatThemesUpdated(
 	) | rpl::map([=] {
-		return themeForEmoji(emoticon);
+		return themeForToken(token);
 	}) | rpl::filter([](const std::optional<CloudTheme> &theme) {
 		return theme.has_value();
 	}) | rpl::take(limit));
 }
 
+void CloudThemes::myGiftThemesLoadMore(bool reload) {
+	if (reload && !_myGiftThemesTokens.empty()) {
+		_session->api().request(base::take(_myGiftThemesRequestId)).cancel();
+	}
+	if (_myGiftThemesRequestId || (!reload && _myGiftThemesLoaded)) {
+		return;
+	}
+	_myGiftThemesRequestId = _session->api().request(
+		MTPaccount_GetUniqueGiftChatThemes(
+			MTP_int(reload ? 0 : _myGiftThemesTokens.size()),
+			MTP_int(kGiftThemesLimit),
+			MTP_long(_myGiftThemesHash))
+	).done([=](const MTPaccount_ChatThemes &result) {
+		_myGiftThemesRequestId = 0;
+		result.match([&](const MTPDaccount_chatThemes &data) {
+			if (reload || _myGiftThemesTokens.empty()) {
+				_myGiftThemesHash = data.vhash().v;
+				_myGiftThemesTokens.clear();
+				_myGiftThemesLoaded = false;
+			}
+			const auto &list = data.vthemes().v;
+			const auto got = int(list.size());
+			_myGiftThemesTokens.reserve(_myGiftThemesTokens.size() + got);
+			for (const auto &theme : list) {
+				theme.match([](const MTPDchatTheme &) {
+				}, [&](const MTPDchatThemeUniqueGift &data) {
+					_myGiftThemesTokens.push_back(
+						processGiftThemeGetToken(data));
+				});
+			}
+			_myGiftThemesLoaded = (got < kGiftThemesLimit);
+			_chatThemesUpdates.fire({});
+		}, [&](const MTPDaccount_chatThemesNotModified &) {
+			if (!reload) {
+				_myGiftThemesLoaded = true;
+			}
+		});
+	}).fail([=] {
+		_myGiftThemesRequestId = 0;
+		_myGiftThemesLoaded = true;
+	}).send();
+}
+
+const std::vector<QString> &CloudThemes::myGiftThemesTokens() const {
+	return _myGiftThemesTokens;
+}
+
+rpl::producer<> CloudThemes::myGiftThemesUpdated() const {
+	return _myGiftThemesUpdates.events();
+}
+
+QString CloudThemes::processGiftThemeGetToken(
+		const MTPDchatThemeUniqueGift &data) {
+	auto parsed = CloudTheme::Parse(_session, data, true);
+	if (parsed.unique) {
+		const auto id = parsed.unique->id;
+		_giftThemes[id] = std::move(parsed);
+		return u"gift:%1"_q.arg(id);
+	}
+	return QString();
+}
+
+void CloudThemes::refreshChatThemesFor(const QString &token) {
+	if (token.startsWith(u"gift:"_q)) {
+		return;
+	}
+	refreshChatThemes();
+}
+
 bool CloudThemes::TestingColors() {
 	return IsTestingColors;
 }
diff --git a/Telegram/SourceFiles/data/data_cloud_themes.h b/Telegram/SourceFiles/data/data_cloud_themes.h
index 1ac4ceff19..4ccbf0a0b9 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.h
+++ b/Telegram/SourceFiles/data/data_cloud_themes.h
@@ -22,6 +22,7 @@ class Controller;
 
 namespace Data {
 
+struct UniqueGift;
 class DocumentMedia;
 
 enum class CloudThemeType {
@@ -38,6 +39,7 @@ struct CloudTheme {
 	UserId createdBy = 0;
 	int usersCount = 0;
 	QString emoticon;
+	std::shared_ptr<UniqueGift> unique;
 
 	using Type = CloudThemeType;
 	struct Settings {
@@ -52,6 +54,10 @@ struct CloudTheme {
 		not_null<Main::Session*> session,
 		const MTPDtheme &data,
 		bool parseSettings = false);
+	static CloudTheme Parse(
+		not_null<Main::Session*> session,
+		const MTPDchatThemeUniqueGift &data,
+		bool parseSettings = false);
 	static CloudTheme Parse(
 		not_null<Main::Session*> session,
 		const MTPTheme &data,
@@ -73,9 +79,17 @@ public:
 	void refreshChatThemes();
 	[[nodiscard]] const std::vector<CloudTheme> &chatThemes() const;
 	[[nodiscard]] rpl::producer<> chatThemesUpdated() const;
-	[[nodiscard]] std::optional<CloudTheme> themeForEmoji(
-		const QString &emoticon) const;
-	[[nodiscard]] auto themeForEmojiValue(const QString &emoticon)
+
+	void myGiftThemesLoadMore(bool reload = false);
+	[[nodiscard]] const std::vector<QString> &myGiftThemesTokens() const;
+	[[nodiscard]] rpl::producer<> myGiftThemesUpdated() const;
+	[[nodiscard]] QString processGiftThemeGetToken(
+		const MTPDchatThemeUniqueGift &data);
+
+	void refreshChatThemesFor(const QString &token);
+	[[nodiscard]] std::optional<CloudTheme> themeForToken(
+		const QString &token) const;
+	[[nodiscard]] auto themeForTokenValue(const QString &token)
 		-> rpl::producer<std::optional<CloudTheme>>;
 
 	[[nodiscard]] static bool TestingColors();
@@ -140,6 +154,13 @@ private:
 	std::vector<CloudTheme> _chatThemes;
 	rpl::event_stream<> _chatThemesUpdates;
 
+	mtpRequestId _myGiftThemesRequestId = 0;
+	base::flat_map<uint64, CloudTheme> _giftThemes;
+	std::vector<QString> _myGiftThemesTokens;
+	rpl::event_stream<> _myGiftThemesUpdates;
+	uint64 _myGiftThemesHash = 0;
+	bool _myGiftThemesLoaded = false;
+
 	base::Timer _reloadCurrentTimer;
 	LoadingDocument _updatingFrom;
 	LoadingDocument _previewFrom;
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index 1c70a3b6a8..d762a6cf68 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -1736,24 +1736,22 @@ PeerId PeerData::groupCallDefaultJoinAs() const {
 	return 0;
 }
 
-void PeerData::setThemeEmoji(const QString &emoticon) {
-	if (_themeEmoticon == emoticon) {
+void PeerData::setThemeToken(const QString &token) {
+	if (_themeToken == token) {
+		return;
+	} else if (Ui::Emoji::Find(_themeToken) == Ui::Emoji::Find(token)) {
+		_themeToken = token;
 		return;
 	}
-	if (Ui::Emoji::Find(_themeEmoticon) == Ui::Emoji::Find(emoticon)) {
-		_themeEmoticon = emoticon;
-		return;
+	_themeToken = token;
+	if (!token.isEmpty() && !owner().cloudThemes().themeForToken(token)) {
+		owner().cloudThemes().refreshChatThemesFor(token);
 	}
-	_themeEmoticon = emoticon;
-	if (!emoticon.isEmpty()
-		&& !owner().cloudThemes().themeForEmoji(emoticon)) {
-		owner().cloudThemes().refreshChatThemes();
-	}
-	session().changes().peerUpdated(this, UpdateFlag::ChatThemeEmoji);
+	session().changes().peerUpdated(this, UpdateFlag::ChatThemeToken);
 }
 
-const QString &PeerData::themeEmoji() const {
-	return _themeEmoticon;
+const QString &PeerData::themeToken() const {
+	return _themeToken;
 }
 
 void PeerData::setWallPaper(
diff --git a/Telegram/SourceFiles/data/data_peer.h b/Telegram/SourceFiles/data/data_peer.h
index c27b25834a..ad8a1e70a3 100644
--- a/Telegram/SourceFiles/data/data_peer.h
+++ b/Telegram/SourceFiles/data/data_peer.h
@@ -530,8 +530,8 @@ public:
 	[[nodiscard]] Data::GroupCall *groupCall() const;
 	[[nodiscard]] PeerId groupCallDefaultJoinAs() const;
 
-	void setThemeEmoji(const QString &emoticon);
-	[[nodiscard]] const QString &themeEmoji() const;
+	void setThemeToken(const QString &token);
+	[[nodiscard]] const QString &themeToken() const;
 
 	void setWallPaper(
 		std::optional<Data::WallPaper> paper,
@@ -615,7 +615,7 @@ private:
 	uint8 _userpicHasVideo : 1 = 0;
 
 	QString _about;
-	QString _themeEmoticon;
+	QString _themeToken;
 	std::unique_ptr<Data::WallPaper> _wallPaper;
 
 };
diff --git a/Telegram/SourceFiles/data/data_user.cpp b/Telegram/SourceFiles/data/data_user.cpp
index e0b00b1963..638aa1ff7c 100644
--- a/Telegram/SourceFiles/data/data_user.cpp
+++ b/Telegram/SourceFiles/data/data_user.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/business/data_business_common.h"
 #include "data/business/data_business_info.h"
 #include "data/components/credits.h"
+#include "data/data_cloud_themes.h"
 #include "data/data_saved_music.h"
 #include "data/data_session.h"
 #include "data/data_changes.h"
@@ -789,7 +790,16 @@ void ApplyUserUpdate(not_null<UserData*> user, const MTPDuserFull &update) {
 	user->setCommonChatsCount(update.vcommon_chats_count().v);
 	user->setPeerGiftsCount(update.vstargifts_count().value_or_empty());
 	user->checkFolder(update.vfolder_id().value_or_empty());
-	user->setThemeEmoji(qs(update.vtheme_emoticon().value_or_empty()));
+	if (const auto theme = update.vtheme()) {
+		theme->match([&](const MTPDchatTheme &data) {
+			user->setThemeToken(qs(data.vemoticon()));
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			user->setThemeToken(
+				user->owner().cloudThemes().processGiftThemeGetToken(data));
+		});
+	} else {
+		user->setThemeToken(QString());
+	}
 	user->setTranslationDisabled(update.is_translations_disabled());
 	user->setPrivateForwardName(
 		update.vprivate_forward_name().value_or_empty());
diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp
index 68e8d37cbe..bd16f6d86f 100644
--- a/Telegram/SourceFiles/export/data/export_data_types.cpp
+++ b/Telegram/SourceFiles/export/data/export_data_types.cpp
@@ -1608,9 +1608,13 @@ ServiceAction ParseServiceAction(
 			.date = data.vschedule_date().v,
 		};
 	}, [&](const MTPDmessageActionSetChatTheme &data) {
-		result.content = ActionSetChatTheme{
-			.emoji = qs(data.vemoticon()),
-		};
+		data.vtheme().match([&](const MTPDchatTheme &data) {
+			result.content = ActionSetChatTheme{
+				.emoji = qs(data.vemoticon()),
+			};
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			result.content = ActionSetChatTheme{};
+		});
 	}, [&](const MTPDmessageActionChatJoinedByRequest &data) {
 		result.content = ActionChatJoinedByRequest();
 	}, [&](const MTPDmessageActionWebViewDataSentMe &data) {
diff --git a/Telegram/SourceFiles/history/history.cpp b/Telegram/SourceFiles/history/history.cpp
index 69e0ed7600..be7089d41b 100644
--- a/Telegram/SourceFiles/history/history.cpp
+++ b/Telegram/SourceFiles/history/history.cpp
@@ -25,6 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/components/top_peers.h"
 #include "data/notify/data_notify_settings.h"
 #include "data/stickers/data_stickers.h"
+#include "data/data_cloud_themes.h"
 #include "data/data_drafts.h"
 #include "data/data_saved_messages.h"
 #include "data/data_saved_sublist.h"
@@ -1303,7 +1304,12 @@ void History::applyServiceChanges(
 			}
 		}
 	}, [&](const MTPDmessageActionSetChatTheme &data) {
-		peer->setThemeEmoji(qs(data.vemoticon()));
+		data.vtheme().match([&](const MTPDchatTheme &data) {
+			peer->setThemeToken(qs(data.vemoticon()));
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			peer->setThemeToken(
+				owner().cloudThemes().processGiftThemeGetToken(data));
+		});
 	}, [&](const MTPDmessageActionSetChatWallPaper &data) {
 		if (item->out() || data.is_for_both()) {
 			peer->setWallPaper(
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 5207443627..66d6317374 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -5350,38 +5350,63 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 
 	auto prepareSetChatTheme = [this](const MTPDmessageActionSetChatTheme &action) {
 		auto result = PreparedServiceText();
-		const auto text = qs(action.vemoticon());
-		if (!text.isEmpty()) {
-			if (_from->isSelf()) {
-				result.text = tr::lng_action_you_theme_changed(
-					tr::now,
-					lt_emoji,
-					{ .text = text },
-					Ui::Text::WithEntities);
+		action.vtheme().match([&](const MTPDchatTheme &data) {
+			const auto text = qs(data.vemoticon());
+			if (!text.isEmpty()) {
+				if (_from->isSelf()) {
+					result.text = tr::lng_action_you_theme_changed(
+						tr::now,
+						lt_emoji,
+						{ .text = text },
+						Ui::Text::WithEntities);
+				} else {
+					result.links.push_back(fromLink());
+					result.text = tr::lng_action_theme_changed(
+						tr::now,
+						lt_from,
+						fromLinkText(), // Link 1.
+						lt_emoji,
+						{ .text = text },
+						Ui::Text::WithEntities);
+				}
 			} else {
-				result.links.push_back(fromLink());
-				result.text = tr::lng_action_theme_changed(
-					tr::now,
-					lt_from,
-					fromLinkText(), // Link 1.
-					lt_emoji,
-					{ .text = text },
-					Ui::Text::WithEntities);
+				if (_from->isSelf()) {
+					result.text = tr::lng_action_you_theme_disabled(
+						tr::now,
+						Ui::Text::WithEntities);
+				} else {
+					result.links.push_back(fromLink());
+					result.text = tr::lng_action_theme_disabled(
+						tr::now,
+						lt_from,
+						fromLinkText(), // Link 1.
+						Ui::Text::WithEntities);
+				}
 			}
-		} else {
-			if (_from->isSelf()) {
-				result.text = tr::lng_action_you_theme_disabled(
-					tr::now,
-					Ui::Text::WithEntities);
-			} else {
-				result.links.push_back(fromLink());
-				result.text = tr::lng_action_theme_disabled(
-					tr::now,
-					lt_from,
-					fromLinkText(), // Link 1.
-					Ui::Text::WithEntities);
-			}
-		}
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			data.vgift().match([&](const MTPDstarGiftUnique &data) {
+				const auto giftName = Ui::Text::Bold(qs(data.vtitle())
+					+ u" #"_q
+					+ QString::number(data.vnum().v));
+				if (_from->isSelf()) {
+					result.text = tr::lng_action_you_gift_theme_changed(
+						tr::now,
+						lt_name,
+						giftName,
+						Ui::Text::WithEntities);
+				} else {
+					result.links.push_back(fromLink());
+					result.text = tr::lng_action_gift_theme_changed(
+						tr::now,
+						lt_from,
+						fromLinkText(),
+						lt_name,
+						giftName,
+						Ui::Text::WithEntities);
+				}
+			}, [](const MTPDstarGift &) {
+			});
+		});
 		return result;
 	};
 
diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp
index a0cdec1702..1fa75f6852 100644
--- a/Telegram/SourceFiles/history/history_widget.cpp
+++ b/Telegram/SourceFiles/history/history_widget.cpp
@@ -814,7 +814,7 @@ HistoryWidget::HistoryWidget(
 		| PeerUpdateFlag::Slowmode
 		| PeerUpdateFlag::BotStartToken
 		| PeerUpdateFlag::MessagesTTL
-		| PeerUpdateFlag::ChatThemeEmoji
+		| PeerUpdateFlag::ChatThemeToken
 		| PeerUpdateFlag::FullInfo
 		| PeerUpdateFlag::StarsPerMessage
 		| PeerUpdateFlag::GiftSettings
@@ -888,10 +888,10 @@ HistoryWidget::HistoryWidget(
 		if (flags & PeerUpdateFlag::MessagesTTL) {
 			checkMessagesTTL();
 		}
-		if ((flags & PeerUpdateFlag::ChatThemeEmoji) && _list) {
-			const auto emoji = _peer->themeEmoji();
+		if ((flags & PeerUpdateFlag::ChatThemeToken) && _list) {
+			const auto emoji = _peer->themeToken();
 			if (Data::CloudThemes::TestingColors() && !emoji.isEmpty()) {
-				_peer->owner().cloudThemes().themeForEmojiValue(
+				_peer->owner().cloudThemes().themeForTokenValue(
 					emoji
 				) | rpl::filter_optional(
 				) | rpl::take(
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
index 99ca5dcb62..69ece36f32 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_format.cpp
@@ -7,14 +7,19 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "info/channel_statistics/earn/earn_format.h"
 
-namespace Info::ChannelEarn {
+#include <QtCore/QLocale>
 
-using EarnInt = Data::EarnInt;
+namespace Info::ChannelEarn {
+namespace {
 
 constexpr auto kMinorPartLength = 9;
 constexpr auto kMaxChoppedZero = kMinorPartLength - 2;
 constexpr auto kZero = QChar('0');
-static const auto DecimalPoint = QLocale().decimalPoint();
+const auto DecimalPoint = QString() + QLocale().decimalPoint();
+
+using EarnInt = Data::EarnInt;
+
+} // namespace
 
 QString MajorPart(EarnInt value) {
 	const auto string = QString::number(value);
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
index ae4349346d..cbc837690d 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
@@ -1312,7 +1312,6 @@ void InnerWidget::fill() {
 					= lifetime().make_state<ShowMoreState>(_peer);
 				state->token = firstSlice.token;
 				state->showed = firstSlice.list.size();
-				const auto max = firstSlice.total;
 				const auto wrap = tabCurrencyList->entity()->add(
 					object_ptr<Ui::SlideWrap<Ui::SettingsButton>>(
 						tabCurrencyList->entity(),
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index cdb5dfd39b..c7e6dc08db 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -167,7 +167,7 @@ messageActionGroupCall#7a0d7f42 flags:# call:InputGroupCall duration:flags.0?int
 messageActionInviteToGroupCall#502f92f7 call:InputGroupCall users:Vector<long> = MessageAction;
 messageActionSetMessagesTTL#3c134d7b flags:# period:int auto_setting_from:flags.0?long = MessageAction;
 messageActionGroupCallScheduled#b3a07661 call:InputGroupCall schedule_date:int = MessageAction;
-messageActionSetChatTheme#aa786345 emoticon:string = MessageAction;
+messageActionSetChatTheme#b91bbd3a theme:ChatTheme = MessageAction;
 messageActionChatJoinedByRequest#ebbca3cb = MessageAction;
 messageActionWebViewDataSentMe#47dd8079 text:string data:string = MessageAction;
 messageActionWebViewDataSent#b4c38cb5 text:string = MessageAction;
@@ -215,7 +215,7 @@ geoPoint#b2a2f663 flags:# long:double lat:double access_hash:long accuracy_radiu
 
 auth.sentCode#5e002502 flags:# type:auth.SentCodeType phone_code_hash:string next_type:flags.1?auth.CodeType timeout:flags.2?int = auth.SentCode;
 auth.sentCodeSuccess#2390fe44 authorization:auth.Authorization = auth.SentCode;
-auth.sentCodePaymentRequired#d7cef980 store_product:string phone_code_hash:string = auth.SentCode;
+auth.sentCodePaymentRequired#d7a2fcf9 store_product:string phone_code_hash:string support_email_address:string support_email_subject:string = auth.SentCode;
 
 auth.authorization#2ea2c0d4 flags:# setup_password_required:flags.1?true otherwise_relogin_days:flags.1?int tmp_sessions:flags.0?int future_auth_token:flags.2?bytes user:User = auth.Authorization;
 auth.authorizationSignUpRequired#44747e9a flags:# terms_of_service:flags.0?help.TermsOfService = auth.Authorization;
@@ -248,7 +248,7 @@ inputReportReasonFake#f5ddd6e7 = ReportReason;
 inputReportReasonIllegalDrugs#a8eb2be = ReportReason;
 inputReportReasonPersonalDetails#9ec7863d = ReportReason;
 
-userFull#3fd81e28 flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme_emoticon:flags.15?string private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating stars_my_pending_rating:flags2.18?StarsRating stars_my_pending_rating_date:flags2.18?int main_tab:flags2.20?ProfileTab saved_music:flags2.21?Document = UserFull;
+userFull#c577b5ad flags:# blocked:flags.0?true phone_calls_available:flags.4?true phone_calls_private:flags.5?true can_pin_message:flags.7?true has_scheduled:flags.12?true video_calls_available:flags.13?true voice_messages_forbidden:flags.20?true translations_disabled:flags.23?true stories_pinned_available:flags.26?true blocked_my_stories_from:flags.27?true wallpaper_overridden:flags.28?true contact_require_premium:flags.29?true read_dates_private:flags.30?true flags2:# sponsored_enabled:flags2.7?true can_view_revenue:flags2.9?true bot_can_manage_emoji_status:flags2.10?true display_gifts_button:flags2.16?true id:long about:flags.1?string settings:PeerSettings personal_photo:flags.21?Photo profile_photo:flags.2?Photo fallback_photo:flags.22?Photo notify_settings:PeerNotifySettings bot_info:flags.3?BotInfo pinned_msg_id:flags.6?int common_chats_count:int folder_id:flags.11?int ttl_period:flags.14?int theme:flags.15?ChatTheme private_forward_name:flags.16?string bot_group_admin_rights:flags.17?ChatAdminRights bot_broadcast_admin_rights:flags.18?ChatAdminRights wallpaper:flags.24?WallPaper stories:flags.25?PeerStories business_work_hours:flags2.0?BusinessWorkHours business_location:flags2.1?BusinessLocation business_greeting_message:flags2.2?BusinessGreetingMessage business_away_message:flags2.3?BusinessAwayMessage business_intro:flags2.4?BusinessIntro birthday:flags2.5?Birthday personal_channel_id:flags2.6?long personal_channel_message:flags2.6?int stargifts_count:flags2.8?int starref_program:flags2.11?StarRefProgram bot_verification:flags2.12?BotVerification send_paid_messages_stars:flags2.14?long disallowed_gifts:flags2.15?DisallowedGiftsSettings stars_rating:flags2.17?StarsRating stars_my_pending_rating:flags2.18?StarsRating stars_my_pending_rating_date:flags2.18?int main_tab:flags2.20?ProfileTab saved_music:flags2.21?Document = UserFull;
 
 contact#145ade0b user_id:long mutual:Bool = Contact;
 
@@ -1417,6 +1417,12 @@ account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordR
 account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
 account.resetPasswordOk#e926d63e = account.ResetPasswordResult;
 
+chatTheme#c3dffc04 emoticon:string = ChatTheme;
+chatThemeUniqueGift#3458f9c8 gift:StarGift theme_settings:Vector<ThemeSettings> = ChatTheme;
+
+account.chatThemesNotModified#e011e1c4 = account.ChatThemes;
+account.chatThemes#4bcef97b flags:# hash:long themes:Vector<ChatTheme> next_offset:flags.0?int = account.ChatThemes;
+
 sponsoredMessage#7dbf8673 flags:# recommended:flags.5?true can_report:flags.12?true random_id:bytes url:string title:string message:string entities:flags.1?Vector<MessageEntity> photo:flags.6?Photo media:flags.14?MessageMedia color:flags.13?PeerColor button_text:string sponsor_info:flags.7?string additional_info:flags.8?string min_display_duration:flags.15?int max_display_duration:flags.15?int = SponsoredMessage;
 
 messages.sponsoredMessages#ffda656d flags:# posts_between:flags.0?int start_delay:flags.1?int between_delay:flags.2?int messages:Vector<SponsoredMessage> chats:Vector<Chat> users:Vector<User> = messages.SponsoredMessages;
@@ -2025,6 +2031,10 @@ account.savedMusicIds#998d6636 ids:Vector<long> = account.SavedMusicIds;
 payments.checkCanSendGiftResultOk#374fa7ad = payments.CheckCanSendGiftResult;
 payments.checkCanSendGiftResultFail#d5e58274 reason:TextWithEntities = payments.CheckCanSendGiftResult;
 
+inputChatThemeEmpty#83268483 = InputChatTheme;
+inputChatTheme#c93de95c emoticon:string = InputChatTheme;
+inputChatThemeUniqueGift#87e5dfe4 slug:string = InputChatTheme;
+
 ---functions---
 
 invokeAfterMsg#cb9f372d {X:Type} msg_id:long query:!X = X;
@@ -2181,6 +2191,7 @@ account.toggleNoPaidMessagesException#fe2eda76 flags:# refund_charged:flags.0?tr
 account.setMainProfileTab#5dee78b0 tab:ProfileTab = Bool;
 account.saveMusic#b26732a9 flags:# unsave:flags.0?true id:InputDocument after_id:flags.1?InputDocument = Bool;
 account.getSavedMusicIds#e09d5faf hash:long = account.SavedMusicIds;
+account.getUniqueGiftChatThemes#fe74ef9f offset:int limit:int hash:long = account.ChatThemes;
 
 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#b60f5918 id:InputUser = users.UserFull;
@@ -2357,7 +2368,7 @@ messages.getAdminsWithInvites#3920e6ef peer:InputPeer = messages.ChatAdminsWithI
 messages.getChatInviteImporters#df04dd4e flags:# requested:flags.0?true subscription_expired:flags.3?true peer:InputPeer link:flags.1?string q:flags.2?string offset_date:int offset_user:InputUser limit:int = messages.ChatInviteImporters;
 messages.setHistoryTTL#b80e5fe4 peer:InputPeer period:int = Updates;
 messages.checkHistoryImportPeer#5dc60f03 peer:InputPeer = messages.CheckedHistoryImportPeer;
-messages.setChatTheme#e63be13f peer:InputPeer emoticon:string = Updates;
+messages.setChatTheme#81202c9 peer:InputPeer theme:InputChatTheme = Updates;
 messages.getMessageReadParticipants#31c1c44f peer:InputPeer msg_id:int = Vector<ReadParticipantDate>;
 messages.getSearchResultsCalendar#6aa3f6bd flags:# peer:InputPeer saved_peer_id:flags.2?InputPeer filter:MessagesFilter offset_id:int offset_date:int = messages.SearchResultsCalendar;
 messages.getSearchResultsPositions#9c7f2f10 flags:# peer:InputPeer saved_peer_id:flags.2?InputPeer filter:MessagesFilter offset_id:int limit:int = messages.SearchResultsPositions;
@@ -2776,4 +2787,4 @@ smsjobs.finishJob#4f1ebf24 flags:# job_id:string error:flags.0?string = Bool;
 
 fragment.getCollectibleInfo#be1e85ba collectible:InputCollectible = fragment.CollectibleInfo;
 
-// LAYER 213
+// LAYER 214
diff --git a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
index 5093766b17..9034ed1d26 100644
--- a/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
+++ b/Telegram/SourceFiles/statistics/view/chart_rulers_view.cpp
@@ -15,6 +15,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "styles/style_basic.h"
 #include "styles/style_statistics.h"
 
+#include <QtCore/QLocale>
+
 namespace Statistic {
 namespace {
 
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 4314f48f20..940254a851 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -149,8 +149,9 @@ struct ChooseThemeController::Entry {
 	Ui::ChatThemeKey key;
 	std::shared_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
-	QImage preview;
+	std::shared_ptr<Data::UniqueGift> gift;
 	EmojiPtr emoji = nullptr;
+	QImage preview;
 	QRect geometry;
 	bool chosen = false;
 };
@@ -178,6 +179,10 @@ void ChooseThemeController::init(rpl::producer<QSize> outer) {
 	using namespace rpl::mappers;
 
 	const auto themes = &_controller->session().data().cloudThemes();
+	if (themes->myGiftThemesTokens().empty()) {
+		themes->myGiftThemesLoadMore();
+	}
+
 	const auto &list = themes->chatThemes();
 	if (!list.empty()) {
 		fill(list);
@@ -269,7 +274,7 @@ void ChooseThemeController::initButtons() {
 			int applyWidth,
 			int chooseWidth,
 			QString chosen) {
-		const auto was = _peer->themeEmoji();
+		const auto was = _peer->themeToken();
 		const auto now = (chosen == kDisableElement()) ? QString() : chosen;
 		const auto changed = (now != was);
 		apply->setVisible(changed);
@@ -283,10 +288,14 @@ void ChooseThemeController::initButtons() {
 
 	apply->setClickedCallback([=] {
 		if (const auto chosen = findChosen()) {
-			const auto was = _peer->themeEmoji();
+			const auto was = _peer->themeToken();
 			const auto now = chosen->key ? _chosen.current() : QString();
 			if (was != now) {
-				_peer->setThemeEmoji(now);
+				const auto giftTheme = now.startsWith(u"gift:"_q)
+					? _peer->owner().cloudThemes().themeForToken(now)
+					: std::optional<Data::CloudTheme>();
+
+				_peer->setThemeToken(now);
 				const auto dropWallPaper = (_peer->wallPaper() != nullptr);
 				if (dropWallPaper) {
 					_peer->setWallPaper({});
@@ -297,6 +306,7 @@ void ChooseThemeController::initButtons() {
 					_controller->pushLastUsedChatTheme(chosen->theme);
 				}
 				const auto api = &_peer->session().api();
+
 				api->request(MTPmessages_SetChatWallPaper(
 					MTP_flags(0),
 					_peer->input,
@@ -306,9 +316,13 @@ void ChooseThemeController::initButtons() {
 				)).afterDelay(10).done([=](const MTPUpdates &result) {
 					api->applyUpdates(result);
 				}).send();
+
 				api->request(MTPmessages_SetChatTheme(
 					_peer->input,
-					MTP_string(now)
+					((giftTheme && giftTheme->unique)
+						? MTP_inputChatThemeUniqueGift(
+							MTP_string(giftTheme->unique->slug))
+						: MTP_inputChatTheme(MTP_string(now)))
 				)).done([=](const MTPUpdates &result) {
 					api->applyUpdates(result);
 				}).send();
@@ -333,7 +347,9 @@ void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
 		+ geometry.height()
 		- (size / factor)
 		- st::chatThemeEmojiBottom;
-	Ui::Emoji::Draw(p, entry.emoji, size, emojiLeft, emojiTop);
+	if (const auto emoji = entry.emoji) {
+		Ui::Emoji::Draw(p, emoji, size, emojiLeft, emojiTop);
+	}
 
 	if (entry.chosen) {
 		auto hq = PainterHighQualityEnabler(p);
@@ -492,7 +508,7 @@ void ChooseThemeController::updateInnerLeft(int now) {
 
 void ChooseThemeController::close() {
 	if (const auto chosen = findChosen()) {
-		if (Ui::Emoji::Find(_peer->themeEmoji()) != chosen->emoji) {
+		if (Ui::Emoji::Find(_peer->themeToken()) != chosen->emoji) {
 			clearCurrentBackgroundState();
 		}
 	}
@@ -543,13 +559,18 @@ void ChooseThemeController::fill(
 		full,
 		margin.top() + single.height() + margin.bottom());
 
-	const auto initial = Ui::Emoji::Find(_peer->themeEmoji());
+	const auto initial = Ui::Emoji::Find(_peer->themeToken());
 	if (!initial) {
 		_chosen = kDisableElement();
 	}
 
-	_dark.value(
-	) | rpl::start_with_next([=](bool dark) {
+	const auto cloudThemes = &_controller->session().data().cloudThemes();
+	rpl::combine(
+		_dark.value(),
+		rpl::single(
+			rpl::empty
+		) | rpl::then(cloudThemes->myGiftThemesUpdated())
+	) | rpl::start_with_next([=](bool dark, auto) {
 		clearCurrentBackgroundState();
 		if (_chosen.current().isEmpty() && initial) {
 			_chosen = initial->text();
@@ -559,8 +580,8 @@ void ChooseThemeController::fill(
 		const auto old = base::take(_entries);
 		auto x = margin.left();
 		_entries.push_back({
-			.preview = GenerateEmptyPreview(),
 			.emoji = _disabledEmoji,
+			.preview = GenerateEmptyPreview(),
 			.geometry = QRect(QPoint(x, margin.top()), single),
 			.chosen = (_chosen.current() == kDisableElement()),
 		});
@@ -640,6 +661,72 @@ void ChooseThemeController::fill(
 			}, _cachingLifetime);
 			x += single.width() + skip;
 		}
+		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
+			const auto found = cloudThemes->themeForToken(token);
+			if (!found || found->settings.contains(type)) {
+				continue;
+			}
+			const auto &theme = *found;
+			const auto key = ChatThemeKey{ theme.id, dark };
+			const auto isChosen = (_chosen.current() == token);
+			_entries.push_back({
+				.key = key,
+				.gift = found->unique,
+				.geometry = QRect(QPoint(x, skip), single),
+				.chosen = isChosen,
+			});
+			_controller->cachedChatThemeValue(
+				theme,
+				Data::WallPaper(0),
+				type
+			) | rpl::filter([=](const std::shared_ptr<ChatTheme> &data) {
+				return data && (data->key() == key);
+			}) | rpl::take(
+				1
+			) | rpl::start_with_next([=](std::shared_ptr<ChatTheme> &&data) {
+				const auto key = data->key();
+				const auto i = ranges::find(_entries, key, &Entry::key);
+				if (i == end(_entries)) {
+					return;
+				}
+				const auto theme = data.get();
+				i->theme = std::move(data);
+				i->preview = GeneratePreview(theme);
+				if (_chosen.current() == i->emoji->text()) {
+					_controller->overridePeerTheme(
+						_peer,
+						i->theme,
+						i->emoji);
+				}
+				_inner->update();
+
+				if (!theme->background().isPattern
+					|| !theme->background().prepared.isNull()) {
+					return;
+				}
+				// Subscribe to pattern loading if needed.
+				theme->repaintBackgroundRequests(
+				) | rpl::filter([=] {
+					const auto i = ranges::find(
+						_entries,
+						key,
+						&Entry::key);
+					return (i == end(_entries))
+						|| !i->theme->background().prepared.isNull();
+				}) | rpl::take(1) | rpl::start_with_next([=] {
+					const auto i = ranges::find(
+						_entries,
+						key,
+						&Entry::key);
+					if (i == end(_entries)) {
+						return;
+					}
+					i->preview = GeneratePreview(theme);
+					_inner->update();
+				}, _cachingLifetime);
+			}, _cachingLifetime);
+			x += single.width() + skip;
+		}
 
 		if (!_initialInnerLeftApplied && _content->width() > 0) {
 			applyInitialInnerLeft();
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 29da7f47ad..42112e3be6 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -36,13 +36,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 namespace Window {
 namespace {
 
-[[nodiscard]] rpl::producer<QString> PeerThemeEmojiValue(
+[[nodiscard]] rpl::producer<QString> PeerThemeTokenValue(
 		not_null<PeerData*> peer) {
 	return peer->session().changes().peerFlagsValue(
 		peer,
-		Data::PeerUpdate::Flag::ChatThemeEmoji
+		Data::PeerUpdate::Flag::ChatThemeToken
 	) | rpl::map([=] {
-		return peer->themeEmoji();
+		return peer->themeToken();
 	});
 }
 
@@ -96,11 +96,11 @@ struct ResolvedPaper {
 [[nodiscard]] auto MaybeChatThemeDataValueFromPeer(
 	not_null<PeerData*> peer)
 -> rpl::producer<std::optional<Data::CloudTheme>> {
-	return PeerThemeEmojiValue(
+	return PeerThemeTokenValue(
 		peer
-	) | rpl::map([=](const QString &emoji)
+	) | rpl::map([=](const QString &token)
 	-> rpl::producer<std::optional<Data::CloudTheme>> {
-		return peer->owner().cloudThemes().themeForEmojiValue(emoji);
+		return peer->owner().cloudThemes().themeForTokenValue(token);
 	}) | rpl::flatten_latest();
 }
 
@@ -507,7 +507,7 @@ auto ChatThemeValueFromPeer(
 			std::shared_ptr<Ui::ChatTheme> &&cloud,
 			PeerThemeOverride &&overriden) {
 		return (overriden.peer == peer.get()
-			&& Ui::Emoji::Find(peer->themeEmoji()) != overriden.emoji)
+			&& Ui::Emoji::Find(peer->themeToken()) != overriden.emoji)
 			? std::move(overriden.theme)
 			: std::move(cloud);
 	});

From 4419ba55e8ee48697e1c7d20cf804dd6dbced8cb Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Aug 2025 22:11:48 +0400
Subject: [PATCH 277/341] Start gift theme background parsing.

---
 .../SourceFiles/data/data_cloud_themes.cpp    | 107 +++++++++---------
 Telegram/SourceFiles/data/data_document.cpp   |   6 +-
 .../data/data_document_resolver.cpp           |   2 +-
 Telegram/SourceFiles/data/data_peer.cpp       |   3 +-
 Telegram/SourceFiles/ui/chat/chat_theme.cpp   |  93 +++++++++++++--
 Telegram/SourceFiles/ui/chat/chat_theme.h     |  11 +-
 .../ui/chat/choose_theme_controller.cpp       |  68 ++++++-----
 .../SourceFiles/window/section_widget.cpp     |   2 +-
 .../window/themes/window_theme.cpp            |   3 +-
 .../window/themes/window_theme_preview.cpp    |   3 +-
 .../window/window_session_controller.cpp      |   9 +-
 .../window/window_session_controller.h        |   4 +-
 Telegram/lib_ui                               |   2 +-
 13 files changed, 207 insertions(+), 106 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp
index 929bca7247..f1a4031bfc 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp
@@ -39,44 +39,38 @@ CloudTheme CloudTheme::Parse(
 		bool parseSettings) {
 	const auto document = data.vdocument();
 	const auto paper = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return data.vwallpaper()
-				? WallPaper::Create(session, *data.vwallpaper())
-				: std::nullopt;
-		});
+		const auto &data = settings.data();
+		return data.vwallpaper()
+			? WallPaper::Create(session, *data.vwallpaper())
+			: std::nullopt;
 	};
 	const auto outgoingMessagesColors = [&](
 			const MTPThemeSettings &settings) {
 		auto result = std::vector<QColor>();
-		settings.match([&](const MTPDthemeSettings &data) {
-			if (const auto colors = data.vmessage_colors()) {
-				for (const auto &color : colors->v) {
-					result.push_back(Ui::ColorFromSerialized(color));
-				}
+		const auto &data = settings.data();
+		if (const auto colors = data.vmessage_colors()) {
+			for (const auto &color : colors->v) {
+				result.push_back(Ui::ColorFromSerialized(color));
 			}
-		});
+		}
 		return result;
 	};
 	const auto accentColor = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return Ui::ColorFromSerialized(data.vaccent_color());
-		});
+		const auto &data = settings.data();
+		return Ui::ColorFromSerialized(data.vaccent_color());
 	};
 	const auto outgoingAccentColor = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return Ui::MaybeColorFromSerialized(data.voutbox_accent_color());
-		});
+		const auto &data = settings.data();
+		return Ui::MaybeColorFromSerialized(data.voutbox_accent_color());
 	};
 	const auto basedOnDark = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return data.vbase_theme().match([](
-					const MTPDbaseThemeNight &) {
-				return true;
-			}, [](const MTPDbaseThemeTinted &) {
-				return true;
-			}, [](const auto &) {
-				return false;
-			});
+		const auto &data = settings.data();
+		return data.vbase_theme().match([](const MTPDbaseThemeNight &) {
+			return true;
+		}, [](const MTPDbaseThemeTinted &) {
+			return true;
+		}, [](const auto &) {
+			return false;
 		});
 	};
 	const auto settings = [&] {
@@ -122,45 +116,48 @@ CloudTheme CloudTheme::Parse(
 		return {};
 	}
 	const auto paper = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return data.vwallpaper()
-				? WallPaper::Create(session, *data.vwallpaper())
-				: std::nullopt;
+		const auto &data = settings.data();
+		return data.vwallpaper()
+			? WallPaper::Create(session, *data.vwallpaper())
+			: std::nullopt;
+	};
+	const auto basedOnDark = [&](const MTPThemeSettings &settings) {
+		const auto &data = settings.data();
+		return data.vbase_theme().match([](const MTPDbaseThemeNight &) {
+			return true;
+		}, [](const MTPDbaseThemeTinted &) {
+			return true;
+		}, [](const auto &) {
+			return false;
 		});
 	};
 	const auto outgoingMessagesColors = [&](
 			const MTPThemeSettings &settings) {
 		auto result = std::vector<QColor>();
-		settings.match([&](const MTPDthemeSettings &data) {
-			if (const auto colors = data.vmessage_colors()) {
-				for (const auto &color : colors->v) {
-					result.push_back(Ui::ColorFromSerialized(color));
-				}
+		const auto &data = settings.data();
+		if (const auto colors = data.vmessage_colors()) {
+			for (const auto &color : colors->v) {
+				result.push_back(Ui::ColorFromSerialized(color));
 			}
-		});
+		//} else if (basedOnDark(settings)) {
+		//	result.push_back(gift->unique->backdrop.edgeColor);
+		//} else {
+		//	result.push_back(anim::color(
+		//		gift->unique->backdrop.patternColor,
+		//		QColor(255, 255, 255, 255),
+		//		0.75));
+		}
 		return result;
 	};
 	const auto accentColor = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return Ui::ColorFromSerialized(data.vaccent_color());
-		});
+		const auto &data = settings.data();
+		return Ui::ColorFromSerialized(data.vaccent_color());
 	};
 	const auto outgoingAccentColor = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return Ui::MaybeColorFromSerialized(data.voutbox_accent_color());
-		});
-	};
-	const auto basedOnDark = [&](const MTPThemeSettings &settings) {
-		return settings.match([&](const MTPDthemeSettings &data) {
-			return data.vbase_theme().match([](
-					const MTPDbaseThemeNight &) {
-				return true;
-			}, [](const MTPDbaseThemeTinted &) {
-				return true;
-			}, [](const auto &) {
-				return false;
-			});
-		});
+		const auto &data = settings.data();
+		return Ui::MaybeColorFromSerialized(
+			data.voutbox_accent_color()
+		);// .value_or(gift->unique->backdrop.patternColor);
 	};
 	const auto settings = [&] {
 		auto result = base::flat_map<Type, Settings>();
@@ -538,7 +535,7 @@ void CloudThemes::myGiftThemesLoadMore(bool reload) {
 				});
 			}
 			_myGiftThemesLoaded = (got < kGiftThemesLimit);
-			_chatThemesUpdates.fire({});
+			_myGiftThemesUpdates.fire({});
 		}, [&](const MTPDaccount_chatThemesNotModified &) {
 			if (!reload) {
 				_myGiftThemesLoaded = true;
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 0d8a7799d4..cd33b8a469 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -653,7 +653,11 @@ bool DocumentData::checkWallPaperProperties() {
 	if (type == WallPaperDocument) {
 		return true;
 	}
-	if (type != FileDocument
+	if (hasMimeType(u"application/x-tgwallpattern"_q)
+		&& dimensions.isEmpty()) {
+		dimensions = QSize(1125, 2313);
+		AssertIsDebug();
+	} else if (type != FileDocument
 		|| !hasThumbnail()
 		|| dimensions.isEmpty()
 		|| dimensions.width() > Storage::kMaxWallPaperDimension
diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index eea69ed577..3d5c013c5a 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -169,7 +169,7 @@ base::binary_guard ReadBackgroundImageAsync(
 		guard = result.make_guard(),
 		callback = std::move(done)
 	]() mutable {
-		auto image = Ui::ReadBackgroundImage(path, bytes, gzipSvg);
+		auto image = Ui::ReadBackgroundImage(path, bytes, gzipSvg).image;
 		if (postprocess) {
 			image = postprocess(std::move(image));
 		}
diff --git a/Telegram/SourceFiles/data/data_peer.cpp b/Telegram/SourceFiles/data/data_peer.cpp
index d762a6cf68..036d828167 100644
--- a/Telegram/SourceFiles/data/data_peer.cpp
+++ b/Telegram/SourceFiles/data/data_peer.cpp
@@ -1739,7 +1739,8 @@ PeerId PeerData::groupCallDefaultJoinAs() const {
 void PeerData::setThemeToken(const QString &token) {
 	if (_themeToken == token) {
 		return;
-	} else if (Ui::Emoji::Find(_themeToken) == Ui::Emoji::Find(token)) {
+	} else if (!token.startsWith(u"gift:"_q)
+		&& Ui::Emoji::Find(_themeToken) == Ui::Emoji::Find(token)) {
 		_themeToken = token;
 		return;
 	}
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index 4979e5c4ad..6dd873f6cb 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -415,6 +415,7 @@ void ChatTheme::setBackground(ChatThemeBackground &&background) {
 void ChatTheme::updateBackgroundImageFrom(ChatThemeBackground &&background) {
 	_mutableBackground.key = background.key;
 	_mutableBackground.prepared = std::move(background.prepared);
+	_mutableBackground.giftSymbols = std::move(background.giftSymbols);
 	_mutableBackground.preparedForTiled = std::move(
 		background.preparedForTiled);
 	if (!_backgroundState.now.pixmap.isNull()) {
@@ -905,19 +906,83 @@ QImage PrepareImageForTiled(const QImage &prepared) {
 	return result;
 }
 
-[[nodiscard]] QImage ReadBackgroundImage(
+std::vector<QRectF> ParseGiftSymbols(
+		const QByteArray &rects,
+		QSize size,
+		float64 scale) {
+	if (size.isEmpty()) {
+		return {};
+	}
+
+	auto result = std::vector<QRectF>();
+	auto offset = 0;
+	const auto jumpPast = [&](const QByteArray &what) {
+		const auto pos = rects.indexOf(what, offset);
+		if (pos < 0) {
+			return false;
+		}
+		offset = pos + what.size();
+		return true;
+	};
+	const auto takeDouble = [&](float64 &value) {
+		const auto end = rects.indexOf('"', offset);
+		if (end < 0) {
+			return false;
+		}
+		value = rects.mid(offset, end - offset).toDouble();
+		offset = end + 1;
+		return true;
+	};
+	const auto cw = scale / float64(size.width());
+	const auto ch = scale / float64(size.height());
+	while (true) {
+		auto x = float64(), y = float64(), w = float64(), h = float64();
+		if (!jumpPast("<rect "_q)
+			|| !jumpPast("x=\""_q)
+			|| !takeDouble(x)
+			|| !jumpPast("y=\""_q)
+			|| !takeDouble(y)
+			|| !jumpPast("width=\""_q)
+			|| !takeDouble(w)
+			|| !jumpPast("height=\""_q)
+			|| !takeDouble(h)
+			|| !jumpPast("/>"_q)) {
+			break;
+		}
+		result.push_back({
+			x * cw,
+			y * ch,
+			w * cw,
+			h * ch,
+		});
+	}
+	return result;
+}
+
+BackgroundImageFields ReadBackgroundImage(
 		const QString &path,
 		const QByteArray &content,
-		bool gzipSvg) {
-	auto result = Images::Read({
+		bool gzipSvg,
+		bool findGiftSymbols) {
+	auto read = Images::Read({
 		.path = path,
 		.content = content,
+		.svgCutOutId = findGiftSymbols ? "GiftPatterns"_q : QByteArray(),
 		.maxSize = QSize(kMaxSize, kMaxSize),
 		.gzipSvg = gzipSvg,
-	}).image;
-	if (result.isNull()) {
-		result = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
-		result.fill(Qt::black);
+	});
+	if (read.image.isNull()) {
+		read.image = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
+		read.image.fill(Qt::black);
+	}
+	auto result = BackgroundImageFields{
+		.image = std::move(read.image),
+	};
+	if (const auto &rects = read.svgCutOutContent; !rects.isEmpty()) {
+		result.giftSymbols = ParseGiftSymbols(
+			rects, 
+			result.image.size(),
+			read.scale);
 	}
 	return result;
 }
@@ -1022,9 +1087,16 @@ QImage GenerateDitheredGradient(
 
 ChatThemeBackground PrepareBackgroundImage(
 		const ChatThemeBackgroundData &data) {
-	auto prepared = (data.isPattern || data.colors.empty())
-		? PreprocessBackgroundImage(
-			ReadBackgroundImage(data.path, data.bytes, data.gzipSvg))
+	const auto needBackground = (data.isPattern || data.colors.empty());
+	auto read = needBackground
+		? ReadBackgroundImage(
+			data.path,
+			data.bytes,
+			data.gzipSvg,
+			data.findGiftSymbols)
+		: BackgroundImageFields();
+	auto prepared = needBackground
+		? PreprocessBackgroundImage(std::move(read.image))
 		: QImage();
 	if (data.isPattern && !prepared.isNull()) {
 		if (data.colors.size() < 2) {
@@ -1070,6 +1142,7 @@ ChatThemeBackground PrepareBackgroundImage(
 			? std::nullopt
 			: std::make_optional(data.colors.front())),
 		.colors = data.colors,
+		.giftSymbols = std::move(read.giftSymbols),
 		.patternOpacity = data.patternOpacity,
 		.gradientRotation = data.generateGradient ? data.gradientRotation : 0,
 		.isPattern = data.isPattern,
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index 91c2599e78..10b76f4c16 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -29,6 +29,7 @@ struct ChatThemeBackground {
 	QImage gradientForFill;
 	std::optional<QColor> colorForFill;
 	std::vector<QColor> colors;
+	std::vector<QRectF> giftSymbols;
 	float64 patternOpacity = 1.;
 	int gradientRotation = 0;
 	bool isPattern = false;
@@ -54,6 +55,7 @@ struct ChatThemeBackgroundData {
 	bool isBlurred = false;
 	bool forDarkMode = false;
 	bool generateGradient = false;
+	bool findGiftSymbols = false;
 	int gradientRotation = 0;
 };
 
@@ -238,10 +240,15 @@ struct ChatBackgroundRects {
 	const QImage &image);
 [[nodiscard]] QImage PrepareImageForTiled(const QImage &prepared);
 
-[[nodiscard]] QImage ReadBackgroundImage(
+struct BackgroundImageFields {
+	QImage image;
+	std::vector<QRectF> giftSymbols;
+};
+[[nodiscard]] BackgroundImageFields ReadBackgroundImage(
 	const QString &path,
 	const QByteArray &content,
-	bool gzipSvg);
+	bool gzipSvg,
+	bool findGiftSymbols = false);
 [[nodiscard]] QImage GenerateBackgroundImage(
 	QSize size,
 	const std::vector<QColor> &bg,
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 940254a851..8f94a95f0d 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -19,6 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_session.h"
 #include "data/data_peer.h"
 #include "data/data_cloud_themes.h"
@@ -146,10 +147,12 @@ const auto kDisableElement = [] { return u"disable"_q; };
 } // namespace
 
 struct ChooseThemeController::Entry {
+	QString token;
 	Ui::ChatThemeKey key;
 	std::shared_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
 	std::shared_ptr<Data::UniqueGift> gift;
+	std::unique_ptr<Ui::Text::CustomEmoji> custom;
 	EmojiPtr emoji = nullptr;
 	QImage preview;
 	QRect geometry;
@@ -341,14 +344,22 @@ void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
 
 	const auto size = Ui::Emoji::GetSizeLarge();
 	const auto factor = style::DevicePixelRatio();
-	const auto emojiLeft = geometry.x()
-		+ (geometry.width() - (size / factor)) / 2;
+	const auto esize = size / factor;
+	const auto emojiLeft = geometry.x() + (geometry.width() - esize) / 2;
 	const auto emojiTop = geometry.y()
 		+ geometry.height()
-		- (size / factor)
+		- esize
 		- st::chatThemeEmojiBottom;
+	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
+	const auto customSkip = (esize - customSize) / 2;
+
 	if (const auto emoji = entry.emoji) {
 		Ui::Emoji::Draw(p, emoji, size, emojiLeft, emojiTop);
+	} else if (const auto custom = entry.custom.get()) {
+		custom->paint(p, {
+			.textColor = st::windowFg->c,
+			.position = { emojiLeft + customSkip, emojiTop + customSkip },
+		});
 	}
 
 	if (entry.chosen) {
@@ -395,7 +406,7 @@ void ChooseThemeController::initList() {
 		if (!entry) {
 			return QString();
 		} else if (entry->key) {
-			return entry->emoji->text();
+			return entry->token;
 		} else {
 			return kDisableElement();
 		}
@@ -445,7 +456,7 @@ void ChooseThemeController::initList() {
 					_controller->overridePeerTheme(
 						_peer,
 						entry->theme,
-						entry->emoji);
+						entry->token);
 				}
 				_inner->update();
 			}
@@ -508,7 +519,7 @@ void ChooseThemeController::updateInnerLeft(int now) {
 
 void ChooseThemeController::close() {
 	if (const auto chosen = findChosen()) {
-		if (Ui::Emoji::Find(_peer->themeToken()) != chosen->emoji) {
+		if (_peer->themeToken() != chosen->token) {
 			clearCurrentBackgroundState();
 		}
 	}
@@ -531,7 +542,7 @@ auto ChooseThemeController::findChosen() -> Entry* {
 	for (auto &entry : _entries) {
 		if (!entry.key && chosen == kDisableElement()) {
 			return &entry;
-		} else if (chosen == entry.emoji->text()) {
+		} else if (chosen == entry.token) {
 			return &entry;
 		}
 	}
@@ -547,18 +558,9 @@ void ChooseThemeController::fill(
 	if (themes.empty()) {
 		return;
 	}
-	const auto count = int(themes.size()) + 1;
 	const auto single = st::chatThemePreviewSize;
 	const auto skip = st::chatThemeEntrySkip;
 	const auto &margin = st::chatThemeEntryMargin;
-	const auto full = margin.left()
-		+ single.width() * count
-		+ skip * (count - 1)
-		+ margin.right();
-	_inner->resize(
-		full,
-		margin.top() + single.height() + margin.bottom());
-
 	const auto initial = Ui::Emoji::Find(_peer->themeToken());
 	if (!initial) {
 		_chosen = kDisableElement();
@@ -601,9 +603,11 @@ void ChooseThemeController::fill(
 			if (!emoji || !theme.settings.contains(type)) {
 				continue;
 			}
+			const auto token = emoji->text();
 			const auto key = ChatThemeKey{ theme.id, dark };
-			const auto isChosen = (_chosen.current() == emoji->text());
+			const auto isChosen = (_chosen.current() == token);
 			_entries.push_back({
+				.token = token,
 				.key = key,
 				.emoji = emoji,
 				.geometry = QRect(QPoint(x, skip), single),
@@ -624,13 +628,11 @@ void ChooseThemeController::fill(
 					return;
 				}
 				const auto theme = data.get();
+				const auto token = i->token;
 				i->theme = std::move(data);
 				i->preview = GeneratePreview(theme);
-				if (_chosen.current() == i->emoji->text()) {
-					_controller->overridePeerTheme(
-						_peer,
-						i->theme,
-						i->emoji);
+				if (_chosen.current() == token) {
+					_controller->overridePeerTheme(_peer, i->theme, token);
 				}
 				_inner->update();
 
@@ -661,17 +663,24 @@ void ChooseThemeController::fill(
 			}, _cachingLifetime);
 			x += single.width() + skip;
 		}
+		const auto owner = &_controller->session().data();
+		const auto manager = &owner->customEmojiManager();
 		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
 			const auto found = cloudThemes->themeForToken(token);
-			if (!found || found->settings.contains(type)) {
+			if (!found || !found->settings.contains(type)) {
 				continue;
 			}
 			const auto &theme = *found;
 			const auto key = ChatThemeKey{ theme.id, dark };
 			const auto isChosen = (_chosen.current() == token);
 			_entries.push_back({
+				.token = token,
 				.key = key,
 				.gift = found->unique,
+				.custom = manager->create(
+					found->unique->model.document, 
+					[=] { _inner->update(); }, 
+					Data::CustomEmojiSizeTag::Large),
 				.geometry = QRect(QPoint(x, skip), single),
 				.chosen = isChosen,
 			});
@@ -690,13 +699,11 @@ void ChooseThemeController::fill(
 					return;
 				}
 				const auto theme = data.get();
+				const auto token = i->token;
 				i->theme = std::move(data);
 				i->preview = GeneratePreview(theme);
-				if (_chosen.current() == i->emoji->text()) {
-					_controller->overridePeerTheme(
-						_peer,
-						i->theme,
-						i->emoji);
+				if (_chosen.current() == token) {
+					_controller->overridePeerTheme(_peer, i->theme, token);
 				}
 				_inner->update();
 
@@ -728,6 +735,11 @@ void ChooseThemeController::fill(
 			x += single.width() + skip;
 		}
 
+		const auto full = x - skip + margin.right();
+		_inner->resize(
+			full,
+			margin.top() + single.height() + margin.bottom());
+
 		if (!_initialInnerLeftApplied && _content->width() > 0) {
 			applyInitialInnerLeft();
 		}
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index 42112e3be6..f61134868d 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -507,7 +507,7 @@ auto ChatThemeValueFromPeer(
 			std::shared_ptr<Ui::ChatTheme> &&cloud,
 			PeerThemeOverride &&overriden) {
 		return (overriden.peer == peer.get()
-			&& Ui::Emoji::Find(peer->themeToken()) != overriden.emoji)
+			&& peer->themeToken() != overriden.token)
 			? std::move(overriden.theme)
 			: std::move(cloud);
 	});
diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp
index 7a75e1b2fb..a6827b034f 100644
--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@@ -74,7 +74,8 @@ inline bool AreTestingTheme() {
 	return Ui::ReadBackgroundImage(
 		u":/gui/art/background.tgv"_q,
 		QByteArray(),
-		true);
+		true
+	).image;
 }
 
 [[nodiscard]] bool GoodImageFormatAndSize(const QImage &image) {
diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
index 42f1abb3c2..9b05d2fafd 100644
--- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp
@@ -468,7 +468,8 @@ void Generator::paintHistoryBackground() {
 			background = Ui::ReadBackgroundImage(
 				u":/gui/art/background.tgv"_q,
 				QByteArray(),
-				true);
+				true
+			).image;
 			const auto paper = Data::DefaultWallPaper();
 			background = Ui::PreparePatternImage(
 				std::move(background),
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 4d3bf4b03f..e6df00af52 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1506,6 +1506,7 @@ struct SessionController::CachedTheme {
 	std::weak_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
 	Data::WallPaper paper;
+	bool findGiftSymbols = false;
 	bool basedOnDark = false;
 	bool caching = false;
 	rpl::lifetime lifetime;
@@ -3248,11 +3249,11 @@ void SessionController::clearCachedChatThemes() {
 void SessionController::overridePeerTheme(
 		not_null<PeerData*> peer,
 		std::shared_ptr<Ui::ChatTheme> theme,
-		EmojiPtr emoji) {
+		QString token) {
 	_peerThemeOverride = PeerThemeOverride{
 		peer,
 		theme ? theme : _defaultChatTheme,
-		emoji,
+		token,
 	};
 }
 
@@ -3294,12 +3295,14 @@ void SessionController::cacheChatTheme(
 	const auto &use = !paper.isNull() ? paper : *i->second.paper;
 	const auto document = use.document();
 	const auto media = document ? document->createMediaView() : nullptr;
+	const auto findGiftSymbols = (data.unique != nullptr);
 	use.loadDocument();
 	auto &theme = [&]() -> CachedTheme& {
 		const auto i = _customChatThemes.find(key);
 		if (i != end(_customChatThemes)) {
 			i->second.media = media;
 			i->second.paper = use;
+			i->second.findGiftSymbols = findGiftSymbols;
 			i->second.basedOnDark = dark;
 			i->second.caching = true;
 			return i->second;
@@ -3309,6 +3312,7 @@ void SessionController::cacheChatTheme(
 			CachedTheme{
 				.media = media,
 				.paper = use,
+				.findGiftSymbols = findGiftSymbols,
 				.basedOnDark = dark,
 				.caching = true,
 			}).first->second;
@@ -3428,6 +3432,7 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 		.isBlurred = isBlurred,
 		.forDarkMode = theme.basedOnDark,
 		.generateGradient = generateGradient,
+		.findGiftSymbols = theme.findGiftSymbols,
 		.gradientRotation = gradientRotation,
 	};
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index b20da580bc..d8597e0aab 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -107,7 +107,7 @@ struct SeparateId;
 struct PeerThemeOverride {
 	PeerData *peer = nullptr;
 	std::shared_ptr<Ui::ChatTheme> theme;
-	EmojiPtr emoji = nullptr;
+	QString token;
 };
 bool operator==(const PeerThemeOverride &a, const PeerThemeOverride &b);
 bool operator!=(const PeerThemeOverride &a, const PeerThemeOverride &b);
@@ -642,7 +642,7 @@ public:
 	void overridePeerTheme(
 		not_null<PeerData*> peer,
 		std::shared_ptr<Ui::ChatTheme> theme,
-		EmojiPtr emoji);
+		QString token);
 	void clearPeerThemeOverride(not_null<PeerData*> peer);
 	[[nodiscard]] auto peerThemeOverrideValue() const
 		-> rpl::producer<PeerThemeOverride> {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 962581d1bf..c9c1f63df8 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 962581d1bf8b97323d0bd67dc06a8e4ff56757b5
+Subproject commit c9c1f63df8c7d6f8043ca66d8e67cc4fdb84c6c5

From d51944e6a5fa42cfaddbf948fe3777e1b226f6e5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Aug 2025 16:53:32 +0400
Subject: [PATCH 278/341] Update API scheme on layer 214.

---
 Telegram/SourceFiles/data/data_cloud_themes.cpp | 2 ++
 Telegram/SourceFiles/data/data_document.cpp     | 6 +-----
 Telegram/SourceFiles/mtproto/scheme/api.tl      | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp
index f1a4031bfc..9204fa1666 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp
@@ -524,6 +524,8 @@ void CloudThemes::myGiftThemesLoadMore(bool reload) {
 				_myGiftThemesTokens.clear();
 				_myGiftThemesLoaded = false;
 			}
+			_session->data().processUsers(data.vusers());
+			_session->data().processChats(data.vchats());
 			const auto &list = data.vthemes().v;
 			const auto got = int(list.size());
 			_myGiftThemesTokens.reserve(_myGiftThemesTokens.size() + got);
diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index cd33b8a469..0d8a7799d4 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -653,11 +653,7 @@ bool DocumentData::checkWallPaperProperties() {
 	if (type == WallPaperDocument) {
 		return true;
 	}
-	if (hasMimeType(u"application/x-tgwallpattern"_q)
-		&& dimensions.isEmpty()) {
-		dimensions = QSize(1125, 2313);
-		AssertIsDebug();
-	} else if (type != FileDocument
+	if (type != FileDocument
 		|| !hasThumbnail()
 		|| dimensions.isEmpty()
 		|| dimensions.width() > Storage::kMaxWallPaperDimension
diff --git a/Telegram/SourceFiles/mtproto/scheme/api.tl b/Telegram/SourceFiles/mtproto/scheme/api.tl
index c7e6dc08db..4803ec36b5 100644
--- a/Telegram/SourceFiles/mtproto/scheme/api.tl
+++ b/Telegram/SourceFiles/mtproto/scheme/api.tl
@@ -1421,7 +1421,7 @@ chatTheme#c3dffc04 emoticon:string = ChatTheme;
 chatThemeUniqueGift#3458f9c8 gift:StarGift theme_settings:Vector<ThemeSettings> = ChatTheme;
 
 account.chatThemesNotModified#e011e1c4 = account.ChatThemes;
-account.chatThemes#4bcef97b flags:# hash:long themes:Vector<ChatTheme> next_offset:flags.0?int = account.ChatThemes;
+account.chatThemes#16484857 flags:# hash:long themes:Vector<ChatTheme> chats:Vector<Chat> users:Vector<User> next_offset:flags.0?int = account.ChatThemes;
 
 sponsoredMessage#7dbf8673 flags:# recommended:flags.5?true can_report:flags.12?true random_id:bytes url:string title:string message:string entities:flags.1?Vector<MessageEntity> photo:flags.6?Photo media:flags.14?MessageMedia color:flags.13?PeerColor button_text:string sponsor_info:flags.7?string additional_info:flags.8?string min_display_duration:flags.15?int max_display_duration:flags.15?int = SponsoredMessage;
 
@@ -1899,7 +1899,7 @@ starsGiveawayOption#94ce852a flags:# extended:flags.0?true default:flags.1?true
 starsGiveawayWinnersOption#54236209 flags:# default:flags.0?true users:int per_user_stars:long = StarsGiveawayWinnersOption;
 
 starGift#80ac53c3 flags:# limited:flags.0?true sold_out:flags.1?true birthday:flags.2?true require_premium:flags.7?true limited_per_user:flags.8?true id:long sticker:Document stars:long availability_remains:flags.0?int availability_total:flags.0?int availability_resale:flags.4?long convert_stars:long first_sale_date:flags.1?int last_sale_date:flags.1?int upgrade_stars:flags.3?long resell_min_stars:flags.4?long title:flags.5?string released_by:flags.6?Peer per_user_total:flags.8?int per_user_remains:flags.8?int locked_until_date:flags.9?int = StarGift;
-starGiftUnique#26a5553e flags:# require_premium:flags.6?true resale_ton_only:flags.7?true id:long gift_id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer value_amount:flags.8?long value_currency:flags.8?string = StarGift;
+starGiftUnique#1befe865 flags:# require_premium:flags.6?true resale_ton_only:flags.7?true theme_available:flags.9?true id:long gift_id:long title:string slug:string num:int owner_id:flags.0?Peer owner_name:flags.1?string owner_address:flags.2?string attributes:Vector<StarGiftAttribute> availability_issued:int availability_total:int gift_address:flags.3?string resell_amount:flags.4?Vector<StarsAmount> released_by:flags.5?Peer value_amount:flags.8?long value_currency:flags.8?string theme_peer:flags.10?Peer = StarGift;
 
 payments.starGiftsNotModified#a388a368 = payments.StarGifts;
 payments.starGifts#2ed82995 hash:int gifts:Vector<StarGift> chats:Vector<Chat> users:Vector<User> = payments.StarGifts;

From b868cfdca960acb37fd46c8a7b8b8346c9e967f7 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Aug 2025 17:53:56 +0400
Subject: [PATCH 279/341] Fix pattern caching on themed chat open.

---
 Telegram/SourceFiles/api/api_premium.cpp    |  1 +
 Telegram/SourceFiles/data/data_star_gift.h  |  1 +
 Telegram/SourceFiles/ui/chat/chat_theme.cpp | 10 +++++++---
 Telegram/SourceFiles/ui/chat/chat_theme.h   |  2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index b05355d24b..069eb05dbe 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -911,6 +911,7 @@ std::optional<Data::StarGift> FromTL(
 				.starsForResale = FindStarsForResale(data.vresell_amount()),
 				.number = data.vnum().v,
 				.onlyAcceptTon = data.is_resale_ton_only(),
+				.canBeTheme = data.is_theme_available(),
 				.model = *model,
 				.pattern = *pattern,
 				.value = (data.vvalue_amount()
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index 86dc5b132a..d78cf6c2a3 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -67,6 +67,7 @@ struct UniqueGift {
 	int starsForTransfer = -1;
 	int number = 0;
 	bool onlyAcceptTon = false;
+	bool canBeTheme = false;
 	TimeId exportAt = 0;
 	TimeId canTransferAt = 0;
 	TimeId canResellAt = 0;
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index 6dd873f6cb..d5deb53f6a 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -535,7 +535,8 @@ bool ChatTheme::readyForBackgroundRotation() const {
 }
 
 void ChatTheme::generateNextBackgroundRotation() {
-	if (_backgroundCachingRequest
+	if (_nextCachingRequest
+		|| _backgroundCachingRequest
 		|| !_backgroundNext.image.isNull()
 		|| !readyForBackgroundRotation()
 		|| background().colors.size() < 3) {
@@ -548,8 +549,9 @@ void ChatTheme::generateNextBackgroundRotation() {
 	if (!request) {
 		return;
 	}
+	_nextCachingRequest = request;
 	cacheBackgroundAsync(request, [=](CacheBackgroundResult &&result) {
-		const auto forRequest = base::take(_backgroundCachingRequest);
+		const auto forRequest = base::take(_nextCachingRequest);
 		if (!readyForBackgroundRotation()) {
 			return;
 		}
@@ -601,7 +603,9 @@ void ChatTheme::cacheBackgroundNow() {
 void ChatTheme::cacheBackgroundAsync(
 		const CacheBackgroundRequest &request,
 		Fn<void(CacheBackgroundResult&&)> done) {
-	_backgroundCachingRequest = request;
+	if (!done) {
+		_backgroundCachingRequest = request;
+	}
 	const auto weak = base::make_weak(this);
 	crl::async([=] {
 		if (!weak) {
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index 10b76f4c16..9c1643dfbb 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -202,7 +202,9 @@ private:
 	BackgroundState _backgroundState;
 	Animations::Simple _backgroundFade;
 	CacheBackgroundRequest _backgroundCachingRequest;
+	CacheBackgroundRequest _nextCachingRequest;
 	CacheBackgroundResult _backgroundNext;
+	int _backgroundVersion = 0;
 	QSize _cacheBackgroundArea;
 	crl::time _lastBackgroundAreaChangeTime = 0;
 	std::optional<base::Timer> _cacheBackgroundTimer;

From 1f3996032c04ee07c78d860c38a98d1d09754c50 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 28 Aug 2025 22:37:52 +0400
Subject: [PATCH 280/341] Fix theme preview pattern loading.

---
 .../data/data_document_resolver.cpp           |   4 +
 Telegram/SourceFiles/ui/chat/chat_theme.cpp   |   6 +-
 .../ui/chat/choose_theme_controller.cpp       | 116 ++++++------------
 3 files changed, 43 insertions(+), 83 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_document_resolver.cpp b/Telegram/SourceFiles/data/data_document_resolver.cpp
index 3d5c013c5a..248daec9a9 100644
--- a/Telegram/SourceFiles/data/data_document_resolver.cpp
+++ b/Telegram/SourceFiles/data/data_document_resolver.cpp
@@ -170,6 +170,10 @@ base::binary_guard ReadBackgroundImageAsync(
 		callback = std::move(done)
 	]() mutable {
 		auto image = Ui::ReadBackgroundImage(path, bytes, gzipSvg).image;
+		if (image.isNull()) {
+			image = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
+			image.fill(Qt::black);
+		}
 		if (postprocess) {
 			image = postprocess(std::move(image));
 		}
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index d5deb53f6a..babcb94215 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -975,16 +975,12 @@ BackgroundImageFields ReadBackgroundImage(
 		.maxSize = QSize(kMaxSize, kMaxSize),
 		.gzipSvg = gzipSvg,
 	});
-	if (read.image.isNull()) {
-		read.image = QImage(1, 1, QImage::Format_ARGB32_Premultiplied);
-		read.image.fill(Qt::black);
-	}
 	auto result = BackgroundImageFields{
 		.image = std::move(read.image),
 	};
 	if (const auto &rects = read.svgCutOutContent; !rects.isEmpty()) {
 		result.giftSymbols = ParseGiftSymbols(
-			rects, 
+			rects,
 			result.image.size(),
 			read.scale);
 	}
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 8f94a95f0d..77d92779f8 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -561,8 +561,8 @@ void ChooseThemeController::fill(
 	const auto single = st::chatThemePreviewSize;
 	const auto skip = st::chatThemeEntrySkip;
 	const auto &margin = st::chatThemeEntryMargin;
-	const auto initial = Ui::Emoji::Find(_peer->themeToken());
-	if (!initial) {
+	const auto initial = _peer->themeToken();
+	if (initial.isEmpty()) {
 		_chosen = kDisableElement();
 	}
 
@@ -574,8 +574,8 @@ void ChooseThemeController::fill(
 		) | rpl::then(cloudThemes->myGiftThemesUpdated())
 	) | rpl::start_with_next([=](bool dark, auto) {
 		clearCurrentBackgroundState();
-		if (_chosen.current().isEmpty() && initial) {
-			_chosen = initial->text();
+		if (_chosen.current().isEmpty() && !initial.isEmpty()) {
+			_chosen = initial;
 		}
 
 		_cachingLifetime.destroy();
@@ -598,89 +598,30 @@ void ChooseThemeController::fill(
 			: Data::CloudThemeType::Light;
 
 		x += single.width() + skip;
-		for (const auto &theme : themes) {
-			const auto emoji = Ui::Emoji::Find(theme.emoticon);
-			if (!emoji || !theme.settings.contains(type)) {
-				continue;
-			}
-			const auto token = emoji->text();
-			const auto key = ChatThemeKey{ theme.id, dark };
-			const auto isChosen = (_chosen.current() == token);
-			_entries.push_back({
-				.token = token,
-				.key = key,
-				.emoji = emoji,
-				.geometry = QRect(QPoint(x, skip), single),
-				.chosen = isChosen,
-			});
-			_controller->cachedChatThemeValue(
-				theme,
-				Data::WallPaper(0),
-				type
-			) | rpl::filter([=](const std::shared_ptr<ChatTheme> &data) {
-				return data && (data->key() == key);
-			}) | rpl::take(
-				1
-			) | rpl::start_with_next([=](std::shared_ptr<ChatTheme> &&data) {
-				const auto key = data->key();
-				const auto i = ranges::find(_entries, key, &Entry::key);
-				if (i == end(_entries)) {
-					return;
-				}
-				const auto theme = data.get();
-				const auto token = i->token;
-				i->theme = std::move(data);
-				i->preview = GeneratePreview(theme);
-				if (_chosen.current() == token) {
-					_controller->overridePeerTheme(_peer, i->theme, token);
-				}
-				_inner->update();
 
-				if (!theme->background().isPattern
-					|| !theme->background().prepared.isNull()) {
-					return;
-				}
-				// Subscribe to pattern loading if needed.
-				theme->repaintBackgroundRequests(
-				) | rpl::filter([=] {
-					const auto i = ranges::find(
-						_entries,
-						key,
-						&Entry::key);
-					return (i == end(_entries))
-						|| !i->theme->background().prepared.isNull();
-				}) | rpl::take(1) | rpl::start_with_next([=] {
-					const auto i = ranges::find(
-						_entries,
-						key,
-						&Entry::key);
-					if (i == end(_entries)) {
-						return;
-					}
-					i->preview = GeneratePreview(theme);
-					_inner->update();
-				}, _cachingLifetime);
-			}, _cachingLifetime);
-			x += single.width() + skip;
-		}
 		const auto owner = &_controller->session().data();
 		const auto manager = &owner->customEmojiManager();
-		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
-			const auto found = cloudThemes->themeForToken(token);
-			if (!found || !found->settings.contains(type)) {
-				continue;
+		const auto push = [&](
+				const Data::CloudTheme &theme,
+				const QString &token) {
+			if (token.isEmpty() || !theme.settings.contains(type)) {
+				return;
 			}
-			const auto &theme = *found;
 			const auto key = ChatThemeKey{ theme.id, dark };
 			const auto isChosen = (_chosen.current() == token);
 			_entries.push_back({
 				.token = token,
 				.key = key,
-				.gift = found->unique,
-				.custom = manager->create(
-					found->unique->model.document, 
-					[=] { _inner->update(); }, 
-					Data::CustomEmojiSizeTag::Large),
+				.gift = theme.unique,
+				.custom = (theme.unique
+					? manager->create(
+						theme.unique->model.document,
+						[=] { _inner->update(); },
+						Data::CustomEmojiSizeTag::Large)
+					: nullptr),
+				.emoji = (theme.emoticon.isEmpty()
+					? nullptr
+					: Ui::Emoji::Find(theme.emoticon)),
 				.geometry = QRect(QPoint(x, skip), single),
 				.chosen = isChosen,
 			});
@@ -733,6 +674,25 @@ void ChooseThemeController::fill(
 				}, _cachingLifetime);
 			}, _cachingLifetime);
 			x += single.width() + skip;
+		};
+
+		if (const auto now = cloudThemes->themeForToken(initial)) {
+			push(*now, initial);
+		}
+		for (const auto &theme : themes) {
+			if (const auto emoji = Ui::Emoji::Find(theme.emoticon)) {
+				const auto token = emoji->text();
+				if (token != initial) {
+					push(theme, token);
+				}
+			}
+		}
+		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
+			if (const auto found = cloudThemes->themeForToken(token)) {
+				if (token != initial) {
+					push(*found, token);
+				}
+			}
 		}
 
 		const auto full = x - skip + margin.right();

From c8abc84c3c0d97c9c5782f17b898a4afae070fe5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Aug 2025 11:20:50 +0400
Subject: [PATCH 281/341] Put gift themes in beginning.

---
 Telegram/SourceFiles/data/data_cloud_themes.cpp |  5 +++++
 Telegram/SourceFiles/data/data_cloud_themes.h   |  1 +
 .../ui/chat/choose_theme_controller.cpp         | 17 ++++++++++-------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/data/data_cloud_themes.cpp b/Telegram/SourceFiles/data/data_cloud_themes.cpp
index 9204fa1666..1a8fce9a91 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.cpp
+++ b/Telegram/SourceFiles/data/data_cloud_themes.cpp
@@ -541,6 +541,7 @@ void CloudThemes::myGiftThemesLoadMore(bool reload) {
 		}, [&](const MTPDaccount_chatThemesNotModified &) {
 			if (!reload) {
 				_myGiftThemesLoaded = true;
+				_myGiftThemesUpdates.fire({});
 			}
 		});
 	}).fail([=] {
@@ -553,6 +554,10 @@ const std::vector<QString> &CloudThemes::myGiftThemesTokens() const {
 	return _myGiftThemesTokens;
 }
 
+bool CloudThemes::myGiftThemesReady() const {
+	return !_myGiftThemesTokens.empty() || _myGiftThemesLoaded;
+}
+
 rpl::producer<> CloudThemes::myGiftThemesUpdated() const {
 	return _myGiftThemesUpdates.events();
 }
diff --git a/Telegram/SourceFiles/data/data_cloud_themes.h b/Telegram/SourceFiles/data/data_cloud_themes.h
index 4ccbf0a0b9..deb3160863 100644
--- a/Telegram/SourceFiles/data/data_cloud_themes.h
+++ b/Telegram/SourceFiles/data/data_cloud_themes.h
@@ -85,6 +85,7 @@ public:
 	[[nodiscard]] rpl::producer<> myGiftThemesUpdated() const;
 	[[nodiscard]] QString processGiftThemeGetToken(
 		const MTPDchatThemeUniqueGift &data);
+	[[nodiscard]] bool myGiftThemesReady() const;
 
 	void refreshChatThemesFor(const QString &token);
 	[[nodiscard]] std::optional<CloudTheme> themeForToken(
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 77d92779f8..3b215c4554 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -573,6 +573,9 @@ void ChooseThemeController::fill(
 			rpl::empty
 		) | rpl::then(cloudThemes->myGiftThemesUpdated())
 	) | rpl::start_with_next([=](bool dark, auto) {
+		if (!cloudThemes->myGiftThemesReady()) {
+			return;
+		}
 		clearCurrentBackgroundState();
 		if (_chosen.current().isEmpty() && !initial.isEmpty()) {
 			_chosen = initial;
@@ -679,6 +682,13 @@ void ChooseThemeController::fill(
 		if (const auto now = cloudThemes->themeForToken(initial)) {
 			push(*now, initial);
 		}
+		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
+			if (const auto found = cloudThemes->themeForToken(token)) {
+				if (token != initial) {
+					push(*found, token);
+				}
+			}
+		}
 		for (const auto &theme : themes) {
 			if (const auto emoji = Ui::Emoji::Find(theme.emoticon)) {
 				const auto token = emoji->text();
@@ -687,13 +697,6 @@ void ChooseThemeController::fill(
 				}
 			}
 		}
-		for (const auto &token : cloudThemes->myGiftThemesTokens()) {
-			if (const auto found = cloudThemes->themeForToken(token)) {
-				if (token != initial) {
-					push(*found, token);
-				}
-			}
-		}
 
 		const auto full = x - skip + margin.right();
 		_inner->resize(

From 50450de3e4e967ae99e1b0489ae95445876d970e Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Aug 2025 14:10:28 +0400
Subject: [PATCH 282/341] Confirm transfer gift theme.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 Telegram/SourceFiles/api/api_premium.cpp      |   7 +
 Telegram/SourceFiles/data/data_star_gift.h    |   1 +
 Telegram/SourceFiles/settings/settings.style  |   1 +
 .../ui/chat/choose_theme_controller.cpp       | 171 +++++++++++++-----
 5 files changed, 140 insertions(+), 41 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index e178713532..2fde605adc 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -6352,6 +6352,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_chat_theme_change_wallpaper" = "Change Wallpaper";
 "lng_chat_theme_title" = "Select theme";
 "lng_chat_theme_cant_voice" = "Sorry, you can't change the chat theme while you have an unsent voice message.";
+"lng_chat_theme_gift_replace" = "This gift is already your theme in the chat with {name}. Remove it there and use it here instead?";
 
 "lng_photo_editor_menu_delete" = "Delete";
 "lng_photo_editor_menu_flip" = "Flip";
diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index 069eb05dbe..dcb9d303f9 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -891,9 +891,15 @@ std::optional<Data::StarGift> FromTL(
 		const auto releasedById = data.vreleased_by()
 			? peerFromMTP(*data.vreleased_by())
 			: PeerId();
+		const auto themeUserId = data.vtheme_peer()
+			? peerFromMTP(*data.vtheme_peer())
+			: PeerId();
 		const auto releasedBy = releasedById
 			? session->data().peer(releasedById).get()
 			: nullptr;
+		const auto themeUser = themeUserId
+			? session->data().peer(themeUserId).get()
+			: nullptr;
 		auto result = Data::StarGift{
 			.id = data.vid().v,
 			.unique = std::make_shared<Data::UniqueGift>(Data::UniqueGift{
@@ -907,6 +913,7 @@ std::optional<Data::StarGift> FromTL(
 					? peerFromMTP(*data.vowner_id())
 					: PeerId()),
 				.releasedBy = releasedBy,
+				.themeUser = themeUser,
 				.nanoTonForResale = FindTonForResale(data.vresell_amount()),
 				.starsForResale = FindStarsForResale(data.vresell_amount()),
 				.number = data.vnum().v,
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index d78cf6c2a3..19e1af0987 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -62,6 +62,7 @@ struct UniqueGift {
 	QString ownerName;
 	PeerId ownerId = 0;
 	PeerData *releasedBy = nullptr;
+	PeerData *themeUser = nullptr;
 	int64 nanoTonForResale = -1;
 	int starsForResale = -1;
 	int starsForTransfer = -1;
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index c5610967d4..817a7d8fa1 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -286,6 +286,7 @@ chatThemeEntryMargin: margins(16px, 10px, 16px, 8px);
 chatThemeEmptyPreviewTop: 16px;
 chatThemeEmojiBottom: 12px;
 chatThemeButtonMargin: margins(10px, 0px, 10px, 8px);
+chatThemeGiftTaken: icon {{ "mediaview/mini_repost", msgFileInBg }};
 
 autoDownloadLimitButton: SettingsButton(settingsButtonNoIcon) {
 	padding: margins(22px, 10px, 22px, 0px);
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index 3b215c4554..cfe31e3e8d 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -8,12 +8,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/choose_theme_controller.h"
 
 #include "boxes/background_box.h"
+#include "ui/dynamic_image.h"
+#include "ui/dynamic_thumbnails.h"
 #include "ui/rp_widget.h"
+#include "ui/boxes/confirm_box.h"
+#include "ui/chat/chat_theme.h"
+#include "ui/chat/message_bubble.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/buttons.h"
-#include "ui/chat/chat_theme.h"
-#include "ui/chat/message_bubble.h"
 #include "ui/wrap/vertical_layout.h"
 #include "ui/painter.h"
 #include "main/main_session.h"
@@ -39,7 +44,14 @@ namespace {
 
 const auto kDisableElement = [] { return u"disable"_q; };
 
-[[nodiscard]] QImage GeneratePreview(not_null<Ui::ChatTheme*> theme) {
+struct Preview {
+	QImage preview;
+	QRect userpic;
+};
+
+[[nodiscard]] Preview GeneratePreview(
+		not_null<Ui::ChatTheme*> theme,
+		const std::shared_ptr<Ui::DynamicImage> &takenUserpic) {
 	const auto &background = theme->background();
 	const auto &colors = background.colors;
 	const auto size = st::chatThemePreviewSize;
@@ -72,6 +84,7 @@ const auto kDisableElement = [] { return u"disable"_q; };
 			QRect(QPoint(), size * style::DevicePixelRatio()),
 			small);
 	};
+	auto userpic = QRect();
 	const auto fullsize = size * style::DevicePixelRatio();
 	auto result = background.waitingForNegativePattern()
 		? QImage(
@@ -119,8 +132,28 @@ const auto kDisableElement = [] { return u"disable"_q; };
 		}
 		p.setBrush(theme->palette()->msgInBg()->c);
 		p.drawRoundedRect(received, radius, radius);
+
+		if (takenUserpic) {
+			const auto border = 2 * st::lineWidth;
+			const auto inner = received.marginsRemoved(
+				{ border, border, border, border });
+			userpic = inner;
+			userpic.setWidth(userpic.height());
+
+			st::chatThemeGiftTaken.paintInCenter(
+				p,
+				QRect(
+					inner.x() + inner.width() - inner.height() - border,
+					inner.y(),
+					inner.height(),
+					inner.height()),
+				theme->palette()->msgFileInBg()->c);
+		}
 	}
-	return Images::Round(std::move(result), ImageRoundRadius::Large);
+	return {
+		.preview = Images::Round(std::move(result), ImageRoundRadius::Large),
+		.userpic = userpic,
+	};
 }
 
 [[nodiscard]] QImage GenerateEmptyPreview() {
@@ -152,9 +185,11 @@ struct ChooseThemeController::Entry {
 	std::shared_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
 	std::shared_ptr<Data::UniqueGift> gift;
+	std::shared_ptr<Ui::DynamicImage> takenUserpic;
 	std::unique_ptr<Ui::Text::CustomEmoji> custom;
 	EmojiPtr emoji = nullptr;
 	QImage preview;
+	QRect userpic;
 	QRect geometry;
 	bool chosen = false;
 };
@@ -289,49 +324,85 @@ void ChooseThemeController::initButtons() {
 		shown->moveToLeft(left, margin.top());
 	}, controls->lifetime());
 
+	const auto setTheme = crl::guard(apply, [=](
+			const QString &token,
+			const std::shared_ptr<Ui::ChatTheme> &theme) {
+		const auto giftTheme = token.startsWith(u"gift:"_q)
+			? _peer->owner().cloudThemes().themeForToken(token)
+			: std::optional<Data::CloudTheme>();
+
+		_peer->setThemeToken(token);
+		const auto dropWallPaper = (_peer->wallPaper() != nullptr);
+		if (dropWallPaper) {
+			_peer->setWallPaper({});
+		}
+
+		if (theme) {
+			// Remember while changes propagate through event loop.
+			_controller->pushLastUsedChatTheme(theme);
+		}
+		const auto api = &_peer->session().api();
+
+		api->request(MTPmessages_SetChatWallPaper(
+			MTP_flags(0),
+			_peer->input,
+			MTPInputWallPaper(),
+			MTPWallPaperSettings(),
+			MTPint()
+		)).afterDelay(10).done([=](const MTPUpdates &result) {
+			api->applyUpdates(result);
+		}).send();
+
+		api->request(MTPmessages_SetChatTheme(
+			_peer->input,
+			((giftTheme && giftTheme->unique)
+				? MTP_inputChatThemeUniqueGift(
+					MTP_string(giftTheme->unique->slug))
+				: MTP_inputChatTheme(MTP_string(token)))
+		)).done([=](const MTPUpdates &result) {
+			api->applyUpdates(result);
+		}).send();
+
+		_controller->toggleChooseChatTheme(_peer);
+	});
+	const auto confirmTakeGiftTheme = crl::guard(apply, [=](
+			const QString &token,
+			const std::shared_ptr<Ui::ChatTheme> &theme,
+			not_null<PeerData*> nowHasTheme) {
+		_controller->show(Box([=](not_null<Ui::GenericBox*> box) {
+			const auto confirmed = [=](Fn<void()> close) {
+				setTheme(token, theme);
+				close();
+			};
+			Ui::ConfirmBox(box, {
+				.text = tr::lng_chat_theme_gift_replace(
+					lt_name,
+					rpl::single(Ui::Text::Bold(nowHasTheme->shortName())),
+					Ui::Text::WithEntities),
+				.confirmed = confirmed,
+				.confirmText = tr::lng_box_yes(),
+			});
+		}));
+	});
 	apply->setClickedCallback([=] {
 		if (const auto chosen = findChosen()) {
 			const auto was = _peer->themeToken();
 			const auto now = chosen->key ? _chosen.current() : QString();
+			const auto user = chosen->gift
+				? chosen->gift->themeUser
+				: nullptr;
 			if (was != now) {
-				const auto giftTheme = now.startsWith(u"gift:"_q)
-					? _peer->owner().cloudThemes().themeForToken(now)
-					: std::optional<Data::CloudTheme>();
-
-				_peer->setThemeToken(now);
-				const auto dropWallPaper = (_peer->wallPaper() != nullptr);
-				if (dropWallPaper) {
-					_peer->setWallPaper({});
+				if (!user || user == _peer) {
+					setTheme(now, chosen->theme);
+				} else {
+					confirmTakeGiftTheme(now, chosen->theme, user);
 				}
-
-				if (chosen->theme) {
-					// Remember while changes propagate through event loop.
-					_controller->pushLastUsedChatTheme(chosen->theme);
-				}
-				const auto api = &_peer->session().api();
-
-				api->request(MTPmessages_SetChatWallPaper(
-					MTP_flags(0),
-					_peer->input,
-					MTPInputWallPaper(),
-					MTPWallPaperSettings(),
-					MTPint()
-				)).afterDelay(10).done([=](const MTPUpdates &result) {
-					api->applyUpdates(result);
-				}).send();
-
-				api->request(MTPmessages_SetChatTheme(
-					_peer->input,
-					((giftTheme && giftTheme->unique)
-						? MTP_inputChatThemeUniqueGift(
-							MTP_string(giftTheme->unique->slug))
-						: MTP_inputChatTheme(MTP_string(now)))
-				)).done([=](const MTPUpdates &result) {
-					api->applyUpdates(result);
-				}).send();
+			} else {
+				_controller->toggleChooseChatTheme(_peer);
 			}
+		} else {
+			_controller->toggleChooseChatTheme(_peer);
 		}
-		_controller->toggleChooseChatTheme(_peer);
 	});
 	choose->setClickedCallback([=] {
 		_controller->show(Box<BackgroundBox>(_controller, _peer));
@@ -341,6 +412,14 @@ void ChooseThemeController::initButtons() {
 void ChooseThemeController::paintEntry(QPainter &p, const Entry &entry) {
 	const auto geometry = entry.geometry;
 	p.drawImage(geometry, entry.preview);
+	if (const auto userpic = entry.takenUserpic.get()) {
+		userpic->subscribeToUpdates([=] {
+			_inner->update();
+		});
+		p.drawImage(
+			entry.userpic.translated(geometry.topLeft()),
+			userpic->image(entry.userpic.height()));
+	}
 
 	const auto size = Ui::Emoji::GetSizeLarge();
 	const auto factor = style::DevicePixelRatio();
@@ -612,10 +691,16 @@ void ChooseThemeController::fill(
 			}
 			const auto key = ChatThemeKey{ theme.id, dark };
 			const auto isChosen = (_chosen.current() == token);
+			const auto themeUser = theme.unique
+				? theme.unique->themeUser
+				: nullptr;
 			_entries.push_back({
 				.token = token,
 				.key = key,
 				.gift = theme.unique,
+				.takenUserpic = (themeUser
+					? Ui::MakeUserpicThumbnail(themeUser, true)
+					: nullptr),
 				.custom = (theme.unique
 					? manager->create(
 						theme.unique->model.document,
@@ -645,7 +730,9 @@ void ChooseThemeController::fill(
 				const auto theme = data.get();
 				const auto token = i->token;
 				i->theme = std::move(data);
-				i->preview = GeneratePreview(theme);
+				auto generated = GeneratePreview(theme, i->takenUserpic);
+				i->preview = std::move(generated.preview);
+				i->userpic = generated.userpic;
 				if (_chosen.current() == token) {
 					_controller->overridePeerTheme(_peer, i->theme, token);
 				}
@@ -672,7 +759,9 @@ void ChooseThemeController::fill(
 					if (i == end(_entries)) {
 						return;
 					}
-					i->preview = GeneratePreview(theme);
+					auto generated = GeneratePreview(theme, i->takenUserpic);
+					i->preview = std::move(generated.preview);
+					i->userpic = generated.userpic;
 					_inner->update();
 				}, _cachingLifetime);
 			}, _cachingLifetime);

From e876a0f6bd2b6bd0fd2c5474672742da8de8a854 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Aug 2025 15:25:15 +0400
Subject: [PATCH 283/341] Set gift as theme from gift view.

---
 Telegram/Resources/langs/lang.strings         |   2 +
 .../SourceFiles/boxes/transfer_gift_box.cpp   | 103 ++++++++++++++++++
 .../SourceFiles/boxes/transfer_gift_box.h     |  19 ++++
 .../boosts/giveaway/giveaway.style            |   1 +
 .../settings/settings_credits_graphics.cpp    |   8 ++
 .../settings/settings_credits_graphics.h      |   1 +
 .../ui/chat/choose_theme_controller.cpp       |  38 +------
 7 files changed, 136 insertions(+), 36 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 2fde605adc..4a70bd8e5c 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3787,6 +3787,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_transfer_sure_for" = "Do you want to transfer ownership of {name} to {recipient} for {price}?";
 "lng_gift_transfer_button" = "Transfer";
 "lng_gift_transfer_button_for" = "Transfer for {price}";
+"lng_gift_transfer_set_theme" = "Set as Theme in...";
+"lng_gift_transfer_choose" = "Choose Chat";
 "lng_gift_transfer_wear" = "Wear";
 "lng_gift_transfer_take_off" = "Take Off";
 "lng_gift_transfer_sell" = "Sell";
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
index 598c2a4744..6ee2a4977d 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.cpp
@@ -12,8 +12,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_cloud_password.h"
 #include "base/unixtime.h"
 #include "boxes/passcode_box.h"
+#include "data/data_cloud_themes.h"
 #include "data/data_session.h"
 #include "data/data_star_gift.h"
+#include "data/data_thread.h"
 #include "data/data_user.h"
 #include "boxes/filters/edit_filter_chats_list.h" // CreatePe...tionSubtitle.
 #include "boxes/peer_list_box.h"
@@ -673,6 +675,107 @@ void ShowTransferGiftBox(
 		Ui::LayerOption::KeepOther);
 }
 
+void SetThemeFromUniqueGift(
+		not_null<Window::SessionController*> window,
+		std::shared_ptr<Data::UniqueGift> unique) {
+	class Controller final : public ChooseRecipientBoxController {
+	public:
+		Controller(
+			not_null<Window::SessionController*> window,
+			std::shared_ptr<Data::UniqueGift> unique)
+		: ChooseRecipientBoxController({
+			.session = &window->session(),
+			.callback = [=](not_null<Data::Thread*> thread) {
+				const auto weak = base::make_weak(window);
+				const auto peer = thread->peer();
+				SendPeerThemeChangeRequest(window, peer, QString(), unique);
+				if (weak) window->showPeerHistory(peer);
+				if (weak) window->hideLayer(anim::type::normal);
+			},
+			.filter = [=](not_null<Data::Thread*> thread) {
+				return thread->peer()->isUser();
+			},
+			.moneyRestrictionError = WriteMoneyRestrictionError,
+		}) {
+		}
+
+	private:
+		void prepareViewHook() override {
+			ChooseRecipientBoxController::prepareViewHook();
+			delegate()->peerListSetTitle(tr::lng_gift_transfer_choose());
+		}
+
+	};
+
+	window->show(
+		Box<PeerListBox>(
+			std::make_unique<Controller>(window, std::move(unique)),
+			[](not_null<PeerListBox*> box) {
+				box->addButton(tr::lng_cancel(), [=] {
+					box->closeBox();
+				});
+			}));
+}
+
+void SendPeerThemeChangeRequest(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		const QString &token,
+		const std::shared_ptr<Data::UniqueGift> &unique,
+		bool locallySet) {
+	const auto api = &peer->session().api();
+
+	api->request(MTPmessages_SetChatWallPaper(
+		MTP_flags(0),
+		peer->input,
+		MTPInputWallPaper(),
+		MTPWallPaperSettings(),
+		MTPint()
+	)).afterDelay(10).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+	}).send();
+
+	api->request(MTPmessages_SetChatTheme(
+		peer->input,
+		(unique
+			? MTP_inputChatThemeUniqueGift(MTP_string(unique->slug))
+			: MTP_inputChatTheme(MTP_string(token)))
+	)).done([=](const MTPUpdates &result) {
+		api->applyUpdates(result);
+		if (!locallySet) {
+			peer->updateFullForced();
+		}
+	}).send();
+}
+
+void SetPeerTheme(
+		not_null<Window::SessionController*> controller,
+		not_null<PeerData*> peer,
+		const QString &token,
+		const std::shared_ptr<Ui::ChatTheme> &theme) {
+	const auto giftTheme = token.startsWith(u"gift:"_q)
+		? peer->owner().cloudThemes().themeForToken(token)
+		: std::optional<Data::CloudTheme>();
+
+	peer->setThemeToken(token);
+	const auto dropWallPaper = (peer->wallPaper() != nullptr);
+	if (dropWallPaper) {
+		peer->setWallPaper({});
+	}
+
+	if (theme) {
+		// Remember while changes propagate through event loop.
+		controller->pushLastUsedChatTheme(theme);
+	}
+
+	SendPeerThemeChangeRequest(
+		controller,
+		peer,
+		token,
+		giftTheme ? giftTheme->unique : nullptr,
+		true);
+}
+
 void ShowBuyResaleGiftBox(
 		std::shared_ptr<ChatHelpers::Show> show,
 		std::shared_ptr<Data::UniqueGift> gift,
diff --git a/Telegram/SourceFiles/boxes/transfer_gift_box.h b/Telegram/SourceFiles/boxes/transfer_gift_box.h
index cab7aee2b4..285c2149fb 100644
--- a/Telegram/SourceFiles/boxes/transfer_gift_box.h
+++ b/Telegram/SourceFiles/boxes/transfer_gift_box.h
@@ -20,6 +20,10 @@ struct UniqueGift;
 class SavedStarGiftId;
 } // namespace Data
 
+namespace Ui {
+class ChatTheme;
+} // namespace Ui
+
 void ShowTransferToBox(
 	not_null<Window::SessionController*> controller,
 	not_null<PeerData*> peer,
@@ -45,3 +49,18 @@ bool ShowResaleGiftLater(
 bool ShowTransferGiftLater(
 	std::shared_ptr<ChatHelpers::Show> show,
 	std::shared_ptr<Data::UniqueGift> gift);
+
+void SetThemeFromUniqueGift(
+	not_null<Window::SessionController*> window,
+	std::shared_ptr<Data::UniqueGift> unique);
+void SendPeerThemeChangeRequest(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	const QString &token,
+	const std::shared_ptr<Data::UniqueGift> &unique,
+	bool locallySet = false);
+void SetPeerTheme(
+	not_null<Window::SessionController*> controller,
+	not_null<PeerData*> peer,
+	const QString &token,
+	const std::shared_ptr<Ui::ChatTheme> &theme);
diff --git a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
index 6a2472a955..956c16c2cc 100644
--- a/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
+++ b/Telegram/SourceFiles/info/channel_statistics/boosts/giveaway/giveaway.style
@@ -214,6 +214,7 @@ darkGiftCodeBox: Box(giveawayGiftCodeBox) {
 }
 darkGiftLink: icon {{ "menu/copy", groupCallMembersFg }};
 darkGiftShare: icon {{ "menu/share", groupCallMembersFg }};
+darkGiftTheme: icon {{ "menu/colors", groupCallMembersFg }};
 darkGiftTransfer: icon {{ "chat/input_replace", groupCallMembersFg }};
 darkGiftNftWear: icon {{ "menu/nft_wear", groupCallMembersFg }};
 darkGiftNftTakeOff: icon {{ "menu/nft_takeoff", groupCallMembersFg }};
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 873ac0bd34..ad337fc840 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1094,6 +1094,13 @@ void FillUniqueGiftMenu(
 	if (!unique) {
 		return;
 	}
+	if (unique->canBeTheme) {
+		menu->addAction(tr::lng_gift_transfer_set_theme(tr::now), [=] {
+			if (const auto window = show->resolveWindow()) {
+				SetThemeFromUniqueGift(window, unique);
+			}
+		}, st.theme ? st.theme : &st::menuIconChangeColors);
+	}
 	const auto transfer = savedId
 		&& (savedId.isUser() ? e.in : savedId.chat()->canTransferGifts())
 		&& (unique->starsForTransfer >= 0);
@@ -1176,6 +1183,7 @@ CreditsEntryBoxStyleOverrides DarkCreditsEntryBoxStyle() {
 		.tableValueMessage = &st::darkGiftTableMessage,
 		.link = &st::darkGiftLink,
 		.share = &st::darkGiftShare,
+		.theme = &st::darkGiftTheme,
 		.transfer = &st::darkGiftTransfer,
 		.wear = &st::darkGiftNftWear,
 		.takeoff = &st::darkGiftNftTakeOff,
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.h b/Telegram/SourceFiles/settings/settings_credits_graphics.h
index db7cdbe066..d4af6f0977 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.h
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.h
@@ -115,6 +115,7 @@ struct CreditsEntryBoxStyleOverrides {
 	const style::FlatLabel *tableValueMessage = nullptr;
 	const style::icon *link = nullptr;
 	const style::icon *share = nullptr;
+	const style::icon *theme = nullptr;
 	const style::icon *transfer = nullptr;
 	const style::icon *wear = nullptr;
 	const style::icon *takeoff = nullptr;
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index cfe31e3e8d..ad42cb8dc6 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/chat/choose_theme_controller.h"
 
 #include "boxes/background_box.h"
+#include "boxes/transfer_gift_box.h"
 #include "ui/dynamic_image.h"
 #include "ui/dynamic_thumbnails.h"
 #include "ui/rp_widget.h"
@@ -327,42 +328,7 @@ void ChooseThemeController::initButtons() {
 	const auto setTheme = crl::guard(apply, [=](
 			const QString &token,
 			const std::shared_ptr<Ui::ChatTheme> &theme) {
-		const auto giftTheme = token.startsWith(u"gift:"_q)
-			? _peer->owner().cloudThemes().themeForToken(token)
-			: std::optional<Data::CloudTheme>();
-
-		_peer->setThemeToken(token);
-		const auto dropWallPaper = (_peer->wallPaper() != nullptr);
-		if (dropWallPaper) {
-			_peer->setWallPaper({});
-		}
-
-		if (theme) {
-			// Remember while changes propagate through event loop.
-			_controller->pushLastUsedChatTheme(theme);
-		}
-		const auto api = &_peer->session().api();
-
-		api->request(MTPmessages_SetChatWallPaper(
-			MTP_flags(0),
-			_peer->input,
-			MTPInputWallPaper(),
-			MTPWallPaperSettings(),
-			MTPint()
-		)).afterDelay(10).done([=](const MTPUpdates &result) {
-			api->applyUpdates(result);
-		}).send();
-
-		api->request(MTPmessages_SetChatTheme(
-			_peer->input,
-			((giftTheme && giftTheme->unique)
-				? MTP_inputChatThemeUniqueGift(
-					MTP_string(giftTheme->unique->slug))
-				: MTP_inputChatTheme(MTP_string(token)))
-		)).done([=](const MTPUpdates &result) {
-			api->applyUpdates(result);
-		}).send();
-
+		SetPeerTheme(_controller, _peer, token, theme);
 		_controller->toggleChooseChatTheme(_peer);
 	});
 	const auto confirmTakeGiftTheme = crl::guard(apply, [=](

From 1dc70d5a8de0146f0f3e1e48be02dc24b164280c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Aug 2025 16:29:59 +0400
Subject: [PATCH 284/341] Load gift themes while scrolling.

---
 Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp | 6 ++++++
 Telegram/SourceFiles/ui/chat/choose_theme_controller.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
index ad42cb8dc6..ee929cfb2c 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.cpp
@@ -560,6 +560,10 @@ void ChooseThemeController::updateInnerLeft(int now) {
 		? (skip / 2)
 		: std::clamp(now, skip, 0);
 	_inner->move(clamped, 0);
+	const auto visibleTill = -clamped + _content->width();
+	if (_giftsFinishAt - visibleTill < _content->width()) {
+		_peer->owner().cloudThemes().myGiftThemesLoadMore();
+	}
 }
 
 void ChooseThemeController::close() {
@@ -734,6 +738,7 @@ void ChooseThemeController::fill(
 			x += single.width() + skip;
 		};
 
+		_giftsFinishAt = 0;
 		if (const auto now = cloudThemes->themeForToken(initial)) {
 			push(*now, initial);
 		}
@@ -741,6 +746,7 @@ void ChooseThemeController::fill(
 			if (const auto found = cloudThemes->themeForToken(token)) {
 				if (token != initial) {
 					push(*found, token);
+					_giftsFinishAt = x;
 				}
 			}
 		}
diff --git a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
index 603c57839a..3a824ddcdf 100644
--- a/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
+++ b/Telegram/SourceFiles/ui/chat/choose_theme_controller.h
@@ -73,6 +73,7 @@ private:
 	std::optional<QPoint> _pressPosition;
 	std::optional<QPoint> _dragStartPosition;
 	int _dragStartInnerLeft = 0;
+	int _giftsFinishAt = 0;
 	bool _initialInnerLeftApplied = false;
 
 	rpl::variable<bool> _shouldBeShown = false;

From e792088cebe2af697d3a1d5cde0e47174d2f43be Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 29 Aug 2025 21:17:46 +0400
Subject: [PATCH 285/341] Insert gift pattern symbols in background.

---
 Telegram/SourceFiles/ui/chat/chat_theme.cpp   | 74 +++++++++++++++++--
 Telegram/SourceFiles/ui/chat/chat_theme.h     |  9 ++-
 .../window/window_session_controller.cpp      | 44 ++++++++---
 .../window/window_session_controller.h        |  1 +
 Telegram/lib_ui                               |  2 +-
 5 files changed, 113 insertions(+), 17 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index babcb94215..c745a0f180 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -7,12 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "ui/chat/chat_theme.h"
 
-#include "ui/image/image_prepare.h"
+#include "ui/color_contrast.h"
+#include "ui/emoji_config.h"
+#include "ui/painter.h"
 #include "ui/power_saving.h"
 #include "ui/ui_utility.h"
 #include "ui/chat/message_bubble.h"
 #include "ui/chat/chat_style.h"
-#include "ui/color_contrast.h"
+#include "ui/image/image_prepare.h"
+#include "ui/text/text_custom_emoji.h"
 #include "ui/style/style_core_palette.h"
 #include "ui/style/style_palette_colorizer.h"
 
@@ -53,6 +56,14 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 	return (doubled % 2) ? 0.5 : 1.;
 }
 
+[[nodiscard]] int RotationForSymbol(const QRectF &symbol) {
+	const auto a = int(base::SafeRound(symbol.x() * 255));
+	const auto b = int(base::SafeRound(symbol.y() * 255));
+	const auto value = uint16((uint16(a) << 8) | uint16(b));
+	const auto shuffled = uint16(value << 5) | uint16(value >> 3);
+	return (shuffled % 90) - 45;
+}
+
 [[nodiscard]] CacheBackgroundResult CacheBackgroundByRequest(
 		const CacheBackgroundRequest &request) {
 	Expects(!request.area.isEmpty());
@@ -83,14 +94,17 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 			QPainter p(&result);
 			if (!gradient.isNull()) {
 				if (request.background.patternOpacity >= 0.) {
-					p.setCompositionMode(QPainter::CompositionMode_SoftLight);
+					p.setCompositionMode(
+						QPainter::CompositionMode_SoftLight);
 					p.setOpacity(request.background.patternOpacity);
 				} else {
 					p.setCompositionMode(
 						QPainter::CompositionMode_DestinationIn);
 				}
 			}
-			const auto tiled = request.background.isPattern
+			const auto hasGiftSymbols = request.background.isPattern
+				&& !request.background.giftSymbols.empty();
+			auto tiled = request.background.isPattern
 				? request.background.prepared.scaled(
 					request.area.height() * ratio,
 					request.area.height() * ratio,
@@ -99,6 +113,31 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				: request.background.preparedForTiled;
 			const auto w = tiled.width() / float(ratio);
 			const auto h = tiled.height() / float(ratio);
+
+			const auto &giftSymbols = request.background.giftSymbols;
+			const auto &giftSymbolFrame = request.background.giftSymbolFrame;
+			const auto giftSymbolSize = giftSymbolFrame.size() / ratio;
+			if (hasGiftSymbols) {
+				auto q = QPainter(&tiled);
+				auto hq = PainterHighQualityEnabler(q);
+				q.setOpacity(0.8);
+				for (const auto &symbol : giftSymbols) {
+					const auto rect = QRectF(
+						symbol.x() * w,
+						symbol.y() * h,
+						symbol.width() * w,
+						symbol.height() * h);
+					q.save();
+					q.translate(rect.center());
+					q.scale(
+						rect.width() / giftSymbolSize.width(),
+						rect.height() / giftSymbolSize.height());
+					q.rotate(RotationForSymbol(symbol));
+					q.translate(-rect.center());
+					q.drawImage(rect.topLeft(), giftSymbolFrame);
+					q.restore();
+				}
+			}
 			const auto cx = int(std::ceil(request.area.width() / w));
 			const auto cy = int(std::ceil(request.area.height() / h));
 			const auto rows = cy;
@@ -111,7 +150,8 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 			const auto useshift = xshift / float(ratio);
 			for (auto y = 0; y != rows; ++y) {
 				for (auto x = 0; x != cols; ++x) {
-					p.drawImage(QPointF(useshift + x * w, y * h), tiled);
+					const auto position = QPointF(useshift + x * w, y * h);
+					p.drawImage(position, tiled);
 				}
 			}
 			if (!gradient.isNull()
@@ -1093,7 +1133,7 @@ ChatThemeBackground PrepareBackgroundImage(
 			data.path,
 			data.bytes,
 			data.gzipSvg,
-			data.findGiftSymbols)
+			!data.giftSymbolFrame.isNull())
 		: BackgroundImageFields();
 	auto prepared = needBackground
 		? PreprocessBackgroundImage(std::move(read.image))
@@ -1143,10 +1183,32 @@ ChatThemeBackground PrepareBackgroundImage(
 			: std::make_optional(data.colors.front())),
 		.colors = data.colors,
 		.giftSymbols = std::move(read.giftSymbols),
+		.giftSymbolFrame = data.giftSymbolFrame,
 		.patternOpacity = data.patternOpacity,
 		.gradientRotation = data.generateGradient ? data.gradientRotation : 0,
 		.isPattern = data.isPattern,
 	};
 }
 
+[[nodiscard]] QImage PrepareGiftSymbol(
+		const std::unique_ptr<Text::CustomEmoji> &emoji) {
+	if (!emoji || !emoji->ready()) {
+		return QImage();
+	}
+	const auto ratio = style::DevicePixelRatio();
+	const auto size = Ui::Emoji::GetSizeNormal() / ratio;
+	auto result = QImage(
+		2 * QSize(size, size) * ratio,
+		QImage::Format_ARGB32_Premultiplied);
+	result.setDevicePixelRatio(ratio);
+	result.fill(Qt::transparent);
+	auto p = QPainter(&result);
+	const auto shift = (2 * size - (Ui::Emoji::GetSizeLarge() / ratio)) / 2;
+	emoji->paint(p, {
+		.textColor = QColor(0, 0, 0),
+		.position = QPoint(shift, shift),
+	});
+	return result;
+}
+
 } // namespace Window::Theme
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index 9c1643dfbb..caa7dfb591 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -16,6 +16,10 @@ class palette;
 struct colorizer;
 } // namespace style
 
+namespace Ui::Text {
+class CustomEmoji;
+} // namespace Ui::Text
+
 namespace Ui {
 
 class ChatStyle;
@@ -30,6 +34,7 @@ struct ChatThemeBackground {
 	std::optional<QColor> colorForFill;
 	std::vector<QColor> colors;
 	std::vector<QRectF> giftSymbols;
+	QImage giftSymbolFrame;
 	float64 patternOpacity = 1.;
 	int gradientRotation = 0;
 	bool isPattern = false;
@@ -47,6 +52,7 @@ struct ChatThemeBackgroundData {
 	QString key;
 	QString path;
 	QByteArray bytes;
+	QImage giftSymbolFrame;
 	bool gzipSvg = false;
 	std::vector<QColor> colors;
 	bool isPattern = false;
@@ -55,7 +61,6 @@ struct ChatThemeBackgroundData {
 	bool isBlurred = false;
 	bool forDarkMode = false;
 	bool generateGradient = false;
-	bool findGiftSymbols = false;
 	int gradientRotation = 0;
 };
 
@@ -269,5 +274,7 @@ struct BackgroundImageFields {
 	int rotation);
 [[nodiscard]] ChatThemeBackground PrepareBackgroundImage(
 	const ChatThemeBackgroundData &data);
+[[nodiscard]] QImage PrepareGiftSymbol(
+	const std::unique_ptr<Text::CustomEmoji> &emoji);
 
 } // namespace Ui
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index e6df00af52..8546ffe054 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1505,8 +1505,8 @@ struct SessionController::CachedThemeKey {
 struct SessionController::CachedTheme {
 	std::weak_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
+	std::unique_ptr<Ui::Text::CustomEmoji> giftSymbol;
 	Data::WallPaper paper;
-	bool findGiftSymbols = false;
 	bool basedOnDark = false;
 	bool caching = false;
 	rpl::lifetime lifetime;
@@ -3296,13 +3296,20 @@ void SessionController::cacheChatTheme(
 	const auto document = use.document();
 	const auto media = document ? document->createMediaView() : nullptr;
 	const auto findGiftSymbols = (data.unique != nullptr);
+	auto giftSymbol = findGiftSymbols
+		? session().data().customEmojiManager().create(
+			data.unique->pattern.document,
+			crl::guard(this, [=] { _giftSymbolLoaded.fire({}); }),
+			Data::CustomEmojiSizeTag::Large)
+		: nullptr;
+	const auto giftSymbolReady = !giftSymbol || giftSymbol->ready();
 	use.loadDocument();
 	auto &theme = [&]() -> CachedTheme& {
 		const auto i = _customChatThemes.find(key);
 		if (i != end(_customChatThemes)) {
 			i->second.media = media;
+			i->second.giftSymbol = std::move(giftSymbol);
 			i->second.paper = use;
-			i->second.findGiftSymbols = findGiftSymbols;
 			i->second.basedOnDark = dark;
 			i->second.caching = true;
 			return i->second;
@@ -3311,8 +3318,8 @@ void SessionController::cacheChatTheme(
 			key,
 			CachedTheme{
 				.media = media,
+				.giftSymbol = std::move(giftSymbol),
 				.paper = use,
-				.findGiftSymbols = findGiftSymbols,
 				.basedOnDark = dark,
 				.caching = true,
 			}).first->second;
@@ -3341,6 +3348,9 @@ void SessionController::cacheChatTheme(
 	});
 	if (media && media->loaded(true)) {
 		theme.media = nullptr;
+		if (giftSymbolReady) {
+			theme.giftSymbol = nullptr;
+		}
 	}
 }
 
@@ -3358,15 +3368,25 @@ void SessionController::cacheChatThemeDone(
 	}
 	i->second.caching = false;
 	i->second.theme = result;
-	if (i->second.media) {
-		if (i->second.media->loaded(true)) {
+	const auto media = i->second.media.get();
+	const auto giftSymbol = i->second.giftSymbol.get();
+	if (media || giftSymbol) {
+		if ((!media || media->loaded(true))
+			&& (!giftSymbol || giftSymbol->ready())) {
 			updateCustomThemeBackground(i->second);
 		} else {
-			session().downloaderTaskFinished(
+			rpl::merge(
+				session().downloaderTaskFinished(),
+				((giftSymbol && !giftSymbol->ready())
+					? (_giftSymbolLoaded.events() | rpl::type_erased())
+					: rpl::never<rpl::empty_value>())
 			) | rpl::filter([=] {
 				const auto i = _customChatThemes.find(key);
 				Assert(i != end(_customChatThemes));
-				return !i->second.media || i->second.media->loaded(true);
+				const auto media = i->second.media.get();
+				const auto giftSymbol = i->second.giftSymbol.get();
+				return (!media || media->loaded(true))
+					&& (!giftSymbol || giftSymbol->ready());
 			}) | rpl::start_with_next([=] {
 				const auto i = _customChatThemes.find(key);
 				Assert(i != end(_customChatThemes));
@@ -3381,9 +3401,15 @@ void SessionController::updateCustomThemeBackground(CachedTheme &theme) {
 	const auto guard = gsl::finally([&] {
 		theme.lifetime.destroy();
 		theme.media = nullptr;
+		theme.giftSymbol = nullptr;
 	});
 	const auto strong = theme.theme.lock();
-	if (!theme.media || !strong || !theme.media->loaded(true)) {
+	const auto media = theme.media.get();
+	const auto giftSymbol = theme.giftSymbol.get();
+	if (!strong
+		|| (!media && !giftSymbol)
+		|| (media && !media->loaded(true))
+		|| (giftSymbol && !giftSymbol->ready())) {
 		return;
 	}
 	const auto key = strong->key();
@@ -3424,6 +3450,7 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 		.key = paper.key(),
 		.path = paperPath,
 		.bytes = paperBytes,
+		.giftSymbolFrame = Ui::PrepareGiftSymbol(theme.giftSymbol),
 		.gzipSvg = gzipSvg,
 		.colors = colors,
 		.isPattern = isPattern,
@@ -3432,7 +3459,6 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 		.isBlurred = isBlurred,
 		.forDarkMode = theme.basedOnDark,
 		.generateGradient = generateGradient,
-		.findGiftSymbols = theme.findGiftSymbols,
 		.gradientRotation = gradientRotation,
 	};
 }
diff --git a/Telegram/SourceFiles/window/window_session_controller.h b/Telegram/SourceFiles/window/window_session_controller.h
index d8597e0aab..be206dadf0 100644
--- a/Telegram/SourceFiles/window/window_session_controller.h
+++ b/Telegram/SourceFiles/window/window_session_controller.h
@@ -799,6 +799,7 @@ private:
 	const std::shared_ptr<Ui::ChatTheme> _defaultChatTheme;
 	base::flat_map<CachedThemeKey, CachedTheme> _customChatThemes;
 	rpl::event_stream<std::shared_ptr<Ui::ChatTheme>> _cachedThemesStream;
+	rpl::event_stream<> _giftSymbolLoaded;
 	const std::unique_ptr<Ui::ChatStyle> _chatStyle;
 	std::weak_ptr<Ui::ChatTheme> _chatStyleTheme;
 	std::deque<std::shared_ptr<Ui::ChatTheme>> _lastUsedCustomChatThemes;
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index c9c1f63df8..3710f80536 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit c9c1f63df8c7d6f8043ca66d8e67cc4fdb84c6c5
+Subproject commit 3710f80536352b009c5ab359210911086ead6b13

From 76cc59acab48e108398b063867a78c9d683e69c8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 30 Aug 2025 00:37:29 +0400
Subject: [PATCH 286/341] Show gift sticker in the background.

---
 Telegram/SourceFiles/ui/chat/chat_theme.cpp   | 97 +++++++++++++++----
 Telegram/SourceFiles/ui/chat/chat_theme.h     |  7 ++
 .../SourceFiles/window/section_widget.cpp     | 69 ++++++++++++-
 Telegram/SourceFiles/window/section_widget.h  |  6 +-
 .../window/window_session_controller.cpp      |  7 ++
 5 files changed, 161 insertions(+), 25 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index c745a0f180..34c7aa367a 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -61,7 +61,27 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 	const auto b = int(base::SafeRound(symbol.y() * 255));
 	const auto value = uint16((uint16(a) << 8) | uint16(b));
 	const auto shuffled = uint16(value << 5) | uint16(value >> 3);
-	return (shuffled % 90) - 45;
+	return (shuffled % 60) - 30;
+}
+
+[[nodiscard]] int ChooseGiftSymbolSkip(const std::vector<QRectF> &symbols) {
+	if (symbols.empty()) {
+		return -1;
+	}
+	auto maxIndex = -1;
+	auto maxValue = 0.;
+	for (auto i = 0, count = int(symbols.size()); i != count; ++i) {
+		const auto &symbol = symbols[i];
+		const auto center = symbol.center();
+		const auto value = std::min(center.x(), 1. - center.x())
+			* std::min(center.y(), 1. - center.y())
+			* std::min(symbol.width(), symbol.height());
+		if (maxIndex < 0 || maxValue < value) {
+			maxIndex = i;
+			maxValue = value;
+		}
+	}
+	return maxIndex;
 }
 
 [[nodiscard]] CacheBackgroundResult CacheBackgroundByRequest(
@@ -90,6 +110,8 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				Qt::IgnoreAspectRatio,
 				Qt::SmoothTransformation);
 		result.setDevicePixelRatio(ratio);
+		auto giftArea = QRect();
+		int giftRotation = 0;
 		if (!request.background.prepared.isNull()) {
 			QPainter p(&result);
 			if (!gradient.isNull()) {
@@ -115,27 +137,37 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 			const auto h = tiled.height() / float(ratio);
 
 			const auto &giftSymbols = request.background.giftSymbols;
+			const auto giftSymbolsCount = int(giftSymbols.size());
+			const auto giftSymbolSkip = ChooseGiftSymbolSkip(giftSymbols);
 			const auto &giftSymbolFrame = request.background.giftSymbolFrame;
 			const auto giftSymbolSize = giftSymbolFrame.size() / ratio;
+			const auto giftSymbolRect = [&](const QRectF &symbol) {
+				return QRectF(
+					symbol.x() * w,
+					symbol.y() * h,
+					symbol.width() * w,
+					symbol.height() * h);
+			};
+			const auto giftSymbolPaint = [&](QPainter &p, QRectF symbol) {
+				const auto rect = giftSymbolRect(symbol);
+				p.save();
+				p.translate(rect.center());
+				p.scale(
+					rect.width() / giftSymbolSize.width(),
+					rect.height() / giftSymbolSize.height());
+				p.rotate(RotationForSymbol(symbol));
+				p.translate(-rect.center());
+				p.drawImage(rect.topLeft(), giftSymbolFrame);
+				p.restore();
+			};
 			if (hasGiftSymbols) {
 				auto q = QPainter(&tiled);
 				auto hq = PainterHighQualityEnabler(q);
 				q.setOpacity(0.8);
-				for (const auto &symbol : giftSymbols) {
-					const auto rect = QRectF(
-						symbol.x() * w,
-						symbol.y() * h,
-						symbol.width() * w,
-						symbol.height() * h);
-					q.save();
-					q.translate(rect.center());
-					q.scale(
-						rect.width() / giftSymbolSize.width(),
-						rect.height() / giftSymbolSize.height());
-					q.rotate(RotationForSymbol(symbol));
-					q.translate(-rect.center());
-					q.drawImage(rect.topLeft(), giftSymbolFrame);
-					q.restore();
+				for (auto i = 0; i != giftSymbolsCount; ++i) {
+					if (i != giftSymbolSkip) {
+						giftSymbolPaint(q, giftSymbols[i]);
+					}
 				}
 			}
 			const auto cx = int(std::ceil(request.area.width() / w));
@@ -148,10 +180,33 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				? (request.area.width() * ratio - cols * tiled.width()) / 2
 				: 0;
 			const auto useshift = xshift / float(ratio);
+			const auto drawTile = [&](int x, int y) {
+				const auto position = QPointF(useshift + x * w, y * h);
+				p.drawImage(position, tiled);
+			};
+
+			// Skip a symbol in the center for the gift itself.
+			drawTile(cols / 2, 0);
+			if (hasGiftSymbols) {
+				const auto &gift = giftSymbols[giftSymbolSkip];
+				auto q = QPainter(&tiled);
+				auto hq = PainterHighQualityEnabler(q);
+				q.setOpacity(0.8);
+				giftSymbolPaint(q, gift);
+				const auto exact = giftSymbolRect(gift);
+				giftArea = QRect(
+					useshift + (cols / 2) * w + exact.x(),
+					exact.y(),
+					exact.width(),
+					exact.height());
+				giftRotation = RotationForSymbol(gift);
+			}
+
 			for (auto y = 0; y != rows; ++y) {
 				for (auto x = 0; x != cols; ++x) {
-					const auto position = QPointF(useshift + x * w, y * h);
-					p.drawImage(position, tiled);
+					if (y || x != (cols / 2)) {
+						drawTile(x, y);
+					}
 				}
 			}
 			if (!gradient.isNull()
@@ -167,6 +222,8 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				QImage::Format_ARGB32_Premultiplied),
 			.gradient = gradient,
 			.area = request.area,
+			.giftArea = giftArea,
+			.giftRotation = giftRotation,
 			.waitingForNegativePattern
 				= request.background.waitingForNegativePattern()
 		};
@@ -239,6 +296,8 @@ CachedBackground::CachedBackground(CacheBackgroundResult &&result)
 , area(result.area)
 , x(result.x)
 , y(result.y)
+, giftArea(result.giftArea)
+, giftRotation(result.giftRotation)
 , waitingForNegativePattern(result.waitingForNegativePattern) {
 }
 
@@ -456,6 +515,7 @@ void ChatTheme::updateBackgroundImageFrom(ChatThemeBackground &&background) {
 	_mutableBackground.key = background.key;
 	_mutableBackground.prepared = std::move(background.prepared);
 	_mutableBackground.giftSymbols = std::move(background.giftSymbols);
+	_mutableBackground.giftId = background.giftId;
 	_mutableBackground.preparedForTiled = std::move(
 		background.preparedForTiled);
 	if (!_backgroundState.now.pixmap.isNull()) {
@@ -1184,6 +1244,7 @@ ChatThemeBackground PrepareBackgroundImage(
 		.colors = data.colors,
 		.giftSymbols = std::move(read.giftSymbols),
 		.giftSymbolFrame = data.giftSymbolFrame,
+		.giftId = data.giftId,
 		.patternOpacity = data.patternOpacity,
 		.gradientRotation = data.generateGradient ? data.gradientRotation : 0,
 		.isPattern = data.isPattern,
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index caa7dfb591..0426455780 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -35,6 +35,7 @@ struct ChatThemeBackground {
 	std::vector<QColor> colors;
 	std::vector<QRectF> giftSymbols;
 	QImage giftSymbolFrame;
+	uint64_t giftId = 0;
 	float64 patternOpacity = 1.;
 	int gradientRotation = 0;
 	bool isPattern = false;
@@ -53,6 +54,7 @@ struct ChatThemeBackgroundData {
 	QString path;
 	QByteArray bytes;
 	QImage giftSymbolFrame;
+	uint64 giftId = 0;
 	bool gzipSvg = false;
 	std::vector<QColor> colors;
 	bool isPattern = false;
@@ -94,6 +96,8 @@ struct CacheBackgroundResult {
 	QSize area;
 	int x = 0;
 	int y = 0;
+	QRect giftArea;
+	int giftRotation = 0;
 	bool waitingForNegativePattern = false;
 };
 
@@ -108,6 +112,9 @@ struct CachedBackground {
 	QSize area;
 	int x = 0;
 	int y = 0;
+	QRect giftArea;
+	int giftRotation = 0;
+	mutable std::unique_ptr<Text::CustomEmoji> gift;
 	bool waitingForNegativePattern = false;
 };
 
diff --git a/Telegram/SourceFiles/window/section_widget.cpp b/Telegram/SourceFiles/window/section_widget.cpp
index f61134868d..36fd532c31 100644
--- a/Telegram/SourceFiles/window/section_widget.cpp
+++ b/Telegram/SourceFiles/window/section_widget.cpp
@@ -325,12 +325,33 @@ void SectionWidget::PaintBackground(
 		not_null<Ui::ChatTheme*> theme,
 		not_null<QWidget*> widget,
 		QRect clip) {
+	if (const auto id = theme->background().giftId) {
+		const auto fillHeight = controller->content()->height();
+		const auto fill = QSize(widget->width(), fillHeight);
+		const auto &state = theme->backgroundState(fill);
+		const auto make = [&] {
+			return std::make_unique<Ui::Text::LimitedLoopsEmoji>(
+				controller->session().data().customEmojiManager().create(
+					id,
+					crl::guard(widget, [=] { widget->update(); }),
+					Data::CustomEmojiSizeTag::Isolated),
+				1);
+		};
+		if (!state.was.gift) {
+			state.was.gift = make();
+		}
+		if (!state.now.gift) {
+			state.now.gift = make();
+		}
+	}
+
 	PaintBackground(
 		theme,
 		widget,
 		controller->content()->height(),
 		controller->content()->backgroundFromY(),
-		clip);
+		clip,
+		controller->isGifPausedAtLeastFor(GifPauseReason::Any));
 }
 
 void SectionWidget::PaintBackground(
@@ -338,37 +359,68 @@ void SectionWidget::PaintBackground(
 		not_null<QWidget*> widget,
 		int fillHeight,
 		int fromy,
-		QRect clip) {
+		QRect clip,
+		bool paused) {
 	auto p = QPainter(widget);
 	if (fromy) {
 		p.translate(0, fromy);
 		clip = clip.translated(0, -fromy);
 	}
-	PaintBackground(p, theme, QSize(widget->width(), fillHeight), clip);
+	const auto fill = QSize(widget->width(), fillHeight);
+	PaintBackground(p, theme, fill, clip, paused);
 }
 
 void SectionWidget::PaintBackground(
 		QPainter &p,
 		not_null<Ui::ChatTheme*> theme,
 		QSize fill,
-		QRect clip) {
+		QRect clip,
+		bool paused) {
 	const auto &background = theme->background();
 	if (background.colorForFill) {
 		p.fillRect(clip, *background.colorForFill);
 		return;
 	}
 	const auto &gradient = background.gradientForFill;
-	auto state = theme->backgroundState(fill);
+	const auto &state = theme->backgroundState(fill);
 	const auto paintCache = [&](const Ui::CachedBackground &cache) {
 		const auto to = QRect(
 			QPoint(cache.x, cache.y),
 			cache.pixmap.size() / style::DevicePixelRatio());
+		const auto paintGift = [&](QRect area) {
+			if (!cache.gift) {
+				return;
+			}
+			auto hq = PainterHighQualityEnabler(p);
+			const auto center = area.center();
+			const auto size = Data::FrameSizeFromTag(
+				Data::CustomEmojiSizeTag::Isolated
+			) / style::DevicePixelRatio();
+			p.save();
+			p.translate(center);
+			p.rotate(cache.giftRotation);
+			p.translate(-center);
+			p.setOpacity(0.5);
+			cache.gift->paint(p, {
+				.textColor = st::windowFg->c,
+				.size = QSize(size, size),
+				.now = crl::now(),
+				.scale = (area.width() / float64(size)),
+				.position = area.topLeft(),
+				.paused = paused,
+				.scaled = true,
+			});
+			p.restore();
+		};
 		if (cache.waitingForNegativePattern) {
 			// While we wait for pattern being loaded we paint just gradient.
 			// But in case of negative patter opacity we just fill-black.
 			p.fillRect(to, Qt::black);
 		} else if (cache.area == fill) {
 			p.drawPixmap(to, cache.pixmap);
+			if (background.giftId && !cache.giftArea.isEmpty()) {
+				paintGift(cache.giftArea.translated(to.topLeft()));
+			}
 		} else {
 			const auto sx = fill.width() / float64(cache.area.width());
 			const auto sy = fill.height() / float64(cache.area.height());
@@ -384,6 +436,13 @@ void SectionWidget::PaintBackground(
 				round((to.x() + to.width()) * sx) - sto.x(),
 				round((to.y() + to.height()) * sy) - sto.y(),
 				cache.pixmap);
+			if (background.giftId && !cache.giftArea.isEmpty()) {
+				paintGift(QRect(
+					(to.x() + cache.giftArea.x()) * sx,
+					(to.y() + cache.giftArea.y()) * sy,
+					cache.giftArea.width() * sx,
+					cache.giftArea.height() * sy));
+			}
 		}
 	};
 	const auto hasNow = !state.now.pixmap.isNull();
diff --git a/Telegram/SourceFiles/window/section_widget.h b/Telegram/SourceFiles/window/section_widget.h
index b1d6f41cbc..2d288810bf 100644
--- a/Telegram/SourceFiles/window/section_widget.h
+++ b/Telegram/SourceFiles/window/section_widget.h
@@ -207,12 +207,14 @@ public:
 		not_null<QWidget*> widget,
 		int fillHeight,
 		int fromy,
-		QRect clip);
+		QRect clip,
+		bool paused = false);
 	static void PaintBackground(
 		QPainter &p,
 		not_null<Ui::ChatTheme*> theme,
 		QSize fill,
-		QRect clip);
+		QRect clip,
+		bool paused = false);
 
 protected:
 	void paintEvent(QPaintEvent *e) override;
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 8546ffe054..88274ad5ec 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1506,6 +1506,7 @@ struct SessionController::CachedTheme {
 	std::weak_ptr<Ui::ChatTheme> theme;
 	std::shared_ptr<Data::DocumentMedia> media;
 	std::unique_ptr<Ui::Text::CustomEmoji> giftSymbol;
+	uint64 giftId = 0;
 	Data::WallPaper paper;
 	bool basedOnDark = false;
 	bool caching = false;
@@ -3302,6 +3303,9 @@ void SessionController::cacheChatTheme(
 			crl::guard(this, [=] { _giftSymbolLoaded.fire({}); }),
 			Data::CustomEmojiSizeTag::Large)
 		: nullptr;
+	const auto giftId = findGiftSymbols
+		? data.unique->model.document->id
+		: uint64();
 	const auto giftSymbolReady = !giftSymbol || giftSymbol->ready();
 	use.loadDocument();
 	auto &theme = [&]() -> CachedTheme& {
@@ -3309,6 +3313,7 @@ void SessionController::cacheChatTheme(
 		if (i != end(_customChatThemes)) {
 			i->second.media = media;
 			i->second.giftSymbol = std::move(giftSymbol);
+			i->second.giftId = giftId;
 			i->second.paper = use;
 			i->second.basedOnDark = dark;
 			i->second.caching = true;
@@ -3319,6 +3324,7 @@ void SessionController::cacheChatTheme(
 			CachedTheme{
 				.media = media,
 				.giftSymbol = std::move(giftSymbol),
+				.giftId = giftId,
 				.paper = use,
 				.basedOnDark = dark,
 				.caching = true,
@@ -3451,6 +3457,7 @@ Ui::ChatThemeBackgroundData SessionController::backgroundData(
 		.path = paperPath,
 		.bytes = paperBytes,
 		.giftSymbolFrame = Ui::PrepareGiftSymbol(theme.giftSymbol),
+		.giftId = theme.giftId,
 		.gzipSvg = gzipSvg,
 		.colors = colors,
 		.isPattern = isPattern,

From 5b0fc5b97bf3a4ff24ed70aca6c6b2a23ec4b38d Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 20:53:24 +0400
Subject: [PATCH 287/341] Fix build with Xcode.

---
 Telegram/SourceFiles/boxes/star_gift_box.cpp                 | 5 ++---
 .../SourceFiles/info/channel_statistics/earn/earn_icons.cpp  | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 4d1d16f1c9..96fa9205fa 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2094,12 +2094,12 @@ void ShowUpgradeGiftedToast(
 	if (const auto strong = weak.get()) {
 		strong->showToast({
 			.title = tr::lng_gift_upgrade_gifted_title(tr::now),
-			.text = (peer->isBroadcast()
+			.text = { (peer->isBroadcast()
 				? tr::lng_gift_upgrade_gifted_about_channel
 				: tr::lng_gift_upgrade_gifted_about)(
 					tr::now,
 					lt_name,
-					peer->shortName()),
+					peer->shortName()) },
 			.duration = kUpgradeDoneToastDuration,
 		});
 	}
@@ -2204,7 +2204,6 @@ void GiftUpgrade(
 		}
 		done(result);
 	};
-	using Flag = MTPDinputInvoiceStarGiftUpgrade::Flag;
 	RequestStarsFormAndSubmit(
 		window->uiShow(),
 		MTP_inputInvoiceStarGiftPrepaidUpgrade(
diff --git a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
index 80bfdc845c..a398532737 100644
--- a/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
+++ b/Telegram/SourceFiles/info/channel_statistics/earn/earn_icons.cpp
@@ -160,7 +160,7 @@ Ui::Text::PaletteDependentEmoji IconCreditsEmoji(
 				: st::defaultTableLabel.style.font->height),
 			1);
 	}, .margin = descriptor.margin.value_or(
-		{ 0, st::giftBoxByStarsSkip, 0, 0 }) };
+		QMargins{ 0, st::giftBoxByStarsSkip, 0, 0 }) };
 }
 
 Ui::Text::PaletteDependentEmoji IconCurrencyEmoji(

From 8859e352f9515f261e2122602ac35185f47ddb43 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 22:06:04 +0400
Subject: [PATCH 288/341] Fix crash with widget double delete.

---
 Telegram/SourceFiles/dialogs/dialogs_widget.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h
index ab4685101f..faf7b89370 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h
@@ -331,7 +331,7 @@ private:
 
 	base::unique_qptr<Ui::RpWidget> _chatFilters;
 
-	Ui::SlideWrap<Ui::RpWidget> *_topBarSuggestion = nullptr;
+	QPointer<Ui::SlideWrap<Ui::RpWidget>> _topBarSuggestion;
 	rpl::event_stream<int> _topBarSuggestionHeightChanged;
 	rpl::event_stream<bool> _searchStateForTopBarSuggestion;
 	rpl::event_stream<bool> _openedFolderOrForumChanges;

From 881d73d4ab445d8f96da88e32efbb4f8cf6a9b45 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 22:17:17 +0400
Subject: [PATCH 289/341] Fix build with MSVC.

---
 Telegram/SourceFiles/boxes/about_sponsored_box.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
index 1603820ff1..e4e3515c04 100644
--- a/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_sponsored_box.cpp
@@ -64,8 +64,7 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 			return Ui::Text::Link(text, url);
 		}),
 		Ui::Text::RichLangValue);
-	const auto info1 = box->addRow(
-		object_ptr<FlatLabel>(box, std::move(text1), stLabel));
+	box->addRow(object_ptr<FlatLabel>(box, std::move(text1), stLabel));
 
 	box->addSkip(st::sponsoredUrlButtonSkip);
 	addUrl();

From b016be6eb5d51bfb3f523ffe07c3275c289cf9e9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 22:18:05 +0400
Subject: [PATCH 290/341] Fix emoji repaint crashing.

---
 .../SourceFiles/window/window_session_controller.cpp  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 88274ad5ec..06b11a7ffe 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -3297,10 +3297,19 @@ void SessionController::cacheChatTheme(
 	const auto document = use.document();
 	const auto media = document ? document->createMediaView() : nullptr;
 	const auto findGiftSymbols = (data.unique != nullptr);
+	const auto reportSymbolLoaded = [weak = base::make_weak(this)] {
+		// We must notify async here, because we destroy emoji in
+		// the handler and we can't destroy emoji in repaint callback.
+		crl::on_main([weak] {
+			if (const auto strong = weak.get()) {
+				strong->_giftSymbolLoaded.fire({});
+			}
+		});
+	};
 	auto giftSymbol = findGiftSymbols
 		? session().data().customEmojiManager().create(
 			data.unique->pattern.document,
-			crl::guard(this, [=] { _giftSymbolLoaded.fire({}); }),
+			reportSymbolLoaded,
 			Data::CustomEmojiSizeTag::Large)
 		: nullptr;
 	const auto giftId = findGiftSymbols

From cc4b768f546e9c91ddba1c9a832038b2d0a02e64 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 23:04:49 +0400
Subject: [PATCH 291/341] Implement nice gift theme message layout.

---
 .../SourceFiles/data/data_media_types.cpp     |   6 +-
 Telegram/SourceFiles/data/data_media_types.h  |   1 +
 Telegram/SourceFiles/history/history_item.cpp |  14 ++
 .../media/history_view_theme_document.cpp     | 172 ++++++++++++++++++
 .../view/media/history_view_theme_document.h  |  46 +++++
 Telegram/SourceFiles/ui/chat/chat.style       |   2 +
 6 files changed, 240 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/data/data_media_types.cpp b/Telegram/SourceFiles/data/data_media_types.cpp
index bef2e57e1c..6f1001b20c 100644
--- a/Telegram/SourceFiles/data/data_media_types.cpp
+++ b/Telegram/SourceFiles/data/data_media_types.cpp
@@ -2585,7 +2585,11 @@ std::unique_ptr<HistoryView::Media> MediaGiftBox::createView(
 		not_null<HistoryView::Element*> message,
 		not_null<HistoryItem*> realParent,
 		HistoryView::Element *replacing) {
-	if (const auto &unique = _data.unique) {
+	if (_data.type == GiftType::ChatTheme) {
+		return std::make_unique<HistoryView::ServiceBox>(
+			message,
+			std::make_unique<HistoryView::GiftThemeBox>(message, this));
+	} else if (const auto &unique = _data.unique) {
 		return std::make_unique<HistoryView::MediaGeneric>(
 			message,
 			HistoryView::GenerateUniqueGiftMedia(message, replacing, unique),
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index a05ddd96cd..c793bb1234 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -138,6 +138,7 @@ enum class GiftType : uchar {
 	Credits, // count - credits
 	Ton, // count - nano tons
 	StarGift, // count - stars
+	ChatTheme,
 };
 
 struct GiftCode {
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 66d6317374..3d6de77155 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -6410,6 +6410,20 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 					data.is_for_both());
 			}
 		}
+	}, [&](const MTPDmessageActionSetChatTheme &data) {
+		data.vtheme().match([](const MTPDchatTheme &) {
+		}, [&](const MTPDchatThemeUniqueGift &data) {
+			const auto session = &history()->session();
+			if (const auto gift = Api::FromTL(session, data.vgift())) {
+				_media = std::make_unique<Data::MediaGiftBox>(
+					this,
+					_from,
+					Data::GiftCode{
+						.unique = gift->unique,
+						.type = Data::GiftType::ChatTheme,
+					});
+			}
+		}, [](const MTPDchatTheme &) {});
 	}, [&](const MTPDmessageActionGiftCode &data) {
 		const auto boostedId = data.vboost_peer()
 			? peerToChannel(peerFromMTP(*data.vboost_peer()))
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
index 16ca49083b..84add9cfb5 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.cpp
@@ -9,11 +9,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "apiwrap.h"
 #include "boxes/background_preview_box.h"
+#include "boxes/star_gift_box.h"
 #include "history/history.h"
 #include "history/history_item.h"
 #include "history/view/history_view_element.h"
 #include "history/view/history_view_cursor_state.h"
 #include "history/view/media/history_view_sticker_player_abstract.h"
+#include "data/stickers/data_custom_emoji.h"
 #include "data/data_changes.h"
 #include "data/data_document.h"
 #include "data/data_session.h"
@@ -27,6 +29,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "main/main_session.h"
 #include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
 #include "ui/boxes/confirm_box.h"
 #include "ui/chat/chat_style.h"
 #include "ui/chat/chat_theme.h"
@@ -37,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_session_controller.h"
 #include "window/themes/window_theme.h"
 #include "styles/style_chat.h"
+#include "styles/style_credits.h"
 
 namespace HistoryView {
 namespace {
@@ -605,4 +609,172 @@ void ThemeDocumentBox::unloadHeavyPart() {
 	}
 }
 
+GiftThemeBox::GiftThemeBox(
+	not_null<Element*> parent,
+	not_null<Data::MediaGiftBox*> gift)
+: _parent(parent)
+, _data(*gift->gift()) {
+}
+
+GiftThemeBox::~GiftThemeBox() = default;
+
+int GiftThemeBox::top() {
+	return st::msgServiceStarGiftStickerTop;
+}
+
+int GiftThemeBox::width() {
+	return _data.stargiftReleasedBy
+		? st::msgServiceStarGiftByWidth
+		: st::msgServiceStarGiftBoxWidth;
+}
+
+QSize GiftThemeBox::size() {
+	return QSize(
+		st::msgServiceGiftThemeStickerSize,
+		st::msgServiceGiftThemeStickerSize).grownBy(
+			st::msgServiceGiftThemeStickerPadding);
+}
+
+TextWithEntities GiftThemeBox::title() {
+	return {};
+}
+
+TextWithEntities GiftThemeBox::subtitle() {
+	const auto giftName = Ui::Text::Bold(
+		Data::UniqueGiftName(*_data.unique));
+	if (_parent->data()->out()) {
+		return tr::lng_action_you_gift_theme_changed(
+			tr::now,
+			lt_name,
+			giftName,
+			Ui::Text::WithEntities);
+	} else {
+		return tr::lng_action_gift_theme_changed(
+			tr::now,
+			lt_from,
+			Ui::Text::Bold(_parent->data()->from()->shortName()),
+			lt_name,
+			giftName,
+			Ui::Text::WithEntities);
+	}
+	return _parent->data()->originalText();
+}
+
+rpl::producer<QString> GiftThemeBox::button() {
+	return tr::lng_sticker_premium_view();
+}
+
+ClickHandlerPtr GiftThemeBox::createViewLink() {
+	return std::make_shared<UrlClickHandler>(
+		u"tg://nft?slug="_q + _data.unique->slug);
+}
+
+int GiftThemeBox::buttonSkip() {
+	return st::msgServiceGiftBoxButtonMargins.top();
+}
+
+void GiftThemeBox::cacheUniqueBackground(int width, int height) {
+	if (!_patternEmoji) {
+		const auto session = &_parent->data()->history()->session();
+		_patternEmoji = session->data().customEmojiManager().create(
+			_data.unique->pattern.document,
+			[=] { _parent->repaint(); },
+			Data::CustomEmojiSizeTag::Large);
+		[[maybe_unused]] const auto preload = _patternEmoji->ready();
+	}
+	const auto inner = QRect(0, 0, width, height);
+	const auto ratio = style::DevicePixelRatio();
+	if (_backgroundCache.size() != inner.size() * ratio) {
+		_backgroundCache = QImage(
+			inner.size() * ratio,
+			QImage::Format_ARGB32_Premultiplied);
+		_backgroundCache.fill(Qt::transparent);
+		_backgroundCache.setDevicePixelRatio(ratio);
+
+		const auto radius = st::giftBoxGiftRadius;
+		auto p = QPainter(&_backgroundCache);
+		auto hq = PainterHighQualityEnabler(p);
+		auto gradient = QRadialGradient(inner.center(), inner.width() / 2);
+		gradient.setStops({
+			{ 0., _data.unique->backdrop.centerColor },
+			{ 1., _data.unique->backdrop.edgeColor },
+		});
+		p.setBrush(gradient);
+		p.setPen(Qt::NoPen);
+		p.drawRoundedRect(inner, radius, radius);
+		_backroundPatterned = false;
+	}
+	if (!_backroundPatterned && _patternEmoji->ready()) {
+		_backroundPatterned = true;
+		auto p = QPainter(&_backgroundCache);
+		p.setClipRect(inner);
+		const auto skip = inner.width() / 3;
+		Ui::PaintPoints(
+			p,
+			Ui::PatternPointsSmall(),
+			_patternCache,
+			_patternEmoji.get(),
+			*_data.unique,
+			QRect(-skip, 0, inner.width() + 2 * skip, inner.height()));
+	}
+}
+
+void GiftThemeBox::draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) {
+	cacheUniqueBackground(geometry.width(), geometry.height());
+	p.drawImage(geometry.topLeft(), _backgroundCache);
+
+	if (_sticker) {
+		_sticker->draw(
+			p,
+			context,
+			geometry.marginsRemoved(st::msgServiceGiftThemeStickerPadding));
+	} else {
+		ensureStickerCreated();
+	}
+}
+
+bool GiftThemeBox::hideServiceText() {
+	return true;
+}
+
+void GiftThemeBox::stickerClearLoopPlayed() {
+	if (_sticker) {
+		_sticker->stickerClearLoopPlayed();
+	}
+}
+
+std::unique_ptr<StickerPlayer> GiftThemeBox::stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) {
+	return _sticker
+		? _sticker->stickerTakePlayer(data, replacements)
+		: nullptr;
+}
+
+bool GiftThemeBox::hasHeavyPart() {
+	return (_sticker ? _sticker->hasHeavyPart() : false);
+}
+
+void GiftThemeBox::unloadHeavyPart() {
+	if (_sticker) {
+		_sticker->unloadHeavyPart();
+	}
+}
+
+void GiftThemeBox::ensureStickerCreated() const {
+	if (_sticker) {
+		return;
+	}
+	const auto document = _data.unique->model.document;
+	const auto sticker = document->sticker();
+	Assert(sticker != nullptr);
+	_sticker.emplace(_parent, document, false, _parent);
+	_sticker->setPlayingOnce(true);
+	_sticker->initSize(st::msgServiceGiftThemeStickerSize);
+	_parent->repaint();
+}
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
index 2c7d515d9e..d2f4079c30 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
+++ b/Telegram/SourceFiles/history/view/media/history_view_theme_document.h
@@ -9,12 +9,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "history/view/media/history_view_file.h"
 #include "history/view/media/history_view_service_box.h"
+#include "history/view/media/history_view_sticker.h"
 
 class Image;
 
 namespace Data {
 class DocumentMedia;
 class WallPaper;
+class MediaGiftBox;
+struct GiftCode;
 } // namespace Data
 
 namespace HistoryView {
@@ -128,4 +131,47 @@ private:
 
 };
 
+class GiftThemeBox final : public ServiceBoxContent {
+public:
+	GiftThemeBox(
+		not_null<Element*> parent,
+		not_null<Data::MediaGiftBox*> gift);
+	~GiftThemeBox();
+
+	int top() override;
+	int width() override;
+	QSize size() override;
+	TextWithEntities title() override;
+	TextWithEntities subtitle() override;
+	rpl::producer<QString> button() override;
+	int buttonSkip() override;
+	void draw(
+		Painter &p,
+		const PaintContext &context,
+		const QRect &geometry) override;
+	ClickHandlerPtr createViewLink() override;
+
+	bool hideServiceText() override;
+	void stickerClearLoopPlayed() override;
+	std::unique_ptr<StickerPlayer> stickerTakePlayer(
+		not_null<DocumentData*> data,
+		const Lottie::ColorReplacements *replacements) override;
+
+	bool hasHeavyPart() override;
+	void unloadHeavyPart() override;
+
+private:
+	void ensureStickerCreated() const;
+	void cacheUniqueBackground(int width, int height);
+
+	const not_null<Element*> _parent;
+	const Data::GiftCode &_data;
+	std::unique_ptr<Ui::Text::CustomEmoji> _patternEmoji;
+	QImage _backgroundCache;
+	base::flat_map<float64, QImage> _patternCache;
+	bool _backroundPatterned = false;
+	mutable std::optional<Sticker> _sticker;
+
+};
+
 } // namespace HistoryView
diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style
index 8f1373b45b..c6e969af25 100644
--- a/Telegram/SourceFiles/ui/chat/chat.style
+++ b/Telegram/SourceFiles/ui/chat/chat.style
@@ -948,6 +948,8 @@ msgServiceStarGiftBoxWidth: 224px;
 msgServiceStarGiftByWidth: 272px;
 msgServiceStarGiftStickerTop: 24px;
 msgServiceStarGiftStickerSize: 100px;
+msgServiceGiftThemeStickerSize: 64px;
+msgServiceGiftThemeStickerPadding: margins(18px, 18px, 18px, 18px);
 
 historySponsorInfoItem: FlatLabel(defaultFlatLabel) {
 	style: TextStyle(defaultTextStyle) {

From 51a58182eeb9af1e7e773214272f974f6c6445c4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 23:19:02 +0400
Subject: [PATCH 292/341] Use saved music as is for now.

---
 .../SourceFiles/info/saved/info_saved_music_provider.cpp    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
index ef8378b139..144057caaf 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -353,7 +353,7 @@ HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {
 	//	}
 	}
 
-	auto nearestId = (HistoryItem*)nullptr; AssertIsDebug();
+	auto nearestId = (HistoryItem*)nullptr; //AssertIsDebug();
 	//for (auto i = 0; i != _slice.size(); ++i) {
 	//	if (!nearestId
 	//		|| std::abs(*nearestId - state.position)
@@ -375,7 +375,7 @@ void MusicProvider::saveState(
 		not_null<Media::Memento*> memento,
 		ListScrollTopState scrollState) {
 	if (_aroundId != nullptr && scrollState.item) {
-		AssertIsDebug();
+		//AssertIsDebug();
 		//memento->setAroundId({ _peer->id, StoryIdToMsgId(_aroundId) });
 		//memento->setIdsLimit(_idsLimit);
 		//memento->setScrollTopItem(scrollState.item->globalId());
@@ -391,7 +391,7 @@ void MusicProvider::restoreState(
 		const auto wasAroundId = memento->aroundId();
 		if (wasAroundId.peer == _peer->id) {
 			_idsLimit = limit;
-			AssertIsDebug();
+			//AssertIsDebug();
 			//_aroundId = StoryIdFromMsgId(wasAroundId.msg);
 			restoreScrollState({
 				.position = memento->scrollTopItemPosition(),

From a37528b377dd18d9352a2deddb4201ae0ac3e05c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 23:34:20 +0400
Subject: [PATCH 293/341] Fix crash in premium preview.

---
 Telegram/SourceFiles/ui/effects/premium_bubble.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
index 460da991ce..beb3ff357b 100644
--- a/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
+++ b/Telegram/SourceFiles/ui/effects/premium_bubble.cpp
@@ -64,7 +64,9 @@ Bubble::Bubble(
 	const auto texts = _textFactory(0);
 	_numberAnimation.setText(texts.counter, 0);
 	_numberAnimation.finishAnimating();
-	_additional.setText(_st.additionalStyle, texts.additional);
+	if (!texts.additional.isEmpty()) {
+		_additional.setText(_st.additionalStyle, texts.additional);
+	}
 }
 
 crl::time Bubble::SlideNoDeflectionDuration() {
@@ -120,7 +122,9 @@ void Bubble::setCounter(int value) {
 		_counter = value;
 		const auto texts = _textFactory(value);
 		_numberAnimation.setText(texts.counter, value);
-		_additional.setText(_st.additionalStyle, texts.additional);
+		if (!texts.additional.isEmpty()) {
+			_additional.setText(_st.additionalStyle, texts.additional);
+		}
 	}
 }
 

From 87f873c8b6290f67b2fa1cc20afd0576ab6f9846 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sun, 31 Aug 2025 23:07:30 +0400
Subject: [PATCH 294/341] Version 6.1.

- Music on Profiles.
- Gift Themes.
- Gift Value Information.
- Upgrading Gifts for Other Users.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml |  2 +-
 Telegram/Resources/winrc/Telegram.rc         |  8 ++++----
 Telegram/Resources/winrc/Updater.rc          |  8 ++++----
 Telegram/SourceFiles/core/version.h          |  6 +++---
 Telegram/build/version                       | 12 ++++++------
 changelog.txt                                |  7 +++++++
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index ccd26ab448..bacf3108f4 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.0.3.0" />
+    Version="6.1.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 0c4b76c874..758d14ccb7 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,3,0
- PRODUCTVERSION 6,0,3,0
+ FILEVERSION 6,1,0,0
+ PRODUCTVERSION 6,1,0,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.0.3.0"
+            VALUE "FileVersion", "6.1.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.3.0"
+            VALUE "ProductVersion", "6.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index d26bfffd6c..401f4766c9 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,3,0
- PRODUCTVERSION 6,0,3,0
+ FILEVERSION 6,1,0,0
+ PRODUCTVERSION 6,1,0,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.0.3.0"
+            VALUE "FileVersion", "6.1.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.0.3.0"
+            VALUE "ProductVersion", "6.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 329078f2c4..d9f4ae0c03 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6000003;
-constexpr auto AppVersionStr = "6.0.3";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 6001000;
+constexpr auto AppVersionStr = "6.1";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 04a1268f87..f2821dc03e 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6000003
-AppVersionStrMajor 6.0
-AppVersionStrSmall 6.0.3
-AppVersionStr      6.0.3
-BetaChannel        1
+AppVersion         6001000
+AppVersionStrMajor 6.1
+AppVersionStrSmall 6.1
+AppVersionStr      6.1.0
+BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 6.0.3.beta
+AppVersionOriginal 6.1
diff --git a/changelog.txt b/changelog.txt
index f4a64a77d5..7741259fac 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+6.1 (31.08.25)
+
+- Music on Profiles.
+- Gift Themes.
+- Gift Value Information.
+- Upgrading Gifts for Other Users.
+
 6.0.3 beta (22.08.25)
 
 - Ctrl+Tab / Ctrl+Shift+Tab for last opened chats switching.

From cb51238bfc9448a3819f396e6f7cd01da6125c35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 31 Aug 2025 20:07:02 +0000
Subject: [PATCH 295/341] Bump actions/checkout from 4 to 5

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/docker.yml       | 2 +-
 .github/workflows/linux.yml        | 2 +-
 .github/workflows/mac.yml          | 2 +-
 .github/workflows/mac_packaged.yml | 2 +-
 .github/workflows/snap.yml         | 2 +-
 .github/workflows/win.yml          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8c04e71228..24fbcb9080 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index ae23948629..9a70f1c35d 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -59,7 +59,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
 
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 395d430ca5..a66ff7e64b 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -56,7 +56,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml
index ddef1c7523..8749a59999 100644
--- a/.github/workflows/mac_packaged.yml
+++ b/.github/workflows/mac_packaged.yml
@@ -60,7 +60,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: ${{ env.REPO_NAME }}
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c67734a1f8..c0a96529b5 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -47,7 +47,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           submodules: recursive
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index ef9360f809..d42f42fead 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -72,7 +72,7 @@ jobs:
         run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV
 
       - name: Clone.
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: ${{ env.TBUILD }}\${{ env.REPO_NAME }}

From c78262be9125e2ad0b2d23efe68e7074b820eef9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 22:56:17 +0000
Subject: [PATCH 296/341] Bump endersonmenezes/free-disk-space from 2.1.0 to
 2.1.1

Bumps [endersonmenezes/free-disk-space](https://github.com/endersonmenezes/free-disk-space) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/endersonmenezes/free-disk-space/releases)
- [Commits](https://github.com/endersonmenezes/free-disk-space/compare/dd13eb48e709830a7ec4e50692e841be6b400d90...713d134e243b926eba4a5cce0cf608bfd1efb89a)

---
updated-dependencies:
- dependency-name: endersonmenezes/free-disk-space
  dependency-version: 2.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/snap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index c0a96529b5..dedfc0c76e 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -61,7 +61,7 @@ jobs:
           sudo lxd waitready
 
       - name: Free up some disk space.
-        uses: endersonmenezes/free-disk-space@dd13eb48e709830a7ec4e50692e841be6b400d90
+        uses: endersonmenezes/free-disk-space@713d134e243b926eba4a5cce0cf608bfd1efb89a
         with:
           remove_android: true
           remove_dotnet: true

From 8f65a7ac197ec87685f082c63163265d7309e34e Mon Sep 17 00:00:00 2001
From: GitHub Action <action@github.com>
Date: Mon, 1 Sep 2025 00:40:13 +0000
Subject: [PATCH 297/341] Update User-Agent for DNS to Chrome 139.0.0.0.

---
 .../SourceFiles/mtproto/details/mtproto_domain_resolver.cpp     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
index 3b2029b544..bd8dddb55c 100644
--- a/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
+++ b/Telegram/SourceFiles/mtproto/details/mtproto_domain_resolver.cpp
@@ -65,7 +65,7 @@ QByteArray DnsUserAgent() {
 	static const auto kResult = QByteArray(
 		"Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
 		"AppleWebKit/537.36 (KHTML, like Gecko) "
-		"Chrome/138.0.0.0 Safari/537.36");
+		"Chrome/139.0.0.0 Safari/537.36");
 	return kResult;
 }
 

From 84c70a090528a3f0275c5aba83845a31d7049816 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Aug 2025 15:53:14 +0400
Subject: [PATCH 298/341] Suggest upgrading next gift.

---
 Telegram/Resources/langs/lang.strings                       | 1 -
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 4a70bd8e5c..3122dbc298 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3669,7 +3669,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_unique_upgrade" = "Upgrade";
 "lng_gift_unique_upgrade_next" = "Upgrade Next Gift";
 "lng_gift_unique_gift_upgrade" = "Gift an Upgrade";
-"lng_gift_unique_gift_pay_upgrade" = "Pay {amount} for Upgrade";
 "lng_gift_unique_number" = "Collectible #{index}";
 "lng_gift_unique_number_by" = "Collectible #{index} by {name}";
 "lng_gift_unique_model" = "Model";
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index ad337fc840..291110acf4 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2095,6 +2095,9 @@ void GenericCreditsEntryBox(
 	const auto toRejoin = (s.cancelled || s.expired)
 		&& rejoinBySlug
 		&& !s.cancelledByBot;
+	//const auto suggestUpgradeNext = uniqueGift
+	//	&& canToggle
+	//	&& e.savedToProfile;
 	auto confirmText = rpl::conditional(
 		state->confirmButtonBusy.value(),
 		rpl::single(QString()),

From d63f3b6da120cf7c9f76add64c3c75452aecd714 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Aug 2025 10:41:49 +0400
Subject: [PATCH 299/341] Fix ctrl+tab/ctrl+shift+tab as overriden shortcuts.

---
 Telegram/SourceFiles/core/shortcuts.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 87a186b48d..34d5457f10 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -834,18 +834,16 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 			? Qt::MetaModifier
 			: Qt::ControlModifier;
 
-		if (Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)
-			&& Data.handles(QKeySequence(ctrl | Qt::Key_Tab))
-			&& Data.handles(QKeySequence(ctrl | Qt::Key_Backtab))) {
+		if (Data.handles(QKeySequence(ctrl | Qt::Key_Tab))
+			&& (Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Backtab)
+				|| Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)
+				|| Data.handles(QKeySequence(ctrl | Qt::Key_Backtab)))) {
 			return false;
 		} else if (key == Qt::Key_Control || key == Qt::Key_Meta) {
 			ChatSwitchModifier = key;
 		} else if (key == Qt::Key_Tab || key == Qt::Key_Backtab) {
 			const auto modifiers = event->modifiers();
 			if (modifiers & ctrl) {
-				if (Data.handles(modifiers | key)) {
-					return false;
-				}
 				if (ChatSwitchModifier == Qt::Key()) {
 					ChatSwitchModifier = Platform::IsMac()
 						? Qt::Key_Meta
@@ -854,6 +852,18 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 				const auto action = (modifiers & Qt::ShiftModifier)
 					? Qt::Key_Backtab
 					: key;
+				if (Data.handles(modifiers | key)) {
+					return false;
+				} else if (action == Qt::Key_Tab
+					&& Data.handles(QKeySequence(ctrl | Qt::Key_Tab))) {
+					return false;
+				} else if (action == Qt::Key_Backtab
+					&& Data.handles(QKeySequence(ctrl | Qt::Key_Backtab))) {
+					return false;
+				} else if (action == Qt::Key_Backtab
+					&& Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)) {
+					return false;
+				}
 				const auto started = !std::exchange(ChatSwitchStarted, true);
 				ChatSwitchStream.fire({
 					.action = action,

From 4ad12b686257610c3fd76b84841cf0d4e180580c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Aug 2025 11:17:36 +0400
Subject: [PATCH 300/341] Fix alignment of webview crashed error.

---
 Telegram/SourceFiles/iv/iv_controller.cpp     | 20 +++++++++++++------
 .../payments/ui/payments_panel.cpp            | 17 ++++++++++++----
 .../ui/chat/attach/attach_bot_webview.cpp     | 17 ++++++++++++----
 3 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index 2b436d842c..c73b063294 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -903,10 +903,12 @@ void Controller::showWebviewError() {
 }
 
 void Controller::showWebviewError(TextWithEntities text) {
-	auto error = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
-		_container,
+	const auto wrap = Ui::CreateChild<Ui::RpWidget>(_container);
+
+	const auto error = Ui::CreateChild<Ui::PaddingWrap<Ui::FlatLabel>>(
+		wrap,
 		object_ptr<Ui::FlatLabel>(
-			_container,
+			wrap,
 			rpl::single(text),
 			st::paymentsCriticalError),
 		st::paymentsCriticalErrorPadding);
@@ -920,10 +922,16 @@ void Controller::showWebviewError(TextWithEntities text) {
 		File::OpenUrl(entity.data);
 		return false;
 	});
-	error->show();
+	wrap->show();
+
+	wrap->widthValue() | rpl::start_with_next([=](int width) {
+		error->resizeToWidth(width);
+		wrap->resize(width, error->height());
+	}, wrap->lifetime());
+
 	_container->sizeValue() | rpl::start_with_next([=](QSize size) {
-		error->setGeometry(0, 0, size.width(), size.height() * 2 / 3);
-	}, error->lifetime());
+		wrap->setGeometry(0, 0, size.width(), size.height() * 2 / 3);
+	}, wrap->lifetime());
 }
 
 void Controller::showInWindow(
diff --git a/Telegram/SourceFiles/payments/ui/payments_panel.cpp b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
index b0e1bcc0cb..6e7f049bc1 100644
--- a/Telegram/SourceFiles/payments/ui/payments_panel.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_panel.cpp
@@ -881,10 +881,13 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 	_progress = nullptr;
 	_webviewProgress = false;
 	if (!_weakFormSummary || !_weakFormSummary->showCriticalError(text)) {
-		auto error = base::make_unique_q<PaddingWrap<FlatLabel>>(
-			_widget.get(),
+		auto wrap = base::make_unique_q<RpWidget>(_widget.get());
+		const auto raw = wrap.get();
+
+		const auto error = CreateChild<PaddingWrap<FlatLabel>>(
+			raw,
 			object_ptr<FlatLabel>(
-				_widget.get(),
+				raw,
 				rpl::single(text),
 				st::paymentsCriticalError),
 			st::paymentsCriticalErrorPadding);
@@ -898,7 +901,13 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 			_delegate->panelOpenUrl(entity.data);
 			return false;
 		});
-		_widget->showInner(std::move(error));
+
+		raw->widthValue() | rpl::start_with_next([=](int width) {
+			error->resizeToWidth(width);
+			raw->resize(width, error->height());
+		}, raw->lifetime());
+
+		_widget->showInner(std::move(wrap));
 	}
 }
 
diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
index 525bc4eb05..5bc6481e86 100644
--- a/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
+++ b/Telegram/SourceFiles/ui/chat/attach/attach_bot_webview.cpp
@@ -2014,10 +2014,13 @@ void Panel::hideLayer(anim::type animated) {
 void Panel::showCriticalError(const TextWithEntities &text) {
 	_progress = nullptr;
 	_webviewProgress = false;
-	auto error = base::make_unique_q<PaddingWrap<FlatLabel>>(
-		_widget.get(),
+	auto wrap = base::make_unique_q<RpWidget>(_widget.get());
+	const auto raw = wrap.get();
+
+	const auto error = CreateChild<PaddingWrap<FlatLabel>>(
+		raw,
 		object_ptr<FlatLabel>(
-			_widget.get(),
+			raw,
 			rpl::single(text),
 			st::paymentsCriticalError),
 		st::paymentsCriticalErrorPadding);
@@ -2031,7 +2034,13 @@ void Panel::showCriticalError(const TextWithEntities &text) {
 		File::OpenUrl(entity.data);
 		return false;
 	});
-	_widget->showInner(std::move(error));
+
+	raw->widthValue() | rpl::start_with_next([=](int width) {
+		error->resizeToWidth(width);
+		raw->resize(width, error->height());
+	}, raw->lifetime());
+
+	_widget->showInner(std::move(wrap));
 }
 
 void Panel::updateThemeParams(const Webview::ThemeParams &params) {

From edc70e9acbc17925ae4d3f08bc8f78007ff05118 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Aug 2025 12:23:05 +0400
Subject: [PATCH 301/341] Improve phrases for currency switching.

---
 Telegram/Resources/langs/lang.strings        |  3 ++-
 Telegram/SourceFiles/boxes/star_gift_box.cpp | 11 ++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3122dbc298..3d7169c2b9 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -3847,7 +3847,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_gift_resale_symbol" = "Symbol";
 "lng_gift_resale_symbols#one" = "{count} Symbol";
 "lng_gift_resale_symbols#other" = "{count} Symbols";
-"lng_gift_resale_switch_to" = "Switch to {currency}";
+"lng_gift_resale_switch_to_ton" = "Switch to Ton";
+"lng_gift_resale_switch_to_stars" = "Switch to Stars";
 "lng_gift_resale_early" = "You will be able to resell this gift in {duration}.";
 "lng_gift_transfer_early" = "You will be able to transfer this gift in {duration}.";
 "lng_gift_resale_transfer_early_title" = "Try Later";
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 96fa9205fa..7d37a999c2 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -3375,13 +3375,10 @@ void GiftResaleBox(
 		state->ton = !state->ton.current();
 		state->updated.fire({});
 	});
-	currency->setText(tr::lng_gift_resale_switch_to(
-		lt_currency,
-		rpl::conditional(
-			state->ton.value(),
-			rpl::single(Ui::Text::IconEmoji(&st::starIconEmoji)),
-			rpl::single(Ui::Text::IconEmoji(&st::tonIconEmoji))),
-		Ui::Text::WithEntities));
+	currency->setText(rpl::conditional(
+		state->ton.value(),
+		tr::lng_gift_resale_switch_to_stars(),
+		tr::lng_gift_resale_switch_to_ton()));
 #endif
 
 	box->heightValue() | rpl::start_with_next([=](int height) {

From 6dcd52deb563f4873fc323aa79ba5ce0c86c5eaf Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 25 Aug 2025 13:38:51 +0400
Subject: [PATCH 302/341] Support all userpic types in Switch.

---
 .../ui/controls/userpic_button.cpp            | 29 +++++++++++++++++++
 .../SourceFiles/ui/controls/userpic_button.h  |  4 +++
 .../window/window_chat_switch_process.cpp     |  2 ++
 3 files changed, 35 insertions(+)

diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.cpp b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
index ffd74c3efe..ad0402e41f 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.cpp
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.cpp
@@ -561,6 +561,20 @@ void UserpicButton::paintEvent(QPaintEvent *e) {
 			photoPosition.y(),
 			width(),
 			_st.photoSize);
+	} else if (showMyNotes()) {
+		Ui::EmptyUserpic::PaintMyNotes(
+			p,
+			photoPosition.x(),
+			photoPosition.y(),
+			width(),
+			_st.photoSize);
+	} else if (showAuthorHidden()) {
+		Ui::EmptyUserpic::PaintHiddenAuthor(
+			p,
+			photoPosition.x(),
+			photoPosition.y(),
+			width(),
+			_st.photoSize);
 	} else {
 		if (_a_appearance.animating()) {
 			p.drawPixmapLeft(photoPosition, width(), _oldUserpic);
@@ -976,6 +990,13 @@ void UserpicButton::showSavedMessagesOnSelf(bool enabled) {
 	}
 }
 
+void UserpicButton::showMyNotesOnSelf(bool enabled) {
+	if (_showMyNotesOnSelf != enabled) {
+		_showMyNotesOnSelf = enabled;
+		update();
+	}
+}
+
 bool UserpicButton::showSavedMessages() const {
 	return _showSavedMessagesOnSelf && _peer && _peer->isSelf();
 }
@@ -984,6 +1005,14 @@ bool UserpicButton::showRepliesMessages() const {
 	return _showSavedMessagesOnSelf && _peer && _peer->isRepliesChat();
 }
 
+bool UserpicButton::showMyNotes() const {
+	return _showMyNotesOnSelf && _peer && _peer->isSelf();
+}
+
+bool UserpicButton::showAuthorHidden() const {
+	return _showMyNotesOnSelf && _peer && _peer->isSavedHiddenAuthor();
+}
+
 void UserpicButton::startChangeOverlayAnimation() {
 	auto over = isOver() || isDown();
 	_changeOverlayShown.start(
diff --git a/Telegram/SourceFiles/ui/controls/userpic_button.h b/Telegram/SourceFiles/ui/controls/userpic_button.h
index f126fac07a..6703a3977f 100644
--- a/Telegram/SourceFiles/ui/controls/userpic_button.h
+++ b/Telegram/SourceFiles/ui/controls/userpic_button.h
@@ -96,6 +96,7 @@ public:
 		bool enabled,
 		Fn<void(ChosenImage)> chosen);
 	void showSavedMessagesOnSelf(bool enabled);
+	void showMyNotesOnSelf(bool enabled);
 	void overrideShape(PeerUserpicShape shape);
 
 	// Role::ChoosePhoto or Role::ChangePhoto
@@ -140,6 +141,8 @@ private:
 	void updateVideo();
 	[[nodiscard]] bool showSavedMessages() const;
 	[[nodiscard]] bool showRepliesMessages() const;
+	[[nodiscard]] bool showMyNotes() const;
+	[[nodiscard]] bool showAuthorHidden() const;
 	void checkStreamedIsStarted();
 	bool createStreamingObjects(not_null<PhotoData*> photo);
 	void clearStreaming();
@@ -184,6 +187,7 @@ private:
 	base::unique_qptr<PopupMenu> _menu;
 
 	bool _showSavedMessagesOnSelf = false;
+	bool _showMyNotesOnSelf = false;
 	bool _canOpenPhoto = false;
 	bool _cursorInChangeOverlay = false;
 	bool _changeOverlayEnabled = false;
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index a66b31c6b3..c856a98ac7 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -88,6 +88,7 @@ void Button::setup(
 			this,
 			sublistPeer,
 			st::chatSwitchUserpicSublist);
+		userpic->showMyNotesOnSelf(true);
 		userpic->show();
 		userpic->move(
 			((width() - userpicSize.width()) / 2),
@@ -102,6 +103,7 @@ void Button::setup(
 		this,
 		peer,
 		*userpicSt);
+	userpic->showSavedMessagesOnSelf(true);
 	userpic->show();
 	userpic->move(
 		(((width() - userpicSize.width()) / 2)

From 00919f32320cbbba96087367a41e1257604f8dcc Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 26 Aug 2025 14:19:36 +0400
Subject: [PATCH 303/341] Support arrows in chat switch.

---
 Telegram/SourceFiles/core/application.cpp     |  2 +
 Telegram/SourceFiles/core/shortcuts.cpp       | 38 +++++++----
 .../window/window_chat_switch_process.cpp     | 67 ++++++++++++++-----
 .../window/window_chat_switch_process.h       |  3 +
 4 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp
index 190f4431b4..933e248d05 100644
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -648,6 +648,8 @@ bool Application::eventFilter(QObject *object, QEvent *e) {
 		if (base::Platform::GlobalShortcuts::IsToggleFullScreenKey(event)
 			&& toggleActiveWindowFullScreen()) {
 			return true;
+		} else if (Shortcuts::HandlePossibleChatSwitch(event)) {
+			return true;
 		}
 	} break;
 	case QEvent::MouseButtonPress:
diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 34d5457f10..9f4c053146 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -805,12 +805,22 @@ bool HandleEvent(
 	return Launch(Data.lookup(object));
 }
 
-void CancelChatSwitch(Qt::Key result) {
+bool CancelChatSwitch(Qt::Key result) {
 	ChatSwitchModifier = Qt::Key();
-	if (ChatSwitchStarted) {
-		ChatSwitchStarted = false;
-		ChatSwitchStream.fire({ .action = result });
+	if (!ChatSwitchStarted) {
+		return false;
 	}
+	ChatSwitchStarted = false;
+	ChatSwitchStream.fire({ .action = result });
+	return true;
+}
+
+bool NavigateChatSwitch(Qt::Key result) {
+	if (!ChatSwitchStarted) {
+		return false;
+	}
+	ChatSwitchStream.fire({ .action = result });
+	return true;
 }
 
 rpl::producer<ChatSwitchRequest> ChatSwitchRequests() {
@@ -823,17 +833,9 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 		return false;
 	} else if (type == QEvent::ShortcutOverride) {
 		const auto key = Qt::Key(event->key());
-		if (key == Qt::Key_Escape) {
-			CancelChatSwitch(Qt::Key_Escape);
-			return false;
-		} else if (key == Qt::Key_Return || key == Qt::Key_Enter) {
-			CancelChatSwitch(Qt::Key_Enter);
-			return false;
-		}
 		const auto ctrl = Platform::IsMac()
 			? Qt::MetaModifier
 			: Qt::ControlModifier;
-
 		if (Data.handles(QKeySequence(ctrl | Qt::Key_Tab))
 			&& (Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Backtab)
 				|| Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)
@@ -872,6 +874,18 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 				return true;
 			}
 		}
+	} else if (type == QEvent::KeyPress) {
+		const auto key = Qt::Key(event->key());
+		if (key == Qt::Key_Escape) {
+			return CancelChatSwitch(Qt::Key_Escape);
+		} else if (key == Qt::Key_Return || key == Qt::Key_Enter) {
+			return CancelChatSwitch(Qt::Key_Enter);
+		} else if (key == Qt::Key_Left
+			|| key == Qt::Key_Right
+			|| key == Qt::Key_Up
+			|| key == Qt::Key_Down) {
+			return NavigateChatSwitch(key);
+		}
 	} else if (type == QEvent::KeyRelease) {
 		const auto key = Qt::Key(event->key());
 		if (key == ChatSwitchModifier) {
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index c856a98ac7..871c54a97c 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -210,9 +210,8 @@ rpl::producer<> ChatSwitchProcess::closeRequests() const {
 }
 
 void ChatSwitchProcess::process(const Request &request) {
-	Expects(_selected < int(_list.size()));
+	Expects(_selected < _shownCount);
 
-	const auto count = int(_list.size());
 	if (request.action == Qt::Key_Escape) {
 		_closeRequests.fire({});
 	} else if (request.action == Qt::Key_Enter) {
@@ -221,18 +220,28 @@ void ChatSwitchProcess::process(const Request &request) {
 		} else {
 			_closeRequests.fire({});
 		}
-	} else if (request.action == Qt::Key_Tab) {
-		if (_selected < 0 || _selected + 1 >= count) {
+	} else if (request.action == Qt::Key_Tab
+		|| request.action == Qt::Key_Right) {
+		if (_selected < 0 || _selected + 1 >= _shownCount) {
 			setSelected(0);
 		} else {
 			setSelected(_selected + 1);
 		}
-	} else if (request.action == Qt::Key_Backtab) {
+	} else if (request.action == Qt::Key_Backtab
+		|| request.action == Qt::Key_Left) {
 		if (_selected <= 0) {
-			setSelected(count - 1);
+			setSelected(_shownCount - 1);
 		} else {
 			setSelected(_selected - 1);
 		}
+	} else if (request.action == Qt::Key_Up) {
+		const auto now = std::max(_selected, 0) - _shownPerRow;
+		const auto bound = (now < 0) ? (_shownCount + now) : now;
+		setSelected(bound);
+	} else if (request.action == Qt::Key_Down) {
+		const auto now = std::max(_selected, 0) + _shownPerRow;
+		const auto bound = (now >= _shownCount) ? (now - _shownCount) : now;
+		setSelected(bound);
 	}
 }
 
@@ -357,17 +366,38 @@ void ChatSwitchProcess::layout(QSize size) {
 	auto inner = outer.marginsRemoved(st::chatSwitchPadding);
 	const auto available = inner.width();
 	const auto canPerRow = (available / st::chatSwitchSize.width());
+	const auto canRows = (canPerRow > 2 * 7)
+		? 1
+		: (canPerRow > 3 * 4)
+		? 2
+		: 3;
 	if (canPerRow < 1 || _list.empty()) {
 		return;
 	}
 	const auto count = int(_list.size());
-	const auto rows = (count + canPerRow - 1) / canPerRow;
-	const auto minPerRow = count / rows;
-	const auto wideRows = (count - (minPerRow * rows));
-	const auto maxPerRow = wideRows ? (minPerRow + 1) : minPerRow;
-	const auto narrowShift = wideRows ? (st::chatSwitchSize.width() / 2) : 0;
-	const auto width = maxPerRow * st::chatSwitchSize.width();
-	const auto height = rows * st::chatSwitchSize.height();
+	_shownRows = std::min(canRows, (count + canPerRow - 1) / canPerRow);
+	_shownPerRow = std::min(count / _shownRows, canPerRow);
+	if (_shownRows > 2) {
+		if (_shownPerRow * 2 > _shownRows * 4) {
+			_shownRows = 2;
+		} else if (_shownPerRow > 4) {
+			_shownPerRow = 4;
+		}
+	}
+	if (_shownRows > 1) {
+		if (_shownPerRow > _shownRows * 7) {
+			_shownRows = 1;
+		} else if (_shownPerRow > 7) {
+			_shownPerRow = 7;
+		}
+	}
+	_shownCount = _shownPerRow * _shownRows;
+	if (_selected >= _shownCount) {
+		_selected = -1;
+	}
+
+	const auto width = _shownPerRow * st::chatSwitchSize.width();
+	const auto height = _shownRows * st::chatSwitchSize.height();
 
 	size = QSize(width, height);
 	_inner = QRect(
@@ -381,16 +411,19 @@ void ChatSwitchProcess::layout(QSize size) {
 
 	auto index = 0;
 	auto top = padding.top();
-	for (auto row = 0; row != rows; ++row) {
-		const auto columns = (row < wideRows) ? maxPerRow : minPerRow;
-		auto left = padding.left() + ((row < wideRows) ? 0 : narrowShift);
-		for (auto column = 0; column != columns; ++column) {
+	for (auto row = 0; row != _shownRows; ++row) {
+		auto left = padding.left();
+		for (auto column = 0; column != _shownPerRow; ++column) {
 			auto &entry = _entries[index++];
 			entry.button->moveToLeft(left, top, _inner.width());
+			entry.button->show();
 			left += st::chatSwitchSize.width();
 		}
 		top += st::chatSwitchSize.height();
 	}
+	for (auto i = _shownRows * _shownPerRow; i < count; ++i) {
+		_entries[i].button->hide();
+	}
 
 	_shadowed = _outer.marginsAdded(st::boxRoundShadow.extend);
 	_view->setGeometry(_shadowed);
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.h b/Telegram/SourceFiles/window/window_chat_switch_process.h
index 77173489ff..36c5f24c75 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.h
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.h
@@ -71,6 +71,9 @@ private:
 	std::vector<Entry> _entries;
 
 	int _selected = -1;
+	int _shownRows = 0;
+	int _shownCount = 0;
+	int _shownPerRow = 0;
 
 	rpl::event_stream<not_null<Data::Thread*>> _chosen;
 	rpl::event_stream<> _closeRequests;

From b075bb9f4e7e998841f07890cfb8b8effe34b4e8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 10:59:54 +0400
Subject: [PATCH 304/341] Fix checkbox in background settings.

---
 Telegram/SourceFiles/boxes/boxes.style | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index 29fb5b4ac3..510dfa7420 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -758,7 +758,7 @@ backgroundCheckbox: Checkbox(defaultCheckbox) {
 	textFg: msgServiceFg;
 	textFgActive: msgServiceFg;
 
-	width: -50px;
+	width: -10px;
 	margin: margins(0px, 0px, 0px, 0px);
 
 	textPosition: point(0px, 6px);

From 811dfee42c19c75e448b3c058d17a4504526de58 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 11:23:33 +0400
Subject: [PATCH 305/341] Separately bought upgrade doesn't auto-add details.

---
 Telegram/SourceFiles/api/api_premium.cpp                    | 1 +
 Telegram/SourceFiles/data/data_credits.h                    | 1 +
 Telegram/SourceFiles/data/data_media_types.h                | 1 +
 Telegram/SourceFiles/data/data_star_gift.h                  | 1 +
 Telegram/SourceFiles/history/history_item.cpp               | 4 +++-
 Telegram/SourceFiles/settings/settings_credits_graphics.cpp | 6 +++++-
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/api/api_premium.cpp b/Telegram/SourceFiles/api/api_premium.cpp
index dcb9d303f9..545ef29be3 100644
--- a/Telegram/SourceFiles/api/api_premium.cpp
+++ b/Telegram/SourceFiles/api/api_premium.cpp
@@ -992,6 +992,7 @@ std::optional<Data::SavedStarGift> FromTL(
 			? peerFromMTP(*data.vfrom_id())
 			: PeerId()),
 		.date = data.vdate().v,
+		.upgradeSeparate = data.is_upgrade_separate(),
 		.upgradable = data.is_can_upgrade(),
 		.anonymous = data.is_name_hidden(),
 		.pinned = data.is_pinned_to_top() && hasUnique,
diff --git a/Telegram/SourceFiles/data/data_credits.h b/Telegram/SourceFiles/data/data_credits.h
index 1cf1670408..5102d58a4b 100644
--- a/Telegram/SourceFiles/data/data_credits.h
+++ b/Telegram/SourceFiles/data/data_credits.h
@@ -106,6 +106,7 @@ struct CreditsHistoryEntry final {
 	bool giftTransferred : 1 = false;
 	bool giftRefunded : 1 = false;
 	bool giftUpgraded : 1 = false;
+	bool giftUpgradeSeparate : 1 = false;
 	bool giftResale : 1 = false;
 	bool giftResaleForceTon : 1 = false;
 	bool giftPinned : 1 = false;
diff --git a/Telegram/SourceFiles/data/data_media_types.h b/Telegram/SourceFiles/data/data_media_types.h
index c793bb1234..a8fce546d0 100644
--- a/Telegram/SourceFiles/data/data_media_types.h
+++ b/Telegram/SourceFiles/data/data_media_types.h
@@ -163,6 +163,7 @@ struct GiftCode {
 	GiftType type = GiftType::Premium;
 	bool viaGiveaway : 1 = false;
 	bool transferred : 1 = false;
+	bool upgradeSeparate : 1 = false;
 	bool upgradable : 1 = false;
 	bool unclaimed : 1 = false;
 	bool anonymous : 1 = false;
diff --git a/Telegram/SourceFiles/data/data_star_gift.h b/Telegram/SourceFiles/data/data_star_gift.h
index 19e1af0987..c9e41a84cd 100644
--- a/Telegram/SourceFiles/data/data_star_gift.h
+++ b/Telegram/SourceFiles/data/data_star_gift.h
@@ -178,6 +178,7 @@ struct SavedStarGift {
 	QString giftPrepayUpgradeHash;
 	PeerId fromId = 0;
 	TimeId date = 0;
+	bool upgradeSeparate = false;
 	bool upgradable = false;
 	bool anonymous = false;
 	bool pinned = false;
diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp
index 3d6de77155..47b8410f45 100644
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -5869,13 +5869,14 @@ void HistoryItem::setServiceMessageByAction(const MTPmessageAction &action) {
 			const MTPDmessageActionStarGift &action) {
 		auto result = PreparedServiceText();
 		const auto upgradeGifted = action.is_prepaid_upgrade();
+		const auto upgradeSeparate = action.is_upgrade_separate();
 		const auto isSelf = _from->isSelf();
 		const auto peer = isSelf ? _history->peer : _from;
 		const auto stars = action.vgift().match([&](
 				const MTPDstarGift &data) {
 			return upgradeGifted
 				? uint64(action.vupgrade_stars().value_or_empty())
-				: action.is_upgrade_separate()
+				: upgradeSeparate
 				? uint64(data.vstars().v)
 				: (uint64(data.vstars().v)
 					+ uint64(action.vupgrade_stars().value_or_empty()));
@@ -6503,6 +6504,7 @@ void HistoryItem::applyAction(const MTPMessageAction &action) {
 			.starsUpgradedBySender = int(
 				data.vupgrade_stars().value_or_empty()),
 			.type = Data::GiftType::StarGift,
+			.upgradeSeparate = data.is_upgrade_separate(),
 			.upgradable = data.is_can_upgrade(),
 			.anonymous = data.is_name_hidden(),
 			.converted = data.is_converted(),
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index 291110acf4..d988a14023 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -1874,7 +1874,9 @@ void GenericCreditsEntryBox(
 				&& e.hasGiftComment),
 			.canAddMyComment = (giftToSelf && e.hasGiftComment),
 			.addDetailsDefault = (giftToSelf
-				|| (e.starsUpgradedBySender && !e.anonymous)),
+				|| (e.starsUpgradedBySender
+					&& !e.giftUpgradeSeparate
+					&& !e.anonymous)),
 		});
 	};
 
@@ -2553,6 +2555,7 @@ Data::CreditsHistoryEntry SavedStarGiftEntry(
 		.converted = false,
 		.anonymous = data.anonymous,
 		.stargift = true,
+		.giftUpgradeSeparate = data.upgradeSeparate,
 		.giftPinned = data.pinned,
 		.savedToProfile = !data.hidden,
 		.fromGiftsList = true,
@@ -2657,6 +2660,7 @@ void ShowStarGiftViewBox(
 		.stargift = true,
 		.giftTransferred = data.transferred,
 		.giftRefunded = data.refunded,
+		.giftUpgradeSeparate = data.upgradeSeparate,
 		.savedToProfile = data.saved,
 		.canUpgradeGift = data.upgradable,
 		.hasGiftComment = !data.message.empty(),

From 36447eb1e32fa814b7587da7a72df65dc2f79d86 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 11:28:52 +0400
Subject: [PATCH 306/341] Try fixing macOS action build.

---
 .../SourceFiles/history/view/media/history_view_document.cpp    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 2a14dd78e6..e6e2a026f9 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -455,7 +455,7 @@ QSize Document::countOptimalSize() {
 				? Ui::Text::Italic(tr::lng_audio_transcribe_long(tr::now))
 				: entry.failed
 				? Ui::Text::Italic(tr::lng_attach_failed(tr::now))
-				: TextWithEntities(entry.result).append(
+				: TextWithEntities{ entry.result }.append(
 					pending
 						? Ui::Text::LottieEmoji(descriptor)
 						: TextWithEntities());

From c52a31384e1fef325403980474f2b94490948731 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 11:57:07 +0400
Subject: [PATCH 307/341] Fix couple of possible crashes in saved music.

---
 Telegram/SourceFiles/info/info_wrap_widget.cpp                | 4 ++++
 Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 9048245092..26c7fe9e3a 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -291,6 +291,10 @@ Dialogs::RowDescriptor WrapWidget::activeChat() const {
 			: Dialogs::RowDescriptor(
 				storiesPeer->owner().history(storiesPeer),
 				FullMsgId());
+	} else if (const auto musicPeer = key().musicPeer()) {
+		return Dialogs::RowDescriptor(
+			musicPeer->owner().history(musicPeer),
+			FullMsgId());
 	} else if (key().settingsSelf()
 			|| key().isDownloads()
 			|| key().reactionsContextId()
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
index 144057caaf..7bc1e8e010 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -245,7 +245,7 @@ BaseLayout *MusicProvider::lookupLayout(const HistoryItem *item) {
 }
 
 bool MusicProvider::isMyItem(not_null<const HistoryItem*> item) {
-	return IsStoryMsgId(item->id) && (item->history()->peer == _peer);
+	return item->isSavedMusicItem() && (item->history()->peer == _peer);
 }
 
 bool MusicProvider::isAfter(
@@ -340,7 +340,7 @@ QString MusicProvider::showInFolderPath(
 }
 
 int64 MusicProvider::scrollTopStatePosition(not_null<HistoryItem*> item) {
-	return StoryIdFromMsgId(item->id);
+	return item->id.bare;
 }
 
 HistoryItem *MusicProvider::scrollTopStateItem(ListScrollTopState state) {

From 6d1e5243d8d0d3d72e003a9cc25d0479b96e4f84 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 11:58:05 +0400
Subject: [PATCH 308/341] Fix possible crash in recent chat switches.

---
 Telegram/SourceFiles/window/window_chat_switch_process.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index 871c54a97c..87216bb1c1 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -269,7 +269,9 @@ void ChatSwitchProcess::setupWidget(not_null<Ui::RpWidget*> geometry) {
 
 	_widget->events() | rpl::start_with_next([=](not_null<QEvent*> e) {
 		if (e->type() == QEvent::MouseButtonPress) {
-			_closeRequests.fire({});
+			crl::on_main(_widget.get(), [=] {
+				_closeRequests.fire({});
+			});
 		}
 	}, _widget->lifetime());
 

From 4a23da6ce1a294548ffffff4864058259af7c992 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 12:42:29 +0400
Subject: [PATCH 309/341] Fix build with GCC.

---
 .../SourceFiles/info/media/info_media_list_widget.cpp | 11 -----------
 .../info/saved/info_saved_music_provider.cpp          |  5 -----
 .../settings/settings_credits_graphics.cpp            |  1 -
 3 files changed, 17 deletions(-)

diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
index 8dcd58bc87..3fe4f341cd 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp
@@ -1105,17 +1105,6 @@ void ListWidget::showContextMenu(
 			link->property(kDocumentLinkMediaProperty).toULongLong())
 		: nullptr;
 	if (lnkPhoto || lnkDocument) {
-		auto [isVideo, isVoice, isAudio] = [&] {
-			if (lnkDocument) {
-				return std::make_tuple(
-					lnkDocument->isVideoFile(),
-					lnkDocument->isVoiceMessage(),
-					lnkDocument->isAudioFile()
-				);
-			}
-			return std::make_tuple(false, false, false);
-		}();
-
 		if (lnkPhoto) {
 		} else {
 			if (lnkDocument->loading()) {
diff --git a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
index 7bc1e8e010..605a58e3a7 100644
--- a/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
+++ b/Telegram/SourceFiles/info/saved/info_saved_music_provider.cpp
@@ -273,12 +273,7 @@ BaseLayout *MusicProvider::getLayout(
 std::unique_ptr<BaseLayout> MusicProvider::createLayout(
 		not_null<HistoryItem*> item,
 		not_null<Overview::Layout::Delegate*> delegate) {
-	const auto peer = item->history()->peer;
-
 	using namespace Overview::Layout;
-	const auto options = MediaOptions{
-	};
-
 	if (const auto media = item->media()) {
 		if (const auto file = media->document()) {
 			return std::make_unique<Document>(
diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
index d988a14023..85f29f0f8f 100644
--- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
+++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp
@@ -2688,7 +2688,6 @@ void ShowStarGiftViewBox(
 	const auto toChannel = peer->isServiceUser() && data.channel;
 	const auto incoming = !toChannel
 		&& (data.upgrade ? item->out() : !item->out());
-	const auto fromId = incoming ? peer->id : peer->session().userPeerId();
 	const auto toId = incoming ? peer->session().userPeerId() : peer->id;
 	const auto ownerId = data.unique ? data.unique->ownerId : toId;
 	const auto owner = peer->owner().peer(ownerId);

From c0c5ad21b682ec8f2e42d7a1c875693d1ea4bb37 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 16:03:13 +0400
Subject: [PATCH 310/341] Don't push recent peers to chat switch.

---
 .../SourceFiles/data/components/recent_peers.cpp     | 12 +-----------
 .../window/window_chat_switch_process.cpp            | 12 +++++++++---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index 63d2668a41..b5e4501004 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -139,17 +139,7 @@ void RecentPeers::applyLocal(QByteArray serialized) {
 
 std::vector<not_null<Thread*>> RecentPeers::collectChatOpenHistory() const {
 	_session->local().readSearchSuggestions();
-
-	auto result = _opens;
-	result.reserve(result.size() + _list.size());
-	for (const auto &peer : _list) {
-		const auto history = peer->owner().history(peer);
-		const auto thread = not_null<Data::Thread*>(history);
-		if (!ranges::contains(result, thread)) {
-			result.push_back(thread);
-		}
-	}
-	return result;
+	return _opens;
 }
 
 void RecentPeers::chatOpenPush(not_null<Thread*> thread) {
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index 87216bb1c1..81df9b7ad0 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -190,7 +190,7 @@ ChatSwitchProcess::ChatSwitchProcess(
 : _session(session)
 , _widget(std::make_unique<Ui::RpWidget>(
 	geometry->parentWidget() ? geometry->parentWidget() : geometry))
-, _view(Ui::CreateChild<Ui::RpWidget>(_widget.get()))\
+, _view(Ui::CreateChild<Ui::RpWidget>(_widget.get()))
 , _bg(st::boxRadius, st::boxBg) {
 	setupWidget(geometry);
 	setupContent(opened);
@@ -246,7 +246,7 @@ void ChatSwitchProcess::process(const Request &request) {
 }
 
 void ChatSwitchProcess::setSelected(int index) {
-	if (_selected == index || _list.empty()) {
+	if (_selected == index || _list.size() < 2) {
 		return;
 	}
 	if (_selected >= 0) {
@@ -280,6 +280,9 @@ void ChatSwitchProcess::setupWidget(not_null<Ui::RpWidget*> geometry) {
 
 void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 	_list = _session->recentPeers().collectChatOpenHistory();
+	if (_list.size() < 2) {
+		return;
+	}
 
 	if (opened) {
 		const auto i = ranges::find(_list, not_null(opened));
@@ -373,7 +376,10 @@ void ChatSwitchProcess::layout(QSize size) {
 		: (canPerRow > 3 * 4)
 		? 2
 		: 3;
-	if (canPerRow < 1 || _list.empty()) {
+	if (canPerRow < 1) {
+		return;
+	} else if (_list.size() < 2) {
+		_closeRequests.fire({});
 		return;
 	}
 	const auto count = int(_list.size());

From 9df98352a8df1e30a931ae8302bb373fc3eb3b82 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 17:14:55 +0400
Subject: [PATCH 311/341] Show correct error on gift limit reaching.

---
 Telegram/SourceFiles/boxes/star_gift_box.cpp          | 11 +++++++++++
 Telegram/SourceFiles/payments/payments_form.cpp       |  1 +
 Telegram/SourceFiles/payments/payments_form.h         |  2 ++
 .../payments/payments_non_panel_process.cpp           |  8 ++++++++
 4 files changed, 22 insertions(+)

diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index 7d37a999c2..cbc8f707ec 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -2041,6 +2041,7 @@ void SendGift(
 			.message = details.text,
 			.recipient = peer,
 			.limitedCount = gift.info.limitedCount,
+			.perUserLimit = gift.info.perUserTotal,
 			.anonymous = details.anonymous,
 			.upgraded = details.upgraded,
 		}, done, processNonPanelPaymentFormFactory);
@@ -2952,6 +2953,16 @@ void SendGiftBox(
 						[=] { state->resaleRequestingId = 0; });
 				} else if (star && IsSoldOut(star->info)) {
 					window->show(Box(SoldOutBox, window, *star));
+				} else if (star
+						&& star->info.perUserTotal
+						&& !star->info.perUserRemains) {
+					window->showToast({
+						.text = tr::lng_gift_sent_finished(
+							tr::now,
+							lt_count,
+							star->info.perUserTotal,
+							Ui::Text::RichLangValue),
+					});
 				} else {
 					send();
 				}
diff --git a/Telegram/SourceFiles/payments/payments_form.cpp b/Telegram/SourceFiles/payments/payments_form.cpp
index f0b46dd21d..ff005327ad 100644
--- a/Telegram/SourceFiles/payments/payments_form.cpp
+++ b/Telegram/SourceFiles/payments/payments_form.cpp
@@ -533,6 +533,7 @@ void Form::requestForm() {
 				.invoice = invoice,
 				.inputInvoice = inputInvoice(),
 				.starGiftLimitedCount = gift ? gift->limitedCount : 0,
+				.starGiftPerUserLimit = gift ? gift->perUserLimit : 0,
 				.starGiftForm = true,
 			};
 			_updates.fire(CreditsPaymentStarted{ .data = formData });
diff --git a/Telegram/SourceFiles/payments/payments_form.h b/Telegram/SourceFiles/payments/payments_form.h
index 598f9a23d8..f857ce500d 100644
--- a/Telegram/SourceFiles/payments/payments_form.h
+++ b/Telegram/SourceFiles/payments/payments_form.h
@@ -179,6 +179,7 @@ struct InvoiceStarGift {
 	TextWithEntities message;
 	not_null<PeerData*> recipient;
 	int limitedCount = 0;
+	int perUserLimit = 0;
 	bool anonymous = false;
 	bool upgraded = false;
 };
@@ -202,6 +203,7 @@ struct CreditsFormData {
 	InvoiceCredits invoice;
 	MTPInputInvoice inputInvoice;
 	int starGiftLimitedCount = 0;
+	int starGiftPerUserLimit = 0;
 	bool starGiftForm = false;
 };
 
diff --git a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
index d63b505a98..09b3bc1f50 100644
--- a/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
+++ b/Telegram/SourceFiles/payments/payments_non_panel_process.cpp
@@ -77,6 +77,14 @@ void ProcessCreditsPayment(
 							show->showToast(
 								tr::lng_gift_sold_out_title(tr::now));
 						}
+					} else if (*error == u"STARGIFT_USER_USAGE_LIMITED"_q) {
+						show->showToast({
+							.text = tr::lng_gift_sent_finished(
+								tr::now,
+								lt_count,
+								std::max(form->starGiftPerUserLimit, 1),
+								Ui::Text::RichLangValue),
+						});
 					} else {
 						show->showToast(*error);
 					}

From ec5725d8deec57e6acd5034fd4afe6ab04de5d2c Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 17:34:27 +0400
Subject: [PATCH 312/341] Fix finalizing intersecting quotes.

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 3710f80536..92f7e78d2d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 3710f80536352b009c5ab359210911086ead6b13
+Subproject commit 92f7e78d2de4cc38703de0d73b60b71aa5f8580b

From 3419b49381eec244a2b692203591679ac5362c01 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 17:52:15 +0400
Subject: [PATCH 313/341] Hide gift value details tooltips on click.

---
 Telegram/SourceFiles/boxes/gift_premium_box.cpp | 8 ++++++++
 Telegram/lib_ui                                 | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
index af7077662a..9d674b9059 100644
--- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp
+++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp
@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_premium.h"
 #include "api/api_premium_option.h"
 #include "apiwrap.h"
+#include "base/event_filter.h"
 #include "base/timer_rpl.h"
 #include "base/unixtime.h"
 #include "base/weak_ptr.h"
@@ -106,6 +107,13 @@ void ShowInfoTooltip(
 		st::defaultImportantTooltip);
 	tooltip->toggleFast(false);
 
+	base::install_event_filter(tooltip, qApp, [=](not_null<QEvent*> e) {
+		if (e->type() == QEvent::MouseButtonPress) {
+			tooltip->toggleAnimated(false);
+		}
+		return base::EventFilterResult::Continue;
+	});
+
 	const auto update = [=] {
 		const auto geometry = Ui::MapFrom(parent, target, target->rect());
 		const auto countPosition = [=](QSize size) {
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 92f7e78d2d..114fd95c75 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 92f7e78d2de4cc38703de0d73b60b71aa5f8580b
+Subproject commit 114fd95c7511f6de1091b21bb23e51b8ecdc50ab

From 86262333a457f62709726ee4ab9c48fa58824da4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 1 Sep 2025 17:53:59 +0400
Subject: [PATCH 314/341] Version 6.1.1.

- Ctrl+Tab / Ctrl+Shift+Tab collect chats on every launch.
- Fix Ctrl+Tab / Ctrl+Shift+Tab shortcut override.
- Fix possible crashes in saved music.
- Fix webview error label alignment.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 7 +++++++
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index bacf3108f4..bd91d859d6 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.1.0.0" />
+    Version="6.1.1.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 758d14ccb7..ce792100b7 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,0,0
- PRODUCTVERSION 6,1,0,0
+ FILEVERSION 6,1,1,0
+ PRODUCTVERSION 6,1,1,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.1.0.0"
+            VALUE "FileVersion", "6.1.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.1.0.0"
+            VALUE "ProductVersion", "6.1.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 401f4766c9..eb97925dfa 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,0,0
- PRODUCTVERSION 6,1,0,0
+ FILEVERSION 6,1,1,0
+ PRODUCTVERSION 6,1,1,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.1.0.0"
+            VALUE "FileVersion", "6.1.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.1.0.0"
+            VALUE "ProductVersion", "6.1.1.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index d9f4ae0c03..3dd21b6f26 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6001000;
-constexpr auto AppVersionStr = "6.1";
+constexpr auto AppVersion = 6001001;
+constexpr auto AppVersionStr = "6.1.1";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index f2821dc03e..e59237ce1a 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6001000
+AppVersion         6001001
 AppVersionStrMajor 6.1
-AppVersionStrSmall 6.1
-AppVersionStr      6.1.0
+AppVersionStrSmall 6.1.1
+AppVersionStr      6.1.1
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 6.1
+AppVersionOriginal 6.1.1
diff --git a/changelog.txt b/changelog.txt
index 7741259fac..2415440069 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+6.1.1 (01.09.25)
+
+- Ctrl+Tab / Ctrl+Shift+Tab collect chats on every launch.
+- Fix Ctrl+Tab / Ctrl+Shift+Tab shortcut override.
+- Fix possible crashes in saved music.
+- Fix webview error label alignment.
+
 6.1 (31.08.25)
 
 - Music on Profiles.

From 4052c3d1019625b825babefa04ef314cff74b895 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 08:17:29 +0400
Subject: [PATCH 315/341] Fix color picker in userpic builder.

---
 Telegram/SourceFiles/ui/widgets/color_editor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/ui/widgets/color_editor.cpp b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
index 8b21f06ba3..06ca4d3389 100644
--- a/Telegram/SourceFiles/ui/widgets/color_editor.cpp
+++ b/Telegram/SourceFiles/ui/widgets/color_editor.cpp
@@ -917,6 +917,7 @@ void ColorEditor::prepare() {
 	connect(_blueField, &Ui::MaskedInputField::submitted, submitted);
 	connect(_result, &Ui::MaskedInputField::submitted, submitted);
 
+	setNaturalWidth(st::colorEditWidth);
 	const auto height = st::colorEditSkip
 		+ st::colorPickerSize
 		+ st::colorEditSkip

From 74b530259d29b7c75c9ad249ae9fa6bba0b921f5 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 08:26:04 +0400
Subject: [PATCH 316/341] Fix color picker in userpic builder again.

---
 .../info/userpic/info_userpic_colors_editor.cpp            | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
index d1076d99fe..cb7846dfae 100644
--- a/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
+++ b/Telegram/SourceFiles/info/userpic/info_userpic_colors_editor.cpp
@@ -270,10 +270,12 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 	Ui::AddDivider(container);
 	Ui::AddSkip(container);
 
-	const auto editor = container->add(object_ptr<ColorEditor>(
+	auto ownedEditor = object_ptr<ColorEditor>(
 		container,
 		ColorEditor::Mode::HSL,
-		state->colors.back()));
+		state->colors.back());
+	container->resizeToWidth(ownedEditor->width());
+	const auto editor = container->add(std::move(ownedEditor));
 
 	buttonsContainer->chosenChanges(
 	) | rpl::start_with_next([=](ColorsLine::Chosen *chosen) {
@@ -305,7 +307,6 @@ object_ptr<Ui::RpWidget> CreateGradientEditor(
 		save();
 	}, container->lifetime());
 
-	container->resizeToWidth(editor->width());
 	buttonsContainer->init();
 
 	return container;

From bf484b551895459646da39c8c7edbc395268f224 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 08:33:15 +0400
Subject: [PATCH 317/341] Update lib_webview.

---
 Telegram/lib_webview | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index 55af106a52..cbdeb830e3 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit 55af106a525cfe9e1001ab36cbe09bf487fa2545
+Subproject commit cbdeb830e3f5119851a44c3cbf3e900b98276cf5

From d697677fabec46e2fac2c2f7b592a9abbddc16b6 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 08:38:10 +0400
Subject: [PATCH 318/341] Fix time input colon.

---
 Telegram/lib_ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index 114fd95c75..e79c2cc66d 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit 114fd95c7511f6de1091b21bb23e51b8ecdc50ab
+Subproject commit e79c2cc66de149d1193c26ad691fa5c834d1d4f7

From 312c94f386fdace3b3a174f1ba72ba3fa47832e1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 12:04:47 +0400
Subject: [PATCH 319/341] Fill suggested prices for gifts between stars/TON.

---
 Telegram/SourceFiles/boxes/star_gift_box.cpp  | 62 +++++++++----------
 Telegram/SourceFiles/boxes/star_gift_box.h    |  7 +++
 .../controls/history_view_suggest_options.cpp | 40 +++++++++---
 3 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/star_gift_box.cpp b/Telegram/SourceFiles/boxes/star_gift_box.cpp
index cbc8f707ec..0a89d2b02b 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.cpp
+++ b/Telegram/SourceFiles/boxes/star_gift_box.cpp
@@ -239,37 +239,6 @@ struct SessionResalePrices {
 	crl::time lastReceived = 0;
 };
 
-[[nodiscard]] CreditsAmount StarsFromTon(
-		not_null<Main::Session*> session,
-		CreditsAmount ton) {
-	const auto appConfig = &session->appConfig();
-	const auto starsRate = appConfig->starsWithdrawRate() / 100.;
-	const auto tonRate = appConfig->currencyWithdrawRate();
-	if (!starsRate) {
-		return {};
-	}
-	const auto count = (ton.value() * tonRate) / starsRate;
-	return CreditsAmount(int(base::SafeRound(count)));
-}
-
-[[nodiscard]] CreditsAmount TonFromStars(
-		not_null<Main::Session*> session,
-		CreditsAmount stars) {
-	const auto appConfig = &session->appConfig();
-	const auto starsRate = appConfig->starsWithdrawRate() / 100.;
-	const auto tonRate = appConfig->currencyWithdrawRate();
-	if (!tonRate) {
-		return {};
-	}
-	const auto count = (stars.value() * starsRate) / tonRate;
-	const auto whole = int(std::floor(count));
-	const auto cents = int(base::SafeRound((count - whole) * 100));
-	return CreditsAmount(
-		whole,
-		cents * (Ui::kNanosInOne / 100),
-		CreditsType::Ton);
-}
-
 [[nodiscard]] not_null<SessionResalePrices*> ResalePrices(
 		not_null<Main::Session*> session) {
 	static auto result = base::flat_map<
@@ -5460,4 +5429,35 @@ rpl::lifetime ShowStarGiftResale(
 	});
 }
 
+CreditsAmount StarsFromTon(
+		not_null<Main::Session*> session,
+		CreditsAmount ton) {
+	const auto appConfig = &session->appConfig();
+	const auto starsRate = appConfig->starsWithdrawRate() / 100.;
+	const auto tonRate = appConfig->currencyWithdrawRate();
+	if (!starsRate) {
+		return {};
+	}
+	const auto count = (ton.value() * tonRate) / starsRate;
+	return CreditsAmount(int(base::SafeRound(count)));
+}
+
+CreditsAmount TonFromStars(
+		not_null<Main::Session*> session,
+		CreditsAmount stars) {
+	const auto appConfig = &session->appConfig();
+	const auto starsRate = appConfig->starsWithdrawRate() / 100.;
+	const auto tonRate = appConfig->currencyWithdrawRate();
+	if (!tonRate) {
+		return {};
+	}
+	const auto count = (stars.value() * starsRate) / tonRate;
+	const auto whole = int(std::floor(count));
+	const auto cents = int(base::SafeRound((count - whole) * 100));
+	return CreditsAmount(
+		whole,
+		cents * (Ui::kNanosInOne / 100),
+		CreditsType::Ton);
+}
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/boxes/star_gift_box.h b/Telegram/SourceFiles/boxes/star_gift_box.h
index 520b1278d4..dac00b9b5f 100644
--- a/Telegram/SourceFiles/boxes/star_gift_box.h
+++ b/Telegram/SourceFiles/boxes/star_gift_box.h
@@ -165,4 +165,11 @@ void ShowResaleGiftBoughtToast(
 	QString title,
 	Fn<void()> finishRequesting);
 
+[[nodiscard]] CreditsAmount StarsFromTon(
+	not_null<Main::Session*> session,
+	CreditsAmount ton);
+[[nodiscard]] CreditsAmount TonFromStars(
+	not_null<Main::Session*> session,
+	CreditsAmount stars);
+
 } // namespace Ui
diff --git a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
index 48125dc169..618d1b2793 100644
--- a/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
+++ b/Telegram/SourceFiles/history/view/controls/history_view_suggest_options.cpp
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 #include "base/event_filter.h"
 #include "base/unixtime.h"
+#include "boxes/star_gift_box.h"
 #include "chat_helpers/compose/compose_show.h"
 #include "core/ui_integration.h"
 #include "data/components/credits.h"
@@ -271,7 +272,7 @@ StarsTonPriceInput AddStarsTonPriceInput(
 
 	auto computeResult = [=]() -> std::optional<CreditsAmount> {
 		auto nanos = int64();
-		const auto ton = uint32(state->ton.current() ? 1 : 0);
+		const auto ton = state->ton.current();
 		if (ton) {
 			const auto text = tonField->getLastText();
 			const auto now = Ui::ParseTonAmountString(text);
@@ -302,16 +303,41 @@ StarsTonPriceInput AddStarsTonPriceInput(
 		}
 		state->updates.fire({});
 	};
-	QObject::connect(
-		starsField,
-		&Ui::NumberInput::changed,
-		starsField,
-		updatePrice);
+	const auto updateTonFromStars = [=] {
+		if (auto result = computeResult(); result && result->stars()) {
+			const auto v = Ui::TonFromStars(session, *result);
+			const auto amount = v.whole() * Ui::kNanosInOne + v.nano();
+			tonField->setText(
+				Ui::FormatTonAmount(amount, Ui::TonFormatFlag::Simple).full);
+		}
+	};
+	const auto updateStarsFromTon = [=] {
+		if (auto result = computeResult(); result && result->ton()) {
+			const auto v = Ui::StarsFromTon(session, *result);
+			starsField->setText(QString::number(v.whole()));
+		}
+	};
+	QObject::connect(starsField, &Ui::NumberInput::changed, starsField, [=] {
+		if (!state->ton.current()) {
+			updatePrice();
+			updateTonFromStars();
+		}
+	});
 	tonField->changes(
-	) | rpl::start_with_next(updatePrice, tonField->lifetime());
+	) | rpl::start_with_next([=] {
+		if (state->ton.current()) {
+			updatePrice();
+			updateStarsFromTon();
+		}
+	}, tonField->lifetime());
 
 	state->ton.changes(
 	) | rpl::start_with_next(updatePrice, container->lifetime());
+	if (state->ton.current()) {
+		updateStarsFromTon();
+	} else {
+		updateTonFromStars();
+	}
 
 	QObject::connect(
 		starsField,

From 59390ddaa10800c0114e399fb765651307b72632 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 13:54:42 +0400
Subject: [PATCH 320/341] Support pasting multi-line as multi-tasks.

---
 .../SourceFiles/boxes/edit_todo_list_box.cpp  | 91 ++++++++++++++++---
 1 file changed, 80 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp b/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
index 65591aaf9a..2f1add532b 100644
--- a/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_todo_list_box.cpp
@@ -143,6 +143,11 @@ private:
 		int id,
 		TextWithEntities text,
 		anim::type animated);
+	void insertTask(
+		int beforeIndex,
+		int id,
+		TextWithEntities text,
+		anim::type animated);
 	void initTaskField(not_null<Task*> task, TextWithEntities text);
 	void checkLastTask();
 	void validateState();
@@ -150,6 +155,9 @@ private:
 	void destroy(std::unique_ptr<Task> task);
 	void removeDestroyed(not_null<Task*> field);
 	int findField(not_null<Ui::InputField*> field) const;
+	void handlePaste(
+		not_null<Ui::InputField*> field,
+		const QStringList &list);
 
 	not_null<Ui::BoxContent*> _box;
 	not_null<Ui::VerticalLayout*> _container;
@@ -187,6 +195,27 @@ void InitField(
 		options);
 }
 
+[[nodiscard]] QStringList ParsePastedList(const QString &text) {
+	auto list = QStringView(text).split('\n');
+	for (auto i = list.begin(); i != list.end();) {
+		auto text = i->trimmed();
+		if (text.isEmpty() && (i + 1 != list.end())) {
+			i = list.erase(i);
+		} else {
+			*i++ = text;
+		}
+	}
+	if (list.size() < 2) {
+		return {};
+	}
+	auto result = QStringList();
+	result.reserve(list.size());
+	for (const auto &view : list) {
+		result.push_back(view.toString());
+	}
+	return result;
+}
+
 not_null<Ui::FlatLabel*> CreateWarningLabel(
 		not_null<QWidget*> parent,
 		not_null<Ui::InputField*> field,
@@ -263,7 +292,7 @@ Tasks::Task::Task(
 		session->user()->isPremium()
 			? st::createPollOptionFieldPremium
 			: st::createPollOptionField,
-		Ui::InputField::Mode::NoNewlines,
+		Ui::InputField::Mode::MultiLine,
 		tr::lng_todo_create_list_add()))
 , _limit(session->appConfig().todoListItemTextLimit()) {
 	InitField(outer, _field, session);
@@ -629,24 +658,35 @@ void Tasks::addTask(
 		int id,
 		TextWithEntities text,
 		anim::type animated) {
+	insertTask(_list.size(), id, std::move(text), animated);
+}
+
+void Tasks::insertTask(
+		int beforeIndex,
+		int id,
+		TextWithEntities text,
+		anim::type animated) {
 	if (full()) {
 		return;
 	}
+	Assert(beforeIndex >= 0 && beforeIndex <= _list.size());
 	if (_list.size() > 1) {
 		(*(_list.end() - 2))->removePlaceholder();
 		(*(_list.end() - 2))->toggleRemoveAlways(true);
 	}
 	const auto locked = id && _existingLocked;
-	_list.push_back(std::make_unique<Task>(
-		_box,
-		_container,
-		&_controller->session(),
-		id,
-		_position + _list.size() + _destroyed.size(),
-		locked));
-	const auto field = _list.back()->field();
+	const auto i = _list.insert(
+		begin(_list) + beforeIndex,
+		std::make_unique<Task>(
+			_box,
+			_container,
+			&_controller->session(),
+			id,
+			_position + beforeIndex + _destroyed.size(),
+			locked));
+	const auto field = i->get()->field();
 	if (!locked) {
-		initTaskField(_list.back().get(), std::move(text));
+		initTaskField(i->get(), std::move(text));
 	} else {
 		InitMessageFieldHandlers(
 			_controller,
@@ -659,7 +699,7 @@ void Tasks::addTask(
 		});
 	}
 	field->finishAnimating();
-	_list.back()->show(animated);
+	i->get()->show(animated);
 	fixShadows();
 }
 
@@ -706,6 +746,14 @@ void Tasks::initTaskField(not_null<Task*> task, TextWithEntities text) {
 	}, field->lifetime());
 	field->changes(
 	) | rpl::start_with_next([=] {
+		auto list = ParsePastedList(field->getLastText());
+		if (!list.empty()) {
+			field->setText(list.front());
+			field->forceProcessContentsChanges();
+
+			list.pop_front();
+			handlePaste(field, list);
+		}
 		Ui::PostponeCall(crl::guard(field, [=] {
 			validateState();
 		}));
@@ -793,6 +841,27 @@ int Tasks::findField(not_null<Ui::InputField*> field) const {
 	return result;
 }
 
+void Tasks::handlePaste(
+		not_null<Ui::InputField*> field,
+		const QStringList &list) {
+	const auto index = findField(field);
+	for (auto i = 0, count = int(list.size()); i != count; ++i) {
+		insertTask(
+			index + 1 + i,
+			0, // id
+			TextWithEntities{ list[i] },
+			anim::type::instant);
+	}
+	const auto last = std::min(
+		int(index + list.size()),
+		int(_list.size()) - 1);
+	const auto add = _list[last]->field();
+	crl::on_main(add, [=] {
+		add->setCursorPosition(add->getLastText().size());
+		add->setFocus();
+	});
+}
+
 void Tasks::checkLastTask() {
 	removeEmptyTail();
 	addEmptyTask();

From 10237a2d90c0a0b887e6e3f8cf344f15d69ac434 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 17:28:38 +0400
Subject: [PATCH 321/341] Correct gift symbol sizes and rotations.

---
 Telegram/SourceFiles/ui/chat/chat_theme.cpp | 62 +++++++++++++--------
 Telegram/SourceFiles/ui/chat/chat_theme.h   | 13 +++--
 2 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index 34c7aa367a..be462c8557 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -64,7 +64,8 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 	return (shuffled % 60) - 30;
 }
 
-[[nodiscard]] int ChooseGiftSymbolSkip(const std::vector<QRectF> &symbols) {
+[[nodiscard]] int ChooseGiftSymbolSkip(
+		const std::vector<ChatThemeGiftSymbol> &symbols) {
 	if (symbols.empty()) {
 		return -1;
 	}
@@ -72,10 +73,10 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 	auto maxValue = 0.;
 	for (auto i = 0, count = int(symbols.size()); i != count; ++i) {
 		const auto &symbol = symbols[i];
-		const auto center = symbol.center();
+		const auto center = symbol.area.center();
 		const auto value = std::min(center.x(), 1. - center.x())
 			* std::min(center.y(), 1. - center.y())
-			* std::min(symbol.width(), symbol.height());
+			* std::min(symbol.area.width(), symbol.area.height());
 		if (maxIndex < 0 || maxValue < value) {
 			maxIndex = i;
 			maxValue = value;
@@ -111,7 +112,7 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				Qt::SmoothTransformation);
 		result.setDevicePixelRatio(ratio);
 		auto giftArea = QRect();
-		int giftRotation = 0;
+		float64 giftRotation = 0.;
 		if (!request.background.prepared.isNull()) {
 			QPainter p(&result);
 			if (!gradient.isNull()) {
@@ -148,15 +149,22 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 					symbol.width() * w,
 					symbol.height() * h);
 			};
-			const auto giftSymbolPaint = [&](QPainter &p, QRectF symbol) {
-				const auto rect = giftSymbolRect(symbol);
+			const auto giftSymbolPaint = [&](
+					QPainter &p,
+					ChatThemeGiftSymbol symbol) {
+				const auto rect = giftSymbolRect(symbol.area);
+
+				const auto esize = Ui::Emoji::GetSizeLarge() / ratio;
+				const auto custom = Ui::Text::AdjustCustomEmojiSize(esize);
+				const auto coef = rect.width() / float64(custom);
+
 				p.save();
 				p.translate(rect.center());
-				p.scale(
-					rect.width() / giftSymbolSize.width(),
-					rect.height() / giftSymbolSize.height());
-				p.rotate(RotationForSymbol(symbol));
+				p.rotate(symbol.rotation);
 				p.translate(-rect.center());
+				p.translate(rect.topLeft());
+				p.scale(coef, coef);
+				p.translate(-rect.topLeft());
 				p.drawImage(rect.topLeft(), giftSymbolFrame);
 				p.restore();
 			};
@@ -193,13 +201,13 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 				auto hq = PainterHighQualityEnabler(q);
 				q.setOpacity(0.8);
 				giftSymbolPaint(q, gift);
-				const auto exact = giftSymbolRect(gift);
+				const auto exact = giftSymbolRect(gift.area);
 				giftArea = QRect(
 					useshift + (cols / 2) * w + exact.x(),
 					exact.y(),
 					exact.width(),
 					exact.height());
-				giftRotation = RotationForSymbol(gift);
+				giftRotation = gift.rotation;
 			}
 
 			for (auto y = 0; y != rows; ++y) {
@@ -1010,7 +1018,7 @@ QImage PrepareImageForTiled(const QImage &prepared) {
 	return result;
 }
 
-std::vector<QRectF> ParseGiftSymbols(
+std::vector<ChatThemeGiftSymbol> ParseGiftSymbols(
 		const QByteArray &rects,
 		QSize size,
 		float64 scale) {
@@ -1018,7 +1026,7 @@ std::vector<QRectF> ParseGiftSymbols(
 		return {};
 	}
 
-	auto result = std::vector<QRectF>();
+	auto result = std::vector<ChatThemeGiftSymbol>();
 	auto offset = 0;
 	const auto jumpPast = [&](const QByteArray &what) {
 		const auto pos = rects.indexOf(what, offset);
@@ -1028,8 +1036,8 @@ std::vector<QRectF> ParseGiftSymbols(
 		offset = pos + what.size();
 		return true;
 	};
-	const auto takeDouble = [&](float64 &value) {
-		const auto end = rects.indexOf('"', offset);
+	const auto takeDouble = [&](float64 &value, char finish = '"') {
+		const auto end = rects.indexOf(finish, offset);
 		if (end < 0) {
 			return false;
 		}
@@ -1037,10 +1045,20 @@ std::vector<QRectF> ParseGiftSymbols(
 		offset = end + 1;
 		return true;
 	};
+	const auto maybeTakeRotation = [&](float64 &value) {
+		const auto end = rects.indexOf("/>"_q, offset);
+		const auto pos = rects.indexOf("rotate("_q, offset);
+		if (pos > offset && end > offset && pos < end) {
+			offset = pos + 7;
+			return takeDouble(value, ')');
+		}
+		return true;
+	};
 	const auto cw = scale / float64(size.width());
 	const auto ch = scale / float64(size.height());
 	while (true) {
 		auto x = float64(), y = float64(), w = float64(), h = float64();
+		auto rotation = float64();
 		if (!jumpPast("<rect "_q)
 			|| !jumpPast("x=\""_q)
 			|| !takeDouble(x)
@@ -1050,15 +1068,16 @@ std::vector<QRectF> ParseGiftSymbols(
 			|| !takeDouble(w)
 			|| !jumpPast("height=\""_q)
 			|| !takeDouble(h)
+			|| !maybeTakeRotation(rotation)
 			|| !jumpPast("/>"_q)) {
 			break;
 		}
-		result.push_back({
+		result.push_back({ .area = {
 			x * cw,
 			y * ch,
 			w * cw,
 			h * ch,
-		});
+		}, .rotation = rotation });
 	}
 	return result;
 }
@@ -1257,17 +1276,16 @@ ChatThemeBackground PrepareBackgroundImage(
 		return QImage();
 	}
 	const auto ratio = style::DevicePixelRatio();
-	const auto size = Ui::Emoji::GetSizeNormal() / ratio;
+	const auto esize = Ui::Emoji::GetSizeLarge() / ratio;
+	const auto customSize = Ui::Text::AdjustCustomEmojiSize(esize);
 	auto result = QImage(
-		2 * QSize(size, size) * ratio,
+		QSize(customSize, customSize) * ratio,
 		QImage::Format_ARGB32_Premultiplied);
 	result.setDevicePixelRatio(ratio);
 	result.fill(Qt::transparent);
 	auto p = QPainter(&result);
-	const auto shift = (2 * size - (Ui::Emoji::GetSizeLarge() / ratio)) / 2;
 	emoji->paint(p, {
 		.textColor = QColor(0, 0, 0),
-		.position = QPoint(shift, shift),
 	});
 	return result;
 }
diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h
index 0426455780..5872613edf 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.h
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.h
@@ -26,6 +26,11 @@ class ChatStyle;
 struct ChatPaintContext;
 struct BubblePattern;
 
+struct ChatThemeGiftSymbol {
+	QRectF area;
+	float64 rotation = 0.;
+};
+
 struct ChatThemeBackground {
 	QString key;
 	QImage prepared;
@@ -33,7 +38,7 @@ struct ChatThemeBackground {
 	QImage gradientForFill;
 	std::optional<QColor> colorForFill;
 	std::vector<QColor> colors;
-	std::vector<QRectF> giftSymbols;
+	std::vector<ChatThemeGiftSymbol> giftSymbols;
 	QImage giftSymbolFrame;
 	uint64_t giftId = 0;
 	float64 patternOpacity = 1.;
@@ -97,7 +102,7 @@ struct CacheBackgroundResult {
 	int x = 0;
 	int y = 0;
 	QRect giftArea;
-	int giftRotation = 0;
+	float64 giftRotation = 0;
 	bool waitingForNegativePattern = false;
 };
 
@@ -113,7 +118,7 @@ struct CachedBackground {
 	int x = 0;
 	int y = 0;
 	QRect giftArea;
-	int giftRotation = 0;
+	float64 giftRotation = 0.;
 	mutable std::unique_ptr<Text::CustomEmoji> gift;
 	bool waitingForNegativePattern = false;
 };
@@ -256,7 +261,7 @@ struct ChatBackgroundRects {
 
 struct BackgroundImageFields {
 	QImage image;
-	std::vector<QRectF> giftSymbols;
+	std::vector<ChatThemeGiftSymbol> giftSymbols;
 };
 [[nodiscard]] BackgroundImageFields ReadBackgroundImage(
 	const QString &path,

From d0341d191bcdd0f2261a232564d23d583355ad85 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 19:22:19 +0400
Subject: [PATCH 322/341] Close selected chat in switch by Q.

---
 Telegram/SourceFiles/core/shortcuts.cpp       | 50 ++++++++-----
 .../data/components/recent_peers.cpp          |  2 +-
 .../data/components/recent_peers.h            |  2 +-
 Telegram/SourceFiles/data/data_forum.cpp      |  2 +-
 .../SourceFiles/data/data_saved_messages.cpp  |  2 +-
 .../window/window_chat_switch_process.cpp     | 75 +++++++++++++++----
 .../window/window_chat_switch_process.h       |  1 +
 7 files changed, 100 insertions(+), 34 deletions(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 9f4c053146..773b180683 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -799,12 +799,6 @@ const QStringList &Errors() {
 	return Data.errors();
 }
 
-bool HandleEvent(
-		not_null<QObject*> object,
-		not_null<QShortcutEvent*> event) {
-	return Launch(Data.lookup(object));
-}
-
 bool CancelChatSwitch(Qt::Key result) {
 	ChatSwitchModifier = Qt::Key();
 	if (!ChatSwitchStarted) {
@@ -823,6 +817,38 @@ bool NavigateChatSwitch(Qt::Key result) {
 	return true;
 }
 
+bool CheckChatSwitchEvent(Qt::Key key) {
+	const auto plain = key
+		& ~(Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier);
+	if (plain == Qt::Key_Escape) {
+		return CancelChatSwitch(Qt::Key_Escape);
+	} else if (plain == Qt::Key_Return || plain == Qt::Key_Enter) {
+		return CancelChatSwitch(Qt::Key_Enter);
+	} else if (plain == Qt::Key_Left
+		|| plain == Qt::Key_Right
+		|| plain == Qt::Key_Up
+		|| plain == Qt::Key_Down
+		|| plain == Qt::Key_Q) {
+		return NavigateChatSwitch(Qt::Key(plain));
+	}
+	return false;
+}
+
+bool HandleEvent(
+		not_null<QObject*> object,
+		not_null<QShortcutEvent*> event) {
+	if (ChatSwitchStarted) {
+		const auto key = event->key();
+		for (auto i = 0; i != key.count(); ++i) {
+			if (CheckChatSwitchEvent(Qt::Key(key[i]))) {
+				return true;
+			}
+		}
+		return false;
+	}
+	return Launch(Data.lookup(object));
+}
+
 rpl::producer<ChatSwitchRequest> ChatSwitchRequests() {
 	return ChatSwitchStream.events();
 }
@@ -875,17 +901,7 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 			}
 		}
 	} else if (type == QEvent::KeyPress) {
-		const auto key = Qt::Key(event->key());
-		if (key == Qt::Key_Escape) {
-			return CancelChatSwitch(Qt::Key_Escape);
-		} else if (key == Qt::Key_Return || key == Qt::Key_Enter) {
-			return CancelChatSwitch(Qt::Key_Enter);
-		} else if (key == Qt::Key_Left
-			|| key == Qt::Key_Right
-			|| key == Qt::Key_Up
-			|| key == Qt::Key_Down) {
-			return NavigateChatSwitch(key);
-		}
+		return CheckChatSwitchEvent(Qt::Key(event->key()));
 	} else if (type == QEvent::KeyRelease) {
 		const auto key = Qt::Key(event->key());
 		if (key == ChatSwitchModifier) {
diff --git a/Telegram/SourceFiles/data/components/recent_peers.cpp b/Telegram/SourceFiles/data/components/recent_peers.cpp
index b5e4501004..2185fd1ac2 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.cpp
+++ b/Telegram/SourceFiles/data/components/recent_peers.cpp
@@ -154,7 +154,7 @@ void RecentPeers::chatOpenPush(not_null<Thread*> thread) {
 	}
 }
 
-void RecentPeers::chatOpenDestroyed(not_null<Thread*> thread) {
+void RecentPeers::chatOpenRemove(not_null<Thread*> thread) {
 	_opens.erase(ranges::remove(_opens, thread), end(_opens));
 }
 
diff --git a/Telegram/SourceFiles/data/components/recent_peers.h b/Telegram/SourceFiles/data/components/recent_peers.h
index 624b9d3c33..9b2ad907b6 100644
--- a/Telegram/SourceFiles/data/components/recent_peers.h
+++ b/Telegram/SourceFiles/data/components/recent_peers.h
@@ -35,7 +35,7 @@ public:
 	[[nodiscard]] auto collectChatOpenHistory() const
 		-> std::vector<not_null<Thread*>>;
 	void chatOpenPush(not_null<Thread*> thread);
-	void chatOpenDestroyed(not_null<Thread*> thread);
+	void chatOpenRemove(not_null<Thread*> thread);
 	void chatOpenKeepUserpics(
 		base::flat_map<not_null<PeerData*>, Ui::PeerUserpicView> userpics);
 
diff --git a/Telegram/SourceFiles/data/data_forum.cpp b/Telegram/SourceFiles/data/data_forum.cpp
index 0038b189a2..4fa805b6e3 100644
--- a/Telegram/SourceFiles/data/data_forum.cpp
+++ b/Telegram/SourceFiles/data/data_forum.cpp
@@ -195,7 +195,7 @@ void Forum::applyTopicDeleted(MsgId rootId) {
 		_activeSubsectionTopic = nullptr;
 	}
 	_topicDestroyed.fire(raw);
-	_history->session().recentPeers().chatOpenDestroyed(raw);
+	_history->session().recentPeers().chatOpenRemove(raw);
 	session().changes().topicUpdated(
 		raw,
 		Data::TopicUpdate::Flag::Destroyed);
diff --git a/Telegram/SourceFiles/data/data_saved_messages.cpp b/Telegram/SourceFiles/data/data_saved_messages.cpp
index 571a7663da..48db91d4a9 100644
--- a/Telegram/SourceFiles/data/data_saved_messages.cpp
+++ b/Telegram/SourceFiles/data/data_saved_messages.cpp
@@ -453,7 +453,7 @@ void SavedMessages::applySublistDeleted(not_null<PeerData*> sublistPeer) {
 	}
 
 	_sublistDestroyed.fire(raw);
-	_owner->session().recentPeers().chatOpenDestroyed(raw);
+	_owner->session().recentPeers().chatOpenRemove(raw);
 	session().changes().sublistUpdated(
 		raw,
 		Data::SublistUpdate::Flag::Destroyed);
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index 81df9b7ad0..bf0a005db9 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "window/window_chat_switch_process.h"
 
+#include "core/application.h"
 #include "core/shortcuts.h"
 #include "data/components/recent_peers.h"
 #include "data/data_forum_topic.h"
@@ -20,6 +21,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/controls/userpic_button.h"
 #include "ui/painter.h"
 #include "ui/rp_widget.h"
+#include "window/window_separate_id.h"
+#include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
 #include "styles/style_layers.h"
 #include "styles/style_window.h"
@@ -54,6 +57,29 @@ private:
 
 };
 
+void CloseInWindows(not_null<Data::Thread*> thread) {
+	using WindowPointer = base::weak_ptr<Window::SessionController>;
+	auto closing = std::vector<WindowPointer>();
+	auto clearing = std::vector<WindowPointer>();
+	for (const auto window : thread->session().windows()) {
+		if (window->windowId().chat() == thread) {
+			closing.push_back(base::make_weak(window));
+		} else if (window->activeChatCurrent().thread() == thread) {
+			clearing.push_back(base::make_weak(window));
+		}
+	}
+	for (const auto window : closing) {
+		if (const auto strong = window.get()) {
+			Core::App().closeWindow(&strong->window());
+		}
+	}
+	for (const auto window : clearing) {
+		if (const auto strong = window.get()) {
+			strong->clearSectionStack();
+		}
+	}
+}
+
 Button::Button(
 	QWidget *parent,
 	not_null<Data::Thread*> thread,
@@ -180,6 +206,7 @@ void Button::mouseMoveEvent(QMouseEvent *e) {
 } // namespace
 
 struct ChatSwitchProcess::Entry {
+	not_null<Data::Thread*> thread;
 	std::unique_ptr<Button> button;
 };
 
@@ -242,6 +269,13 @@ void ChatSwitchProcess::process(const Request &request) {
 		const auto now = std::max(_selected, 0) + _shownPerRow;
 		const auto bound = (now >= _shownCount) ? (now - _shownCount) : now;
 		setSelected(bound);
+	} else if (request.action == Qt::Key_Q) {
+		if (_selected >= 0) {
+			const auto thread = _list[_selected];
+			thread->session().recentPeers().chatOpenRemove(thread);
+			remove(thread);
+			CloseInWindows(thread);
+		}
 	}
 }
 
@@ -315,7 +349,7 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 			_chosen.fire_copy(thread);
 		});
 
-		_entries.push_back({ .button = std::move(button) });
+		_entries.push_back({ thread, std::move(button) });
 
 		auto destroyed = thread->asTopic()
 			? thread->asTopic()->destroyed()
@@ -326,22 +360,37 @@ void ChatSwitchProcess::setupContent(Data::Thread *opened) {
 			continue;
 		}
 		std::move(destroyed) | rpl::start_with_next([=] {
-			_list.erase(ranges::remove(_list, thread), end(_list));
-			if (const auto i = find(raw); i != end(_entries)) {
-				const auto index = int(i - begin(_entries));
-				if (_selected > index) {
-					--_selected;
-				} else if (_selected == index) {
-					_selected = -1;
-				}
-
-				_entries.erase(i);
-				layout(_widget->size());
-			}
+			remove(thread);
 		}, raw->lifetime());
 	}
 }
 
+void ChatSwitchProcess::remove(not_null<Data::Thread*> thread) {
+	_list.erase(ranges::remove(_list, thread), end(_list));
+
+	const auto i = ranges::find(_entries, thread, &Entry::thread);
+	if (i != end(_entries)) {
+		const auto selected = _selected;
+		const auto index = int(i - begin(_entries));
+		if (_selected > index) {
+			--_selected;
+		} else if (_selected == index) {
+			_selected = -1;
+		}
+
+		_entries.erase(i);
+		const auto weak = base::make_weak(_widget.get());
+		layout(_widget->size());
+		if (weak && _selected < 0 && selected > 0) {
+			if (_entries.empty()) {
+				_closeRequests.fire({});
+			} else {
+				setSelected(std::min(selected - 1, _shownCount - 1));
+			}
+		}
+	}
+}
+
 void ChatSwitchProcess::setupView() {
 	_widget->sizeValue() | rpl::start_with_next([=](QSize size) {
 		layout(size);
diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.h b/Telegram/SourceFiles/window/window_chat_switch_process.h
index 36c5f24c75..9a73c16e16 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.h
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.h
@@ -54,6 +54,7 @@ private:
 	void setupView();
 
 	void layout(QSize size);
+	void remove(not_null<Data::Thread*> thread);
 
 	void setSelected(int index);
 

From 4b2d0d1a6792bd8334d280f55cd7eaf2ae3c8955 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 2 Sep 2025 21:36:08 +0400
Subject: [PATCH 323/341] Allow a bit more theme previews.

---
 Telegram/SourceFiles/data/data_document.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Telegram/SourceFiles/data/data_document.cpp b/Telegram/SourceFiles/data/data_document.cpp
index 0d8a7799d4..937ebd892f 100644
--- a/Telegram/SourceFiles/data/data_document.cpp
+++ b/Telegram/SourceFiles/data/data_document.cpp
@@ -1744,6 +1744,7 @@ bool DocumentData::isTheme() const {
 		|| _filename.endsWith(u".tdesktop-palette"_q, Qt::CaseInsensitive)
 		|| (hasMimeType(u"application/x-tgtheme-tdesktop"_q)
 			&& (_filename.isEmpty()
+				|| !_filename.contains('.')
 				|| _nameType == Core::NameType::ThemeFile));
 }
 

From 2164d08c3cd5ca1317dd28dcf86c37928ae5e238 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 11:28:21 +0400
Subject: [PATCH 324/341] Fixed a crash in gifts section closing.

Fixes #29737.
---
 Telegram/SourceFiles/info/info_wrap_widget.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp
index 26c7fe9e3a..ae59c84cba 100644
--- a/Telegram/SourceFiles/info/info_wrap_widget.cpp
+++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp
@@ -291,6 +291,10 @@ Dialogs::RowDescriptor WrapWidget::activeChat() const {
 			: Dialogs::RowDescriptor(
 				storiesPeer->owner().history(storiesPeer),
 				FullMsgId());
+	} else if (const auto giftsPeer = key().giftsPeer()) {
+		return Dialogs::RowDescriptor(
+			giftsPeer->owner().history(giftsPeer),
+			FullMsgId());
 	} else if (const auto musicPeer = key().musicPeer()) {
 		return Dialogs::RowDescriptor(
 			musicPeer->owner().history(musicPeer),

From 9960a7a7e484e57580998486d901a5920ceac4da Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 09:53:18 +0400
Subject: [PATCH 325/341] Remove unneeded openssl/engine.h include.

---
 Telegram/SourceFiles/core/utils.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/utils.cpp b/Telegram/SourceFiles/core/utils.cpp
index c4d0b76fab..caeb3a19b3 100644
--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@@ -15,7 +15,6 @@ extern "C" {
 #include <openssl/sha.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/engine.h>
 #include <openssl/conf.h>
 #include <openssl/ssl.h>
 #include <openssl/rand.h>

From 180a570f997d7f3ae1061c9f832f87626e3e7efd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 09:53:51 +0400
Subject: [PATCH 326/341] Handle robustly Ctrl+Q/Ctrl+Arrows in Ctrl+Tab chat
 switch.

---
 Telegram/SourceFiles/core/shortcuts.cpp | 87 +++++++++++++++++++++----
 1 file changed, 73 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index 773b180683..d27561b391 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -7,14 +7,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "core/shortcuts.h"
 
+#include "base/platform/base_platform_info.h"
+#include "base/event_filter.h"
+#include "base/parse_helper.h"
+#include "core/application.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "window/window_controller.h"
-#include "core/application.h"
 #include "media/player/media_player_instance.h"
-#include "base/platform/base_platform_info.h"
 #include "platform/platform_specific.h"
-#include "base/parse_helper.h"
 
 #include <QAction>
 #include <QShortcut>
@@ -30,9 +31,18 @@ constexpr auto kCountLimit = 256; // How many shortcuts can be in json file.
 rpl::event_stream<not_null<Request*>> RequestsStream;
 bool Paused/* = false*/;
 
+const auto kChatSwitchSpecialKeys = std::array{
+	Qt::Key_Left,
+	Qt::Key_Right,
+	Qt::Key_Up,
+	Qt::Key_Down,
+	Qt::Key_Q,
+};
 Qt::Key ChatSwitchModifier/* = Qt::Key()*/;
 bool ChatSwitchStarted/* = false*/;
+QObject *ChatSwitchFilter/* = nullptr*/;
 rpl::event_stream<ChatSwitchRequest> ChatSwitchStream;
+std::array<Qt::Key, kChatSwitchSpecialKeys.size()> ChatSwitchKeyPressHandled;
 
 const auto AutoRepeatCommands = base::flat_set<Command>{
 	Command::MediaPrevious,
@@ -799,12 +809,31 @@ const QStringList &Errors() {
 	return Data.errors();
 }
 
+bool MarkChatSwitchKeyPressHandled(Qt::Key key, bool handled) {
+	if (handled) {
+		if (ranges::contains(ChatSwitchKeyPressHandled, key)) {
+			return false;
+		}
+		const auto i = ranges::find(ChatSwitchKeyPressHandled, Qt::Key(0));
+		Assert(i != end(ChatSwitchKeyPressHandled));
+		*i = key;
+		return true;
+	}
+	const auto i = ranges::find(ChatSwitchKeyPressHandled, key);
+	if (i == end(ChatSwitchKeyPressHandled)) {
+		return false;
+	}
+	*i = Qt::Key(0);
+	return true;
+}
+
 bool CancelChatSwitch(Qt::Key result) {
 	ChatSwitchModifier = Qt::Key();
 	if (!ChatSwitchStarted) {
 		return false;
 	}
 	ChatSwitchStarted = false;
+	delete base::take(ChatSwitchFilter);
 	ChatSwitchStream.fire({ .action = result });
 	return true;
 }
@@ -818,17 +847,18 @@ bool NavigateChatSwitch(Qt::Key result) {
 }
 
 bool CheckChatSwitchEvent(Qt::Key key) {
-	const auto plain = key
-		& ~(Qt::ControlModifier | Qt::ShiftModifier | Qt::AltModifier);
-	if (plain == Qt::Key_Escape) {
+	const auto plain = Qt::Key(int(key)
+		& ~(Qt::ControlModifier
+			| Qt::ShiftModifier
+			| Qt::AltModifier
+			| Qt::MetaModifier));
+	if (MarkChatSwitchKeyPressHandled(plain, false)) {
+		return true;
+	} else if (plain == Qt::Key_Escape) {
 		return CancelChatSwitch(Qt::Key_Escape);
 	} else if (plain == Qt::Key_Return || plain == Qt::Key_Enter) {
 		return CancelChatSwitch(Qt::Key_Enter);
-	} else if (plain == Qt::Key_Left
-		|| plain == Qt::Key_Right
-		|| plain == Qt::Key_Up
-		|| plain == Qt::Key_Down
-		|| plain == Qt::Key_Q) {
+	} else if (ranges::contains(kChatSwitchSpecialKeys, plain)) {
 		return NavigateChatSwitch(Qt::Key(plain));
 	}
 	return false;
@@ -838,9 +868,14 @@ bool HandleEvent(
 		not_null<QObject*> object,
 		not_null<QShortcutEvent*> event) {
 	if (ChatSwitchStarted) {
-		const auto key = event->key();
-		for (auto i = 0; i != key.count(); ++i) {
-			if (CheckChatSwitchEvent(Qt::Key(key[i]))) {
+		const auto full = event->key();
+		for (auto i = 0; i != full.count(); ++i) {
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+			const auto raw = full[i].key();
+#else // Qt >= 6.0.0
+			const auto raw = full[i];
+#endif // Qt < 6.0.0
+			if (CheckChatSwitchEvent(Qt::Key(raw))) {
 				return true;
 			}
 		}
@@ -862,6 +897,22 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 		const auto ctrl = Platform::IsMac()
 			? Qt::MetaModifier
 			: Qt::ControlModifier;
+		if ((event->modifiers() & ctrl)
+			&& ranges::contains(kChatSwitchSpecialKeys, key)) {
+			// For Ctrl+Q in case of active chat switch we have
+			// on Windows always ShortcutOverride + KeyPress,
+			// while on macOS we have just ShortcutOverride for
+			// the first press and KeyPress only for repeat events.
+			//
+			// This complex scheme allows to handle both cases with
+			// firing the switch event Key_Q exactly once initially.
+			if (CheckChatSwitchEvent(key)) {
+				MarkChatSwitchKeyPressHandled(key, true);
+			}
+			crl::on_main([=] {
+				MarkChatSwitchKeyPressHandled(key, false);
+			});
+		}
 		if (Data.handles(QKeySequence(ctrl | Qt::Key_Tab))
 			&& (Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Backtab)
 				|| Data.handles(ctrl | Qt::ShiftModifier | Qt::Key_Tab)
@@ -893,6 +944,14 @@ bool HandlePossibleChatSwitch(not_null<QKeyEvent*> event) {
 					return false;
 				}
 				const auto started = !std::exchange(ChatSwitchStarted, true);
+				if (started) {
+					Assert(!ChatSwitchFilter);
+					ChatSwitchFilter = base::install_event_filter(qApp, [=](not_null<QEvent*> e) {
+						return (e->type() == QEvent::InputMethod)
+							? base::EventFilterResult::Cancel
+							: base::EventFilterResult::Continue;
+					});
+				}
 				ChatSwitchStream.fire({
 					.action = action,
 					.started = started,

From 82c921d7394d544d66f63309bd67558434723a58 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 12:00:49 +0400
Subject: [PATCH 327/341] Fix build with Xcode.

---
 Telegram/SourceFiles/window/window_chat_switch_process.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/window/window_chat_switch_process.cpp b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
index bf0a005db9..cbbab0025b 100644
--- a/Telegram/SourceFiles/window/window_chat_switch_process.cpp
+++ b/Telegram/SourceFiles/window/window_chat_switch_process.cpp
@@ -68,12 +68,12 @@ void CloseInWindows(not_null<Data::Thread*> thread) {
 			clearing.push_back(base::make_weak(window));
 		}
 	}
-	for (const auto window : closing) {
+	for (const auto &window : closing) {
 		if (const auto strong = window.get()) {
 			Core::App().closeWindow(&strong->window());
 		}
 	}
-	for (const auto window : clearing) {
+	for (const auto &window : clearing) {
 		if (const auto strong = window.get()) {
 			strong->clearSectionStack();
 		}

From d4dd1b7ba020c9ece846b60fe1070cbbddcd4aae Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 11:48:30 +0400
Subject: [PATCH 328/341] Fix build with GCC.

---
 Telegram/SourceFiles/ui/chat/chat_theme.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.cpp b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
index be462c8557..0d1424d4a1 100644
--- a/Telegram/SourceFiles/ui/chat/chat_theme.cpp
+++ b/Telegram/SourceFiles/ui/chat/chat_theme.cpp
@@ -56,14 +56,6 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 	return (doubled % 2) ? 0.5 : 1.;
 }
 
-[[nodiscard]] int RotationForSymbol(const QRectF &symbol) {
-	const auto a = int(base::SafeRound(symbol.x() * 255));
-	const auto b = int(base::SafeRound(symbol.y() * 255));
-	const auto value = uint16((uint16(a) << 8) | uint16(b));
-	const auto shuffled = uint16(value << 5) | uint16(value >> 3);
-	return (shuffled % 60) - 30;
-}
-
 [[nodiscard]] int ChooseGiftSymbolSkip(
 		const std::vector<ChatThemeGiftSymbol> &symbols) {
 	if (symbols.empty()) {
@@ -141,7 +133,6 @@ constexpr auto kMinAcceptableContrast = 1.14;// 4.5;
 			const auto giftSymbolsCount = int(giftSymbols.size());
 			const auto giftSymbolSkip = ChooseGiftSymbolSkip(giftSymbols);
 			const auto &giftSymbolFrame = request.background.giftSymbolFrame;
-			const auto giftSymbolSize = giftSymbolFrame.size() / ratio;
 			const auto giftSymbolRect = [&](const QRectF &symbol) {
 				return QRectF(
 					symbol.x() * w,

From fb1f70f5dedfd50cb2af5c34a97f3019857946c1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 12:01:05 +0400
Subject: [PATCH 329/341] Version 6.1.2.

- Close selected chat in Ctrl+Tab chat switch by 'Q'.
- Auto-split pasted multiple lines to checklist task creation.
- Fix color picker in userpic builder.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 6 ++++++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index bd91d859d6..c982c9f3b5 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.1.1.0" />
+    Version="6.1.2.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index ce792100b7..4b4e760d04 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,1,0
- PRODUCTVERSION 6,1,1,0
+ FILEVERSION 6,1,2,0
+ PRODUCTVERSION 6,1,2,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.1.1.0"
+            VALUE "FileVersion", "6.1.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.1.1.0"
+            VALUE "ProductVersion", "6.1.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index eb97925dfa..7bc8e8c21f 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,1,0
- PRODUCTVERSION 6,1,1,0
+ FILEVERSION 6,1,2,0
+ PRODUCTVERSION 6,1,2,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.1.1.0"
+            VALUE "FileVersion", "6.1.2.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.1.1.0"
+            VALUE "ProductVersion", "6.1.2.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 3dd21b6f26..ff0176a01f 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6001001;
-constexpr auto AppVersionStr = "6.1.1";
+constexpr auto AppVersion = 6001002;
+constexpr auto AppVersionStr = "6.1.2";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index e59237ce1a..54bca7ae90 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6001001
+AppVersion         6001002
 AppVersionStrMajor 6.1
-AppVersionStrSmall 6.1.1
-AppVersionStr      6.1.1
+AppVersionStrSmall 6.1.2
+AppVersionStr      6.1.2
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 6.1.1
+AppVersionOriginal 6.1.2
diff --git a/changelog.txt b/changelog.txt
index 2415440069..850ca038fb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+6.1.2 (02.09.25)
+
+- Close selected chat in Ctrl+Tab chat switch by 'Q'.
+- Auto-split pasted multiple lines to checklist task creation.
+- Fix color picker in userpic builder.
+
 6.1.1 (01.09.25)
 
 - Ctrl+Tab / Ctrl+Shift+Tab collect chats on every launch.

From 0babad837d958c7dd2b4540deec7e8d3af590f67 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 4 Sep 2025 13:03:25 +0400
Subject: [PATCH 330/341] Remove legacy "quicklaunchicon" InnoSetup task.

---
 Telegram/build/setup.iss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss
index d2c75fa1b4..8d611de70c 100644
--- a/Telegram/build/setup.iss
+++ b/Telegram/build/setup.iss
@@ -68,7 +68,6 @@ Name: "ua";      MessagesFile: "compiler:Languages\Ukrainian.isl"
 
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
-Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; OnlyBelowVersion: 0,6.1
 
 [Files]
 Source: "{#ReleasePath}\Telegram.exe"; DestDir: "{app}"; Flags: ignoreversion

From 08a64f0dc09c4ecb1fc01b9a8802b2ba8def3810 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 4 Sep 2025 13:05:37 +0300
Subject: [PATCH 331/341] Fixed color of lottie icon from transcribe voices
 while loading.

---
 .../SourceFiles/history/view/media/history_view_document.cpp    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index e6e2a026f9..41eeb0be46 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -447,6 +447,8 @@ QSize Document::countOptimalSize() {
 				? Lottie::IconDescriptor{
 					.name = u"transcribe_loading"_q,
 					.sizeOverride = Size(st::historyTranscribeLoadingSize),
+					.color = &st::historyTextInFg,
+					.colorizeUsingAlpha = true,
 				}
 				: Lottie::IconDescriptor();
 			auto text = (entry.requestId || !entry.shown)

From a785d837913f7c69e761ffaa9ec842cf10f29b8a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 6 Sep 2025 08:36:35 +0400
Subject: [PATCH 332/341] Don't cancel special KeyPress events (key = 0).

I hope this fixes #29747, #29745, #29744, #29743, #29741.
---
 Telegram/SourceFiles/core/shortcuts.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/core/shortcuts.cpp b/Telegram/SourceFiles/core/shortcuts.cpp
index d27561b391..fe12804c08 100644
--- a/Telegram/SourceFiles/core/shortcuts.cpp
+++ b/Telegram/SourceFiles/core/shortcuts.cpp
@@ -810,7 +810,9 @@ const QStringList &Errors() {
 }
 
 bool MarkChatSwitchKeyPressHandled(Qt::Key key, bool handled) {
-	if (handled) {
+	if (!key) {
+		return false;
+	} else if (handled) {
 		if (ranges::contains(ChatSwitchKeyPressHandled, key)) {
 			return false;
 		}

From e6665a8305dc9b9af957afa25938b635b8b80a2b Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 27 Aug 2025 15:54:29 +0000
Subject: [PATCH 333/341] Fix playing audio files via webkitgtk in snap

---
 snap/snapcraft.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index bb2b093ea4..ee60e21a3c 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -27,6 +27,10 @@ apps:
     slots:
       - mpris
 
+layout:
+  /var/tmp:
+    type: tmpfs
+
 parts:
   telegram:
     plugin: cmake

From 09fb42291df403093960a428011dbc4f0d6fc023 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Mon, 1 Sep 2025 01:09:50 +0400
Subject: [PATCH 334/341] Revert "Self-build openh264 in snap for lesser
 package size"

This reverts commit a8430d8ecf52820db4af881566ee250df8f2a6dc.
---
 snap/snapcraft.yaml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index ee60e21a3c..373b64cf32 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -99,11 +99,13 @@ parts:
     plugin: nil
     stage-packages:
       - libgeoclue-2-0
+      - libopenh264-7
       - libxcb-cursor0
       - libxcb-record0
       - libxcb-screensaver0
     stage:
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-record.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-screensaver.so*
@@ -157,6 +159,7 @@ parts:
     build-packages:
       - nasm
       - libdav1d-dev
+      - libopenh264-dev
       - libopus-dev
       - libvdpau-dev
       - libvpx-dev
@@ -166,7 +169,6 @@ parts:
       - --libdir=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
       - --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
       - --extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1"
-      - --extra-ldflags="-Wl,--push-state,--no-as-needed,-lstdc++,--pop-state"
       - --disable-debug
       - --disable-programs
       - --disable-doc
@@ -305,7 +307,6 @@ parts:
     prime: [-./*]
     after:
       - nv-codec-headers
-      - openh264
 
   jpegli:
     source: https://github.com/libjxl/libjxl.git
@@ -374,19 +375,6 @@ parts:
       - LIBDIR=lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR
     prime: [-./*]
 
-  openh264:
-    source: https://github.com/cisco/openh264.git
-    source-depth: 1
-    source-tag: v2.6.0
-    plugin: meson
-    build-packages:
-      - meson
-    meson-parameters:
-      - --prefix=/usr
-      - --buildtype=release
-      - --default-library=static
-    prime: [-./*]
-
   protobuf:
     source: https://github.com/protocolbuffers/protobuf.git
     source-depth: 1
@@ -490,6 +478,7 @@ parts:
     source-commit: 62321fd7128ab2650b459d4195781af8185e46b5
     plugin: cmake
     build-packages:
+      - libopenh264-dev
       - libopus-dev
       - libpipewire-0.3-dev
       - libssl-dev
@@ -502,4 +491,3 @@ parts:
     after:
       - ffmpeg
       - jpegli
-      - openh264

From 929032d598f7c521adc1869152463cf9e1160533 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sun, 31 Aug 2025 21:16:47 +0000
Subject: [PATCH 335/341] Add GStreamer H264, H265, AAC and VA-API plugins to
 snap

---
 snap/snapcraft.yaml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 373b64cf32..e5667732f7 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -98,12 +98,21 @@ parts:
   pkgs:
     plugin: nil
     stage-packages:
+      - gstreamer1.0-fdkaac
+      - gstreamer1.0-plugins-bad
       - libgeoclue-2-0
       - libopenh264-7
       - libxcb-cursor0
       - libxcb-record0
       - libxcb-screensaver0
     stage:
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstde265.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstfdkaac.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstopenh264.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstsubenc.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstva.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gstreamer-1.0/libgstvideoparsersbad.so
+      - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libfdk-aac.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libgeoclue-2.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libopenh264.so*
       - ./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libxcb-cursor.so*

From 9eb5ea599e18c71788fd6635fae8c37c8ae932dd Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 5 Sep 2025 10:24:22 +0400
Subject: [PATCH 336/341] Fix build with MSVC.

---
 .../SourceFiles/history/view/media/history_view_document.cpp    | 2 +-
 Telegram/build/setup.iss                                        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Telegram/SourceFiles/history/view/media/history_view_document.cpp b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
index 41eeb0be46..445d414782 100644
--- a/Telegram/SourceFiles/history/view/media/history_view_document.cpp
+++ b/Telegram/SourceFiles/history/view/media/history_view_document.cpp
@@ -446,8 +446,8 @@ QSize Document::countOptimalSize() {
 			auto descriptor = pending
 				? Lottie::IconDescriptor{
 					.name = u"transcribe_loading"_q,
-					.sizeOverride = Size(st::historyTranscribeLoadingSize),
 					.color = &st::historyTextInFg,
+					.sizeOverride = Size(st::historyTranscribeLoadingSize),
 					.colorizeUsingAlpha = true,
 				}
 				: Lottie::IconDescriptor();
diff --git a/Telegram/build/setup.iss b/Telegram/build/setup.iss
index 8d611de70c..5c304b5729 100644
--- a/Telegram/build/setup.iss
+++ b/Telegram/build/setup.iss
@@ -81,7 +81,6 @@ Source: "{#ReleasePath}\{#ModulesFolder}\d3d\d3dcompiler_47.dll"; DestDir: "{app
 Name: "{group}\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{group}\{cm:UninstallProgram,{#MyAppShortName}}"; Filename: "{uninstallexe}"
 Name: "{userdesktop}\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppShortName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppShortName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

From e3c328c7e3a6d854968733bb552db875cdc2aa4f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 6 Sep 2025 11:32:31 +0300
Subject: [PATCH 337/341] Reverted "Removed ability to clear history from
 replies chat.".

This reverts commit 86daf2a9dc09d480c098cd6064153003061a2260.
---
 Telegram/SourceFiles/window/window_peer_menu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index 9a38fa0ef9..dab3191684 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -733,7 +733,7 @@ void Filler::addToggleArchive() {
 }
 
 void Filler::addClearHistory() {
-	if (_topic || _peer->isMonoforum() || _peer->isRepliesChat()) {
+	if (_topic || _peer->isMonoforum()) {
 		return;
 	}
 	const auto channel = _peer->asChannel();

From 512e6de39b4ff056b95d87d7aad4df0fb3be0e75 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sat, 6 Sep 2025 19:08:31 +0300
Subject: [PATCH 338/341] Fixed position of tag preview in chats filter
 settings.

Fixed #29750.
---
 Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp | 3 ++-
 Telegram/SourceFiles/settings/settings.style           | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
index be4531aec5..7584c9f137 100644
--- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
+++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp
@@ -40,6 +40,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/filter_icons.h"
 #include "ui/layers/generic_box.h"
 #include "ui/painter.h"
+#include "ui/rect.h"
 #include "ui/power_saving.h"
 #include "ui/vertical_list.h"
 #include "ui/widgets/buttons.h"
@@ -593,7 +594,7 @@ void EditFilterBox(
 		) | rpl::start_with_next([=](const QRect &r) {
 			const auto h = st::normalFont->height;
 			preview->setGeometry(
-				colors->x(),
+				rect::right(colors) - st::settingsFilterTagPreviewSkip,
 				r.y() + (r.height() - h) / 2 + st::lineWidth,
 				colors->width(),
 				h);
diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style
index 817a7d8fa1..b7b39b372a 100644
--- a/Telegram/SourceFiles/settings/settings.style
+++ b/Telegram/SourceFiles/settings/settings.style
@@ -311,6 +311,8 @@ settingsFilterDividerLabelPadding: margins(0px, 16px, 0px, 22px);
 settingsFilterIconSize: 74px;
 settingsFilterIconPadding: margins(0px, 17px, 0px, 5px);
 
+settingsFilterTagPreviewSkip: 14px;
+
 settingsDeviceName: InputField(defaultInputField) {
 	textBg: transparent;
 	textMargins: margins(1px, 3px, 1px, 4px);

From 2740c5db239f35cbc01846535b3cabd293b828f0 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 7 Sep 2025 01:09:57 +0300
Subject: [PATCH 339/341] Extracted URL protocol stripping to
 Ui::Text::StripUrlProtocol.

---
 .../info/bot/starref/info_bot_starref_common.cpp            | 6 +-----
 Telegram/lib_ui                                             | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
index 18a9de42aa..b134eaf526 100644
--- a/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
+++ b/Telegram/SourceFiles/info/bot/starref/info_bot_starref_common.cpp
@@ -393,11 +393,7 @@ object_ptr<Ui::AbstractButton> MakeLinkLabel(
 		const QString &link,
 		const style::InputField *stOverride) {
 	const auto &st = stOverride ? *stOverride : st::dialogsFilter;
-	const auto text = link.startsWith(u"https://"_q)
-		? link.mid(8)
-		: link.startsWith(u"http://"_q)
-		? link.mid(7)
-		: link;
+	const auto text = Ui::Text::StripUrlProtocol(link);
 	const auto margins = st.textMargins;
 	const auto height = st.heightMin;
 	const auto skip = margins.left();
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index e79c2cc66d..ca5daff64b 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit e79c2cc66de149d1193c26ad691fa5c834d1d4f7
+Subproject commit ca5daff64b73ca78763e02bcc44fffdec7e44727

From 8db1bf9052e0089247920c5b6e4bb5720c649dc5 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Sun, 7 Sep 2025 00:33:30 +0300
Subject: [PATCH 340/341] Added ability to share link for monoforum of owned
 channels.

---
 Telegram/Resources/langs/lang.strings         |   1 +
 .../SourceFiles/boxes/edit_privacy_box.cpp    | 101 ++++++++++++++----
 2 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings
index 3d7169c2b9..65492b1c0a 100644
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -1950,6 +1950,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_manage_monoforum_price" = "Price for each message";
 "lng_manage_monoforum_about" = "Allow users to send messages to your channel, with the option to charge a fee for each message.";
 "lng_manage_monoforum_price_about" = "Your channel will receive {percent} of the selected fee ({amount}) for each incoming message.";
+"lng_manage_monoforum_link_subtitle" = "Link to direct messages";
 
 "lng_manage_history_visibility_title" = "Chat history for new members";
 "lng_manage_history_visibility_shown" = "Visible";
diff --git a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
index be19114412..411f4b1e36 100644
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.cpp
@@ -8,37 +8,42 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "boxes/edit_privacy_box.h"
 
 #include "api/api_global_privacy.h"
+#include "apiwrap.h"
 #include "boxes/filters/edit_filter_chats_list.h"
-#include "ui/effects/premium_graphics.h"
-#include "ui/layers/generic_box.h"
-#include "ui/widgets/checkbox.h"
-#include "ui/widgets/continuous_sliders.h"
-#include "ui/widgets/shadow.h"
-#include "ui/text/format_values.h"
-#include "ui/text/text_utilities.h"
-#include "ui/toast/toast.h"
-#include "ui/wrap/slide_wrap.h"
-#include "ui/painter.h"
-#include "ui/vertical_list.h"
+#include "boxes/peers/edit_peer_invite_link.h"
+#include "data/data_channel.h"
+#include "data/data_chat.h"
+#include "data/data_peer_values.h"
+#include "data/data_user.h"
 #include "history/history.h"
-#include "boxes/peer_list_controllers.h"
+#include "lang/lang_keys.h"
+#include "main/main_app_config.h"
+#include "main/main_session.h"
 #include "settings/settings_premium.h"
 #include "settings/settings_privacy_controllers.h"
 #include "settings/settings_privacy_security.h"
-#include "calls/calls_instance.h"
-#include "lang/lang_keys.h"
-#include "apiwrap.h"
-#include "main/main_app_config.h"
-#include "main/main_session.h"
-#include "data/data_user.h"
-#include "data/data_chat.h"
-#include "data/data_channel.h"
-#include "data/data_peer_values.h"
+#include "ui/boxes/peer_qr_box.h"
+#include "ui/controls/invite_link_buttons.h"
+#include "ui/controls/invite_link_label.h"
+#include "ui/effects/premium_graphics.h"
+#include "ui/layers/generic_box.h"
+#include "ui/painter.h"
+#include "ui/text/format_values.h"
+#include "ui/text/text_utilities.h"
+#include "ui/toast/toast.h"
+#include "ui/vertical_list.h"
+#include "ui/widgets/buttons.h"
+#include "ui/widgets/checkbox.h"
+#include "ui/widgets/continuous_sliders.h"
+#include "ui/widgets/popup_menu.h"
+#include "ui/widgets/shadow.h"
+#include "ui/wrap/slide_wrap.h"
 #include "window/window_session_controller.h"
 #include "styles/style_boxes.h"
-#include "styles/style_settings.h"
+#include "styles/style_info.h"
 #include "styles/style_layers.h"
 #include "styles/style_menu_icons.h"
+#include "styles/style_settings.h"
 #include "styles/style_window.h"
 
 namespace {
@@ -1312,6 +1317,58 @@ void EditDirectMessagesPriceBox(
 		*result = stars;
 	}, box->lifetime());
 
+	if (const auto username = channel->username(); !username.isEmpty()) {
+		Ui::AddSkip(inner);
+		Ui::AddSubsectionTitle(
+			inner,
+			tr::lng_manage_monoforum_link_subtitle());
+
+		constexpr auto kDirectParam = "?direct"_cs;
+		const auto link = channel->session().createInternalLinkFull(username)
+			+ kDirectParam.utf8();
+		const auto copyLink = [=] {
+			TextUtilities::SetClipboardText(TextForMimeData::Simple(link));
+			box->uiShow()->showToast(tr::lng_group_invite_copied(tr::now));
+		};
+		const auto shareLink = [=] {
+			box->uiShow()->showBox(ShareInviteLinkBox(channel, link));
+		};
+		const auto createMenu = [=] {
+			auto result = base::make_unique_q<Ui::PopupMenu>(
+				inner,
+				st::popupMenuWithIcons);
+			result->addAction(
+				tr::lng_group_invite_context_qr(tr::now),
+				[=] {
+					box->uiShow()->showBox(Box([=](
+							not_null<Ui::GenericBox*> qrBox) {
+						Ui::FillPeerQrBox(qrBox, channel, link, nullptr);
+					}));
+				},
+				&st::menuIconQrCode);
+			return result;
+		};
+
+		auto linkText = Ui::Text::StripUrlProtocol(link);
+		const auto label = inner->lifetime().make_state<Ui::InviteLinkLabel>(
+			inner,
+			rpl::single(std::move(linkText)),
+			createMenu);
+		inner->add(
+			label->take(),
+			st::inviteLinkFieldPadding);
+
+		label->clicks() | rpl::start_with_next(copyLink, label->lifetime());
+
+		Ui::AddSkip(inner);
+
+		AddCopyShareLinkButtons(inner, copyLink, shareLink);
+		Ui::AddSkip(inner);
+		Ui::AddSkip(inner);
+
+		Ui::AddDivider(inner);
+	}
+
 	box->addButton(tr::lng_settings_save(), [=] {
 		const auto weak = base::make_weak(box);
 		callback(toggle->toggled() ? *result : std::optional<int>());

From 6229c0020cd3cb7aec62f4afc25926928a5958d8 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 6 Sep 2025 08:41:57 +0400
Subject: [PATCH 341/341] Version 6.1.3.

- Fix dead keys / alt combinations / input methods issues.
---
 Telegram/Resources/uwp/AppX/AppxManifest.xml | 2 +-
 Telegram/Resources/winrc/Telegram.rc         | 8 ++++----
 Telegram/Resources/winrc/Updater.rc          | 8 ++++----
 Telegram/SourceFiles/core/version.h          | 4 ++--
 Telegram/build/version                       | 8 ++++----
 changelog.txt                                | 4 ++++
 6 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index c982c9f3b5..a95c99b9d6 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/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.1.2.0" />
+    Version="6.1.3.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 4b4e760d04..01f6cc1ca8 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,2,0
- PRODUCTVERSION 6,1,2,0
+ FILEVERSION 6,1,3,0
+ PRODUCTVERSION 6,1,3,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.1.2.0"
+            VALUE "FileVersion", "6.1.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.1.2.0"
+            VALUE "ProductVersion", "6.1.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 7bc8e8c21f..e1fc0ae367 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,1,2,0
- PRODUCTVERSION 6,1,2,0
+ FILEVERSION 6,1,3,0
+ PRODUCTVERSION 6,1,3,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.1.2.0"
+            VALUE "FileVersion", "6.1.3.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2025"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "6.1.2.0"
+            VALUE "ProductVersion", "6.1.3.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index ff0176a01f..3ce82cbd0f 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 6001002;
-constexpr auto AppVersionStr = "6.1.2";
+constexpr auto AppVersion = 6001003;
+constexpr auto AppVersionStr = "6.1.3";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/build/version b/Telegram/build/version
index 54bca7ae90..e9e0a6b3d1 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         6001002
+AppVersion         6001003
 AppVersionStrMajor 6.1
-AppVersionStrSmall 6.1.2
-AppVersionStr      6.1.2
+AppVersionStrSmall 6.1.3
+AppVersionStr      6.1.3
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 6.1.2
+AppVersionOriginal 6.1.3
diff --git a/changelog.txt b/changelog.txt
index 850ca038fb..2709b491af 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+6.1.3 (06.09.25)
+
+- Fix dead keys / alt combinations / input methods issues.
+
 6.1.2 (02.09.25)
 
 - Close selected chat in Ctrl+Tab chat switch by 'Q'.