Improve pending transaction handling + add explorer to CLO

yuhao-git-star · Apr 16, 2018 · c93645d · c93645d
1 parent 325de27
commit c93645d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/Trust/EtherClient/ChainState.swift b/Trust/EtherClient/ChainState.swift
@@ -108,8 +108,8 @@ class ChainState {
     func confirmations(fromBlock: Int) -> Int? {
         guard fromBlock > 0 else { return nil }
         let block = latestBlock - fromBlock
-        guard latestBlock != 0, block > 0 else { return nil }
-        return max(0, block)
+        guard latestBlock != 0, block >= 0 else { return nil }
+        return max(1, block)
     }
     deinit {
         NotificationCenter.default.removeObserver(self)

diff --git a/Trust/InCoordinator.swift b/Trust/InCoordinator.swift
@@ -169,7 +169,9 @@ class InCoordinator: Coordinator {
         showTab(.wallet)
 
         // activate all view controllers.
-        let _ = [Tabs.wallet, Tabs.transactions].map { tabBarController.viewControllers?[$0.index].view }
+        [Tabs.wallet, Tabs.transactions].forEach {
+            tabBarController.viewControllers?[$0.index].view
+        }
 
         keystore.recentlyUsedWallet = account
     }

diff --git a/Trust/Settings/Types/ConfigExplorer.swift b/Trust/Settings/Types/ConfigExplorer.swift
@@ -54,7 +54,9 @@ struct ConfigExplorer {
             return "https://poaexplorer.com"
         case .sokol:
             return "https://sokol-explorer.poa.network"
-        case .custom, .callisto:
+        case .callisto:
+            return "https://explorer.callisto.network/tx/"
+        case .custom:
             return .none
         }
     }

diff --git a/TrustTests/Transactions/New Group/TransactionViewModelTests.swift b/TrustTests/Transactions/New Group/TransactionViewModelTests.swift
@@ -5,19 +5,24 @@ import XCTest
 
 class TransactionViewModelTests: XCTestCase {
 
-    func testErrorState() {
-        let viewModel = TransactionViewModel(transaction: .make(state: .error), config: .make(), chainState: .make(), currentWallet: .make())
+    func testPendingState() {
+        let blockNumber = 0
+        let chainState: ChainState = .make()
+        chainState.latestBlock = blockNumber
+
+        let viewModel = TransactionViewModel(transaction: .make(blockNumber: blockNumber), config: .make(), chainState: chainState, currentWallet: .make())
 
+        XCTAssertEqual(.none, viewModel.confirmations)
     }
 
-    func testPendingState() {
+    func testConfirmedState() {
         let blockNumber = 1
         let chainState: ChainState = .make()
         chainState.latestBlock = blockNumber
 
         let viewModel = TransactionViewModel(transaction: .make(blockNumber: blockNumber), config: .make(), chainState: chainState, currentWallet: .make())
 
-        XCTAssertEqual(.none, viewModel.confirmations)
+        XCTAssertEqual(1, viewModel.confirmations)
     }
 
     func testCompleteStateWhenLatestBlockBehind() {