Fixes activities list cleaning after unsuccessful activites request from status-go (#22270)

* Fixed cleaning activities list when activities request failed

* status-im/status-go@ba8fd51...002cd8c

* Updated to release status-go with fixed issue

status-im/status-go@ba8fd51...37fd3a2

Author: vkjr

src/status_im/contexts/wallet/common/activity_tab/constants.cljs

@@ -14,6 +14,10 @@
 (def ^:const wallet-activity-token-type-erc-721 2)
 (def ^:const wallet-activity-token-type-erc-1155 3)
 
+(def ^:const activity-request-success 1)
+(def ^:const activity-request-task-cancelled 2)
+(def ^:const activity-request-failed 3)
+
 (def ^:const wallet-activity-status->name
   {wallet-activity-status-failed    :failed
    wallet-activity-status-pending   :pending

src/status_im/contexts/wallet/common/activity_tab/events.cljs

@@ -1,5 +1,6 @@
 (ns status-im.contexts.wallet.common.activity-tab.events
   (:require [camel-snake-kebab.extras :as cske]
+            [status-im.contexts.wallet.common.activity-tab.constants :as constants]
             [utils.collection :as collection]
             [utils.ethereum.chain :as chain]
             [utils.re-frame :as rf]
@@ -92,21 +93,25 @@
  :wallet/activity-filtering-for-current-account-done
  (fn [{:keys [db]} [{:keys [message]}]]
    (let [{:keys [address
-                 remove-all-existing-activities?]} (get-in db [:wallet :ui :activity-tab :request])
-         {:keys [activities offset hasMore]}       (transforms/json->clj message)
-         new-activities                            (->> activities
-                                                        (cske/transform-keys
-                                                         transforms/->kebab-case-keyword)
-                                                        (collection/index-by :key))
-         existing-activities                       (get-in db [:wallet :activities address])
-         updated-activities                        (if remove-all-existing-activities?
-                                                     new-activities
-                                                     (nested-merge existing-activities new-activities))]
-     {:db (-> db
-              (assoc-in [:wallet :activities address] updated-activities)
-              (assoc-in [:wallet :ui :activity-tab :request :offset] offset)
-              (assoc-in [:wallet :ui :activity-tab :request :has-more?] hasMore)
-              (assoc-in [:wallet :ui :activity-tab :request :loading?] false))})))
+                 remove-all-existing-activities?]}     (get-in db [:wallet :ui :activity-tab :request])
+         message-clj                                   (transforms/json->clj message)
+         {:keys [activities offset hasMore errorCode]} message-clj]
+     (if (= errorCode constants/activity-request-success)
+       (let [new-activities      (->> activities
+                                      (cske/transform-keys
+                                       transforms/->kebab-case-keyword)
+                                      (collection/index-by :key))
+             existing-activities (get-in db [:wallet :activities address])
+             updated-activities  (if remove-all-existing-activities?
+                                   new-activities
+                                   (nested-merge existing-activities
+                                                 new-activities))]
+         {:db (-> db
+                  (assoc-in [:wallet :activities address] updated-activities)
+                  (assoc-in [:wallet :ui :activity-tab :request :offset] offset)
+                  (assoc-in [:wallet :ui :activity-tab :request :has-more?] hasMore)
+                  (assoc-in [:wallet :ui :activity-tab :request :loading?] false))})
+       {:db (assoc-in db [:wallet :ui :activity-tab :request :loading?] false)}))))
 
 (rf/reg-event-fx
  :wallet/activities-filtering-entries-updated

status-go-version.json

@@ -3,7 +3,7 @@
     "_comment": "Instead use: scripts/update-status-go.sh <rev>",
     "owner": "status-im",
     "repo": "status-go",
-    "version": "v10.7.0+hotfix.2",
-    "commit-sha1": "595dc68e9ff5e6e57364818098616a97b83eabd5",
-    "src-sha256": "04dsmz70h3i738bj3i3ba8bckpw61vxb56m8sc4qw8agc9pdaxc0"
+    "version": "v10.7.0+hotfix.3",
+    "commit-sha1": "37fd3a28aface4e4d6f75191b43c0496b0e3e861",
+    "src-sha256": "01zwasnqvizl15vsarw2bqv4g1avcjn141mn4g0v9rzb8cg87c42"
 }