From 3cfa963f69ad31803fbb782595f1c7543c1b0043 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Fri, 1 Nov 2024 11:22:13 +0300 Subject: [PATCH] Added start date to subscription entry in credits transactions history. --- .../SourceFiles/boxes/gift_premium_box.cpp | 10 +++++++++ .../settings/settings_credits_graphics.cpp | 21 +++++++++++-------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp index e9e126b90..d1bdd9bf1 100644 --- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp +++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp @@ -1310,6 +1310,16 @@ void AddSubscriptionEntryTable( controller, peerId); if (!s.until.isNull()) { + if (s.subscription.period > 0) { + const auto subscribed = s.until.addSecs(-s.subscription.period); + if (subscribed.isValid()) { + AddTableRow( + table, + tr::lng_group_invite_joined_row_date(), + rpl::single( + Ui::Text::WithEntities(langDateTime(subscribed)))); + } + } AddTableRow( table, s.expired diff --git a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp index b466dab84..6d0677348 100644 --- a/Telegram/SourceFiles/settings/settings_credits_graphics.cpp +++ b/Telegram/SourceFiles/settings/settings_credits_graphics.cpp @@ -1212,16 +1212,19 @@ void ReceiptCreditsBox( } if (s) { Ui::AddSkip(content); - box->addRow(object_ptr>( + auto label = object_ptr( box, - object_ptr( - box, - s.cancelled - ? tr::lng_credits_subscription_off_about() - : tr::lng_credits_subscription_on_about( - lt_date, - rpl::single(langDayOfMonthFull(s.until.date()))), - st::creditsBoxAboutDivider))); + s.cancelled + ? tr::lng_credits_subscription_off_about() + : tr::lng_credits_subscription_on_about( + lt_date, + rpl::single(langDayOfMonthFull(s.until.date()))), + st::creditsBoxAboutDivider); + if (s.cancelled) { + label->setTextColorOverride(st::menuIconAttentionColor->c); + } + box->addRow( + object_ptr>(box, std::move(label))); } Ui::AddSkip(content);