SharedMarketViewModel's tokenSymbol and tokenFullName renamed to …

…`assetId` and `assetName`
dydxprotocol · Aug 19, 2024 · 05c1cb8 · 05c1cb8
1 parent 892af07
commit 05c1cb8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Markets/Shared/SharedMarketPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Markets/Shared/SharedMarketPresenter.swift
@@ -49,8 +49,8 @@ class SharedMarketPresenter: HostedViewPresenter<SharedMarketViewModel>, SharedM
 
     static func createViewModel(market: PerpetualMarket, asset: Asset?) -> SharedMarketViewModel {
         let viewModel = SharedMarketViewModel()
-        viewModel.tokenSymbol = asset?.id ?? market.assetId
-        viewModel.tokenFullName = asset?.name ?? market.assetId
+        viewModel.assetId = asset?.id ?? market.assetId
+        viewModel.assetName = asset?.name ?? market.displayId
         if let imageUrl = asset?.resources?.imageUrl {
             viewModel.logoUrl = URL(string: imageUrl)
         }

diff --git a/dydx/dydxViews/dydxViews/_v4/MarketInfo/Components/Resources/dydxMarketResourcesView.swift b/dydx/dydxViews/dydxViews/_v4/MarketInfo/Components/Resources/dydxMarketResourcesView.swift
@@ -61,11 +61,11 @@ public class dydxMarketResourcesViewModel: PlatformViewModel {
                         HStack {
                             VStack(alignment: .leading) {
                                 HStack(spacing: 4) {
-                                    Text(sharedMarketViewModel.tokenFullName ?? "")
+                                    Text(sharedMarketViewModel.assetName ?? "")
                                         .themeColor(foreground: .textPrimary)
                                         .themeFont(fontType: .plus, fontSize: .medium)
                                 }
-                                Text(sharedMarketViewModel.tokenSymbol ?? "")
+                                Text(sharedMarketViewModel.assetId ?? "")
                                     .themeFont(fontType: .base, fontSize: .small)
                             }
                             Spacer()

diff --git a/dydx/dydxViews/dydxViews/_v4/MarketInfo/Components/dydxMarketInfoHeaderView.swift b/dydx/dydxViews/dydxViews/_v4/MarketInfo/Components/dydxMarketInfoHeaderView.swift
@@ -34,10 +34,10 @@ public class dydxMarketInfoHeaderViewModel: PlatformViewModel {
                 .createView(parentStyle: parentStyle, styleKey: styleKey)
                 VStack(alignment: .leading, spacing: 0) {
                     HStack(spacing: 4) {
-                        Text(sharedMarketViewModel?.tokenFullName ?? "")
+                        Text(sharedMarketViewModel?.assetName ?? "")
                             .themeColor(foreground: .textSecondary)
                             .themeFont(fontType: .base, fontSize: .large)
-                        TokenTextViewModel(symbol: sharedMarketViewModel?.tokenSymbol ?? "")
+                        TokenTextViewModel(symbol: sharedMarketViewModel?.assetId ?? "")
                             .createView(parentStyle: parentStyle.themeFont(fontSize: .smallest), styleKey: styleKey)
                     }
                     HStack(alignment: .center, spacing: 4) {

diff --git a/dydx/dydxViews/dydxViews/_v4/Markets/Components/dydxMarketAssetItemView.swift b/dydx/dydxViews/dydxViews/_v4/Markets/Components/dydxMarketAssetItemView.swift
@@ -87,7 +87,7 @@ open class dydxMarketAssetItemViewModel: PlatformViewModel {
             HStack {
                 VStack(alignment: .leading) {
                     HStack(spacing: 4) {
-                        Text(sharedMarketViewModel?.tokenSymbol ?? "")
+                        Text(sharedMarketViewModel?.assetId ?? "")
                             .themeColor(foreground: .textPrimary)
                             .themeFont(fontType: .plus, fontSize: .medium)
                             .layoutPriority(1)

diff --git a/dydx/dydxViews/dydxViews/_v4/Markets/Shared/SharedMarketView.swift b/dydx/dydxViews/dydxViews/_v4/Markets/Shared/SharedMarketView.swift
@@ -10,8 +10,8 @@ import PlatformUI
 import Utilities
 
 public final class SharedMarketViewModel: PlatformViewModel, Equatable {
-    @Published public var tokenSymbol: String?
-    @Published public var tokenFullName: String?
+    @Published public var assetId: String?
+    @Published public var assetName: String?
     @Published public var logoUrl: URL?
     @Published public var volume24H: String?
     @Published public var indexPrice: String?
@@ -27,8 +27,8 @@ public final class SharedMarketViewModel: PlatformViewModel, Equatable {
 
     public static var previewValue: SharedMarketViewModel = {
         let vm = SharedMarketViewModel()
-        vm.tokenSymbol = "ETH"
-        vm.tokenFullName = "Ethereum"
+        vm.assetId = "ETH"
+        vm.assetName = "Ethereum"
         vm.logoUrl = URL(string: "https://media.dydx.exchange/currencies/eth.png")
         vm.volume24H = "$223M"
         vm.indexPrice = "$1.00"
@@ -45,8 +45,8 @@ public final class SharedMarketViewModel: PlatformViewModel, Equatable {
 
     public static func == (lhs: SharedMarketViewModel, rhs: SharedMarketViewModel) -> Bool {
         lhs.id == rhs.id &&
-        lhs.tokenSymbol == rhs.tokenSymbol &&
-        lhs.tokenFullName == rhs.tokenFullName &&
+        lhs.assetId == rhs.assetId &&
+        lhs.assetName == rhs.assetName &&
         lhs.logoUrl == rhs.logoUrl &&
         lhs.volume24H == rhs.volume24H &&
         lhs.indexPrice == rhs.indexPrice &&