Merge branch 'develop' into feature/x-request-id

gradle.properties

@@ -7,21 +7,19 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+
+org.gradle.parallel=true
+org.gradle.caching=true
+
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Manually configure analysis per project
 dependency.analysis.autoapply=false
 systemProp.dependency.analysis.test.analysis=false
 
-
 android.enableR8.fullMode = false

v4/integration/dydxStateManager/src/main/java/exchange/dydx/dydxstatemanager/AbacusStateManager.kt

@@ -37,6 +37,7 @@ import exchange.dydx.dydxstatemanager.clientState.transfers.DydxTransferStateMan
 import exchange.dydx.dydxstatemanager.clientState.wallets.DydxWalletInstance
 import exchange.dydx.dydxstatemanager.clientState.wallets.DydxWalletStateManagerProtocol
 import exchange.dydx.dydxstatemanager.protocolImplementations.UIImplementationsExtensions
+import exchange.dydx.trading.common.R
 import exchange.dydx.trading.common.featureflags.DydxFeatureFlag
 import exchange.dydx.trading.common.featureflags.DydxFeatureFlags
 import exchange.dydx.trading.integration.cosmos.CosmosV4ClientProtocol
@@ -134,8 +135,8 @@ class AbacusStateManager @Inject constructor(
             deployment = "MAINNET"
             appConfigs = AppConfigs.forApp
         } else {
-            deployment = "DEV"
-            appConfigs = if (BuildConfig.DEBUG) AppConfigs.forAppDebug else AppConfigs.forApp
+            deployment = context.getString(R.string.app_deployment)
+            appConfigs = if (BuildConfig.DEBUG && deployment != "MAINNET") AppConfigs.forAppDebug else AppConfigs.forApp
         }
 
         appConfigs.squidVersion = AppConfigs.SquidVersion.V2
@@ -171,7 +172,7 @@ class AbacusStateManager @Inject constructor(
             if (!urlOverride.isNullOrEmpty()) {
                 return urlOverride
             } else {
-                return "https://" + context.getString(exchange.dydx.trading.common.R.string.app_web_host)
+                return "https://" + context.getString(R.string.app_web_host)
             }
         }