Skip to content

style: Updates position, orderes, trades and funding tabs #16

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

Merged
Sam-dYdX merged 8 commits into from
Oct 29, 2025
Merged

style: Updates position, orderes, trades and funding tabs #16

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8852a2
Adds updated positions tab
Sam-dYdX Oct 27, 2025
07eee6c
Updates TP/SL button Styles
Sam-dYdX Oct 28, 2025
52a23ec
Updates orders list
Sam-dYdX Oct 28, 2025
68c063a
Updates trades list style
Sam-dYdX Oct 28, 2025
d4c47f4
Updates funding tab to new style
Sam-dYdX Oct 28, 2025
fabd10e
Ensures text has correct color
Sam-dYdX Oct 28, 2025
b205747
Style Updates
Sam-dYdX Oct 29, 2025
baf2956
Moves data formatting to presenter
Sam-dYdX Oct 29, 2025
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
10 changes: 2 additions & 8 deletions ios/PlatformUIJedio/PlatformUIJedio.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1185,10 +1185,7 @@
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
Expand Down Expand Up @@ -1262,10 +1259,7 @@
LDPLUSPLUS = "";
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
10 changes: 2 additions & 8 deletions ios/StatsigInjections/StatsigInjections.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,10 +362,7 @@
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
Expand Down Expand Up @@ -439,10 +436,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
" ",
);
OTHER_LDFLAGS = "$(inherited) ";
REACT_NATIVE_PATH = "${PODS_ROOT}/../../../node_modules/react-native";
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
Expand Down
3 changes: 1 addition & 2 deletions ios/Utilities/Utilities/_Extensions/Date+Utils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@ public extension Date {

var englishDatetimeString: String {
let formatter = type(of: self).localFormatter
formatter.dateStyle = .short
formatter.timeStyle = .short
formatter.dateFormat = "HH:mm MMMM dd, yyyy"
return formatter.string(from: self)
}

Expand Down
2 changes: 1 addition & 1 deletion ...xPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioFillsViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class dydxPortfolioFillsViewPresenter: HostedViewPresenter<dydxPortfolioFillsVie
super.init()

self.viewModel = viewModel

viewModel?.onboardAction = {
Router.shared?.navigate(to: RoutingRequest(path: "/onboard"), animated: true, completion: { /* [weak self] */ _, _ in
})
Expand Down
4 changes: 2 additions & 2 deletions ...resenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioFundingViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class dydxPortfolioFundingViewPresenter: HostedViewPresenter<dydxPortfolioFundin
super.init()

self.viewModel = viewModel

viewModel?.onboardAction = {
Router.shared?.navigate(to: RoutingRequest(path: "/onboard"), animated: true, completion: { /* [weak self] */ _, _ in
})
Expand Down Expand Up @@ -68,7 +68,7 @@ class dydxPortfolioFundingViewPresenter: HostedViewPresenter<dydxPortfolioFundin
let item = cache[funding] ?? dydxPortfolioFundingItemViewModel()
cache[funding] = item

item.time = dydxFormatter.shared.interval(time: Date(milliseconds: funding.createdAtMilliseconds))
item.time = Date(milliseconds: funding.createdAtMilliseconds)
Copy link
Contributor

@ruixhuang ruixhuang Oct 29, 2025

Choose a reason for hiding this comment

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

Not a big deal, but in VIPER the data formatting is done at the presenter. But it's okay if you decided to relax the pattern.

Copy link
Contributor Author

@Sam-dYdX Sam-dYdX Oct 29, 2025

Choose a reason for hiding this comment

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

I think it makes sense to keep following the pattern so I'm going to move the data formatting to the presenter.

I think I do the same with the SharedFill so I'll update it there too

let amount = dydxFormatter.shared.dollar(number: abs(funding.payment), size: "0.0001")
if funding.payment >= 0.0 {
item.amount = SignedAmountViewModel(text: amount, sign: .plus, coloringOption: .signOnly)
Expand Down
6 changes: 3 additions & 3 deletions ...Presenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioOrdersViewPresenter.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class dydxPortfolioOrdersViewPresenter: HostedViewPresenter<dydxPortfolioOrdersV
super.init()

self.viewModel = viewModel

viewModel?.onboardAction = {
Router.shared?.navigate(to: RoutingRequest(path: "/onboard"), animated: true, completion: { /* [weak self] */ _, _ in
})
Expand Down Expand Up @@ -80,9 +80,9 @@ class dydxPortfolioOrdersViewPresenter: HostedViewPresenter<dydxPortfolioOrdersV
item.id = order.id
item.type = DataLocalizer.localize(path: order.resources.typeStringKey ?? "-")
if order.side == Abacus.OrderSide.buy {
item.sideText.side = .buy
item.sideText = SideTextViewModel(side: .buy, coloringOption: .withBackground)
} else {
item.sideText.side = .sell
item.sideText = SideTextViewModel(side: .sell, coloringOption: .withBackground)
}
item.status = DataLocalizer.localize(path: order.resources.statusStringKey ?? "-")
item.canCancel = order.status.canCancel
Expand Down
21 changes: 21 additions & 0 deletions ios/dydx/dydxViews/dydxViews/Media.xcassets/circle_stack.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "circle_stack.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
6 changes: 6 additions & 0 deletions ios/dydx/dydxViews/dydxViews/Media.xcassets/circle_stack.imageset/circle_stack.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ios/dydx/dydxViews/dydxViews/Shared/OrderStatus.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class OrderStatusModel: PlatformViewModel {
case .green:
return ThemeSettings.positiveColor.color
case .blank:
return ThemeColor.SemanticColor.textPrimary.color
return ThemeColor.SemanticColor.layer2.color
case .yellow:
return ThemeColor.SemanticColor.colorYellow.color
}
Expand All @@ -46,7 +46,7 @@ public class OrderStatusModel: PlatformViewModel {
return AnyView(
ZStack {
Circle()
.fill(ThemeColor.SemanticColor.layer0.color ?? .clear)
.fill(ThemeColor.SemanticColor.colorFadedPurple.color)
.frame(width: 16, height: 16)
Circle()
.fill(self.status?.color ?? .clear)
Expand Down
38 changes: 37 additions & 1 deletion ios/dydx/dydxViews/dydxViews/Shared/PlaceholderView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,20 @@ import Utilities

public class PlaceholderViewModel: PlatformViewModel {
@Published public var text: String?
@Published public var subText: String?
@Published public var icon: PlatformIconViewModel.IconType?
private let useUpdatedStyle: Bool

public init(text: String? = nil) {
public init(
text: String? = nil,
subText: String? = nil,
icon: PlatformIconViewModel.IconType? = nil,
useUpdatedStyle: Bool = false
) {
self.text = text
self.subText = subText
self.icon = icon
self.useUpdatedStyle = useUpdatedStyle
}

public static var previewValue: PlaceholderViewModel {
Expand All @@ -26,6 +37,31 @@ public class PlaceholderViewModel: PlatformViewModel {
PlatformView(viewModel: self, parentStyle: parentStyle, styleKey: styleKey) { [weak self] style in
guard let self = self else { return AnyView(PlatformView.nilView) }

if useUpdatedStyle {
return VStack(alignment: .center) {
if let icon = self.icon {
PlatformIconViewModel(
type: icon,
size: .init(width: 24, height: 24),
templateColor: .textTertiary
)
.createView(parentStyle: parentStyle)
.opacity(0.75)
}
Text(self.text ?? "")
.themeColor(foreground: .textTertiary)
.themeFont(fontType: .plus, fontSize: .small)
Text(self.subText ?? "")
.themeColor(foreground: .textTertiary)
.themeFont(fontSize: .smaller)
.opacity(0.75)
}
.padding(.vertical, 20)
.frame(maxWidth: .infinity)
.border(borderWidth: 1, cornerRadius: 12, borderColor: ThemeColor.SemanticColor.layer3.color)
.wrappedInAnyView()
}

let main = Text(self.text ?? "")
.themeFont(fontSize: .small)
.themeColor(foreground: .textTertiary)
Expand Down
Loading