Review notes fixed

status-im · Sep 27, 2019 · fcb4c15 · fcb4c15
1 parent 69e2e27
commit fcb4c15
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/components/src/status_im/ui/components/react.cljs b/components/src/status_im/ui/components/react.cljs
@@ -26,9 +26,7 @@
 (def native-modules (.-NativeModules js-dependencies/react-native))
 (def device-event-emitter (.-DeviceEventEmitter js-dependencies/react-native))
 
-(def dismiss-keyboard! (if platform/desktop?
-                         #()
-                         js-dependencies/dismiss-keyboard))
+(def dismiss-keyboard! js-dependencies/dismiss-keyboard)
 
 (def splash-screen (.-SplashScreen native-modules))
 

diff --git a/react-native/src/desktop/status_im/react_native/js_dependencies.cljs b/react-native/src/desktop/status_im/react_native/js_dependencies.cljs
@@ -21,7 +21,7 @@
 (def camera                 #js {:RNCamera #js {:constants #js {:Aspect "Portrait"}}})
 (def status-keycard         #js {:default #js {}})
 (def dialogs                #js {})
-(def dismiss-keyboard       #js {})
+(def dismiss-keyboard       #())
 (def image-crop-picker      #js {})
 (def image-resizer          #js {})
 (def svg                    #js {})

diff --git a/src/status_im/ui/components/icons/vector_icons.cljs b/src/status_im/ui/components/icons/vector_icons.cljs
@@ -23,8 +23,8 @@
 
 (defn icon-source [name]
   (if platform/desktop?
-    {:source {:uri (keyword (string/replace (clojure.core/name name) "-" "_"))}}
-    {:source {:uri (keyword (clojure.core/name name))}}))
+    {:uri (keyword (string/replace (clojure.core/name name) "-" "_"))}
+    {:uri (keyword (clojure.core/name name))}))
 
 (defn icon
   ([name] (icon name nil))
@@ -38,15 +38,15 @@
                            {:width  (or width 24)
                             :height (or height 24)})
      :accessibility-label accessibility-label}
-    [react/image (merge {:style  (cond-> {:width  (or width 24)
-                                          :height (or height 24)}
+    [react/image {:style  (cond-> {:width  (or width 24)
+                                   :height (or height 24)}
 
-                                   resize-mode
-                                   (assoc :resize-mode resize-mode)
+                            resize-mode
+                            (assoc :resize-mode resize-mode)
 
-                                   color
-                                   (assoc :tint-color (match-color color)))}
-                        (icon-source name))]]))
+                            color
+                            (assoc :tint-color (match-color color)))
+                  :source (icon-source name)}]]))
 
 (defn tiny-icon
   ([name] (tiny-icon name {}))

diff --git a/src/status_im/ui/screens/chat/views.cljs b/src/status_im/ui/screens/chat/views.cljs
@@ -450,6 +450,6 @@
   [chat-root true])
 
 (defview select-chat []
-  [react/view {:style {:align-items :center :justify-content :center :flex 1}}
-   [react/text {:style style/select-chat}
+  [react/view {:align-items :center :justify-content :center :flex 1}
+   [react/text style/select-chat
     (i18n/label :t/select-chat)]])