diff --git a/android/app/src/main/assets/fonts/Inter-Bold.ttf b/android/app/src/main/assets/fonts/Inter-Bold.ttf index cc065b681f..728ab9be1f 100644 Binary files a/android/app/src/main/assets/fonts/Inter-Bold.ttf and b/android/app/src/main/assets/fonts/Inter-Bold.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-BoldItalic.ttf b/android/app/src/main/assets/fonts/Inter-BoldItalic.ttf index 503b9e0ae6..9a7a216eb7 100644 Binary files a/android/app/src/main/assets/fonts/Inter-BoldItalic.ttf and b/android/app/src/main/assets/fonts/Inter-BoldItalic.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf b/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf index e244ac9b6e..c8f20100b9 100644 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf and b/android/app/src/main/assets/fonts/Inter-ExtraBold.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf b/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf index e49f4d90a0..42855a51ed 100644 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf and b/android/app/src/main/assets/fonts/Inter-ExtraLight-BETA.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf b/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf index 4c84fe4072..6aebfa6f9d 100644 Binary files a/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf and b/android/app/src/main/assets/fonts/Inter-ExtraLightItalic-BETA.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-Italic.ttf b/android/app/src/main/assets/fonts/Inter-Italic.ttf index 598db24121..de23a382e6 100644 Binary files a/android/app/src/main/assets/fonts/Inter-Italic.ttf and b/android/app/src/main/assets/fonts/Inter-Italic.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf b/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf index 81f56263c9..f318224c68 100644 Binary files a/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf and b/android/app/src/main/assets/fonts/Inter-Light-BETA.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf b/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf index e5e453849b..bceb0f76b0 100644 Binary files a/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf and b/android/app/src/main/assets/fonts/Inter-LightItalic-BETA.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-Medium.ttf b/android/app/src/main/assets/fonts/Inter-Medium.ttf index 5fb476d84f..8913185821 100644 Binary files a/android/app/src/main/assets/fonts/Inter-Medium.ttf and b/android/app/src/main/assets/fonts/Inter-Medium.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-MediumItalic.ttf b/android/app/src/main/assets/fonts/Inter-MediumItalic.ttf index e8a7259484..0c72989122 100644 Binary files a/android/app/src/main/assets/fonts/Inter-MediumItalic.ttf and b/android/app/src/main/assets/fonts/Inter-MediumItalic.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-Regular.ttf b/android/app/src/main/assets/fonts/Inter-Regular.ttf index 8c04c5bc83..ffc482f0b8 100644 Binary files a/android/app/src/main/assets/fonts/Inter-Regular.ttf and b/android/app/src/main/assets/fonts/Inter-Regular.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-SemiBold.ttf b/android/app/src/main/assets/fonts/Inter-SemiBold.ttf index af40294e59..634e538d77 100644 Binary files a/android/app/src/main/assets/fonts/Inter-SemiBold.ttf and b/android/app/src/main/assets/fonts/Inter-SemiBold.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-SemiBoldItalic.ttf b/android/app/src/main/assets/fonts/Inter-SemiBoldItalic.ttf index 894a65fd61..2ae594bc84 100644 Binary files a/android/app/src/main/assets/fonts/Inter-SemiBoldItalic.ttf and b/android/app/src/main/assets/fonts/Inter-SemiBoldItalic.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf b/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf index b6ba236653..90e4603383 100644 Binary files a/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf and b/android/app/src/main/assets/fonts/Inter-Thin-BETA.ttf differ diff --git a/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf b/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf index 1df838c704..e710885029 100644 Binary files a/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf and b/android/app/src/main/assets/fonts/Inter-ThinItalic-BETA.ttf differ diff --git a/android/app/src/main/res/drawable-hdpi/tiny_reply.png b/android/app/src/main/res/drawable-hdpi/tiny_reply.png deleted file mode 100644 index 482c1afadb..0000000000 Binary files a/android/app/src/main/res/drawable-hdpi/tiny_reply.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-mdpi/tiny_reply.png b/android/app/src/main/res/drawable-mdpi/tiny_reply.png deleted file mode 100644 index ba011b3723..0000000000 Binary files a/android/app/src/main/res/drawable-mdpi/tiny_reply.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xhdpi/tiny_reply.png b/android/app/src/main/res/drawable-xhdpi/tiny_reply.png deleted file mode 100644 index ab2c37d672..0000000000 Binary files a/android/app/src/main/res/drawable-xhdpi/tiny_reply.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxhdpi/tiny_reply.png b/android/app/src/main/res/drawable-xxhdpi/tiny_reply.png deleted file mode 100644 index 4376f90da8..0000000000 Binary files a/android/app/src/main/res/drawable-xxhdpi/tiny_reply.png and /dev/null differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/tiny_reply.png b/android/app/src/main/res/drawable-xxxhdpi/tiny_reply.png deleted file mode 100644 index 734a1b0b00..0000000000 Binary files a/android/app/src/main/res/drawable-xxxhdpi/tiny_reply.png and /dev/null differ diff --git a/desktop/js_files/package.json b/desktop/js_files/package.json index 60dcaacbfb..b3dbae5f23 100644 --- a/desktop/js_files/package.json +++ b/desktop/js_files/package.json @@ -203,7 +203,6 @@ "../../../../../desktop/resources/tiny_new_contact.png", "../../../../../desktop/resources/tiny_pending.png", "../../../../../desktop/resources/tiny_public.png", - "../../../../../desktop/resources/tiny_reply.png", "../../../../../desktop/resources/tiny_settings.png", "../../../../../desktop/resources/tiny_tribute_to_talk.png", "../../../../../desktop/resources/tribute_to_talk.png", diff --git a/desktop/resources/tiny_reply.png b/desktop/resources/tiny_reply.png deleted file mode 100644 index 482c1afadb..0000000000 Binary files a/desktop/resources/tiny_reply.png and /dev/null differ diff --git a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/Contents.json b/ios/StatusIm/Images.xcassets/tiny-reply.imageset/Contents.json deleted file mode 100644 index ccf10477b5..0000000000 --- a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "tiny-reply.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "tiny-reply@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "tiny-reply@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply.png b/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply.png deleted file mode 100644 index ba011b3723..0000000000 Binary files a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply.png and /dev/null differ diff --git a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply@2x.png b/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply@2x.png deleted file mode 100644 index ab2c37d672..0000000000 Binary files a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply@2x.png and /dev/null differ diff --git a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply@3x.png b/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply@3x.png deleted file mode 100644 index 4376f90da8..0000000000 Binary files a/ios/StatusIm/Images.xcassets/tiny-reply.imageset/tiny-reply@3x.png and /dev/null differ diff --git a/resources/fonts/Inter-Black.otf b/resources/fonts/Inter-Black.otf index 86842872f3..66cfaf6ced 100644 Binary files a/resources/fonts/Inter-Black.otf and b/resources/fonts/Inter-Black.otf differ diff --git a/resources/fonts/Inter-BlackItalic.otf b/resources/fonts/Inter-BlackItalic.otf index 7001434044..336c804492 100644 Binary files a/resources/fonts/Inter-BlackItalic.otf and b/resources/fonts/Inter-BlackItalic.otf differ diff --git a/resources/fonts/Inter-Bold.otf b/resources/fonts/Inter-Bold.otf index 502bba341c..0dbf67b7c4 100644 Binary files a/resources/fonts/Inter-Bold.otf and b/resources/fonts/Inter-Bold.otf differ diff --git a/resources/fonts/Inter-BoldItalic.otf b/resources/fonts/Inter-BoldItalic.otf index a1f7d88339..d9d46b67e8 100644 Binary files a/resources/fonts/Inter-BoldItalic.otf and b/resources/fonts/Inter-BoldItalic.otf differ diff --git a/resources/fonts/Inter-ExtraBold.otf b/resources/fonts/Inter-ExtraBold.otf index 7410f73cff..b3ef7a3628 100644 Binary files a/resources/fonts/Inter-ExtraBold.otf and b/resources/fonts/Inter-ExtraBold.otf differ diff --git a/resources/fonts/Inter-ExtraBoldItalic.otf b/resources/fonts/Inter-ExtraBoldItalic.otf index 7d451cbb9d..5f3410bdda 100644 Binary files a/resources/fonts/Inter-ExtraBoldItalic.otf and b/resources/fonts/Inter-ExtraBoldItalic.otf differ diff --git a/resources/fonts/Inter-ExtraLight-BETA.otf b/resources/fonts/Inter-ExtraLight-BETA.otf index 6e9672f6b4..4152657ac3 100644 Binary files a/resources/fonts/Inter-ExtraLight-BETA.otf and b/resources/fonts/Inter-ExtraLight-BETA.otf differ diff --git a/resources/fonts/Inter-ExtraLightItalic-BETA.otf b/resources/fonts/Inter-ExtraLightItalic-BETA.otf index e7789f95aa..48bd97cd61 100644 Binary files a/resources/fonts/Inter-ExtraLightItalic-BETA.otf and b/resources/fonts/Inter-ExtraLightItalic-BETA.otf differ diff --git a/resources/fonts/Inter-Italic.otf b/resources/fonts/Inter-Italic.otf index 4e2906e5ff..d041c41f04 100644 Binary files a/resources/fonts/Inter-Italic.otf and b/resources/fonts/Inter-Italic.otf differ diff --git a/resources/fonts/Inter-Light-BETA.otf b/resources/fonts/Inter-Light-BETA.otf index 80ee72b8c0..9b986a567c 100644 Binary files a/resources/fonts/Inter-Light-BETA.otf and b/resources/fonts/Inter-Light-BETA.otf differ diff --git a/resources/fonts/Inter-LightItalic-BETA.otf b/resources/fonts/Inter-LightItalic-BETA.otf index ba2cb1b834..bfb5ba3b0e 100644 Binary files a/resources/fonts/Inter-LightItalic-BETA.otf and b/resources/fonts/Inter-LightItalic-BETA.otf differ diff --git a/resources/fonts/Inter-Medium.otf b/resources/fonts/Inter-Medium.otf index 6604db39da..1bcb0a9343 100644 Binary files a/resources/fonts/Inter-Medium.otf and b/resources/fonts/Inter-Medium.otf differ diff --git a/resources/fonts/Inter-MediumItalic.otf b/resources/fonts/Inter-MediumItalic.otf index ea66c5a629..0274a218f4 100644 Binary files a/resources/fonts/Inter-MediumItalic.otf and b/resources/fonts/Inter-MediumItalic.otf differ diff --git a/resources/fonts/Inter-Regular.otf b/resources/fonts/Inter-Regular.otf index fdb121dd6b..6724353f43 100644 Binary files a/resources/fonts/Inter-Regular.otf and b/resources/fonts/Inter-Regular.otf differ diff --git a/resources/fonts/Inter-SemiBold.otf b/resources/fonts/Inter-SemiBold.otf index 78482e60f4..a6f9b2dc5a 100644 Binary files a/resources/fonts/Inter-SemiBold.otf and b/resources/fonts/Inter-SemiBold.otf differ diff --git a/resources/fonts/Inter-SemiBoldItalic.otf b/resources/fonts/Inter-SemiBoldItalic.otf index e74b87411d..ac35ffc52a 100644 Binary files a/resources/fonts/Inter-SemiBoldItalic.otf and b/resources/fonts/Inter-SemiBoldItalic.otf differ diff --git a/resources/fonts/Inter-Thin-BETA.otf b/resources/fonts/Inter-Thin-BETA.otf index 90def70df2..442f4724f7 100644 Binary files a/resources/fonts/Inter-Thin-BETA.otf and b/resources/fonts/Inter-Thin-BETA.otf differ diff --git a/resources/fonts/Inter-ThinItalic-BETA.otf b/resources/fonts/Inter-ThinItalic-BETA.otf index cc7419c354..6a9e702082 100644 Binary files a/resources/fonts/Inter-ThinItalic-BETA.otf and b/resources/fonts/Inter-ThinItalic-BETA.otf differ diff --git a/src/status_im/ui/screens/chat/input/input.cljs b/src/status_im/ui/screens/chat/input/input.cljs index e8f1dec995..314af6931b 100644 --- a/src/status_im/ui/screens/chat/input/input.cljs +++ b/src/status_im/ui/screens/chat/input/input.cljs @@ -125,10 +125,6 @@ current-public-key [:multiaccount/public-key]] [react/scroll-view {:style style/reply-message-content} [react/view {:style style/reply-message-to-container} - [vector-icons/tiny-icon :tiny-icons/tiny-reply {:container-style style/reply-icon - :accessibility-label :tiny-reply-icon - :width 20 - :color colors/gray}] (chat-utils/format-reply-author from alias ens-name current-public-key style/reply-message-author)] [react/text {:style (assoc (message-style/style-message-text false) :font-size 14) :number-of-lines 3} message-text]])) diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs index 5a3de2d869..d6e2e06df6 100644 --- a/src/status_im/ui/screens/chat/message/message.cljs +++ b/src/status_im/ui/screens/chat/message/message.cljs @@ -50,12 +50,10 @@ (when (or quote text) [react/view {:style (style/quoted-message-container outgoing)} [react/view {:style style/quoted-message-author-container} - [vector-icons/tiny-icon :tiny-icons/tiny-reply - {:color (if outgoing colors/white-transparent colors/gray)}] - (chat.utils/format-reply-author + [chat.utils/format-reply-author (or from (:from quote)) alias ens-name current-public-key - (partial style/quoted-message-author outgoing))] + (partial style/quoted-message-author outgoing)]] [react/text {:style (style/quoted-message-text outgoing) :number-of-lines 5} @@ -66,7 +64,7 @@ :on-press #(re-frame/dispatch [:chat.ui/message-expand-toggled chat-id message-id])} (i18n/label (if expanded? :show-less :show-more))]) -(defn render-inline [message-text outgoing acc {:keys [type literal destination] :as node}] +(defn render-inline [message-text outgoing acc {:keys [type literal destination]}] (case type "" (conj acc literal) @@ -177,12 +175,12 @@ {:justify-timestamp? true}]) (defn emoji-message - [{:keys [content current-public-key alias] :as message}] + [{:keys [content current-public-key alias outgoing] :as message}] (let [response-to (:response-to content)] [message-view message - [react/view {:style (style/style-message-text false)} + [react/view {:style (style/style-message-text outgoing)} (when response-to - [quoted-message response-to (:quoted-message message) alias false current-public-key]) + [quoted-message response-to (:quoted-message message) alias outgoing current-public-key]) [react/text {:style (style/emoji-message message)} (:text content)]]])) @@ -504,7 +502,8 @@ from outgoing modal? - content] :as message} child] + content] + :as message} child] [react/view (style/group-message-wrapper message) [react/view (style/message-body message) (when display-photo? @@ -515,7 +514,8 @@ [photos/member-photo from identicon]]])]) [react/view (style/group-message-view outgoing display-photo?) (when display-username? - [react/touchable-opacity {:on-press #(re-frame/dispatch [:chat.ui/show-profile from])} + [react/touchable-opacity {:style style/message-author-touchable + :on-press #(re-frame/dispatch [:chat.ui/show-profile from])} [message-author-name from alias]]) [react/view {:style (style/timestamp-content-wrapper outgoing)} child]]] diff --git a/src/status_im/ui/screens/chat/styles/message/message.cljs b/src/status_im/ui/screens/chat/styles/message/message.cljs index 483fe45e89..1f178ef453 100644 --- a/src/status_im/ui/screens/chat/styles/message/message.cljs +++ b/src/status_im/ui/screens/chat/styles/message/message.cljs @@ -11,13 +11,6 @@ [outgoing] {:color (if outgoing colors/white colors/text)}) -(defn message-padding-top - [{:keys [last-in-group? display-username?]}] - (if (and display-username? - last-in-group?) - 6 - 2)) - (defn last-message-padding [{:keys [first? typing]}] (when (and first? (not typing)) @@ -25,10 +18,10 @@ (defn message-body [{:keys [outgoing] :as message}] - (let [align (if outgoing :flex-end :flex-start) + (let [align (if outgoing :flex-end :flex-start) direction (if outgoing :row-reverse :row)] {:flex-direction direction - :padding-top (message-padding-top message) + :margin-top 4 :align-self align :align-items align})) @@ -46,11 +39,12 @@ (defn message-timestamp-text [justify-timestamp? outgoing rtl? emoji?] (merge message-timestamp - {:color (if (and outgoing (not emoji?)) - colors/white-transparent-70 - colors/gray)} + {:line-height 10 + :color (if outgoing + colors/white-transparent-70 + colors/gray)} (when justify-timestamp? {:position :absolute - :bottom 7 + :bottom 9 ; 6 Bubble bottom, 3 message baseline (if rtl? :left :right) 12}))) (def message-expand-button @@ -66,10 +60,10 @@ :color colors/text-gray}) (defn group-message-wrapper [{:keys [outgoing] :as message}] - (merge {:flex-direction :column} + (merge {:flex-direction :column} (if outgoing - {:margin-left 64} - {:margin-right 64}) + {:margin-left 96} + {:margin-right 52}) (last-message-padding message))) (defn timestamp-content-wrapper [outgoing] @@ -79,7 +73,7 @@ [outgoing display-photo?] (let [align (if outgoing :flex-end :flex-start)] (merge {:flex-direction :column - :max-width (if platform/desktop? 500 320) + :flex-shrink 1 :align-items align} (if outgoing {:margin-right 8} @@ -93,6 +87,10 @@ {:align-self :flex-start :padding-left (if platform/desktop? 24 8)})) +(def message-author-touchable + {:margin-left 12 + :padding-vertical 2}) + (defn message-author [outgoing] (merge {:width (+ 16 photos/default-size) ;; 16 is for the padding @@ -134,25 +132,35 @@ :line-height 22 :margin-bottom (if collapsed? 2 0))) -(styles/defn emoji-message +(defn emoji-message [{:keys [incoming-group]}] - {:font-size 40 - :desktop {:line-height 46} - :margin-top (if incoming-group 4 0)}) + {:font-size 28 + :line-height 34 ;TODO: Smaller crops the icon on the top + :margin-right 12 + :margin-top (if incoming-group 4 0)}) (defn message-view [{:keys [content-type outgoing group-chat last-in-group?]}] - (merge {:padding-vertical 6 - :padding-horizontal 12 - :border-radius 8 - :margin-top (if (and last-in-group? - (or outgoing - (not group-chat))) - 16 - 4)} - (if (= content-type constants/content-type-emoji) - {:flex-direction :row} - {:background-color (if outgoing colors/blue colors/blue-light)}))) + (merge + {:border-top-left-radius 16 + :border-top-right-radius 16 + :border-bottom-right-radius 16 + :border-bottom-left-radius 16 + :padding-vertical 6 + :padding-horizontal 12 + :border-radius 8 + :margin-top (if (and last-in-group? + (or outgoing + (not group-chat))) + 16 + 0)} + (if outgoing + {:border-bottom-right-radius 4} + {:border-bottom-left-radius 4}) + + {:background-color (if outgoing colors/blue colors/blue-light)} + (when (= content-type constants/content-type-emoji) + {:flex-direction :row}))) (def play-image {:width 33 @@ -175,8 +183,6 @@ :font-weight (if chosen? "500" "400") :padding-top 6 :padding-left 12 - :padding-right 16 - :margin-right 12 :text-align-vertical :center}) (def message-author-name-container @@ -203,9 +209,11 @@ (defn quoted-message-author [outgoing chosen?] (assoc (message-author-name chosen?) - :padding-bottom 5 - :padding-top 4 - :padding-left 6 + :padding-bottom 6 + :padding-top 0 + :padding-left 0 + :line-height 18 + :font-weight "500" :color (if outgoing colors/white-transparent-70 colors/gray))) diff --git a/src/status_im/ui/screens/chat/utils.cljs b/src/status_im/ui/screens/chat/utils.cljs index 57c5717ea8..ce35faf1d8 100644 --- a/src/status_im/ui/screens/chat/utils.cljs +++ b/src/status_im/ui/screens/chat/utils.cljs @@ -14,16 +14,28 @@ (defn format-author [alias style name] (let [additional-styles (style false)] (if name - [react/text {:style (merge {:color colors/blue :font-size 13 :font-weight "500"} additional-styles)} + [react/text {:style (merge {:color colors/blue + :font-size 13 + :line-height 18 + :font-weight "500"} additional-styles)} (str "@" (or (stateofus/username name) name))] - [react/text {:style (merge {:color colors/gray :font-size 12 :font-weight "400"} additional-styles)} + [react/text {:style (merge {:color colors/gray + :font-size 12 + :line-height 18 + :font-weight "400"} additional-styles)} alias]))) +(def ^:private reply-symbol "↪ ") + (defn format-reply-author [from alias username current-public-key style] - (or (and (= from current-public-key) - [react/text {:style (style true)} - (i18n/label :t/You)]) - (format-author alias style username))) + (let [reply-name (or (some->> username + (str "@") + (str reply-symbol)) + (str reply-symbol alias))] + (or (and (= from current-public-key) + [react/text {:style (style true)} + (str reply-symbol (i18n/label :t/You))]) + (format-author reply-name style false)))) (def ^:private styling->prop {:bold {:style {:font-weight "700"}} diff --git a/src/status_im/ui/screens/ens/views.cljs b/src/status_im/ui/screens/ens/views.cljs index 57e7842493..fed87c37db 100644 --- a/src/status_im/ui/screens/ens/views.cljs +++ b/src/status_im/ui/screens/ens/views.cljs @@ -648,7 +648,7 @@ :content-type constants/content-type-text :timestamp-str "9:41 AM"}] [react/view - [react/view {:padding-left 60} + [react/view {:padding-left 72} [message/message-author-name public-key]] [react/view {:flex-direction :row} [react/view {:padding-left 16 :padding-right 8 :padding-top 4} diff --git a/test/appium/views/chat_view.py b/test/appium/views/chat_view.py index a91159146d..d262217c41 100644 --- a/test/appium/views/chat_view.py +++ b/test/appium/views/chat_view.py @@ -337,7 +337,7 @@ class ChatElementByText(BaseText): class Username(BaseText): def __init__(self, driver, parent_locator): super(Username, self).__init__(driver) - self.locator = self.Locator.xpath_selector(parent_locator + "/*[1]/android.widget.TextView") + self.locator = self.Locator.xpath_selector(parent_locator + "/*[2]/android.widget.TextView") return Username(self.driver, self.locator.value)