From 35671226e49bd33d52652a5c06ef89c1e3b0637a Mon Sep 17 00:00:00 2001
From: andrey <motor4ik@gmail.com>
Date: Thu, 21 Jan 2021 16:01:37 +0100
Subject: [PATCH] remove outdated :initial-props

Signed-off-by: andrey <motor4ik@gmail.com>
---
 src/status_im/core.cljs               |  3 +--
 src/status_im/db.cljs                 |  1 -
 src/status_im/events.cljs             |  5 -----
 src/status_im/init/core.cljs          |  3 +--
 src/status_im/node/core.cljs          | 14 +++++---------
 src/status_im/subs.cljs               |  1 -
 src/status_im/utils/logging/core.cljs |  1 -
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/status_im/core.cljs b/src/status_im/core.cljs
index ffac88c06c..62caf05c5e 100644
--- a/src/status_im/core.cljs
+++ b/src/status_im/core.cljs
@@ -51,7 +51,7 @@
 (defn root [_]
   (reagent/create-class
    {:component-did-mount
-    (fn [this]
+    (fn [_]
       (.addListener ^js react/keyboard
                     (if platform/ios?
                       "keyboardWillShow"
@@ -71,7 +71,6 @@
       (.addEventListener react-native-shake
                          "ShakeEvent"
                          on-shake)
-      (re-frame/dispatch [:set-initial-props (reagent/props this)])
       (.hide ^js splash-screen))
     :component-will-unmount
     (fn []
diff --git a/src/status_im/db.cljs b/src/status_im/db.cljs
index 064289d30c..c419315e41 100644
--- a/src/status_im/db.cljs
+++ b/src/status_im/db.cljs
@@ -32,7 +32,6 @@
              :chat/last-outgoing-message-sent-at 0
              :chat/spam-messages-frequency       0
              :tooltips                           {}
-             :initial-props                      {}
              :dimensions/window                  (dimensions/window)
              :registry                           {}
              :stickers/packs-owned               #{}
diff --git a/src/status_im/events.cljs b/src/status_im/events.cljs
index d8c553f084..2b0f3db5fe 100644
--- a/src/status_im/events.cljs
+++ b/src/status_im/events.cljs
@@ -888,11 +888,6 @@
  (fn [cofx [_ installation-id metadata]]
    (pairing/update-installation cofx installation-id metadata)))
 
-(handlers/register-handler-fx
- :set-initial-props
- (fn [cofx [_ initial-props]]
-   {:db (assoc (:db cofx) :initial-props initial-props)}))
-
 (handlers/register-handler-fx
  :pairing.ui/enable-installation-pressed
  (fn [cofx [_ installation-id]]
diff --git a/src/status_im/init/core.cljs b/src/status_im/init/core.cljs
index 46d6aa119e..850e5cddd5 100644
--- a/src/status_im/init/core.cljs
+++ b/src/status_im/init/core.cljs
@@ -11,11 +11,10 @@
 
 (fx/defn initialize-app-db
   "Initialize db to initial state"
-  [{{:keys [keycard initial-props supported-biometric-auth app-active-since]
+  [{{:keys [keycard supported-biometric-auth app-active-since]
      :network/keys [type]} :db
     now :now}]
   {:db (assoc app-db
-              :initial-props initial-props
               :network/type type
               :keycard (dissoc keycard :secrets)
               :supported-biometric-auth supported-biometric-auth
diff --git a/src/status_im/node/core.cljs b/src/status_im/node/core.cljs
index 3aca4a1308..e2ddea2b06 100644
--- a/src/status_im/node/core.cljs
+++ b/src/status_im/node/core.cljs
@@ -50,15 +50,11 @@
       les-topic (assoc les-topic {:Min 2, :Max 2}))))
 
 (defn- get-base-node-config [config]
-  (let [initial-props @(re-frame/subscribe [:initial-props])
-        status-node-port (get initial-props :STATUS_NODE_PORT)]
-    (cond-> (assoc config
-                   :Name "StatusIM")
-      config/dev-build?
-      (assoc :ListenAddr ":30304"
-             :DataDir (str (:DataDir config) "_dev"))
-      status-node-port
-      (assoc :ListenAddr (str ":" status-node-port)))))
+  (cond-> (assoc config
+                 :Name "StatusIM")
+    config/dev-build?
+    (assoc :ListenAddr ":30304"
+           :DataDir (str (:DataDir config) "_dev"))))
 
 (defn- pick-nodes
   "Picks `limit` different nodes randomly from the list of nodes
diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs
index 23604c8a7f..cd4811034c 100644
--- a/src/status_im/subs.cljs
+++ b/src/status_im/subs.cljs
@@ -70,7 +70,6 @@
 (reg-root-key-sub :about-app/node-info :node-info)
 (reg-root-key-sub :peers-summary :peers-summary)
 (reg-root-key-sub :dimensions/window :dimensions/window)
-(reg-root-key-sub :initial-props :initial-props)
 (reg-root-key-sub :fleets/custom-fleets :custom-fleets)
 (reg-root-key-sub :animations :animations)
 (reg-root-key-sub :ui/search :ui/search)
diff --git a/src/status_im/utils/logging/core.cljs b/src/status_im/utils/logging/core.cljs
index eaabe8d81d..f87d6dd1e0 100644
--- a/src/status_im/utils/logging/core.cljs
+++ b/src/status_im/utils/logging/core.cljs
@@ -60,7 +60,6 @@
   ;; TODO: Add message explaining db export
   (let [db-json (types/clj->json (select-keys db [:app-state
                                                   :current-chat-id
-                                                  :initial-props
                                                   :keyboard-height
                                                   :keyboard-max-height
                                                   :network