Fixing a race condition of incentive points display (#801)

Author: ruixhuang

build.gradle.kts

@@ -52,7 +52,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.12.73"
+version = "1.12.74"
 
 repositories {
     google()

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/manager/StateManagerAdaptorV2.kt

@@ -149,26 +149,29 @@ internal class StateManagerAdaptorV2(
         delegate = this,
     )
 
-    private val system = SystemSupervisor(
+    private val accounts = AccountsSupervisor(
         stateMachine = stateMachine,
         helper = networkHelper,
         analyticsUtils = analyticsUtils,
-        configs = appConfigs.systemConfigs,
+        configs = appConfigs.accountConfigs,
+        screening = appConfigs.screening,
     )
 
-    private val onboarding = OnboardingSupervisor(
+    private val system = SystemSupervisor(
         stateMachine = stateMachine,
         helper = networkHelper,
         analyticsUtils = analyticsUtils,
-        configs = appConfigs.onboardingConfigs,
+        configs = appConfigs.systemConfigs,
+        incentiveSeasonReceived = {
+            accounts.currentIncentiveSeason = it
+        },
     )
 
-    private val accounts = AccountsSupervisor(
+    private val onboarding = OnboardingSupervisor(
         stateMachine = stateMachine,
         helper = networkHelper,
         analyticsUtils = analyticsUtils,
-        configs = appConfigs.accountConfigs,
-        screening = appConfigs.screening,
+        configs = appConfigs.onboardingConfigs,
     )
 
     private val markets = MarketsSupervisor(

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/AccountSupervisor.kt

@@ -84,6 +84,14 @@ internal open class AccountSupervisor(
 ) : DynamicNetworkSupervisor(stateMachine, helper, analyticsUtils) {
     val subaccounts = mutableMapOf<Int, SubaccountSupervisor>()
 
+    var currentIncentiveSeason: String? = null
+        set(value) {
+            if (field != value) {
+                field = value
+                retrieveLaunchIncentivePoints()
+            }
+        }
+
     private val accountBalancePollingDuration = 10.0
     private var accountBalancesTimer: LocalTimerProtocol? = null
         set(value) {

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/AccountsSupervisor.kt

@@ -46,6 +46,16 @@ internal class AccountsSupervisor(
     private var pushNotificationToken: String? = null
     private var pushNotificationLanguageCode: String? = null
 
+    var currentIncentiveSeason: String? = null
+        set(value) {
+            if (field != value) {
+                field = value
+                for (account in accounts.values) {
+                    account.currentIncentiveSeason = value
+                }
+            }
+        }
+
     internal var historicalPnlPeriod: HistoricalPnlPeriod
         get() {
             return when (stateMachine.historicalPnlDays) {

src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SystemSupervisor.kt

@@ -24,6 +24,7 @@ internal class SystemSupervisor(
     helper: NetworkHelper,
     analyticsUtils: AnalyticsUtils,
     internal val configs: SystemConfigs,
+    private val incentiveSeasonReceived: (String?) -> Unit,
 ) : NetworkSupervisor(stateMachine, helper, analyticsUtils) {
     override fun didSetReadyToConnect(readyToConnect: Boolean) {
         super.didSetReadyToConnect(readyToConnect)
@@ -178,7 +179,7 @@ internal class SystemSupervisor(
                     val oldState = stateMachine.state
                     update(stateMachine.launchIncentiveSeasons(response), oldState)
 
-//                    retrieveLaunchIncentivePoints()
+                    incentiveSeasonReceived(stateMachine.state?.launchIncentive?.currentSeason)
                 }
             }
         }

v4_abacus.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.12.73'
+    spec.version                  = '1.12.74'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''