fix: Hide network fee fiat conversion on test nets

MetaMask · Feb 7, 2025 · b7fa514 · b7fa514
1 parent 335b3bb
commit b7fa514
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 25 deletions.
diff --git a/test/e2e/tests/transaction/gas-estimates.spec.js b/test/e2e/tests/transaction/gas-estimates.spec.js
@@ -20,7 +20,13 @@ describe('Gas estimates generated by MetaMask', function () {
     it('show expected gas defaults', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder().build(),
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            })
+            .build(),
           ganacheOptions: postLondonGanacheOptions,
           title: this.test.fullTitle(),
         },
@@ -55,7 +61,13 @@ describe('Gas estimates generated by MetaMask', function () {
     it('show expected gas defaults when API is down', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder().build(),
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            })
+            .build(),
           ganacheOptions: postLondonGanacheOptions,
           testSpecificMock: (mockServer) => {
             mockServer
@@ -101,7 +113,13 @@ describe('Gas estimates generated by MetaMask', function () {
     it('show expected gas defaults when the network is not supported', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder().build(),
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            })
+            .build(),
           ganacheOptions: postLondonGanacheOptions,
           testSpecificMock: (mockServer) => {
             mockServer
@@ -146,7 +164,13 @@ describe('Gas estimates generated by MetaMask', function () {
     it('show expected gas defaults on a network supported by legacy gas API', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder().build(),
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            })
+            .build(),
           ganacheOptions: {
             ...preLondonGanacheOptions,
             chainId: parseInt(CHAIN_IDS.BSC, 16),
@@ -182,7 +206,13 @@ describe('Gas estimates generated by MetaMask', function () {
     it('show expected gas defaults on a network supported by legacy gas API when that API is down', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder().build(),
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            })
+            .build(),
           ganacheOptions: {
             ...preLondonGanacheOptions,
             chainId: parseInt(CHAIN_IDS.BSC, 16),
@@ -232,7 +262,13 @@ describe('Gas estimates generated by MetaMask', function () {
     it('show expected gas defaults on a network not supported by legacy gas API', async function () {
       await withFixtures(
         {
-          fixtures: new FixtureBuilder().build(),
+          fixtures: new FixtureBuilder()
+            .withPreferencesController({
+              preferences: {
+                showFiatInTestnets: true,
+              },
+            })
+            .build(),
           ganacheOptions: preLondonGanacheOptions,
           title: this.test.fullTitle(),
         },

diff --git a/test/e2e/tests/transaction/send-edit.spec.js b/test/e2e/tests/transaction/send-edit.spec.js
@@ -15,7 +15,14 @@ describe('Editing Confirm Transaction', function () {
   it('goes back from confirm page to edit eth value, gas price and gas limit', async function () {
     await withFixtures(
       {
-        fixtures: new FixtureBuilder().withConversionRateDisabled().build(),
+        fixtures: new FixtureBuilder()
+          .withPreferencesController({
+            preferences: {
+              showFiatInTestnets: true,
+            },
+          })
+          .withConversionRateDisabled()
+          .build(),
         ganacheOptions: defaultGanacheOptions,
         title: this.test.fullTitle(),
       },

diff --git a/...ages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx b/...ages/confirmations/components/confirm/info/shared/edit-gas-fees-row/edit-gas-fees-row.tsx
@@ -70,25 +70,25 @@ export const EditGasFeesRow = ({
           {nativeFee}
         </Text>
         {(!isTestnet || showFiatInTestnets) &&
-        fiatFeeWith18SignificantDigits ? (
-          <Tooltip title={fiatFeeWith18SignificantDigits}>
+          (fiatFeeWith18SignificantDigits ? (
+            <Tooltip title={fiatFeeWith18SignificantDigits}>
+              <Text
+                marginRight={2}
+                color={TextColor.textAlternative}
+                data-testid="native-currency"
+              >
+                {fiatFee}
+              </Text>
+            </Tooltip>
+          ) : (
             <Text
               marginRight={2}
               color={TextColor.textAlternative}
               data-testid="native-currency"
             >
               {fiatFee}
             </Text>
-          </Tooltip>
-        ) : (
-          <Text
-            marginRight={2}
-            color={TextColor.textAlternative}
-            data-testid="native-currency"
-          >
-            {fiatFee}
-          </Text>
-        )}
+          ))}
       </Box>
     </ConfirmInfoAlertRow>
   );

diff --git a/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.tsx b/ui/pages/confirmations/components/confirm/info/shared/gas-fees-row/gas-fees-row.tsx
@@ -62,13 +62,13 @@ export const GasFeesRow = ({
           {nativeFee}
         </Text>
         {(!isTestnet || showFiatInTestnets) &&
-        fiatFeeWith18SignificantDigits ? (
-          <Tooltip title={fiatFeeWith18SignificantDigits}>
+          (fiatFeeWith18SignificantDigits ? (
+            <Tooltip title={fiatFeeWith18SignificantDigits}>
+              <Text color={TextColor.textAlternative}>{fiatFee}</Text>
+            </Tooltip>
+          ) : (
             <Text color={TextColor.textAlternative}>{fiatFee}</Text>
-          </Tooltip>
-        ) : (
-          <Text color={TextColor.textAlternative}>{fiatFee}</Text>
-        )}
+          ))}
       </Box>
     </ConfirmInfoRow>
   );