From 2aad6bf7a3b94ce3e05fa785393aefc3ba30db14 Mon Sep 17 00:00:00 2001
From: Howard Braham <howrad@gmail.com>
Date: Mon, 14 Oct 2024 18:41:50 -0700
Subject: [PATCH] fixing rules of hooks

---
 .../app/toast-master/toast-master.js          | 23 ++++++++++++++-----
 ui/components/app/toast-master/utils.ts       | 20 ----------------
 ui/pages/routes/routes.component.js           |  4 ++--
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/ui/components/app/toast-master/toast-master.js b/ui/components/app/toast-master/toast-master.js
index ba719dfe37b0..863448c906f0 100644
--- a/ui/components/app/toast-master/toast-master.js
+++ b/ui/components/app/toast-master/toast-master.js
@@ -2,7 +2,7 @@
 
 import React, { useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { MILLISECOND, SECOND } from '../../../../shared/constants/time';
 import {
   PRIVACY_POLICY_LINK,
@@ -14,7 +14,10 @@ import {
   IconColor,
   TextVariant,
 } from '../../../helpers/constants/design-system';
-import { REVIEW_PERMISSIONS } from '../../../helpers/constants/routes';
+import {
+  DEFAULT_ROUTE,
+  REVIEW_PERMISSIONS,
+} from '../../../helpers/constants/routes';
 import { getURLHost } from '../../../helpers/utils/util';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { usePrevious } from '../../../hooks/usePrevious';
@@ -44,10 +47,9 @@ import {
   selectShowConnectAccountToast,
   selectShowPrivacyPolicyToast,
   selectShowSurveyToast,
+  selectSwitchedNetworkNeverShowMessage,
 } from './selectors';
 import {
-  getShowAutoNetworkSwitchTest,
-  onHomeScreen,
   setNewPrivacyPolicyToastClickedOrClosed,
   setNewPrivacyPolicyToastShownDate,
   setShowNftDetectionEnablementToast,
@@ -56,8 +58,12 @@ import {
 } from './utils';
 
 export function ToastMaster() {
+  const location = useLocation();
+
+  const onHomeScreen = location.pathname === DEFAULT_ROUTE;
+
   return (
-    onHomeScreen() && (
+    onHomeScreen && (
       <ToastContainer>
         <SurveyToast />
         <ConnectAccountToast />
@@ -193,9 +199,14 @@ function SwitchedNetworkToast() {
   const dispatch = useDispatch();
 
   const switchedNetworkDetails = useSelector(getSwitchedNetworkDetails);
+  const switchedNetworkNeverShowMessage = useSelector(
+    selectSwitchedNetworkNeverShowMessage,
+  );
+
+  const show = switchedNetworkDetails && !switchedNetworkNeverShowMessage;
 
   return (
-    getShowAutoNetworkSwitchTest() && (
+    show && (
       <Toast
         key="switched-network-toast"
         startAdornment={
diff --git a/ui/components/app/toast-master/utils.ts b/ui/components/app/toast-master/utils.ts
index 3fb9aaa94fe6..e55b4f99a09e 100644
--- a/ui/components/app/toast-master/utils.ts
+++ b/ui/components/app/toast-master/utils.ts
@@ -1,12 +1,7 @@
 import { PayloadAction } from '@reduxjs/toolkit';
 import { ReactFragment } from 'react';
-import { useSelector } from 'react-redux';
-import { useLocation } from 'react-router-dom';
-import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
-import { getSwitchedNetworkDetails } from '../../../selectors';
 import { SHOW_NFT_DETECTION_ENABLEMENT_TOAST } from '../../../store/actionConstants';
 import { submitRequestToBackground } from '../../../store/background-connection';
-import { selectSwitchedNetworkNeverShowMessage } from './selectors';
 
 /**
  * Returns true if the privacy policy toast was shown either never, or less than a day ago.
@@ -54,23 +49,8 @@ export function setSwitchedNetworkNeverShowMessage() {
   submitRequestToBackground('setSwitchedNetworkNeverShowMessage', [true]);
 }
 
-export function onHomeScreen() {
-  const location = useLocation();
-
-  return location.pathname === DEFAULT_ROUTE;
-}
-
 export function setSurveyLinkLastClickedOrClosed(time: number) {
   return async () => {
     await submitRequestToBackground('setSurveyLinkLastClickedOrClosed', [time]);
   };
 }
-
-export function getShowAutoNetworkSwitchTest() {
-  const switchedNetworkDetails = useSelector(getSwitchedNetworkDetails);
-  const switchedNetworkNeverShowMessage = useSelector(
-    selectSwitchedNetworkNeverShowMessage,
-  );
-
-  return switchedNetworkDetails && !switchedNetworkNeverShowMessage;
-}
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 8161877a7099..e26e17be9e23 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -473,7 +473,7 @@ export default class Routes extends Component {
         })}
         dir={textDirection}
         onMouseUp={
-          deprecatedGetShowAutoNetworkSwitchTest(this.props)
+          getShowAutoNetworkSwitchTest(this.props)
             ? () => clearSwitchedNetworkDetails()
             : undefined
         }
@@ -549,6 +549,6 @@ export default class Routes extends Component {
 }
 
 // Will eventually delete this function
-function deprecatedGetShowAutoNetworkSwitchTest(props) {
+function getShowAutoNetworkSwitchTest(props) {
   return props.switchedNetworkDetails && !props.switchedNetworkNeverShowMessage;
 }