feat(uphold): align Uphold and Coinbase portals

DashWallet/Resources/AppAssets.xcassets/Integrations/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/buyCoinbase.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/Integrations/integration.buy.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icon.buy-dash.png",
+      "filename" : "buy.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "icon.buy-dash@2x.png",
+      "filename" : "buy@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon.buy-dash@3x.png",
+      "filename" : "buy@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/sellDash.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/Integrations/integration.convert.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icon.buy-dash.png",
+      "filename" : "convert.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "icon.buy-dash@2x.png",
+      "filename" : "convert@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon.buy-dash@3x.png",
+      "filename" : "convert@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/transferCoinbase.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/Integrations/integration.sell.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icon.buy-dash.png",
+      "filename" : "sell.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "icon.buy-dash@2x.png",
+      "filename" : "sell@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon.buy-dash@3x.png",
+      "filename" : "sell@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Resources/AppAssets.xcassets/Integrations/integration.transfer.disabled.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "integration.transfer.disabled.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "integration.transfer.disabled@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "integration.transfer.disabled@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

DashWallet/Resources/AppAssets.xcassets/convertCrypto.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/Integrations/integration.transfer.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "icon.convert-crypto.png",
+      "filename" : "transfer.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "icon.convert-crypto@2x.png",
+      "filename" : "transfer@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon.convert-crypto@3x.png",
+      "filename" : "transfer@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

DashWallet/Sources/Models/Coinbase/Coinbase+Error.swift

@@ -26,13 +26,34 @@ extension Coinbase {
         enum GeneralFailureReason: LocalizedError {
             case noActiveUser
             case revokedToken
+            case noPaymentMethods
 
             var errorDescription: String? {
                 switch self {
                 case .noActiveUser:
                     return NSLocalizedString("No active user", comment: "Coinbase")
                 case .revokedToken:
                     return NSLocalizedString("For your security, you have been signed out.", comment: "Coinbase")
+                case .noPaymentMethods:
+                    return NSLocalizedString("Please add a payment method on Coinbase", comment: "Coinbase/Buy Dash")
+                }
+            }
+
+            var failureReason: String? {
+                switch self {
+                case .noPaymentMethods:
+                    return NSLocalizedString("No payment methods found", comment: "Coinbase/Buy Dash")
+                default:
+                    return ""
+                }
+            }
+
+            var recoverySuggestion: String? {
+                switch self {
+                case .noPaymentMethods:
+                    return NSLocalizedString("Add", comment: "Coinbase/Buy Dash")
+                default:
+                    return ""
                 }
             }
         }

DashWallet/Sources/Models/URL Handling/DWURLActions.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 //
 
-@interface DWURLUpholdAction : DWURLAction
+@interface DWURLIntegrationAction : DWURLAction
 
 @property (nonatomic, strong) NSURL *url;
 

DashWallet/Sources/Models/URL Handling/DWURLActions.m

@@ -24,7 +24,7 @@ @implementation DWURLAction
 
 //
 
-@implementation DWURLUpholdAction
+@implementation DWURLIntegrationAction
 @end
 
 //

DashWallet/Sources/Models/URL Handling/DWURLParser.m

@@ -51,7 +51,7 @@ + (BOOL)canHandleURL:(NSURL *)url {
 
 + (nullable DWURLAction *)actionForURL:(NSURL *)url {
     if ([url.absoluteString containsString:@"uphold"]) {
-        DWURLUpholdAction *action = [[DWURLUpholdAction alloc] init];
+        DWURLIntegrationAction *action = [[DWURLIntegrationAction alloc] init];
         action.url = url;
 
         return action;

DashWallet/Sources/UI/Coinbase/Base/UIViewController+Coinbase.swift

@@ -22,7 +22,7 @@ extension BaseViewController {
         let vc = SuccessfulOperationStatusViewController.initiate(from: sb("OperationStatus"))
         vc.closeHandler = { [weak self] in
             guard let wSelf = self else { return }
-            guard let rootController = wSelf.navigationController?.controller(by: CoinbaseEntryPointViewController.self) else {
+            guard let rootController = wSelf.navigationController?.controller(by: IntegrationViewController.self) else {
                 wSelf.navigationController?.popToRootViewController(animated: true)
                 return
             }

DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/Model/CoinbaseEntryPointModel.swift → DashWallet/Sources/UI/Coinbase/CoinbaseEntryPoint/CoinbaseEntryPointModel.swift

@@ -17,82 +17,86 @@
 
 import Foundation
 
-// MARK: - CoinbaseEntryPointItem
+// MARK: IntegrationEntryPointItem
 
-enum CoinbaseEntryPointItem: CaseIterable {
-    case buyDash
-    case sellDash
-    case convertCrypto
-    case transferDash
-}
-
-extension CoinbaseEntryPointItem {
-    static let supportedCases: [CoinbaseEntryPointItem] = [.buyDash, .convertCrypto, .transferDash]
+struct CoinbaseEntryPointItem: IntegrationEntryPointItem {
+    let type: IntegrationItemType
+    static let supportedCases = [.buyDash, .convertCrypto, .transferDash].map { CoinbaseEntryPointItem(type: $0) }
 
-    var title: String {
-        switch self {
-        case .buyDash:
-            return NSLocalizedString("Buy Dash", comment: "Coinbase Entry Point")
-        case .sellDash:
-            return NSLocalizedString("Sell Dash", comment: "Coinbase Entry Point")
-        case .convertCrypto:
-            return NSLocalizedString("Convert Crypto", comment: "Coinbase Entry Point")
-        case .transferDash:
-            return NSLocalizedString("Transfer Dash", comment: "Coinbase Entry Point")
-        }
-    }
+    var title: String { type.title }
+    var icon: String { type.icon }
+    var alwaysEnabled: Bool { false }
+    var hasAdditionalInfo: Bool { false }
 
     var description: String {
-        switch self {
+        switch type {
         case .buyDash:
             return NSLocalizedString("Receive directly into Dash Wallet", comment: "Coinbase Entry Point")
         case .sellDash:
             return NSLocalizedString("Receive directly into Coinbase", comment: "Coinbase Entry Point")
         case .convertCrypto:
-            return NSLocalizedString("Between Dash Wallet and Coinbase.", comment: "Coinbase Entry Point")
-        case .transferDash:
-            return NSLocalizedString("Between Dash Wallet and Coinbase.", comment: "Coinbase Entry Point")
-        }
-    }
-
-    var icon: String {
-        switch self {
-        case .buyDash:
-            return "buyCoinbase"
-        case .sellDash:
-            return "sellDash"
-        case .convertCrypto:
-            return "convertCrypto"
+            return NSLocalizedString("Between Dash Wallet and Coinbase", comment: "Coinbase Entry Point")
         case .transferDash:
-            return "transferCoinbase"
+            return NSLocalizedString("Between Dash Wallet and Coinbase", comment: "Coinbase Entry Point")
         }
     }
 }
 
 // MARK: - CoinbaseEntryPointModel
 
-final class CoinbaseEntryPointModel {
-    let items: [CoinbaseEntryPointItem] = CoinbaseEntryPointItem.supportedCases
+final class CoinbaseEntryPointModel: BaseIntegrationModel {
+    override var items: [IntegrationEntryPointItem] {
+        CoinbaseEntryPointItem.supportedCases
+    }
 
     var hasPaymentMethods = false
 
-    var userDidSignOut: (() -> ())?
-    var userDidChange: (() -> ())?
-
     var balance: UInt64 {
         guard let amount = Coinbase.shared.lastKnownBalance else { return 0 }
 
         return amount
     }
+
+    override var mainAmountString: String {
+        balance.formattedDashAmount
+    }
+
+    override var supplementaryAmountString: String {
+        let fiat: String
+
+        if let fiatAmount = try? CurrencyExchanger.shared.convertDash(amount: balance.dashAmount, to: App.fiatCurrency) {
+            fiat = NumberFormatter.fiatFormatter.string(from: fiatAmount as NSNumber)!
+        } else {
+            fiat = NSLocalizedString("Syncing...", comment: "Balance")
+        }
+
+        return fiat
+    }
+
+    override var balanceTitle: String {
+        NSLocalizedString("Dash balance on Coinbase", comment: "Coinbase Entry Point")
+    }
+
+    override var signInTitle: String {
+        NSLocalizedString("Link Uphold Account", comment: "Uphold Entry Point")
+    }
+
+    override var signOutTitle: String {
+        NSLocalizedString("Disconnect Coinbase Account", comment: "Coinbase Entry Point")
+    }
+
+    override var shouldPopOnLogout: Bool { true }
 
     private var userDidChangeListenerHandle: UserDidChangeListenerHandle!
     private var accountDidChangeHandle: AnyObject?
 
     init() {
+        super.init(service: .coinbase)
+
         userDidChangeListenerHandle = Coinbase.shared.addUserDidChangeListener { [weak self] user in
-            if user == nil {
-                self?.userDidSignOut?()
-            } else {
+            self?.isLoggedIn = user != nil
+
+            if user != nil {
                 self?.userDidChange?()
             }
         }
@@ -107,34 +111,35 @@ final class CoinbaseEntryPointModel {
         }
     }
 
-    public func signOut() {
+    override func logOut() {
         Task {
             try await Coinbase.shared.signOut()
         }
     }
+
+    override func validate(operation type: IntegrationItemType) -> LocalizedError? {
+        switch type {
+        case .buyDash:
+            return hasPaymentMethods ? nil : Coinbase.Error.GeneralFailureReason.noPaymentMethods
+        default:
+            return super.validate(operation: type)
+        }
+    }
+
+    override func handle(error: Swift.Error) {
+        super.handle(error: error)
+
+        if case Coinbase.Error.GeneralFailureReason.noPaymentMethods = error {
+            addPaymentMethod()
+        }
+    }
+
+    private func addPaymentMethod() {
+        UIApplication.shared.open(kCoinbaseAddPaymentMethodsURL)
+    }
 
     deinit {
         NotificationCenter.default.removeObserver(accountDidChangeHandle!)
         Coinbase.shared.removeUserDidChangeListener(handle: userDidChangeListenerHandle)
     }
 }
-
-// MARK: BalanceViewDataSource
-
-extension CoinbaseEntryPointModel: BalanceViewDataSource {
-    var mainAmountString: String {
-        balance.formattedDashAmount
-    }
-
-    var supplementaryAmountString: String {
-        let fiat: String
-
-        if let fiatAmount = try? CurrencyExchanger.shared.convertDash(amount: balance.dashAmount, to: App.fiatCurrency) {
-            fiat = NumberFormatter.fiatFormatter.string(from: fiatAmount as NSNumber)!
-        } else {
-            fiat = NSLocalizedString("Syncing...", comment: "Balance")
-        }
-
-        return fiat
-    }
-}