Merge pull request #1927 from MixinNetwork/feature/swap

Request swap with wallet id

Author: over140

Mixin/Service/API/Model/SwapRequest.swift

@@ -3,6 +3,7 @@ import MixinServices
 
 struct SwapRequest: Encodable {
 
+    let walletId: String?
     let payer: String
     let inputMint: String
     let inputAmount: String
@@ -14,6 +15,7 @@ struct SwapRequest: Encodable {
     let referral: String?
 
     init(
+        walletId: String?,
         sendToken: SwapToken,
         sendAmount: Decimal,
         receiveToken: SwapToken,
@@ -23,6 +25,7 @@ struct SwapRequest: Encodable {
         withdrawalDestination: String?,
         referral: String?,
     ) {
+        self.walletId = walletId
         self.payer = myUserId
         self.inputMint = sendToken.assetID
         self.inputAmount = TokenAmountFormatter.string(from: sendAmount)

Mixin/UserInterface/Controllers/Wallet/Swap/MixinSwapViewController.swift

@@ -103,6 +103,7 @@ class MixinSwapViewController: SwapViewController {
         }
         sender.isBusy = true
         let request = SwapRequest(
+            walletId: nil,
             sendToken: quote.sendToken,
             sendAmount: quote.sendAmount,
             receiveToken: quote.receiveToken,

Mixin/UserInterface/Controllers/Wallet/Swap/Web3SwapViewController.swift

@@ -120,6 +120,7 @@ final class Web3SwapViewController: SwapViewController {
         }
 
         let request = SwapRequest(
+            walletId: wallet.walletID,
             sendToken: quote.sendToken,
             sendAmount: quote.sendAmount,
             receiveToken: quote.receiveToken,