feat: solana swap and bridge navigation

builds.yml

@@ -65,6 +65,7 @@ buildTypes:
       - build-flask
       - keyring-snaps
       - solana
+      - solana-swaps
     env:
       - INFURA_FLASK_PROJECT_ID
       - SEGMENT_FLASK_WRITE_KEY
@@ -139,6 +140,7 @@ features:
   solana:
     assets:
       - ./{app,shared,ui}/**/solana/**
+  solana-swaps:
 
 # Env variables that are required for all types of builds
 #

shared/constants/bridge.ts

@@ -1,3 +1,6 @@
+///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+import { MultichainNetworks } from './multichain/networks';
+///: END:ONLY_INCLUDE_IF
 import { CHAIN_IDS, NETWORK_TO_NAME_MAP } from './network';
 
 // TODO read from feature flags
@@ -11,6 +14,9 @@ export const ALLOWED_BRIDGE_CHAIN_IDS = [
   CHAIN_IDS.ARBITRUM,
   CHAIN_IDS.LINEA_MAINNET,
   CHAIN_IDS.BASE,
+  ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+  MultichainNetworks.SOLANA,
+  ///: END:ONLY_INCLUDE_IF
 ];
 
 export type AllowedBridgeChainIds = (typeof ALLOWED_BRIDGE_CHAIN_IDS)[number];
@@ -45,6 +51,13 @@ export const NETWORK_TO_SHORT_NETWORK_NAME_MAP: Record<
   [CHAIN_IDS.OPTIMISM]: NETWORK_TO_NAME_MAP[CHAIN_IDS.OPTIMISM],
   [CHAIN_IDS.ZKSYNC_ERA]: 'ZkSync Era',
   [CHAIN_IDS.BASE]: 'Base',
+  ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+  [MultichainNetworks.SOLANA]: 'Solana',
+  [MultichainNetworks.SOLANA_TESTNET]: 'Solana Testnet',
+  [MultichainNetworks.SOLANA_DEVNET]: 'Solana Devnet',
+  [MultichainNetworks.BITCOIN]: 'Bitcoin',
+  [MultichainNetworks.BITCOIN_TESTNET]: 'Bitcoin Testnet',
+  ///: END:ONLY_INCLUDE_IF
 };
 export const BRIDGE_MM_FEE_RATE = 0.875;
 export const REFRESH_INTERVAL_MS = 30 * 1000;

shared/constants/swaps.ts

@@ -1,3 +1,6 @@
+///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+import { MultichainNetworks } from './multichain/networks';
+///: END:ONLY_INCLUDE_IF
 import {
   ETH_TOKEN_IMAGE_URL,
   TEST_ETH_TOKEN_IMAGE_URL,
@@ -181,6 +184,9 @@ export const ALLOWED_PROD_SWAPS_CHAIN_IDS = [
   CHAIN_IDS.ZKSYNC_ERA,
   CHAIN_IDS.LINEA_MAINNET,
   CHAIN_IDS.BASE,
+  ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+  MultichainNetworks.SOLANA,
+  ///: END:ONLY_INCLUDE_IF
 ] as const;
 
 export const ALLOWED_DEV_SWAPS_CHAIN_IDS = [

test/e2e/flask/solana/send-flow.spec.ts

@@ -83,13 +83,13 @@ describe('Send full flow of USD', function (this: Suite) {
         );
         assert.equal(
           await homePage.check_ifSwapButtonIsClickable(),
-          false,
-          'Swap button is enabled and it shouldn`t',
+          true,
+          'Swap button is not enabled and it should',
         );
         assert.equal(
           await homePage.check_ifBridgeButtonIsClickable(),
-          false,
-          'Bridge button is enabled  and it should`t',
+          true,
+          'Bridge button is not enabled and it should',
         );
         await homePage.clickOnSendButton();
         const sendSolanaPage = new SendSolanaPage(driver);
@@ -234,13 +234,13 @@ describe('Send full flow of SOL', function (this: Suite) {
         );
         assert.equal(
           await homePage.check_ifSwapButtonIsClickable(),
-          false,
-          'Swap button is enabled and it shouldn`t',
+          true,
+          'Swap button is not enabled and it should',
         );
         assert.equal(
           await homePage.check_ifBridgeButtonIsClickable(),
-          false,
-          'Bridge button is enabled  and it should`t',
+          true,
+          'Bridge button is not enabled and it should',
         );
         await homePage.clickOnSendButton();
         const sendSolanaPage = new SendSolanaPage(driver);
@@ -378,13 +378,13 @@ describe('Send flow flow', function (this: Suite) {
         );
         assert.equal(
           await homePage.check_ifSwapButtonIsClickable(),
-          false,
-          'Swap button is enabled and it should`t',
+          true,
+          'Swap button is not enabled and it should',
         );
         assert.equal(
           await homePage.check_ifBridgeButtonIsClickable(),
-          false,
-          'Bridge button is enabled and it should`t',
+          true,
+          'Bridge button is not enabled and it should',
         );
         await homePage.clickOnSendButton();
         const sendSolanaPage = new SendSolanaPage(driver);

test/e2e/page-objects/pages/home/non-evm-homepage.ts

@@ -9,6 +9,8 @@ class NonEvmHomepage extends HomePage {
 
   protected readonly swapButton = '[data-testid="token-overview-button-swap"]';
 
+  protected readonly bridgeButton = '[data-testid="coin-overview-bridge"]';
+
   /**
    * Clicks the send button on the non-EVM account homepage.
    */

ui/components/app/wallet-overview/coin-buttons.tsx

@@ -97,11 +97,14 @@ import {
 import { isMultichainWalletSnap } from '../../../../shared/lib/accounts/snaps';
 ///: END:ONLY_INCLUDE_IF
 import {
-  getMultichainIsEvm,
   getMultichainNativeCurrency,
+  getMultichainNetwork,
 } from '../../../selectors/multichain';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 import { getCurrentChainId } from '../../../../shared/modules/selectors/networks';
+///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+import { MultichainNetworks } from '../../../../shared/constants/multichain/networks';
+///: END:ONLY_INCLUDE_IF
 
 type CoinButtonsProps = {
   account: InternalAccount;
@@ -160,12 +163,15 @@ const CoinButtons = ({
   // Initially, those events were using a "ETH" as `token_symbol`, so we keep this behavior
   // for EVM, no matter the currently selected native token (e.g. SepoliaETH if you are on Sepolia
   // network).
-  const isEvm = useMultichainSelector(getMultichainIsEvm, account);
+  const { isEvmNetwork, chainId: multichainChainId } = useMultichainSelector(
+    getMultichainNetwork,
+    account,
+  );
   const multichainNativeToken = useMultichainSelector(
     getMultichainNativeCurrency,
     account,
   );
-  const nativeToken = isEvm ? 'ETH' : multichainNativeToken;
+  const nativeToken = isEvmNetwork ? 'ETH' : multichainNativeToken;
 
   const isExternalServicesEnabled = useSelector(getUseExternalServices);
 
@@ -331,7 +337,7 @@ const CoinButtons = ({
   ///: END:ONLY_INCLUDE_IF
 
   const setCorrectChain = useCallback(async () => {
-    if (currentChainId !== chainId) {
+    if (currentChainId !== chainId && multichainChainId !== chainId) {
       try {
         const networkConfigurationId = networks[chainId];
         await dispatch(setActiveNetworkWithError(networkConfigurationId));
@@ -404,7 +410,44 @@ const CoinButtons = ({
     history.push(SEND_ROUTE);
   }, [chainId, account, setCorrectChain]);
 
+  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
+  const handleBuyAndSellOnClick = useCallback(() => {
+    openBuyCryptoInPdapp(getChainId());
+    trackEvent({
+      event: MetaMetricsEventName.NavBuyButtonClicked,
+      category: MetaMetricsEventCategory.Navigation,
+      properties: {
+        account_type: account.type,
+        location: 'Home',
+        text: 'Buy',
+        chain_id: chainId,
+        token_symbol: defaultSwapsToken,
+        ...getSnapAccountMetaMetricsPropertiesIfAny(account),
+      },
+    });
+  }, [chainId, defaultSwapsToken]);
+
+  const handleBridgeOnClick = useCallback(async () => {
+    if (!defaultSwapsToken) {
+      return;
+    }
+    await setCorrectChain();
+    openBridgeExperience(
+      'Home',
+      defaultSwapsToken,
+      location.pathname.includes('asset') ? '&token=native' : '',
+    );
+  }, [defaultSwapsToken, location, openBridgeExperience]);
+  ///: END:ONLY_INCLUDE_IF
+
   const handleSwapOnClick = useCallback(async () => {
+    ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+    if (multichainChainId === MultichainNetworks.SOLANA) {
+      handleBridgeOnClick();
+      return;
+    }
+    ///: END:ONLY_INCLUDE_IF
+
     await setCorrectChain();
     ///: BEGIN:ONLY_INCLUDE_IF(build-mmi)
     global.platform.openTab({
@@ -447,36 +490,6 @@ const CoinButtons = ({
     ///: END:ONLY_INCLUDE_IF
   ]);
 
-  ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-  const handleBuyAndSellOnClick = useCallback(() => {
-    openBuyCryptoInPdapp(getChainId());
-    trackEvent({
-      event: MetaMetricsEventName.NavBuyButtonClicked,
-      category: MetaMetricsEventCategory.Navigation,
-      properties: {
-        account_type: account.type,
-        location: 'Home',
-        text: 'Buy',
-        chain_id: chainId,
-        token_symbol: defaultSwapsToken,
-        ...getSnapAccountMetaMetricsPropertiesIfAny(account),
-      },
-    });
-  }, [chainId, defaultSwapsToken]);
-
-  const handleBridgeOnClick = useCallback(async () => {
-    if (!defaultSwapsToken) {
-      return;
-    }
-    await setCorrectChain();
-    openBridgeExperience(
-      'Home',
-      defaultSwapsToken,
-      location.pathname.includes('asset') ? '&token=native' : '',
-    );
-  }, [defaultSwapsToken, location, openBridgeExperience]);
-  ///: END:ONLY_INCLUDE_IF
-
   return (
     <Box display={Display.Flex} justifyContent={JustifyContent.spaceEvenly}>
       {

ui/components/app/wallet-overview/non-evm-overview.test.tsx

@@ -316,6 +316,8 @@ describe('NonEvmOverview', () => {
         location: 'Home',
         snap_id: mockNonEvmAccount.metadata.snap.id,
         text: 'Buy',
+        // We use a `SwapsEthToken` in this case, so we're expecting an entire object here.
+        token_symbol: expect.any(Object),
       },
     });
   });

ui/components/app/wallet-overview/non-evm-overview.tsx

@@ -14,7 +14,14 @@ import {
 import { getIsBitcoinBuyable } from '../../../ducks/ramps';
 import { useMultichainSelector } from '../../../hooks/useMultichainSelector';
 ///: END:ONLY_INCLUDE_IF
-import { getSelectedInternalAccount } from '../../../selectors';
+import {
+  ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+  getIsSwapsChain,
+  getIsBridgeChain,
+  ///: END:ONLY_INCLUDE_IF
+  getSelectedInternalAccount,
+  getSwapsDefaultToken,
+} from '../../../selectors';
 import { CoinOverview } from './coin-overview';
 
 type NonEvmOverviewProps = {
@@ -37,6 +44,14 @@ const NonEvmOverview = ({ className }: NonEvmOverviewProps) => {
   const isBtc = accountType === BtcAccountType.P2wpkh;
   const isBuyableChain = isBtc ? isBtcBuyable && isBtcMainnetAccount : false;
   ///: END:ONLY_INCLUDE_IF
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken);
+
+  let isSwapsChain = false;
+  let isBridgeChain = false;
+  ///: BEGIN:ONLY_INCLUDE_IF(solana-swaps)
+  isSwapsChain = useSelector((state) => getIsSwapsChain(state, chainId));
+  isBridgeChain = useSelector((state) => getIsBridgeChain(state, chainId));
+  ///: END:ONLY_INCLUDE_IF
 
   return (
     <CoinOverview
@@ -47,9 +62,10 @@ const NonEvmOverview = ({ className }: NonEvmOverviewProps) => {
       className={className}
       chainId={chainId}
       isSigningEnabled={true}
-      isSwapsChain={false}
+      isSwapsChain={isSwapsChain}
+      defaultSwapsToken={defaultSwapsToken}
       ///: BEGIN:ONLY_INCLUDE_IF(build-main,build-beta,build-flask)
-      isBridgeChain={false}
+      isBridgeChain={isBridgeChain}
       isBuyableChain={isBuyableChain}
       ///: END:ONLY_INCLUDE_IF
     />

ui/pages/bridge/index.tsx

@@ -35,6 +35,7 @@ import { useGasFeeEstimates } from '../../hooks/useGasFeeEstimates';
 import { useBridgeExchangeRates } from '../../hooks/bridge/useBridgeExchangeRates';
 import { useQuoteFetchEvents } from '../../hooks/bridge/useQuoteFetchEvents';
 import { TextVariant } from '../../helpers/constants/design-system';
+import { getMultichainIsSolana } from '../../selectors/multichain';
 import PrepareBridgePage from './prepare/prepare-bridge-page';
 import AwaitingSignaturesCancelButton from './awaiting-signatures/awaiting-signatures-cancel-button';
 import AwaitingSignatures from './awaiting-signatures/awaiting-signatures';
@@ -94,6 +95,8 @@ const CrossChainSwap = () => {
 
   const [isSettingsModalOpen, setIsSettingsModalOpen] = useState(false);
 
+  const isSolana = useSelector(getMultichainIsSolana);
+
   return (
     <Page className="bridge__container">
       <Header
@@ -117,7 +120,7 @@ const CrossChainSwap = () => {
           />
         }
       >
-        {t('bridge')}
+        {isSolana ? t('swap') : t('bridge')}
       </Header>
       <Content padding={0}>
         <Switch>

ui/pages/bridge/prepare/bridge-input-group.tsx

@@ -39,6 +39,7 @@ import { shortenString } from '../../../helpers/utils/util';
 import type { BridgeToken } from '../../../../shared/types/bridge';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { MINUTE } from '../../../../shared/constants/time';
+import { getMultichainIsSolana } from '../../../selectors/multichain';
 import { BridgeAssetPickerButton } from './components/bridge-asset-picker-button';
 
 export const BridgeInputGroup = ({
@@ -99,6 +100,8 @@ export const BridgeInputGroup = ({
     }
   }, [amountFieldProps?.value, isAmountReadOnly, token]);
 
+  const isSolana = useSelector(getMultichainIsSolana);
+
   return (
     <Column paddingInline={6} gap={1}>
       <Row gap={4}>
@@ -172,7 +175,7 @@ export const BridgeInputGroup = ({
                 fontWeight={FontWeight.Normal}
                 style={{ whiteSpace: 'nowrap' }}
               >
-                {t('bridgeTo')}
+                {isSolana ? t('swapSwapTo') : t('bridgeTo')}
               </Button>
             ) : (
               <BridgeAssetPickerButton

ui/pages/bridge/prepare/prepare-bridge-page.tsx

@@ -95,6 +95,7 @@ import { getCurrentKeyring, getLocale } from '../../../selectors';
 import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import { SECOND } from '../../../../shared/constants/time';
 import { BRIDGE_QUOTE_MAX_RETURN_DIFFERENCE_PERCENTAGE } from '../../../../shared/constants/bridge';
+import { getMultichainIsSolana } from '../../../selectors/multichain';
 import { BridgeInputGroup } from './bridge-input-group';
 import { BridgeCTAButton } from './bridge-cta-button';
 
@@ -365,6 +366,8 @@ const PrepareBridgePage = () => {
     }
   }, [fromChain, fromToken, fromTokens, search]);
 
+  const isSolana = useSelector(getMultichainIsSolana);
+
   return (
     <Column className="prepare-bridge-page" gap={8}>
       <BridgeInputGroup
@@ -522,7 +525,7 @@ const PrepareBridgePage = () => {
               dispatch(setToChain(networkConfig.chainId));
               dispatch(setToToken(null));
             },
-            header: t('bridgeTo'),
+            header: isSolana ? t('swapSwapTo') : t('bridgeTo'),
             shouldDisableNetwork: ({ chainId }) =>
               chainId === fromChain?.chainId,
           }}

ui/selectors/multichain.ts

@@ -221,6 +221,16 @@ export function getMultichainIsBitcoin(
   return !isEvm && symbol === 'BTC';
 }
 
+export function getMultichainIsSolana(
+  state: MultichainState,
+  account?: InternalAccount,
+) {
+  const isEvm = getMultichainIsEvm(state, account);
+  const { symbol } = getMultichainDefaultToken(state, account);
+
+  return !isEvm && symbol === 'SOL';
+}
+
 /**
  * Retrieves the provider configuration for a multichain network.
  *