[ISSUE #2177] Moved component into ui

env/test/env/android/main.cljs

@@ -13,7 +13,7 @@
 (def root-el (r/as-element [reloader]))
 (defn callback []
   (swap! cnt inc)
-  (status-im.components.status/init-jail)
+  (status-im.ui.components.status/init-jail)
   (re-frame.core/dispatch [:load-commands!]))
 
 (figwheel/watch-and-reload

src/status_im/android/core.cljs

@@ -7,7 +7,7 @@
             status-im.ui.screens.subs
             status-im.data-store.core
             [status-im.ui.screens.views :as views]
-            [status-im.components.react :as react]
+            [status-im.ui.components.react :as react]
             [status-im.native-module.core :as status]
             [status-im.utils.error-handler :as error-handler]
             [status-im.utils.utils :as utils]

src/status_im/android/platform.cljs

@@ -1,5 +1,5 @@
 (ns status-im.android.platform
-  (:require [status-im.components.styles :as styles]
+  (:require [status-im.ui.components.styles :as styles]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 
 ;; DEPRECATION NOTICE

src/status_im/chat/events.cljs

@@ -14,7 +14,7 @@
             [status-im.ui.screens.navigation :as navigation]
             [status-im.protocol.core :as protocol]
             [status-im.constants :as const]
-            [status-im.components.list-selection :as list-selection]
+            [status-im.ui.components.list-selection :as list-selection]
             status-im.chat.events.input
             status-im.chat.events.commands
             status-im.chat.events.animation

src/status_im/chat/events/input.cljs

@@ -10,7 +10,7 @@
             [status-im.chat.events.commands :as commands-events]
             [status-im.chat.events.animation :as animation-events]
             [status-im.bots.events :as bots-events]
-            [status-im.components.react :as react-comp]
+            [status-im.ui.components.react :as react-comp]
             [status-im.utils.datetime :as time]
             [status-im.utils.handlers :as handlers]
             [status-im.utils.random :as random]

src/status_im/chat/handlers.cljs

@@ -3,7 +3,7 @@
   (:require [re-frame.core :refer [enrich after debug dispatch reg-fx]]
             [cljs.core.async :as a]
             [clojure.string :as string]
-            [status-im.components.styles :refer [default-chat-color]] 
+            [status-im.ui.components.styles :refer [default-chat-color]]
             [status-im.chat.constants :as chat-consts]
             [status-im.protocol.core :as protocol]
             [status-im.data-store.chats :as chats]

src/status_im/chat/handlers/webview_bridge.cljs

@@ -3,7 +3,7 @@
             [status-im.utils.handlers :as handlers]
             [status-im.utils.types :as types]
             [taoensso.timbre :as log]
-            [status-im.components.nfc :as nfc]))
+            [status-im.ui.components.nfc :as nfc]))
 
 (handlers/register-handler :set-webview-bridge
   (fn [db [_ bridge]]

src/status_im/chat/models.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.models
-  (:require [status-im.components.styles :as styles]))
+  (:require [status-im.ui.components.styles :as styles]))
 
 (defn set-chat-ui-props
   "Updates ui-props in active chat by merging provided kvs into them"

src/status_im/chat/models/input.cljs

@@ -1,7 +1,7 @@
 (ns status-im.chat.models.input
   (:require [clojure.string :as str]
             [status-im.bots.constants :as bots-constants]
-            [status-im.components.react :as rc]
+            [status-im.ui.components.react :as rc]
             [status-im.native-module.core :as status]
             [status-im.chat.constants :as const]
             [status-im.chat.models.commands :as commands-model]

src/status_im/chat/new_chat/styles.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.new-chat.styles
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def contacts-list-container
   {:flex          1

src/status_im/chat/new_chat/view.cljs

@@ -1,16 +1,16 @@
 (ns status-im.chat.new-chat.view
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
   (:require [re-frame.core :refer [dispatch]]
-            [status-im.components.common.common :as common]
+            [status-im.ui.components.common.common :as common]
-            [status-im.components.renderers.renderers :as renderers]
+            [status-im.ui.components.renderers.renderers :as renderers]
-            [status-im.components.action-button.action-button :refer [action-button
+            [status-im.ui.components.action-button.action-button :refer [action-button
-                                                                      action-separator]]
+                                                                         action-separator]]
-            [status-im.components.action-button.styles :refer [actions-list]]
+            [status-im.ui.components.action-button.styles :refer [actions-list]]
-            [status-im.components.react :refer [view text list-view list-item]]
+            [status-im.ui.components.react :refer [view text list-view list-item]]
-            [status-im.components.contact.contact :refer [contact-view]]
+            [status-im.ui.components.contact.contact :refer [contact-view]]
-            [status-im.components.status-bar :refer [status-bar]]
+            [status-im.ui.components.status-bar :refer [status-bar]]
-            [status-im.components.toolbar.view :refer [toolbar-with-search]]
+            [status-im.ui.components.toolbar.view :refer [toolbar-with-search]]
-            [status-im.components.drawer.view :refer [drawer-view]]
+            [status-im.ui.components.drawer.view :refer [drawer-view]]
             [status-im.chat.new-chat.styles :as styles]
             [status-im.utils.listview :as lw]
             [status-im.i18n :refer [label]]))

src/status_im/chat/new_public_chat/styles.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.new-public-chat.styles
   (:require-macros [status-im.utils.styles :refer [defstyle]])
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def group-chat-name-input
   {:font-size      17

src/status_im/chat/new_public_chat/view.cljs

@@ -2,11 +2,11 @@
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
   (:require [re-frame.core :refer [dispatch]]
             status-im.utils.db
-            [status-im.components.react :as react :refer [text]]
+            [status-im.ui.components.react :as react :refer [text]]
-            [status-im.components.text-field.view :refer [text-field]]
+            [status-im.ui.components.text-field.view :refer [text-field]]
-            [status-im.components.styles :as components.styles]
+            [status-im.ui.components.styles :as components.styles]
-            [status-im.components.status-bar :refer [status-bar]]
+            [status-im.ui.components.status-bar :refer [status-bar]]
-            [status-im.components.toolbar.view :as toolbar]
+            [status-im.ui.components.toolbar.view :as toolbar]
             [status-im.chat.new-public-chat.styles :as styles]
             [status-im.chat.new-public-chat.db :as v]
             [status-im.i18n :refer [label]]

src/status_im/chat/screen.cljs

@@ -1,24 +1,24 @@
 (ns status-im.chat.screen
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
-                                                animated-view
+                                                   animated-view
-                                                text
+                                                   text
-                                                modal
+                                                   modal
-                                                touchable-highlight
+                                                   touchable-highlight
-                                                list-view
+                                                   list-view
-                                                list-item]]
+                                                   list-item]]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
-            [status-im.components.status-bar :refer [status-bar]]
+            [status-im.ui.components.status-bar :refer [status-bar]]
-            [status-im.components.chat-icon.screen :refer [chat-icon-view-action
+            [status-im.ui.components.chat-icon.screen :refer [chat-icon-view-action
-                                                           chat-icon-view-menu-item]]
+                                                              chat-icon-view-menu-item]]
             [status-im.chat.styles.screen :as st]
             [status-im.utils.listview :refer [to-datasource-inverted]]
             [status-im.utils.utils :refer [truncate-str]]
             [status-im.utils.datetime :as time]
             [status-im.utils.platform :as platform :refer [platform-specific]]
-            [status-im.components.invertible-scroll-view :refer [invertible-scroll-view]]
+            [status-im.ui.components.invertible-scroll-view :refer [invertible-scroll-view]]
-            [status-im.components.toolbar.view :as toolbar]
+            [status-im.ui.components.toolbar.view :as toolbar]
             [status-im.chat.views.toolbar-content :refer [toolbar-content-view]]
             [status-im.chat.views.message.message :refer [chat-message]]
             [status-im.chat.views.message.datemark :refer [chat-datemark]]
@@ -27,8 +27,8 @@
             [status-im.chat.views.bottom-info :refer [bottom-info-view]]
             [status-im.chat.constants :as chat-const]
             [status-im.i18n :refer [label label-pluralize]]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
-            [status-im.components.sync-state.offline :refer [offline-view]]
+            [status-im.ui.components.sync-state.offline :refer [offline-view]]
             [status-im.constants :refer [content-type-status]]
             [taoensso.timbre :as log]
             [clojure.string :as str]))

src/status_im/chat/sign_up.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.sign-up
   (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
-            [status-im.components.styles :refer [default-chat-color]]
+            [status-im.ui.components.styles :refer [default-chat-color]]
             [status-im.utils.random :as random]
             [status-im.constants :as const]
             [status-im.chat.constants :as chat-const]

src/status_im/chat/styles/animations.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.styles.animations
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def color-root-border "rgba(192, 198, 202, 0.28)")
 (def header-draggable-icon "rgba(73, 84, 93, 0.23)")

src/status_im/chat/styles/input/box_header.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.styles.input.box-header
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def header-height 33)
 

src/status_im/chat/styles/input/emoji.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.styles.input.emoji
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def container-height 250)
 

src/status_im/chat/styles/input/input.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.input.input
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :as common]
+  (:require [status-im.ui.components.styles :as common]
             [status-im.utils.platform :as platform]
             [taoensso.timbre :as log]))
 

src/status_im/chat/styles/input/input_actions.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.input.input-actions
   (:require-macros [status-im.utils.styles :refer [defnstyle]])
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def actions-container
   {:flex-direction :row

src/status_im/chat/styles/input/result_box.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.styles.input.result-box
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def color-root-border "rgba(192, 198, 202, 0.5)")
 

src/status_im/chat/styles/input/suggestions.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.input.suggestions
   (:require-macros [status-im.utils.styles :refer [defnstyle]])
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def color-item-title-text "rgb(147, 155, 161)")
 (def color-item-suggestion-name "rgb(98, 143, 227)")

src/status_im/chat/styles/input/validation_message.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.input.validation-message
   (:require [status-im.chat.constants :as constants]
-            [status-im.components.styles :as common]))
+            [status-im.ui.components.styles :as common]))
 
 (defn root [bottom]
   {:flex-direction :column

src/status_im/chat/styles/message/command_pill.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.message.command-pill
   (:require  [status-im.utils.platform :as p]
-             [status-im.components.styles :refer [color-white]]))
+             [status-im.ui.components.styles :refer [color-white]]))
 
 (defn pill [command]
   {:backgroundColor   (:color command)

src/status_im/chat/styles/message/datemark.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.styles.message.datemark
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def datemark-wrapper
   {:flex        1

src/status_im/chat/styles/message/message.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.message.message
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :refer [color-white
+  (:require [status-im.ui.components.styles :refer [color-white
                                                  color-black
                                                  color-blue
                                                  color-light-blue

src/status_im/chat/styles/screen.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.styles.screen
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :as component.styles]))
+  (:require [status-im.ui.components.styles :as component.styles]))
 
 (def chat-view
   {:flex             1

src/status_im/chat/views/actions.cljs

@@ -2,8 +2,8 @@
   (:require [clojure.string :as string]
             [re-frame.core :as re-frame]
             [status-im.chat.styles.screen :as styles]
-            [status-im.components.chat-icon.screen :as chat-icon.screen]
+            [status-im.ui.components.chat-icon.screen :as chat-icon.screen]
-            [status-im.components.react :as react]
+            [status-im.ui.components.react :as react]
             [status-im.i18n :as i18n]
             [status-im.utils.platform :as platform])
   (:require-macros [status-im.utils.views :refer [defview letsubs]]))

src/status_im/chat/views/api/choose_contact.cljs

@@ -2,12 +2,12 @@
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [reagent.core :as r]
             [re-frame.core :refer [dispatch subscribe]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 list-view
                                                 list-item]]
-            [status-im.components.contact.contact :refer [contact-view]]
+            [status-im.ui.components.contact.contact :refer [contact-view]]
-            [status-im.components.renderers.renderers :as renderers]
+            [status-im.ui.components.renderers.renderers :as renderers]
             [status-im.utils.listview :as lw]))
 
 (defn render-row [arg-index bot-db-key]

src/status_im/chat/views/api/geolocation/styles.cljs

@@ -1,5 +1,5 @@
 (ns status-im.chat.views.api.geolocation.styles
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (defn place-item-container [address]
   {:height          (if address 74 52)

src/status_im/chat/views/api/geolocation/views.cljs

@@ -1,16 +1,16 @@
 (ns status-im.chat.views.api.geolocation.views
   (:require-macros [status-im.utils.views :refer [defview letsubs]]
                    [reagent.ratom :refer [reaction]])
-  (:require [status-im.components.react :refer [view image text touchable-highlight]]
+  (:require [status-im.ui.components.react :refer [view image text touchable-highlight]]
             [reagent.core :as r]
             [goog.string :as gstr]
             [status-im.utils.utils :refer [http-get]]
             [status-im.utils.types :refer [json->clj]]
             [status-im.chat.views.api.geolocation.styles :as st]
-            [status-im.components.mapbox :refer [mapview]]
+            [status-im.ui.components.mapbox :refer [mapview]]
             [re-frame.core :refer [dispatch subscribe]]
             [status-im.i18n :refer [label]]
-            [status-im.components.react :as components]))
+            [status-im.ui.components.react :as components]))
 
 (def mapbox-api "https://api.mapbox.com/geocoding/v5/mapbox.places/")
 (def access-token "pk.eyJ1Ijoic3RhdHVzaW0iLCJhIjoiY2oydmtnZjRrMDA3czMzcW9kemR4N2lxayJ9.Rz8L6xdHBjfO8cR3CDf3Cw")

src/status_im/chat/views/bottom_info.cljs

@@ -2,7 +2,7 @@
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
             [reagent.core :as r]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 animated-view
                                                 image
                                                 text
@@ -10,10 +10,10 @@
                                                 touchable-highlight
                                                 list-view
                                                 list-item]]
-            [status-im.components.chat-icon.screen :refer [chat-icon-view-menu-item]]
+            [status-im.ui.components.chat-icon.screen :refer [chat-icon-view-menu-item]]
             [status-im.chat.styles.screen :as st]
             [status-im.i18n :refer [label label-pluralize message-status-label]]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
             [status-im.utils.utils :refer [truncate-str]]
             [status-im.utils.identicon :refer [identicon]]
             [status-im.utils.listview :as lw]

src/status_im/chat/views/input/animations/expandable.cljs

@@ -3,9 +3,9 @@
   (:require [reagent.core :as r]
             [reagent.impl.component :as rc]
             [re-frame.core :refer [dispatch subscribe]]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
-            [status-im.components.drag-drop :as drag]
+            [status-im.ui.components.drag-drop :as drag]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 animated-view]]
             [status-im.chat.views.input.animations.responder :as resp]
             [status-im.chat.views.input.utils :as input-utils]

src/status_im/chat/views/input/animations/responder.cljs

@@ -1,11 +1,11 @@
 (ns status-im.chat.views.input.animations.responder
-  (:require [status-im.components.drag-drop :as drag]
+  (:require [status-im.ui.components.drag-drop :as drag]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
             [status-im.chat.views.input.utils :as input-utils]
             [re-frame.core :refer [dispatch]]
             [taoensso.timbre :as log]
             [status-im.utils.platform :as p]
-            [status-im.components.toolbar.styles :as toolbar-st]))
+            [status-im.ui.components.toolbar.styles :as toolbar-st]))
 
 ;; todo bad name. Ideas?
 (defn enough-dy [gesture]

src/status_im/chat/views/input/box_header.cljs

@@ -1,7 +1,7 @@
 (ns status-im.chat.views.input.box-header
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 touchable-highlight
                                                 text
                                                 icon]]

src/status_im/chat/views/input/emoji.cljs

@@ -1,7 +1,7 @@
 (ns status-im.chat.views.input.emoji
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 icon
                                                 emoji-picker]]

src/status_im/chat/views/input/input.cljs

@@ -14,8 +14,8 @@
             [status-im.chat.views.input.result-box :as result-box]
             [status-im.chat.views.input.suggestions :as suggestions]
             [status-im.chat.views.input.validation-messages :as validation-messages]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 animated-view
                                                 text
                                                 icon
@@ -23,7 +23,7 @@
                                                 text-input
                                                 touchable-highlight
                                                 dismiss-keyboard!]]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
             [status-im.i18n :as i18n]
             [status-im.utils.platform :as platform]))
 

src/status_im/chat/views/input/input_actions.cljs

@@ -4,7 +4,7 @@
             [reagent.core :as r]
             [re-frame.core :refer [subscribe dispatch]]
             [taoensso.timbre :as log]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 icon
                                                 touchable-highlight]]

src/status_im/chat/views/input/result_box.cljs

@@ -1,14 +1,14 @@
 (ns status-im.chat.views.input.result-box
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 scroll-view
                                                 touchable-highlight
                                                 text
                                                 icon]]
             [status-im.chat.views.input.animations.expandable :refer [expandable-view]]
             [status-im.chat.views.input.box-header :as box-header]
-            [status-im.components.sync-state.offline :refer [offline-view]]))
+            [status-im.ui.components.sync-state.offline :refer [offline-view]]))
 
 (defview result-box-container [markup]
   [view {:flex 1}

src/status_im/chat/views/input/suggestions.cljs

@@ -1,7 +1,7 @@
 (ns status-im.chat.views.input.suggestions
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 scroll-view
                                                 touchable-highlight
                                                 text

src/status_im/chat/views/input/utils.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.views.input.utils
   (:require [taoensso.timbre :as log]
-            [status-im.components.toolbar.styles :as toolbar-st]
+            [status-im.ui.components.toolbar.styles :as toolbar-st]
             [status-im.utils.platform :as p]))
 
 (def min-height     19)

src/status_im/chat/views/input/validation_messages.cljs

@@ -1,7 +1,7 @@
 (ns status-im.chat.views.input.validation-messages
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
   (:require [re-frame.core :as re-frame]
-            [status-im.components.react :as c]
+            [status-im.ui.components.react :as c]
             [status-im.chat.styles.input.validation-message :as style]
             [status-im.utils.listview :as lw]
             [status-im.i18n :as i18n]))

src/status_im/chat/views/input/web_view.cljs

@@ -2,8 +2,8 @@
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [reagent.core :as r]
             [re-frame.core :refer [dispatch]]
-            [status-im.components.webview-bridge :refer [webview-bridge]]
+            [status-im.ui.components.webview-bridge :refer [webview-bridge]]
-            [status-im.components.react :refer [view text] :as components]
+            [status-im.ui.components.react :refer [view text] :as components]
             [status-im.native-module.core :as status]
             [status-im.i18n :refer [label]]
             [status-im.utils.js-resources :as js-res]

src/status_im/chat/views/message/datemark.cljs

@@ -1,6 +1,6 @@
 (ns status-im.chat.views.message.datemark
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text]]
             [clojure.string :as str]
             [status-im.i18n :refer [label]]

src/status_im/chat/views/message/message.cljs

@@ -4,7 +4,7 @@
             [clojure.walk :as walk]
             [reagent.core :as r]
             [status-im.i18n :refer [message-status-label]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 image
                                                 icon
@@ -14,8 +14,8 @@
                                                 autolink
                                                 get-dimensions
                                                 dismiss-keyboard!]]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
-            [status-im.components.list-selection :refer [share share-or-open-map]]
+            [status-im.ui.components.list-selection :refer [share share-or-open-map]]
             [status-im.chat.constants :as chat-consts]
             [status-im.chat.models.commands :as commands]
             [status-im.chat.styles.message.message :as st]
@@ -29,7 +29,7 @@
                                          content-type-status
                                          content-type-command
                                          content-type-command-request] :as c]
-            [status-im.components.chat-icon.screen :refer [chat-icon-message-status]]
+            [status-im.ui.components.chat-icon.screen :refer [chat-icon-message-status]]
             [status-im.utils.identicon :refer [identicon]]
             [status-im.utils.gfycat.core :refer [generate-gfy]]
             [status-im.utils.platform :as platform]

src/status_im/chat/views/message/request_message.cljs

@@ -2,7 +2,7 @@
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
   (:require [re-frame.core :refer [subscribe dispatch]]
             [reagent.core :as r]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 animated-view
                                                 text
                                                 image
@@ -10,7 +10,7 @@
                                                 touchable-highlight]]
             [status-im.chat.styles.message.message :as st]
             [status-im.chat.models.commands :as commands]
-            [status-im.components.animation :as anim]
+            [status-im.ui.components.animation :as anim]
             [taoensso.timbre :as log]))
 
 (def request-message-icon-scale-delay 600)

src/status_im/chat/views/toolbar_content.cljs

@@ -3,7 +3,7 @@
   (:require [re-frame.core :refer [subscribe dispatch]]
             [clojure.string :as str]
             [cljs-time.core :as t]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 icon]]
             [status-im.i18n :refer [get-contact-translated

src/status_im/commands/handlers/debug.cljs

@@ -1,6 +1,6 @@
 (ns status-im.commands.handlers.debug
   (:require [re-frame.core :as re-frame]
-            [status-im.components.react :as react]
+            [status-im.ui.components.react :as react]
             [status-im.data-store.accounts :as accounts]
             [status-im.data-store.messages :as messages]
             [status-im.utils.handlers :as handlers]

src/status_im/commands/handlers/jail.cljs

@@ -5,7 +5,7 @@
             [status-im.utils.types :refer [json->clj]]
             [status-im.commands.utils :refer [reg-handler]]
             [clojure.string :as s]
-            [status-im.components.react :as r]
+            [status-im.ui.components.react :as r]
             [status-im.constants :refer [console-chat-id]]
             [status-im.i18n :refer [get-contact-translated]]
             [taoensso.timbre :as log]

src/status_im/commands/utils.cljs

@@ -2,11 +2,11 @@
   (:require [clojure.set :as set]
             [clojure.walk :as w]
             [re-frame.core :refer [dispatch trim-v]]
-            [status-im.components.react :as components]
+            [status-im.ui.components.react :as components]
             [status-im.chat.views.input.web-view :as chat-web-view]
             [status-im.chat.views.input.validation-messages :as chat-validation-messages]
             [status-im.chat.views.api.choose-contact :as choose-contact]
-            [status-im.components.qr-code :as qr]
+            [status-im.ui.components.qr-code :as qr]
             [status-im.chat.views.api.geolocation.views :as geolocation]
             [status-im.utils.handlers :refer [register-handler]]
             [taoensso.timbre :as log]))

src/status_im/data_store/realm/schemas/account/v1/chat.cljs

@@ -1,6 +1,6 @@
 (ns status-im.data-store.realm.schemas.account.v1.chat
   (:require [taoensso.timbre :as log]
-            [status-im.components.styles :refer [default-chat-color]]))
+            [status-im.ui.components.styles :refer [default-chat-color]]))
 
 (def schema {:name       :chat
              :primaryKey :chat-id

src/status_im/data_store/realm/schemas/account/v11/chat.cljs

@@ -1,6 +1,6 @@
 (ns status-im.data-store.realm.schemas.account.v11.chat
   (:require [taoensso.timbre :as log]
-            [status-im.components.styles :refer [default-chat-color]]))
+            [status-im.ui.components.styles :refer [default-chat-color]]))
 
 (def schema {:name       :chat
              :primaryKey :chat-id

src/status_im/data_store/realm/schemas/account/v2/chat.cljs

@@ -1,6 +1,6 @@
 (ns status-im.data-store.realm.schemas.account.v2.chat
   (:require [taoensso.timbre :as log]
-            [status-im.components.styles :refer [default-chat-color]]))
+            [status-im.ui.components.styles :refer [default-chat-color]]))
 
 (def schema {:name       :chat
              :primaryKey :chat-id

src/status_im/data_store/realm/schemas/account/v3/chat.cljs

@@ -1,6 +1,6 @@
 (ns status-im.data-store.realm.schemas.account.v3.chat
   (:require [taoensso.timbre :as log]
-            [status-im.components.styles :refer [default-chat-color]]))
+            [status-im.ui.components.styles :refer [default-chat-color]]))
 
 (def schema {:name       :chat
              :primaryKey :chat-id

src/status_im/data_store/realm/schemas/account/v4/chat.cljs

@@ -1,6 +1,6 @@
 (ns status-im.data-store.realm.schemas.account.v4.chat
   (:require [taoensso.timbre :as log]
-            [status-im.components.styles :refer [default-chat-color]]))
+            [status-im.ui.components.styles :refer [default-chat-color]]))
 
 (def schema {:name       :chat
              :primaryKey :chat-id

src/status_im/ios/core.cljs

@@ -7,7 +7,7 @@
             status-im.ui.screens.subs
             status-im.data-store.core
             [status-im.ui.screens.views :as views]
-            [status-im.components.react :as react]
+            [status-im.ui.components.react :as react]
             [status-im.native-module.core :as status]
             [status-im.utils.error-handler :as error-handler]
             [status-im.utils.utils :as utils]

src/status_im/ios/platform.cljs

@@ -1,5 +1,5 @@
 (ns status-im.ios.platform
-  (:require [status-im.components.styles :as styles]
+  (:require [status-im.ui.components.styles :as styles]
             [status-im.i18n :refer [label]]
             [status-im.utils.utils :as utils]
             [status-im.react-native.js-dependencies :as rn-dependencies]))

src/status_im/native_module/impl/module.cljs

@@ -1,7 +1,7 @@
 (ns status-im.native-module.impl.module
   (:require-macros
    [cljs.core.async.macros :as async :refer [go-loop go]])
-  (:require [status-im.components.react :as r]
+  (:require [status-im.ui.components.react :as r]
             [re-frame.core :refer [dispatch]]
             [taoensso.timbre :as log]
             [cljs.core.async :as async :refer [<! timeout]]

src/status_im/network/net_info.cljs

@@ -1,6 +1,6 @@
 (ns status-im.network.net-info
   (:require [taoensso.timbre :as log]
-            [status-im.components.react :as react-components]))
+            [status-im.ui.components.react :as react-components]))
 
 (defn init [callback]
   (when react-components/net-info

src/status_im/ui/components/action_button/action_button.cljs

@@ -1,8 +1,8 @@
-(ns status-im.components.action-button.action-button
+(ns status-im.ui.components.action-button.action-button
-  (:require [status-im.components.action-button.styles :as st]
+  (:require [status-im.ui.components.action-button.styles :as st]
-            [status-im.components.common.common :refer [list-separator]]
+            [status-im.ui.components.common.common :refer [list-separator]]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
-            [status-im.components.react :as rn]))
+            [status-im.ui.components.react :as rn]))
 
 (defn action-button [{:keys [label icon icon-opts on-press label-style cyrcle-color]}]
   [rn/touchable-highlight {:on-press on-press}

src/status_im/ui/components/action_button/styles.cljs

@@ -1,7 +1,7 @@
-(ns status-im.components.action-button.styles
+(ns status-im.ui.components.action-button.styles
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
   (:require [status-im.utils.platform :as p]
-            [status-im.components.styles :refer [color-white
+            [status-im.ui.components.styles :refer [color-white
                                                  color-light-blue-transparent
                                                  color-light-blue
                                                  color-light-gray

src/status_im/ui/components/animation.cljs

@@ -1,5 +1,5 @@
-(ns status-im.components.animation
+(ns status-im.ui.components.animation
-  (:require [status-im.components.react :refer [animated]]))
+  (:require [status-im.ui.components.react :refer [animated]]))
 
 (defn start
   ([anim] (.start anim))

src/status_im/ui/components/button/styles.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.button.styles
+(ns status-im.ui.components.button.styles
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :as styles]
+  (:require [status-im.ui.components.styles :as styles]
             [status-im.utils.platform :as platform]))
 
 (def border-color styles/color-white-transparent-3)

src/status_im/ui/components/button/view.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.button.view
+(ns status-im.ui.components.button.view
-  (:require [status-im.components.button.styles :as button.styles]
+  (:require [status-im.ui.components.button.styles :as button.styles]
-            [status-im.components.react :as react]
+            [status-im.ui.components.react :as react]
             [status-im.utils.platform :as platform]))
 
 (defn button-text [{:keys [disabled? text-style]} label]

src/status_im/ui/components/camera.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.camera
+(ns status-im.ui.components.camera
   (:require [reagent.core :as r]
             [clojure.walk :refer [keywordize-keys]]
             [status-im.utils.platform :as platform]

src/status_im/ui/components/carousel/carousel.cljs

@@ -1,12 +1,12 @@
-(ns status-im.components.carousel.carousel
+(ns status-im.ui.components.carousel.carousel
   (:require [reagent.impl.component :as rc]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 scroll-view
                                                 touchable-without-feedback
                                                 text]]
-            [status-im.components.carousel.styles :as st]
+            [status-im.ui.components.carousel.styles :as st]
             [taoensso.timbre :as log]
-            [status-im.components.react :as r]
+            [status-im.ui.components.react :as r]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 
 

src/status_im/ui/components/carousel/styles.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.carousel.styles)
+(ns status-im.ui.components.carousel.styles)
 
 (def scroll-view-container
   {:flex 1})

src/status_im/ui/components/chat_icon/screen.cljs

@@ -1,11 +1,11 @@
-(ns status-im.components.chat-icon.screen
+(ns status-im.ui.components.chat-icon.screen
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 image]]
-            [status-im.components.chat-icon.styles :as st]
+            [status-im.ui.components.chat-icon.styles :as st]
-            [status-im.components.styles :refer [default-chat-color]]
+            [status-im.ui.components.styles :refer [default-chat-color]]
             [status-im.react-native.resources :as resources]
             [status-im.constants :refer [console-chat-id]]
             [clojure.string :as s]))

src/status_im/ui/components/chat_icon/styles.cljs

@@ -1,5 +1,5 @@
-(ns status-im.components.chat-icon.styles
+(ns status-im.ui.components.chat-icon.styles
-  (:require [status-im.components.styles :refer [color-white
+  (:require [status-im.ui.components.styles :refer [color-white
                                                  online-color]]
             [status-im.utils.platform :as p]))
 

src/status_im/ui/components/checkbox/styles.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.checkbox.styles
+(ns status-im.ui.components.checkbox.styles
   (:require-macros [status-im.utils.styles :refer [defnstyle]])
-  (:require [status-im.components.styles :as st]))
+  (:require [status-im.ui.components.styles :as st]))
 
 (defnstyle icon-check-container [checked?]
   {:background-color (if checked? st/color-light-blue st/color-gray5)

src/status_im/ui/components/checkbox/view.cljs

@@ -1,7 +1,7 @@
-(ns status-im.components.checkbox.view
+(ns status-im.ui.components.checkbox.view
   (:require [cljs.spec.alpha :as s]
-            [status-im.components.checkbox.styles :as cst]
+            [status-im.ui.components.checkbox.styles :as cst]
-            [status-im.components.react :as rn]
+            [status-im.ui.components.react :as rn]
             [status-im.utils.platform :as p]))
 
 (defn checkbox [{:keys [on-press checked?]}]

src/status_im/ui/components/common/common.cljs

@@ -1,10 +1,10 @@
-(ns status-im.components.common.common
+(ns status-im.ui.components.common.common
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
-  (:require [status-im.components.react :as react]
+  (:require [status-im.ui.components.react :as react]
-            [status-im.components.icons.vector-icons :as vector-icons]
+            [status-im.ui.components.icons.vector-icons :as vector-icons]
-            [status-im.components.context-menu :refer [context-menu]]
+            [status-im.ui.components.context-menu :refer [context-menu]]
             [status-im.utils.platform :as platform]
-            [status-im.components.common.styles :as styles]
+            [status-im.ui.components.common.styles :as styles]
             [status-im.i18n :as i18n]))
 
 (defn top-shadow []

src/status_im/ui/components/common/styles.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.common.styles
+(ns status-im.ui.components.common.styles
   (:require-macros [status-im.utils.styles :refer [defstyle]])
-  (:require [status-im.components.styles :as styles]))
+  (:require [status-im.ui.components.styles :as styles]))
 
 (def gradient-top
   {:flexDirection   :row

src/status_im/ui/components/contact/contact.cljs

@@ -1,10 +1,10 @@
-(ns status-im.components.contact.contact
+(ns status-im.ui.components.contact.contact
   (:require-macros [status-im.utils.views :refer [defview]])
-  (:require [status-im.components.react :refer [view touchable-highlight text]]
+  (:require [status-im.ui.components.react :refer [view touchable-highlight text]]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
-            [status-im.components.chat-icon.screen :refer [contact-icon-contacts-tab]]
+            [status-im.ui.components.chat-icon.screen :refer [contact-icon-contacts-tab]]
-            [status-im.components.context-menu :refer [context-menu]]
+            [status-im.ui.components.context-menu :refer [context-menu]]
-            [status-im.components.contact.styles :as st]
+            [status-im.ui.components.contact.styles :as st]
             [status-im.utils.gfycat.core :refer [generate-gfy]]
             [status-im.i18n :refer [get-contact-translated label]]))
 

src/status_im/ui/components/contact/styles.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.contact.styles
+(ns status-im.ui.components.contact.styles
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :as common]
+  (:require [status-im.ui.components.styles :as common]
             [status-im.utils.platform]))
 
 (defstyle contact-inner-container

src/status_im/ui/components/context_menu.cljs

@@ -1,8 +1,8 @@
-(ns status-im.components.context-menu
+(ns status-im.ui.components.context-menu
   (:require [reagent.core :as r]
-            [status-im.components.styles :as st]
+            [status-im.ui.components.styles :as st]
             [status-im.utils.platform :refer [platform-specific ios?]]
-            [status-im.components.react :as rn]
+            [status-im.ui.components.react :as rn]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 
 (defn- get-property [name]

src/status_im/ui/components/drag_drop.cljs

@@ -1,5 +1,5 @@
-(ns status-im.components.drag-drop
+(ns status-im.ui.components.drag-drop
-  (:require [status-im.components.react :refer [animated pan-responder]]))
+  (:require [status-im.ui.components.react :refer [animated pan-responder]]))
 
 (defn pan-handlers [pan-responder]
   (js->clj (.-panHandlers pan-responder)))

src/status_im/ui/components/drawer/styles.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.drawer.styles
+(ns status-im.ui.components.drawer.styles
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :as common]))
+  (:require [status-im.ui.components.styles :as common]))
 
 (def drawer
   {:flex             1

src/status_im/ui/components/drawer/view.cljs

@@ -1,14 +1,14 @@
-(ns status-im.components.drawer.view
+(ns status-im.ui.components.drawer.view
   (:require-macros [status-im.utils.views :refer [defview letsubs]])
   (:require [cljs.spec.alpha :as s]
             [clojure.string :as str]
             [reagent.core :as r]
             [re-frame.core :as rf]
-            [status-im.components.chat-icon.screen :as ci]
+            [status-im.ui.components.chat-icon.screen :as ci]
-            [status-im.components.common.common :as common]
+            [status-im.ui.components.common.common :as common]
-            [status-im.components.context-menu :as context-menu]
+            [status-im.ui.components.context-menu :as context-menu]
-            [status-im.components.drawer.styles :as st]
+            [status-im.ui.components.drawer.styles :as st]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 text-input
                                                 list-item
@@ -18,8 +18,8 @@
                                                 touchable-highlight
                                                 touchable-opacity
                                                 dismiss-keyboard!]]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
-            [status-im.components.status-view.view :as status-view]
+            [status-im.ui.components.status-view.view :as status-view]
             [status-im.i18n :as i18n]
             [status-im.ui.screens.profile.db :as profile.db]
             [status-im.utils.datetime :as time]

src/status_im/ui/components/icons/custom_icons.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.icons.custom-icons
+(ns status-im.ui.components.icons.custom-icons
   (:require [reagent.core :as r]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 

src/status_im/ui/components/icons/vector_icons.cljs

@@ -1,9 +1,9 @@
-(ns status-im.components.icons.vector-icons
+(ns status-im.ui.components.icons.vector-icons
   (:require-macros [status-im.utils.slurp :refer [slurp-svg]])
   (:require [reagent.core :as reagent]
             [status-im.utils.platform :as platform]
-            [status-im.components.styles :as styles]
+            [status-im.ui.components.styles :as styles]
-            [status-im.components.react :as react]
+            [status-im.ui.components.react :as react]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 
 (defn get-property [name]

src/status_im/ui/components/image_button/styles.cljs

@@ -1,5 +1,5 @@
-(ns status-im.components.image-button.styles
+(ns status-im.ui.components.image-button.styles
-  (:require [status-im.components.styles :refer [color-blue]]))
+  (:require [status-im.ui.components.styles :refer [color-blue]]))
 
 (def image-button
   {:position   :absolute

src/status_im/ui/components/image_button/view.cljs

@@ -1,13 +1,13 @@
-(ns status-im.components.image-button.view
+(ns status-im.ui.components.image-button.view
   (:require [re-frame.core :refer [subscribe dispatch dispatch-sync]]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 image
                                                 touchable-highlight]]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
-            [status-im.components.styles :refer [icon-scan]]
+            [status-im.ui.components.styles :refer [icon-scan]]
             [status-im.i18n :refer [label]]
-            [status-im.components.image-button.styles :as st]))
+            [status-im.ui.components.image-button.styles :as st]))
 
 (defn image-button [{:keys [value style handler]}]
   [view st/image-button

src/status_im/ui/components/invertible_scroll_view.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.invertible-scroll-view
+(ns status-im.ui.components.invertible-scroll-view
   (:require [reagent.core :as r]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 

src/status_im/ui/components/item_checkbox.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.item-checkbox
+(ns status-im.ui.components.item-checkbox
   (:require [reagent.core :as r]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 

src/status_im/ui/components/list/styles.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.list.styles
+(ns status-im.ui.components.list.styles
   (:require-macros [status-im.utils.styles :refer [defstyle]])
-  (:require [status-im.components.styles :as styles]
+  (:require [status-im.ui.components.styles :as styles]
             [status-im.utils.platform :as platform]))
 
 (def item

src/status_im/ui/components/list/views.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.list.views
+(ns status-im.ui.components.list.views
   "
   Wrapper for react-native list components.
 
@@ -19,9 +19,9 @@
   [section-list {:sections [{:title \"\" :key :unik :render-fn render :data {:title  \"\" :subtitle \"\"}}]}]
   "
   (:require [reagent.core :as r]
-            [status-im.components.list.styles :as lst]
+            [status-im.ui.components.list.styles :as lst]
-            [status-im.components.react :as rn]
+            [status-im.ui.components.react :as rn]
-            [status-im.components.icons.vector-icons :as vi]
+            [status-im.ui.components.icons.vector-icons :as vi]
             [status-im.utils.platform :as p]))
 
 (def flat-list-class (rn/get-class "FlatList"))

src/status_im/ui/components/list_selection.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.list-selection
+(ns status-im.ui.components.list-selection
   (:require [re-frame.core :refer [dispatch]]
-            [status-im.components.react :refer [copy-to-clipboard
+            [status-im.ui.components.react :refer [copy-to-clipboard
                                                 sharing
                                                 linking]]
             [status-im.utils.platform :refer [platform-specific ios?]]

src/status_im/ui/components/mapbox.cljs

@@ -1,10 +1,10 @@
-(ns status-im.components.mapbox
+(ns status-im.ui.components.mapbox
   (:require [reagent.core :as r]
-            [status-im.components.styles :as common]
+            [status-im.ui.components.styles :as common]
             [status-im.i18n :refer [label]]
             [status-im.utils.platform :refer [platform-specific ios?]]
             [re-frame.core :refer [dispatch]]
-            [status-im.components.react :refer [view touchable-highlight text]]
+            [status-im.ui.components.react :refer [view touchable-highlight text]]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 
 (defn get-property [name]

src/status_im/ui/components/native_action_button.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.native-action-button
+(ns status-im.ui.components.native-action-button
   (:require [reagent.core :as r]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 

src/status_im/ui/components/nfc.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.nfc
+(ns status-im.ui.components.nfc
   (:require [cljs.spec.alpha :as s]
             [status-im.utils.platform :as platform]
             [status-im.react-native.js-dependencies :as rn-dependencies]))

src/status_im/ui/components/permissions.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.permissions
+(ns status-im.ui.components.permissions
   (:require [status-im.utils.platform :as platform]
             [taoensso.timbre :as log]
             [status-im.react-native.js-dependencies :as rn-dependencies]))

src/status_im/ui/components/qr_code.cljs

@@ -1,4 +1,4 @@
-(ns status-im.components.qr-code
+(ns status-im.ui.components.qr-code
   (:require [reagent.core :as r]
             [status-im.react-native.js-dependencies :as rn-dependencies]))
 

src/status_im/ui/components/react.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.react
+(ns status-im.ui.components.react
   (:require [reagent.core :as r]
-            [status-im.components.styles :as st]
+            [status-im.ui.components.styles :as st]
             [status-im.utils.utils :as u]
             [status-im.utils.platform :refer [platform-specific ios?]]
             [status-im.i18n :as i18n]

src/status_im/ui/components/renderers/renderers.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.renderers.renderers
+(ns status-im.ui.components.renderers.renderers
-  (:require [status-im.components.react :refer [list-item]]
+  (:require [status-im.ui.components.react :refer [list-item]]
-            [status-im.components.common.common :as common]))
+            [status-im.ui.components.common.common :as common]))
 
 (defn list-separator-renderer [_ row-id _]
   (list-item

src/status_im/ui/components/sortable_list_view.cljs

@@ -1,6 +1,6 @@
-(ns status-im.components.sortable-list-view
+(ns status-im.ui.components.sortable-list-view
   (:require [reagent.core :as r]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 touchable-highlight
                                                 list-item]]
             [status-im.react-native.js-dependencies :as rn-dependencies]))

src/status_im/ui/components/status_bar.cljs

@@ -1,5 +1,5 @@
-(ns status-im.components.status-bar
+(ns status-im.ui.components.status-bar
-  (:require [status-im.components.react :as ui]
+  (:require [status-im.ui.components.react :as ui]
             [status-im.utils.platform :refer [platform-specific]]))
 
 (defn status-bar [{type :type

src/status_im/ui/components/status_view/view.cljs

@@ -1,10 +1,10 @@
-(ns status-im.components.status-view.view
+(ns status-im.ui.components.status-view.view
   (:require-macros [status-im.utils.views :refer [defview]])
   (:require [re-frame.core :refer [subscribe dispatch]]
             [clojure.string :as str]
-            [status-im.components.react :refer [view text]]
+            [status-im.ui.components.react :refer [view text]]
             [status-im.utils.platform :refer [platform-specific]]
-            [status-im.components.styles :refer [color-blue color-black color-blue4-faded]]
+            [status-im.ui.components.styles :refer [color-blue color-black color-blue4-faded]]
             [status-im.utils.utils :refer [hash-tag?]]))
 
 (defn tag-view [tag]

src/status_im/ui/components/sticky_button.cljs

@@ -1,9 +1,9 @@
-(ns status-im.components.sticky-button
+(ns status-im.ui.components.sticky-button
   (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]])
-  (:require [status-im.components.styles :as common]
+  (:require [status-im.ui.components.styles :as common]
             [status-im.utils.platform :refer [platform-specific]]
             [status-im.utils.utils :as u]
-            [status-im.components.react :refer [view
+            [status-im.ui.components.react :refer [view
                                                 text
                                                 touchable-highlight]]))