MOB-445 Add TP | SL button to market info page when there are open positions for the market

v4/common/src/main/java/exchange/dydx/trading/common/navigation/DydxRoutes.kt

@@ -12,6 +12,7 @@ object OnboardingRoutes {
 object PortfolioRoutes {
     const val main = "portfolio"
     const val order_details = "orders"
+    const val orders = "portfolio/orders"
 }
 
 object ProfileRoutes {

v4/feature/market/src/main/java/exchange/dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionButtonsView.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -58,13 +59,15 @@ object DydxMarketPositionButtonsView : DydxComponent {
         val triggerPrice: String? = null,
         val limitPrice: String? = null,
         val sizePercent: String? = null,
+        val hasMultipleOrders: Boolean = false,
     ) {
         companion object {
             val preview = TriggerViewState(
                 label = "TP",
                 triggerPrice = "$120.0",
                 limitPrice = "$110.0",
                 sizePercent = "10%",
+                hasMultipleOrders = false,
             )
         }
     }
@@ -201,11 +204,13 @@ object DydxMarketPositionButtonsView : DydxComponent {
             Column(
                 modifier = Modifier
                     .clickable { action() }
-                    .padding(8.dp),
+                    .padding(vertical = ThemeShapes.VerticalPadding),
                 verticalArrangement = Arrangement.spacedBy(ThemeShapes.VerticalPadding),
             ) {
                 Row(
-                    modifier = Modifier,
+                    modifier = Modifier
+                        .defaultMinSize(minHeight = 36.dp)
+                        .padding(horizontal = ThemeShapes.HorizontalPadding),
                     horizontalArrangement = Arrangement.spacedBy(8.dp),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
@@ -218,20 +223,30 @@ object DydxMarketPositionButtonsView : DydxComponent {
 
                     Spacer(modifier = Modifier.weight(1f))
 
-                    Text(
-                        modifier = Modifier,
-                        text = state.triggerPrice ?: "",
-                        style = TextStyle.dydxDefault
-                            .themeFont(fontSize = ThemeFont.FontSize.medium)
-                            .themeColor(ThemeColor.SemanticColor.text_primary),
-                    )
+                    if (state.hasMultipleOrders) {
+                        Text(
+                            text = localizer.localize("APP.GENERAL.MULTIPLE"),
+                            style = TextStyle.dydxDefault
+                                .themeFont(fontSize = ThemeFont.FontSize.medium)
+                                .themeColor(ThemeColor.SemanticColor.text_secondary),
+                        )
+                    } else {
+                        Text(
+                            modifier = Modifier,
+                            text = state.triggerPrice ?: "",
+                            style = TextStyle.dydxDefault
+                                .themeFont(fontSize = ThemeFont.FontSize.medium)
+                                .themeColor(ThemeColor.SemanticColor.text_primary),
+                        )
+                    }
                 }
 
-                if (state.limitPrice != null || state.sizePercent != null) {
+                if (!state.hasMultipleOrders && (state.limitPrice != null || state.sizePercent != null)) {
                     PlatformDivider()
 
                     Row(
-                        modifier = Modifier,
+                        modifier = Modifier
+                            .padding(horizontal = ThemeShapes.HorizontalPadding),
                         horizontalArrangement = Arrangement.spacedBy(8.dp),
                         verticalAlignment = Alignment.CenterVertically,
                     ) {

v4/feature/market/src/main/java/exchange/dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionButtonsViewModel.kt

@@ -69,31 +69,30 @@ class DydxMarketPositionButtonsViewModel @Inject constructor(
                     presentation = DydxRouter.Presentation.Modal,
                 )
             },
-            takeProfitTrigger = takeProfitOrders?.firstOrNull()?.let {
-                createTriggerViewState(
-                    label = "TP",
-                    position = position,
-                    order = it,
-                    configsAndAsset = configsAndAsset,
-                )
-            },
-            stopLossTrigger = stopLossOrders?.firstOrNull()?.let {
-                createTriggerViewState(
-                    label = "SL",
-                    position = position,
-                    order = it,
-                    configsAndAsset = configsAndAsset,
-                )
-            },
+            takeProfitTrigger = createTriggerViewState(
+                label = "TP",
+                position = position,
+                orders = takeProfitOrders,
+                configsAndAsset = configsAndAsset,
+            ),
+            stopLossTrigger = createTriggerViewState(
+                label = "SL",
+                position = position,
+                orders = stopLossOrders,
+                configsAndAsset = configsAndAsset,
+            ),
         )
     }
 
     private fun createTriggerViewState(
         label: String,
         position: SubaccountPosition?,
-        order: SubaccountOrder,
+        orders: List<SubaccountOrder>?,
         configsAndAsset: MarketConfigsAndAsset?,
-    ): DydxMarketPositionButtonsView.TriggerViewState {
+    ): DydxMarketPositionButtonsView.TriggerViewState? {
+        val order = orders?.firstOrNull()
+            ?: return null
+
         val tickSize = configsAndAsset?.configs?.displayTickSizeDecimals ?: 0
         val size = order.size
         val positionSize = position?.size?.current ?: 0.0
@@ -107,6 +106,7 @@ class DydxMarketPositionButtonsViewModel @Inject constructor(
             triggerPrice = order.triggerPrice?.let { formatter.dollar(it, tickSize) },
             limitPrice = order.price.let { formatter.dollar(it, tickSize) },
             sizePercent = formatter.percent(percentage, 2),
+            hasMultipleOrders = orders.size > 1,
         )
     }
 }

v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/PortfolioRouter.kt

@@ -7,6 +7,7 @@ import androidx.navigation.navArgument
 import exchange.dydx.trading.common.navigation.DydxRouter
 import exchange.dydx.trading.common.navigation.PortfolioRoutes
 import exchange.dydx.trading.common.navigation.dydxComposable
+import exchange.dydx.trading.feature.portfolio.components.orders.DydxPortfolioOrdersView
 import exchange.dydx.trading.feature.portfolio.orderdetails.DydxOrderDetailsView
 import timber.log.Timber
 
@@ -35,4 +36,12 @@ fun NavGraphBuilder.portfolioGraph(
         }
         DydxOrderDetailsView.Content(Modifier)
     }
+
+    dydxComposable(
+        router = appRouter,
+        route = PortfolioRoutes.orders,
+        deepLinks = appRouter.deeplinks(PortfolioRoutes.orders),
+    ) { navBackStackEntry ->
+        DydxPortfolioOrdersView.Content(Modifier, isFullScreen = true)
+    }
 }

v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/orders/DydxPortfolioOrdersView.kt

@@ -2,6 +2,7 @@ package exchange.dydx.trading.feature.portfolio.components.orders
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -31,6 +32,7 @@ import exchange.dydx.trading.common.compose.collectAsStateWithLifecycle
 import exchange.dydx.trading.common.theme.DydxThemedPreviewSurface
 import exchange.dydx.trading.common.theme.MockLocalizer
 import exchange.dydx.trading.feature.portfolio.components.placeholder.DydxPortfolioPlaceholderView
+import exchange.dydx.trading.feature.shared.views.HeaderView
 import exchange.dydx.trading.feature.shared.viewstate.SharedOrderViewState
 
 @Preview
@@ -52,6 +54,7 @@ object DydxPortfolioOrdersView : DydxComponent {
         val localizer: LocalizerProtocol,
         val orders: List<SharedOrderViewState> = listOf(),
         val onOrderTappedAction: (String) -> Unit = {},
+        val onBackTappedAction: () -> Unit = {},
     ) {
         companion object {
             val preview = ViewState(
@@ -66,11 +69,42 @@ object DydxPortfolioOrdersView : DydxComponent {
 
     @Composable
     override fun Content(modifier: Modifier) {
+        Content(modifier, isFullScreen = false)
+    }
+
+    @Composable
+    fun Content(modifier: Modifier, isFullScreen: Boolean) {
         val viewModel: DydxPortfolioOrdersViewModel = hiltViewModel()
 
         val state = viewModel.state.collectAsStateWithLifecycle(initialValue = null).value
-        LazyColumn {
-            ListContent(this, modifier, state)
+        if (isFullScreen) {
+            Column(
+                modifier = modifier.fillMaxWidth(),
+            ) {
+                HeaderView(
+                    modifier = Modifier.fillMaxWidth(),
+                    title = state?.localizer?.localize("APP.GENERAL.ORDERS") ?: "",
+                    backAction = state?.onBackTappedAction,
+                )
+
+                PlatformDivider()
+
+                Spacer(modifier = Modifier.height(16.dp))
+
+                LazyColumn(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .weight(1f),
+                ) {
+                    ListContent(this, Modifier, state)
+                }
+            }
+        } else {
+            LazyColumn(
+                modifier = modifier,
+            ) {
+                ListContent(this, Modifier, state)
+            }
         }
     }
 

v4/feature/portfolio/src/main/java/exchange/dydx/trading/feature/portfolio/components/orders/DydxPortfolioOrdersViewModel.kt

@@ -63,6 +63,9 @@ class DydxPortfolioOrdersViewModel @Inject constructor(
                     presentation = DydxRouter.Presentation.Modal,
                 )
             },
+            onBackTappedAction = {
+                router.navigateBack()
+            },
         )
     }
 }

v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TriggerOrderStream.kt

@@ -38,7 +38,7 @@ interface TriggerOrderStreaming {
 }
 
 interface MutableTriggerOrderStreaming : TriggerOrderStreaming {
-    fun updatesubmissionStatus(status: AbacusStateManagerProtocol.SubmissionStatus?)
+    fun updateSubmissionStatus(status: AbacusStateManagerProtocol.SubmissionStatus?)
     fun clearSubmissionStatus()
     fun setTakeProfitGainLossDisplayType(displayType: GainLossDisplayType)
     fun setStopLossGainLossDisplayType(displayType: GainLossDisplayType)
@@ -71,7 +71,7 @@ class TriggerOrderStream @Inject constructor(
         }
             .distinctUntilChanged()
 
-    override fun updatesubmissionStatus(status: AbacusStateManagerProtocol.SubmissionStatus?) {
+    override fun updateSubmissionStatus(status: AbacusStateManagerProtocol.SubmissionStatus?) {
         _submissionStatus.update { status }
     }