From 94fbbbcb3cd5adbad3848cb0a3078b54443b5230 Mon Sep 17 00:00:00 2001
From: Sean Hagstrom <sean@seanhagstrom.com>
Date: Fri, 24 Jan 2025 15:51:46 +0000
Subject: [PATCH] fix: resolve UI glitches for chat, contacts, and keycard
 (#21946)

This change resolves some issues related to text-overflow in the app, and it also ensures we use the correct drawer title when editing a user nickname.
---
 src/quo/components/selectors/disclaimer/style.cljs            | 3 ++-
 .../contexts/chat/messenger/messages/content/view.cljs        | 4 +++-
 src/status_im/contexts/profile/contact/add_nickname/view.cljs | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/quo/components/selectors/disclaimer/style.cljs b/src/quo/components/selectors/disclaimer/style.cljs
index f0531fae3d0..669e8639e24 100644
--- a/src/quo/components/selectors/disclaimer/style.cljs
+++ b/src/quo/components/selectors/disclaimer/style.cljs
@@ -15,7 +15,8 @@
      :border-color     (colors/theme-colors colors/neutral-20 dark-border theme)}))
 
 (def text
-  {:margin-left 8})
+  {:flex        1
+   :margin-left 8})
 
 (def icon-container
   {:align-items :flex-end
diff --git a/src/status_im/contexts/chat/messenger/messages/content/view.cljs b/src/status_im/contexts/chat/messenger/messages/content/view.cljs
index 0e73d817fd5..4753985977f 100644
--- a/src/status_im/contexts/chat/messenger/messages/content/view.cljs
+++ b/src/status_im/contexts/chat/messenger/messages/content/view.cljs
@@ -159,7 +159,9 @@
   [content]
   (reduce (fn [acc e]
             (conj acc (resolve-group-system-message e)))
-          [quo/text]
+          [rn/view
+           {:style {:flex-direction :row
+                    :flex-wrap      :wrap}}]
           (:parsed-text content)))
 
 (defn group-system-message
diff --git a/src/status_im/contexts/profile/contact/add_nickname/view.cljs b/src/status_im/contexts/profile/contact/add_nickname/view.cljs
index f882050d5ff..dc4f0dfff39 100644
--- a/src/status_im/contexts/profile/contact/add_nickname/view.cljs
+++ b/src/status_im/contexts/profile/contact/add_nickname/view.cljs
@@ -52,7 +52,9 @@
      [quo/drawer-top
       {:type                :context-tag
        :context-tag-type    :default
-       :title               (i18n/label :t/add-nickname-title)
+       :title               (if has-nickname?
+                              (i18n/label :t/edit-nickname)
+                              (i18n/label :t/add-nickname-title))
        :full-name           full-name
        :profile-picture     profile-picture
        :customization-color customization-color}]