Merge commit '7facd8aaf0d1f7a7f80c4797f59467f6cb668918' into beta

Author: laktyushin

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -15570,7 +15570,7 @@ Error: %8$@";
 "Gift.Variants.CollectionInfo.Symbol_1" = "**%@** unique symbol";
 "Gift.Variants.CollectionInfo.Symbol_any" = "**%@** unique symbols";
 
-"Gift.Auction.GiftAuction" = "Upcoming Auction";
+"Gift.Auction.GiftAuction" = "Gift Auction";
 "Gift.Auction.UpcomingAuction" = "Upcoming Auction";
 "Gift.Auction.LearnMore" = "Learn more about Telegram Gifts >";
 
@@ -15614,7 +15614,7 @@ Error: %8$@";
 "Notification.StarGiftOffer.Expiration.Hours_any" = "%@ h";
 "Notification.StarGiftOffer.Expiration.Minutes_1" = "%@ m";
 "Notification.StarGiftOffer.Expiration.Minutes_any" = "%@ m";
-"Notification.StarGiftOffer.Expiration.Delimiter" = "";
+"Notification.StarGiftOffer.Expiration.Delimiter" = " ";
 
 "Chat.GiftPurchaseOffer.AcceptConfirmation.Title" = "Confirm Sale";
 "Chat.GiftPurchaseOffer.AcceptConfirmation.Text" = "Do you want to sell **%1$@** to %2$@ for **%3$@**? You'll receive **%4$@** after fees.";

submodules/LegacyComponents/Sources/TGViewController.mm

@@ -1135,7 +1135,11 @@ + (UIEdgeInsets)safeAreaInsetForOrientation:(UIInterfaceOrientation)orientation
             return UIEdgeInsetsMake(0.0f, 44.0f, 21.0f, 44.0f);
 
         default:
-            return UIEdgeInsetsMake(44.0f, 0.0f, 34.0f, 0.0f);
+            if (iosMajorVersion() >= 26) {
+                return UIEdgeInsetsMake(44.0f, 0.0f, 20.0f, 0.0f);
+            } else {
+                return UIEdgeInsetsMake(44.0f, 0.0f, 34.0f, 0.0f);
+            }
     }
 }
 

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

@@ -3822,32 +3822,34 @@ final class CachedStartGiftUpgradeAttributes: Codable {
 
 func _internal_getStarGiftUpgradeAttributes(account: Account, giftId: Int64) -> Signal<[StarGift.UniqueGift.Attribute]?, NoError> {
     return account.postbox.transaction { transaction in
-        if let cachedGifts = transaction.retrieveItemCacheEntry(id: giftUpgradesId(giftId: giftId))?.get(CachedStartGiftUpgradeAttributes.self) {
-            return .single(cachedGifts.attributes)
-        } else {
-            return account.network.request(Api.functions.payments.getStarGiftUpgradeAttributes(giftId: giftId))
-            |> map(Optional.init)
-            |> `catch` { _ -> Signal<Api.payments.StarGiftUpgradeAttributes?, NoError> in
+        let remote = account.network.request(Api.functions.payments.getStarGiftUpgradeAttributes(giftId: giftId))
+        |> map(Optional.init)
+        |> `catch` { _ -> Signal<Api.payments.StarGiftUpgradeAttributes?, NoError> in
+            return .single(nil)
+        }
+        |> mapToSignal { result -> Signal<[StarGift.UniqueGift.Attribute]?, NoError> in
+            guard let result else {
                 return .single(nil)
             }
-            |> mapToSignal { result -> Signal<[StarGift.UniqueGift.Attribute]?, NoError> in
-                guard let result else {
-                    return .single(nil)
-                }
-                switch result {
-                case let .starGiftUpgradeAttributes(apiAttributes):
-                    let attributes = apiAttributes.compactMap { StarGift.UniqueGift.Attribute(apiAttribute: $0) }
-                    return account.postbox.transaction { transaction in
-                        if !attributes.isEmpty {
-                            if let entry = CodableEntry(CachedStartGiftUpgradeAttributes(attributes: attributes)) {
-                                transaction.putItemCacheEntry(id: giftUpgradesId(giftId: giftId), entry: entry)
-                            }
+            switch result {
+            case let .starGiftUpgradeAttributes(apiAttributes):
+                let attributes = apiAttributes.compactMap { StarGift.UniqueGift.Attribute(apiAttribute: $0) }
+                return account.postbox.transaction { transaction in
+                    if !attributes.isEmpty {
+                        if let entry = CodableEntry(CachedStartGiftUpgradeAttributes(attributes: attributes)) {
+                            transaction.putItemCacheEntry(id: giftUpgradesId(giftId: giftId), entry: entry)
                         }
-                        return attributes
                     }
+                    return attributes
                 }
             }
         }
+        if let cachedGifts = transaction.retrieveItemCacheEntry(id: giftUpgradesId(giftId: giftId))?.get(CachedStartGiftUpgradeAttributes.self) {
+            return .single(cachedGifts.attributes)
+            |> then(remote)
+        } else {
+            return remote
+        }
     }
     |> switchToLatest
 }

submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift

@@ -348,8 +348,8 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
         badgeBackgroundColor:  UIColor(rgb: 0xffffff),
         badgeStrokeColor: UIColor(rgb: 0x1c1c1d),
         badgeTextColor:  UIColor(rgb: 0x000000),
-        segmentedBackgroundColor: UIColor(rgb: 0x3a3b3d),
-        segmentedForegroundColor: UIColor(rgb: 0x6f7075),
+        segmentedBackgroundColor: UIColor(rgb: 0xffffff, alpha: 0.11),
+        segmentedForegroundColor: UIColor(rgb: 0xffffff, alpha: 0.36),
         segmentedTextColor: UIColor(rgb: 0xffffff),
         segmentedDividerColor: UIColor(rgb: 0x505155),
         clearButtonBackgroundColor: UIColor(rgb: 0xffffff, alpha: 0.1),

submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift

@@ -139,7 +139,7 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
                 opaqueBackgroundColor: mainBackgroundColor,
                 separatorColor: mainSeparatorColor,
                 segmentedBackgroundColor: mainInputColor,
-                segmentedForegroundColor: mainBackgroundColor,
+                segmentedForegroundColor: mainSecondaryTextColor?.withAlphaComponent(0.4),
                 segmentedDividerColor: mainSecondaryTextColor?.withAlphaComponent(0.5)
             ),
             navigationSearchBar: rootController.navigationSearchBar.withUpdated(
@@ -571,7 +571,7 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
         badgeStrokeColor: UIColor(rgb: 0xef5b5b),
         badgeTextColor: UIColor(rgb: 0xffffff),
         segmentedBackgroundColor: mainInputColor,
-        segmentedForegroundColor: mainBackgroundColor,
+        segmentedForegroundColor: mainSecondaryTextColor.withAlphaComponent(0.4),
         segmentedTextColor: UIColor(rgb: 0xffffff),
         segmentedDividerColor: mainSecondaryTextColor.withAlphaComponent(0.5),
         clearButtonBackgroundColor: UIColor(rgb: 0xffffff, alpha: 0.1),

submodules/TelegramUI/Components/Chat/ChatMessageForwardInfoNode/Sources/ChatMessageForwardInfoNode.swift

@@ -514,14 +514,16 @@ public class ChatMessageForwardInfoNode: ASDisplayNode {
                 }
                 titleNode.frame = CGRect(origin: CGPoint(x: leftOffset, y: 0.0), size: titleLayout.size)
 
+                var nameFrame = CGRect()
                 if let (nameLayout, nameApply) = nameLayoutAndApply {
                     let nameNode = nameApply()
                     if node.nameNode == nil {
                         nameNode.isUserInteractionEnabled = false
                         node.nameNode = nameNode
                         node.addSubnode(nameNode)
                     }
-                    nameNode.frame = CGRect(origin: CGPoint(x: leftOffset + authorAvatarInset, y: titleLayout.size.height + titleAuthorSpacing), size: nameLayout.size)
+                    nameFrame = CGRect(origin: CGPoint(x: leftOffset + authorAvatarInset, y: titleLayout.size.height + titleAuthorSpacing), size: nameLayout.size)
+                    nameNode.frame = nameFrame
 
                     if authorAvatarInset != 0.0 {
                         let avatarNode: AvatarNode
@@ -599,7 +601,7 @@ public class ChatMessageForwardInfoNode: ASDisplayNode {
                         node.credibilityIconNode = credibilityIconNode
                         node.addSubnode(credibilityIconNode)
                     }
-                    credibilityIconNode.frame = CGRect(origin: CGPoint(x: titleLayout.size.width + 4.0, y: 16.0), size: credibilityIconImage.size)
+                    credibilityIconNode.frame = CGRect(origin: CGPoint(x: nameFrame.maxX + 4.0, y: 17.0), size: credibilityIconImage.size)
                     credibilityIconNode.image = credibilityIconImage
                 } else {
                     node.credibilityIconNode?.removeFromSupernode()

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

@@ -293,7 +293,7 @@ private final class DemoSheetContent: CombinedComponent {
             let bottomEdgeEffectHeight = 108.0
             let bottomEdgeEffect = bottomEdgeEffect.update(
                 component: EdgeEffectComponent(
-                    color: .clear,
+                    color: environment.theme.actionSheet.opaqueItemBackgroundColor,
                     blur: true,
                     alpha: 1.0,
                     size: CGSize(width: context.availableSize.width, height: bottomEdgeEffectHeight),

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

@@ -409,26 +409,26 @@ private final class GiftUpgradePreviewScreenComponent: Component {
                 var isSelected = false
                 for attribute in attributeList {
                     switch attribute {
-                    case let .model(name, _, rarityValue):
-                        itemId += name
+                    case let .model(name, file, rarityValue):
+                        itemId += "\(file.fileId.id)"
                         if self.selectedSection == .models {
                             title = name
                             rarity = rarityValue
                             modelAttribute = attribute
 
                             isSelected = self.selectedModel == attribute
                         }
-                    case let .backdrop(name, _, _, _, _, _, rarityValue):
-                        itemId += name
+                    case let .backdrop(name, id, _, _, _, _, rarityValue):
+                        itemId += "\(id)"
                         if self.selectedSection == .backdrops {
                             title = name
                             rarity = rarityValue
                             backdropAttribute = attribute
 
                             isSelected = self.selectedBackdrop == attribute
                         }
-                    case let .pattern(name, _, rarityValue):
-                        itemId += name
+                    case let .pattern(name, file, rarityValue):
+                        itemId += "\(file.fileId.id)"
                         if self.selectedSection == .symbols {
                             title = name
                             rarity = rarityValue
@@ -732,15 +732,23 @@ private final class GiftUpgradePreviewScreenComponent: Component {
                 transition.setFrame(view: titleView, frame: titleFrame)
             }
 
+            var subtitleItems: [AnimatedTextComponent.Item] = []
+            let subtitleString = self.isPlaying ? environment.strings.Gift_Variants_RandomTraits : environment.strings.Gift_Variants_SelectedTraits
+            let words = subtitleString.components(separatedBy: " ")
+            for i in 0 ..< words.count {
+                var text = words[i]
+                if i > 0 {
+                    text = " \(text)"
+                }
+                subtitleItems.append(AnimatedTextComponent.Item(id: text.lowercased(), content: .text(text)))
+            }
+            
             let subtitleSize = self.subtitle.update(
                 transition: .spring(duration: 0.2),
                 component: AnyComponent(AnimatedTextComponent(
                     font: Font.regular(14.0),
                     color: secondaryTextColor,
-                    items: [
-                        AnimatedTextComponent.Item(id: self.isPlaying ? "random" : "selected", content: .text(self.isPlaying ? "Random" : "Selected")),
-                        AnimatedTextComponent.Item(id: "traits", content: .text(" Traits"))
-                    ],
+                    items: subtitleItems,
                     noDelay: true,
                     blur: true
                 )),

submodules/TelegramUI/Components/SegmentControlComponent/Sources/SegmentControlComponent.swift

@@ -127,7 +127,7 @@ public final class SegmentControlComponent: Component {
                 }
 
                 if themeUpdated {
-                    let backgroundColor = component.theme.overallDarkAppearance ? component.theme.list.itemBlocksBackgroundColor : component.theme.rootController.navigationBar.segmentedBackgroundColor
+                    let backgroundColor = component.theme.rootController.navigationBar.segmentedBackgroundColor
                     segmentedView.setTitleTextAttributes([
                         .font: Font.semibold(14.0),
                         .foregroundColor: component.theme.rootController.navigationBar.segmentedTextColor