diff --git a/PlatformUI/PlatformUI/Components/ComboBox/ComboBox.swift b/PlatformUI/PlatformUI/Components/ComboBox/ComboBox.swift index 4a995665c..cb722a3bd 100644 --- a/PlatformUI/PlatformUI/Components/ComboBox/ComboBox.swift +++ b/PlatformUI/PlatformUI/Components/ComboBox/ComboBox.swift @@ -59,7 +59,7 @@ public class ComboBoxModel: PlatformViewModel { trailing: trailing) .createView(parentStyle: style) .themeColor(background: .layer4) - .cornerRadius(12) + .borderAndClip(style: .cornerRadius(12), borderColor: .borderDefault, lineWidth: 1) .onTapGesture { [weak self] in self?.onTapAction?() } diff --git a/dydx/dydxViews/dydxViews/_v4/Receipt/dydxReceiptView.swift b/dydx/dydxViews/dydxViews/_v4/Receipt/dydxReceiptView.swift index d8f8a2ede..06adfe52e 100644 --- a/dydx/dydxViews/dydxViews/_v4/Receipt/dydxReceiptView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Receipt/dydxReceiptView.swift @@ -104,8 +104,7 @@ public class dydxReceiptViewModel: PlatformViewModel { .frame(maxWidth: .infinity) .padding() .themeColor(background: .layer3) - .cornerRadius(8) - .border(cornerRadius: 8) + .borderAndClip(style: .cornerRadius(12), borderColor: .borderDefault, lineWidth: 1) .padding(.horizontal, -8) } diff --git a/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputSizeView.swift b/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputSizeView.swift index 63aa91725..b6ddda8e5 100644 --- a/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputSizeView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputSizeView.swift @@ -93,8 +93,7 @@ public class dydxTradeInputSizeViewModel: PlatformTextInputViewModel { private func createTopView(inputView: PlatformView, parentStyle: ThemeStyle) -> some View { inputView - .themeColor(background: .layer4) - .cornerRadius(12) + .makeInput() } private func createBottomView(parentStyle: ThemeStyle) -> some View { diff --git a/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputViewModifier.swift b/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputViewModifier.swift index 0bee0abe4..cf0914218 100644 --- a/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputViewModifier.swift +++ b/dydx/dydxViews/dydxViews/_v4/Trade/TradeInput/Components/TradeInputViewModifier.swift @@ -21,6 +21,6 @@ struct TradeInputModifier: ViewModifier { func body(content: Content) -> some View { content .themeColor(background: .layer4) - .cornerRadius(12) + .borderAndClip(style: .cornerRadius(12), borderColor: .borderDefault, lineWidth: 1) } } diff --git a/dydx/dydxViews/dydxViews/_v4/Transfer/TransferOut/dydxTransferOutView.swift b/dydx/dydxViews/dydxViews/_v4/Transfer/TransferOut/dydxTransferOutView.swift index f599bbf2c..b1014c9bf 100644 --- a/dydx/dydxViews/dydxViews/_v4/Transfer/TransferOut/dydxTransferOutView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Transfer/TransferOut/dydxTransferOutView.swift @@ -49,8 +49,7 @@ public class dydxTransferOutViewModel: PlatformViewModel { VStack(spacing: 12) { self.chainsComboBox?.createView(parentStyle: style) self.addressInput?.createView(parentStyle: style) - .themeColor(background: .layer4) - .cornerRadius(12) + .makeInput() self.tokensComboBox?.createView(parentStyle: style) self.amountBox?.createView(parentStyle: style) } diff --git a/dydx/dydxViews/dydxViews/_v4/Transfer/Withdrawal/dydxTransferWithdrawalView.swift b/dydx/dydxViews/dydxViews/_v4/Transfer/Withdrawal/dydxTransferWithdrawalView.swift index abfc306d3..f03321462 100644 --- a/dydx/dydxViews/dydxViews/_v4/Transfer/Withdrawal/dydxTransferWithdrawalView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Transfer/Withdrawal/dydxTransferWithdrawalView.swift @@ -48,8 +48,7 @@ public class dydxTransferWithdrawalViewModel: PlatformViewModel { VStack(spacing: 12) { HStack { self.addressInput?.createView(parentStyle: style) - .themeColor(background: .layer4) - .cornerRadius(12) + .makeInput() self.chainsComboBox?.createView(parentStyle: style) }