From f089212a3d763f4e68a65e7818d8705ca37ff987 Mon Sep 17 00:00:00 2001
From: Rui <rui@dydx.exchange>
Date: Wed, 27 Mar 2024 20:39:00 -0700
Subject: [PATCH] Optimiazation

---
 .../feature/workers/globalworkers/DydxUserTrackingWorker.kt   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/globalworkers/DydxUserTrackingWorker.kt b/v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/globalworkers/DydxUserTrackingWorker.kt
index 31639550..9d3dccea 100644
--- a/v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/globalworkers/DydxUserTrackingWorker.kt
+++ b/v4/feature/workers/src/main/java/exchange/dydx/trading/feature/workers/globalworkers/DydxUserTrackingWorker.kt
@@ -10,6 +10,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 
 class DydxUserTrackingWorker(
@@ -49,11 +50,12 @@ class DydxUserTrackingWorker(
                 .launchIn(scope)
 
             abacusStateManager.state.selectedSubaccount
+                .map { it?.subaccountNumber }
                 .distinctUntilChanged()
                 .onEach {
                     tracker.setUserProperties(
                         mapOf(
-                            UserProperty.subaccountNumber.rawValue to it?.subaccountNumber.let { subaccountNumber -> subaccountNumber?.toString() },
+                            UserProperty.subaccountNumber.rawValue to it?.let { subaccountNumber -> subaccountNumber?.toString() },
                         ),
                     )
                 }