lint

status-im · May 14, 2024 · 5069fab · 5069fab
1 parent 7e41e35
commit 5069fab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/src/status_im/contexts/wallet/wallet_connect/utils.cljs b/src/status_im/contexts/wallet/wallet_connect/utils.cljs
@@ -1,10 +1,10 @@
 (ns status-im.contexts.wallet.wallet-connect.utils
   ;; NOTE: Not sorting namespaces since @walletconnect/react-native-compat should be the first
   #_{:clj-kondo/ignore [:unsorted-required-namespaces]}
-  (:require ["@walletconnect/react-native-compat"]
-            ["@walletconnect/core" :refer [Core]]
-            ["@walletconnect/web3wallet" :refer [Web3Wallet]]
+  (:require ["@walletconnect/core" :refer [Core]]
+            ["@walletconnect/react-native-compat"]
             ["@walletconnect/utils" :refer [buildApprovedNamespaces]]
+            ["@walletconnect/web3wallet" :refer [Web3Wallet]]
             [status-im.config :as config]
             [utils.i18n :as i18n]))
 

diff --git a/src/status_im/subs/wallet/activities.cljs b/src/status_im/subs/wallet/activities.cljs
@@ -1,6 +1,7 @@
 (ns status-im.subs.wallet.activities
   (:require
     [re-frame.core :as rf]
+    [status-im.contexts.wallet.common.activity-tab.constants :as constants]
     [utils.datetime :as datetime]))
 
 (rf/reg-sub
@@ -13,9 +14,11 @@
  :<- [:wallet/current-viewing-account-address]
  (fn [[activities current-viewing-account-address]]
    (->> activities
-        (filter (fn [{:keys [sender recipient]}]
-                  (or (= sender current-viewing-account-address)
-                      (= recipient current-viewing-account-address))))
+        (filter (fn [{:keys [sender recipient activity-type]}]
+                  (let [receiving-activity? (= activity-type constants/wallet-activity-type-receive)
+                        relevant-address    (if receiving-activity? recipient sender)]
+                    (= relevant-address current-viewing-account-address))))
+        (distinct)
         (group-by (fn [{:keys [timestamp]}]
                     (datetime/timestamp->relative-short-date (* timestamp 1000))))
         (map (fn [[date activities]]

diff --git a/src/status_im/subs/wallet/activities_test.cljs b/src/status_im/subs/wallet/activities_test.cljs
@@ -27,6 +27,10 @@
                        {:sender "acc2" :recipient "acc1" :timestamp 1588377600}
                        {:sender "acc3" :recipient "acc4" :timestamp 1588464000}])
             (assoc-in [:wallet :current-viewing-account-address] "acc1"))))
-    (is (= [{:title "May 2, 2020" :data [{:sender "acc2" :recipient "acc1" :timestamp 1588377600}] :timestamp 1588377600}
-            {:title "May 1, 2020" :data [{:sender "acc1" :recipient "acc2" :timestamp 1588291200}] :timestamp 1588291200}]
+    (is (= [{:title     "May 2, 2020"
+             :data      [{:sender "acc2" :recipient "acc1" :timestamp 1588377600}]
+             :timestamp 1588377600}
+            {:title     "May 1, 2020"
+             :data      [{:sender "acc1" :recipient "acc2" :timestamp 1588291200}]
+             :timestamp 1588291200}]
            (rf/sub [sub-name])))))