Merge commit 'b378b7b282985bd0d1801c31d93ab89248131180' into beta

This commit is contained in:
Isaac 2025-03-08 18:31:01 +01:00
commit 21c9965750
3 changed files with 8 additions and 2 deletions

View File

@ -2638,7 +2638,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
giftsPeerId = peerId giftsPeerId = peerId
text = added ? presentationData.strings.Gift_Displayed_ChannelText : presentationData.strings.Gift_Hidden_ChannelText text = added ? presentationData.strings.Gift_Displayed_ChannelText : presentationData.strings.Gift_Hidden_ChannelText
} else { } else {
giftsPeerId = arguments.peerId giftsPeerId = context.account.peerId
text = added ? presentationData.strings.Gift_Displayed_NewText : presentationData.strings.Gift_Hidden_NewText text = added ? presentationData.strings.Gift_Displayed_NewText : presentationData.strings.Gift_Hidden_NewText
} }

View File

@ -12707,6 +12707,12 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen, KeyShortc
self.starsContext = nil self.starsContext = nil
} }
if isMyProfile, let profileGiftsContext {
profileGiftsContext.updateFilter(.All)
profileGiftsContext.updateSorting(.date)
profileGiftsContext.reload()
}
self.presentationData = updatedPresentationData?.0 ?? context.sharedContext.currentPresentationData.with { $0 } self.presentationData = updatedPresentationData?.0 ?? context.sharedContext.currentPresentationData.with { $0 }
let baseNavigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData) let baseNavigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData)

View File

@ -620,7 +620,7 @@ extension ChatControllerImpl {
if let peer = strongSelf.presentationInterfaceState.renderedPeer?.peer, let starsContext = context.starsContext { if let peer = strongSelf.presentationInterfaceState.renderedPeer?.peer, let starsContext = context.starsContext {
let premiumGiftOptions = strongSelf.presentationInterfaceState.premiumGiftOptions let premiumGiftOptions = strongSelf.presentationInterfaceState.premiumGiftOptions
if !premiumGiftOptions.isEmpty { if !premiumGiftOptions.isEmpty {
let controller = PremiumGiftAttachmentScreen(context: context, starsContext: starsContext, peerId: peer.id, premiumOptions: premiumGiftOptions, hasBirthday: true, completion: { [weak self] in let controller = PremiumGiftAttachmentScreen(context: context, starsContext: starsContext, peerId: peer.id, premiumOptions: premiumGiftOptions, hasBirthday: strongSelf.presentationInterfaceState.hasBirthdayToday, completion: { [weak self] in
guard let self else { guard let self else {
return return
} }