ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-06-08 00:33:01 +04:00
parent 3bacb78f08
commit c5b8b6392d
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/InAppPurchaseManager/Sources/InAppPurchaseManager.swift
View File

@ -187,7 +187,7 @@ extension InAppPurchaseManager: SKPaymentTransactionObserver {
let transactionState: TransactionState? let transactionState: TransactionState?
switch transaction.transactionState { switch transaction.transactionState {
case .purchased: case .purchased:
let transactionIdentifier = transaction.original?.transactionIdentifier ?? transaction.transactionIdentifier let transactionIdentifier = transaction.transactionIdentifier
transactionState = .purchased(transactionId: transactionIdentifier) transactionState = .purchased(transactionId: transactionIdentifier)
if let transactionIdentifier = transactionIdentifier { if let transactionIdentifier = transactionIdentifier {
self.disposableSet.set( self.disposableSet.set(
@ -196,11 +196,11 @@ extension InAppPurchaseManager: SKPaymentTransactionObserver {
}, completed: { }, completed: {
queue.finishTransaction(transaction) queue.finishTransaction(transaction)
}), }),
forKey: transaction.transactionIdentifier ?? "" forKey: transactionIdentifier
) )
} }
case .restored: case .restored:
let transactionIdentifier = transaction.original?.transactionIdentifier ?? transaction.transactionIdentifier let transactionIdentifier = transaction.transactionIdentifier
transactionState = .restored(transactionId: transactionIdentifier) transactionState = .restored(transactionId: transactionIdentifier)
if let transactionIdentifier = transactionIdentifier { if let transactionIdentifier = transactionIdentifier {
self.disposableSet.set( self.disposableSet.set(
@ -209,7 +209,7 @@ extension InAppPurchaseManager: SKPaymentTransactionObserver {
}, completed: { }, completed: {
queue.finishTransaction(transaction) queue.finishTransaction(transaction)
}), }),
forKey: transaction.transactionIdentifier ?? "" forKey: transactionIdentifier
) )
} }
case .failed: case .failed:

3
submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
View File

@ -3090,7 +3090,8 @@ final class PeerInfoHeaderNode: ASDisplayNode {
if !self.backgroundNode.frame.contains(point) { if !self.backgroundNode.frame.contains(point) {
return nil return nil
} }
if self.currentCredibilityIcon == .premium {
if self.currentCredibilityIcon == .premium && !(self.state?.isEditing ?? false) {
let iconFrame = self.titleCredibilityIconNode.view.convert(self.titleCredibilityIconNode.bounds, to: self.view) let iconFrame = self.titleCredibilityIconNode.view.convert(self.titleCredibilityIconNode.bounds, to: self.view)
let expandedIconFrame = self.titleExpandedCredibilityIconNode.view.convert(self.titleExpandedCredibilityIconNode.bounds, to: self.view) let expandedIconFrame = self.titleExpandedCredibilityIconNode.view.convert(self.titleExpandedCredibilityIconNode.bounds, to: self.view)
if expandedIconFrame.contains(point) && self.isAvatarExpanded { if expandedIconFrame.contains(point) && self.isAvatarExpanded {