Set fleet to shards.test

status-im/status-go@d7e7792...7bbfbf5
status-im · Dec 8, 2023 · 44fca8f · 44fca8f
1 parent f614f0a
commit 44fca8f
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 24 deletions.
diff --git a/...les/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java b/...les/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java
@@ -1183,6 +1183,11 @@ public String keystoreDir() {
         return pathCombine(absRootDirPath, "keystore");
     }
 
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public String fleets() {
+        return Statusgo.fleets();
+    }
+
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String backupDisabledDataDir() {
         return this.getNoBackupDirectory();

diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.m b/modules/react-native-status/ios/RCTStatus/RCTStatus.m
@@ -981,6 +981,10 @@ - (void) migrateKeystore:(NSString *)accountData
   return StatusgoIsAddress(address);
 }
 
+RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
+  return StatusgoFleets();
+}
+
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
   return StatusgoToChecksumAddress(address);
 }

diff --git a/modules/react-native-status/nodejs/status.cpp b/modules/react-native-status/nodejs/status.cpp
@@ -298,6 +298,7 @@ void _MultiAccountStoreAccount(const FunctionCallbackInfo<Value>& args) {
 	delete c;
 }
 
+
 void _InitKeystore(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -562,6 +563,17 @@ void _CheckAddressChecksum(const FunctionCallbackInfo<Value>& args) {
 
 }
 
+void _Fleets(const FunctionCallbackInfo<Value>& args) {
+	Isolate* isolate = args.GetIsolate();
+	// Call exported Go function, which returns a C string
+	char *c = Fleets();
+
+	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
+	args.GetReturnValue().Set(ret);
+	delete c;
+}
+
+
 void _IsAddress(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1888,6 +1900,7 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreDerivedAccounts", _MultiAccountStoreDerivedAccounts);
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
+	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
 	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);

diff --git a/src/native_module/core.cljs b/src/native_module/core.cljs
@@ -519,6 +519,10 @@
   []
   (.backupDisabledDataDir ^js (status)))
 
+(defn fleets
+  []
+  (.fleets ^js (status)))
+
 (defn keystore-dir
   []
   (.keystoreDir ^js (status)))

diff --git a/src/status_im/fleet/core.cljs b/src/status_im/fleet/core.cljs
@@ -1,16 +1,25 @@
 (ns status-im.fleet.core
   (:require
+    [native-module.core :as native-module]
     [re-frame.core :as re-frame]
     [status-im.multiaccounts.update.core :as multiaccounts.update]
     [status-im.node.core :as node]
     [status-im2.constants :as constants]
     [utils.i18n :as i18n]
-    [utils.re-frame :as rf]))
+    [utils.re-frame :as rf]
+    [utils.transforms :as transforms]))
+
+(def ^:private default-fleets (transforms/json->clj (native-module/fleets)))
+(def ^:private default-fleet (:defaultFleet default-fleets))
+(def fleets
+  (->> default-fleets
+       :fleets
+       keys))
 
 (defn current-fleet-sub
   [multiaccount]
   (keyword (or (get multiaccount :fleet)
-               config/fleet)))
+               default-fleet)))
 
 (defn format-mailserver
   [mailserver address]

diff --git a/src/status_im/ui/screens/fleet_settings/views.cljs b/src/status_im/ui/screens/fleet_settings/views.cljs
@@ -1,6 +1,7 @@
 (ns status-im.ui.screens.fleet-settings.views
   (:require
     [re-frame.core :as re-frame]
+    [status-im.fleet.core :as fleets]
     [status-im.ui.components.icons.icons :as icons]
     [status-im.ui.components.list.views :as list]
     [status-im.ui.components.react :as react]
@@ -29,16 +30,11 @@
        [react/text {:style styles/fleet-item-name-text}
         fleet]]]]))
 
-(defn fleets
-  [custom-fleets]
-  (map name (keys (node/fleets {:custom-fleets custom-fleets}))))
-
 (views/defview fleet-settings
   []
-  (views/letsubs [custom-fleets [:fleets/custom-fleets]
-                  current-fleet [:fleets/current-fleet]]
+  (views/letsubs [current-fleet [:fleets/current-fleet]]
     [list/flat-list
-     {:data               (fleets custom-fleets)
+     {:data               fleets/fleets
       :default-separator? false
       :key-fn             identity
       :render-data        (name current-fleet)

diff --git a/src/status_im/utils/test.cljs b/src/status_im/utils/test.cljs
@@ -121,6 +121,9 @@
     :isAddress
     (fn [address] (.isAddress native-status address))
 
+    :fleets
+    (fn [] (.fleets native-status))
+
     :validateMnemonic
     (fn [json callback] (callback (.validateMnemonic native-status json)))
 

diff --git a/src/status_im2/contexts/chat/actions/view.cljs b/src/status_im2/contexts/chat/actions/view.cljs
@@ -4,17 +4,14 @@
     [utils.i18n :as i18n]
     [utils.re-frame :as rf]))
 
-(defn fetch-messages!
-  [chat-id]
-  (rf/dispatch [:hide-bottom-sheet])
-  (rf/dispatch [:chat/fetch-messages chat-id]))
-
 (defn fetch-messages
   [chat-id]
   {:icon                :i/download
    :right-icon          :i/chevron-right
    :accessibility-label :chat-fetch-messages
-   :on-press            (partial fetch-messages! chat-id)
+   :on-press            (fn []
+                          (rf/dispatch [:hide-bottom-sheet])
+                          (rf/dispatch [:chat/fetch-messages chat-id]))
    :label               (i18n/label :t/fetch-messages)})
 
 (defn new-chat

diff --git a/src/status_im2/contexts/chat/events.cljs b/src/status_im2/contexts/chat/events.cljs
@@ -150,10 +150,9 @@
                            (update db :chats dissoc chat-id))
                        (update :chats-home-list disj chat-id)
                        (assoc :current-chat-id nil))
-    :json-rpc/call [{:method     "wakuext_deactivateChat"
-                     :params     [{:id chat-id}]
-                     :on-success #()
-                     :on-error   #(log/error "failed to create public chat" chat-id %)}]}
+    :json-rpc/call [{:method   "wakuext_deactivateChat"
+                     :params   [{:id chat-id}]
+                     :on-error #(log/error "failed to create public chat" chat-id %)}]}
    (clear-history chat-id true)))
 
 (rf/defn offload-messages

diff --git a/src/status_im2/contexts/profile/rpc.cljs b/src/status_im2/contexts/profile/rpc.cljs
@@ -6,8 +6,7 @@
 
 (defn rpc->wakuv2-config
   [wakuv2-config]
-  (-> wakuv2-config
-      (clojure.set/rename-keys {:LightClient :light-client})))
+  (clojure.set/rename-keys wakuv2-config {:LightClient :light-client}))
 
 (defn rpc->profiles-overview
   [{:keys [customizationColor keycard-pairing] :as profile}]

diff --git a/status-go-version.json b/status-go-version.json
@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v0.171.28",
-    "commit-sha1": "d7e7792b51f79e8cbebc9f59de79e64b6f6e684a",
-    "src-sha256": "0y0di4jfmk93pqc4i9fsgasrhqgvwh46ly5h04m87pm611faa2ay"
+    "version": "chore/set-default-fleet-to-shard-test",
+    "commit-sha1": "7bbfbf5eb3cb1d21b105cb80694969189fb431e7",
+    "src-sha256": "01qxkqfs3nc2i5xfp1n84n71j4in7abh81spa98fyy4bhsd8k893"
 }