Merge pull request #3283 from safe-global/GH-2996/notification-metamask

GH-2996 show error message from the metamask
safe-global · Aug 9, 2023 · 8654d75 · 8654d75
2 parents 22a578a + 3716beb
commit 8654d75
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/Multisig.xcodeproj/project.pbxproj b/Multisig.xcodeproj/project.pbxproj
@@ -25,7 +25,7 @@
 		04248BDB272E21C500431397 /* AddressBookTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04248BDA272E11BB00431397 /* AddressBookTests.swift */; };
 		042626E128EEE61E000BD2CC /* successAnimationDark.json in Resources */ = {isa = PBXBuildFile; fileRef = 042626E028EEE61E000BD2CC /* successAnimationDark.json */; };
 		042626E328EEE62F000BD2CC /* successAnimation.json in Resources */ = {isa = PBXBuildFile; fileRef = 042626E228EEE62F000BD2CC /* successAnimation.json */; };
-		04273663291191980033FEF5 /* KeyAddedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04273662291191980033FEF5 /* KeyAddedViewController.swift */; };
+		04273663291191980033FEF5 /* KeyNotificationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04273662291191980033FEF5 /* KeyNotificationViewController.swift */; };
 		04273E5826AEE06500A14E95 /* BluetoothController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04273E5726AEE06500A14E95 /* BluetoothController.swift */; };
 		04273E5A26B1474700A14E95 /* LedgerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04273E5926B1474700A14E95 /* LedgerController.swift */; };
 		04273E5C26B41A3700A14E95 /* APDUController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04273E5B26B41A3700A14E95 /* APDUController.swift */; };
@@ -1075,7 +1075,7 @@
 		04248BDA272E11BB00431397 /* AddressBookTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressBookTests.swift; sourceTree = "<group>"; };
 		042626E028EEE61E000BD2CC /* successAnimationDark.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = successAnimationDark.json; sourceTree = "<group>"; };
 		042626E228EEE62F000BD2CC /* successAnimation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = successAnimation.json; sourceTree = "<group>"; };
-		04273662291191980033FEF5 /* KeyAddedViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyAddedViewController.swift; sourceTree = "<group>"; };
+		04273662291191980033FEF5 /* KeyNotificationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyNotificationViewController.swift; sourceTree = "<group>"; };
 		04273E5726AEE06500A14E95 /* BluetoothController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BluetoothController.swift; sourceTree = "<group>"; };
 		04273E5926B1474700A14E95 /* LedgerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LedgerController.swift; sourceTree = "<group>"; };
 		04273E5B26B41A3700A14E95 /* APDUController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = APDUController.swift; sourceTree = "<group>"; };
@@ -4157,7 +4157,7 @@
 				6A1CFA4C280819C600B2C340 /* Backup */,
 				55CCD58627550F42004EA3E3 /* DelegateKeyController.swift */,
 				0ADD19B5265EA23200EB0F2B /* ExportViewController.swift */,
-				04273662291191980033FEF5 /* KeyAddedViewController.swift */,
+				04273662291191980033FEF5 /* KeyNotificationViewController.swift */,
 				D80B5A0C276A362900D6E024 /* AddOwnerFirst */,
 				55413674265E49E100796F91 /* AddOwnerKeyViewController */,
 				049A9D6D25F92FB000CA5723 /* ChooseOwnerKeyViewController */,
@@ -5560,7 +5560,7 @@
 				0A451C06252DDB93001DB7D2 /* NetworkContentView.swift in Sources */,
 				0AC0948127945B5900FA1B83 /* CircleView.swift in Sources */,
 				0A93DDBB24461F4800688050 /* Buttons.swift in Sources */,
-				04273663291191980033FEF5 /* KeyAddedViewController.swift in Sources */,
+				04273663291191980033FEF5 /* KeyNotificationViewController.swift in Sources */,
 				04FA1A342580FDF100E45671 /* HistoryTransactionsSummaryListRequest.swift in Sources */,
 				0A3DAD9B26270F5500743E38 /* IDN.swift in Sources */,
 				550FB1B626691D9500C13D54 /* DetailedCell.swift in Sources */,

diff --git a/Multisig/Features/Connect to Wallet/UI/SignatureRequestToWalletViewController.swift b/Multisig/Features/Connect to Wallet/UI/SignatureRequestToWalletViewController.swift
@@ -79,10 +79,14 @@ class SignatureRequestToWalletViewController: PendingWalletActionViewController
     }
 
     private func handleRequestResponse(_ result: Result<String, Error>) {
-        DispatchQueue.main.async {
+        DispatchQueue.main.async { [weak self] in
+            guard let self = self else { return }
             switch result {
             case .failure(let error):
-                App.shared.snackbar.show(message: error.localizedDescription)
+                let wallet = self.connection?.remotePeer?.name
+                let message = error.localizedDescription
+                let errorMessage = [wallet, message].compactMap{ $0 }.joined(separator: ": ")
+                App.shared.snackbar.show(message: errorMessage)
                 self.doCancel()
             case .success(let signature):
                 self.dismiss(animated: true) {

diff --git a/Multisig/Features/Connect to Web/Logic/WebConnectionController.swift b/Multisig/Features/Connect to Web/Logic/WebConnectionController.swift
@@ -1032,6 +1032,10 @@ class WebConnectionController: ServerDelegateV2, RequestHandler, WebConnectionSu
     }
 
     private func handleSignResponse(_ response: Response, completion: @escaping (Result<String, Error>) -> Void) {
+        if let error = response.error {
+            completion(.failure(error))
+            return
+        }
         do {
             var signature = try response.result(as: String.self)
 

diff --git a/Multisig/UI/Settings/OwnerKeyManagement/GenerateOwnerKey/AddKeyFlow.swift b/Multisig/UI/Settings/OwnerKeyManagement/GenerateOwnerKey/AddKeyFlow.swift
@@ -115,7 +115,7 @@ class AddKeyFlow: UIFlow {
             return
         }
 
-        let vc = factory.keyAdded(address: address, name: name, type: type) { [unowned self] in
+        let vc = factory.keyNotification(for: address, name: name, type: type) { [unowned self] in
             didDelegateKeySetup()
         }
 
@@ -174,11 +174,11 @@ class AddKeyFlowFactory {
         OwnerKeyDetailsViewController(keyInfo: keyInfo, completion: completion)
     }
 
-    func keyAdded(address: Address,
-                  name: String,
-                  type: KeyType,
-                  completion: @escaping () -> ()) -> KeyAddedViewController {
-        KeyAddedViewController(address: address,
+    func keyNotification(for address: Address,
+                         name: String,
+                         type: KeyType,
+                         completion: @escaping () -> ()) -> KeyNotificationViewController {
+        KeyNotificationViewController(address: address,
                                name: name,
                                type: type,
                                completion: completion)

diff --git a/...eyManagement/KeyAddedViewController.swift → ...ement/KeyNotificationViewController.swift b/...eyManagement/KeyAddedViewController.swift → ...ement/KeyNotificationViewController.swift
@@ -1,13 +1,13 @@
 //
-//  KeyAddedViewController.swift
+//  KeyNotificationViewController.swift
 //  Multisig
 //
 //  Created by Mouaz on 11/1/22.
 //  Copyright © 2022 Gnosis Ltd. All rights reserved.
 //
 
 import Foundation
-class KeyAddedViewController: AccountActionCompletedViewController {
+class KeyNotificationViewController: AccountActionCompletedViewController {
     private var addKeyController: DelegateKeyController!
     private var type: KeyType!