Fix CCTP status not showing up correctly. (#279)

The hash returned can be uppercased(), while the downstream code expects lowercase. Also bumping Abacus
dydxprotocol · Dec 6, 2024 · 41c7f7d · 41c7f7d
1 parent 35908e6
commit 41c7f7d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/v4/build.gradle b/v4/build.gradle
@@ -88,7 +88,7 @@ ext {
     compileSdkVersion = 34
 
     // App dependencies
-    abacusVersion = '1.13.39'
+    abacusVersion = '1.13.40'
     carteraVersion = '0.1.15'
     kollectionsVersion = '2.0.16'
 

diff --git a/...main/java/exchange/dydx/trading/feature/shared/viewstate/SharedMarketPositionViewState.kt b/...main/java/exchange/dydx/trading/feature/shared/viewstate/SharedMarketPositionViewState.kt
@@ -112,9 +112,11 @@ data class SharedMarketPositionViewState(
                     configs.displayStepSizeDecimals ?: 1,
                 ),
                 notionalTotal = formatter.dollar(notionalTotal, 2),
-                token = TokenTextView.ViewState(
-                    symbol = asset?.displayableAssetId ?: market.assetId,
-                ),
+                token = asset?.displayableAssetId?.let {
+                    TokenTextView.ViewState(
+                        symbol = it,
+                    )
+                },
                 side = SideTextView.ViewState(
                     localizer = localizer,
                     coloringOption = SideTextView.ColoringOption.WITH_BACKGROUND,

diff --git a/.../java/exchange/dydx/trading/feature/transfer/deposit/DydxTransferDepositCtaButtonModel.kt b/.../java/exchange/dydx/trading/feature/transfer/deposit/DydxTransferDepositCtaButtonModel.kt
@@ -158,7 +158,7 @@ class DydxTransferDepositCtaButtonModel @Inject constructor(
                 ).runWithLogs()
 
             isSubmittingFlow.value = false
-            val hash = event.getOrNull()
+            val hash = event.getOrNull()?.lowercase()
             if (hash != null) {
                 sendOnboardingAnalytics()
                 transferAnalytics.logDeposit(transferInput)

diff --git a/.../java/exchange/dydx/trading/feature/transfer/transferout/DydxTransferOutCtaButtonModel.kt b/.../java/exchange/dydx/trading/feature/transfer/transferout/DydxTransferOutCtaButtonModel.kt
@@ -207,7 +207,7 @@ class DydxTransferOutCtaButtonModel @Inject constructor(
                 }
             }
 
-            val hash = transferResult.getOrNull()
+            val hash = transferResult.getOrNull()?.lowercase()
             if (hash != null) {
                 abacusStateManager.resetTransferInputFields()
                 transferInstanceStore.addTransferHash(

diff --git a/...exchange/dydx/trading/feature/transfer/withdrawal/DydxTransferWithdrawalCtaButtonModel.kt b/...exchange/dydx/trading/feature/transfer/withdrawal/DydxTransferWithdrawalCtaButtonModel.kt
@@ -183,7 +183,7 @@ class DydxTransferWithdrawalCtaButtonModel @Inject constructor(
                 }
             }
 
-            val hash = withdrawResult.getOrNull()
+            val hash = withdrawResult.getOrNull()?.lowercase()
             if (hash != null) {
                 transferAnalytics.logWithdrawal(transferInput)
                 transferInstanceStore.addTransferHash(