Bump Abacus, update AGP version and fix transfer fee display (#265)

dydxprotocol · Nov 5, 2024 · 39c27c1 · 39c27c1
1 parent 69f3832
commit 39c27c1
Show file tree

Hide file tree

Showing 15 changed files with 116 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext.ktlintVersion = '0.48.0'
     ext.kotlinVersion = '1.9.24'
-    ext.androidApplicationVersion = '8.7.1'
+    ext.androidApplicationVersion = '8.7.2'
 
     repositories {
         google()

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

diff --git a/v4/feature/receipt/src/main/java/exchange/dydx/trading/feature/receipt/DydxReceiptView.kt b/v4/feature/receipt/src/main/java/exchange/dydx/trading/feature/receipt/DydxReceiptView.kt
@@ -35,6 +35,7 @@ import exchange.dydx.trading.feature.receipt.components.expectedprice.DydxReceip
 import exchange.dydx.trading.feature.receipt.components.fee.DydxReceiptBridgeFeeView
 import exchange.dydx.trading.feature.receipt.components.fee.DydxReceiptFeeView
 import exchange.dydx.trading.feature.receipt.components.fee.DydxReceiptGasFeeView
+import exchange.dydx.trading.feature.receipt.components.fee.DydxReceiptTransferFeeView
 import exchange.dydx.trading.feature.receipt.components.isolatedmargin.DydxReceiptIsolatedPositionMarginUsageView
 import exchange.dydx.trading.feature.receipt.components.leverage.DydxReceiptPositionLeverageView
 import exchange.dydx.trading.feature.receipt.components.liquidationprice.DydxReceiptLiquidationPriceView
@@ -61,6 +62,7 @@ object DydxReceiptView : DydxComponent {
         Fee,
         GasFee,
         BridgeFee,
+        TransferFee,
         ExpectedPrice,
         Rewards,
         Equity,
@@ -193,6 +195,10 @@ object DydxReceiptView : DydxComponent {
                         ReceiptLineType.LiquidationPrice -> {
                             DydxReceiptLiquidationPriceView.Content(Modifier.animateItemPlacement())
                         }
+
+                        ReceiptLineType.TransferFee -> {
+                            DydxReceiptTransferFeeView.Content(Modifier.animateItemPlacement())
+                        }
                     }
                 }
 

diff --git a/...ature/receipt/src/main/java/exchange/dydx/trading/feature/receipt/DydxReceiptViewModel.kt b/...ature/receipt/src/main/java/exchange/dydx/trading/feature/receipt/DydxReceiptViewModel.kt
@@ -51,6 +51,7 @@ private fun ReceiptLine.toType(): DydxReceiptView.ReceiptLineType? {
         ReceiptLine.PositionMargin -> DydxReceiptView.ReceiptLineType.PositionMargin
         ReceiptLine.PositionLeverage -> DydxReceiptView.ReceiptLineType.PositionLeverage
         ReceiptLine.LiquidationPrice -> DydxReceiptView.ReceiptLineType.LiquidationPrice
+        ReceiptLine.TransferFee -> DydxReceiptView.ReceiptLineType.TransferFee
         ReceiptLine.Total -> null
         ReceiptLine.WalletBalance -> null
         ReceiptLine.CrossFreeCollateral -> null

diff --git a/...ge/dydx/trading/feature/receipt/components/buyingpower/DydxReceiptBuyingPowerViewModel.kt b/...ge/dydx/trading/feature/receipt/components/buyingpower/DydxReceiptBuyingPowerViewModel.kt
@@ -12,6 +12,7 @@ import exchange.dydx.trading.common.DydxViewModel
 import exchange.dydx.trading.common.formatter.DydxFormatter
 import exchange.dydx.trading.feature.receipt.ReceiptType
 import exchange.dydx.trading.feature.shared.views.AmountText
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -27,6 +28,7 @@ class DydxReceiptBuyingPowerViewModel @Inject constructor(
     private val receiptTypeFlow: Flow<@JvmSuppressWildcards ReceiptType?>,
 ) : ViewModel(), DydxViewModel {
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     val state: Flow<DydxReceiptBuyingPowerView.ViewState?> =
         receiptTypeFlow
             .flatMapLatest { receiptType ->
@@ -64,7 +66,7 @@ class DydxReceiptBuyingPowerViewModel @Inject constructor(
                 AmountText.ViewState(
                     localizer = localizer,
                     formatter = formatter,
-                    amount = position?.buyingPower?.current,
+                    amount = position.buyingPower.current,
                     tickSize = 0,
                     requiresPositive = true,
                 )
@@ -75,7 +77,7 @@ class DydxReceiptBuyingPowerViewModel @Inject constructor(
                 AmountText.ViewState(
                     localizer = localizer,
                     formatter = formatter,
-                    amount = position?.buyingPower?.postOrder,
+                    amount = position.buyingPower.postOrder,
                     tickSize = 0,
                     requiresPositive = true,
                 )
@@ -95,7 +97,7 @@ class DydxReceiptBuyingPowerViewModel @Inject constructor(
                 AmountText.ViewState(
                     localizer = localizer,
                     formatter = formatter,
-                    amount = subaccount?.buyingPower?.current,
+                    amount = subaccount.buyingPower?.current,
                     tickSize = 0,
                     requiresPositive = true,
                 )
@@ -106,7 +108,7 @@ class DydxReceiptBuyingPowerViewModel @Inject constructor(
                 AmountText.ViewState(
                     localizer = localizer,
                     formatter = formatter,
-                    amount = subaccount?.buyingPower?.postOrder,
+                    amount = subaccount.buyingPower?.postOrder,
                     tickSize = 0,
                     requiresPositive = true,
                 )

diff --git a/...ava/exchange/dydx/trading/feature/receipt/components/equity/DydxReceiptEquityViewModel.kt b/...ava/exchange/dydx/trading/feature/receipt/components/equity/DydxReceiptEquityViewModel.kt
@@ -36,7 +36,7 @@ class DydxReceiptEquityViewModel @Inject constructor(
                 AmountText.ViewState(
                     localizer = localizer,
                     formatter = formatter,
-                    amount = subaccount?.equity?.current,
+                    amount = subaccount.equity?.current,
                     tickSize = 2,
                 )
             } else {
@@ -46,7 +46,7 @@ class DydxReceiptEquityViewModel @Inject constructor(
                 AmountText.ViewState(
                     localizer = localizer,
                     formatter = formatter,
-                    amount = subaccount?.equity?.postOrder,
+                    amount = subaccount.equity?.postOrder,
                     tickSize = 2,
                 )
             } else {

diff --git a/...ading/feature/receipt/components/exchangereceived/DydxReceiptExchangeReceivedViewModel.kt b/...ading/feature/receipt/components/exchangereceived/DydxReceiptExchangeReceivedViewModel.kt
@@ -43,26 +43,26 @@ class DydxReceiptExchangeReceivedViewModel @Inject constructor(
         transferInput: TransferInput?
     ): String? {
         val exchangeRate = transferInput?.summary?.exchangeRate ?: return null
-        val type = transferInput?.type ?: return null
-        val token = transferInput?.token ?: return null
+        val type = transferInput.type ?: return null
+        val token = transferInput.token ?: return null
         val symbol =
-            transferInput?.resources?.tokenResources?.toMap()?.get(token)?.symbol ?: return null
+            transferInput.resources?.tokenResources?.toMap()?.get(token)?.symbol ?: return null
         when (type) {
             TransferType.deposit -> {
-                val usdcSize = transferInput?.summary?.usdcSize ?: return null
+                val usdcSize = transferInput.summary?.usdcSize ?: return null
                 val converted = formatter.raw(usdcSize, 2) ?: return null
                 return "$converted USDC"
             }
 
             TransferType.withdrawal -> {
-                val toAmount = transferInput?.summary?.toAmount
+                val toAmount = transferInput.summary?.toAmount
                 if (toAmount != null) {
-                    val decimals = transferInput?.resources?.tokenResources?.toMap()?.get(token)?.decimals ?: return null
+                    val decimals = transferInput.resources?.tokenResources?.toMap()?.get(token)?.decimals ?: return null
                     val size = toAmount.toDouble() / 10.0.pow(decimals)
                     val converted = formatter.raw(size, 4) ?: return null
                     return "$converted $symbol"
                 } else {
-                    val usdcSize = transferInput?.summary?.usdcSize ?: return null
+                    val usdcSize = transferInput.summary?.usdcSize ?: return null
                     if (exchangeRate > 0) {
                         val converted = formatter.raw(usdcSize * exchangeRate, 2) ?: return null
                         return "$converted $symbol"

diff --git a/...ydx/trading/feature/receipt/components/expectedprice/DydxReceiptExpectedPriceViewModel.kt b/...ydx/trading/feature/receipt/components/expectedprice/DydxReceiptExpectedPriceViewModel.kt
@@ -44,7 +44,7 @@ class DydxReceiptExpectedPriceViewModel @Inject constructor(
             title = localizer.localize("APP.TRADE.EXPECTED_PRICE"),
             value = if (tradeSummary?.price != null) {
                 formatter.dollar(
-                    tradeSummary?.price ?: 0.0,
+                    tradeSummary.price ?: 0.0,
                     market.configs?.displayTickSizeDecimals ?: 0,
                 )
             } else {

diff --git a/...main/java/exchange/dydx/trading/feature/receipt/components/fee/DydxReceiptFeeViewModel.kt b/...main/java/exchange/dydx/trading/feature/receipt/components/fee/DydxReceiptFeeViewModel.kt
@@ -32,9 +32,9 @@ class DydxReceiptFeeViewModel @Inject constructor(
             feeType = localizer.localize("APP.TRADE.TAKER"),
             feeFont = if (tradeSummary?.fee == null) {
                 null
-            } else if (tradeSummary?.fee ?: 0.0 > 0.0) {
+            } else if ((tradeSummary.fee ?: 0.0) > 0.0) {
                 DydxReceiptBaseFeeView.FeeFont.Number(
-                    formatter.dollar(tradeSummary?.fee ?: 0.0, 2) ?: "",
+                    formatter.dollar(tradeSummary.fee ?: 0.0, 2) ?: "",
                 )
             } else {
                 DydxReceiptBaseFeeView.FeeFont.String(localizer.localize("APP.GENERAL.FREE"))

diff --git a/...n/java/exchange/dydx/trading/feature/receipt/components/fee/DydxReceiptTransferFeeView.kt b/...n/java/exchange/dydx/trading/feature/receipt/components/fee/DydxReceiptTransferFeeView.kt
@@ -0,0 +1,34 @@
+package exchange.dydx.trading.feature.receipt.components.fee
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.hilt.navigation.compose.hiltViewModel
+import exchange.dydx.platformui.compose.collectAsStateWithLifecycle
+import exchange.dydx.platformui.theme.DydxThemedPreviewSurface
+import exchange.dydx.trading.common.component.DydxComponent
+import exchange.dydx.trading.feature.receipt.components.fee.DydxReceiptBaseFeeView.ViewState
+
+@Preview
+@Composable
+fun Preview_DydxReceiptTransferFeeView() {
+    DydxThemedPreviewSurface {
+        DydxReceiptTransferFeeView.Content(Modifier, ViewState.preview)
+    }
+}
+
+object DydxReceiptTransferFeeView : DydxReceiptBaseFeeView(), DydxComponent {
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val viewModel: DydxReceiptTransferFeeViewModel = hiltViewModel()
+
+        val state = viewModel.state.collectAsStateWithLifecycle(initialValue = null).value
+        Content(modifier, state)
+    }
+
+    @Composable
+    fun Content(modifier: Modifier, state: ViewState?) {
+        DydxReceiptBaseFeeView.Content(modifier, state)
+    }
+}
diff --git a/...a/exchange/dydx/trading/feature/receipt/components/fee/DydxReceiptTransferFeeViewModel.kt b/...a/exchange/dydx/trading/feature/receipt/components/fee/DydxReceiptTransferFeeViewModel.kt
@@ -0,0 +1,47 @@
+package exchange.dydx.trading.feature.receipt.components.fee
+
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import exchange.dydx.abacus.output.input.TransferInput
+import exchange.dydx.abacus.protocols.LocalizerProtocol
+import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
+import exchange.dydx.trading.common.DydxViewModel
+import exchange.dydx.trading.common.formatter.DydxFormatter
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+@HiltViewModel
+class DydxReceiptTransferFeeViewModel @Inject constructor(
+    private val localizer: LocalizerProtocol,
+    private val abacusStateManager: AbacusStateManagerProtocol,
+    private val formatter: DydxFormatter,
+) : ViewModel(), DydxViewModel {
+
+    val state: Flow<DydxReceiptBaseFeeView.ViewState?> =
+        abacusStateManager.state.transferInput
+            .map {
+                createViewState(it)
+            }
+            .distinctUntilChanged()
+
+    private fun createViewState(
+        transferInput: TransferInput?
+    ): DydxReceiptBaseFeeView.ViewState {
+        val gasFee = transferInput?.summary?.gasFee
+        return DydxReceiptBaseFeeView.ViewState(
+            localizer = localizer,
+            feeType = "Gas",
+            feeFont = if (gasFee == null) {
+                null
+            } else if (gasFee > 0.0) {
+                DydxReceiptBaseFeeView.FeeFont.Number(
+                    formatter.dollar(gasFee, 2) ?: "",
+                )
+            } else {
+                DydxReceiptBaseFeeView.FeeFont.String(localizer.localize("APP.GENERAL.FREE"))
+            },
+        )
+    }
+}
diff --git a/...x/trading/feature/receipt/components/freecollateral/DydxReceiptFreeCollateralViewModel.kt b/...x/trading/feature/receipt/components/freecollateral/DydxReceiptFreeCollateralViewModel.kt
@@ -9,6 +9,7 @@ import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel
 import exchange.dydx.trading.common.formatter.DydxFormatter
 import exchange.dydx.trading.feature.shared.views.AmountText
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -24,6 +25,7 @@ class DydxReceiptFreeCollateralViewModel @Inject constructor(
     private val formatter: DydxFormatter,
 ) : ViewModel(), DydxViewModel {
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     val state: Flow<DydxReceiptFreeCollateralView.ViewState?> =
         abacusStateManager.marketId
             .filterNotNull()

diff --git a/...ture/receipt/components/isolatedmargin/DydxReceiptIsolatedPositionMarginUsageViewModel.kt b/...ture/receipt/components/isolatedmargin/DydxReceiptIsolatedPositionMarginUsageViewModel.kt
@@ -8,6 +8,7 @@ import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel
 import exchange.dydx.trading.common.formatter.DydxFormatter
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -24,6 +25,7 @@ class DydxReceiptIsolatedPositionMarginUsageViewModel @Inject constructor(
     private val formatter: DydxFormatter,
 ) : ViewModel(), DydxViewModel {
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     val state: Flow<DydxReceiptIsolatedPositionMarginUsageView.ViewState?> =
         abacusStateManager.marketId
             .filterNotNull()

diff --git a/.../dydx/trading/feature/receipt/components/leverage/DydxReceiptPositionLeverageViewModel.kt b/.../dydx/trading/feature/receipt/components/leverage/DydxReceiptPositionLeverageViewModel.kt
@@ -9,6 +9,7 @@ import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel
 import exchange.dydx.trading.common.formatter.DydxFormatter
 import exchange.dydx.trading.feature.shared.views.LeverageView
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -24,6 +25,7 @@ class DydxReceiptPositionLeverageViewModel @Inject constructor(
     private val formatter: DydxFormatter,
 ) : ViewModel(), DydxViewModel {
 
+    @OptIn(ExperimentalCoroutinesApi::class)
     val state: Flow<DydxReceiptPositionLeverageView.ViewState?> =
         abacusStateManager.marketId
             .filterNotNull()

diff --git a/...ge/dydx/trading/feature/receipt/components/marginusage/DydxReceiptMarginUsageViewModel.kt b/...ge/dydx/trading/feature/receipt/components/marginusage/DydxReceiptMarginUsageViewModel.kt
@@ -37,7 +37,7 @@ class DydxReceiptMarginUsageViewModel @Inject constructor(
                 MarginUsageView.ViewState(
                     localizer = localizer,
                     displayOption = MarginUsageView.DisplayOption.IconAndValue,
-                    percent = subaccount?.marginUsage?.current ?: 0.0,
+                    percent = subaccount.marginUsage?.current ?: 0.0,
                 )
             } else {
                 null
@@ -46,7 +46,7 @@ class DydxReceiptMarginUsageViewModel @Inject constructor(
                 MarginUsageView.ViewState(
                     localizer = localizer,
                     displayOption = MarginUsageView.DisplayOption.IconAndValue,
-                    percent = subaccount?.marginUsage?.postOrder ?: 0.0,
+                    percent = subaccount.marginUsage?.postOrder ?: 0.0,
                 )
             } else {
                 null