Merge branch 'develop' into MMPD-1363

Author: ziad-saab

ui/components/multichain/import-tokens-modal/import-tokens-modal.js

@@ -493,7 +493,6 @@ export const ImportTokensModal = ({ onClose }) => {
   return (
     <Modal
       isOpen
-      isClosedOnOutsideClick={false}
       onClose={() => {
         dispatch(clearPendingTokens());
         onClose();

ui/hooks/useCurrencyRatePolling.ts

@@ -7,14 +7,20 @@ import {
   currencyRateStartPolling,
   currencyRateStopPollingByPollingToken,
 } from '../store/actions';
-import { getCompletedOnboarding } from '../ducks/metamask/metamask';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../ducks/metamask/metamask';
 import usePolling from './usePolling';
 
 const useCurrencyRatePolling = () => {
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const completedOnboarding = useSelector(getCompletedOnboarding);
+  const isUnlocked = useSelector(getIsUnlocked);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
+  const enabled = completedOnboarding && isUnlocked && useCurrencyRateCheck;
+
   const nativeCurrencies = [
     ...new Set(
       Object.values(networkConfigurations).map((n) => n.nativeCurrency),
@@ -25,7 +31,7 @@ const useCurrencyRatePolling = () => {
     startPolling: currencyRateStartPolling,
     stopPollingByPollingToken: currencyRateStopPollingByPollingToken,
     input: nativeCurrencies,
-    enabled: useCurrencyRateCheck && completedOnboarding,
+    enabled,
   });
 };
 

ui/hooks/useTokenRatesPolling.ts

@@ -10,10 +10,16 @@ import {
   tokenRatesStartPolling,
   tokenRatesStopPollingByPollingToken,
 } from '../store/actions';
+import {
+  getCompletedOnboarding,
+  getIsUnlocked,
+} from '../ducks/metamask/metamask';
 import useMultiPolling from './useMultiPolling';
 
 const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
   // Selectors to determine polling input
+  const completedOnboarding = useSelector(getCompletedOnboarding);
+  const isUnlocked = useSelector(getIsUnlocked);
   const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
   const networkConfigurations = useSelector(getNetworkConfigurationsByChainId);
 
@@ -22,12 +28,12 @@ const useTokenRatesPolling = ({ chainIds }: { chainIds?: string[] } = {}) => {
   const tokensMarketData = useSelector(getTokensMarketData);
   const marketData = useSelector(getMarketData);
 
+  const enabled = completedOnboarding && isUnlocked && useCurrencyRateCheck;
+
   useMultiPolling({
     startPolling: tokenRatesStartPolling,
     stopPollingByPollingToken: tokenRatesStopPollingByPollingToken,
-    input: useCurrencyRateCheck
-      ? chainIds ?? Object.keys(networkConfigurations)
-      : [],
+    input: enabled ? chainIds ?? Object.keys(networkConfigurations) : [],
   });
 
   return {