diff --git a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp index 20411811c1..0f18f577ff 100644 --- a/Telegram/SourceFiles/history/view/history_view_contact_status.cpp +++ b/Telegram/SourceFiles/history/view/history_view_contact_status.cpp @@ -628,7 +628,7 @@ void ContactStatus::setupState(not_null peer, bool showInForum) { PeerCustomStatus(peer), ((channel && !showInForum) ? Data::PeerFlagValue(channel, ChannelData::Flag::Forum) - : rpl::single(false)) + : (rpl::single(false) | rpl::type_erased())) ) | rpl::start_with_next([=]( State state, TextWithEntities status, diff --git a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp index d2ca0172a0..60d7994bab 100644 --- a/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp +++ b/Telegram/SourceFiles/history/view/history_view_group_call_bar.cpp @@ -358,7 +358,7 @@ rpl::producer GroupCallBarContentByPeer( Data::PeerUpdate::Flag::GroupCall), Core::App().calls().currentGroupCallValue(), ((showInForum || !channel) - ? rpl::single(false) + ? (rpl::single(false) | rpl::type_erased()) : Data::PeerFlagValue(channel, ChannelData::Flag::Forum)) ) | rpl::map([=](auto, Calls::GroupCall *current, bool hiddenByForum) { const auto call = peer->groupCall(); diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp index 443333a3ea..d936ef4353 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp @@ -60,9 +60,9 @@ auto PlainPrimaryUsernameValue(not_null peer) { peer ) | rpl::map([=](std::vector usernames) { if (!usernames.empty()) { - return rpl::single(usernames.front().text); + return rpl::single(usernames.front().text) | rpl::type_erased(); } else { - return PlainUsernameValue(peer); + return PlainUsernameValue(peer) | rpl::type_erased(); } }) | rpl::flatten_latest(); } @@ -148,7 +148,7 @@ rpl::producer UsernameValue( bool primary) { return (primary ? PlainPrimaryUsernameValue(user) - : PlainUsernameValue(user) + : (PlainUsernameValue(user) | rpl::type_erased()) ) | rpl::map([](QString &&username) { return username.isEmpty() ? QString() @@ -223,7 +223,7 @@ rpl::producer AboutValue(not_null peer) { rpl::producer LinkValue(not_null peer, bool primary) { return (primary ? PlainPrimaryUsernameValue(peer) - : PlainUsernameValue(peer) + : PlainUsernameValue(peer) | rpl::type_erased() ) | rpl::map([=](QString &&username) { return username.isEmpty() ? QString()