Merge pull request #5222 from EdgeApp/jon/fix/default-swap-assets

Fix TransactionListTop default swap asset logic

Author: Jon-edge

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 
 - changed: Some unecessary `showError` dropdowns demoted to hidden `showDevError`
+- fixed: Default swap pair logic from the trade modal was not prioritizing mainnet assets
 - removed: 'fasterpayments' payment type
 
 ## 4.12.0

src/components/themed/TransactionListTop.tsx

@@ -326,7 +326,7 @@ export class TransactionListTopComponent extends React.PureComponent<Props, Stat
         // priority assets for swapping.
         const isPriorityAssetMatch =
           currencyWallet.currencyInfo.pluginId === priorityAsset.pluginId &&
-          currencyWallet.enabledTokenIds.some(enabledTokenId => enabledTokenId === priorityAsset.tokenId)
+          (priorityAsset.tokenId == null || currencyWallet.enabledTokenIds.some(enabledTokenId => enabledTokenId === priorityAsset.tokenId))
 
         // If the wallet or enabled tokens has a priority swap asset match,
         // calculate its USD value and add it to the ownedAssets array along