remove viewmodel caching

dydxprotocol · Jul 1, 2024 · 9abdb78 · 9abdb78
1 parent 5eae6ee
commit 9abdb78
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 29 deletions.
diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md
@@ -20,7 +20,11 @@ _Provide a clear and concise description of the fix(es) or change(s) you made. I
 
 | Before | After |
 |--------|-------|
-| <img src=""> | <img src=""> |
+| <img src=""> | <img src="" width=60%> |
+| <img src=""> | <img src="" width=60%> |
+| <img src=""> | <img src="" width=60%> |
+| <img src=""> | <img src="" width=60%> |
+| <img src=""> | <img src="" width=60%> |
 | <video src=""> | <video src=""> |
 
 

diff --git a/...senters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift b/...senters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioPositionsViewPresenter.swift
@@ -21,9 +21,6 @@ protocol dydxPortfolioPositionsViewPresenterProtocol: HostedViewPresenterProtoco
 }
 
 class dydxPortfolioPositionsViewPresenter: HostedViewPresenter<dydxPortfolioPositionsViewModel>, dydxPortfolioPositionsViewPresenterProtocol {
-    private var positionsCache = [String: dydxPortfolioPositionItemViewModel]()
-    private var pendingPositionsCache = [String: dydxPortfolioPendingPositionsItemViewModel]()
-
     init(viewModel: dydxPortfolioPositionsViewModel?) {
         super.init()
 
@@ -57,25 +54,19 @@ class dydxPortfolioPositionsViewPresenter: HostedViewPresenter<dydxPortfolioPosi
 
     private func updatePositions(positions: [SubaccountPosition], marketMap: [String: PerpetualMarket], assetMap: [String: Asset]) {
         let items: [dydxPortfolioPositionItemViewModel] = positions.compactMap { position -> dydxPortfolioPositionItemViewModel? in
-            let item = Self.createPositionViewModelItem(position: position,
+            Self.createPositionViewModelItem(position: position,
                                                         marketMap: marketMap,
-                                                        assetMap: assetMap,
-                                                        positionsCache: positionsCache)
-            positionsCache[position.assetId] = item
-            return item
+                                                        assetMap: assetMap)
         }
 
         self.viewModel?.positionItems = items
     }
 
     private func updatePendingPositions(pendingPositions: [SubaccountPendingPosition], marketMap: [String: PerpetualMarket], assetMap: [String: Asset]) {
         let items: [dydxPortfolioPendingPositionsItemViewModel] = pendingPositions.compactMap { pendingPosition -> dydxPortfolioPendingPositionsItemViewModel? in
-            let item = Self.createPendingPositionsViewModelItem(pendingPosition: pendingPosition,
+            Self.createPendingPositionsViewModelItem(pendingPosition: pendingPosition,
                                                                 marketMap: marketMap,
-                                                                assetMap: assetMap,
-                                                                pendingPositionsCache: pendingPositionsCache)
-            pendingPositionsCache[pendingPosition.assetId] = item
-            return item
+                                                                assetMap: assetMap)
         }
 
         self.viewModel?.pendingPositionItems = items

diff --git a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioPositionsView.swift
@@ -50,21 +50,21 @@ public class dydxPortfolioPositionItemViewModel: PlatformViewModel {
         self.handler = Handler(onTapAction: onTapAction, onMarginEditAction: onMarginEditAction)
     }
 
-    public var size: String?
-    public var token: TokenTextViewModel?
-    public var sideText = SideTextViewModel()
-    public var leverage: String?
-    public var leverageIcon: LeverageRiskModel?
-    public var indexPrice: String?
-    public var entryPrice: String?
-    public var unrealizedPnl: SignedAmountViewModel?
-    public var unrealizedPnlPercent: String = ""
-    public var marginValue: String = "--"
-    public var marginMode: String = "--"
-    public var isMarginAdjustable: Bool = false
-    public var logoUrl: URL?
-    public var gradientType: GradientType
-    public var handler: Handler?
+    @Published public var size: String?
+    @Published public var token: TokenTextViewModel?
+    @Published public var sideText = SideTextViewModel()
+    @Published public var leverage: String?
+    @Published public var leverageIcon: LeverageRiskModel?
+    @Published public var indexPrice: String?
+    @Published public var entryPrice: String?
+    @Published public var unrealizedPnl: SignedAmountViewModel?
+    @Published public var unrealizedPnlPercent: String = ""
+    @Published public var marginValue: String = "--"
+    @Published public var marginMode: String = "--"
+    @Published public var isMarginAdjustable: Bool = false
+    @Published public var logoUrl: URL?
+    @Published public var gradientType: GradientType
+    @Published public var handler: Handler?
 
     public static var previewValue: dydxPortfolioPositionItemViewModel {
         let item = dydxPortfolioPositionItemViewModel(