From a69cb0284d3e2e79a110fc8fed386a17c71a14b5 Mon Sep 17 00:00:00 2001
From: micaelae <100321200+micaelae@users.noreply.github.com>
Date: Mon, 13 Mar 2023 08:50:12 -0700
Subject: [PATCH] Wrap balance and portfolio button (#18109)

---
 .../app/wallet-overview/eth-overview.js       |  1 +
 .../app/wallet-overview/eth-overview.test.js  | 61 ++++++++++++++++++-
 ui/components/app/wallet-overview/index.scss  | 14 ++---
 3 files changed, 67 insertions(+), 9 deletions(-)

diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index b7717ce26..0996597fb 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -75,6 +75,7 @@ const EthOverview = ({ className }) => {
             <div className="eth-overview__primary-container">
               {balance ? (
                 <UserPreferencedCurrencyDisplay
+                  style={{ display: 'contents' }}
                   className={classnames('eth-overview__primary-balance', {
                     'eth-overview__cached-balance': balanceIsCached,
                   })}
diff --git a/ui/components/app/wallet-overview/eth-overview.test.js b/ui/components/app/wallet-overview/eth-overview.test.js
index 09ec4498d..0d3090762 100644
--- a/ui/components/app/wallet-overview/eth-overview.test.js
+++ b/ui/components/app/wallet-overview/eth-overview.test.js
@@ -32,10 +32,16 @@ describe('EthOverview', () => {
         type: 'test',
         chainId: CHAIN_IDS.MAINNET,
       },
-      cachedBalances: {},
+      cachedBalances: {
+        '0x1': {
+          '0x1': '0x1F4',
+        },
+      },
       preferences: {
         useNativeCurrencyAsPrimaryCurrency: true,
       },
+      useCurrencyRateCheck: true,
+      conversionRate: 2,
       identities: {
         '0x1': {
           address: '0x1',
@@ -66,6 +72,8 @@ describe('EthOverview', () => {
   const ETH_OVERVIEW_BUY = 'eth-overview-buy';
   const ETH_OVERVIEW_BRIDGE = 'eth-overview-bridge';
   const ETH_OVERVIEW_PORTFOLIO = 'home__portfolio-site';
+  const ETH_OVERVIEW_PRIMARY_CURRENCY = 'eth-overview__primary-currency';
+  const ETH_OVERVIEW_SECONDARY_CURRENCY = 'eth-overview__secondary-currency';
 
   afterEach(() => {
     store.clearActions();
@@ -86,6 +94,57 @@ describe('EthOverview', () => {
       openTabSpy.mockClear();
     });
 
+    it('should show the primary balance', async () => {
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <EthOverview />,
+        store,
+      );
+
+      const primaryBalance = queryByTestId(ETH_OVERVIEW_PRIMARY_CURRENCY);
+      expect(primaryBalance).toBeInTheDocument();
+      expect(primaryBalance).toHaveTextContent('0ETH');
+      expect(queryByText('*')).not.toBeInTheDocument();
+    });
+
+    it('should show the cached primary balance', async () => {
+      const mockedStoreWithCachedBalance = {
+        metamask: {
+          ...mockStore.metamask,
+          accounts: {
+            '0x1': {
+              address: '0x1',
+            },
+          },
+          cachedBalances: {
+            '0x1': {
+              '0x1': '0x24da51d247e8b8',
+            },
+          },
+        },
+      };
+      const mockedStore = configureMockStore([thunk])(
+        mockedStoreWithCachedBalance,
+      );
+
+      const { queryByTestId, queryByText } = renderWithProvider(
+        <EthOverview />,
+        mockedStore,
+      );
+
+      const primaryBalance = queryByTestId(ETH_OVERVIEW_PRIMARY_CURRENCY);
+      expect(primaryBalance).toBeInTheDocument();
+      expect(primaryBalance).toHaveTextContent('0.0104ETH');
+      expect(queryByText('*')).toBeInTheDocument();
+    });
+
+    it('should show the secondary balance', async () => {
+      const { queryByTestId } = renderWithProvider(<EthOverview />, store);
+
+      const secondaryBalance = queryByTestId(ETH_OVERVIEW_SECONDARY_CURRENCY);
+      expect(secondaryBalance).toBeInTheDocument();
+      expect(secondaryBalance).toHaveTextContent('0');
+    });
+
     it('should always show the Bridge button', () => {
       const { queryByTestId } = renderWithProvider(<EthOverview />, store);
       const bridgeButton = queryByTestId(ETH_OVERVIEW_BRIDGE);
diff --git a/ui/components/app/wallet-overview/index.scss b/ui/components/app/wallet-overview/index.scss
index e6262168f..ae90cfad2 100644
--- a/ui/components/app/wallet-overview/index.scss
+++ b/ui/components/app/wallet-overview/index.scss
@@ -46,20 +46,20 @@
     align-items: center;
     margin: 16px 0;
     padding: 0 16px;
-    max-width: 100%;
+    max-width: 326px;
   }
 
   &__primary-container {
     display: flex;
-    position: relative;
+    max-width: inherit;
+    justify-content: center;
+    flex-wrap: wrap;
   }
 
   &__primary-balance {
     @include H2;
 
     color: var(--color-text-default);
-    width: 100%;
-    justify-content: center;
   }
 
   &__cached-star {
@@ -67,10 +67,8 @@
   }
 
   &__portfolio-button {
-    position: absolute;
-    top: 50%;
-    transform: translate(0, -50%);
-    left: calc(100% + 2px);
+    height: inherit;
+    padding-inline-start: 16px;
   }
 
   &__cached-balance,