[#15944] Set installation name on account creation

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -1156,23 +1156,7 @@ RCT_EXPORT_METHOD(deactivateKeepAwake)
 
 - (NSString*) deviceName
 {
-
+    return [[UIDevice currentDevice] name];;
-    NSString* deviceName = nil;
-
-    if ([self.deviceId rangeOfString:@"iPod"].location != NSNotFound) {
-        deviceName = @"iPod Touch";
-    }
-    else if([self.deviceId rangeOfString:@"iPad"].location != NSNotFound) {
-        deviceName = @"iPad";
-    }
-    else if([self.deviceId rangeOfString:@"iPhone"].location != NSNotFound){
-        deviceName = @"iPhone";
-    }
-    else if([self.deviceId rangeOfString:@"AppleTV"].location != NSNotFound){
-        deviceName = @"Apple TV";
-    }
-
-    return deviceName;
 }
 
 - (NSDictionary *)constantsToExport

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,14 @@
      :build-id  (.-buildId status)
      :device-id (.-deviceId status)}))
 
+(defn get-installation-name
+  []
+  ;; NOTE(rasom): Only needed for android devices currently
+  (when platform/android?
+    (string/join " "
+                 ((juxt :model :device-id)
+                  (get-device-model-info)))))
+
 (defn get-node-config
   [callback]
   (log/debug "[native-module] get-node-config")

src/status_im2/contexts/onboarding/events.cljs

@@ -80,6 +80,7 @@
                           :multiaccount/restore-account-and-login
                           :multiaccount/create-account-and-login)
         request         {:displayName                 display-name
+                         :deviceName                  (native-module/get-installation-name)
                          :password                    (ethereum/sha3 (security/safe-unmask-data
                                                                       password))
                          :mnemonic                    (when seed-phrase

src/status_im2/contexts/syncing/events.cljs

@@ -26,6 +26,7 @@
   (let [db {:networks/current-network config/default-network
             :networks/networks        (data-store.settings/rpc->networks config/default-networks)
             :profile/profile          {:installation-id           installation-id
+                                       :device-name               (native-module/get-installation-name)
                                        :log-level                 config/log-level
                                        :waku-bloom-filter-mode    false
                                        :custom-bootnodes          nil
@@ -59,7 +60,9 @@
                                         {:receiverConfig {:kdfIterations config/default-kdf-iterations
                                                           :nodeConfig final-node-config
                                                           :settingCurrentNetwork config/default-network
-                                                          :deviceType utils.platform/os}}))]
+                                                          :deviceType utils.platform/os
+                                                          :deviceName
+                                                          (native-module/get-installation-name)}}))]
             (rf/dispatch [:syncing/update-role constants/local-pairing-role-receiver])
             (native-module/input-connection-string-for-bootstrapping
              connection-string