review fixes

Author: vkjr

src/status_im/contexts/centralized_metrics/events.cljs

@@ -14,12 +14,14 @@
 
 (defn centralized-metrics-interceptor
   [context]
-  (when-let [event (tracking/tracked-event (interceptor/get-coeffect context :event)
-                                           (interceptor/get-coeffect context :db))]
-    (log/debug "tracking event" event)
-    (when (push-event? (interceptor/get-coeffect context :db))
-      (native-module/add-centralized-metric event)))
-  context)
+  (let [rf-event      (interceptor/get-coeffect context :event)
+        rf-db         (interceptor/get-effect context :db)
+        rf-event-data (get rf-db :centralized-metrics/event-data)]
+    (when-let [metrics-event (tracking/tracked-event rf-event rf-event-data)]
+      (log/debug "tracking event" metrics-event)
+      (when (push-event? rf-db)
+        (native-module/add-centralized-metric metrics-event)))
+    (interceptor/assoc-effect context :db (dissoc rf-db :centralized-metrics/event-data))))
 
 (def interceptor
   (interceptor/->interceptor

src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -53,21 +53,16 @@
   (when (contains? view-ids-to-track view-id)
     (navigation-event (name view-id))))
 
-(defn collectilbes-fetched-event
-  [db]
-  (let [accounts               (get-in db [:wallet :accounts])
-        amount-on-all-accounts (reduce (fn [collectibles-amount account]
-                                         (+ collectibles-amount (:current-collectible-idx account)))
-                                       0
-                                       (vals accounts))]
-    (key-value-event "collectibles-fetched" :total-amount amount-on-all-accounts)))
+(defn collectibles-fetched-event
+  [has-collectibles?]
+  (key-value-event "collectibles-fetched" :has-collectibles has-collectibles?))
 
 (defn navigated-to-collectibles-tab-event
   [location]
   (key-value-event "navigated-to-collectibles-tab" :location location))
 
 (defn tracked-event
-  [[event-name second-parameter] db]
+  [[event-name second-parameter] event-data]
   (case event-name
     :profile/get-profiles-overview-success
     (user-journey-event app-started-event)
@@ -87,6 +82,6 @@
       (navigated-to-collectibles-tab-event :home))
 
     :wallet/flush-collectibles-fetched
-    (collectilbes-fetched-event db)
+    (collectibles-fetched-event event-data)
 
     nil))

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

@@ -43,10 +43,16 @@
 
 (defn flush-collectibles
   [{:keys [db]}]
-  (let [collectibles-per-account (get-in db [:wallet :ui :collectibles :fetched])]
+  (let [collectibles-per-account (get-in db [:wallet :ui :collectibles :fetched])
+        updated-accounts         (move-collectibles-to-accounts (get-in db [:wallet :accounts])
+                                                                collectibles-per-account)
+        has-collectibles?        (some (fn [account]
+                                         (pos? (count (:collectibles account))))
+                                       (vals updated-accounts))]
     {:db (-> db
              (update-in [:wallet :ui :collectibles] dissoc :pending-requests :fetched)
-             (update-in [:wallet :accounts] move-collectibles-to-accounts collectibles-per-account))}))
+             (assoc-in [:wallet :accounts] updated-accounts)
+             (assoc :centralized-metrics/event-data has-collectibles?))}))
 
 (rf/reg-event-fx :wallet/flush-collectibles-fetched flush-collectibles)
 

src/status_im/contexts/wallet/db.cljs

@@ -10,4 +10,5 @@
         ;; Note: we set it to nil by default to differentiate when the user logs
         ;; in and the device is offline, versus re-fetching when offline and
         ;; tokens already exist in the app-db.
-        :tokens-loading nil}})
+        :tokens-loading nil
+        :active-tab     :assets}})

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

@@ -35,8 +35,6 @@
    :on-press            #(rf/dispatch [:show-bottom-sheet {:content new-account}])
    :type                :add-account})
 
-(def first-tab-id :assets)
-
 (def tabs-data
   [{:id :assets :label (i18n/label :t/assets) :accessibility-label :assets-tab}
    {:id :collectibles :label (i18n/label :t/collectibles) :accessibility-label :collectibles-tab}
@@ -68,7 +66,7 @@
 
 (defn view
   []
-  (let [selected-tab                   (or (rf/sub [:wallet/home-tab]) first-tab-id)
+  (let [selected-tab                   (rf/sub [:wallet/home-tab])
         account-list-ref               (rn/use-ref-atom nil)
         tokens-loading?                (rf/sub [:wallet/home-tokens-loading?])
         networks                       (rf/sub [:wallet/selected-network-details])