Better propagate EdgeTransaction.feeRateUsed

If we don't have this saved on disk, let the engine's one pass through.

src/core/currency/wallet/currency-wallet-api.ts

@@ -677,6 +677,7 @@ export function combineTxWithFile(
     blockHeight: tx.blockHeight,
     confirmations: tx.confirmations,
     currencyCode,
+    feeRateUsed: tx.feeRateUsed,
     date: tx.date,
     isSend: tx.isSend,
     memos: tx.memos,
@@ -713,7 +714,9 @@ export function combineTxWithFile(
         out.requestedCustomFee = file.feeRateRequested
       }
     }
-    out.feeRateUsed = file.feeRateUsed
+    if (out.feeRateUsed == null) {
+      out.feeRateUsed = file.feeRateUsed
+    }
 
     if (file.payees != null) {
       out.spendTargets = file.payees.map(payee => ({

src/core/currency/wallet/currency-wallet-reducer.ts

@@ -43,19 +43,20 @@ export interface TxidHashes {
 }
 
 export interface MergedTransaction {
+  blockHeight: number
   chainAction?: EdgeTxAction
   chainAssetAction: Map<EdgeTokenId, EdgeAssetAction>
-  blockHeight: number
   confirmations: EdgeTransaction['confirmations']
   date: number
+  feeRateUsed?: object
   isSend: boolean
   memos: EdgeMemo[]
+  nativeAmount: EdgeBalanceMap
+  networkFee: EdgeBalanceMap
   otherParams?: object
   ourReceiveAddresses: string[]
   signedTx: string
   txid: string
-  nativeAmount: EdgeBalanceMap
-  networkFee: EdgeBalanceMap
 }
 
 export interface CurrencyWalletState {
@@ -432,13 +433,17 @@ export function mergeTx(
   tx: EdgeTransaction,
   oldTx: MergedTransaction | undefined
 ): MergedTransaction {
-  const { isSend = lt(tx.nativeAmount, '0'), tokenId = null } = tx
+  const {
+    confirmations = 'unconfirmed',
+    isSend = lt(tx.nativeAmount, '0'),
+    tokenId = null
+  } = tx
 
   const out: MergedTransaction = {
-    chainAssetAction: new Map(oldTx?.chainAssetAction ?? []),
     blockHeight: tx.blockHeight,
     chainAction: tx.chainAction,
-    confirmations: tx.confirmations ?? 'unconfirmed',
+    chainAssetAction: new Map(oldTx?.chainAssetAction ?? []),
+    confirmations,
     date: tx.date,
     isSend,
     memos: tx.memos,
@@ -451,6 +456,9 @@ export function mergeTx(
   }
   out.nativeAmount.set(tokenId, tx.nativeAmount)
   out.networkFee.set(tokenId, tx.networkFee ?? '0')
+  if (tx.feeRateUsed != null) {
+    out.feeRateUsed = tx.feeRateUsed
+  }
   if (tx.parentNetworkFee != null) {
     out.networkFee.set(null, String(tx.parentNetworkFee))
   }

src/types/types.ts

@@ -598,11 +598,13 @@ export interface EdgeTransaction {
   /** App-provided action data for all assets in a transaction */
   savedAction?: EdgeTxAction
 
+  /** This has the same format as the `customNetworkFee` */
+  feeRateUsed?: JsonObject
+
   // Spend-specific metadata:
   deviceDescription?: string
   networkFeeOption?: 'high' | 'standard' | 'low' | 'custom'
   requestedCustomFee?: JsonObject
-  feeRateUsed?: JsonObject
   spendTargets?: Array<{
     readonly currencyCode: string // Saved for future reference
     readonly nativeAmount: string