From c46a129ff7ab1157296dadc03c82c7411ca3abee Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Wed, 17 Jan 2024 18:03:30 +0400
Subject: [PATCH] Various fixes

---
 .../Telegram-iOS/en.lproj/Localizable.strings     |  1 +
 .../ChatMessageContactBubbleContentNode.swift     | 15 +++++++++++++--
 .../ChatRecordingPreviewInputPanelNode.swift      | 10 +++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index df5604a3dd..4e9d8ec336 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -10886,6 +10886,7 @@ Sorry for the inconvenience.";
 "Call.StatusWeakSignal" = "Weak network signal";
 
 "Conversation.ContactAddContact" = "ADD";
+"Conversation.ContactAddContactLong" = "ADD CONTACT";
 "Conversation.ContactMessage" = "MESSAGE";
 
 "Chat.PlayOnceVideoMessageTooltip" = "This video message can only be played once.";
diff --git a/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift b/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift
index e020e3d4c7..2007ed9f71 100644
--- a/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift
+++ b/submodules/TelegramUI/Components/Chat/ChatMessageContactBubbleContentNode/Sources/ChatMessageContactBubbleContentNode.swift
@@ -307,7 +307,18 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                 }
                 
                 let (messageButtonWidth, messageContinueLayout) = makeMessageButtonLayout(constrainedSize.width, nil, false, item.presentationData.strings.Conversation_ContactMessage.uppercased(), mainColor, false, false)
-                let (addButtonWidth, addContinueLayout) = makeAddButtonLayout(constrainedSize.width, nil, false, !canMessage && !canAdd ? item.presentationData.strings.Conversation_ViewContactDetails.uppercased() : item.presentationData.strings.Conversation_ContactAddContact.uppercased(), mainColor, false, false)
+                
+                let addTitle: String
+                if !canMessage && !canAdd  {
+                    addTitle = item.presentationData.strings.Conversation_ViewContactDetails
+                } else {
+                    if canMessage {
+                        addTitle = item.presentationData.strings.Conversation_ContactAddContact
+                    } else {
+                        addTitle = item.presentationData.strings.Conversation_ContactAddContactLong
+                    }
+                }
+                let (addButtonWidth, addContinueLayout) = makeAddButtonLayout(constrainedSize.width, nil, false, addTitle.uppercased(), mainColor, false, false)
                 
                 let maxButtonWidth = max(messageButtonWidth, addButtonWidth)
                 var maxContentWidth: CGFloat = avatarSize.width + 7.0
@@ -387,7 +398,7 @@ public class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                             strongSelf.messageButtonNode.isHidden = !canMessage
                             
                             let backgroundInsets = layoutConstants.text.bubbleInsets
-                            let backgroundFrame = CGRect(origin: CGPoint(x: backgroundInsets.left, y: backgroundInsets.top + 5.0), size: CGSize(width: contentWidth - layoutConstants.text.bubbleInsets.right * 2.0, height: layoutSize.height - 34.0))
+                            let backgroundFrame = CGRect(origin: CGPoint(x: backgroundInsets.left, y: backgroundInsets.top + 5.0), size: CGSize(width: boundingWidth - layoutConstants.text.bubbleInsets.right * 2.0, height: layoutSize.height - 34.0))
                             
                             if let statusSizeAndApply = statusSizeAndApply {
                                 strongSelf.dateAndStatusNode.frame = CGRect(origin: CGPoint(x: layoutConstants.text.bubbleInsets.left, y: backgroundFrame.maxY + 3.0), size: statusSizeAndApply.0)
diff --git a/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
index 2e31756982..8a6c84f630 100644
--- a/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
@@ -350,11 +350,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
                 }
             }
         }
-        
-        if isFirstTime, !self.viewOnceButton.isHidden {
-            self.maybePresentViewOnceTooltip()
-        }
-        
+                
         let panelHeight = defaultHeight(metrics: metrics)
 
         transition.updateFrame(node: self.deleteButton, frame: CGRect(origin: CGPoint(x: leftInset + 2.0 - UIScreenPixel, y: 1), size: CGSize(width: 40.0, height: 40)))
@@ -488,6 +484,10 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
             }
         }
         
+        if isFirstTime, !self.viewOnceButton.isHidden {
+            self.maybePresentViewOnceTooltip()
+        }
+        
         return panelHeight
     }