Update error type implementation so handling them is less fragile #6498

2 years ago · cc855861d0
parent 7c4e835add
commit cc855861d0
39 changed files with 131 additions and 141 deletions
--- a/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift
+++ b/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift
@ -872,7 +872,7 @@ extension DappBrowserCoordinator {
    enum DappBrowserError: Error, LocalizedError {
        case serverUnavailable

-        var localizedDescription: String {
+        var errorDescription: String? {
            return "RPC Server Unavailable"
        }
    }
--- a/AlphaWallet/Common/Coordinators/WalletApiCoordinator.swift
+++ b/AlphaWallet/Common/Coordinators/WalletApiCoordinator.swift
@ -107,7 +107,7 @@ class WalletApiCoordinator: NSObject, Coordinator {
    private func displayError(_ error: Error, completion: @escaping () -> Void) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError, completion: completion)
+            .displayError(message: error.localizedDescription, completion: completion)
    }

    private func acceptProposal(proposalType: ProposalType) -> Promise<ProposalResult> {
--- a/AlphaWallet/Common/Types/Error.swift
+++ b/AlphaWallet/Common/Types/Error.swift
@ -2,8 +2,9 @@

 import Foundation
 import AlphaWalletFoundation
+import AlphaWalletCore

-extension KeystoreError {
+extension KeystoreError: LocalizedError {
    public var errorDescription: String? {
        switch self {
        case .failedToDeleteAccount:
@ -40,69 +41,41 @@ extension KeystoreError {
    }
 }

-public struct UndefinedError: LocalizedError { }
-public struct UnknownError: LocalizedError { }
-
 extension Error {
-    public var prettyError: String {
-        //TODO figure out how we can remove this switch-cases. Too fragile
-        switch self {
-        case let error as BuyCryptoError:
-            return error.localizedDescription
-        case let error as ActiveWalletError:
-            return error.localizedDescription
-        case let error as SwapTokenError:
-            return error.localizedDescription
-        case let error as WalletApiError:
-            return error.localizedDescription
-        case let error as FunctionError:
-            return error.localizedDescription
-        case let error as TransactionConfiguratorError:
-            return error.localizedDescription
-        case let error as KeystoreError:
-            return error.errorDescription ?? UnknownError().localizedDescription
-        case let error as SendInputErrors:
-            return error.errorDescription ?? UnknownError().localizedDescription
-        case let error as RpcNodeRetryableRequestError:
-            return error.errorDescription ?? UnknownError().localizedDescription
-        case let error as OpenURLError:
-            return error.localizedDescription
-        case let error as ConfigureTransactionError:
-            return error.localizedDescription
-        case let error as AddCustomChainError:
-            return error.localizedDescription
-        case let error as SignMessageValidatorError:
-            return error.localizedDescription
-        case let error as SessionTaskError:
-            return generatePrettyError(forSessionTaskError: error)
-        case let error as LocalizedError:
-            return error.errorDescription ?? UnknownError().localizedDescription
-        case let error as NSError:
-            return error.localizedDescription
-        default:
-            return UndefinedError().localizedDescription
-        }
-    }
-
    public var code: Int { return (self as NSError).code }
    public var domain: String { return (self as NSError).domain }
+}

-    private func generatePrettyError(forSessionTaskError error: SessionTaskError) -> String {
-        switch error {
+extension PromiseError: LocalizedError {
+    public var errorDescription: String? {
+        return embedded.localizedDescription
+    }
+}
+
+extension SessionTaskError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
        case .connectionError(let error):
-            return error.prettyError
+            return error.localizedDescription
        case .requestError(let error):
-            return error.prettyError
+            return error.localizedDescription
        case .responseError(let error):
-            guard let JSONError = error as? JSONRPCError else {
-                return error.prettyError
+            return error.localizedDescription
        }
-            switch JSONError {
-            case .responseError(_, let message, _):
-                return message
-            case .responseNotFound, .resultObjectParseError, .errorObjectParseError, .unsupportedVersion, .unexpectedTypeObject, .missingBothResultAndError, .nonArrayResponse:
-                return UndefinedError().localizedDescription
    }
+}
+
+extension AnyCAIP10AccountProvidable.CAIP10AccountProvidableError: LocalizedError {
+    var errorDescription: String? {
+        switch self {
+        case .unavailableToBuildBlockchain:
+            return "Unavailable To Build Blockchain"
+        case .accountsNotFound:
+            return "Accounts Not Found"
+        case .emptyNamespaces:
+            return "Empty Namespaces"
+        case .eip155NotFound:
+            return "Eip155 Not Found"
        }
    }
 }
--- a/AlphaWallet/Extensions/UIViewController.swift
+++ b/AlphaWallet/Extensions/UIViewController.swift
@ -8,7 +8,7 @@ import SafariServices
 import UIKit
 import AlphaWalletFoundation

-enum ConfirmationError: LocalizedError {
+enum ConfirmationError: Error {
    case cancel
 }

@ -55,10 +55,10 @@ extension UIViewController {
        var title = title
        let message: String
        if title.isEmpty {
-            title = error.prettyError
+            title = error.localizedDescription
            message = ""
        } else {
-            message = error.prettyError
+            message = error.localizedDescription
        }
        let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
        alertController.popoverPresentationController?.sourceView = view
--- a/AlphaWallet/Settings/Coordinators/CheckTransactionStateCoordinator.swift
+++ b/AlphaWallet/Settings/Coordinators/CheckTransactionStateCoordinator.swift
@ -60,7 +60,7 @@ extension CheckTransactionStateCoordinator: SelectTransactionHashViewControllerD
            .transactionsState(hash: transactionHash)
            .sink(receiveCompletion: { result in
                if case .failure(let error) = result {
-                    self.displayErrorMessage(R.string.localizable.checkTransactionStateError(error.prettyError), title: R.string.localizable.error())
+                    self.displayErrorMessage(R.string.localizable.checkTransactionStateError(error.localizedDescription), title: R.string.localizable.error())
                }

                self.rootViewController.set(isActionButtonEnable: true)
--- a/AlphaWallet/Settings/Coordinators/PingInfuraCoordinator.swift
+++ b/AlphaWallet/Settings/Coordinators/PingInfuraCoordinator.swift
@ -57,7 +57,7 @@ class PingInfuraCoordinator: Coordinator {
                if case .failure(let error) = result {
                    UIAlertController.alert(
                        title: R.string.localizable.settingsPingInfuraFail(),
-                        message: "\(error.prettyError)",
+                        message: "\(error.localizedDescription)",
                        alertButtonTitles: [R.string.localizable.oK()],
                        alertButtonStyles: [.cancel],
                        viewController: self.viewController,
--- a/AlphaWallet/Settings/ViewModels/CheckTransactionStateViewModel.swift
+++ b/AlphaWallet/Settings/ViewModels/CheckTransactionStateViewModel.swift
@ -68,14 +68,3 @@ extension AlphaWalletWeb3.Web3Error: LocalizedError {
        }
    }
 }
-extension UndefinedError {
-    public var localizedDescription: String {
-        R.string.localizable.undefinedError()
-    }
-}
-
-extension UnknownError {
-    public var localizedDescription: String {
-        R.string.localizable.unknownError()
-    }
-}
--- a/AlphaWallet/Settings/ViewModels/ExportJsonKeystoreFileViewModel.swift
+++ b/AlphaWallet/Settings/ViewModels/ExportJsonKeystoreFileViewModel.swift
@ -57,7 +57,7 @@ class ExportJsonKeystoreFileViewModel {
            .share()
            .eraseToAnyPublisher()

-        let error = Publishers.Merge(makeJsonFile.compactMap { $0.error?.prettyError }, computeJson.compactMap { $0.error?.prettyError })
+        let error = Publishers.Merge(makeJsonFile.compactMap { $0.error?.localizedDescription }, computeJson.compactMap { $0.error?.localizedDescription })
            .eraseToAnyPublisher()

        let fileUrl = makeJsonFile.compactMap { $0.value }
--- a/AlphaWallet/Swap/Swap/SwapTokensCoordinator.swift
+++ b/AlphaWallet/Swap/Swap/SwapTokensCoordinator.swift
@ -205,7 +205,7 @@ extension SwapTokensCoordinator: ApproveSwapProviderDelegate {
        } else {
            UIApplication.shared
                .presentedViewController(or: navigationController)
-                .displayError(message: error.prettyError)
+                .displayError(message: error.localizedDescription)
        }
    }

@ -281,7 +281,7 @@ extension SwapTokensCoordinator: ApproveSwapProviderDelegate {
    private func showError(_ error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }
 }

@ -313,7 +313,7 @@ extension SwapTokensCoordinator: TransactionConfirmationCoordinatorDelegate {
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }

    func didClose(in coordinator: TransactionConfirmationCoordinator) {
--- a/AlphaWallet/Swap/Swap/ViewModels/SwapQuoteDetailsViewModel.swift
+++ b/AlphaWallet/Swap/Swap/ViewModels/SwapQuoteDetailsViewModel.swift
@ -128,7 +128,7 @@ final class SwapQuoteDetailsViewModel {
 }

 extension TokenLevelTokenScriptDisplayStatus.SignatureValidationError {
-    var localizedDescription: String {
+    var errorDescription: String? {
        switch self {
        case .tokenScriptType1SupportedNotCanonicalizedAndUnsigned:
            return R.string.localizable.tokenScriptType1SupportedNotCanonicalizedAndUnsigned()
--- a/AlphaWallet/Tokens/Coordinators/ClaimPaidOrderCoordinator.swift
+++ b/AlphaWallet/Tokens/Coordinators/ClaimPaidOrderCoordinator.swift
@ -86,7 +86,7 @@ class ClaimPaidOrderCoordinator: Coordinator {
        } catch {
            UIApplication.shared
                .presentedViewController(or: navigationController)
-                .displayError(message: error.prettyError)
+                .displayError(message: error.localizedDescription)
        }
    }
 }
@ -95,7 +95,7 @@ extension ClaimPaidOrderCoordinator: TransactionConfirmationCoordinatorDelegate
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)

        delegate?.coordinator(self, didFailTransaction: error)
    }
--- a/AlphaWallet/Tokens/ViewControllers/NewTokenViewController.swift
+++ b/AlphaWallet/Tokens/ViewControllers/NewTokenViewController.swift
@ -318,7 +318,7 @@ class NewTokenViewController: UIViewController {
        var balance: [String] = viewModel.erc875TokenBalance

        guard let address = AlphaWallet.Address(string: contract) else {
-            addressTextField.errorState = .error(InputError.invalidAddress.prettyError)
+            addressTextField.errorState = .error(InputError.invalidAddress.localizedDescription)
            return
        }
        addressTextField.errorState = .none
@ -378,7 +378,7 @@ extension NewTokenViewController: AddressTextFieldDelegate {
    }

    func displayError(error: Error, for textField: AddressTextField) {
-        textField.errorState = .error(error.prettyError)
+        textField.errorState = .error(error.localizedDescription)
    }

    func openQRCodeReader(for textField: AddressTextField) {
--- a/AlphaWallet/Transactions/Coordinators/ReplaceTransactionCoordinator.swift
+++ b/AlphaWallet/Transactions/Coordinators/ReplaceTransactionCoordinator.swift
@ -149,7 +149,7 @@ extension ReplaceTransactionCoordinator: TransactionConfirmationCoordinatorDeleg
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: presentingViewController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }

    func didSendTransaction(_ transaction: SentTransaction, inCoordinator coordinator: TransactionConfirmationCoordinator) {
--- a/AlphaWallet/Transfer/Collectibles/Coordinators/TransferCollectiblesCoordinator.swift
+++ b/AlphaWallet/Transfer/Collectibles/Coordinators/TransferCollectiblesCoordinator.swift
@ -125,7 +125,7 @@ extension TransferCollectiblesCoordinator: SendSemiFungibleTokenViewControllerDe
        } catch {
            UIApplication.shared
                .presentedViewController(or: navigationController)
-                .displayError(message: error.prettyError)
+                .displayError(message: error.localizedDescription)
        }
    }

@ -164,7 +164,7 @@ extension TransferCollectiblesCoordinator: TransactionConfirmationCoordinatorDel
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }

    func didClose(in coordinator: TransactionConfirmationCoordinator) {
--- a/AlphaWallet/Transfer/Collectibles/ViewControllers/SendSemiFungibleTokenViewController.swift
+++ b/AlphaWallet/Transfer/Collectibles/ViewControllers/SendSemiFungibleTokenViewController.swift
@ -167,7 +167,7 @@ final class SendSemiFungibleTokenViewController: UIViewController, TokenVerifiab
        if let address = AlphaWallet.Address(string: targetAddressTextField.value.trimmed) {
            delegate?.didEnterWalletAddress(tokenHolders: viewModel.tokenHolders, to: address, in: self)
        } else {
-            targetAddressTextField.errorState = .error(InputError.invalidAddress.prettyError)
+            targetAddressTextField.errorState = .error(InputError.invalidAddress.localizedDescription)
        }
    }

@ -219,7 +219,7 @@ extension SendSemiFungibleTokenViewController: AddressTextFieldDelegate {
    }

    func displayError(error: Error, for textField: AddressTextField) {
-        targetAddressTextField.errorState = .error(InputError.invalidAddress.prettyError)
+        targetAddressTextField.errorState = .error(InputError.invalidAddress.localizedDescription)
    }

    func openQRCodeReader(for textField: AddressTextField) {
--- a/AlphaWallet/Transfer/Collectibles/ViewModels/SendSemiFungibleTokenViewModel.swift
+++ b/AlphaWallet/Transfer/Collectibles/ViewModels/SendSemiFungibleTokenViewModel.swift
@ -69,7 +69,7 @@ final class SendSemiFungibleTokenViewModel {
    }
 }

-extension RpcNodeRetryableRequestError {
+extension RpcNodeRetryableRequestError: LocalizedError {
    public var errorDescription: String? {
        switch self {
        case .possibleBinanceTestnetTimeout:
@ -89,8 +89,8 @@ extension RpcNodeRetryableRequestError {
    }
 }

-extension SwapTokenError {
-    var localizedDescription: String {
+extension SwapTokenError: LocalizedError {
+    public var errorDescription: String? {
        switch self {
        case .swapNotSupported:
            return "Swap Not Supported"
@ -98,8 +98,8 @@ extension SwapTokenError {
    }
 }

-extension BuyCryptoError {
-    var localizedDescription: String {
+extension BuyCryptoError: LocalizedError {
+    public var errorDescription: String? {
        switch self {
        case .buyNotSupported:
            return "Buy Crypto Not Supported"
@ -107,8 +107,8 @@ extension BuyCryptoError {
    }
 }

-extension ActiveWalletError {
-    var localizedDescription: String {
+extension ActiveWalletError: LocalizedError {
+    public var errorDescription: String? {
        switch self {
        case .unavailableToResolveBridgeActionProvider:
            return "Unavailable To Resolve BridgeActionProvider"
@ -124,8 +124,8 @@ extension ActiveWalletError {
    }
 }

-extension WalletApiError {
-    var localizedDescription: String {
+extension WalletApiError: LocalizedError {
+    public var errorDescription: String? {
        switch self {
        case .connectionAddressNotFound:
            return "Connection Address not Found"
@ -139,8 +139,8 @@ extension WalletApiError {
    }
 }

-extension OpenURLError {
-    var localizedDescription: String {
+extension OpenURLError: LocalizedError {
+    public var errorDescription: String? {
        switch self {
        case .unsupportedTokenScriptVersion:
            return R.string.localizable.tokenScriptNotSupportedSchemaError()
--- a/AlphaWallet/Transfer/Coordinators/SendCoordinator.swift
+++ b/AlphaWallet/Transfer/Coordinators/SendCoordinator.swift
@ -135,7 +135,7 @@ extension SendCoordinator: TransactionConfirmationCoordinatorDelegate {
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }

    func didSendTransaction(_ transaction: SentTransaction, inCoordinator coordinator: TransactionConfirmationCoordinator) {
--- a/AlphaWallet/Transfer/Coordinators/SignMessageCoordinator.swift
+++ b/AlphaWallet/Transfer/Coordinators/SignMessageCoordinator.swift
@ -10,7 +10,7 @@ protocol SignMessageCoordinatorDelegate: AnyObject {
 }

 extension SignMessageValidatorError: LocalizedError {
-    var localizedDescription: String {
+    public var errorDescription: String? {
        switch self {
        case .emptyMessage:
            return R.string.localizable.signMessageValidationEmptyMessage()
@ -112,7 +112,7 @@ class SignMessageCoordinator: Coordinator {
    private func showError(error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }
 }

--- a/AlphaWallet/Transfer/Coordinators/TokenScriptCoordinator.swift
+++ b/AlphaWallet/Transfer/Coordinators/TokenScriptCoordinator.swift
@ -179,7 +179,7 @@ extension TokenScriptCoordinator: TransactionConfirmationCoordinatorDelegate {
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }

    func didClose(in coordinator: TransactionConfirmationCoordinator) {
@ -250,7 +250,7 @@ extension TokenScriptCoordinator: ConfirmTokenScriptActionTransactionDelegate {
        } catch {
            UIApplication.shared
                .presentedViewController(or: navigationController)
-                .displayError(message: error.prettyError)
+                .displayError(message: error.localizedDescription)
        }
    }
 }
--- a/AlphaWallet/Transfer/Coordinators/TransferNFTCoordinator.swift
+++ b/AlphaWallet/Transfer/Coordinators/TransferNFTCoordinator.swift
@ -106,7 +106,7 @@ extension TransferNFTCoordinator: SendSemiFungibleTokenViewControllerDelegate {
        } catch {
            UIApplication.shared
                .presentedViewController(or: navigationController)
-                .displayError(message: error.prettyError)
+                .displayError(message: error.localizedDescription)
        }
    }

@ -161,7 +161,7 @@ extension TransferNFTCoordinator: TransactionConfirmationCoordinatorDelegate {
    func coordinator(_ coordinator: TransactionConfirmationCoordinator, didFailTransaction error: Error) {
        UIApplication.shared
            .presentedViewController(or: navigationController)
-            .displayError(message: error.prettyError)
+            .displayError(message: error.localizedDescription)
    }

    func didClose(in coordinator: TransactionConfirmationCoordinator) {
--- a/AlphaWallet/Transfer/ViewControllers/SendViewController.swift
+++ b/AlphaWallet/Transfer/ViewControllers/SendViewController.swift
@ -221,7 +221,7 @@ extension SendViewController: AddressTextFieldDelegate {
    }

    func displayError(error: Error, for textField: AddressTextField) {
-        textField.errorState = .error(error.prettyError)
+        textField.errorState = .error(error.localizedDescription)
    }

    func openQRCodeReader(for textField: AddressTextField) {
--- a/AlphaWallet/Transfer/ViewModels/SendTransactionErrorViewModel.swift
+++ b/AlphaWallet/Transfer/ViewModels/SendTransactionErrorViewModel.swift
@ -20,8 +20,8 @@ extension SendTransactionNotRetryableError: LocalizedError {
            return message
        case .executionReverted(let message):
            return message
-        case .unknown:
-            return R.string.localizable.unknownError()
+        case .unknown(_, let message):
+            return message
        }
    }
 }
--- a/AlphaWallet/Transfer/ViewModels/SendViewModel.swift
+++ b/AlphaWallet/Transfer/ViewModels/SendViewModel.swift
@ -143,7 +143,7 @@ final class SendViewModel: TransactionTypeSupportable {
            .eraseToAnyPublisher()

        let recipientErrorState = isRecipientValid(inputsValidationError: inputsValidationError)
-            .map { $0 ? TextField.TextFieldErrorState.none : TextField.TextFieldErrorState.error(InputError.invalidAddress.prettyError) }
+            .map { $0 ? TextField.TextFieldErrorState.none : TextField.TextFieldErrorState.error(InputError.invalidAddress.localizedDescription) }
            .eraseToAnyPublisher()

        let cryptoErrorState = isCryptoValueValid(cryptoValue: input.amountToSend, send: input.send)
@ -464,7 +464,7 @@ extension TransactionTypeFromQrCode {
        case serverNotMatches
        case tokenNotFound

-        var localizedDescription: String {
+        var errorDescription: String? {
            switch self {
            case .serverNotMatches:
                return "Server Not Matches"
--- a/AlphaWallet/Transfer/ViewModels/TransactionConfirmation/CancelTransactionViewModel.swift
+++ b/AlphaWallet/Transfer/ViewModels/TransactionConfirmation/CancelTransactionViewModel.swift
@ -150,8 +150,8 @@ extension TransactionConfigurator.GasFeeWarning {
    }
 }

-extension ConfigureTransactionError {
-    var localizedDescription: String {
+extension ConfigureTransactionError: LocalizedError {
+    public var errorDescription: String? {
        switch self {
        case .gasLimitTooHigh:
            return R.string.localizable.configureTransactionErrorGasLimitTooHigh(ConfigureTransaction.gasLimitMax)
@ -168,7 +168,7 @@ extension ConfigureTransactionError {
 }

 extension AddCustomChainError {
-    var localizedDescription: String {
+    var errorDescription: String? {
        switch self {
        case .cancelled:
            //This is the default behavior, just keep it
--- a/AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift
+++ b/AlphaWallet/Wallet/ViewControllers/ImportWalletViewController.swift
@ -676,7 +676,7 @@ extension ImportWalletViewController: AddressTextFieldDelegate {
    }

    func displayError(error: Error, for textField: AddressTextField) {
-        textField.errorState = .error(error.prettyError)
+        textField.errorState = .error(error.localizedDescription)
    }

    func openQRCodeReader(for textField: AddressTextField) {
--- a/AlphaWallet/WalletConnect/CAIP10AccountProvidable.swift
+++ b/AlphaWallet/WalletConnect/CAIP10AccountProvidable.swift
@ -28,7 +28,7 @@ extension CAIP10AccountProvidable {
 }

 class AnyCAIP10AccountProvidable: CAIP10AccountProvidable {
-    enum CAIP10AccountProvidableError: LocalizedError {
+    enum CAIP10AccountProvidableError: Error {
        case unavailableToBuildBlockchain
        case accountsNotFound
        case emptyNamespaces
--- a/AlphaWallet/WalletConnect/Coordinator/WalletConnectCoordinator.swift
+++ b/AlphaWallet/WalletConnect/Coordinator/WalletConnectCoordinator.swift
@ -303,7 +303,7 @@ extension WalletConnectCoordinator: WalletConnectProviderDelegate {
    func provider(_ provider: WalletConnectProvider, didFail error: WalletConnectError) {
        infoLog("[WalletConnect] didFail error: \(error)")

-        guard let description = error.localizedDescription else { return }
+        guard let description = error.errorDescription else { return }
        displayErrorMessage(description)
    }

--- a/AlphaWallet/WalletConnect/WalletConnectServer.swift
+++ b/AlphaWallet/WalletConnect/WalletConnectServer.swift
@ -11,7 +11,7 @@ import AlphaWalletFoundation
 import PromiseKit
 import AlphaWalletCore

-enum WalletConnectError: Error {
+enum WalletConnectError: LocalizedError {
    case onlyForWatchWallet(address: AlphaWallet.Address)
    case walletsNotFound(addresses: [AlphaWallet.Address])
    case callbackIdMissing
@ -30,7 +30,7 @@ enum WalletConnectError: Error {
        } else if let error = error.embedded as? WalletConnectError {
            self = error
        } else {
-            self = .internal(.init(code: -32051, message: error.embedded.prettyError))
+            self = .internal(.init(code: -32051, message: error.embedded.localizedDescription))
        }
    }

@ -43,7 +43,7 @@ enum WalletConnectError: Error {
        }
    }

-    var localizedDescription: String? {
+    var errorDescription: String? {
        switch self {
        case .internal(let error):
            return error.message
--- a/AlphaWalletTests/Common/Types/ErrorTests.swift
+++ b/AlphaWalletTests/Common/Types/ErrorTests.swift
@ -8,6 +8,6 @@ class ErrorTests: XCTestCase {
    func testMakeSureErrorMessageDefinedInExtensionAvailableCorrectlyAcrossFrameworks() {
        //Must be stored as `Error` for test
        let e: Error = KeystoreError.duplicateAccount
-        XCTAssertEqual(e.prettyError, "You already added this address to wallets")
+        XCTAssertEqual(e.localizedDescription, "You already added this address to wallets")
    }
 }
--- a/AlphaWalletTests/EtherClient/EtherKeystoreTests.swift
+++ b/AlphaWalletTests/EtherClient/EtherKeystoreTests.swift
@ -154,7 +154,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.createHDWallet()
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { account in
@ -177,7 +177,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.createHDWallet()
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { wallet in
@ -201,7 +201,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.importWallet(json: dict.jsonString!, password: passphrase)
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { wallet in
@ -219,7 +219,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.importWallet(privateKey: privateKey)
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { wallet in
@ -254,7 +254,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.importWallet(mnemonic: words, passphrase: "")
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { wallet in
@ -280,7 +280,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.importWallet(privateKey: privateKey)
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { wallet in
@ -306,7 +306,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.watchWallet(address: address)
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { _ in
@ -325,7 +325,7 @@ class EtherKeystoreTests: XCTestCase {
        keystore.watchWallet(address: address)
            .sink(receiveCompletion: { result in
                if case .failure(let e) = result {
-                    XCTFail(e.prettyError)
+                    XCTFail(e.localizedDescription)
                }
                expectation.fulfill()
            }, receiveValue: { wallet in
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/CastError.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/CastError.swift
@ -11,7 +11,7 @@ public struct CastError<ExpectedType>: LocalizedError {
        self.expectedType = expectedType
    }

-    public var localizedDescription: String {
+    public var errorDescription: String? {
        return "Decode failure: Unable to decode value of \(actualValue) to expected type \(String(describing: expectedType))"
    }
 }
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/KeyStoreError.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/EtherClient/KeyStoreError.swift
@ -2,7 +2,7 @@

 import Foundation

-public enum KeystoreError: LocalizedError {
+public enum KeystoreError: Error {
    case failedToDeleteAccount
    case failedToDecryptKey
    case failedToImport(Error)
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapError.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/SwapToken/NativeSwap/Types/SwapError.swift
@ -7,7 +7,7 @@

 import Foundation

-public enum SwapError: Error {
+public enum SwapError: LocalizedError {
    case unableToBuildSwapUnsignedTransactionFromSwapProvider
    case unableToBuildSwapUnsignedTransaction(message: String)
    case invalidJson
@ -16,7 +16,7 @@ public enum SwapError: Error {
    case inner(Error)
    case unknownError

-    public var localizedDescription: String {
+    public var errorDescription: String? {
        switch self {
        case .unableToBuildSwapUnsignedTransaction(let message):
            return "Unable To Build Swap Unsigned Transaction: \(message)"
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/FunctionOrigin.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/TokenScriptClient/Models/FunctionOrigin.swift
@ -10,7 +10,7 @@ public enum FunctionError: LocalizedError {
    case formValue
    case postTransaction

-    var localizedDescription: String {
+    public var errorDescription: String? {
        switch self {
        case .formPayload:
            return "Impossible To Build Configuration! Form Payload missing"
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetBlockTimestamp.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Tokens/Logic/GetBlockTimestamp.swift
@ -50,3 +50,25 @@ final class GetBlockTimestamp {
    }
 }

+extension JSONRPCKit.JSONRPCError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .responseError(_, let message, _):
+            return message
+        case .responseNotFound:
+            return "Response Not Found"
+        case .resultObjectParseError:
+            return "Result Object Parse Error"
+        case .errorObjectParseError:
+            return "Error Object Parse Error"
+        case .unsupportedVersion(let string):
+            return "Unsupported Version \(string)"
+        case .unexpectedTypeObject:
+            return "Unexpected Type Object"
+        case .missingBothResultAndError:
+            return "Missing Both Result And Error"
+        case .nonArrayResponse:
+            return "Non Array Response"
+        }
+    }
+}
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/TransactionConfigurator.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/TransactionConfigurator.swift
@ -14,10 +14,10 @@ public protocol TransactionConfiguratorDelegate: AnyObject {
    func updateNonce(to nonce: Int, in configurator: TransactionConfigurator)
 }

-public enum TransactionConfiguratorError: Error {
+public enum TransactionConfiguratorError: LocalizedError {
    case impossibleToBuildConfiguration

-    var localizedDescription: String {
+    public var errorDescription: String? {
        return "Impossible To Build Configuration"
    }
 }
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/SendTransactionError.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Transfer/Types/SendTransactionError.swift
@ -23,7 +23,7 @@ public struct SendTransactionNotRetryableError: Error {
    }
 }

-public enum RpcNodeRetryableRequestError: LocalizedError {
+public enum RpcNodeRetryableRequestError: Error {
    //TODO move those that aren't retryable to a not-retryable version
    case possibleBinanceTestnetTimeout
    //TODO rate limited means we should retry after delay. Or maybe all retries should have a delay
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AppErrors.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/AppErrors.swift
@ -7,15 +7,15 @@

 import Foundation

-public enum SwapTokenError: LocalizedError {
+public enum SwapTokenError: Error {
    case swapNotSupported
 }

-public enum BuyCryptoError: LocalizedError {
+public enum BuyCryptoError: Error {
    case buyNotSupported
 }

-public enum ActiveWalletError: LocalizedError {
+public enum ActiveWalletError: Error {
    case unavailableToResolveSwapActionProvider
    case unavailableToResolveBridgeActionProvider
    case bridgeNotSupported
@ -23,7 +23,7 @@ public enum ActiveWalletError: LocalizedError {
    case operationForTokenNotFound
 }

-public enum WalletApiError: LocalizedError {
+public enum WalletApiError: Error {
    case connectionAddressNotFound
    case requestedWalletNonActive
    case requestedServerDisabled
--- a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RpcJson/JsonRpcError.swift
+++ b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RpcJson/JsonRpcError.swift
@ -34,3 +34,9 @@ public extension JsonRpcError {
        JsonRpcError(code: -32603, message: message)
    }
 }
+
+extension JsonRpcError: LocalizedError {
+    public var errorDescription: String? {
+        return message
+    }
+}