_

status-im · Jun 21, 2023 · aa1f107 · aa1f107
1 parent 547f749
commit aa1f107
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/native_module/core.cljs b/src/native_module/core.cljs
@@ -4,7 +4,8 @@
             [taoensso.timbre :as log]
             [react-native.platform :as platform]
             [react-native.core :as rn]
-            [utils.transforms :as types]))
+            [utils.transforms :as types]
+            [clojure.string :as string]))
 
 (defn status
   []
@@ -387,6 +388,10 @@
      :build-id  (.-buildId status)
      :device-id (.-deviceId status)}))
 
+(defn get-device-name []
+  (string/join "_" ((juxt :model :brand :device-id :build-id)
+                    (get-device-model-info))))
+
 (defn get-node-config
   [callback]
   (log/debug "[native-module] get-node-config")

diff --git a/src/status_im2/contexts/syncing/events.cljs b/src/status_im2/contexts/syncing/events.cljs
@@ -27,10 +27,7 @@
   (let [db {:networks/current-network config/default-network
             :networks/networks        (data-store.settings/rpc->networks config/default-networks)
             :multiaccount             {:installation-id           installation-id
-                                       :device-name               (string/join
-                                                                   " "
-                                                                   ((juxt :model :device-id)
-                                                                    (native-module/get-device-model-info)))
+                                       :device-name               (native-module/get-device-name)
                                        :log-level                 config/log-level
                                        :waku-bloom-filter-mode    false
                                        :custom-bootnodes          nil
@@ -65,10 +62,7 @@
                                                           :nodeConfig final-node-config
                                                           :settingCurrentNetwork config/default-network
                                                           :deviceType utils.platform/os
-                                                          :deviceName (string/join
-                                                                       " "
-                                                                       ((juxt :model :device-id)
-                                                                        (native-module/get-device-model-info)))}}))]
+                                                          :deviceName (native-module/get-device-name)}}))]
             (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
             (native-module/input-connection-string-for-bootstrapping
              connection-string