ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-04 21:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-04-09 14:40:50 +03:00
commit 9a075f5fde
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift
View File

@ -431,6 +431,11 @@ private func availablePaymentMethods(form: BotPaymentForm, current: BotCheckoutP
methods.append(current)
}
}
if let savedCredentials = form.savedCredentials {
if !methods.contains(.savedCredentials(savedCredentials)) {
methods.append(.savedCredentials(savedCredentials))
}
}
return methods
}

15
submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift
View File

@ -353,10 +353,21 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode,
guard let maskedCardNumber = resultInfo["masked_card_number"] as? String else {
throw ReponseError.generic
}
guard let cardType = resultInfo["card_type"] as? String else {
throw ReponseError.generic
}
var last4 = maskedCardNumber
if last4.count > 4 {
let lastDigits = String(maskedCardNumber[maskedCardNumber.index(maskedCardNumber.endIndex, offsetBy: -4)...])
if lastDigits.allSatisfy(\.isNumber) {
last4 = "\(cardType) *\(lastDigits)"
}
}
let responseJson: [String: Any] = [
"type": "card",
"id": "\(token)"
"token": "\(token)"
]
let serializedResponseJson = try JSONSerialization.data(withJSONObject: responseJson, options: [])
@ -366,7 +377,7 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode,
}
strongSelf.completion(.webToken(BotCheckoutPaymentWebToken(
title: maskedCardNumber,
title: last4,
data: serializedResponseString,
saveOnServer: strongSelf.saveInfoItem.isOn
)))

5
submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
View File

@ -823,6 +823,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
}
deinit {
assert(Queue.mainQueue().isCurrent())
self.audioSessionShouldBeActiveDisposable?.dispose()
self.audioSessionActiveDisposable?.dispose()
self.summaryStateDisposable?.dispose()
@ -1074,6 +1076,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
activeCallInfo = nil
}
}
if self.leaving {
shouldJoin = false
}
if shouldJoin, let callInfo = activeCallInfo {
let callContext: OngoingGroupCallContext