Add vault legal text (#263)

![Screenshot_1730398523](https://github.com/user-attachments/assets/de934833-8677-45f7-a541-8ed7a814fbca) Also adding the order cancellation reason: ![Screenshot_1730158037](https://github.com/user-attachments/assets/809cd97b-da70-4bd3-8e63-d644dedb5c86)
dydxprotocol · Oct 31, 2024 · e892dfc · e892dfc
1 parent f32b14f
commit e892dfc
Show file tree

Hide file tree

Showing 13 changed files with 5,873 additions and 4,207 deletions.
diff --git a/scripts/update_client_api.sh b/scripts/update_client_api.sh
@@ -30,7 +30,11 @@ if [ $? -ne 0 ]; then
     exit 1
 fi
 
+source ~/.zprofile
+
 # Running npm commands
+nvm install
+nvm use
 npm install
 npm run build
 npm run webpack

diff --git a/v4/build.gradle b/v4/build.gradle
@@ -88,7 +88,7 @@ ext {
     compileSdkVersion = 34
 
     // App dependencies
-    abacusVersion = '1.13.14'
+    abacusVersion = '1.13.17'
     carteraVersion = '0.1.15'
     kollectionsVersion = '2.0.16'
 

diff --git a/v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRoutes.kt b/v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRoutes.kt
@@ -75,4 +75,5 @@ object VaultRoutes {
     const val withdraw = "vault/withdraw"
     const val confirmation = "vault/confirmation"
     const val history = "vault/history"
+    const val tos = "vault/tos"
 }
diff --git a/...rc/main/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsView.kt b/...rc/main/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsView.kt
@@ -18,6 +18,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -162,7 +163,7 @@ object DydxOrderDetailsView : DydxComponent {
                         .padding(vertical = 16.dp)
                         .padding(horizontal = ThemeShapes.HorizontalPadding),
                     verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween,
+                    horizontalArrangement = Arrangement.spacedBy(ThemeShapes.HorizontalPadding),
                 ) {
                     Text(
                         text = item.title ?: "",
@@ -171,6 +172,8 @@ object DydxOrderDetailsView : DydxComponent {
                             .themeFont(fontSize = ThemeFont.FontSize.small),
                     )
 
+                    Spacer(modifier = Modifier.weight(1f))
+
                     when (val value = item.value) {
                         is Item.ItemValue.Number -> {
                             Text(
@@ -185,6 +188,7 @@ object DydxOrderDetailsView : DydxComponent {
                                 text = value.value ?: "-",
                                 style = TextStyle.dydxDefault
                                     .themeColor(ThemeColor.SemanticColor.text_primary),
+                                textAlign = TextAlign.End,
                             )
                         }
                         is Item.ItemValue.Checkmark -> {

diff --git a/...in/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsViewModel.kt b/...in/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsViewModel.kt
@@ -248,16 +248,39 @@ class DydxOrderDetailsViewModel @Inject constructor(
                     ),
                 ),
                 DydxOrderDetailsView.Item(
-                    title = localizer.localize("APP.TRADE.TIME_IN_FORCE"),
+                    title = localizer.localize("APP.TRADE.GOOD_TIL"),
                     value = DydxOrderDetailsView.Item.ItemValue.StringValue(
-                        order.resources.timeInForceString ?: order.resources.timeInForceStringKey?.let {
-                            localizer.localize(
-                                it,
-                            )
+                        order.goodTilBlock?.toLong()?.let {
+                            "$it"
                         },
                     ),
                 ),
-            ),
+                DydxOrderDetailsView.Item(
+                    title = localizer.localize("APP.TRADE.TIME_IN_FORCE"),
+                    value = DydxOrderDetailsView.Item.ItemValue.StringValue(
+                        order.resources.timeInForceString
+                            ?: order.resources.timeInForceStringKey?.let {
+                                localizer.localize(
+                                    it,
+                                )
+                            },
+                    ),
+                ),
+                if (order.cancelReason != null) {
+                    DydxOrderDetailsView.Item(
+                        title = localizer.localize("APP.TRADE.CANCEL_REASON"),
+                        value = DydxOrderDetailsView.Item.ItemValue.StringValue(
+                            order.cancelReason?.let {
+                                localizer.localize(
+                                    "APP.TRADE.$it",
+                                )
+                            },
+                        ),
+                    )
+                } else {
+                    null
+                },
+            ).filterNotNull(),
         )
     }
 

diff --git a/...rc/main/java/exchange/dydx/trading/feature/trade/margin/DydxAdjustMarginInputViewModel.kt b/...rc/main/java/exchange/dydx/trading/feature/trade/margin/DydxAdjustMarginInputViewModel.kt
@@ -111,21 +111,21 @@ class DydxAdjustMarginInputViewModel @Inject constructor(
         when (input.type) {
             Add -> {
                 if (summary.crossFreeCollateral != null && amount.toDouble() >= summary.crossFreeCollateral!!) {
-                    return localizer.localize("APP.ERRORS.TRANSFER_MODAL.TRANSFER_MORE_THAN_FREE")
+                    return localizer.localize("ERRORS.TRANSFER_MODAL.TRANSFER_MORE_THAN_FREE")
                 }
                 if (summary.crossMarginUsage != null && summary.crossMarginUsage!! > 1.0) {
-                    return localizer.localize("APP.ERRORS.TRADE_BOX.INVALID_NEW_ACCOUNT_MARGIN_USAGE")
+                    return localizer.localize("ERRORS.TRADE_BOX.INVALID_NEW_ACCOUNT_MARGIN_USAGE")
                 }
             }
             Remove -> {
                 if (summary.positionLeverageUpdated != null && summary.positionLeverageUpdated!! > marketMaxLeverage) {
-                    return localizer.localize("APP.ERRORS.TRADE_BOX.POSITION_LEVERAGE_OVER_MAX")
+                    return localizer.localize("ERRORS.TRADE_BOX.POSITION_LEVERAGE_OVER_MAX")
                 }
                 if (marginUsage != null && marginUsage > 1) {
-                    return localizer.localize("APP.ERRORS.TRADE_BOX.INVALID_NEW_ACCOUNT_MARGIN_USAGE")
+                    return localizer.localize("ERRORS.TRADE_BOX.INVALID_NEW_ACCOUNT_MARGIN_USAGE")
                 }
                 if (freeCollateral != null && amount.toDouble() > freeCollateral) {
-                    return localizer.localize("APP.ERRORS.TRANSFER_MODAL.TRANSFER_MORE_THAN_FREE")
+                    return localizer.localize("ERRORS.TRANSFER_MODAL.TRANSFER_MORE_THAN_FREE")
                 }
             }
         }

diff --git a/v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TradeStream.kt b/v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TradeStream.kt
@@ -55,7 +55,7 @@ class TradeStream @Inject constructor(
             .distinctUntilChanged()
 
     override fun submitTrade() {
-        if (abacusStateManager.state.tradeInput != null) {
+        if (abacusStateManager.state.tradeInput.value != null) {
             _submissionStatus.update { null }
 
             abacusStateManager.placeOrder { submissionStatus ->
@@ -68,7 +68,7 @@ class TradeStream @Inject constructor(
     }
 
     override fun closePosition() {
-        if (abacusStateManager.state.closePositionInput != null) {
+        if (abacusStateManager.state.closePositionInput.value != null) {
             _submissionStatus.update { null }
 
             abacusStateManager.closePosition { submissionStatus ->

diff --git a/...c/main/java/exchange/dydx/trading/feature/transfer/transferout/DydxTransferOutUSDCStep.kt b/...c/main/java/exchange/dydx/trading/feature/transfer/transferout/DydxTransferOutUSDCStep.kt
@@ -32,9 +32,10 @@ class DydxTransferOutUSDCStep(
         val recipient = transferInput.address ?: return invalidInputEvent
 
         if (usdcBalanceInWallet > gasFee) {
-            val payload: Map<String, Any> = mapOf(
+            val payload: Map<String, Any?> = mapOf(
                 "subaccountNumber" to subaccountNumber,
                 "amount" to amount,
+                "memo" to transferInput.memo,
                 "recipient" to recipient,
             )
             val paramsInJson = payload.toJson()

diff --git a/v4/feature/vault/src/main/java/exchange/dydx/trading/feature/vault/DydxVaultRouter.kt b/v4/feature/vault/src/main/java/exchange/dydx/trading/feature/vault/DydxVaultRouter.kt
@@ -11,6 +11,7 @@ import exchange.dydx.trading.feature.vault.DydxVaultView
 import exchange.dydx.trading.feature.vault.depositwithdraw.DydxVaultDepositWithdrawView
 import exchange.dydx.trading.feature.vault.depositwithdraw.confirmation.DydxVaultConfirmationView
 import exchange.dydx.trading.feature.vault.history.DydxVaultHistoryView
+import exchange.dydx.trading.feature.vault.tos.DydxVaultTosView
 import exchange.dydx.utilities.utils.Logging
 
 fun NavGraphBuilder.vaultGraph(
@@ -58,4 +59,12 @@ fun NavGraphBuilder.vaultGraph(
     ) { navBackStackEntry ->
         DydxVaultHistoryView.Content(Modifier)
     }
+
+    dydxComposable(
+        router = appRouter,
+        route = VaultRoutes.tos,
+        deepLinks = appRouter.deeplinks(VaultRoutes.tos),
+    ) { navBackStackEntry ->
+        DydxVaultTosView.Content(Modifier)
+    }
 }
diff --git a/.../src/main/java/exchange/dydx/trading/feature/vault/components/DydxVaultHeaderViewModel.kt b/.../src/main/java/exchange/dydx/trading/feature/vault/components/DydxVaultHeaderViewModel.kt
@@ -6,6 +6,7 @@ import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel
 import exchange.dydx.trading.common.navigation.DydxRouter
+import exchange.dydx.trading.common.navigation.VaultRoutes
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 import javax.inject.Inject
@@ -24,10 +25,10 @@ class DydxVaultHeaderViewModel @Inject constructor(
             localizer = localizer,
             dydxChainLogoUrl = abacusStateManager.environment?.chainLogo,
             learnMoreAction = {
-                val url = abacusStateManager.environment?.links?.vaultLearnMore
-                if (url != null) {
-                    router.navigateTo(url)
-                }
+                router.navigateTo(
+                    route = VaultRoutes.tos,
+                    presentation = DydxRouter.Presentation.Modal,
+                )
             },
         )
     }