fixed rebase mess with default-chat-color

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
2018-10-09 13:51:02 +02:00 · 2018-10-09 13:51:02 +02:00 · 17053019e3
parent a0f707fee2
commit 17053019e3
2 changed files with 2 additions and 2 deletions
--- a/src/status_im/data_store/realm/schemas/account/chat.cljs
+++ b/src/status_im/data_store/realm/schemas/account/chat.cljs
@ -132,7 +132,7 @@
         :properties {:chat-id                :string
                      :name                   :string
                      :color                  {:type    :string
-                                               :default default-chat-color}
+                                               :default colors/default-chat-color}
                      :group-chat             {:type    :bool
                                               :indexed true}
                      :is-active              :bool
--- a/src/status_im/ui/components/colors.cljs
+++ b/src/status_im/ui/components/colors.cljs
@ -51,4 +51,4 @@
 (def text black)
 (def text-gray gray)

-(def default-chat-color :purpule) ;; legacy
+(def default-chat-color "#a187d5") ;; legacy