From 0dc778f5d4b402544b7dc8567a5befb05f93ca45 Mon Sep 17 00:00:00 2001
From: Rui <102453770+ruixhuang@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:35:42 -0500
Subject: [PATCH] MOB-297: Fix total dydx amount not populated from Profile tab
 (#101)

* MOB-297: Fix total dydx amount not populated from Profile tab

* Address feedback
---
 dydx/Podfile.lock                             |  2 +-
 dydx/Pods/Manifest.lock                       |  2 +-
 .../dydxProfileBalancesViewPresenter.swift    | 29 ++++++++++++-------
 .../AbacusState+Combine.swift                 |  4 +--
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/dydx/Podfile.lock b/dydx/Podfile.lock
index 4a71328ec..1c639f726 100644
--- a/dydx/Podfile.lock
+++ b/dydx/Podfile.lock
@@ -445,4 +445,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 9e6e5d5e9ea0594fa77a099c8fd30545318f1cb9
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/dydx/Pods/Manifest.lock b/dydx/Pods/Manifest.lock
index 4a71328ec..1c639f726 100644
--- a/dydx/Pods/Manifest.lock
+++ b/dydx/Pods/Manifest.lock
@@ -445,4 +445,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 9e6e5d5e9ea0594fa77a099c8fd30545318f1cb9
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileBalancesViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileBalancesViewPresenter.swift
index 8700410b8..02429e782 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileBalancesViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/Profile/Components/dydxProfileBalancesViewPresenter.swift
@@ -32,10 +32,16 @@ public class dydxProfileBalancesViewPresenter: HostedViewPresenter<dydxProfileBa
     public override func start() {
         super.start()
 
-        AbacusStateManager.shared.state.accountBalance(of: AbacusStateManager.shared.environment?.dydxTokenInfo?.denom)
-            .sink { [weak self] dydxAmount in
-                if let dydxAmount = dydxAmount {
-                    self?.viewModel?.walletAmount = dydxFormatter.shared.raw(number: Parser.standard.asNumber(dydxAmount), digits: 4)
+        let decimal = 4
+        let dydxTokenDenom = AbacusStateManager.shared.environment?.dydxTokenInfo?.denom
+        Publishers
+            .CombineLatest(
+                AbacusStateManager.shared.state.accountBalance(of: dydxTokenDenom),
+                AbacusStateManager.shared.state.stakingBalance(of: dydxTokenDenom)
+            )
+            .sink { [weak self] accountBalance, stakingBalance in
+                if let accountBalance = accountBalance {
+                    self?.viewModel?.walletAmount = dydxFormatter.shared.raw(number: Parser.standard.asNumber(accountBalance), digits: decimal)
                     self?.viewModel?.transferAction = {
                         Router.shared?.navigate(to: RoutingRequest(path: "/transfer", params: ["section": "transferOut"]), animated: true, completion: nil)
                     }
@@ -43,16 +49,19 @@ public class dydxProfileBalancesViewPresenter: HostedViewPresenter<dydxProfileBa
                     self?.viewModel?.walletAmount = "-"
                     self?.viewModel?.transferAction = nil
                 }
-            }
-            .store(in: &subscriptions)
 
-        AbacusStateManager.shared.state.stakingBalance(of: AbacusStateManager.shared.environment?.dydxTokenInfo?.denom ?? "")
-            .sink { [weak self] dydxAmount in
-                if let dydxAmount = dydxAmount {
-                    self?.viewModel?.stakedAmount = dydxFormatter.shared.raw(number: Parser.standard.asNumber(dydxAmount), digits: 4)
+                if let stakingBalance = stakingBalance {
+                    self?.viewModel?.stakedAmount = dydxFormatter.shared.raw(number: Parser.standard.asNumber(stakingBalance), digits: decimal)
                 } else {
                     self?.viewModel?.stakedAmount = "-"
                 }
+
+                if accountBalance != nil || stakingBalance != nil {
+                    let totalAmount = (accountBalance ?? 0.0) + (stakingBalance ?? 0.0)
+                    self?.viewModel?.totalAmount = dydxFormatter.shared.raw(number: Parser.standard.asNumber(totalAmount), digits: decimal)
+                } else {
+                    self?.viewModel?.totalAmount = "-"
+                }
             }
             .store(in: &subscriptions)
     }
diff --git a/dydx/dydxStateManager/dydxStateManager/AbacusState+Combine.swift b/dydx/dydxStateManager/dydxStateManager/AbacusState+Combine.swift
index ce0edbcc9..3979da1bc 100644
--- a/dydx/dydxStateManager/dydxStateManager/AbacusState+Combine.swift
+++ b/dydx/dydxStateManager/dydxStateManager/AbacusState+Combine.swift
@@ -122,10 +122,10 @@ public final class AbacusState {
             .eraseToAnyPublisher()
     }
 
-    public func stakingBalance(of tokenDenom: String) -> AnyPublisher<Double?, Never> {
+    public func stakingBalance(of tokenDenom: String?) -> AnyPublisher<Double?, Never> {
         account
             .map { account in
-                self.parser.asDecimal(account?.stakingBalances?[tokenDenom]?.amount)?.doubleValue
+                self.parser.asDecimal(account?.stakingBalances?[tokenDenom ?? ""]?.amount)?.doubleValue
             }
             .removeDuplicates()
             .share()