diff --git a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPendingPositionsItemViewModel.swift b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPendingPositionsItemViewModel.swift index 656c44335..97422b084 100644 --- a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPendingPositionsItemViewModel.swift +++ b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPendingPositionsItemViewModel.swift @@ -68,14 +68,15 @@ public class dydxPortfolioPendingPositionsItemViewModel: PlatformViewModel { } private var divider: some View { - Spacer(minLength: 1) + Rectangle() + .frame(height: 1) .overlay(ThemeColor.SemanticColor.borderDefault.color) } private var bottomContent: some View { let viewOrdersStringKey: String let viewOrdersStringParams: [String: String]? - if orderCount > 1 { + if orderCount == 1 { viewOrdersStringKey = "APP.GENERAL.VIEW_ORDER" viewOrdersStringParams = nil } else { @@ -102,12 +103,14 @@ public class dydxPortfolioPendingPositionsItemViewModel: PlatformViewModel { PlatformView(viewModel: self, parentStyle: parentStyle, styleKey: styleKey) { [weak self] _ in guard let self = self else { return AnyView(PlatformView.nilView) } + let horizontalPadding: CGFloat = 12 return VStack(spacing: 0) { self.topContent self.divider + .padding(.horizontal, -horizontalPadding) self.bottomContent } - .padding(.horizontal, 12) + .padding(.horizontal, horizontalPadding) .themeColor(background: .layer3) .clipShape(.rect(cornerRadius: 10)) .wrappedInAnyView() diff --git a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift index 4a51d5fab..fb0ff5359 100644 --- a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift @@ -398,7 +398,8 @@ public class dydxPortfolioPositionsViewModel: PlatformViewModel { .fixedSize() Text("\(pendingPositionItems.count)") .frame(width: 28, height: 28) - .themeColor(background: .layer6) + .themeColor(background: .layer3) + .themeColor(foreground: .textSecondary) .borderAndClip(style: .circle, borderColor: .borderDefault) Spacer() }