Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/mob 498 integration target leverage #103

Merged
merged 5 commits into from
May 15, 2024
Merged

Feature/mob 498 integration target leverage #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
751e48e
UX working
johnqh May 14, 2024
bd902a7
Sync up text formatting
johnqh May 14, 2024
6b10cc0
Update Abacus
johnqh May 15, 2024
a008257
Merge branch 'feature/update-abacus-1-7-16' into feature/MOB-498-inte…
johnqh May 15, 2024
ffc1a59
compile issue
johnqh May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions v4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ subprojects {
ignoreFailures = true
}
}

}

// Define versions in a single place
Expand All @@ -89,7 +88,7 @@ ext {
compileSdkVersion = 34

// App dependencies
abacusVersion = '1.7.10'
abacusVersion = '1.7.16'
carteraVersion = '0.1.13'
kollectionsVersion = '2.0.16'

Expand Down
1 change: 1 addition & 0 deletions ...nge/dydx/trading/feature/market/marketinfo/components/prices/DydxMarketPricesViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.filterNotNull
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.stateIn
import timber.log.Timber
import java.time.Instant
import java.time.temporal.ChronoUnit
import javax.inject.Inject
Expand Down
24 changes: 17 additions & 7 deletions ...n/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputTargetLeverageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import exchange.dydx.trading.feature.shared.scaffolds.InputFieldScaffold
import exchange.dydx.trading.feature.shared.views.HeaderViewCloseBotton
import exchange.dydx.trading.feature.shared.views.LabeledTextInput

data class LeverageTextAndValue(val text: String, val value: Double)
data class LeverageTextAndValue(val text: String, val value: String)

@Preview
@Composable
Expand All @@ -55,6 +55,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
val localizer: LocalizerProtocol,
val leverageText: String?,
val leverageOptions: List<LeverageTextAndValue>?,
val selectAction: ((String) -> Unit)? = null,
val closeAction: (() -> Unit)? = null,
) {
companion object {
Expand Down Expand Up @@ -185,7 +186,11 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
localizer = MockLocalizer(),
label = state?.localizer?.localize("APP.TRADE.TARGET_LEVERAGE"),
value = state?.leverageText ?: "",
onValueChanged = {},
onValueChanged = {
state?.selectAction?.invoke(
it,
)
},
),
)
}
Expand All @@ -198,7 +203,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
state: ViewState?
) {
Row(
modifier = Modifier
modifier = modifier
.padding(
horizontal = ThemeShapes.HorizontalPadding,
vertical = 8.dp,
Expand All @@ -213,7 +218,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
items = state?.leverageOptions?.map {
{ modifier ->
PlatformPillItem(
modifier = Modifier
modifier = modifier
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be modifier = Modifier

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it is not. the modifier is passed in from PlatformTabGroup, contains the tap handler. Tapping doesn't work without it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh.. I see.

.padding(
vertical = 4.dp,
horizontal = 8.dp,
Expand All @@ -234,7 +239,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
selectedItems = state?.leverageOptions?.map {
{ modifier ->
PlatformPillItem(
modifier = Modifier
modifier = modifier
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

.padding(
vertical = 4.dp,
horizontal = 8.dp,
Expand All @@ -254,9 +259,13 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
} ?: listOf(),
equalWeight = false,
currentSelection = state?.leverageOptions?.indexOfFirst {
it.text == state.leverageText
it.value.toDouble() == state.leverageText?.toDouble()
},
onSelectionChanged = { it ->
state?.leverageOptions?.get(it)?.value?.let { value ->
state.selectAction?.invoke(value)
}
},
onSelectionChanged = {},
)
}
}
Expand All @@ -276,6 +285,7 @@ object DydxTradeInputTargetLeverageView : DydxComponent {
text = state?.localizer?.localize("APP.TRADE.CONFIRM_LEVERAGE"),
state = PlatformButtonState.Primary,
) {
state?.closeAction?.invoke()
}
}
}
63 changes: 43 additions & 20 deletions ...a/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputTargetLeverageViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import exchange.dydx.abacus.output.input.TradeInput
import exchange.dydx.abacus.protocols.LocalizerProtocol
import exchange.dydx.abacus.state.model.TradeInputField
import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
import exchange.dydx.platformui.components.PlatformInfo
import exchange.dydx.trading.common.DydxViewModel
import exchange.dydx.trading.common.formatter.DydxFormatter
import exchange.dydx.trading.common.navigation.DydxRouter
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import javax.inject.Inject

@HiltViewModel
Expand All @@ -22,43 +24,64 @@ class DydxTradeInputTargetLeverageViewModel @Inject constructor(
private val formatter: DydxFormatter,
val platformInfo: PlatformInfo,
) : ViewModel(), DydxViewModel {
var targetLeverage: MutableStateFlow<String?> = MutableStateFlow(null)

val state: Flow<DydxTradeInputTargetLeverageView.ViewState?> =
abacusStateManager.state.tradeInput
.map {
createViewState(it)
}
combine(
abacusStateManager.state.tradeInput,
targetLeverage,
) { selectedSubaccountPosition, marketAndAsset ->
createViewState(selectedSubaccountPosition, marketAndAsset)
}
.distinctUntilChanged()

private fun createViewState(tradeInput: TradeInput?): DydxTradeInputTargetLeverageView.ViewState {
val targetLeverage = tradeInput?.targetLeverage ?: 1.0
private fun createViewState(
tradeInput: TradeInput?,
targetLeverage: String?
): DydxTradeInputTargetLeverageView.ViewState {
val maxLeverage = tradeInput?.options?.maxLeverage ?: 5.0
val leverages = leverageOptions(maxLeverage)
return DydxTradeInputTargetLeverageView.ViewState(
localizer = localizer,
leverageText = formatter.localFormatted(targetLeverage, 1),
leverageText = targetLeverage ?: (
tradeInput?.targetLeverage?.let {
"$it"
}
) ?: "2.0",
leverageOptions = leverages,
selectAction = { leverage ->
this.targetLeverage.value = leverage
},
closeAction = {
targetLeverage.let {
abacusStateManager.trade("$it", TradeInputField.targetLeverage)
}
router.navigateBack()
},
)
}

private fun leverageOptions(max: Double): List<LeverageTextAndValue> {
val steps = listOf(1.0, 2.0, 5.0, 10.0)
val leverages = mutableListOf<LeverageTextAndValue>()
if (max > 1.0) {
leverages.add(LeverageTextAndValue("1.0", 1.0))
}
if (max > 2.0) {
leverages.add(LeverageTextAndValue("2.0", 2.0))
}
if (max > 5.0) {
leverages.add(LeverageTextAndValue("5.0", 2.0))
}
if (max > 10.0) {
leverages.add(LeverageTextAndValue("10.0", 2.0))
for (step in steps) {
if (max > step) {
leverages.add(leverageTextAndValue(step))
}
}
leverages.add(LeverageTextAndValue(localizer.localize("APP.GENERAL.MAX"), max))
leverages.add(
LeverageTextAndValue(
localizer.localize("APP.GENERAL.MAX"),
formatter.raw(max) ?: "",
),
)
return leverages
}

private fun leverageTextAndValue(value: Double): LeverageTextAndValue {
return LeverageTextAndValue(
formatter.leverage(value, 1) ?: "",
formatter.raw(value) ?: "",
)
}
}
10 changes: 4 additions & 6 deletions ...e/src/main/java/exchange/dydx/trading/feature/trade/tradeinput/DydxTradeInputViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ class DydxTradeInputViewModel @Inject constructor(
),
isIsolatedMarketEnabled = featureFlags.isFeatureEnabled(DydxFeatureFlag.enable_isolated_market),
isIsolatedMarketSelected = tradeInput?.marginMode == MarginMode.isolated,
isolatedMarketTargetLeverageText = tradeInput?.targetLeverage?.let {
formatter.leverage(
it,
2,
)
} ?: "2x",
isolatedMarketTargetLeverageText = formatter.leverage(
(tradeInput?.targetLeverage ?: 2.0),
1,
),
orderbookToggleState = orderbookToggleState,
requestedBottomSheetState = buttomSheetState,
onMarketType = {
Expand Down
Loading