Various improvements

Author: laktyushin

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

@@ -13875,6 +13875,22 @@ Sorry for the inconvenience.";
 
 "Chat.PanelCustomStatusShortInfo" = "%@ is a mark for [Premium subscribers >]()";
 
+"Chat.NonContactUser.Subtitle" = "Not a contact";
+"Chat.NonContactUser.PhoneNumber" = "Phone Number";
+"Chat.NonContactUser.Registration" = "Registration";
+"Chat.NonContactUser.Groups" = "Shared Groups";
+"Chat.NonContactUser.GroupsCount_1" = "%@ group";
+"Chat.NonContactUser.GroupsCount_any" = "%@ groups";
+"Chat.NonContactUser.GroupsNone" = "None";
+"Chat.NonContactUser.Disclaimer" = "Not an official account";
+"Chat.NonContactUser.AnonymousNumber" = "Anonymous";
+
+"Chat.NonContactUser.UpdatedName" = "User updated name %2$@";
+"Chat.NonContactUser.UpdatedPhoto" = "User updated photo %2$@";
+"Chat.NonContactUser.UpdatedToday" = "today";
+"Chat.NonContactUser.UpdatedDays_1" = "%@ day ago";
+"Chat.NonContactUser.UpdatedDays_any" = "%@ days ago";
+
 "Chat.InputTextPaidMessagePlaceholder" = "Message for %@";
 
 "Privacy.Messages.Stars_1" = "%@ Star";
@@ -13884,3 +13900,36 @@ Sorry for the inconvenience.";
 "Premium.PaidMessages" = "Paid Messages";
 "Premium.PaidMessagesInfo" = "Charge a fee for messages from non-contacts or new senders.";
 "Premium.PaidMessages.Proceed" = "About Telegram Premium";
+
+"PeerInfo.Gifts.Reorder" = "Reorder";
+"PeerInfo.Gifts.Context.Pin" = "Pin";
+"PeerInfo.Gifts.Context.Unpin" = "Unpin";
+"PeerInfo.Gifts.Context.Reorder" = "Reorder";
+"PeerInfo.Gifts.Context.Wear" = "Wear";
+"PeerInfo.Gifts.Context.CopyLink" = "Copy Link";
+"PeerInfo.Gifts.Context.Share" = "Share";
+"PeerInfo.Gifts.Context.Hide" = "Hide";
+"PeerInfo.Gifts.Context.Show" = "Show";
+"PeerInfo.Gifts.Context.Transfer" = "Transfer";
+
+"Gift.Send.Premium.Confirmation.Title" = "Send a Gift";
+"Gift.Send.Premium.Confirmation.Text" = "Are you sure you want to gift **Telegram Premium** to **%1$@** for **%2$@**?";
+"Gift.Send.Premium.Confirmation.Text.Stars_1" = "%@ Star";
+"Gift.Send.Premium.Confirmation.Text.Stars_any" = "%@ Stars";
+"Gift.Send.Premium.Confirmation.Confirm" = "Confirm";
+
+"StarsBalance.YourBalance" = "Your balance is %@";
+"StarsBalance.GetMoreStars" = "Get More Stars >";
+
+"Stars.Intro.BuyShort" = "Top Up";
+"Stars.Intro.Withdraw" = "Withdraw";
+
+"Group.Info.Settings" = "Group Settings";
+
+"Monetization.Balance.StarsInfoGroup" = "You can collect rewards for Stars using Fragment. You cannot withdraw less than 1000 stars. [Learn More >]()";
+
+"PeerInfo.Gifts.ToastPinLimit.Text_1" = "You can't pin more than %@ gift.";
+"PeerInfo.Gifts.ToastPinLimit.Text_any" = "You can't pin more than %@ gifts.";
+"PeerInfo.Gifts.ToastUnpinned.Text" = "Gift Unpinned.";
+"PeerInfo.Gifts.ToastPinned.Title" = "Gift Pinned";
+"PeerInfo.Gifts.ToastPinned.Text" = "Now it will always be shown on the top.";

submodules/AccountContext/Sources/AccountContext.swift

@@ -593,6 +593,7 @@ public enum PeerInfoControllerMode {
     case myProfile
     case gifts
     case myProfileGifts
+    case groupsInCommon
 }
 
 public enum ContactListActionItemInlineIconPosition {
@@ -1100,6 +1101,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeStarsStatisticsScreen(context: AccountContext, peerId: EnginePeer.Id, revenueContext: StarsRevenueStatsContext) -> ViewController
     func makeStarsAmountScreen(context: AccountContext, initialValue: Int64?, completion: @escaping (Int64) -> Void) -> ViewController
     func makeStarsWithdrawalScreen(context: AccountContext, stats: StarsRevenueStats, completion: @escaping (Int64) -> Void) -> ViewController
+    func makeStarsWithdrawalScreen(context: AccountContext, completion: @escaping (Int64) -> Void) -> ViewController
     func makeStarsGiftScreen(context: AccountContext, message: EngineMessage) -> ViewController
     func makeStarsGiveawayBoostScreen(context: AccountContext, peerId: EnginePeer.Id, boost: ChannelBoostersContext.State.Boost) -> ViewController
     func makeStarsIntroScreen(context: AccountContext) -> ViewController

submodules/AccountContext/Sources/ChatController.swift

@@ -314,10 +314,12 @@ public struct ChatControllerInitialBotAppStart {
 public enum ChatControllerInteractionNavigateToPeer {
     public struct InfoParams {
         public let switchToRecommendedChannels: Bool
+        public let switchToGroupsInCommon: Bool
         public let ignoreInSavedMessages: Bool
 
-        public init(switchToRecommendedChannels: Bool = false, ignoreInSavedMessages: Bool = false) {
+        public init(switchToRecommendedChannels: Bool = false, switchToGroupsInCommon: Bool = false, ignoreInSavedMessages: Bool = false) {
             self.switchToRecommendedChannels = switchToRecommendedChannels
+            self.switchToGroupsInCommon = switchToGroupsInCommon
             self.ignoreInSavedMessages = ignoreInSavedMessages
         }
     }

submodules/CountrySelectionUI/Sources/CountryList.swift

@@ -13,6 +13,8 @@ public func emojiFlagForISOCountryCode(_ countryCode: String) -> String {
         return "🛰️"
     } else if countryCode == "XV" {
         return "🌍"
+    } else if countryCode == "TS" {
+        return "🏳️"
     }
 
     if ["YL"].contains(countryCode) {

submodules/MediaPickerUI/Sources/MediaPickerScreen.swift

@@ -2376,7 +2376,6 @@ public final class MediaPickerScreenImpl: ViewController, MediaPickerScreen, Att
         transition.updateTransformScale(node: self.moreButtonNode.iconNode, scale: moreIsVisible ? 1.0 : 0.1)
 
         //if self. {
-            //TODO:localize
             //self.mainButtonStatePromise.set(.single(AttachmentMainButtonState(text: "Add", badge: "\(count)", font: .bold, background: .color(self.presentationData.theme.actionSheet.controlAccentColor), textColor: self.presentationData.theme.list.itemCheckColors.foregroundColor, isVisible: count > 0, progress: .none, isEnabled: true, hasShimmer: false)))
         //}
     }

submodules/PremiumUI/Sources/PremiumDemoScreen.swift

@@ -1302,7 +1302,6 @@ private final class DemoSheetContent: CombinedComponent {
                             buttonAnimationName = "premium_unlock"
                         case .paidMessages:
                             buttonText = strings.Premium_PaidMessages_Proceed
-                            buttonAnimationName = "premium_unlock"
                         default:
                             buttonText = strings.Common_OK
                     }

submodules/StatisticsUI/Sources/ChannelStatsController.swift

@@ -1565,7 +1565,7 @@ private func monetizationEntries(
     presentationData: PresentationData,
     state: ChannelStatsControllerState,
     peer: EnginePeer?,
-    data: RevenueStats,
+    data: RevenueStats?,
     boostData: ChannelBoostStatus?,
     transactionsInfo: RevenueStatsTransactionsContext.State,
     starsData: StarsRevenueStats?,
@@ -1584,7 +1584,7 @@ private func monetizationEntries(
         isBot = true
     }
 
-    if canViewRevenue {
+    if canViewRevenue, let data {
         entries.append(.adsHeader(presentationData.theme, isBot ? presentationData.strings.Monetization_Bot_Header : presentationData.strings.Monetization_Header))
 
         if !data.topHoursGraph.isEmpty {
@@ -1608,7 +1608,7 @@ private func monetizationEntries(
     entries.append(.adsProceedsTitle(presentationData.theme, presentationData.strings.Monetization_StarsProceeds_Title))
     entries.append(.adsProceedsOverview(presentationData.theme, canViewRevenue ? data : nil, canViewStarsRevenue ? starsData : nil))
 
-    let hasTonBalance = data.balances.overallRevenue > 0
+    let hasTonBalance = (data?.balances.overallRevenue ?? 0) > 0
     let hasStarsBalance = (starsData?.balances.overallRevenue ?? StarsAmount.zero) > StarsAmount.zero
 
     let proceedsInfo: String
@@ -1622,11 +1622,15 @@ private func monetizationEntries(
     entries.append(.adsProceedsInfo(presentationData.theme, proceedsInfo))
 
     var isCreator = false
+    var isGroup = false
     if let peer, case let .channel(channel) = peer, channel.flags.contains(.isCreator) {
         isCreator = true
+        if case .group = channel.info {
+            isGroup = true
+        }
     }
 
-    if canViewRevenue {
+    if canViewRevenue, let data {
         entries.append(.adsTonBalanceTitle(presentationData.theme, isBot ? presentationData.strings.Monetization_Bot_BalanceTitle : presentationData.strings.Monetization_TonBalanceTitle))
         entries.append(.adsTonBalance(presentationData.theme, data, (isCreator || isBot) && data.balances.availableBalance > 0, data.balances.withdrawEnabled))
 
@@ -1643,12 +1647,14 @@ private func monetizationEntries(
         }
     }
 
-    if canViewStarsRevenue {
-        if let starsData, starsData.balances.overallRevenue > StarsAmount.zero {
-            entries.append(.adsStarsBalanceTitle(presentationData.theme, presentationData.strings.Monetization_StarsBalanceTitle))
-            entries.append(.adsStarsBalance(presentationData.theme, starsData, isCreator && starsData.balances.availableBalance > StarsAmount.zero, starsData.balances.withdrawEnabled, starsData.balances.nextWithdrawalTimestamp))
-            entries.append(.adsStarsBalanceInfo(presentationData.theme, presentationData.strings.Monetization_Balance_StarsInfo))
-        }
+    if canViewStarsRevenue, let starsData, starsData.balances.overallRevenue > StarsAmount.zero {
+        entries.append(.adsStarsBalanceTitle(presentationData.theme, presentationData.strings.Monetization_StarsBalanceTitle))
+        entries.append(.adsStarsBalance(presentationData.theme, starsData, isCreator && starsData.balances.availableBalance > StarsAmount.zero, starsData.balances.withdrawEnabled, starsData.balances.nextWithdrawalTimestamp))
+        entries.append(.adsStarsBalanceInfo(presentationData.theme, isGroup ? presentationData.strings.Monetization_Balance_StarsInfoGroup : presentationData.strings.Monetization_Balance_StarsInfo))
+    }
+    
+    if canJoinRefPrograms && !isGroup {
+        entries.append(.earnStarsInfo)
     }
 
     var addedTransactionsTabs = false
@@ -1666,7 +1672,7 @@ private func monetizationEntries(
     if canViewStarsRevenue && !starsTransactionsInfo.transactions.isEmpty && (transactionsInfo.transactions.isEmpty || state.starsSelected) {
         displayStarsTransactions = true
     }
-    
+        
     if displayTonTransactions {
         if !addedTransactionsTabs {
             entries.append(.adsTransactionsTitle(presentationData.theme, isBot ? presentationData.strings.Monetization_TransactionsTitle.uppercased() : presentationData.strings.Monetization_TonTransactions.uppercased()))
@@ -1700,11 +1706,7 @@ private func monetizationEntries(
 
     if displayStarsTransactions {
         if !addedTransactionsTabs {
-            if canJoinRefPrograms {
-                entries.append(.earnStarsInfo)
-            }
-            
-            entries.append(.adsTransactionsTitle(presentationData.theme, presentationData.strings.Monetization_StarsTransactions.uppercased()))
+            entries.append(.adsTransactionsTitle(presentationData.theme, isGroup ? presentationData.strings.Monetization_TransactionsTitle.uppercased() : presentationData.strings.Monetization_StarsTransactions.uppercased()))
         }
 
         var transactions = starsTransactionsInfo.transactions
@@ -1733,7 +1735,7 @@ private func monetizationEntries(
         }
     }
 
-    if isCreator && canViewRevenue {
+    if isCreator && canViewRevenue && !isGroup {
         var switchOffAdds: Bool? = nil
         if let boostData, boostData.level >= premiumConfiguration.minChannelRestrictAdsLevel {
             switchOffAdds = adsRestricted
@@ -1797,7 +1799,7 @@ private func channelStatsControllerEntries(
             )
         }
     case .monetization:
-        if let revenueState {
+        if revenueState != nil || starsState != nil {
             return monetizationEntries(
                 presentationData: presentationData,
                 state: state,
@@ -1825,6 +1827,7 @@ public func channelStatsController(
     peerId: PeerId,
     section: ChannelStatsSection = .stats,
     existingRevenueContext: RevenueStatsContext? = nil,
+    existingStarsRevenueContext: StarsRevenueStatsContext? = nil,
     boostStatus: ChannelBoostStatus? = nil,
     boostStatusUpdated: ((ChannelBoostStatus) -> Void)? = nil
 ) -> ViewController {
@@ -1888,7 +1891,7 @@ public func channelStatsController(
     let revenueState = Promise<RevenueStatsContextState?>()
     revenueState.set(.single(nil) |> then(revenueContext.state |> map(Optional.init)))
 
-    let starsContext = context.engine.payments.peerStarsRevenueContext(peerId: peerId)
+    let starsContext = existingStarsRevenueContext ?? context.engine.payments.peerStarsRevenueContext(peerId: peerId)
     let starsState = Promise<StarsRevenueStatsContextState?>()
     starsState.set(.single(nil) |> then(starsContext.state |> map(Optional.init)))
 
@@ -2157,8 +2160,9 @@ public func channelStatsController(
     )
     |> deliverOnMainQueue
     |> map { presentationData, state, peer, data, messageView, stories, boostData, boostersState, giftsState, revenueState, revenueTransactions, starsState, starsTransactions, peerData, longLoading -> (ItemListControllerState, (ItemListNodeState, Any)) in
-        let (canViewStats, adsRestricted, _, canViewStarsRevenue) = peerData
+        let (canViewStats, adsRestricted, _, _) = peerData
         var canViewRevenue = peerData.2
+        var canViewStarsRevenue = peerData.3
 
         var canJoinRefPrograms = false
         if let data = context.currentAppConfiguration.with({ $0 }).data, let value = data["starref_connect_allowed"] {
@@ -2192,7 +2196,7 @@ public func channelStatsController(
                 emptyStateItem = ItemListLoadingIndicatorEmptyStateItem(theme: presentationData.theme)
             }
         case .monetization:
-            if revenueState?.stats == nil {
+            if revenueState?.stats == nil && starsState?.stats == nil {
                 emptyStateItem = ItemListLoadingIndicatorEmptyStateItem(theme: presentationData.theme)
             }
         }
@@ -2222,7 +2226,10 @@ public func channelStatsController(
         var headerItem: BoostHeaderItem?
         var leftNavigationButton: ItemListNavigationButton?
         var boostsOnly = false
-        if existingRevenueContext != nil {
+        if existingStarsRevenueContext != nil {
+            title = .text(presentationData.strings.Stats_Monetization)
+            canViewStarsRevenue = true
+        } else if existingRevenueContext != nil {
             title = .text(presentationData.strings.Stats_TonBotRevenue_Title)
             canViewRevenue = true
         } else if section == .boosts {

submodules/StatisticsUI/Sources/StarsTransactionItem.swift

@@ -231,7 +231,10 @@ final class StarsTransactionItemNode: ListViewItemNode, ItemListItemNode {
                     var itemDate: String
                     switch item.transaction.peer {
                     case let .peer(peer):
-                         if !item.transaction.media.isEmpty {
+                        if item.transaction.flags.contains(.isPaidMessage) {
+                            itemTitle = peer.displayTitle(strings: item.presentationData.strings, displayOrder: .firstLast)
+                            itemSubtitle = item.presentationData.strings.Stars_Intro_Transaction_PaidMessage(item.transaction.paidMessageCount ?? 1)
+                        } else if !item.transaction.media.isEmpty {
                             itemTitle = item.presentationData.strings.Stars_Intro_Transaction_MediaPurchase
                             itemSubtitle = peer.displayTitle(strings: item.presentationData.strings, displayOrder: .firstLast)
                         } else if let title = item.transaction.title {

submodules/TelegramApi/Sources/Api0.swift

@@ -734,7 +734,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-901375139] = { return Api.PeerLocated.parse_peerLocated($0) }
     dict[-118740917] = { return Api.PeerLocated.parse_peerSelfLocated($0) }
     dict[-1721619444] = { return Api.PeerNotifySettings.parse_peerNotifySettings($0) }
-    dict[227293676] = { return Api.PeerSettings.parse_peerSettings($0) }
+    dict[-193510921] = { return Api.PeerSettings.parse_peerSettings($0) }
     dict[-1707742823] = { return Api.PeerStories.parse_peerStories($0) }
     dict[1000707084] = { return Api.PhoneCall.parse_phoneCall($0) }
     dict[587035009] = { return Api.PhoneCall.parse_phoneCallAccepted($0) }
@@ -1390,7 +1390,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[1314881805] = { return Api.payments.PaymentResult.parse_paymentResult($0) }
     dict[-666824391] = { return Api.payments.PaymentResult.parse_paymentVerificationNeeded($0) }
     dict[-74456004] = { return Api.payments.SavedInfo.parse_savedInfo($0) }
-    dict[-418915641] = { return Api.payments.SavedStarGifts.parse_savedStarGifts($0) }
+    dict[-1779201615] = { return Api.payments.SavedStarGifts.parse_savedStarGifts($0) }
     dict[377215243] = { return Api.payments.StarGiftUpgradePreview.parse_starGiftUpgradePreview($0) }
     dict[-2069218660] = { return Api.payments.StarGiftWithdrawalUrl.parse_starGiftWithdrawalUrl($0) }
     dict[-1877571094] = { return Api.payments.StarGifts.parse_starGifts($0) }