[APP-781] Update neutron vesting amount calculating (#327)

cosmostation · Jun 28, 2023 · 2473ef5 · 2473ef5
1 parent 86f323a
commit 2473ef5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Cosmostation/Controller/Main/MainTabViewController.swift b/Cosmostation/Controller/Main/MainTabViewController.swift
@@ -1242,7 +1242,7 @@ class MainTabViewController: UITabBarController, UITabBarControllerDelegate, Acc
                 }
                 if let response = try? Cosmwasm_Wasm_V1_QueryClient(channel: channel).smartContractState(req, callOptions: BaseNetWork.getCallOptions()).response.wait() {
                     let neutronVesting = try? JSONDecoder().decode(Cw20NeutronVestingRes.self, from: response.data)
-                    BaseData.instance.mNeutronVesting = NSDecimalNumber(string: neutronVesting?.allocated_amount)
+                    BaseData.instance.mNeutronVesting = neutronVesting?.getNeutronVestingAmount() ?? NSDecimalNumber.zero
                     BaseData.instance.mNeutronDuration = neutronVesting?.schedule?.getVestingDuration()
                 }
                 try channel.close().wait()

diff --git a/Cosmostation/Dao/Cw20NeutronVestingRes.swift b/Cosmostation/Dao/Cw20NeutronVestingRes.swift
@@ -12,6 +12,13 @@ public struct Cw20NeutronVestingRes : Codable {
     var allocated_amount: String?
     var withdrawn_amount: String?
     var schedule: VestingSchedule?
+
+    func getNeutronVestingAmount() -> NSDecimalNumber {
+        if (allocated_amount != nil && withdrawn_amount != nil) {
+            return NSDecimalNumber(string: allocated_amount).subtracting(NSDecimalNumber(string: withdrawn_amount))
+        }
+        return NSDecimalNumber.zero
+    }
 }
 
 public struct VestingSchedule : Codable {