diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp index 5780e83f08..e41de5d728 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_color_box.cpp @@ -2241,7 +2241,9 @@ void EditPeerProfileColorSection( ? std::nullopt : std::make_optional(state->patternEmojiId.current())); }; - setIndex(peer->colorProfileIndex().value_or(kUnsetColorIndex)); + setIndex(peer->emojiStatusId().collectible + ? kUnsetColorIndex + : peer->colorProfileIndex().value_or(kUnsetColorIndex)); const auto margin = st::settingsColorRadioMargin; const auto skip = st::settingsColorRadioSkip; diff --git a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp index 28c77b0e20..8c826f727c 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_top_bar.cpp @@ -1405,11 +1405,7 @@ void TopBar::setPatternEmojiId(std::optional patternEmojiId) { void TopBar::setLocalEmojiStatusId(EmojiStatusId emojiStatusId) { _localCollectible = emojiStatusId.collectible; - if (!emojiStatusId.collectible) { - _badgeContent = Badge::Content{ BadgeType::Premium, emojiStatusId }; - } else { - _badgeContent = BadgeContentForPeer(_peer); - } + _badgeContent = Badge::Content{ BadgeType::Premium, emojiStatusId }; updateCollectibleStatus(); }