feat(coinjoin): privacy level UI

DashWallet/Resources/AppAssets.xcassets/buyCoinbase.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/CoinJoin/image.locked.imageset/Contents.json

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

DashWallet/Resources/AppAssets.xcassets/sellDash.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/CoinJoin/image.protected.imageset/Contents.json

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

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

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

DashWallet/Resources/AppAssets.xcassets/transferCoinbase.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/convertCrypto.imageset/Contents.json → DashWallet/Resources/AppAssets.xcassets/Integrations/integration.convert.imageset/Contents.json

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

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

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

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/Integrations/integration.transfer.imageset/Contents.json

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

DashWallet/Sources/Infrastructure/Networking/HTTPClient.swift

@@ -34,19 +34,30 @@ private func JSONResponseDataFormatter(_ data: Data) -> String {
 
 // MARK: - HTTPClientError
 
-enum HTTPClientError: Error {
+enum HTTPClientError: LocalizedError {
     case statusCode(Moya.Response)
     case mapping(Moya.Response)
     case moya(MoyaError)
+    case decoder(DecodingError)
 
-    var localizedDescription: String {
+    var errorDescription: String? {
         switch self {
         case .statusCode(let response):
             return "\(response.debugDescription)\nError: \(response.errorDescription ?? "")"
         case .mapping(let response):
             return "\(response.debugDescription)"
         case .moya(let error):
             return "\(String(describing: error.errorDescription))"
+        case .decoder(let error):
+            switch error {
+            case .typeMismatch(_, let context),
+                 .valueNotFound(_, let context),
+                 .keyNotFound(_, let context),
+                 .dataCorrupted(let context):
+                return context.debugDescription
+            @unknown default:
+                return error.localizedDescription
+            }
         }
     }
 }
@@ -216,9 +227,12 @@ extension Swift.Result where Success: Moya.Response, Failure: Error {
             do {
                 let result = try jsonDecoder.decode(T.self, from: r.data)
                 return result
+            } catch let error as DecodingError {
+                throw HTTPClientError.decoder(error)
             } catch {
                 throw HTTPClientError.mapping(r)
             }
+
         case .failure(let error):
             throw error
         }

DashWallet/Sources/Models/Coinbase/Accounts/Account/CBAccount.swift

@@ -132,7 +132,7 @@ extension CBAccount {
 
             let result: BaseDataResponse<CoinbaseTransaction> = try await httpClient
                 .request(.sendCoinsToWallet(accountId: accountId, verificationCode: verificationCode, dto: dto))
-            try? await refreshAccount() // Ignore if fails
+            let _ = try? await refreshAccount() // Ignore if fails
 
             return result.data
         } catch HTTPClientError.statusCode(let r) where r.statusCode == 402 {
@@ -164,46 +164,30 @@ extension CBAccount {
 
 // MARK: Buy
 extension CBAccount {
-    public func placeCoinbaseBuyOrder(amount: UInt64, paymentMethod: CoinbasePaymentMethod) async throws -> CoinbasePlaceBuyOrder {
-        let fiatCurrency = Coinbase.sendLimitCurrency
-        if let localNumber = try? Coinbase.shared.currencyExchanger.convertDash(amount: amount.dashAmount, to: fiatCurrency) {
-            if localNumber < kMinUSDAmountOrder {
-                let min = NSDecimalNumber(decimal: kMinUSDAmountOrder)
-                let localFormatter = NumberFormatter.fiatFormatter(currencyCode: fiatCurrency)
-                let str = localFormatter.string(from: min) ?? "$1.99"
-                throw Coinbase.Error.transactionFailed(.enteredAmountTooLow(minimumAmount: str))
-            } else if localNumber > Coinbase.shared.sendLimit {
-                throw Coinbase.Error.transactionFailed(.limitExceded)
-            }
+    public func placeCoinbaseBuyOrder(amount: UInt64) async throws -> CoinbasePlaceBuyOrder {
+        let fiatCurrency = Coinbase.defaultFiat
+
+        guard let localNumber = try? Coinbase.shared.currencyExchanger.convertDash(amount: amount.dashAmount, to: fiatCurrency) else {
+            throw Coinbase.Error.general(.rateNotFound)
         }
-
-        // NOTE: Make sure we format the amount back into coinbase format (en_US)
-        let amount = amount.formattedDashAmountWithoutCurrencySymbol.coinbaseAmount()
-
-        let request = CoinbasePlaceBuyOrderRequest(amount: amount, currency: kDashCurrency, paymentMethod: paymentMethod.id, commit: false, quote: nil)
-
-        do {
-            try await authInterop.refreshTokenIfNeeded()
-            let result: BaseDataResponse<CoinbasePlaceBuyOrder> = try await httpClient.request(.placeBuyOrder(accountId, request))
-            return result.data
-        } catch HTTPClientError.statusCode(let r) {
-            if let error = r.error?.errors.first {
-                throw Coinbase.Error.transactionFailed(.message(error.message))
-            }
-
-            throw Coinbase.Error.unknownError
-        } catch {
-            throw error
+
+        if localNumber < kMinUSDAmountOrder {
+            let min = NSDecimalNumber(decimal: kMinUSDAmountOrder)
+            let localFormatter = NumberFormatter.fiatFormatter(currencyCode: fiatCurrency)
+            let str = localFormatter.string(from: min) ?? "$1.99"
+            throw Coinbase.Error.transactionFailed(.enteredAmountTooLow(minimumAmount: str))
+        } else if localNumber > Coinbase.shared.sendLimit {
+            throw Coinbase.Error.transactionFailed(.limitExceded)
         }
-    }
 
-    public func commitCoinbaseBuyOrder(orderID: String) async throws -> CoinbasePlaceBuyOrder {
+        let formatter = NumberFormatter.decimalFormatter
+        formatter.maximumFractionDigits = 2
+        let amountStr = formatter.string(from: NSDecimalNumber(decimal: localNumber))!.coinbaseAmount()
+        let request = CoinbasePlaceBuyOrderRequest(clientOrderId: UUID(), productId: Coinbase.dashUSDPair, side: Coinbase.transactionTypeBuy, orderConfiguration: OrderConfiguration(marketMarketIoc: MarketMarketIoc(quoteSize: amountStr)))
+
         do {
             try await authInterop.refreshTokenIfNeeded()
-            let result: BaseDataResponse<CoinbasePlaceBuyOrder> = try await httpClient.request(.commitBuyOrder(accountId, orderID))
-            try? await refreshAccount() // Ignore if fails
-
-            return result.data
+            return try await httpClient.request<CoinbasePlaceBuyOrder>(.placeBuyOrder(request))
         } catch HTTPClientError.statusCode(let r) {
             if let error = r.error?.errors.first {
                 throw Coinbase.Error.transactionFailed(.message(error.message))
@@ -265,7 +249,7 @@ extension CBAccount {
         do {
             try await authInterop.refreshTokenIfNeeded()
             let result: BaseDataResponse<CoinbaseSwapeTrade> = try await httpClient.request(.swapTradeCommit(orderID))
-            try? await refreshAccount() // Ignore if fails
+            let _ = try? await refreshAccount() // Ignore if fails
 
             return result.data
         } catch HTTPClientError.statusCode(let r) {
@@ -280,6 +264,25 @@ extension CBAccount {
     }
 }
 
+// MARK: Deposit
+
+extension CBAccount {
+    public func deposit(from paymentMethodId: String, amount: UInt64) async throws -> CoinbaseDepositResponse {
+        guard let localNumber = try? Coinbase.shared.currencyExchanger.convertDash(amount: amount.dashAmount, to: Coinbase.defaultFiat) else {
+            throw Coinbase.Error.general(.rateNotFound)
+        }
+
+        let formatter = NumberFormatter.decimalFormatter
+        formatter.maximumFractionDigits = 2
+        let amountStr = formatter.string(from: NSDecimalNumber(decimal: localNumber))!.coinbaseAmount()
+        try await authInterop.refreshTokenIfNeeded()
+        let request = CoinbaseDepositRequest(amount: amountStr, currency: Coinbase.defaultFiat, paymentMethod: paymentMethodId)
+        let result: BaseDataResponse<CoinbaseDepositResponse> = try await httpClient.request(.deposit(accountId: info.id, dto: request))
+
+        return result.data
+    }
+}
+
 // MARK: SourceViewDataProvider
 
 extension CBAccount: SourceViewDataProvider {

DashWallet/Sources/Models/Coinbase/Accounts/AccountRepository.swift

@@ -26,6 +26,10 @@ class AccountRepository {
     var dashAccount: CBAccount? {
         cachedAccounts[kDashAccount]
     }
+
+    var usdAccount: CBAccount? {
+        cachedAccounts[Coinbase.dashUSDPair]
+    }
 
     init(authInterop: CBAuthInterop) {
         self.authInterop = authInterop

DashWallet/Sources/Models/Coinbase/Accounts/AccountService.swift

@@ -58,16 +58,18 @@ class AccountService {
         return tx
     }
 
-    public func placeBuyOrder(for accountName: String, amount: UInt64, paymentMethod: CoinbasePaymentMethod) async throws -> CoinbasePlaceBuyOrder {
+    public func placeBuyOrder(for accountName: String, amount: UInt64) async throws -> CoinbasePlaceBuyOrder {
         let account = try await account(by: accountName)
-        return try await account.placeCoinbaseBuyOrder(amount: amount, paymentMethod: paymentMethod)
+        return try await account.placeCoinbaseBuyOrder(amount: amount)
     }
-
-    public func commitBuyOrder(accountName: String, orderID: String) async throws -> CoinbasePlaceBuyOrder {
+    
+    public func deposit(to accountName: String, from paymentMethodId: String, amount: UInt64) async throws {
         let account = try await account(by: accountName)
-
-        let order = try await account.commitCoinbaseBuyOrder(orderID: orderID)
-        return order
+        let result = try await account.deposit(from: paymentMethodId, amount: amount)
+
+        if result.status != "created" {
+            throw Coinbase.Error.general(.depositFailed)
+        }
     }
 
     func placeTradeOrder(from origin: CBAccount, to destination: CBAccount, amount: String) async throws -> CoinbaseSwapeTrade {

DashWallet/Sources/Models/Coinbase/Auth/CBAuth.swift

@@ -150,9 +150,7 @@ extension CBAuth {
             URLQueryItem(name: "account", value: Coinbase.account),
         ]
 
-        if let clientID = Coinbase.clientID as? String {
-            queryItems.append(URLQueryItem(name: "client_id", value: clientID))
-        }
+        queryItems.append(URLQueryItem(name: "client_id", value: Coinbase.clientID))
 
         var urlComponents = URLComponents()
         urlComponents.scheme = "https"

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

@@ -24,11 +24,15 @@ extension Coinbase {
     static let grantType = "authorization_code"
     static let responseType = "code"
     static let scope =
-        "wallet:accounts:read,wallet:user:read,wallet:payment-methods:read,wallet:buys:read,wallet:buys:create,wallet:transactions:transfer,wallet:transactions:request,wallet:transactions:read,wallet:supported-assets:read,wallet:sells:create,wallet:sells:read,wallet:transactions:send,wallet:addresses:read,wallet:addresses:create,wallet:trades:create,wallet:accounts:create"
-    static let sendLimitCurrency = "USD"
+        "wallet:accounts:read,wallet:user:read,wallet:payment-methods:read,wallet:buys:read,wallet:buys:create,wallet:transactions:transfer,wallet:transactions:request,wallet:transactions:read,wallet:supported-assets:read,wallet:sells:create,wallet:sells:read,wallet:transactions:send,wallet:addresses:read,wallet:addresses:create,wallet:trades:create,wallet:accounts:create,wallet:deposits:create"
+    static let defaultFiat = "USD"
+    static let sendLimitCurrency = defaultFiat
     static let sendLimitAmount: Decimal = 1.0
     static let sendLimitPeriod = "month"
     static let account = "all"
+    static let buyFee = 0.006
+    static let dashUSDPair = "DASH-USD"
+    static let transactionTypeBuy = "BUY"
 
     static let clientSecret: String = {
         if let path = Bundle.main.path(forResource: "Coinbase-Info", ofType: "plist"),