Merge pull request #5706 from EdgeApp/jon/fix/same-addr-swap

Jon/fix/same addr swap

Author: Jon-edge

CHANGELOG.md

@@ -7,6 +7,7 @@
 - added: `parseMarkdown` supports bold text (`**strong**`)
 - added: `PendingTxModal` to route to pending txs for acceleration
 - added: Added "Report Error" button to all `AlertDropdown`s from `showError`.
+- added: Handle `SwapAddressError` by auto-selecting an existing wallet with the same address or splitting if needed
 - changed: Duress mode copy
 - changed: Increased tappable area for the close button of `NotificationCard`
 - changed: Replaced 'react-native-camera' with 'react-native-vision-camera'

src/components/modals/ButtonsModal.tsx

@@ -54,9 +54,9 @@ export interface ButtonModalProps<Buttons> {
  * Build a custom modal component if you need form fields, check boxes,
  * or other interactive elements.
  */
-export function ButtonsModal<Buttons extends Record<string, ButtonInfo>>(
-  props: ButtonModalProps<Buttons>
-) {
+export const ButtonsModal: React.FC<
+  ButtonModalProps<Record<string, ButtonInfo>>
+> = props => {
   const {
     bridge,
     title,
@@ -91,7 +91,7 @@ export function ButtonsModal<Buttons extends Record<string, ButtonInfo>>(
         result => {
           if (result) bridge.resolve(key)
         },
-        error => {
+        (error: unknown) => {
           showError(error)
         }
       )

src/components/scenes/SwapProcessingScene.tsx

@@ -2,6 +2,7 @@ import { captureException } from '@sentry/react-native'
 import {
   asMaybeInsufficientFundsError,
   asMaybeSwapAboveLimitError,
+  asMaybeSwapAddressError,
   asMaybeSwapBelowLimitError,
   asMaybeSwapCurrencyError,
   asMaybeSwapPermissionError,
@@ -18,10 +19,13 @@ import { lstrings } from '../../locales/strings'
 import { useSelector } from '../../types/reactRedux'
 import type { NavigationBase, SwapTabSceneProps } from '../../types/routerTypes'
 import { getCurrencyCode } from '../../util/CurrencyInfoHelpers'
+import { getWalletName } from '../../util/CurrencyWalletHelpers'
 import { convertNativeToDisplay, zeroString } from '../../util/utils'
+import { ButtonsModal } from '../modals/ButtonsModal'
 import { showInsufficientFeesModal } from '../modals/InsufficientFeesModal'
 import { showPendingTxModal } from '../modals/PendingTxModal'
 import { CancellableProcessingScene } from '../progress-indicators/CancellableProcessingScene'
+import { Airship } from '../services/AirshipInstance'
 import type { SwapErrorDisplayInfo } from './SwapCreateScene'
 
 export interface SwapProcessingParams {
@@ -33,7 +37,7 @@ export interface SwapProcessingParams {
 
 type Props = SwapTabSceneProps<'swapProcessing'>
 
-export function SwapProcessingScene(props: Props) {
+export const SwapProcessingScene: React.FC<Props> = (props: Props) => {
   const { route, navigation } = props
   const { swapRequest, swapRequestOptions, onCancel, onDone } = route.params
 
@@ -61,6 +65,95 @@ export function SwapProcessingScene(props: Props) {
     navigation: NavigationBase,
     error: unknown
   ): Promise<void> => {
+    // Handle same-address requirement for swap flows requiring a split:
+    const addressError = asMaybeSwapAddressError(error)
+    if (addressError != null && addressError.reason === 'mustMatch') {
+      try {
+        const fromWallet = swapRequest.fromWallet
+        const fromAddresses = await fromWallet.getAddresses({ tokenId: null })
+        const fromAddress = fromAddresses[0]?.publicAddress
+        const targetPluginId = swapRequest.toWallet.currencyInfo.pluginId
+
+        let matchingWalletId: string | undefined
+        for (const walletId of Object.keys(account.currencyWallets)) {
+          const wallet = account.currencyWallets[walletId]
+          if (wallet.currencyInfo.pluginId === targetPluginId) {
+            const toAddresses = await wallet.getAddresses({ tokenId: null })
+            const publicAddress = toAddresses[0]?.publicAddress
+            if (
+              fromAddress != null &&
+              publicAddress != null &&
+              fromAddress.toLowerCase() === publicAddress.toLowerCase()
+            ) {
+              matchingWalletId = walletId
+              break
+            }
+          }
+        }
+
+        let finalToWalletId: string = swapRequest.toWallet.id
+        let finalToWallet = swapRequest.toWallet
+        let isWalletCreated = false
+        if (matchingWalletId == null) {
+          // If not found, split from the source chain wallet to the destination
+          // chain wallet type:
+          isWalletCreated = true
+          const splitFromWallet = fromWallet
+          const targetWalletType =
+            account.currencyConfig[targetPluginId]?.currencyInfo.walletType
+          if (targetWalletType == null)
+            throw new Error('Target wallet type unavailable')
+
+          const splitWalletId = await account.splitWalletInfo(
+            splitFromWallet.id,
+            targetWalletType
+          )
+          const newWallet = await account.waitForCurrencyWallet(splitWalletId)
+          finalToWalletId = newWallet.id
+          finalToWallet = newWallet
+        } else {
+          finalToWalletId = matchingWalletId
+          finalToWallet = account.currencyWallets[matchingWalletId]
+        }
+
+        // Navigate back to swap create with the correct wallet selected:
+        navigation.navigate('swapTab', {
+          screen: 'swapCreate',
+          params: {
+            fromWalletId: fromWallet.id,
+            fromTokenId: swapRequest.fromTokenId,
+            toWalletId: finalToWalletId,
+            toTokenId: swapRequest.toTokenId
+          }
+        })
+
+        // Show modal with OK button:
+        const name = getWalletName(finalToWallet)
+        const fromCurrencyCode = getCurrencyCode(
+          fromWallet,
+          swapRequest.fromTokenId
+        )
+        const toCurrencyCode = getCurrencyCode(
+          finalToWallet,
+          swapRequest.toTokenId
+        )
+        const template = isWalletCreated
+          ? lstrings.ss_same_address_upgrade_created_3s
+          : lstrings.ss_same_address_upgrade_selected_3s
+        await Airship.show<string | undefined>(bridge => (
+          <ButtonsModal
+            bridge={bridge}
+            title={lstrings.exchange_generic_error_title}
+            message={sprintf(template, fromCurrencyCode, toCurrencyCode, name)}
+            buttons={{ ok: { label: lstrings.string_ok_cap } }}
+          />
+        ))
+        return
+      } catch (e) {
+        // Fall through to generic error handling if something goes wrong
+      }
+    }
+
     // Check for pending transaction error first
     if (
       error != null &&
@@ -185,7 +278,7 @@ function processSwapQuoteError({
   }
 
   const belowLimit = asMaybeSwapBelowLimitError(error)
-  if (belowLimit) {
+  if (belowLimit != null) {
     const currentCurrencyDenomination =
       belowLimit.direction === 'to' ? toDenomination : fromDenomination
 

src/locales/en_US.ts

@@ -1069,6 +1069,10 @@ const strings = {
   open_settings: 'Open Settings',
   ss_geolock: 'Location restricted. Unable to complete exchange.',
   ss_unable: 'No enabled exchanges support %1$s to %2$s.',
+  ss_same_address_upgrade_created_3s:
+    '%1$s→%2$s upgrades require the same address for both wallets. %3$s has been created. Please try your upgrade again.',
+  ss_same_address_upgrade_selected_3s:
+    '%1$s→%2$s upgrades require the same address for both wallets. %3$s has been selected. Please try your upgrade again.',
   account: 'Account',
   forget_account_title: 'Forget Account',
   forget_account_message_common:
@@ -1548,6 +1552,7 @@ const strings = {
   request_balance: 'You have %s',
 
   // Crypto Exchange Scene
+  exchange_same_address_upgrade: 'Asset Upgrade',
   exchange_generic_error_title: 'Exchange Error',
   exchange_insufficient_funds_title: 'Insufficient Funds',
   exchange_insufficient_funds_message:

src/locales/strings/enUS.json

@@ -846,6 +846,8 @@
   "open_settings": "Open Settings",
   "ss_geolock": "Location restricted. Unable to complete exchange.",
   "ss_unable": "No enabled exchanges support %1$s to %2$s.",
+  "ss_same_address_upgrade_created_3s": "%1$s→%2$s upgrades require the same address for both wallets. %3$s has been created. Please try your upgrade again.",
+  "ss_same_address_upgrade_selected_3s": "%1$s→%2$s upgrades require the same address for both wallets. %3$s has been selected. Please try your upgrade again.",
   "account": "Account",
   "forget_account_title": "Forget Account",
   "forget_account_message_common": "Are you sure you want to forget the account %1$s from this device? PIN login will no longer work and you will need to login with your username and password.\n\nIf 2FA is enabled for this account, you will need to either enter your 2FA code or be locked out for at least 7 days (up to 18 months) before being able to regain access.",
@@ -1211,6 +1213,7 @@
   "send_address_expire_title": "Payment Address Expiration Time",
   "send_address_expired_error_message": "Payment Address Expired",
   "request_balance": "You have %s",
+  "exchange_same_address_upgrade": "Asset Upgrade",
   "exchange_generic_error_title": "Exchange Error",
   "exchange_insufficient_funds_title": "Insufficient Funds",
   "exchange_insufficient_funds_message": "Entered amount plus fees exceeds wallet balance.",