feat: new receive flow

test/e2e/flask/btc/btc-account-overview.spec.ts

@@ -38,7 +38,7 @@ describe('BTC Account - Overview', function (this: Suite) {
         assert.equal(await buySellButton.isEnabled(), false);
 
         const portfolioButton = await driver.waitForSelector(
-          '[data-testid="coin-overview-portfolio"]',
+          '[data-testid="coin-overview-receive"]',
         );
         assert.equal(await portfolioButton.isEnabled(), true);
       },

test/e2e/tests/account/import-flow.spec.js

@@ -7,7 +7,6 @@ const {
   regularDelayMs,
   largeDelayMs,
   completeImportSRPOnboardingFlow,
-  completeImportSRPOnboardingFlowWordByWord,
   openActionMenuAndStartSendFlow,
   unlockWallet,
   logInWithBalanceValidation,
@@ -61,7 +60,7 @@ describe('Import flow @no-mmi', function () {
         await driver.clickElement(
           '[data-testid="account-list-item-menu-button"]',
         );
-        await driver.clickElement('[data-testid="account-list-menu-details"');
+        await driver.clickElement('[data-testid="account-list-menu-details"]');
         await driver.findVisibleElement('.qr-code__wrapper');
 
         // shows a QR code for the account
@@ -162,40 +161,6 @@ describe('Import flow @no-mmi', function () {
     );
   });
 
-  it('Import wallet using Secret Recovery Phrase with pasting word by word', async function () {
-    const testAddress = '0x0Cc5261AB8cE458dc977078A3623E2BaDD27afD3';
-
-    await withFixtures(
-      {
-        fixtures: new FixtureBuilder({ onboarding: true }).build(),
-        ganacheOptions,
-        title: this.test.fullTitle(),
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-
-        await completeImportSRPOnboardingFlowWordByWord(
-          driver,
-          TEST_SEED_PHRASE,
-          WALLET_PASSWORD,
-        );
-
-        // Show account information
-        await driver.clickElement('[data-testid="account-menu-icon"]');
-        await driver.clickElement(
-          '[data-testid="account-list-item-menu-button"]',
-        );
-        await driver.clickElement('[data-testid="account-list-menu-details"');
-        await driver.findVisibleElement('.qr-code__wrapper');
-        // shows the correct account address
-        await driver.findElement({
-          css: '.qr-code [data-testid="address-copy-button-text"]',
-          text: testAddress,
-        });
-      },
-    );
-  });
-
   it('Import Account using private key and remove imported account', async function () {
     const testPrivateKey1 =
       '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6';

test/e2e/tests/account/incremental-security.spec.js

@@ -73,11 +73,10 @@ describe('Incremental Security', function () {
         );
         await driver.clickElement('[data-testid="account-list-menu-details"');
 
-        // gets the current accounts address
-        const address = await driver.findElement(
-          '.qr-code .multichain-address-copy-button',
+        const outerSegment = await driver.findElement(
+          '.qr-code__address-segments',
         );
-        const publicAddress = await address.getText();
+        const publicAddress = await outerSegment.getText();
 
         // wait for account modal to be visible
         await driver.findVisibleElement(

test/e2e/tests/portfolio/portfolio-site.spec.js

@@ -36,7 +36,7 @@ describe('Portfolio site', function () {
         await unlockWallet(driver);
 
         // Click Portfolio site
-        await driver.clickElement('[data-testid="eth-overview-portfolio"]');
+        await driver.clickElement('[data-testid="portfolio-link"]');
         await driver.waitUntilXWindowHandles(2);
         const windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('E2E Test Page', windowHandles);

ui/components/app/assets/asset-list/asset-list.js

@@ -35,7 +35,6 @@ import {
   DetectedTokensBanner,
   TokenListItem,
   ImportTokenLink,
-  ReceiveTokenLink,
 } from '../../../multichain';
 import { useAccountTotalFiatBalance } from '../../../../hooks/useAccountTotalFiatBalance';
 import { useIsOriginalNativeTokenSymbol } from '../../../../hooks/useIsOriginalNativeTokenSymbol';
@@ -205,20 +204,11 @@ const AssetList = ({ onClickAsset, showTokensLinks }) => {
         }}
       />
       {shouldShowTokensLinks && (
-        <>
-          {balanceIsZero && (
-            <ReceiveTokenLink
-              margin={4}
-              marginBottom={0}
-              marginTop={detectedTokens.length > 0 ? 0 : 4}
-            />
-          )}
-          <ImportTokenLink
-            margin={4}
-            marginBottom={2}
-            marginTop={detectedTokens.length > 0 && !balanceIsZero ? 0 : 2}
-          />
-        </>
+        <ImportTokenLink
+          margin={4}
+          marginBottom={2}
+          marginTop={detectedTokens.length > 0 && !balanceIsZero ? 0 : 2}
+        />
       )}
       {showDetectedTokens && (
         <DetectedToken setShowDetectedTokens={setShowDetectedTokens} />

ui/components/app/assets/asset-list/asset-list.test.js

@@ -24,7 +24,7 @@ const USDC_CONTRACT = '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48';
 const LINK_CONTRACT = '0x514910771AF9Ca656af840dff83E8264EcF986CA';
 const WBTC_CONTRACT = '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599';
 
-let mockTokens = [
+const mockTokens = [
   {
     address: USDC_CONTRACT,
     decimals: 6,
@@ -134,15 +134,4 @@ describe('AssetList', () => {
       expect(screen.getByText('Refresh list')).toBeInTheDocument();
     });
   });
-
-  it('shows the receive button when the user balance is zero', async () => {
-    mockTokens = [];
-
-    await act(async () => {
-      render(mockState.metamask.selectedAddress, '0x0', CHAIN_IDS.MAINNET);
-    });
-    await waitFor(() => {
-      expect(screen.getByText('Receive tokens')).toBeInTheDocument();
-    });
-  });
 });

ui/components/app/wallet-overview/btc-overview.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
-import { fireEvent, waitFor } from '@testing-library/react';
+import { fireEvent } from '@testing-library/react';
 import thunk from 'redux-thunk';
 import { Cryptocurrency } from '@metamask/assets-controllers';
 import { BtcAccountType, BtcMethod } from '@metamask/keyring-api';
@@ -17,7 +17,7 @@ const PORTOFOLIO_URL = 'https://portfolio.test';
 
 const BTC_OVERVIEW_BUY = 'coin-overview-buy';
 const BTC_OVERVIEW_BRIDGE = 'coin-overview-bridge';
-const BTC_OVERVIEW_PORTFOLIO = 'coin-overview-portfolio';
+const BTC_OVERVIEW_RECEIVE = 'coin-overview-receive';
 const BTC_OVERVIEW_SWAP = 'token-overview-button-swap';
 const BTC_OVERVIEW_SEND = 'coin-overview-send';
 const BTC_OVERVIEW_PRIMARY_CURRENCY = 'coin-overview__primary-currency';
@@ -218,27 +218,9 @@ describe('BtcOverview', () => {
     });
   });
 
-  it('always show the Portfolio button', () => {
+  it('always show the Receive button', () => {
     const { queryByTestId } = renderWithProvider(<BtcOverview />, getStore());
-    const portfolioButton = queryByTestId(BTC_OVERVIEW_PORTFOLIO);
-    expect(portfolioButton).toBeInTheDocument();
-  });
-
-  it('open the Portfolio URI when clicking on Portfolio button', async () => {
-    const { queryByTestId } = renderWithProvider(<BtcOverview />, getStore());
-    const openTabSpy = jest.spyOn(global.platform, 'openTab');
-
-    const portfolioButton = queryByTestId(BTC_OVERVIEW_PORTFOLIO);
-    expect(portfolioButton).toBeInTheDocument();
-    fireEvent.click(portfolioButton as HTMLElement);
-
-    expect(openTabSpy).toHaveBeenCalledTimes(1);
-    await waitFor(() =>
-      expect(openTabSpy).toHaveBeenCalledWith({
-        url: expect.stringContaining(
-          `?metamaskEntry=ext_portfolio_button&metametricsId=${mockMetaMetricsId}`,
-        ),
-      }),
-    );
+    const receiveButton = queryByTestId(BTC_OVERVIEW_RECEIVE);
+    expect(receiveButton).toBeInTheDocument();
   });
 });