From 5e371fb28748bd8007e0946bdd1519043a862b70 Mon Sep 17 00:00:00 2001 From: Rui <102453770+ruixhuang@users.noreply.github.com> Date: Wed, 24 Jan 2024 00:22:07 -0800 Subject: [PATCH] TRCL-3496 Reduce Profile->History tab height (#63) * Fix missing logo image. * Reduce Profile->History tab height --- dydx/dydxViews/dydxViews.xcodeproj/project.pbxproj | 8 -------- dydx/dydxViews/dydxViews/_v4/Auth/dydxSecurityView.swift | 8 +++++++- .../_v4/Profile/Components/dydxProfileHistoryView.swift | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dydx/dydxViews/dydxViews.xcodeproj/project.pbxproj b/dydx/dydxViews/dydxViews.xcodeproj/project.pbxproj index bfab8d0d3..6532533a2 100644 --- a/dydx/dydxViews/dydxViews.xcodeproj/project.pbxproj +++ b/dydx/dydxViews/dydxViews.xcodeproj/project.pbxproj @@ -807,7 +807,6 @@ 024B7B5A28B7F8F000F7C386 /* Marker */, 024B7B5428B7F89500F7C386 /* Themes */, 024B7AD628B7F78900F7C386 /* Shared */, - 648327342AF5630200012B75 /* Utils */, 024B79BD28B7F53800F7C386 /* dydxViews.h */, 024B7BE328B80C2A00F7C386 /* Media.xcassets */, 024B79BE28B7F53800F7C386 /* dydxViews.docc */, @@ -1422,13 +1421,6 @@ path = Components; sourceTree = ""; }; - 648327342AF5630200012B75 /* Utils */ = { - isa = PBXGroup; - children = ( - ); - path = Utils; - sourceTree = ""; - }; 64A4DB452966205A008D8E20 /* Components */ = { isa = PBXGroup; children = ( diff --git a/dydx/dydxViews/dydxViews/_v4/Auth/dydxSecurityView.swift b/dydx/dydxViews/dydxViews/_v4/Auth/dydxSecurityView.swift index 564b87e9a..6b8e98ecb 100644 --- a/dydx/dydxViews/dydxViews/_v4/Auth/dydxSecurityView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Auth/dydxSecurityView.swift @@ -70,7 +70,13 @@ public class dydxSecurityViewModel: PlatformViewModel { } private func logoImage(parentStyle: ThemeStyle, styleKey: String?) -> PlatformView { - PlatformIconViewModel(type: .asset(name: "brand", bundle: Bundle.particles.first), + let imageName: String + if currentThemeType == .light { + imageName = "brand_light" + } else { + imageName = "brand_dark" + } + return PlatformIconViewModel(type: .asset(name: imageName, bundle: Bundle.dydxView), clip: .noClip, size: .init(width: 100, height: 100), templateColor: nil) diff --git a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift index 7a3341613..2222c6a44 100644 --- a/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift +++ b/dydx/dydxViews/dydxViews/_v4/Profile/Components/dydxProfileHistoryView.swift @@ -126,7 +126,7 @@ public class dydxProfileHistoryViewModel: dydxTitledCardViewModel { .themeColor(foreground: .textTertiary) } .frame(maxWidth: .infinity) - .frame(minHeight: 210) + .frame(minHeight: 134) .themeColor(background: .layer3) .cornerRadius(12, corners: .allCorners) .wrappedInAnyView()