fix lint errors

MetaMask · Oct 14, 2024 · 7a54b36 · 7a54b36
1 parent 97ab9ca
commit 7a54b36
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 24 deletions.
diff --git a/...mponents/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js b/...mponents/app/assets/nfts/nfts-detection-notice-nfts-tab/nfts-detection-notice-nfts-tab.js
@@ -1,14 +1,14 @@
 import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { BannerAlert } from '../../../../component-library';
 import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import { getOpenSeaEnabled } from '../../../../../selectors';
 import {
   detectNfts,
   setOpenSeaEnabled,
   setUseNftDetection,
 } from '../../../../../store/actions';
-import { getOpenSeaEnabled } from '../../../../../selectors';
-import { setShowNftDetectionEnablementToast } from '../../../toast-master/selectors';
+import { BannerAlert } from '../../../../component-library';
+import { setShowNftDetectionEnablementToast } from '../../../toast-master/utils';
 
 export default function NFTsDetectionNoticeNFTsTab() {
   const t = useI18nContext();

diff --git a/ui/components/app/toast-master/toast-master.js b/ui/components/app/toast-master/toast-master.js
@@ -44,11 +44,11 @@ import {
   selectShowConnectAccountToast,
   selectShowPrivacyPolicyToast,
   selectShowSurveyToast,
-  selectSwitchedNetworkNeverShowMessage,
 } from './selectors';
 import {
   getShowAutoNetworkSwitchTest,
   onHomeScreen,
+  setNewPrivacyPolicyToastClickedOrClosed,
   setNewPrivacyPolicyToastShownDate,
   setShowNftDetectionEnablementToast,
   setSurveyLinkLastClickedOrClosed,
@@ -109,18 +109,18 @@ function ConnectAccountToast() {
         actionText={t('connectAccount')}
         onActionClick={() => {
           // Connect this account
-          dispatch(addPermittedAccount(activeTabOrigin, account.address)),
-            // Use setTimeout to prevent React re-render from
-            // hiding the tooltip
-            setTimeout(() => {
-              // Trigger a mouseenter on the header's connection icon
-              // to display the informative connection tooltip
-              document
-                .querySelector(
-                  '[data-testid="connection-menu"] [data-tooltipped]',
-                )
-                ?.dispatchEvent(new CustomEvent('mouseenter', {}));
-            }, 250 * MILLISECOND);
+          dispatch(addPermittedAccount(activeTabOrigin, account.address));
+          // Use setTimeout to prevent React re-render from
+          // hiding the tooltip
+          setTimeout(() => {
+            // Trigger a mouseenter on the header's connection icon
+            // to display the informative connection tooltip
+            document
+              .querySelector(
+                '[data-testid="connection-menu"] [data-tooltipped]',
+              )
+              ?.dispatchEvent(new CustomEvent('mouseenter', {}));
+          }, 250 * MILLISECOND);
         }}
         onClose={() => setHideConnectAccountToast(true)}
       />
@@ -192,6 +192,8 @@ function SwitchedNetworkToast() {
   const t = useI18nContext();
   const dispatch = useDispatch();
 
+  const switchedNetworkDetails = useSelector(getSwitchedNetworkDetails);
+
   return (
     getShowAutoNetworkSwitchTest() && (
       <Toast

diff --git a/ui/components/app/toast-master/utils.ts b/ui/components/app/toast-master/utils.ts
@@ -1,11 +1,11 @@
 import { PayloadAction } from '@reduxjs/toolkit';
 import { ReactFragment } from 'react';
-import { SHOW_NFT_DETECTION_ENABLEMENT_TOAST } from '../../../store/actionConstants';
-import { submitRequestToBackground } from '../../../store/background-connection';
+import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import { getSwitchedNetworkDetails } from '../../../selectors';
-import { useSelector } from 'react-redux';
+import { SHOW_NFT_DETECTION_ENABLEMENT_TOAST } from '../../../store/actionConstants';
+import { submitRequestToBackground } from '../../../store/background-connection';
 import { selectSwitchedNetworkNeverShowMessage } from './selectors';
 
 /**

diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
@@ -121,7 +121,6 @@ import {
   setTheme,
   showOnboardingHeader,
 } from './utils';
-import { getShowAutoNetworkSwitchTest } from '../../components/app/toast-master/utils';
 
 export default class Routes extends Component {
   static propTypes = {

diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
@@ -37,7 +37,6 @@ import {
   addPermittedAccount,
   automaticallySwitchNetwork,
   clearSwitchedNetworkDetails,
-  switchedNetworkNeverShowMessage,
   ///: BEGIN:ONLY_INCLUDE_IF(keyring-snaps)
   hideKeyringRemovalResultModal,
   ///: END:ONLY_INCLUDE_IF
@@ -51,8 +50,8 @@ import {
   getProviderConfig,
 } from '../../ducks/metamask/metamask';
 import { DEFAULT_AUTO_LOCK_TIME_LIMIT } from '../../../shared/constants/preferences';
-import Routes from './routes.component';
 import { selectSwitchedNetworkNeverShowMessage } from '../../components/app/toast-master/selectors';
+import Routes from './routes.component';
 
 function mapStateToProps(state) {
   const { activeTab, appState } = state;

diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
@@ -9,6 +9,7 @@ import { CHAIN_IDS, NETWORK_TYPES } from '../../shared/constants/network';
 import mockState from '../../test/data/mock-state.json';
 import { createMockInternalAccount } from '../../test/jest/mocks';
 import { mockNetworkState } from '../../test/stub/networks';
+import { selectSwitchedNetworkNeverShowMessage } from '../components/app/toast-master/selectors';
 import { getProviderConfig } from '../ducks/metamask/metamask';
 import * as selectors from './selectors';
 
@@ -166,10 +167,10 @@ describe('Selectors', () => {
     });
   });
 
-  describe('#getNeverShowSwitchedNetworkMessage', () => {
+  describe('#selectSwitchedNetworkNeverShowMessage', () => {
     it('returns the correct value', () => {
       expect(
-        selectors.getNeverShowSwitchedNetworkMessage({
+        selectSwitchedNetworkNeverShowMessage({
           metamask: { switchedNetworkNeverShowMessage: true },
         }),
       ).toStrictEqual(true);