status-im/status-react
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

icons fix

Browse Source
This commit is contained in:
Omar Basem
2022-11-10 16:28:27 +04:00
parent e0ab743008
commit f2ebaa8381
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/status_im/ui2/screens/chat/components/contact_item/view.cljs
+5 -1
View File
@@ -74,9 +74,10 @@
display-name]
(if (:ens-verified item)
[rn/view {:style {:margin-left 5 :margin-top 4}}
[icons/icon :main-icons2/verified {:size 12 :color (colors/theme-colors colors/success-50 colors/success-60)}]]
[icons/icon :main-icons2/verified {:no-color true :size 12 :color (colors/theme-colors colors/success-50 colors/success-60)}]]
(when (:added? item)
[rn/view {:style {:margin-left 5 :margin-top 4}}
<<<<<<< HEAD
[icons/icon :main-icons2/contact {:size 12 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))]
<<<<<<< HEAD
<<<<<<< HEAD
@@ -87,6 +88,9 @@
[text/text {:size :typography-1
:weight :semi-bold
=======
=======
[icons/icon :main-icons2/contact {:no-color true :size 12 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))]
>>>>>>> 1e719b3ab... icons fix
[text/text {:size :paragraph-1
>>>>>>> 6b7e419c9... fix typo
:style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40)}}
src/status_im/ui2/screens/chat/components/message_home_item/view.cljs
+18 -2
View File
@@ -34,6 +34,7 @@
(reduce
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8e74397a9... lint
(fn [{:keys [_ length] :as acc-paragraph} parsed-child]
@@ -45,6 +46,8 @@
children)
<<<<<<< HEAD
=======
=======
>>>>>>> 1e719b3ab... icons fix
(fn [{:keys [_ length] :as acc-paragraph} parsed-child]
(if (>= length max-subheader-length)
(reduced acc-paragraph)
@@ -52,9 +55,12 @@
{:components [rn/text]
:length 0}
children)
<<<<<<< HEAD
>>>>>>> 5fcc08fd3... refactor
=======
>>>>>>> 8e74397a9... lint
=======
>>>>>>> 1e719b3ab... icons fix
"mention"
{:components [rn/text (<sub [:contacts/contact-name-by-identity literal])]
@@ -77,6 +83,7 @@
(reduce
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 8e74397a9... lint
(fn [{:keys [_ length] :as acc-text} new-text-chunk]
@@ -115,6 +122,8 @@
(defn messages-home-item [item]
(let [{:keys [chat-id color group-chat last-message timestamp name unviewed-mentions-count unviewed-messages-count]} item
=======
=======
>>>>>>> 1e719b3ab... icons fix
(fn [{:keys [_ length] :as acc-text} new-text-chunk]
(if (>= length max-subheader-length)
(reduced acc-text)
@@ -127,8 +136,11 @@
:accessibility-label :chat-message-text}]
:length 0}
parsed-text)]
<<<<<<< HEAD
=======
>>>>>>> 8e74397a9... lint
=======
>>>>>>> 1e719b3ab... icons fix
(:components result)))
(defn display-name-view [display-name contact timestamp]
@@ -138,10 +150,14 @@
display-name]
(if (:ens-verified contact)
[rn/view {:style {:margin-left 5 :margin-top 4}}
[icons/icon :main-icons2/verified {:size 12 :color (colors/theme-colors colors/success-50 colors/success-60)}]]
[icons/icon :main-icons2/verified {:no-color true
:size 12
:color (colors/theme-colors colors/success-50 colors/success-60)}]]
(when (:added? contact)
[rn/view {:style {:margin-left 5 :margin-top 4}}
[icons/icon :main-icons2/contact {:size 12 :color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))
[icons/icon :main-icons2/contact {:no-color true
:size 12
:color (colors/theme-colors colors/primary-50 colors/primary-60)}]]))
[text/text {:style (style/timestamp)}
(time/to-short-str timestamp)]])