Pod update TrustWalletSDK (error codes) and refine error handling (tr…

…ustwallet#765)
mishfit · Jun 16, 2018 · 8e9774a · 8e9774a
1 parent 12c5158
commit 8e9774a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -153,7 +153,7 @@ CHECKOUT OPTIONS:
     :commit: 80bd79cbeede842949b229f81bc6328f53701c5a
     :git: https://github.com/yannickl/QRCodeReaderViewController.git
   TrustWalletSDK:
-    :commit: 57de048f020f27907b3896417589252e43b931a6
+    :commit: 82c06558df5e6a75bd9c195a4e76536618e76a9a
     :git: https://github.com/TrustWallet/TrustSDK-iOS
   TrustWeb3Provider:
     :commit: f4e0ebb1b8fa4812637babe85ef975d116543dfd

diff --git a/Trust/Core/Coordinators/LocalSchemeCoordinator.swift b/Trust/Core/Coordinators/LocalSchemeCoordinator.swift
@@ -43,8 +43,12 @@ class LocalSchemeCoordinator: Coordinator {
             switch result {
             case .success(let data):
                 completion(.success(data))
-            case .failure:
-                completion(.failure(WalletError.cancelled))
+            case .failure(let error):
+                if let dappError = error.error as? DAppError, dappError == .cancelled {
+                    completion(.failure(WalletError.cancelled))
+                } else {
+                    completion(.failure(WalletError.unknown))
+                }
             }
             coordinator.didComplete = nil
             self.removeCoordinator(coordinator)
@@ -79,8 +83,12 @@ class LocalSchemeCoordinator: Coordinator {
                 case .sentTransaction(let transaction):
                     completion(.success(transaction.data))
                 }
-            case .failure:
-                completion(.failure(WalletError.cancelled))
+            case .failure(let error):
+                if let dappError = error.error as? DAppError, dappError == .cancelled {
+                    completion(.failure(WalletError.cancelled))
+                } else {
+                    completion(.failure(WalletError.unknown))
+                }
             }
             coordinator.didCompleted = nil
             self.removeCoordinator(coordinator)
@@ -109,14 +117,14 @@ extension LocalSchemeCoordinator: SignMessageCoordinatorDelegate {
 extension LocalSchemeCoordinator: WalletDelegate {
     func signMessage(_ message: Data, address: Address?, completion: @escaping (Result<Data, WalletError>) -> Void) {
         guard let account = account(for: session) else {
-            return completion(.failure(WalletError.cancelled))
+            return completion(.failure(WalletError.watchOnly))
         }
         signMessage(for: account, signMessage: .message(message), completion: completion)
     }
 
     func signPersonalMessage(_ message: Data, address: Address?, completion: @escaping (Result<Data, WalletError>) -> Void) {
         guard let account = account(for: session) else {
-            return completion(.failure(WalletError.cancelled))
+            return completion(.failure(WalletError.watchOnly))
         }
         signMessage(for: account, signMessage: .personalMessage(message), completion: completion)
     }
@@ -133,7 +141,7 @@ extension LocalSchemeCoordinator: WalletDelegate {
         )
 
         guard let account = account(for: session) else {
-            return completion(.failure(WalletError.cancelled))
+            return completion(.failure(WalletError.watchOnly))
         }
         signTransaction(account: account, transaction: transaction, type: .sign, completion: completion)
     }