Merge branch 'develop' into jl/added-generic-polling-hook-replace-use…

…Safe
MetaMask · Mar 6, 2024 · 974acba · 974acba
2 parents 64c3fd5 + ca90dde
commit 974acba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
@@ -93,13 +93,11 @@ const AssetList = ({ onClickAsset }) => {
     numberOfDecimals: secondaryNumberOfDecimals,
   } = useUserPreferencedCurrency(SECONDARY, { ethNumberOfDecimals: 4 });
 
-  const [, primaryCurrencyProperties] = useCurrencyDisplay(
-    selectedAccountBalance,
-    {
+  const [primaryCurrencyDisplay, primaryCurrencyProperties] =
+    useCurrencyDisplay(selectedAccountBalance, {
       numberOfDecimals: primaryNumberOfDecimals,
       currency: primaryCurrency,
-    },
-  );
+    });
 
   const [secondaryCurrencyDisplay, secondaryCurrencyProperties] =
     useCurrencyDisplay(selectedAccountBalance, {
@@ -226,14 +224,15 @@ const AssetList = ({ onClickAsset }) => {
       <TokenListItem
         onClick={() => onClickAsset(nativeCurrency)}
         title={nativeCurrency}
+        // The primary and secondary currencies are subject to change based on the user's settings
+        // TODO: rename this primary/secondary concept here to be more intuitive, regardless of setting
         primary={
-          showPrimaryCurrency(
+          showSecondaryCurrency(
             isOriginalNativeSymbol,
             useNativeCurrencyAsPrimaryCurrency,
           )
-            ? primaryCurrencyProperties.value ??
-              secondaryCurrencyProperties.value
-            : null
+            ? secondaryCurrencyDisplay
+            : undefined
         }
         tokenSymbol={
           useNativeCurrencyAsPrimaryCurrency
@@ -242,11 +241,11 @@ const AssetList = ({ onClickAsset }) => {
         }
         secondary={
           showFiat &&
-          showSecondaryCurrency(
+          showPrimaryCurrency(
             isOriginalNativeSymbol,
             useNativeCurrencyAsPrimaryCurrency,
           )
-            ? secondaryCurrencyDisplay
+            ? primaryCurrencyDisplay
             : undefined
         }
         tokenImage={balanceIsLoading ? null : primaryTokenImage}

diff --git a/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap b/ui/components/app/token-cell/__snapshots__/token-cell.test.js.snap
@@ -85,7 +85,6 @@ exports[`Token Cell should match snapshot 1`] = `
               5.000
                
               TEST
-               
             </p>
           </div>
         </div>

diff --git a/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap b/ui/components/multichain/token-list-item/__snapshots__/token-list-item.test.js.snap
@@ -72,7 +72,6 @@ exports[`TokenListItem should render correctly 1`] = `
               data-testid="multichain-token-list-item-value"
             >
                
-               
             </p>
           </div>
         </div>

diff --git a/ui/components/multichain/token-list-item/token-list-item.js b/ui/components/multichain/token-list-item/token-list-item.js
@@ -300,7 +300,7 @@ export const TokenListItem = ({
                 variant={TextVariant.bodyMd}
                 textAlign={TextAlign.End}
               >
-                {primary} {tokenSymbol}{' '}
+                {primary} {isNativeCurrency ? '' : tokenSymbol}
               </Text>
             </Box>
           </Box>
-Original file line number
+Diff line change
@@ Expand Up / @@ -85,7 +85,6 @@ exports[`Token Cell should match snapshot 1`] = ` @@
 .000
                   TEST
                 </p>
               </div>
             </div>
@@ Expand Down @@