Handle optional swap destination wallet from swap-to-address core

The swap-to-address change in edge-core-js makes EdgeSwapRequest.toWallet and
EdgeTxActionSwap.payoutWalletId optional (a private send has no destination
wallet). Narrow toWallet to its always-present value in the wallet-to-wallet
swap scenes, and tolerate a missing payoutWalletId in the transaction-action
mappers, so these consumers compile against the new core.

Author: j0ntz

eslint.config.mjs

@@ -229,7 +229,7 @@ export default [
       'src/components/rows/EdgeRow.tsx',
 
       'src/components/rows/PaymentMethodRow.tsx',
-      'src/components/rows/SwapProviderRow.tsx',
+
       'src/components/rows/TxCryptoAmountRow.tsx',
 
       'src/components/scenes/ChangeMiningFeeScene.tsx',

src/actions/CategoriesActions.ts

@@ -382,8 +382,9 @@ export const getTxActionDisplayInfo = (
               ? lstrings.transaction_details_swap_to_subcat_1s
               : lstrings.transaction_details_swap_from_subcat_1s
             const walletName =
-              account.currencyWallets[action.payoutWalletId]?.name ??
-              displayName
+              (action.payoutWalletId != null
+                ? account.currencyWallets[action.payoutWalletId]?.name
+                : undefined) ?? displayName
             edgeCategory = {
               category: 'transfer',
               subcategory: sprintf(toFromStr, walletName)

src/components/rows/SwapProviderRow.tsx

@@ -18,7 +18,13 @@ export const SwapProviderRow: React.FC<Props> = (props: Props) => {
   const { quote } = props
   const { request, toNativeAmount, fromNativeAmount } = quote
   const { quoteFor } = request
-  const { fromWallet, fromTokenId, toWallet, toTokenId } = request
+  const { fromWallet, fromTokenId, toTokenId } = request
+  // A wallet-to-wallet swap quote always carries a destination wallet; only a
+  // swap-to-address request (its own flow) omits it.
+  const toWallet = request.toWallet
+  if (toWallet == null) {
+    throw new Error('Swap quote is missing a destination wallet')
+  }
   const theme = useTheme()
   const styles = getStyles(theme)
 

src/components/scenes/SwapConfirmationScene.tsx

@@ -127,7 +127,11 @@ export const SwapConfirmationScene: React.FC<Props> = (props: Props) => {
   const { quoteFor } = request
 
   const priceImpact = React.useMemo(() => {
-    const { fromWallet, fromTokenId, toWallet, toTokenId } = request
+    const { fromWallet, fromTokenId, toTokenId } = request
+    const toWallet = request.toWallet
+    if (toWallet == null) {
+      throw new Error('Swap quote is missing a destination wallet')
+    }
 
     const fromExchangeDenom = getExchangeDenom(
       fromWallet.currencyConfig,
@@ -282,7 +286,11 @@ export const SwapConfirmationScene: React.FC<Props> = (props: Props) => {
         request
       } = selectedQuote
       // Both fromCurrencyCode and toCurrencyCode will exist, since we set them:
-      const { toWallet, toTokenId, fromWallet, fromTokenId } = request
+      const { toTokenId, fromWallet, fromTokenId } = request
+      const toWallet = request.toWallet
+      if (toWallet == null) {
+        throw new Error('Swap quote is missing a destination wallet')
+      }
 
       try {
         dispatch(logEvent('Exchange_Shift_Start'))
@@ -556,7 +564,11 @@ const getSwapInfo = (
     // Currency conversion tools:
     // Both fromCurrencyCode and toCurrencyCode will exist, since we set them:
     const { request } = quote
-    const { fromWallet, toWallet, fromTokenId, toTokenId } = request
+    const { fromWallet, fromTokenId, toTokenId } = request
+    const toWallet = request.toWallet
+    if (toWallet == null) {
+      throw new Error('Swap quote is missing a destination wallet')
+    }
 
     // Format from amount:
     const fromDisplayDenomination = selectDisplayDenom(

src/components/scenes/SwapCreateScene.tsx

@@ -228,6 +228,12 @@ export const SwapCreateScene: React.FC<Props> = props => {
   }
 
   const getQuote = (swapRequest: EdgeSwapRequest): void => {
+    // This scene only builds wallet-to-wallet swap requests, which always carry
+    // a destination wallet (swap-to-address has its own flow).
+    const toWallet = swapRequest.toWallet
+    if (toWallet == null) {
+      throw new Error('Swap request is missing a destination wallet')
+    }
     if (exchangeInfo != null) {
       const disableSrc = checkDisableAsset(
         exchangeInfo.swap.disableAssets.source,
@@ -247,15 +253,15 @@ export const SwapCreateScene: React.FC<Props> = props => {
 
       const disableDest = checkDisableAsset(
         exchangeInfo.swap.disableAssets.destination,
-        swapRequest.toWallet.id,
+        toWallet.id,
         toTokenId
       )
       if (disableDest) {
         showToast(
           sprintf(
             lstrings.swap_token_no_enabled_exchanges_2s,
             toCurrencyCode,
-            swapRequest.toWallet.currencyInfo.displayName
+            toWallet.currencyInfo.displayName
           )
         )
         return

src/components/scenes/SwapProcessingScene.tsx

@@ -49,10 +49,22 @@ export const SwapProcessingScene: React.FC<Props> = (props: Props) => {
     swapRequest.fromTokenId
   )
   const toDenomination = useDisplayDenom(
-    swapRequest.toWallet.currencyConfig,
-    swapRequest.toTokenId
+    // Wallet-to-wallet swaps always have a destination wallet here; fall back to
+    // the source config only so this hook stays unconditional. Pair that
+    // fallback with a null tokenId so the lookup never asks the source config
+    // for a token it does not have (the result is unused once the guard below
+    // throws on a missing destination wallet).
+    (swapRequest.toWallet ?? swapRequest.fromWallet).currencyConfig,
+    swapRequest.toWallet != null ? swapRequest.toTokenId : null
   )
 
+  // This scene only processes wallet-to-wallet swap requests, which always
+  // carry a destination wallet (swap-to-address has its own flow).
+  const toWallet = swapRequest.toWallet
+  if (toWallet == null) {
+    throw new Error('Swap request is missing a destination wallet')
+  }
+
   const doWork = async (isCancelled: () => boolean): Promise<void> => {
     const quotes = await account.fetchSwapQuotes(
       swapRequest,
@@ -70,7 +82,7 @@ export const SwapProcessingScene: React.FC<Props> = (props: Props) => {
         const fromWallet = swapRequest.fromWallet
         const fromAddresses = await fromWallet.getAddresses({ tokenId: null })
         const fromAddress = fromAddresses[0]?.publicAddress
-        const targetPluginId = swapRequest.toWallet.currencyInfo.pluginId
+        const targetPluginId = toWallet.currencyInfo.pluginId
 
         let matchingWalletId: string | undefined
         for (const walletId of Object.keys(account.currencyWallets)) {
@@ -89,8 +101,8 @@ export const SwapProcessingScene: React.FC<Props> = (props: Props) => {
           }
         }
 
-        let finalToWalletId: string = swapRequest.toWallet.id
-        let finalToWallet = swapRequest.toWallet
+        let finalToWalletId: string
+        let finalToWallet: typeof toWallet
         let isWalletCreated = false
         if (matchingWalletId == null) {
           // If not found, split from the source chain wallet to the destination
@@ -165,7 +177,7 @@ export const SwapProcessingScene: React.FC<Props> = (props: Props) => {
         params: {
           fromWalletId: swapRequest.fromWallet.id,
           fromTokenId: swapRequest.fromTokenId,
-          toWalletId: swapRequest.toWallet.id,
+          toWalletId: toWallet.id,
           toTokenId: swapRequest.toTokenId
         }
       })
@@ -189,7 +201,7 @@ export const SwapProcessingScene: React.FC<Props> = (props: Props) => {
       params: {
         fromWalletId: swapRequest.fromWallet.id,
         fromTokenId: swapRequest.fromTokenId,
-        toWalletId: swapRequest.toWallet.id,
+        toWalletId: toWallet.id,
         toTokenId: swapRequest.toTokenId,
         errorDisplayInfo
       }
@@ -313,7 +325,9 @@ function processSwapQuoteError({
       swapRequest.fromTokenId
     )
     const toCurrencyCode = getCurrencyCode(
-      swapRequest.toWallet,
+      // Wallet-to-wallet swaps always have a destination wallet here; the
+      // fallback only keeps the type honest for swap-to-address requests.
+      swapRequest.toWallet ?? swapRequest.fromWallet,
       swapRequest.toTokenId
     )
 
@@ -362,10 +376,11 @@ function trackSwapError(error: unknown, swapRequest: EdgeSwapRequest): void {
         swapRequest.fromTokenId
       ),
       swapToCurrency: getCurrencyCode(
-        swapRequest.toWallet,
+        swapRequest.toWallet ?? swapRequest.fromWallet,
         swapRequest.toTokenId
       ),
-      swapToWalletKind: swapRequest.toWallet.currencyInfo.pluginId,
+      swapToWalletKind: (swapRequest.toWallet ?? swapRequest.fromWallet)
+        .currencyInfo.pluginId,
       swapDirectionType: swapRequest.quoteFor
     })
     // Unsearchable context data:

src/components/scenes/TransactionDetailsScene.tsx

@@ -771,7 +771,9 @@ const convertActionToSwapData = (
     payoutCurrencyCode,
     payoutTokenId: toAsset.tokenId,
     payoutNativeAmount: action.toAsset.nativeAmount ?? '0',
-    payoutWalletId,
+    // A swap-to-address (private send) has no payout wallet; EdgeTxSwap still
+    // types this as required, so fall back to an empty id.
+    payoutWalletId: payoutWalletId ?? '',
     refundAddress
   }
   return out

src/components/themed/ExchangeQuoteComponent.tsx

@@ -27,7 +27,13 @@ interface Props {
 export const ExchangeQuote: React.FC<Props> = props => {
   const { fromTo, priceImpact, quote, showFeeWarning } = props
   const { request, fromNativeAmount, toNativeAmount, networkFee } = quote
-  const { fromWallet, fromTokenId, toWallet, toTokenId } = request
+  const { fromWallet, fromTokenId, toTokenId } = request
+  // A wallet-to-wallet swap quote always carries a destination wallet; only a
+  // swap-to-address request (its own flow) omits it.
+  const toWallet = request.toWallet
+  if (toWallet == null) {
+    throw new Error('Swap quote is missing a destination wallet')
+  }
 
   const theme = useTheme()
   const styles = getStyles(theme)