Merge branch 'develop' into 19645

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.kt

@@ -43,7 +43,6 @@ class StatusModule(private val reactContext: ReactApplicationContext, private va
     }
 
     override fun handleSignal(jsonEventString: String) {
-        Log.d(TAG, "Signal event")
         val params = Arguments.createMap()
         params.putString("jsonEvent", jsonEventString)
         reactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java).emit("gethEvent", params)

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

@@ -38,9 +38,6 @@ - (void)handleSignal:(NSString *)signal
         return;
     }
 
-#if DEBUG
-    NSLog(@"[handleSignal] Received an event from Status-Go: %@", signal);
-#endif
     [bridge.eventDispatcher sendAppEventWithName:@"gethEvent"
                                             body:@{@"jsonEvent": signal}];
 

modules/react-native-status/nodejs/status.cpp

@@ -1128,8 +1128,6 @@ Persistent<Function> r_call;
 std::queue<std::string> q;
 
 void run(char *json) {
-  printf("signal received %s\n", json);
-
   std::string str(json);
   q.push(str);
 }

src/legacy/status_im/events.cljs

@@ -5,7 +5,6 @@
     legacy.status-im.browser.core
     legacy.status-im.browser.permissions
     legacy.status-im.chat.models.loading
-    legacy.status-im.contact.block
     legacy.status-im.currency.core
     legacy.status-im.data-store.chats
     legacy.status-im.data-store.switcher-cards

src/legacy/status_im/node/core.cljs

@@ -3,7 +3,8 @@
     [clojure.string :as string]
     [legacy.status-im.utils.deprecated-types :as types]
     [react-native.platform :as platform]
-    [status-im.config :as config]))
+    [status-im.config :as config]
+    [utils.ethereum.chain :as chain]))
 
 (defn- add-log-level
   [config log-level]
@@ -105,7 +106,7 @@
     (some #(string/includes? (str %) "waku") ks)))
 
 (defn get-multiaccount-node-config
-  [{:keys [profile/profile :networks/networks :networks/current-network]
+  [{:keys [profile/profile :networks/current-network]
     :as   db}]
   (let [wakuv2-config (get profile :wakuv2-config {})
         fleet-key (current-fleet-key db)
@@ -116,7 +117,10 @@
         {:keys [installation-id log-level
                 waku-bloom-filter-mode]}
         profile]
-    (cond-> (get-in networks [current-network :config])
+    (cond-> {:NetworkId      (chain/chain-keyword->chain-id :mainnet)
+             :DataDir        "/ethereum/mainnet_rpc"
+             :UpstreamConfig {:Enabled true
+                              :URL     config/mainnet-rpc-url}}
       :always
       (get-base-node-config)
 
@@ -173,5 +177,3 @@
 
       :always
       (add-log-level log-level))))
-
-

src/legacy/status_im/ui/screens/profile/components/sheets.cljs

@@ -22,7 +22,7 @@
         :loading             @in-progress?
         :accessibility-label :block-contact-confirm
         :on-press            #(do (reset! in-progress? true)
-                                  (re-frame/dispatch [:contact.ui/block-contact-confirmed public-key]))}
+                                  (re-frame/dispatch [:contact/block-contact public-key]))}
        (i18n/label :t/block)]
       [react/view {:height 8}]
       [quo/button

src/legacy/status_im/ui/screens/profile/contact/views.cljs

@@ -56,7 +56,7 @@
             :selected            blocked?
             :icon                :main-icons/cancel
             :action              (if blocked?
-                                   #(re-frame/dispatch [:contact.ui/unblock-contact-pressed public-key])
+                                   #(re-frame/dispatch [:contact/unblock-contact public-key])
                                    #(re-frame/dispatch [:show-popover
                                                         {:view             sheets/block-contact
                                                          :prevent-closing? true

src/quo/components/list_items/user.cljs

@@ -17,26 +17,28 @@
    :flex-direction     :row
    :align-items        :center})
 
-(defn action-icon
-  [{:keys [type on-press on-check disabled? checked?]} customization-color theme]
-  [rn/touchable-opacity
-   {:on-press on-press}
-   (case type
-     :options
-     [icons/icon :i/options
-      {:size  20
-       :color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
-     :checkbox
-     [selectors/view
-      {:type                :checkbox
-       :checked?            checked?
-       :customization-color customization-color
-       :accessibility-label :user-list-toggle-check
-       :disabled?           disabled?
-       :on-change           (when on-check on-check)}]
-     :close
-     [text/text "not implemented"]
-     [rn/view])])
+(defn accessory-item
+  [{:keys [type on-press on-check disabled? checked? child]} customization-color theme]
+  (if (= type :custom)
+    child
+    [rn/touchable-opacity
+     {:on-press on-press}
+     (case type
+       :options
+       [icons/icon :i/options
+        {:size  20
+         :color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}]
+       :checkbox
+       [selectors/view
+        {:type                :checkbox
+         :checked?            checked?
+         :customization-color customization-color
+         :accessibility-label :user-list-toggle-check
+         :disabled?           disabled?
+         :on-change           (when on-check on-check)}]
+       :close
+       [text/text "not implemented"]
+       [rn/view])]))
 
 (defn user
   [{:keys [short-chat-key primary-name secondary-name photo-path online? contact? verified?
@@ -72,4 +74,4 @@
          :style {:color (colors/theme-colors colors/neutral-50 colors/neutral-40 theme)}}
         short-chat-key])]
     (when accessory
-      [action-icon accessory customization-color disabled? theme])]])
+      [accessory-item accessory customization-color disabled? theme])]])