Various fixes

This commit is contained in:
Ilya Laktyushin 2023-03-29 17:07:35 +04:00
parent a85c8073b1
commit d11ab57854
2 changed files with 4 additions and 5 deletions

View File

@ -471,7 +471,7 @@ public final class ListMessageSnippetItemNode: ListMessageNode {
let host: String? = concealed ? urlString : parsedUrl?.host let host: String? = concealed ? urlString : parsedUrl?.host
if let url = parsedUrl, let host = host { if let url = parsedUrl, let host = host {
primaryUrl = urlString primaryUrl = urlString
title = NSAttributedString(string: tempTitleString as String, font: titleFont, textColor: item.presentationData.theme.theme.list.itemPrimaryTextColor) title = NSAttributedString(string: (tempTitleString as String).uppercased(), font: titleFont, textColor: item.presentationData.theme.theme.list.itemPrimaryTextColor)
if url.path.hasPrefix("/addstickers/") { if url.path.hasPrefix("/addstickers/") {
iconText = NSAttributedString(string: "S", font: iconFont, textColor: UIColor.white) iconText = NSAttributedString(string: "S", font: iconFont, textColor: UIColor.white)
} else if url.path.hasPrefix("/addemoji/") { } else if url.path.hasPrefix("/addemoji/") {

View File

@ -2039,23 +2039,22 @@ private final class PremiumIntroScreenComponent: CombinedComponent {
availableProducts = .single([]) availableProducts = .single([])
} }
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
let otherPeerName: Signal<String?, NoError> let otherPeerName: Signal<String?, NoError>
if case let .gift(fromPeerId, toPeerId, _) = source { if case let .gift(fromPeerId, toPeerId, _) = source {
let otherPeerId = fromPeerId != context.account.peerId ? fromPeerId : toPeerId let otherPeerId = fromPeerId != context.account.peerId ? fromPeerId : toPeerId
otherPeerName = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: otherPeerId)) otherPeerName = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: otherPeerId))
|> map { peer -> String? in |> map { peer -> String? in
return peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) return peer?.compactDisplayTitle
} }
} else if case let .profile(peerId) = source { } else if case let .profile(peerId) = source {
otherPeerName = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId)) otherPeerName = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId))
|> map { peer -> String? in |> map { peer -> String? in
return peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) return peer?.compactDisplayTitle
} }
} else if case let .emojiStatus(peerId, _, _, _) = source { } else if case let .emojiStatus(peerId, _, _, _) = source {
otherPeerName = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId)) otherPeerName = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: peerId))
|> map { peer -> String? in |> map { peer -> String? in
return peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) return peer?.compactDisplayTitle
} }
} else { } else {
otherPeerName = .single(nil) otherPeerName = .single(nil)