955: Fixed cleanup bugs

airswap · Oct 24, 2024 · 3f3dd30 · 3f3dd30
1 parent 89c9e96
commit 3f3dd30
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/src/components/@widgets/MakeWidget/MakeWidget.tsx b/src/components/@widgets/MakeWidget/MakeWidget.tsx
@@ -165,7 +165,8 @@ const MakeWidget: FC = () => {
   const isNetworkSupported = useNetworkSupported();
 
   // Modal states
-  const { setShowWalletList } = useContext(InterfaceContext);
+  const { setShowWalletList, transactionsTabIsOpen } =
+    useContext(InterfaceContext);
   const [showOrderTypeInfo, toggleShowOrderTypeInfo] = useToggle(false);
   const [showFeeInfo, toggleShowFeeInfo] = useToggle(false);
   const [showTokenSelectModal, setShowTokenSelectModal] =
@@ -176,6 +177,12 @@ const MakeWidget: FC = () => {
     dispatch(reset());
   }, []);
 
+  useEffect(() => {
+    if (transactionsTabIsOpen) {
+      setShowTokenSelectModal(null);
+    }
+  }, [transactionsTabIsOpen]);
+
   useEffect(() => {
     if (library) {
       dispatch(fetchIndexerUrls({ provider: library }));

diff --git a/src/components/@widgets/MyOrdersWidget/subcomponents/MyOrdersList/MyOrdersList.tsx b/src/components/@widgets/MyOrdersWidget/subcomponents/MyOrdersList/MyOrdersList.tsx
@@ -92,10 +92,12 @@ const MyOrdersList: FC<MyOrdersListProps> = ({
       handleOnContainerScroll.bind(this)
     );
 
-    return containerRef.current?.removeEventListener(
-      "scroll",
-      handleOnContainerScroll.bind(this)
-    );
+    return () => {
+      containerRef.current?.removeEventListener(
+        "scroll",
+        handleOnContainerScroll.bind(this)
+      );
+    };
   }, [containerRef]);
 
   useEffect(() => {

diff --git a/src/components/@widgets/SwapWidget/SwapWidget.tsx b/src/components/@widgets/SwapWidget/SwapWidget.tsx
@@ -213,6 +213,12 @@ const SwapWidget: FC = () => {
     baseTokenInfo?.address === ADDRESS_ZERO &&
     !!nativeCurrencySafeTransactionFee[baseTokenInfo.chainId];
 
+  useEffect(() => {
+    if (transactionsTabIsOpen) {
+      setShowTokenSelectModalFor(null);
+    }
+  }, [transactionsTabIsOpen]);
+
   useEffect(() => {
     setTokenFrom(appRouteParams.tokenFrom);
     setTokenTo(appRouteParams.tokenTo);

diff --git a/src/components/Overlay/Overlay.tsx b/src/components/Overlay/Overlay.tsx
@@ -91,12 +91,6 @@ const Overlay: FC<OverlayProps> = ({
     [isHidden]
   );
 
-  useEffect(() => {
-    if (transactionsTabIsOpen && !isHidden) {
-      onClose();
-    }
-  }, [transactionsTabIsOpen]);
-
   return (
     <Container
       ref={ref}

diff --git a/src/components/TransactionsTab/TransactionsTab.styles.tsx b/src/components/TransactionsTab/TransactionsTab.styles.tsx
@@ -128,6 +128,7 @@ export const NoTransactions = styled(motion.div)`
   display: flex;
   flex-direction: column;
   align-items: center;
+  margin-block-start: 1rem;
   height: 4.5rem;
   color: ${(props) => props.theme.colors.lightGrey};
 `;