Merge commit 'ef20f4229c39b4a77a1f4d40c3ad0bf08f1facd4'

Author: Isaac

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

@@ -14262,6 +14262,7 @@ Sorry for the inconvenience.";
 
 "PeerInfo.Gifts.Sale" = "sale";
 
+"Gift.Store.ForResaleNoResults" = "no results";
 "Gift.Store.ForResale_1" = "%@ for resale";
 "Gift.Store.ForResale_any" = "%@ for resale";
 "Gift.Store.Sort.Price" = "Price";
@@ -14291,10 +14292,31 @@ Sorry for the inconvenience.";
 "MediaPicker.CreateStory_any" = "Create %@ Stories";
 "MediaPicker.CombineIntoCollage" = "Combine into Collage";
 
-"Gift.Resale.Unavailable.Title" = "Resell Gift";
-"Gift.Resale.Unavailable.Text" = "Sorry, you can't list this gift yet.\n\Reselling will be available on %@.";
+"Gift.Resale.Unavailable.Title" = "Try Later";
+"Gift.Resale.Unavailable.Text" = "You will be able to resell this gift on %@.";
 
-"Gift.Transfer.Unavailable.Title" = "Transfer Gift";
-"Gift.Transfer.Unavailable.Text" = "Sorry, you can't transfer this gift yet.\n\Transferring will be available on %@.";
+"Gift.Transfer.Unavailable.Title" = "Try Later";
+"Gift.Transfer.Unavailable.Text" = "You will be able to transfer this gift on %@.";
 
 "Premium.CreateMultipleStories" = "Create Multiple Stories";
+
+"FrozenAccount.Violation.TextNew" = "Your account was frozen for breaking Telegram's [Terms and Conditions]().";
+"FrozenAccount.Violation.TextNew_URL" = "https://telegram.org/tos";
+
+"Stars.Purchase.BuyStarGiftInfo" = "Buy Stars to acquire a unique collectible.";
+
+"Stars.Purchase.EnoughStars" = "You have enough stars at the moment.";
+"Stars.Purchase.BuyAnyway" = "Buy Anyway";
+
+"Gift.Buy.Confirm.Title" = "Confirm Payment";
+"Gift.Buy.Confirm.Text" = "Do you really want to buy **%1$@** for %2$@?";
+"Gift.Buy.Confirm.GiftText" = "Do you really want to buy **%1$@** for %2$@ and gift it to **%3$@**?";
+"Gift.Buy.Confirm.Text.Stars_1" = "**%@** Star";
+"Gift.Buy.Confirm.Text.Stars_any" = "**%@** Stars";
+"Gift.Buy.Confirm.BuyFor_1" = "Buy for %@ Star";
+"Gift.Buy.Confirm.BuyFor_any" = "Buy for %@ Stars";
+
+"Calls.HideCallsTab" = "Hide Calls Tab";
+
+"Story.Editor.TooltipSelection_1" = "Tap here to view your %@ story";
+"Story.Editor.TooltipSelection_any" = "Tap here to view your %@ stories";

submodules/AccountContext/Sources/AccountContext.swift

@@ -322,6 +322,7 @@ public enum ResolvedUrl {
     case premiumMultiGift(reference: String?)
     case collectible(gift: StarGift.UniqueGift?)
     case messageLink(link: TelegramResolvedMessageLink?)
+    case stars
 }
 
 public enum ResolveUrlResult {

submodules/AccountContext/Sources/Premium.swift

@@ -141,6 +141,7 @@ public enum StarsPurchasePurpose: Equatable {
     case upgradeStarGift(requiredStars: Int64)
     case transferStarGift(requiredStars: Int64)
     case sendMessage(peerId: EnginePeer.Id, requiredStars: Int64)
+    case buyStarGift(requiredStars: Int64)
 }
 
 public struct PremiumConfiguration {

submodules/CallListUI/Sources/CallListController.swift

@@ -16,6 +16,7 @@ import TelegramBaseController
 import InviteLinksUI
 import UndoUI
 import TelegramCallsUI
+import TelegramUIPreferences
 
 public enum CallListControllerMode {
     case tab
@@ -734,10 +735,22 @@ public final class CallListController: TelegramBaseController {
             return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: theme.contextMenu.primaryColor)
         }, action: { [weak self] c, f in
             c?.dismiss(completion: { [weak self] in
-                guard let strongSelf = self else {
+                guard let self else {
                     return
                 }
-                strongSelf.callPressed()
+                self.callPressed()
+            })
+        })))
+        items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.Calls_HideCallsTab, icon: { theme in
+            return generateTintedImage(image: UIImage(bundleImageName: "Peer Info/HideIcon"), color: theme.contextMenu.primaryColor)
+        }, action: { [weak self] c, f in
+            c?.dismiss(completion: { [weak self] in
+                guard let self else {
+                    return
+                }
+                let _ = updateCallListSettingsInteractively(accountManager: self.context.sharedContext.accountManager, {
+                    $0.withUpdatedShowTab(false)
+                }).start()
             })
         })))
 

submodules/ChatListUI/Sources/ChatListControllerNode.swift

@@ -1015,7 +1015,7 @@ public final class ChatListContainerNode: ASDisplayNode, ASGestureRecognizerDele
                     }
                 }
 
-                itemNode.listNode.isMainTab.set(self.availableFilters.firstIndex(where: { $0.id == id }) == 0 ? true : false)
+                itemNode.listNode.isMainTab.set(self.availableFilters.firstIndex(where: { $0.id == id }) == 0)
                 itemNode.updateLayout(size: layout.size, insets: insets, visualNavigationHeight: visualNavigationHeight, originalNavigationHeight: originalNavigationHeight, inlineNavigationLocation: inlineNavigationLocation, inlineNavigationTransitionFraction: itemInlineNavigationTransitionFraction, storiesInset: storiesInset, transition: nodeTransition)
                 if let scrollingOffset = self.scrollingOffset {
                     itemNode.updateScrollingOffset(navigationHeight: scrollingOffset.navigationHeight, offset: scrollingOffset.offset, transition: nodeTransition)

submodules/ChatListUI/Sources/Node/ChatListNode.swift

@@ -2092,8 +2092,6 @@ public final class ChatListNode: ListView {
                     return .single(.setupPhoto(accountPeer))
                 } else if suggestions.contains(.gracePremium) {
                     return .single(.premiumGrace)
-                } else if suggestions.contains(.setupBirthday) && birthday == nil {
-                    return .single(.setupBirthday)
                 } else if suggestions.contains(.xmasPremiumGift) {
                     return .single(.xmasPremiumGift)
                 } else if suggestions.contains(.annualPremium) || suggestions.contains(.upgradePremium) || suggestions.contains(.restorePremium), let inAppPurchaseManager = context.inAppPurchaseManager {
@@ -2149,6 +2147,8 @@ public final class ChatListNode: ListView {
                         }
                         return .birthdayPremiumGift(peers: todayBirthdayPeers, birthdays: birthdays)
                     }
+                } else if suggestions.contains(.setupBirthday) && birthday == nil {
+                    return .single(.setupBirthday)
                 } else if case let .link(id, url, title, subtitle) = suggestions.first(where: { if case .link = $0 { return true } else { return false} }) {
                     return .single(.link(id: id, url: url, title: title, subtitle: subtitle))
                 } else {

submodules/Components/ReactionButtonListComponent/Sources/ReactionButtonListComponent.swift

@@ -501,7 +501,7 @@ public final class ReactionButtonAsyncNode: ContextControllerSourceView {
                 animationFraction = max(0.0, min(1.0, (CACurrentMediaTime() - animationState.startTime) / animationState.duration))
                 animationFraction = animationState.curve.solve(at: animationFraction)
                 if animationState.fromExtracted != isExtracted {
-                    fixedTransitionDirection = isExtracted ? true : false
+                    fixedTransitionDirection = isExtracted
                 }
             } else {
                 animationFraction = 1.0

submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift

@@ -1106,6 +1106,10 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
                 }
             }
 
+            if let rightLabelTextLayoutAndApply {
+                additionalTitleInset += rightLabelTextLayoutAndApply.0.size.width + 36.0
+            }
+            
             let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(0.0, params.width - leftInset - rightInset - additionalTitleInset), height: CGFloat.infinity), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
 
             var maxStatusWidth: CGFloat = params.width - leftInset - rightInset - badgeSize

submodules/ContextUI/Sources/ContextController.swift

@@ -527,7 +527,12 @@ final class ContextControllerNode: ViewControllerTracingNode, ASScrollViewDelega
                 guard let strongSelf = self, let _ = gesture else {
                     return
                 }
-                let localPoint = strongSelf.view.convert(point, from: view)
+                let localPoint: CGPoint
+                if let layout = strongSelf.validLayout, layout.metrics.isTablet, layout.size.width > layout.size.height, let view {
+                    localPoint = view.convert(point, to: nil)
+                } else {
+                    localPoint = strongSelf.view.convert(point, from: view)
+                }
                 let initialPoint: CGPoint
                 if let current = strongSelf.initialContinueGesturePoint {
                     initialPoint = current

submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionControllerNode.swift

@@ -167,10 +167,12 @@ public func searchCountries(items: [((String, String), String, [Int])], query: S
         let componentsOne = item.0.0.components(separatedBy: " ")
         let abbrOne = componentsOne.compactMap { $0.first.flatMap { String($0) } }.reduce(into: String(), { $0.append(contentsOf: $1) }).replacingOccurrences(of: "&", with: "")
 
-        let componentsTwo = item.0.0.components(separatedBy: " ")
+        let componentsTwo = item.0.1.components(separatedBy: " ")
         let abbrTwo = componentsTwo.compactMap { $0.first.flatMap { String($0) } }.reduce(into: String(), { $0.append(contentsOf: $1) }).replacingOccurrences(of: "&", with: "")
 
-        let string = "\(item.0.0) \((item.0.1)) \(item.1) \(abbrOne) \(abbrTwo)"
+        let phoneCodes = item.2.map { "\($0)" }.joined(separator: " ")
+        
+        let string = "\(item.0.0) \((item.0.1)) \(item.1) \(abbrOne) \(abbrTwo) \(phoneCodes)"
         let tokens = stringTokens(string)
         if matchStringTokens(tokens, with: queryTokens) {
             for code in item.2 {