lint

src/entries/popup/hooks/swap/useSwapQuote.ts

@@ -115,7 +115,7 @@ export const useSwapQuote = ({
 
   const { data, isLoading, isError, fetchStatus } = useQuery({
     queryFn: async () => {
-      if (!quotesParams) return;
+      if (!quotesParams) throw 'unreacheable';
       const quote = await (isCrosschainSwap ? getCrosschainQuote : getQuote)(
         quotesParams,
       );
@@ -127,7 +127,7 @@ export const useSwapQuote = ({
           outputAmount: assetToBuyValue,
         });
       }
-      return quote;
+      return quote as Quote | CrosschainQuote | QuoteError;
     },
     queryKey: ['getSwapQuote', quotesParams],
     enabled: !!quotesParams,

src/entries/popup/hooks/useTimeout.ts

@@ -2,7 +2,7 @@ import { useEffect, useLayoutEffect, useRef } from 'react';
 
 export function useTimeoutEffect(
   onTimeout: (e: { cancelled: boolean; elapsedTime: number }) => void,
-  delay: number,
+  { timeout, enabled = true }: { timeout: number; enabled?: boolean },
 ) {
   const callback = useRef(onTimeout);
   useLayoutEffect(() => {
@@ -11,22 +11,21 @@ export function useTimeoutEffect(
 
   const timeoutRef = useRef<NodeJS.Timeout>();
   useEffect(() => {
+    if (!enabled) return;
     const startedAt = Date.now();
-    timeoutRef.current = setTimeout(
-      () =>
-        callback.current({
-          cancelled: false,
-          elapsedTime: Date.now() - startedAt,
-        }),
-      delay,
-    );
-    const timeout = timeoutRef.current;
+    timeoutRef.current = setTimeout(() => {
+      callback.current({
+        cancelled: false,
+        elapsedTime: Date.now() - startedAt,
+      });
+    }, timeout);
     return () => {
-      clearTimeout(timeout);
+      if (!timeoutRef.current) return;
+      clearTimeout(timeoutRef.current);
       const elapsedTime = Date.now() - startedAt;
-      if (elapsedTime < delay) {
+      if (elapsedTime < timeout) {
         callback.current({ cancelled: true, elapsedTime });
       }
     };
-  }, [delay]);
+  }, [timeout, enabled]);
 }

src/entries/popup/pages/home/NFTs/NFTDetails.tsx

@@ -166,7 +166,7 @@ export default function NFTDetails() {
         },
       });
     },
-    5 * 1000, // 5s
+    { timeout: 2 * 1000, enabled: !!nft },
   );
 
   return (

src/entries/popup/pages/home/TokenDetails/TokenDetails.tsx

@@ -629,7 +629,7 @@ export function TokenDetails() {
         },
       });
     },
-    5 * 1000, // 5s
+    { timeout: 2 * 1000, enabled: !!token },
   );
 
   const { explainerSheetParams, showExplainerSheet, hideExplainerSheet } =