wip

Author: vkjr

src/status_im/contexts/centralized_metrics/events.cljs

@@ -14,7 +14,8 @@
 
 (defn centralized-metrics-interceptor
   [context]
-  (when-let [event (tracking/tracked-event (interceptor/get-coeffect context :event))]
+  (when-let [event (tracking/tracked-event (interceptor/get-coeffect context :event) (interceptor/get-coeffect context :db))]
+    (tap> event)
     (log/debug "tracking event" event)
     (when (push-event? (interceptor/get-coeffect context :db))
       (native-module/add-centralized-metric event)))
@@ -45,7 +46,3 @@
                           #(rf/dispatch [:profile.login/login-with-biometric-if-available
                                          (get-in db [:profile/login :key-uid])]))
               :shell?   true}]]]})))
-
-;; Events do nothing but they will be intercepted and tracked 
-(rf/reg-event-fx :centralized-metrics/navigated-to-collectibles-tab (fn []))
-(rf/reg-event-fx :centralized-metrics/collectibles-fetched (fn []))

src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -22,7 +22,7 @@
 (def ^:const app-started-event "app-started")
 
 (def ^:const view-ids-to-track
-  #{;; Tabs
+  #{ ;; Tabs
     :communities-stack
     :chats-stack
     :wallet-stack
@@ -54,7 +54,8 @@
     (navigation-event (name view-id))))
 
 (defn tracked-event
-  [[event-name second-parameter]]
+  [[event-name second-parameter] db]
+  (def dbg-db db)
   (case event-name
     :profile/get-profiles-overview-success
     (user-journey-event app-started-event)
@@ -65,10 +66,42 @@
     :set-view-id
     (track-view-id-event second-parameter)
 
-    :centralized-metrics/navigated-to-collectibles-tab
-    (key-value-event "navigated-to-collectibles-tab" :location second-parameter)
+    :wallet/select-account-tab
+    (when (= second-parameter :collectibles)
+      (key-value-event "navigated-to-collectibles-tab" :location :account))
 
-    :centralized-metrics/collectibles-fetched
-    (key-value-event "collectibles-fetched" :amount second-parameter)
+    :wallet/flush-collectibles-fetched
+    (let [accounts (get-in db [:wallet :accounts])
+          total-amount (reduce (fn [collectibles-amount account]
+                                 (+ collectibles-amount (:current-collectible-idx account)))
+                               0
+                               (vals accounts))]
+      (key-value-event "collectibles-fetched" :total-amount total-amount))
+    
+
+    ;; :centralized-metrics/navigated-to-collectibles-tab
+    ;; (key-value-event "navigated-to-collectibles-tab" :location second-parameter)
+
+    ;; :centralized-metrics/collectibles-fetched
+    ;; (key-value-event "collectibles-fetched" :amount second-parameter)
 
     nil))
+
+
+(comment
+  dbg-db
+  (def accounts (get-in dbg-db [:wallet :accounts]))
+  (:current-collectible-idx (second (vals accounts)))
+  (reduce (fn [collectibles-amount account]
+            (+ collectibles-amount (:current-collectible-idx account)))
+          (vals accounts))
+
+  
+
+  (reduce (fn [collectibles-amount account]
+            (+ collectibles-amount (:current-collectible-idx account)))
+          0
+          (vals {:a {:current-collectible-idx 1}
+                 :b {:current-collectible-idx 1}
+                 })))
+

src/status_im/contexts/wallet/account/view.cljs

@@ -19,11 +19,7 @@
    {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab}
    {:id :about :label (i18n/label :t/about) :accessibility-label :about}])
 
-(defn- change-tab
-  [id]
-  (when (= id :collectibles)
-    (rf/dispatch [:centralized-metrics/navigated-to-collectibles-tab :account]))
-  (rf/dispatch [:wallet/select-account-tab id]))
+(defn- change-tab [id] (rf/dispatch [:wallet/select-account-tab id]))
 
 (defn view
   []

src/status_im/contexts/wallet/collectible/events.cljs

@@ -263,10 +263,6 @@
                                                                 (when-not updating? hasMore)))
       :fx [(when (zero? pending-requests)
              [:dispatch [:wallet/flush-collectibles-fetched]])
-           (when (zero? pending-requests)
-             (let [collectibles-amount
-                   (get-in db [:wallet :accounts owner-address :current-collectible-idx])]
-               [:dispatch [:centralized-metrics/collectibles-fetched collectibles-amount]]))
            (when updating?
              [:dispatch [:wallet/set-collectibles-updating-status owner-address updating-chains]])]})))
 

src/status_im/contexts/wallet/home/tabs/view.cljs

@@ -39,3 +39,4 @@
      :assets       [assets/view]
      :collectibles [collectibles-tab]
      [activity/view {:activities []}])])
+

src/status_im/contexts/wallet/home/view.cljs

@@ -84,11 +84,6 @@
      #(when (and (boolean? tokens-loading?) (not tokens-loading?) (not init-loaded?))
         (set-init-loaded true))
      [tokens-loading?])
-    (rn/use-effect
-     (fn []
-       (when (= selected-tab :collectibles)
-         (rf/dispatch [:centralized-metrics/navigated-to-collectibles-tab :wallet-home])))
-     [selected-tab])
     [rn/view {:style (style/home-container)}
      [common.top-nav/view]
      [refreshable-flat-list/view