Merge commit 'd156e552335c98c2d7c432567b8a093457ea10a5' into beta

Author: laktyushin

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

@@ -14996,3 +14996,11 @@ Sorry for the inconvenience.";
 "Gift.Value.ForSaleOnFragment" = "for sale on Fragment";
 
 "Gift.View.Context.SetAsTheme" = "Set as Theme in...";
+
+"Notification.GiftStars" = "Gift for %@";
+"Notification.GiftStars.Stars_1" = "%@ Star";
+"Notification.GiftStars.Stars_any" = "%@ Stars";
+
+"Notification.PrepaidGiftUpgrade" = "Gift Upgrade for %@";
+"Notification.PrepaidGiftUpgrade.Stars_1" = "%@ Star";
+"Notification.PrepaidGiftUpgrade.Stars_any" = "%@ Stars";

submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift

@@ -1173,7 +1173,15 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                         let mutableAttributedString = NSMutableAttributedString(attributedString: stringWithAppliedEntities(text, entities: entities ?? [], baseColor: primaryTextColor, linkColor: primaryTextColor, baseFont: titleFont, linkFont: titleBoldFont, boldFont: titleBoldFont, italicFont: titleFont, boldItalicFont: titleBoldFont, fixedFont: titleFont, blockQuoteFont: titleFont, underlineLinks: false, message: message._asMessage()))
                         attributedString = mutableAttributedString
                     } else {
-                        attributedString = NSAttributedString(string: strings.Notification_Gift, font: titleFont, textColor: primaryTextColor)
+                        if isPrepaidUpgrade {
+                            let starsPrice = strings.Notification_PrepaidGiftUpgrade_Stars(Int32(clamping: upgradeStars ?? 0))
+                            attributedString = NSAttributedString(string: strings.Notification_PrepaidGiftUpgrade(starsPrice).string, font: titleFont, textColor: primaryTextColor)
+                        } else if case let .generic(gift) = gift {
+                            let starsPrice = strings.Notification_GiftStars_Stars(Int32(clamping: gift.price))
+                            attributedString = NSAttributedString(string: strings.Notification_GiftStars(starsPrice).string, font: titleFont, textColor: primaryTextColor)
+                        } else {
+                            attributedString = NSAttributedString(string: strings.Notification_Gift, font: titleFont, textColor: primaryTextColor)
+                        }
                     }
                 } else if case let .generic(gift) = gift {
                     var finalPrice = gift.price

submodules/TelegramUI/Sources/ChatController.swift

@@ -5831,6 +5831,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 }
                             }
                         case .gift:
+                            if let darkAppearancePreview = darkAppearancePreview {
+                                useDarkAppearance = darkAppearancePreview
+                            }
                             if let theme = makePresentationTheme(chatTheme: chatTheme, dark: useDarkAppearance) {
                                 theme.forceSync = true
                                 presentationData = presentationData.withUpdated(theme: theme).withUpdated(chatWallpaper: theme.chat.defaultWallpaper)