diff --git a/Telegram/SourceFiles/boxes/gift_premium_box.cpp b/Telegram/SourceFiles/boxes/gift_premium_box.cpp index 7f305bd5c..8c644b3b1 100644 --- a/Telegram/SourceFiles/boxes/gift_premium_box.cpp +++ b/Telegram/SourceFiles/boxes/gift_premium_box.cpp @@ -162,7 +162,7 @@ void GiftBox( auto text = tr::lng_premium_gift_button( tr::now, lt_cost, - options[value].total); + options[value].costTotal); state->buttonText.fire(std::move(text)); }); Ui::Premium::AddGiftOptions( diff --git a/Telegram/SourceFiles/settings/settings_premium.cpp b/Telegram/SourceFiles/settings/settings_premium.cpp index 6c883494c..38531e377 100644 --- a/Telegram/SourceFiles/settings/settings_premium.cpp +++ b/Telegram/SourceFiles/settings/settings_premium.cpp @@ -1121,11 +1121,11 @@ void Premium::setupSubscriptionOptions( AddSkip(content, st::settingsPremiumOptionsPadding.top()); + const auto apiPremium = &_controller->session().api().premium(); Ui::Premium::AddGiftOptions( content, _radioGroup, - SubscriptionOptionsForRows( - _controller->session().api().premium().subscriptionOptions()), + SubscriptionOptionsForRows(apiPremium->subscriptionOptions()), st::premiumSubscriptionOption, true); @@ -1137,9 +1137,13 @@ void Premium::setupSubscriptionOptions( auto toggleOn = rpl::combine( Data::AmPremiumValue(&_controller->session()), - rpl::single(!!(Ref::EmojiStatus::Parse(_ref))) - ) | rpl::map([=](bool premium, bool isEmojiStatus) { - return !premium && !isEmojiStatus; + rpl::single(!!(Ref::EmojiStatus::Parse(_ref))), + apiPremium->statusTextValue( + ) | rpl::map([=] { + return apiPremium->subscriptionOptions().size() < 2; + }) + ) | rpl::map([=](bool premium, bool isEmojiStatus, bool noOptions) { + return !premium && !isEmojiStatus && !noOptions; }); options->toggleOn(rpl::duplicate(toggleOn), anim::type::instant); skip->toggleOn(std::move(