Skip to content

Commit 3f9820f

Browse files
committed
Various fixes
1 parent e60cd2d commit 3f9820f

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

submodules/TelegramCore/Sources/TelegramEngine/Payments/StarGifts.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ func _internal_keepCachedStarGiftsUpdated(postbox: Postbox, network: Network, ac
976976
let updateSignal = _internal_cachedStarGifts(postbox: postbox)
977977
|> take(1)
978978
|> mapToSignal { list -> Signal<Never, NoError> in
979-
return network.request(Api.functions.payments.getStarGifts(hash: 0))
979+
return network.request(Api.functions.payments.getStarGifts(hash: list?.hashValue ?? 0))
980980
|> map(Optional.init)
981981
|> `catch` { _ -> Signal<Api.payments.StarGifts?, NoError> in
982982
return .single(nil)

submodules/TelegramUI/Components/Gifts/GiftSetupScreen/Sources/GiftSetupScreen.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ final class GiftSetupScreenComponent: Component {
124124

125125
private var inProgress = false
126126

127-
128127
private var previousHadInputHeight: Bool = false
129128
private var previousInputHeight: CGFloat?
130129
private var recenterOnTag: NSObject?
@@ -134,6 +133,8 @@ final class GiftSetupScreenComponent: Component {
134133

135134
private var starImage: (UIImage, PresentationTheme)?
136135

136+
private var updateDisposable: Disposable?
137+
137138
private var optionsDisposable: Disposable?
138139
private(set) var options: [StarsTopUpOption] = [] {
139140
didSet {
@@ -173,6 +174,9 @@ final class GiftSetupScreenComponent: Component {
173174
}
174175

175176
deinit {
177+
self.inputMediaNodeDataDisposable?.dispose()
178+
self.updateDisposable?.dispose()
179+
self.optionsDisposable?.dispose()
176180
}
177181

178182
func scrollToTop() {

submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ private final class GiftViewSheetContent: CombinedComponent {
931931
})
932932

933933
if let tranfserGiftImpl {
934-
return tranfserGiftImpl(transferStars == 0, peerId)
934+
return tranfserGiftImpl(transferStars == 0, reference, peerId)
935935
} else {
936936
return (context.engine.payments.transferStarGift(prepaid: transferStars == 0, reference: reference, peerId: peerId)
937937
|> deliverOnMainQueue)
@@ -4554,7 +4554,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
45544554

45554555
fileprivate let updateSavedToProfile: ((StarGiftReference, Bool) -> Void)?
45564556
fileprivate let convertToStars: ((StarGiftReference) -> Void)?
4557-
fileprivate let transferGift: ((Bool, EnginePeer.Id) -> Signal<Never, TransferStarGiftError>)?
4557+
fileprivate let transferGift: ((Bool, StarGiftReference, EnginePeer.Id) -> Signal<Never, TransferStarGiftError>)?
45584558
fileprivate let upgradeGift: ((Int64?, StarGiftReference, Bool) -> Signal<ProfileGiftsContext.State.StarGift, UpgradeStarGiftError>)?
45594559
fileprivate let buyGift: ((String, EnginePeer.Id, CurrencyAmount?) -> Signal<Never, BuyStarGiftError>)?
45604560
fileprivate let updateResellStars: ((StarGiftReference, CurrencyAmount?) -> Signal<Never, UpdateStarGiftPriceError>)?
@@ -4572,7 +4572,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
45724572
forceDark: Bool = false,
45734573
updateSavedToProfile: ((StarGiftReference, Bool) -> Void)? = nil,
45744574
convertToStars: ((StarGiftReference) -> Void)? = nil,
4575-
transferGift: ((Bool, EnginePeer.Id) -> Signal<Never, TransferStarGiftError>)? = nil,
4575+
transferGift: ((Bool, StarGiftReference, EnginePeer.Id) -> Signal<Never, TransferStarGiftError>)? = nil,
45764576
upgradeGift: ((Int64?, StarGiftReference, Bool) -> Signal<ProfileGiftsContext.State.StarGift, UpgradeStarGiftError>)? = nil,
45774577
buyGift: ((String, EnginePeer.Id, CurrencyAmount?) -> Signal<Never, BuyStarGiftError>)? = nil,
45784578
updateResellStars: ((StarGiftReference, CurrencyAmount?) -> Signal<Never, UpdateStarGiftPriceError>)? = nil,

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoHeaderNode.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1905,7 +1905,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
19051905
transition.updateFrameAdditive(node: self.avatarListNode, frame: CGRect(origin: apparentAvatarFrame.center, size: CGSize()))
19061906
transition.updateFrameAdditive(node: self.avatarOverlayNode, frame: CGRect(origin: apparentAvatarFrame.center, size: CGSize()))
19071907

1908-
let avatarListContainerFrame: CGRect
1908+
var avatarListContainerFrame: CGRect
19091909
let avatarListContainerScale: CGFloat
19101910
if self.isAvatarExpanded {
19111911
if let transitionSourceAvatarFrame = transitionSourceAvatarFrame {
@@ -1922,6 +1922,8 @@ final class PeerInfoHeaderNode: ASDisplayNode {
19221922
avatarListContainerFrame = CGRect(origin: CGPoint(x: -expandedAvatarListSize.width / 2.0, y: -expandedAvatarListSize.width / 2.0), size: expandedAvatarListSize)
19231923
}
19241924
avatarListContainerScale = 1.0 + max(0.0, -contentOffset / avatarListContainerFrame.width)
1925+
let heightDelta = avatarListContainerFrame.height * avatarListContainerScale - avatarListContainerFrame.height
1926+
avatarListContainerFrame.origin.y -= heightDelta / 4.0
19251927
} else {
19261928
let expandHeightFraction = expandedAvatarListSize.height / expandedAvatarListSize.width
19271929
avatarListContainerFrame = CGRect(origin: CGPoint(x: -apparentAvatarFrame.width / 2.0, y: -apparentAvatarFrame.width / 2.0 + expandHeightFraction * 0.0 * apparentAvatarFrame.width), size: apparentAvatarFrame.size)

submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5018,8 +5018,8 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
50185018
}
50195019
profileGifts.convertStarGift(reference: reference)
50205020
},
5021-
transferGift: { [weak profileGifts] prepaid, peerId in
5022-
guard let profileGifts, let reference = gift.reference else {
5021+
transferGift: { [weak profileGifts] prepaid, reference, peerId in
5022+
guard let profileGifts else {
50235023
return .complete()
50245024
}
50255025
return profileGifts.transferStarGift(prepaid: prepaid, reference: reference, peerId: peerId)

submodules/TelegramUI/Components/PeerInfo/PeerInfoVisualMediaPaneNode/Sources/GiftsListView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,8 @@ final class GiftsListView: UIView {
617617
}
618618
self.profileGifts.convertStarGift(reference: reference)
619619
},
620-
transferGift: { [weak self] prepaid, peerId in
621-
guard let self, let reference = product.reference else {
620+
transferGift: { [weak self] prepaid, reference, peerId in
621+
guard let self else {
622622
return .complete()
623623
}
624624
return self.profileGifts.transferStarGift(prepaid: prepaid, reference: reference, peerId: peerId)

0 commit comments

Comments
 (0)