From 90adb4617b1c0886ada61db991dc7eb980fd54c2 Mon Sep 17 00:00:00 2001
From: Nidhi Kumari <nidhi.kumari@consensys.net>
Date: Fri, 4 Aug 2023 22:59:23 +0530
Subject: [PATCH] UX Multichain: Fixed fiat and eth value in Account List Menu
 (#20334)

* swapped fiat and eth valu

* updated e2e test for account list and token value

* updated fixture
---
 test/e2e/tests/account-token-list.spec.js     | 85 +++++++++++++++++++
 .../account-list-item/account-list-item.js    |  4 +-
 2 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 test/e2e/tests/account-token-list.spec.js

diff --git a/test/e2e/tests/account-token-list.spec.js b/test/e2e/tests/account-token-list.spec.js
new file mode 100644
index 000000000..233f4c862
--- /dev/null
+++ b/test/e2e/tests/account-token-list.spec.js
@@ -0,0 +1,85 @@
+const { strict: assert } = require('assert');
+const {
+  withFixtures,
+  defaultGanacheOptions,
+  unlockWallet,
+} = require('../helpers');
+const FixtureBuilder = require('../fixture-builder');
+const { SMART_CONTRACTS } = require('../seeder/smart-contracts');
+
+describe('Settings', function () {
+  const smartContract = SMART_CONTRACTS.ERC1155;
+  it('Should match the value of token list item and account list item for eth conversion', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        defaultGanacheOptions,
+        smartContract,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await unlockWallet(driver);
+
+        await driver.clickElement('[data-testid="home__asset-tab"]');
+
+        const tokenValue = '0 ETH';
+        const tokenListAmount = await driver.findElement(
+          '[data-testid="multichain-token-list-item-value"]',
+        );
+        assert.equal(await tokenListAmount.getText(), tokenValue);
+
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        const accountTokenValue = await driver.waitForSelector(
+          '.currency-display-component__text',
+        );
+
+        assert.equal(await accountTokenValue.getText(), '0', `ETH`);
+      },
+    );
+  });
+
+  it('Should match the value of token list item and account list item for fiat conversion', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: new FixtureBuilder().build(),
+        defaultGanacheOptions,
+        smartContract,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await unlockWallet(driver);
+
+        await driver.clickElement(
+          '[data-testid="account-options-menu-button"]',
+        );
+        await driver.clickElement({ text: 'Settings', tag: 'div' });
+        await driver.clickElement({
+          text: 'General',
+          tag: 'div',
+        });
+        await driver.clickElement({ text: 'Fiat', tag: 'label' });
+
+        await driver.clickElement(
+          '.settings-page__header__title-container__close-button',
+        );
+        await driver.clickElement('[data-testid="home__asset-tab"]');
+        const tokenValue = '0 ETH';
+        const tokenListAmount = await driver.findElement(
+          '[data-testid="multichain-token-list-item-value"]',
+        );
+        assert.equal(await tokenListAmount.getText(), tokenValue);
+
+        await driver.clickElement('[data-testid="account-menu-icon"]');
+        const accountTokenValue = await driver.waitForSelector(
+          '.currency-display-component__text',
+        );
+
+        assert.equal(await accountTokenValue.getText(), '0', `ETH`);
+      },
+    );
+  });
+});
diff --git a/ui/components/multichain/account-list-item/account-list-item.js b/ui/components/multichain/account-list-item/account-list-item.js
index 10e8d463f..ea9d9675d 100644
--- a/ui/components/multichain/account-list-item/account-list-item.js
+++ b/ui/components/multichain/account-list-item/account-list-item.js
@@ -194,7 +194,7 @@ export const AccountListItem = ({
               <UserPreferencedCurrencyDisplay
                 ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
                 value={identity.balance}
-                type={SECONDARY}
+                type={PRIMARY}
               />
             </Text>
           </Box>
@@ -225,7 +225,7 @@ export const AccountListItem = ({
             <UserPreferencedCurrencyDisplay
               ethNumberOfDecimals={MAXIMUM_CURRENCY_DECIMALS}
               value={identity.balance}
-              type={PRIMARY}
+              type={SECONDARY}
             />
           </Text>
         </Box>