Make WalletConnect signature request be clearer about where it's comi…

…ng from AlphaWallet#3289
1nz3kt0 · Nov 2, 2021 · 3355849 · 3355849
1 parent 34f1535
commit 3355849
Show file tree

Hide file tree

Showing 23 changed files with 302 additions and 226 deletions.
diff --git a/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift b/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift
@@ -215,7 +215,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
 
     private func signMessage(with type: SignMessageType, account: AlphaWallet.Address, callbackID: Int) {
         firstly {
-            SignMessageCoordinator.promise(analyticsCoordinator: analyticsCoordinator, navigationController: navigationController, keystore: keystore, coordinator: self, signType: type, account: account, source: .dappBrowser)
+            SignMessageCoordinator.promise(analyticsCoordinator: analyticsCoordinator, navigationController: navigationController, keystore: keystore, coordinator: self, signType: type, account: account, source: .dappBrowser, walletConnectSession: nil)
         }.done { data in
             let callback: DappCallback
             switch type {

diff --git a/AlphaWallet/Core/ViewModels/PromptViewModel.swift b/AlphaWallet/Core/ViewModels/PromptViewModel.swift
@@ -12,6 +12,6 @@ struct PromptViewModel {
     }
 
     var footerBackgroundColor: UIColor {
-        R.color.white()!
+        Colors.appWhite
     }
-}
+}
diff --git a/AlphaWallet/Localization/en.lproj/Localizable.strings b/AlphaWallet/Localization/en.lproj/Localizable.strings
@@ -34,7 +34,9 @@
 "transaction.blockNumber.label.title" = "Block #";
 "transaction.nonce.label.title" = "Nonce";
 "confirmPayment.confirm.button.title" = "Confirm";
+"confirmPayment.sign.button.title" = "Sign";
 "confirmPayment.reject.button.title" = "Reject";
+"confirmPayment.connect.button.title" = "Connect";
 "confirmPayment.from.label.title" = "From";
 "confirmPayment.gasFee.label.title" = "Estimate Network Fee";
 "confirmPayment.gasLimit.label.title" = "Gas Limit";

diff --git a/AlphaWallet/Localization/es.lproj/Localizable.strings b/AlphaWallet/Localization/es.lproj/Localizable.strings
@@ -34,7 +34,9 @@
 "transaction.blockNumber.label.title" = "Bloque n.º";
 "transaction.nonce.label.title" = "Nonce";
 "confirmPayment.confirm.button.title" = "Confirmar";
+"confirmPayment.sign.button.title" = "Sign";
 "confirmPayment.reject.button.title" = "Reject";
+"confirmPayment.connect.button.title" = "Connect";
 "confirmPayment.from.label.title" = "De";
 "confirmPayment.gasFee.label.title" = "Estimación de la tarifa de red";
 "confirmPayment.gasLimit.label.title" = "Límite de gas";

diff --git a/AlphaWallet/Localization/ja.lproj/Localizable.strings b/AlphaWallet/Localization/ja.lproj/Localizable.strings
@@ -34,7 +34,9 @@
 "transaction.blockNumber.label.title" = "ブロック番号";
 "transaction.nonce.label.title" = "Nonce";
 "confirmPayment.confirm.button.title" = "確認";
+"confirmPayment.sign.button.title" = "Sign";
 "confirmPayment.reject.button.title" = "Reject";
+"confirmPayment.connect.button.title" = "Connect";
 "confirmPayment.from.label.title" = "送信元";
 "confirmPayment.gasFee.label.title" = "Estimate Network Fee";
 "confirmPayment.gasLimit.label.title" = "ガスの制限";

diff --git a/AlphaWallet/Localization/ko.lproj/Localizable.strings b/AlphaWallet/Localization/ko.lproj/Localizable.strings
@@ -34,7 +34,9 @@
 "transaction.blockNumber.label.title" = "블록 번호";
 "transaction.nonce.label.title" = "Nonce";
 "confirmPayment.confirm.button.title" = "확인";
+"confirmPayment.sign.button.title" = "Sign";
 "confirmPayment.reject.button.title" = "Reject";
+"confirmPayment.connect.button.title" = "Connect";
 "confirmPayment.from.label.title" = "발신인";
 "confirmPayment.gasFee.label.title" = "Estimate Network Fee";
 "confirmPayment.gasLimit.label.title" = "가스 한도";

diff --git a/AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings b/AlphaWallet/Localization/zh-Hans.lproj/Localizable.strings
@@ -34,7 +34,9 @@
 "transaction.blockNumber.label.title" = "区块 #";
 "transaction.nonce.label.title" = "Nonce";
 "confirmPayment.confirm.button.title" = "确认";
+"confirmPayment.sign.button.title" = "Sign";
 "confirmPayment.reject.button.title" = "Reject";
+"confirmPayment.connect.button.title" = "Connect";
 "confirmPayment.from.label.title" = "来源地址";
 "confirmPayment.gasFee.label.title" = "估计网络费用";
 "confirmPayment.gasLimit.label.title" = "燃料限制";

diff --git a/AlphaWallet/Tokens/Views/TokenInstanceWebView.swift b/AlphaWallet/Tokens/Views/TokenInstanceWebView.swift
@@ -492,7 +492,7 @@ extension TokenInstanceWebView {
         guard let navigationController = delegate?.navigationControllerFor(tokenInstanceWebView: self) else { return }
         let keystore = try! EtherKeystore(analyticsCoordinator: analyticsCoordinator)
         firstly {
-            SignMessageCoordinator.promise(analyticsCoordinator: analyticsCoordinator, navigationController: navigationController, keystore: keystore, signType: type, account: account, source: .tokenScript)
+            SignMessageCoordinator.promise(analyticsCoordinator: analyticsCoordinator, navigationController: navigationController, keystore: keystore, signType: type, account: account, source: .tokenScript, walletConnectSession: nil)
         }.done { data in
             let callback: DappCallback
             switch type {

diff --git a/AlphaWallet/Transfer/Coordinators/SignMessageCoordinator.swift b/AlphaWallet/Transfer/Coordinators/SignMessageCoordinator.swift
@@ -29,7 +29,7 @@ class SignMessageCoordinator: Coordinator {
     weak var delegate: SignMessageCoordinatorDelegate?
 
     private lazy var confirmationViewController: SignatureConfirmationViewController = {
-        let controller = SignatureConfirmationViewController(viewModel: .init(message: message))
+        let controller = SignatureConfirmationViewController(viewModel: .init(message: message, walletConnectSession: walletConnectSession))
         controller.delegate = self
         return controller
     }()
@@ -42,10 +42,12 @@ class SignMessageCoordinator: Coordinator {
 
         return controller
     }()
-
-    init(analyticsCoordinator: AnalyticsCoordinator, navigationController: UINavigationController, keystore: Keystore, account: AlphaWallet.Address, message: SignMessageType, source: Analytics.SignMessageRequestSource) {
+    private let walletConnectSession: WalletConnectSessionViewModel?
+
+    init(analyticsCoordinator: AnalyticsCoordinator, navigationController: UINavigationController, keystore: Keystore, account: AlphaWallet.Address, message: SignMessageType, source: Analytics.SignMessageRequestSource, walletConnectSession: WalletConnectSessionViewModel?) {
         self.analyticsCoordinator = analyticsCoordinator
         self.presentationNavigationController = navigationController
+        self.walletConnectSession = walletConnectSession
         self.keystore = keystore
         self.account = account
         self.message = message
@@ -133,8 +135,7 @@ extension SignMessageCoordinator: SignatureConfirmationViewControllerDelegate {
     func didClose(in controller: SignatureConfirmationViewController) {
         analyticsCoordinator.log(action: Analytics.Action.cancelSignMessageRequest)
         navigationController.dismiss(animated: false) {
-            guard let delegate = self.delegate else { return }
-            delegate.didCancel(in: self)
+            self.delegate?.didCancel(in: self)
         }
     }
 }

diff --git a/AlphaWallet/Transfer/Coordinators/TransactionConfirmationCoordinator.swift b/AlphaWallet/Transfer/Coordinators/TransactionConfirmationCoordinator.swift
@@ -13,15 +13,16 @@ import Result
 enum TransactionConfirmationConfiguration {
     case tokenScriptTransaction(confirmType: ConfirmType, contract: AlphaWallet.Address, keystore: Keystore, functionCallMetaData: DecodedFunctionCall, ethPrice: Subscribable<Double>)
     case dappTransaction(confirmType: ConfirmType, keystore: Keystore, ethPrice: Subscribable<Double>)
-    case walletConnect(confirmType: ConfirmType, keystore: Keystore, ethPrice: Subscribable<Double>)
+    case walletConnect(confirmType: ConfirmType, keystore: Keystore, ethPrice: Subscribable<Double>, walletConnectSession: WalletConnectSessionMappedToServer)
     case sendFungiblesTransaction(confirmType: ConfirmType, keystore: Keystore, assetDefinitionStore: AssetDefinitionStore, amount: FungiblesTransactionAmount, ethPrice: Subscribable<Double>)
     case sendNftTransaction(confirmType: ConfirmType, keystore: Keystore, ethPrice: Subscribable<Double>, tokenInstanceName: String?)
     case claimPaidErc875MagicLink(confirmType: ConfirmType, keystore: Keystore, price: BigUInt, ethPrice: Subscribable<Double>, numberOfTokens: UInt)
     case speedupTransaction(keystore: Keystore, ethPrice: Subscribable<Double>)
     case cancelTransaction(keystore: Keystore, ethPrice: Subscribable<Double>)
+
     var confirmType: ConfirmType {
         switch self {
-        case .dappTransaction(let confirmType, _, _), .walletConnect(let confirmType, _, _), .sendFungiblesTransaction(let confirmType, _, _, _, _), .sendNftTransaction(let confirmType, _, _, _), .tokenScriptTransaction(let confirmType, _, _, _, _), .claimPaidErc875MagicLink(let confirmType, _, _, _, _):
+        case .dappTransaction(let confirmType, _, _), .walletConnect(let confirmType, _, _, _), .sendFungiblesTransaction(let confirmType, _, _, _, _), .sendNftTransaction(let confirmType, _, _, _), .tokenScriptTransaction(let confirmType, _, _, _, _), .claimPaidErc875MagicLink(let confirmType, _, _, _, _):
             return confirmType
         case .speedupTransaction, .cancelTransaction:
             return .signThenSend
@@ -30,14 +31,14 @@ enum TransactionConfirmationConfiguration {
 
     var keystore: Keystore {
         switch self {
-        case .dappTransaction(_, let keystore, _), .walletConnect(_, let keystore, _), .sendFungiblesTransaction(_, let keystore, _, _, _), .sendNftTransaction(_, let keystore, _, _), .tokenScriptTransaction(_, _, let keystore, _, _), .claimPaidErc875MagicLink(_, let keystore, _, _, _), .speedupTransaction(let keystore, _), .cancelTransaction(let keystore, _):
+        case .dappTransaction(_, let keystore, _), .walletConnect(_, let keystore, _, _), .sendFungiblesTransaction(_, let keystore, _, _, _), .sendNftTransaction(_, let keystore, _, _), .tokenScriptTransaction(_, _, let keystore, _, _), .claimPaidErc875MagicLink(_, let keystore, _, _, _), .speedupTransaction(let keystore, _), .cancelTransaction(let keystore, _):
             return keystore
         }
     }
 
     var ethPrice: Subscribable<Double> {
         switch self {
-        case .dappTransaction(_, _, let ethPrice), .walletConnect(_, _, let ethPrice), .sendFungiblesTransaction(_, _, _, _, let ethPrice), .sendNftTransaction(_, _, let ethPrice, _), .tokenScriptTransaction(_, _, _, _, let ethPrice), .claimPaidErc875MagicLink(_, _, _, let ethPrice, _), .speedupTransaction(_, let ethPrice), .cancelTransaction(_, let ethPrice):
+        case .dappTransaction(_, _, let ethPrice), .walletConnect(_, _, let ethPrice, _), .sendFungiblesTransaction(_, _, _, _, let ethPrice), .sendNftTransaction(_, _, let ethPrice, _), .tokenScriptTransaction(_, _, _, _, let ethPrice), .claimPaidErc875MagicLink(_, _, _, let ethPrice, _), .speedupTransaction(_, let ethPrice), .cancelTransaction(_, let ethPrice):
             return ethPrice
         }
     }

diff --git a/AlphaWallet/Transfer/ViewControllers/SignatureConfirmationViewController.swift b/AlphaWallet/Transfer/ViewControllers/SignatureConfirmationViewController.swift
@@ -15,7 +15,7 @@ protocol SignatureConfirmationViewControllerDelegate: AnyObject {
 
 class SignatureConfirmationViewController: UIViewController {
     private lazy var headerView = ConfirmationHeaderView(viewModel: .init(title: viewModel.navigationTitle))
-    private let buttonsBar = ButtonsBar(configuration: .custom(types: [.green, .white]))
+    private let buttonsBar = ButtonsBar(configuration: .empty)
     private (set) var viewModel: SignatureConfirmationViewModel
 
     private let stackView: UIStackView = {
@@ -224,22 +224,23 @@ class SignatureConfirmationViewController: UIViewController {
     func reloadView() {
         generateSubviews()
     }
-
+    
     private func configure(for viewModel: SignatureConfirmationViewModel) {
         scrollView.backgroundColor = viewModel.backgroundColor
         view.backgroundColor = viewModel.backgroundColor
         navigationItem.title = viewModel.title
 
-        buttonsBar.configure()
+        headerView.iconImageView.setImage(url: viewModel.dappIconUrl, placeholder: viewModel.placeholderIcon)
+        buttonsBar.configure(.custom(types: [.white, .green]))
 
-        let button1 = buttonsBar.buttons[0]
+        let button1 = buttonsBar.buttons[1]
         button1.shrinkBorderColor = Colors.loadingIndicatorBorder
         button1.setTitle(viewModel.confirmationButtonTitle, for: .normal)
         button1.addTarget(self, action: #selector(confirmButtonTapped), for: .touchUpInside)
 
-        let button2 = buttonsBar.buttons[1]
+        let button2 = buttonsBar.buttons[0]
         button2.shrinkBorderColor = Colors.loadingIndicatorBorder
-        button2.setTitle(viewModel.rejectionButtonTitle, for: .normal)
+        button2.setTitle(viewModel.cancelationButtonTitle, for: .normal)
         button2.addTarget(self, action: #selector(dismissViewController), for: .touchUpInside)
     }
 
@@ -260,29 +261,61 @@ extension SignatureConfirmationViewController {
         var views: [UIView] = []
         switch viewModel {
         case .typedMessage(let viewModel):
-            for sectionIndex in viewModel.typedData.indices {
-                let header = TransactionConfirmationHeaderView(viewModel: viewModel.headerViewModel(section: sectionIndex))
-                header.delegate = self
-                header.enableTapAction(title: "Show")
-
-                views.append(header)
+            for each in viewModel.viewModels {
+                switch each {
+                case .header(let headerViewModel):
+                    let header = TransactionConfirmationHeaderView(viewModel: headerViewModel)
+                    header.delegate = self
+
+                    views.append(header)
+                case .headerWithShowButton(let headerViewModel, let availableToShowFullMessage):
+                    let header = TransactionConfirmationHeaderView(viewModel: headerViewModel)
+                    header.delegate = self
+
+                    if availableToShowFullMessage {
+                        header.enableTapAction(title: "Show")
+                    }
+
+                    views.append(header)
+                }
             }
-        case .personalMessage(viewModel: let viewModel), .message(viewModel: let viewModel):
-            let header = TransactionConfirmationHeaderView(viewModel: viewModel.headerViewModel(section: 0))
-            header.delegate = self
-
-            if viewModel.availableToShowFullMessage {
-                header.enableTapAction(title: "Show")
+        case .personalMessage(let viewModel), .message(let viewModel):
+            for each in viewModel.viewModels {
+                switch each {
+                case .header(let headerViewModel):
+                    let header = TransactionConfirmationHeaderView(viewModel: headerViewModel)
+                    header.delegate = self
+
+                    views.append(header)
+                case .headerWithShowButton(let headerViewModel, let availableToShowFullMessage):
+                    let header = TransactionConfirmationHeaderView(viewModel: headerViewModel)
+                    header.delegate = self
+
+                    if availableToShowFullMessage {
+                        header.enableTapAction(title: "Show")
+                    }
+
+                    views.append(header)
+                }
             }
-
-            views.append(header)
-        case .eip712v3And4(viewModel: let viewModel):
-            for sectionIndex in viewModel.values.indices {
-                let header = TransactionConfirmationHeaderView(viewModel: viewModel.headerViewModel(section: sectionIndex))
-                header.delegate = self
-                header.enableTapAction(title: "Show")
-
-                views.append(header)
+        case .eip712v3And4(let viewModel):
+            for each in viewModel.viewModels {
+                switch each {
+                case .header(let headerViewModel):
+                    let header = TransactionConfirmationHeaderView(viewModel: headerViewModel)
+                    header.delegate = self
+
+                    views.append(header)
+                case .headerWithShowButton(let headerViewModel, let availableToShowFullMessage):
+                    let header = TransactionConfirmationHeaderView(viewModel: headerViewModel)
+                    header.delegate = self
+
+                    if availableToShowFullMessage {
+                        header.enableTapAction(title: "Show")
+                    }
+
+                    views.append(header)
+                }
             }
         }
 

diff --git a/AlphaWallet/Transfer/ViewControllers/TransactionConfirmationViewController.swift b/AlphaWallet/Transfer/ViewControllers/TransactionConfirmationViewController.swift
@@ -170,6 +170,8 @@ class TransactionConfirmationViewController: UIViewController {
 
         switch viewModel {
         case .dappOrWalletConnectTransaction(let dappTransactionViewModel):
+            headerView.iconImageView.setImage(url: dappTransactionViewModel.dappIconUrl, placeholder: dappTransactionViewModel.placeholderIcon)
+
             dappTransactionViewModel.ethPrice.subscribe { [weak self] cryptoToDollarRate in
                 guard let strongSelf = self else { return }
                 dappTransactionViewModel.cryptoToDollarRate = cryptoToDollarRate

diff --git a/AlphaWallet/Transfer/ViewModels/ConfirmationHeaderViewModel.swift b/AlphaWallet/Transfer/ViewModels/ConfirmationHeaderViewModel.swift
@@ -21,9 +21,9 @@ struct ConfirmationHeaderViewModel {
         style.alignment = .center
 
         return .init(string: title, attributes: [
-            .font: DataEntry.Font.text as Any,
+            .font: Fonts.semibold(size: 17) as Any,
             .paragraphStyle: style,
-            .foregroundColor: Colors.darkGray
+            .foregroundColor: Colors.black
         ])
     }
     var swipeIndicationHidden: Bool