Skip to content

Commit ffd8264

Browse files
committed
Various fixes
1 parent 9b8abdb commit ffd8264

3 files changed

Lines changed: 21 additions & 18 deletions

File tree

submodules/AuthorizationUI/Sources/AuthorizationSequencePaymentScreen.swift

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import PhoneNumberFormat
2828
import PlainButtonComponent
2929
import StoreKit
3030
import DeviceModel
31+
import GlassBarButtonComponent
3132

3233
final class AuthorizationSequencePaymentScreenComponent: Component {
3334
typealias EnvironmentType = ViewControllerComponentContainer.Environment
@@ -254,25 +255,27 @@ final class AuthorizationSequencePaymentScreenComponent: Component {
254255

255256
let helpButtonSize = self.helpButton.update(
256257
transition: transition,
257-
component: AnyComponent(PlainButtonComponent(
258-
content: AnyComponent(MultilineTextComponent(
259-
text: .plain(NSAttributedString(string: environment.strings.Login_PhoneNumberHelp, font: Font.regular(17.0), textColor: environment.theme.list.itemAccentColor))
260-
)),
261-
minSize: CGSize(width: 0.0, height: 44.0),
262-
contentInsets: UIEdgeInsets(top: 0.0, left: 8.0, bottom: 0.0, right: 8.0),
263-
action: { [weak self] in
264-
guard let self else {
265-
return
258+
component: AnyComponent(
259+
GlassBarButtonComponent(
260+
size: nil,
261+
backgroundColor: nil,
262+
isDark: environment.theme.overallDarkAppearance,
263+
state: .glass,
264+
component: AnyComponentWithIdentity(id: "label", component: AnyComponent(MultilineTextComponent(
265+
text: .plain(NSAttributedString(string: environment.strings.Login_PhoneNumberHelp, font: Font.regular(17.0), textColor: environment.theme.chat.inputPanel.panelControlColor))
266+
))),
267+
action: { [weak self] _ in
268+
guard let self else {
269+
return
270+
}
271+
self.displaySendEmail(error: nil, errorCode: nil)
266272
}
267-
self.displaySendEmail(error: nil, errorCode: nil)
268-
},
269-
animateScale: false,
270-
animateContents: false
271-
)),
273+
)
274+
),
272275
environment: {},
273-
containerSize: CGSize(width: 200.0, height: 100.0)
276+
containerSize: CGSize(width: 200.0, height: 44.0)
274277
)
275-
let helpButtonFrame = CGRect(origin: CGPoint(x: availableSize.width - 8.0 - helpButtonSize.width, y: environment.statusBarHeight), size: helpButtonSize)
278+
let helpButtonFrame = CGRect(origin: CGPoint(x: availableSize.width - 16.0 - helpButtonSize.width, y: environment.navigationHeight - helpButtonSize.height - 6.0), size: helpButtonSize)
276279
if let helpButtonView = self.helpButton.view {
277280
if helpButtonView.superview == nil {
278281
self.addSubview(helpButtonView)

submodules/InAppPurchaseManager/Sources/InAppPurchaseManager.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ private let productIdentifiers = [
2828
"org.telegram.telegramPremium.twelveMonths.code_x10",
2929

3030
"org.telegram.telegramPremium.oneWeek.auth",
31+
"org.telegram.telegramPremium.threeDays.auth",
3132

3233
"org.telegram.telegramStars.topup.x15",
3334
"org.telegram.telegramStars.topup.x25",

submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/CountriesMultiselectionScreen.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,7 @@ final class CountriesMultiselectionScreenComponent: Component {
464464
update()
465465
}
466466

467-
let limit = component.context.userLimits.maxGiveawayCountriesCount
468-
if self.selectedCountries.count >= limit, index == nil {
467+
if let limit = component.stateContext.maxCount, self.selectedCountries.count >= limit, index == nil {
469468
self.hapticFeedback.error()
470469

471470
let presentationData = component.context.sharedContext.currentPresentationData.with { $0 }

0 commit comments

Comments
 (0)