more improvements

Author: vkjr

Diff for: src/status_im/contexts/centralized_metrics/events.cljs

@@ -14,10 +14,11 @@
 
 (defn centralized-metrics-interceptor
   [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)]
+  (let [rf-event           (interceptor/get-coeffect context :event)
+        rf-db              (interceptor/get-effect context :db)
+        metrics-event-data (get rf-db :centralized-metrics/event-data)]
+    (when-let [metrics-event (tracking/metrics-event {:rf-event     rf-event
+                                                      :metrics-data metrics-event-data})]
       (log/debug "tracking event" metrics-event)
       (when (push-event? rf-db)
         (native-module/add-centralized-metric metrics-event)))

Diff for: 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/metrics-event (fn [_] {:metric "mocked-event"})
                   events/push-event?     (fn [_] true)]
       (let [context {:coeffects {:event [:some-event]
                                  :db    {:centralized-metrics/enabled? true}}}]

Diff for: src/status_im/contexts/centralized_metrics/tracking.cljs

@@ -61,27 +61,28 @@
   [location]
   (key-value-event "navigated-to-collectibles-tab" :location location))
 
-(defn tracked-event
-  [[event-name second-parameter] event-data]
-  (case event-name
-    :profile/get-profiles-overview-success
-    (user-journey-event app-started-event)
+(defn metrics-event
+  [{:keys [rf-event metrics-data]}]
+  (let [[rf-event-name rf-event-parameter] rf-event]
+    (case rf-event-name
+      :profile/get-profiles-overview-success
+      (user-journey-event app-started-event)
 
-    :centralized-metrics/toggle-centralized-metrics
-    (key-value-event "events.metrics-enabled" :enabled second-parameter)
+      :centralized-metrics/toggle-centralized-metrics
+      (key-value-event "events.metrics-enabled" :enabled rf-event-parameter)
 
-    :set-view-id
-    (track-view-id-event second-parameter)
+      :set-view-id
+      (track-view-id-event rf-event-parameter)
 
-    :wallet/select-account-tab
-    (when (= second-parameter :collectibles)
-      (navigated-to-collectibles-tab-event :account))
+      :wallet/select-account-tab
+      (when (= rf-event-parameter :collectibles)
+        (navigated-to-collectibles-tab-event :account))
 
-    :wallet/select-home-tab
-    (when (= second-parameter :collectibles)
-      (navigated-to-collectibles-tab-event :home))
+      :wallet/select-home-tab
+      (when (= rf-event-parameter :collectibles)
+        (navigated-to-collectibles-tab-event :home))
 
-    :wallet/flush-collectibles-fetched
-    (collectibles-fetched-event event-data)
+      :wallet/flush-collectibles-fetched
+      (collectibles-fetched-event metrics-data)
 
-    nil))
+      nil)))

Diff for: 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/metrics-event {:rf-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/metrics-event {:rf-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/metrics-event {:rf-event [:set-view-id :wallet-stack]})))
+    (is (nil? (tracking/metrics-event {:rf-event [:unknown-event]})))))