Merge pull request #1496 from gnosis/gh-1493-fix-error-message

gh-1493 improve message for user
safe-global · Oct 5, 2021 · 313ad2d · 313ad2d
2 parents 6b22626 + d4ff2fe
commit 313ad2d
Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/Multisig/Logic/Ledger/LedgerController.swift b/Multisig/Logic/Ledger/LedgerController.swift
@@ -50,11 +50,11 @@ class LedgerController {
         }
     }
 
-    typealias SignatureCompletion = (_ signature: String?) -> Void
+    typealias SignatureCompletion = (_ signature: String?, _ errorMessage: String?) -> Void
 
     func sign(safeTxHash: String, deviceId: UUID, path: String, completion: @escaping SignatureCompletion) {
         guard let device = bluetoothController.deviceFor(deviceId: deviceId) else {
-            completion(nil)
+            completion(nil, "Device not found")
             return
         }
         let command = signMessageCommand(path: path, messageHash: safeTxHash)
@@ -67,17 +67,21 @@ class LedgerController {
 
                 // we are interested in the first 65 bytes only
                 guard data.count >= 65 else {
+                    switch data.toHexString() {
+                    case "6985": completion(nil, "The operation was canceled on the Ledger device.")
+                    default: completion(nil, "Please check that Ethereum App is running on the Ledger device.")
+                    }
                     // canceled on the device
-                    completion(nil)
+
                     return
                 }
                 let dataString = data.toHexString()
                 let v = String(Int(dataString.substr(0, 2)!, radix: 16)! + 4, radix: 16)
                 let rs = dataString.substr(2, 128)!
-                completion(rs + v)
+                completion(rs + v, nil)
 
             case .failure(_):
-                completion(nil)
+                completion(nil, "Please check that Ethereum App is running on the Ledger device.")
             }
         }
     }

diff --git a/...wController/RejectionConfirmationViewController/RejectionConfirmationViewController.swift b/...wController/RejectionConfirmationViewController/RejectionConfirmationViewController.swift
@@ -216,6 +216,7 @@ extension RejectionConfirmationViewController: SelectLedgerDeviceDelegate {
               let ledgerKeyMetadata = KeyInfo.LedgerKeyMetadata.from(data: metadata) else { return }
 
         let pendingConfirmationVC = LedgerPendingConfirmationViewController(ledgerHash: rejectionTransaction.hardwareWalletHash)
+        pendingConfirmationVC.headerText = "Reject Transaction"
         pendingConfirmationVC.modalPresentationStyle = .popover
         pendingConfirmationVC.onClose = { [weak self] in
             self?.ledgerController = nil
@@ -227,11 +228,11 @@ extension RejectionConfirmationViewController: SelectLedgerDeviceDelegate {
         ledgerController = LedgerController(bluetoothController: bluetoothController)
         ledgerController!.sign(safeTxHash: safeTxHash,
                                deviceId: deviceId,
-                               path: ledgerKeyMetadata.path) { [weak self] signature in
+                               path: ledgerKeyMetadata.path) { [weak self] weakSignature, weakErrorMessage in
             // dismiss Ledger Pending Confirmation overlay
             controller.presentedViewController?.dismiss(animated: true, completion: nil)
-            guard let signature = signature else {
-                App.shared.snackbar.show(message: "The operation was canceled on the Ledger device.")
+            guard let signature = weakSignature else {
+                App.shared.snackbar.show(message: weakErrorMessage!)
                 controller.reloadData()
                 return
             }

diff --git a/...ig/UI/Transaction/TransactionDetailsViewController/TransactionDetailsViewController.swift b/...ig/UI/Transaction/TransactionDetailsViewController/TransactionDetailsViewController.swift
@@ -538,11 +538,11 @@ extension TransactionDetailsViewController: SelectLedgerDeviceDelegate {
         ledgerController = LedgerController(bluetoothController: bluetoothController)
         ledgerController!.sign(safeTxHash: safeTxHash,
                                deviceId: deviceId,
-                               path: ledgerKeyMetadata.path) { [weak self] signature in
+                               path: ledgerKeyMetadata.path) { [weak self] weakSignature, weakErrorMessage in
             // dismiss Ledger Pending Confirmation overlay
             controller.presentedViewController?.dismiss(animated: true, completion: nil)
-            guard let signature = signature else {
-                App.shared.snackbar.show(message: "The operation was canceled on the Ledger device.")
+            guard let signature = weakSignature else {
+                App.shared.snackbar.show(message: weakErrorMessage!)
                 controller.reloadData()
                 return
             }

diff --git a/Multisig/UI/WalletConnect/WCTransactionConfirmationViewController.swift b/Multisig/UI/WalletConnect/WCTransactionConfirmationViewController.swift
@@ -431,11 +431,11 @@ extension WCTransactionConfirmationViewController: SelectLedgerDeviceDelegate {
         ledgerController = LedgerController(bluetoothController: bluetoothController)
         ledgerController!.sign(safeTxHash: safeTxHash,
                                deviceId: deviceId,
-                               path: ledgerKeyMetadata.path) { [weak self] signature in
+                               path: ledgerKeyMetadata.path) { [weak self] weakSignature, weakErrorMessage in
             // dismiss Ledger Pending Confirmation overlay
             self?.presentedViewController?.dismiss(animated: true, completion: nil)
-            guard let signature = signature else {
-                App.shared.snackbar.show(message: "The operation was canceled on the Ledger device.")
+            guard let signature = weakSignature else {
+                App.shared.snackbar.show(message: weakErrorMessage!)
                 return
             }
             DispatchQueue.global().async {