Various fixes

Author: laktyushin

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

@@ -13885,8 +13885,8 @@ Sorry for the inconvenience.";
 "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.UpdatedName" = "User updated name %1$@";
+"Chat.NonContactUser.UpdatedPhoto" = "User updated photo %1$@";
 "Chat.NonContactUser.UpdatedToday" = "today";
 "Chat.NonContactUser.UpdatedDays_1" = "%@ day ago";
 "Chat.NonContactUser.UpdatedDays_any" = "%@ days ago";

submodules/StatisticsUI/Sources/ChannelStatsController.swift

@@ -250,7 +250,7 @@ private enum StatsEntry: ItemListNodeEntry {
     case adsTonBalanceInfo(PresentationTheme, String)
 
     case adsStarsBalanceTitle(PresentationTheme, String)
-    case adsStarsBalance(PresentationTheme, StarsRevenueStats, Bool, Bool, Int32?)
+    case adsStarsBalance(PresentationTheme, StarsRevenueStats, Bool, Bool, Bool, Int32?)
     case adsStarsBalanceInfo(PresentationTheme, String)
 
     case earnStarsInfo
@@ -827,8 +827,8 @@ private enum StatsEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .adsStarsBalance(lhsTheme, lhsStats, lhsCanWithdraw, lhsIsEnabled, lhsCooldownUntilTimestamp):
-                if case let .adsStarsBalance(rhsTheme, rhsStats, rhsCanWithdraw, rhsIsEnabled, rhsCooldownUntilTimestamp) = rhs, lhsTheme === rhsTheme, lhsStats == rhsStats, lhsCanWithdraw == rhsCanWithdraw, lhsIsEnabled == rhsIsEnabled, lhsCooldownUntilTimestamp == rhsCooldownUntilTimestamp {
+            case let .adsStarsBalance(lhsTheme, lhsStats, lhsCanWithdraw, lhsCanBuyAds, lhsIsEnabled, lhsCooldownUntilTimestamp):
+            if case let .adsStarsBalance(rhsTheme, rhsStats, rhsCanWithdraw, rhsCanBuyAds, rhsIsEnabled, rhsCooldownUntilTimestamp) = rhs, lhsTheme === rhsTheme, lhsStats == rhsStats, lhsCanWithdraw == rhsCanWithdraw, lhsCanBuyAds == rhsCanBuyAds, lhsIsEnabled == rhsIsEnabled, lhsCooldownUntilTimestamp == rhsCooldownUntilTimestamp {
                     return true
                 } else {
                     return false
@@ -1108,7 +1108,7 @@ private enum StatsEntry: ItemListNodeEntry {
                 return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section, linkAction: { _ in
                     arguments.openMonetizationInfo()
                 })
-            case let .adsStarsBalance(_, stats, canWithdraw, isEnabled, cooldownUntilTimestamp):
+            case let .adsStarsBalance(_, stats, canWithdraw, canBuyAds, isEnabled, cooldownUntilTimestamp):
                 return MonetizationBalanceItem(
                     context: arguments.context,
                     presentationData: presentationData,
@@ -1131,7 +1131,7 @@ private enum StatsEntry: ItemListNodeEntry {
                             arguments.requestStarsWithdraw()
                         }
                     },
-                    buyAdsAction: canWithdraw ? {
+                    buyAdsAction: canWithdraw && canBuyAds ? {
                         arguments.buyAds()
                     } : nil,
                     sectionId: self.section,
@@ -1649,7 +1649,7 @@ private func monetizationEntries(
 
     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(.adsStarsBalance(presentationData.theme, starsData, isCreator && starsData.balances.availableBalance > StarsAmount.zero, !isGroup, starsData.balances.withdrawEnabled, starsData.balances.nextWithdrawalTimestamp))
         entries.append(.adsStarsBalanceInfo(presentationData.theme, isGroup ? presentationData.strings.Monetization_Balance_StarsInfoGroup : presentationData.strings.Monetization_Balance_StarsInfo))
     }
 

submodules/TelegramCore/Sources/TelegramEngine/Messages/SendAsPeers.swift

@@ -109,7 +109,7 @@ func _internal_peerSendAsAvailablePeers(accountPeerId: PeerId, network: Network,
             return .single([])
         }
 
-        if let _ = peer as? TelegramChannel {
+        if let channel = peer as? TelegramChannel, case .group = channel.info {
         } else {
             return .single([])
         }

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

@@ -43,7 +43,7 @@ public struct ChatMessageEntryAttributes: Equatable {
 
 public enum ChatInfoData: Equatable {
     case botInfo(title: String, text: String, photo: TelegramMediaImage?, video: TelegramMediaFile?)
-    case userInfo(peer: EnginePeer, registrationDate: String?, phoneCountry: String?, groupsInCommonCount: Int32)
+    case userInfo(peer: EnginePeer, verification: PeerVerification?, registrationDate: String?, phoneCountry: String?, groupsInCommonCount: Int32)
 }
 
 public enum ChatHistoryEntry: Identifiable, Comparable {

submodules/TelegramUI/Components/Chat/ChatUserInfoItem/BUILD

@@ -28,6 +28,7 @@ swift_library(
         "//submodules/CountrySelectionUI",
         "//submodules/TelegramStringFormatting",
         "//submodules/TelegramUI/Components/Chat/MergedAvatarsNode",
+        "//submodules/TelegramUI/Components/TextNodeWithEntities",
     ],
     visibility = [
         "//visibility:public",