@@ -8,6 +8,10 @@
 - changed: Use a custom chart icon for the side menu Markets row, so it matches the rest of the menu.
 - changed: Use the UI4 warning card for the Reveal Raw Keys and Reveal Master Private Key password confirmation warnings.
 - changed: Tron resource staking now describes its claim action as reclaiming your own TRX, instead of claiming a reward.
+- fixed: Bitwave CSV exports now use ISO 8601 UTC timestamps, leave the fee columns blank so Bitwave does not double-count fees, and copy the description into the second custom metadata column.
+- fixed: Bitwave account ids are no longer capitalized by the keyboard or padded with whitespace when entered, so exports import without hand-editing the account id.
+- fixed: NYM max swaps from EVM wallets now report the correct limit error instead of an unsupported-route error (edge-exchange-plugins 2.52.1).
+- fixed: Exchange rate queries no longer request each chain's own asset twice, which had been inflating every rate query with duplicate pairs.
 - fixed: XRP minimum balance warning copy to clarify the reserve is met once the address balance reaches 1 XRP, not on top of it.
 - fixed: Round fiat balances to cents in the Wallets list, matching the wallet detail scene
 - fixed: Notification center cards no longer shrink their text to fit. Long titles and messages now truncate with an ellipsis so every card renders at the same size.
 
@@ -3,6 +3,7 @@ import type { EdgeTransaction } from 'edge-core-js'
 import fs from 'fs'
 
 import {
+  exportTransactionsToBitwave,
   exportTransactionsToCSVInner,
   exportTransactionsToQBO
 } from '../../actions/TransactionExportActions'
@@ -13,6 +14,12 @@ const csvResult = fs.readFileSync('./src/__tests__/exportCsvResult.csv', {
 const qboResult = fs.readFileSync('./src/__tests__/exportQboResult.qbo', {
   encoding: 'utf8'
 })
+const bitwaveResult = fs.readFileSync(
+  './src/__tests__/exportBitwaveResult.csv',
+  { encoding: 'utf8' }
+)
+
+const BITWAVE_ACCOUNT_ID = 'pgM8cDt7bySnWTzs2MyI'
 
 const edgeTxs: EdgeTransaction[] = [
   {
@@ -188,3 +195,104 @@ test('export QBO matches reference data', function () {
   )
   expect(out).toEqual(qboResult)
 })
+
+test('export Bitwave matches reference data', async function () {
+  const out = await exportTransactionsToBitwave(
+    BITWAVE_ACCOUNT_ID,
+    [...edgeTxs],
+    'BTC',
+    '100'
+  )
+  expect(out).toEqual(bitwaveResult)
+})
+
+/**
+ * Splits one CSV row into its fields, unwrapping quoted values and their
+ * doubled-quote escapes.
+ */
+function parseCsvRow(row: string): string[] {
+  const fields: string[] = []
+  let field = ''
+  let quoted = false
+  for (let i = 0; i < row.length; i++) {
+    const char = row[i]
+    if (quoted) {
+      if (char !== '"') field += char
+      else if (row[i + 1] === '"') {
+        field += '"'
+        i++
+      } else quoted = false
+    } else if (char === '"') quoted = true
+    else if (char === ',') {
+      fields.push(field)
+      field = ''
+    } else field += char
+  }
+  fields.push(field)
+  return fields
+}
+
+// Bitwave column letters, as the importer numbers them:
+const COLUMN_G_FEE = 6
+const COLUMN_H_FEE_TICKER = 7
+const COLUMN_I_TIME = 8
+const COLUMN_M_ACCOUNT_ID = 12
+const COLUMN_R_DESCRIPTION = 17
+const COLUMN_W_CUSTOM_METADATA2 = 22
+
+async function exportBitwaveRows(): Promise<string[][]> {
+  const out = await exportTransactionsToBitwave(
+    BITWAVE_ACCOUNT_ID,
+    [...edgeTxs],
+    'BTC',
+    '100'
+  )
+  const [header, ...rows] = out.split('\n').filter(row => row !== '')
+
+  // Guard the column letters this suite asserts on, so a reordered row object
+  // fails here rather than silently invalidating every assertion below:
+  const headerFields = parseCsvRow(header)
+  expect(headerFields[COLUMN_G_FEE]).toEqual('fee')
+  expect(headerFields[COLUMN_H_FEE_TICKER]).toEqual('feeTicker')
+  expect(headerFields[COLUMN_I_TIME]).toEqual('time')
+  expect(headerFields[COLUMN_M_ACCOUNT_ID]).toEqual('accountId')
+  expect(headerFields[COLUMN_R_DESCRIPTION]).toEqual('description')
+  expect(headerFields[COLUMN_W_CUSTOM_METADATA2]).toEqual(
+    'metadata:myCustomMetadata2'
+  )
+
+  expect(rows.length).toBeGreaterThan(0)
+  return rows.map(parseCsvRow)
+}
+
+test('export Bitwave leaves the fee columns blank', async function () {
+  for (const fields of await exportBitwaveRows()) {
+    expect(fields[COLUMN_G_FEE]).toEqual('')
+    expect(fields[COLUMN_H_FEE_TICKER]).toEqual('')
+  }
+})
+
+test('export Bitwave duplicates the description into custom metadata 2', async function () {
+  for (const fields of await exportBitwaveRows()) {
+    expect(fields[COLUMN_W_CUSTOM_METADATA2]).toEqual(
+      fields[COLUMN_R_DESCRIPTION]
+    )
+  }
+})
+
+test('export Bitwave writes ISO 8601 UTC timestamps', async function () {
+  const rows = await exportBitwaveRows()
+  for (const fields of rows) {
+    expect(fields[COLUMN_I_TIME]).toMatch(
+      /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z$/
+    )
+  }
+  // The first transaction's date is 1524476980 (2018-04-23T09:49:40Z):
+  expect(rows[0][COLUMN_I_TIME]).toEqual('2018-04-23T09:49:40Z')
+})
+
+test('export Bitwave preserves the account id exactly', async function () {
+  for (const fields of await exportBitwaveRows()) {
+    expect(fields[COLUMN_M_ACCOUNT_ID]).toEqual(BITWAVE_ACCOUNT_ID)
+  }
+})
@@ -0,0 +1,8 @@
+"id","remoteContactId","amount","amountTicker","cost","costTicker","fee","feeTicker","time","blockchainId","memo","transactionType","accountId","contactId","categoryId","taxExempt","tradeId","description","fromAddress","toAddress","groupId","metadata:myCustomMetadata1","metadata:myCustomMetadata2"
+"1ff0fd8529f4c5bc","","1230000","BTC","","","","","2018-04-23T09:49:40Z","txid1","Hell yeah! Thanks for the fish <<&&>>","deposit","pgM8cDt7bySnWTzs2MyI","","","FALSE","","Crazy Person","","receiveaddress1","","Income:Mo Money","Crazy Person"
+"a1734d2a42db4f78","","3210000","BTC","","","","","2018-04-24T13:36:20Z","txid2","Hell yeah! Here's a fish""","withdrawal","pgM8cDt7bySnWTzs2MyI","","","FALSE","","Crazy Person 2","","","","Expense:Less Money","Crazy Person 2"
+"4152a38fd1753fb1","","3210000","BTC","","","","","2018-04-25T17:23:00Z","txid3","","deposit","pgM8cDt7bySnWTzs2MyI","","","FALSE","","Transfer","","receiveaddress3","","Transfer:Edge","Transfer"
+"bd0499aac742810c","","3210000","BTC","","","","","2018-04-26T21:09:40Z","txid4","","withdrawal","pgM8cDt7bySnWTzs2MyI","","","FALSE","","Transfer but actually income","","","","Transfer:Edge","Transfer but actually income"
+"28b9c7c71f2f3725","","3210000","BTC","","","","","2018-04-28T00:56:20Z","txid4","","withdrawal","pgM8cDt7bySnWTzs2MyI","","","FALSE","","Transfer but no fee","","","","Transfer:Edge","Transfer but no fee"
+"a7604f215aa3ebd8","","3210000","BTC","","","","","2018-04-29T04:43:00Z","txid5","","withdrawal","pgM8cDt7bySnWTzs2MyI","","","FALSE","","Transfer but no fiat amount","","","","Transfer:Edge","Transfer but no fiat amount"
+"9a1aed86663a096c","","3210000","BTC","","","","","2018-04-30T08:29:40Z","txid6","","withdrawal","pgM8cDt7bySnWTzs2MyI","","","FALSE","","","","","","",""
@@ -179,15 +179,17 @@ function makeCsvDateTime(date: number): { date: string; time: string } {
   }
 }
 
+/** ISO 8601 UTC, the timestamp format Bitwave requires for imports. */
 function makeBitwaveDateTime(date: number): string {
   const d = new Date(date * 1000)
-  const yy = d.getUTCFullYear().toString().slice(-2)
+  const yyyy = d.getUTCFullYear().toString()
   const mm = padZero((d.getUTCMonth() + 1).toString())
   const dd = padZero(d.getUTCDate().toString())
   const hh = padZero(d.getUTCHours().toString())
   const min = padZero(d.getUTCMinutes().toString())
+  const ss = padZero(d.getUTCSeconds().toString())
 
-  return `${mm}/${dd}/${yy} ${hh}:${min}`
+  return `${yyyy}-${mm}-${dd}T${hh}:${min}:${ss}Z`
 }
 
 //
@@ -447,15 +449,12 @@ export function exportTransactionsToCSVInner(
 }
 
 export async function exportTransactionsToBitwave(
-  wallet: EdgeCurrencyWallet,
   accountId: string,
   edgeTransactions: EdgeTransaction[],
   currencyCode: string,
-  multiplier: string,
-  parentMultiplier: string
+  multiplier: string
 ): Promise<string> {
   const items: any[] = []
-  const parentCode = wallet.currencyInfo.currencyCode
 
   for (const tx of edgeTransactions) {
     edgeTxToCsv(tx)
@@ -469,25 +468,15 @@ export async function exportTransactionsToBitwave(
       nativeAmount,
       networkFee,
       ourReceiveAddresses,
-      parentNetworkFee,
       spendTargets,
       txid
     } = edgeTx
     const amount: string = abs(div(nativeAmount, multiplier, DECIMAL_PRECISION))
     const time = makeBitwaveDateTime(date)
-    let fee: string = ''
-    let feeTicker: string = ''
     const { name = '', category = '', notes = '' } = metadata ?? {}
 
     let toAddress = ''
     if (isSend) {
-      if (parentNetworkFee != null) {
-        feeTicker = parentCode
-        fee = div(parentNetworkFee, parentMultiplier, DECIMAL_PRECISION)
-      } else {
-        feeTicker = currencyCode
-        fee = div(networkFee, multiplier, DECIMAL_PRECISION)
-      }
       if (spendTargets != null && spendTargets.length > 0) {
         // We can only choose 1 `toAddress` so pick the first spendTarget
         toAddress = spendTargets[0].publicAddress
@@ -509,8 +498,10 @@ export async function exportTransactionsToBitwave(
       amountTicker: currencyCode,
       cost: '',
       costTicker: '',
-      fee,
-      feeTicker,
+      // Bitwave calculates transaction fees on its own side. Exporting them
+      // here duplicates the fees after import, so both columns stay blank:
+      fee: '',
+      feeTicker: '',
       time,
       blockchainId: txid,
       memo: notes,
@@ -525,7 +516,8 @@ export async function exportTransactionsToBitwave(
       toAddress,
       groupId: '',
       'metadata:myCustomMetadata1': category,
-      'metadata:myCustomMetadata2': notes
+      // Bitwave expects this to mirror the description column:
+      'metadata:myCustomMetadata2': name
     })
   }
 
 
@@ -58,7 +58,6 @@ interface StateProps {
   defaultIsoFiat: string
   exchangeMultiplier: string
   multiplier: string
-  parentMultiplier: string
 }
 
 interface DispatchProps {
@@ -303,7 +302,6 @@ class TransactionsExportSceneComponent extends React.PureComponent<
       defaultIsoFiat,
       exchangeMultiplier,
       multiplier,
-      parentMultiplier,
       route
     } = this.props
     const { sourceWallet, tokenId } = route.params
@@ -327,10 +325,15 @@ class TransactionsExportSceneComponent extends React.PureComponent<
     const fileAccountId = exportTxInfo?.bitwaveAccountId ?? ''
 
     if (isExportBitwave) {
-      accountId =
+      // Bitwave account ids are case-sensitive and may start with a lowercase
+      // letter, so the platform default of capitalizing the first character
+      // would corrupt them. Trim as well, since a pasted id often carries
+      // surrounding whitespace:
+      const rawAccountId =
         (await Airship.show<string | undefined>(bridge => (
           <TextInputModal
             autoFocus
+            autoCapitalize="none"
             autoCorrect={false}
             bridge={bridge}
             initialValue={fileAccountId}
@@ -345,6 +348,7 @@ class TransactionsExportSceneComponent extends React.PureComponent<
             title={lstrings.export_transaction_bitwave_accountid_modal_title}
           />
         ))) ?? ''
+      accountId = rawAccountId.trim()
     }
 
     if (
@@ -451,12 +455,10 @@ class TransactionsExportSceneComponent extends React.PureComponent<
 
     if (isExportBitwave) {
       const bitwaveFile = await exportTransactionsToBitwave(
-        sourceWallet,
         accountId,
         txs,
         currencyCode,
-        exchangeMultiplier,
-        parentMultiplier
+        exchangeMultiplier
       )
       files.push({
         contents: bitwaveFile,
@@ -544,9 +546,7 @@ export const TransactionsExportScene = connect<
       state,
       params.sourceWallet.currencyConfig,
       params.tokenId
-    ).multiplier,
-    parentMultiplier: getExchangeDenom(params.sourceWallet.currencyConfig, null)
-      .multiplier
+    ).multiplier
   }),
   dispatch => ({
     updateTxsFiatDispatch: async (wallet, tokenId, currencyCode, txs) => {