diff --git a/resources/images/icons2/20x20/pin@2x.png b/resources/images/icons2/20x20/pin@2x.png index 7ea8665ec07b..4d036932e83e 100644 Binary files a/resources/images/icons2/20x20/pin@2x.png and b/resources/images/icons2/20x20/pin@2x.png differ diff --git a/resources/images/icons2/20x20/pin@3x.png b/resources/images/icons2/20x20/pin@3x.png index 462d35f7a03d..c62021285656 100644 Binary files a/resources/images/icons2/20x20/pin@3x.png and b/resources/images/icons2/20x20/pin@3x.png differ diff --git a/src/quo2/components/avatars/icon_avatar.cljs b/src/quo2/components/avatars/icon_avatar.cljs index 9c151206aa28..95f0981a171e 100644 --- a/src/quo2/components/avatars/icon_avatar.cljs +++ b/src/quo2/components/avatars/icon_avatar.cljs @@ -4,9 +4,8 @@ [quo2.theme :as quo.theme] [react-native.core :as rn])) -(def sizes - {:big 48 - :medium 32 +(def ^:private sizes + {:medium 32 :small 20}) (defn icon-avatar-internal @@ -16,8 +15,7 @@ circle-color (colors/custom-color color 50 opacity) icon-color (colors/custom-color-by-theme color 50 60) icon-size (case size - :big 20 - :medium 16 + :medium 20 :small 12)] [rn/view {:style {:width component-size diff --git a/src/quo2/components/messages/author/view.cljs b/src/quo2/components/messages/author/view.cljs index 135e28edf272..f0ba7998d1c9 100644 --- a/src/quo2/components/messages/author/view.cljs +++ b/src/quo2/components/messages/author/view.cljs @@ -12,7 +12,7 @@ [{:keys [primary-name secondary-name style short-chat-key time-str contact? verified? untrustworthy? muted? size] :or {size 13}}] - [rn/view {:style (merge style/container style)} + [rn/view {:style (merge style/container style {:height (if (= size 15) 21.75 18.2)})} [text/text {:weight :semi-bold :size (if (= size 15) :paragraph-1 :paragraph-2) diff --git a/src/quo2/components/messages/system_message.cljs b/src/quo2/components/messages/system_message.cljs index fe2f123c1e4f..79788efb1b20 100644 --- a/src/quo2/components/messages/system_message.cljs +++ b/src/quo2/components/messages/system_message.cljs @@ -15,7 +15,7 @@ (defn time-color [theme] - (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)) + (colors/theme-colors colors/neutral-40 colors/neutral-50 theme)) (defn sm-icon [{:keys [icon color opacity]}] @@ -28,11 +28,11 @@ :opacity opacity}]]) (defn sm-timestamp - [timestamp] + [timestamp theme] [rn/view {:margin-left 8 :margin-top 2} [text/text {:size :label - :style {:color (time-color :time) + :style {:color (time-color theme) :text-transform :none}} timestamp]]) @@ -61,10 +61,11 @@ item])])) (defn system-message-base - [{:keys [icon timestamp]} child] + [{:keys [icon timestamp theme]} child] [rn/view {:flex-direction :row - :flex 1} + :flex 1 + :align-items :center} [sm-icon icon] [rn/view {:align-self :center @@ -72,7 +73,7 @@ :margin-right 40 ;; dirty hack, flexbox won't work as expected :flex 1} child - [sm-timestamp timestamp]]]) + [sm-timestamp timestamp theme]]]) (defn system-message-deleted-internal [{:keys [label child theme timestamp]}] @@ -80,7 +81,8 @@ {:icon {:icon :i/delete :color :danger :opacity 5} - :timestamp timestamp} + :timestamp timestamp + :theme theme} (if child child [text/text @@ -156,7 +158,8 @@ [rn/view [rn/view {:flex-direction :row - :flex-wrap :wrap} + :flex-wrap :wrap + :height 18.2} [author/author {:primary-name pinned-by}] [split-text (i18n/label :pinned-a-message) theme true]] (when child child)]]) diff --git a/src/status_im2/contexts/chat/composer/reply/style.cljs b/src/status_im2/contexts/chat/composer/reply/style.cljs index a6d2523c61c4..0f2b323ec057 100644 --- a/src/status_im2/contexts/chat/composer/reply/style.cljs +++ b/src/status_im2/contexts/chat/composer/reply/style.cljs @@ -1,13 +1,13 @@ -(ns status-im2.contexts.chat.composer.reply.style - (:require [react-native.platform :as platform])) +(ns status-im2.contexts.chat.composer.reply.style) (defn container [pin? in-chat-input?] {:flex-direction :row :height (when-not pin? 24) - :margin-left (if (and (not in-chat-input?) (not pin?)) 26 (if platform/android? 4 0)) + :margin-left (when (and (not in-chat-input?) (not pin?)) 26) :margin-bottom (when (and (not in-chat-input?) (not pin?)) 8)}) + (defn reply-content [pin?] {:padding-right (when-not pin? 10) diff --git a/src/status_im2/contexts/chat/composer/reply/view.cljs b/src/status_im2/contexts/chat/composer/reply/view.cljs index 8a84427e77f4..88f8c79ab2a3 100644 --- a/src/status_im2/contexts/chat/composer/reply/view.cljs +++ b/src/status_im2/contexts/chat/composer/reply/view.cljs @@ -61,7 +61,7 @@ (i18n/label :t/message-deleted)]]) (defn reply-from - [{:keys [from contact-name current-public-key]}] + [{:keys [from contact-name current-public-key pin?]}] (let [display-name (first (rf/sub [:contacts/contact-two-names-by-identity from])) photo-path (rf/sub [:chats/photo-path from])] [rn/view {:style style/reply-from} @@ -73,7 +73,7 @@ :ring? false}] [quo/text {:weight :semi-bold - :size :paragraph-2 + :size (if pin? :label :paragraph-2) :number-of-lines 1 :style style/message-author-text} (format-reply-author from contact-name current-public-key)]])) @@ -100,7 +100,8 @@ [reply-deleted-message]] [rn/view {:style (style/quoted-message pin?)} [reply-from - {:from from + {:pin? pin? + :from from :contact-name contact-name :current-public-key current-public-key}] (when (not-empty text) diff --git a/status-go-version.json b/status-go-version.json index e1f05480dd4d..2c16cd77c436 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -3,7 +3,7 @@ "_comment": "Instead use: scripts/update-status-go.sh ", "owner": "status-im", "repo": "status-go", - "version": "v0.166.1", - "commit-sha1": "d64633e37b99cc7685a79c9475007881eda1e43b", - "src-sha256": "0pddzb2n1c50zw67j01npswjyrks87dvk6pyhvxd6hkawqgs8ajr" + "version": "v0.166.2", + "commit-sha1": "bd2c38db5d11e68d75440c175eec22892582e27f", + "src-sha256": "16kg4hwqn0cfzgsfbsx25zsmnb287lszcxrb704kh5cccflz65ra" }