diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
index 3a9d2ec92..167bbf73c 100644
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
+ Version="5.4.2.0" />
Telegram Desktop
Telegram Messenger LLP
diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 07aed63b5..c46ba875d 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,4,1,0
- PRODUCTVERSION 5,4,1,0
+ FILEVERSION 5,4,2,0
+ PRODUCTVERSION 5,4,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", "5.4.1.0"
+ VALUE "FileVersion", "5.4.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2024"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "5.4.1.0"
+ VALUE "ProductVersion", "5.4.2.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index ef100d47b..a92ca50ab 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,4,1,0
- PRODUCTVERSION 5,4,1,0
+ FILEVERSION 5,4,2,0
+ PRODUCTVERSION 5,4,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", "5.4.1.0"
+ VALUE "FileVersion", "5.4.2.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2024"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "5.4.1.0"
+ VALUE "ProductVersion", "5.4.2.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 1f4403d66..233b4d7f3 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 = 5004001;
-constexpr auto AppVersionStr = "5.4.1";
-constexpr auto AppBetaVersion = false;
+constexpr auto AppVersion = 5004002;
+constexpr auto AppVersionStr = "5.4.2";
+constexpr auto AppBetaVersion = true;
constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
index ffa8fc01b..c874eb3a9 100644
--- a/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
+++ b/Telegram/SourceFiles/payments/ui/payments_reaction_box.cpp
@@ -38,6 +38,19 @@ namespace {
constexpr auto kMaxTopPaidShown = 3;
+struct TopReactorKey {
+ std::shared_ptr photo;
+ int count = 0;
+ QString name;
+
+ friend inline auto operator<=>(
+ const TopReactorKey &,
+ const TopReactorKey &) = default;
+ friend inline bool operator==(
+ const TopReactorKey &,
+ const TopReactorKey &) = default;
+};
+
struct Discreter {
Fn ratioToValue;
Fn valueToRatio;
@@ -249,14 +262,7 @@ void FillTopReactors(
object_ptr(container, height),
st::paidReactTopMargin));
const auto parent = wrap->entity();
- struct Key {
- std::shared_ptr photo;
- int count = 0;
- QString name;
-
- inline auto operator<=>(const Key &) const = default;
- inline bool operator==(const Key &) const = default;
- };
+ using Key = TopReactorKey;
struct State {
base::flat_map> cache;
std::vector> widgets;
diff --git a/Telegram/build/version b/Telegram/build/version
index 2027f103c..4e89ffc19 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion 5004001
+AppVersion 5004002
AppVersionStrMajor 5.4
-AppVersionStrSmall 5.4.1
-AppVersionStr 5.4.1
-BetaChannel 0
+AppVersionStrSmall 5.4.2
+AppVersionStr 5.4.2
+BetaChannel 1
AlphaVersion 0
-AppVersionOriginal 5.4.1
+AppVersionOriginal 5.4.2.beta
diff --git a/Telegram/lib_ui b/Telegram/lib_ui
index ebbb3aa22..a9d398f50 160000
--- a/Telegram/lib_ui
+++ b/Telegram/lib_ui
@@ -1 +1 @@
-Subproject commit ebbb3aa22d59f73daa9e57771b45b1dd5faed83e
+Subproject commit a9d398f50a6f866898c354da1395f088f671a748
diff --git a/changelog.txt b/changelog.txt
index 80729610f..df2b256b1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+5.4.2 beta (28.08.24)
+
+- Select audio devices from one-on-one call window.
+- Bug fixes and other minor improvements.
+- New text layout testing.
+
5.4.1 (17.08.24)
- Fix crash when sending Star Reaction in comments.