From 6fedfb2e8b84ddb889e32196f99af7f72bae1448 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 31 Aug 2021 21:00:42 +0300 Subject: [PATCH] Various Fixes --- .../Sources/ChatChoosingStickerActivityContentNode.swift | 2 +- submodules/Emoji/Sources/EmojiUtils.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/ChatTitleActivityNode/Sources/ChatChoosingStickerActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatChoosingStickerActivityContentNode.swift index db171d3143..4542fbae9d 100644 --- a/submodules/ChatTitleActivityNode/Sources/ChatChoosingStickerActivityContentNode.swift +++ b/submodules/ChatTitleActivityNode/Sources/ChatChoosingStickerActivityContentNode.swift @@ -101,7 +101,7 @@ class ChatChoosingStickerActivityContentNode: ChatTitleActivityContentNode { self.indicatorNode = ChatChoosingStickerActivityIndicatorNode(color: color) var text = text - self.advanced = text.string == "choosing sticker" + self.advanced = text.string == "choosing a sticker" if self.advanced { let mutable = text.mutableCopy() as? NSMutableAttributedString mutable?.replaceCharacters(in: NSMakeRange(2, 2), with: " ") diff --git a/submodules/Emoji/Sources/EmojiUtils.swift b/submodules/Emoji/Sources/EmojiUtils.swift index 893bae47e8..58ba322f87 100644 --- a/submodules/Emoji/Sources/EmojiUtils.swift +++ b/submodules/Emoji/Sources/EmojiUtils.swift @@ -136,7 +136,7 @@ public extension String { continue } string.unicodeScalars.append(scalar) - if scalar.value == 0x2764, self.unicodeScalars.count > 1, self.emojis.count == 1 { + if scalar.value == 0x2764 && self.unicodeScalars.count < 3 { break } }