From 788cbc34f39f2295c9dc72361177e1666e4201c1 Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Thu, 3 Nov 2016 12:14:38 +0200 Subject: [PATCH] fixes #406 (waiting for a new wallet icon) Former-commit-id: c61c7ccbc5830e4d5ff741e679e8ccc470d57613 --- src/status_im/components/chat_icon/screen.cljs | 10 +++------- src/status_im/components/chat_icon/styles.cljs | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/status_im/components/chat_icon/screen.cljs b/src/status_im/components/chat_icon/screen.cljs index 297bae9f6c..90259e492d 100644 --- a/src/status_im/components/chat_icon/screen.cljs +++ b/src/status_im/components/chat_icon/screen.cljs @@ -17,12 +17,9 @@ (first name)]]) (defn chat-icon [photo-path {:keys [size border]}] - [view - (merge st/default-border-style - border - (st/border-style size)) - [image {:source {:uri photo-path} - :style (st/image-style size)}]]) + [image {:source {:uri photo-path} + :style (merge st/default-image-style + (st/image-style size))}]) (defn dapp-badge [styles] [view st/online-view-wrapper @@ -92,7 +89,6 @@ :online-dot-left st/online-dot-left :online-dot-right st/online-dot-right :size 64 - :border {} :chat-icon st/chat-icon-message-status :default-chat-icon (st/default-chat-icon-message-status color) :default-chat-icon-text st/message-status-icon-text}]) diff --git a/src/status_im/components/chat_icon/styles.cljs b/src/status_im/components/chat_icon/styles.cljs index b7377b2336..7154689d75 100644 --- a/src/status_im/components/chat_icon/styles.cljs +++ b/src/status_im/components/chat_icon/styles.cljs @@ -173,7 +173,7 @@ (def container-message-status {:margin-top 20}) -(def default-border-style +(def default-image-style {:margin 4}) (defn border-style [size]