events added

Author: vkjr

src/status_im/contexts/centralized_metrics/events_test.cljs

@@ -15,7 +15,7 @@
 
 (deftest centralized-metrics-interceptor-test
   (testing "processes context correctly"
-    (with-redefs [tracking/tracked-event (fn [_] {:metric "mocked-event"})
+    (with-redefs [tracking/tracked-event (fn [_ _] {:metric "mocked-event"})
                   events/push-event?     (fn [_] true)]
       (let [context {:coeffects {:event [:some-event]
                                  :db    {:centralized-metrics/enabled? true}}}]

src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -53,9 +53,21 @@
   (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 navigated-to-collectibles-tab-event
+  [location]
+  (key-value-event "navigated-to-collectibles-tab" :location location))
+
 (defn tracked-event
   [[event-name second-parameter] db]
-  (def dbg-db db)
   (case event-name
     :profile/get-profiles-overview-success
     (user-journey-event app-started-event)
@@ -68,40 +80,13 @@
 
     :wallet/select-account-tab
     (when (= second-parameter :collectibles)
-      (key-value-event "navigated-to-collectibles-tab" :location :account))
+      (navigated-to-collectibles-tab-event :account))
+    
+    :wallet/select-home-tab
+    (when (= second-parameter :collectibles)
+      (navigated-to-collectibles-tab-event :home))
 
     :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))
+    (collectilbes-fetched-event db)
 
-
-    ;; :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/centralized_metrics/tracking_test.cljs

@@ -63,17 +63,17 @@
              :platform   platform-os
              :appVersion app-version
              :eventValue {:action tracking/app-started-event}}}
-           (tracking/tracked-event [:profile/get-profiles-overview-success])))
+           (tracking/tracked-event [:profile/get-profiles-overview-success] {})))
     (is (= {:metric
             {:eventName  "events.metrics-enabled"
              :platform   platform-os
              :appVersion app-version
              :eventValue {:enabled true}}}
-           (tracking/tracked-event [:centralized-metrics/toggle-centralized-metrics true])))
+           (tracking/tracked-event [:centralized-metrics/toggle-centralized-metrics true ] {})))
     (is (= {:metric
             {:eventName  "navigation"
              :platform   platform-os
              :appVersion app-version
              :eventValue {:viewId "wallet-stack"}}}
-           (tracking/tracked-event [:set-view-id :wallet-stack])))
-    (is (nil? (tracking/tracked-event [:unknown-event])))))
+           (tracking/tracked-event [:set-view-id :wallet-stack] {})))
+    (is (nil? (tracking/tracked-event [:unknown-event] {})))))

src/status_im/contexts/wallet/events.cljs

@@ -58,6 +58,10 @@
  (fn [{:keys [db]} [tab]]
    {:db (assoc-in db [:wallet :ui :account-page :active-tab] tab)}))
 
+(rf/reg-event-fx :wallet/select-home-tab
+                 (fn [{:keys [db]} [tab]]
+                   {:db (assoc-in db [:wallet :ui :active-tab] tab)}))
+
 (rf/reg-event-fx :wallet/clear-account-tab
  (fn [{:keys [db]}]
    {:db (assoc-in db [:wallet :ui :account-page :active-tab] nil)}))

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

@@ -35,12 +35,16 @@
    :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}
    (when (ff/enabled? ::ff/wallet.home-activity)
      {:id :activity :label (i18n/label :t/activity) :accessibility-label :activity-tab})])
 
+(defn- change-tab [id] (rf/dispatch [:wallet/select-home-tab id]))
+
 (defn- render-cards
   [cards ref]
   [rn/flat-list
@@ -64,7 +68,7 @@
 
 (defn view
   []
-  (let [[selected-tab set-selected-tab] (rn/use-state (:id (first tabs-data)))
+  (let [ selected-tab                   (or (rf/sub [:wallet/home-tab]) first-tab-id)
         account-list-ref                (rn/use-ref-atom nil)
         tokens-loading?                 (rf/sub [:wallet/home-tokens-loading?])
         networks                        (rf/sub [:wallet/selected-network-details])
@@ -104,7 +108,7 @@
                                  (when (ff/enabled? ::ff/wallet.graph)
                                    [quo/wallet-graph {:time-frame :empty}])
                                  [render-cards cards account-list-ref]
-                                 [render-tabs tabs-data set-selected-tab selected-tab]]
+                                 [render-tabs tabs-data change-tab selected-tab]]
        :content-container-style style/list-container
        :sticky-header-indices   [0]
        :data                    []

src/status_im/subs/wallet/wallet.cljs

@@ -527,6 +527,12 @@
  (fn [ui]
    (get-in ui [:account-page :active-tab])))
 
+(rf/reg-sub
+ :wallet/home-tab
+ :<- [:wallet/ui]
+ (fn [ui]
+   (:active-tab ui)))
+
 (rf/reg-sub
  :wallet/aggregated-tokens
  :<- [:wallet/accounts-without-watched-accounts]