fix(cherry-pick): use PORTFOLIO_VIEW flag to determine chain polling (#…

…28578) Cherry picks #28504 to 12.8.0 so chains aren't polled unnecessarily Co-authored-by: Dan J Miller <[email protected]>
MetaMask · Dec 2, 2024 · 8e074a6 · 8e074a6
1 parent 0304023
commit 8e074a6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/ui/hooks/useTokenDetectionPolling.ts b/ui/hooks/useTokenDetectionPolling.ts
@@ -1,5 +1,6 @@
 import { useSelector } from 'react-redux';
 import {
+  getCurrentChainId,
   getNetworkConfigurationsByChainId,
   getUseTokenDetection,
 } from '../selectors';
@@ -17,14 +18,19 @@ const useTokenDetectionPolling = () => {
   const useTokenDetection = useSelector(getUseTokenDetection);
   const completedOnboarding = useSelector(getCompletedOnboarding);
   const isUnlocked = useSelector(getIsUnlocked);
+  const currentChainId = useSelector(getCurrentChainId);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
   const enabled = completedOnboarding && isUnlocked && useTokenDetection;
 
+  const chainIds = process.env.PORTFOLIO_VIEW
+    ? Object.keys(networkConfigurations)
+    : [currentChainId];
+
   useMultiPolling({
     startPolling: tokenDetectionStartPolling,
     stopPollingByPollingToken: tokenDetectionStopPollingByPollingToken,
-    input: enabled ? [Object.keys(networkConfigurations)] : [],
+    input: enabled ? [chainIds] : [],
   });
 
   return {};

diff --git a/ui/hooks/useTokenRatesPolling.ts b/ui/hooks/useTokenRatesPolling.ts
@@ -1,5 +1,6 @@
 import { useSelector } from 'react-redux';
 import {
+  getCurrentChainId,
   getMarketData,
   getNetworkConfigurationsByChainId,
   getTokenExchangeRates,
@@ -16,10 +17,11 @@ import {
 } from '../ducks/metamask/metamask';
 import useMultiPolling from './useMultiPolling';
 
-const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
+const useTokenRatesPolling = () => {
   // Selectors to determine polling input
   const completedOnboarding = useSelector(getCompletedOnboarding);
   const isUnlocked = useSelector(getIsUnlocked);
+  const currentChainId = useSelector(getCurrentChainId);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
@@ -30,10 +32,14 @@ const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
 
   const enabled = completedOnboarding && isUnlocked && useCurrencyRateCheck;
 
+  const chainIds = process.env.PORTFOLIO_VIEW
+    ? Object.keys(networkConfigurations)
+    : [currentChainId];
+
   useMultiPolling({
     startPolling: tokenRatesStartPolling,
     stopPollingByPollingToken: tokenRatesStopPollingByPollingToken,
-    input: enabled ? chainIds ?? Object.keys(networkConfigurations) : [],
+    input: enabled ? chainIds : [],
   });
 
   return {