Various improvements

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

@@ -12682,3 +12682,31 @@ Sorry for the inconvenience.";
 
 "Stars.Subscription.Terms" = "By subscribing you agree to the [Terms of Service]().";
 "Stars.Subscription.Terms_URL" = "https://telegram.org/tos/stars";
+
+"Stars.Transaction.Reaction.Title" = "Star reaction";
+"Stars.Transaction.Reaction.Post" = "Post";
+
+"Stars.Transaction.SubscriptionFee" = "Monthly Subscription Fee";
+"Stars.Transaction.Subscription.Title" = "Subscription";
+"Stars.Transaction.Subscription.Active" = "If you cancel now, you can still access your subscription until %@";
+"Stars.Transaction.Subscription.Cancelled" = "You have cancelled your subscription.";
+"Stars.Transaction.Subscription.Renew" = "Renew Subscription";
+"Stars.Transaction.Subscription.Cancel" = "Cancel Subscription";
+"Stars.Transaction.Subscription.PerMonth" = "%@ / month";
+"Stars.Transaction.Subscription.PerMonthUsd" = "appx. %@ per month";
+"Stars.Transaction.Subscription.Subscription" = "Subscription";
+"Stars.Transaction.Subscription.Subscriber" = "Subscriber";
+
+"Stars.Transaction.Subscription.Status.Expires" = "Expires";
+"Stars.Transaction.Subscription.Status.Expired" = "Expired";
+"Stars.Transaction.Subscription.Status.Renews" = "Renews";
+"Stars.Transaction.Subscription.Status.Subscribed" = "Subscribed";
+
+"Stars.Transaction.Subscription.Cancelled.Title" = "Subscription cancelled";
+"Stars.Transaction.Subscription.Cancelled.Text" = "You will still have access to [%1$@]() until %2$@.";
+
+"Stars.Transaction.Subscription.Renewed.Title" = "Subscription renewed";
+"Stars.Transaction.Subscription.Renewed.Text" = "You renewed your subscription to [%1$@]().";
+
+"Stars.Intro.Transaction.SubscriptionFee.Title" = "Monthly Subscription Fee";
+"Stars.Intro.Transaction.Reaction.Title" = "Star Reaction";

submodules/StatisticsUI/Sources/StarsTransactionItem.swift

@@ -238,9 +238,10 @@ final class StarsTransactionItemNode: ListViewItemNode, ItemListItemNode {
                             itemTitle = title
                             itemSubtitle = peer.displayTitle(strings: item.presentationData.strings, displayOrder: .firstLast)
                         } else {
-                            if let _ = item.transaction.subscriptionPeriod {
+                            if item.transaction.flags.contains(.isReaction) {
-                                //TODO:localize
+                                itemSubtitle = item.presentationData.strings.Stars_Intro_Transaction_Reaction_Title
-                                itemSubtitle = "Monthly subscription fee"
+                            } else if let _ = item.transaction.subscriptionPeriod {
+                                itemSubtitle = item.presentationData.strings.Stars_Intro_Transaction_SubscriptionFee_Title
                             } else {
                                 itemSubtitle = nil
                             }

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

@@ -405,6 +405,9 @@ private extension StarsContext.State.Transaction {
             if (apiFlags & (1 << 10)) != 0 {
                 flags.insert(.isGift)
             }
+            if (apiFlags & (1 << 11)) != 0 {
+                flags.insert(.isReaction)
+            }
             
             let media = extendedMedia.flatMap({ $0.compactMap { textMediaAndExpirationTimerFromApiMedia($0, PeerId(0)).media } }) ?? []
             let _ = subscriptionPeriod
@@ -450,6 +453,7 @@ public final class StarsContext {
                 public static let isPending = Flags(rawValue: 1 << 2)
                 public static let isFailed = Flags(rawValue: 1 << 3)
                 public static let isGift = Flags(rawValue: 1 << 4)
+                public static let isReaction = Flags(rawValue: 1 << 5)
             }
             
             public enum Peer: Equatable {

submodules/TelegramUI/Components/Stars/StarsTransactionScreen/Sources/StarsTransactionScreen.swift

@@ -197,12 +197,12 @@ private final class StarsTransactionSheetContent: CombinedComponent {
             let count: Int64
             var countIsGeneric = false
             var countOnTop = false
-            let transactionId: String?
+            var transactionId: String?
             let date: Int32
-            let via: String?
+            var via: String?
-            let messageId: EngineMessage.Id?
+            var messageId: EngineMessage.Id?
-            let toPeer: EnginePeer?
+            var toPeer: EnginePeer?
-            let transactionPeer: StarsContext.State.Transaction.Peer?
+            var transactionPeer: StarsContext.State.Transaction.Peer?
             var media: [AnyMediaReference] = []
             var photo: TelegramMediaWebFile?
             var transactionStatus: (String, UIColor)? = nil
@@ -211,59 +211,48 @@ private final class StarsTransactionSheetContent: CombinedComponent {
             var isSubscriber = false
             var isSubscriptionFee = false
             var isCancelled = false
+            var isReaction = false
             
             var delayedCloseOnOpenPeer = true
             switch subject {
             case let .importer(peer, pricing, importer, usdRate):
                 let usdValue = formatTonUsdValue(pricing.amount, divide: false, rate: usdRate, dateTimeFormat: environment.dateTimeFormat)
-                titleText = "Subscription"
+                titleText = strings.Stars_Transaction_Subscription_Title
-                descriptionText = "appx. \(usdValue) per month"
+                descriptionText = strings.Stars_Transaction_Subscription_PerMonthUsd(usdValue).string
                 count = pricing.amount
                 countOnTop = true
-                transactionId = nil
                 date = importer.date
-                via = nil
-                messageId = nil
                 toPeer = importer.peer.peer.flatMap(EnginePeer.init)
                 transactionPeer = .peer(peer)
                 isSubscriber = true
             case let .subscription(subscription):
-                titleText = "Subscription"
+                titleText = strings.Stars_Transaction_Subscription_Title
                 descriptionText = ""
                 count = subscription.pricing.amount
-                transactionId = nil
                 date = subscription.untilDate
-                via = nil
-                messageId = nil
                 toPeer = subscription.peer
                 transactionPeer = .peer(subscription.peer)
                 isSubscription = true
                                 
                 if subscription.flags.contains(.isCancelled) {
-                    statusText = "You have cancelled your subscription"
+                    statusText = strings.Stars_Transaction_Subscription_Cancelled
                     statusIsDestructive = true
-                    buttonText = "Renew Subscription"
+                    buttonText = strings.Stars_Transaction_Subscription_Renew
                     isCancelled = true
                 } else {
-                    statusText = "If you cancel now, you can still access your subscription until \(stringForMediumDate(timestamp: subscription.untilDate, strings: strings, dateTimeFormat: dateTimeFormat, withTime: false))"
+                    statusText = strings.Stars_Transaction_Subscription_Active(stringForMediumDate(timestamp: subscription.untilDate, strings: strings, dateTimeFormat: dateTimeFormat, withTime: false)).string
-                    buttonText = "Cancel Subscription"
+                    buttonText = strings.Stars_Transaction_Subscription_Cancel
                     buttonIsDestructive = true
                 }
             case let .transaction(transaction, parentPeer):
                 if let _ = transaction.subscriptionPeriod {
-                    //TODO:localize
+                    titleText = strings.Stars_Transaction_SubscriptionFee
-                    titleText = "Monthly subscription fee"
                     descriptionText = ""
                     count = transaction.count
-                    countOnTop = false
                     transactionId = transaction.id
-                    via = nil
-                    messageId = nil
                     date = transaction.date
                     if case let .peer(peer) = transaction.peer {
                         toPeer = peer
-                    } else {
-                        toPeer = nil
                     }
                     transactionPeer = transaction.peer
                     isSubscriptionFee = true
@@ -273,16 +262,24 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                     count = transaction.count
                     countOnTop = true
                     transactionId = transaction.id
-                    via = nil
-                    messageId = nil
                     date = transaction.date
                     if case let .peer(peer) = transaction.peer {
                         toPeer = peer
-                    } else {
-                        toPeer = nil
                     }
                     transactionPeer = transaction.peer
                     isGift = true
+                } else if transaction.flags.contains(.isReaction) {
+                    titleText = strings.Stars_Transaction_Reaction_Title
+                    descriptionText = ""
+                    messageId = transaction.paidMessageId
+                    count = transaction.count
+                    transactionId = transaction.id
+                    date = transaction.date
+                    if case let .peer(peer) = transaction.peer {
+                        toPeer = peer
+                    }
+                    transactionPeer = transaction.peer
+                    isReaction = true
                 } else {
                     switch transaction.peer {
                     case let .peer(peer):
@@ -291,7 +288,6 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                         } else {
                             titleText = transaction.title ?? peer.compactDisplayTitle
                         }
-                        via = nil
                     case .appStore:
                         titleText = strings.Stars_Transaction_AppleTopUp_Title
                         via = strings.Stars_Transaction_AppleTopUp_Subtitle
@@ -314,7 +310,6 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                         via = strings.Stars_Transaction_TelegramAds_Subtitle
                     case .unsupported:
                         titleText = strings.Stars_Transaction_Unsupported_Title
-                        via = nil
                     }
                     if !transaction.media.isEmpty {
                         var description: String = ""
@@ -354,8 +349,6 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                     date = transaction.date
                     if case let .peer(peer) = transaction.peer {
                         toPeer = peer
-                    } else {
-                        toPeer = nil
                     }
                     transactionPeer = transaction.peer
                     media = transaction.media.map { AnyMediaReference.starsTransaction(transaction: StarsTransactionReference(peerId: parentPeer.id, id: transaction.id, isRefund: transaction.flags.contains(.isRefund)), media: $0) }
@@ -371,16 +364,11 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                 titleText = receipt.invoiceMedia.title
                 descriptionText = receipt.invoiceMedia.description
                 count = (receipt.invoice.prices.first?.amount ?? receipt.invoiceMedia.totalAmount) * -1
-                via = nil
-                messageId = nil
                 transactionId = receipt.transactionId
                 date = receipt.date
                 if let peer = state.peerMap[receipt.botPaymentId] {
                     toPeer = peer
-                } else {
-                    toPeer = nil
                 }
-                transactionPeer = nil
                 photo = receipt.invoiceMedia.photo
                 delayedCloseOnOpenPeer = false
             case let .gift(message):
@@ -398,15 +386,12 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                 } else {
                     fatalError()
                 }
-                via = nil
-                messageId = nil
                 date = message.timestamp
                 if message.id.peerId.id._internalGetInt64Value() == 777000 {
                     toPeer = nil
                 } else {
                     toPeer = state.peerMap[message.id.peerId]
                 }
-                transactionPeer = nil
                 isGift = true
                 delayedCloseOnOpenPeer = false
             }
@@ -427,7 +412,7 @@ private final class StarsTransactionSheetContent: CombinedComponent {
             let formattedAmount = presentationStringsFormattedNumber(abs(Int32(count)), dateTimeFormat.groupingSeparator)
             let countColor: UIColor
             if isSubscription || isSubscriber {
-                amountText = "\(formattedAmount) / month"
+                amountText = strings.Stars_Transaction_Subscription_PerMonth(formattedAmount).string
                 countColor = theme.list.itemSecondaryTextColor
             } else if countIsGeneric {
                 amountText = "\(formattedAmount)"
@@ -543,9 +528,9 @@ private final class StarsTransactionSheetContent: CombinedComponent {
             } else if let toPeer {
                 let title: String
                 if isSubscription {
-                    title = "Subscription"
+                    title = strings.Stars_Transaction_Subscription_Subscription
                 } else if isSubscriber {
-                    title = "Subscriber"
+                    title = strings.Stars_Transaction_Subscription_Subscriber
                 } else {
                     title = count < 0 || countIsGeneric ? strings.Stars_Transaction_To : strings.Stars_Transaction_From
                 }
@@ -604,7 +589,7 @@ private final class StarsTransactionSheetContent: CombinedComponent {
                 }
                 tableItems.append(.init(
                     id: "media",
-                    title: strings.Stars_Transaction_Media,
+                    title: isReaction ? strings.Stars_Transaction_Reaction_Post : strings.Stars_Transaction_Media,
                     component: AnyComponent(
                         Button(
                             content: AnyComponent(
@@ -647,15 +632,15 @@ private final class StarsTransactionSheetContent: CombinedComponent {
             if isSubscription {
                 if isCancelled {
                     if date > Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970) {
-                        dateTitle = "Expires"
+                        dateTitle = strings.Stars_Transaction_Subscription_Status_Expires
                     } else {
-                        dateTitle = "Expired"
+                        dateTitle = strings.Stars_Transaction_Subscription_Status_Expired
                     }
                 } else {
-                    dateTitle = "Renews"
+                    dateTitle = strings.Stars_Transaction_Subscription_Status_Renews
                 }
             } else if isSubscriber {
-                dateTitle = "Subscribed"
+                dateTitle = strings.Stars_Transaction_Subscription_Status_Subscribed
             } else {
                 dateTitle = strings.Stars_Transaction_Date
             }
@@ -1223,11 +1208,11 @@ public class StarsTransactionScreen: ViewControllerComponentContainer {
             let text: String
             switch action {
             case .cancel:
-                title = "Subscription cancelled"
+                title = presentationData.strings.Stars_Transaction_Subscription_Cancelled_Title
-                text = "You will still have access top [\(subscription.peer.compactDisplayTitle)]() until \(stringForMediumDate(timestamp: subscription.untilDate, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat))."
+                text = presentationData.strings.Stars_Transaction_Subscription_Cancelled_Text(subscription.peer.compactDisplayTitle, stringForMediumDate(timestamp: subscription.untilDate, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)).string
             case .renew:
-                title = "Subscription renewed"
+                title = presentationData.strings.Stars_Transaction_Subscription_Renewed_Title
-                text = "You renewed your subscription to [\(subscription.peer.compactDisplayTitle)]()."
+                text = presentationData.strings.Stars_Transaction_Subscription_Renewed_Text(subscription.peer.compactDisplayTitle).string
             }
 
             let controller = UndoOverlayController(presentationData: presentationData, content: .invitedToVoiceChat(context: context, peer: subscription.peer, title: title, text: text, action: nil, duration: 3.0), elevatedLayout: false, position: .bottom, action: { _ in return true })

submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsListPanelComponent.swift

@@ -217,11 +217,12 @@ final class StarsTransactionsListPanelComponent: Component {
                             itemSubtitle = peer.displayTitle(strings: environment.strings, displayOrder: .firstLast)
                         } else {
                             itemTitle = peer.displayTitle(strings: environment.strings, displayOrder: .firstLast)
-                            if item.flags.contains(.isGift) {
+                            if item.flags.contains(.isReaction) {
+                                itemSubtitle = environment.strings.Stars_Intro_Transaction_Reaction_Title
+                            } else if item.flags.contains(.isGift) {
                                 itemSubtitle = environment.strings.Stars_Intro_Transaction_Gift_Title
                             } else if let _ = item.subscriptionPeriod {
-                                //TODO:localize
+                                itemSubtitle = environment.strings.Stars_Intro_Transaction_SubscriptionFee_Title
-                                itemSubtitle = "Monthly subscription fee"
                             } else {
                                 itemSubtitle = nil
                             }