From bf7942bdfd3e3056b58fe70a9b17bf126cba9f88 Mon Sep 17 00:00:00 2001 From: Evan Gray Date: Mon, 13 Sep 2021 13:35:56 -0400 Subject: [PATCH] bridge_ui: fix incorrectly preventing nav Change-Id: I2bbcaf91ee83567fb5e02d9bc2e9f5de0e143da8 --- bridge_ui/src/components/NFT/index.tsx | 3 ++- bridge_ui/src/components/Transfer/index.tsx | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bridge_ui/src/components/NFT/index.tsx b/bridge_ui/src/components/NFT/index.tsx index 7dadb69c7..7ad5be722 100644 --- a/bridge_ui/src/components/NFT/index.tsx +++ b/bridge_ui/src/components/NFT/index.tsx @@ -45,7 +45,8 @@ function NFT() { const isSendComplete = useSelector(selectNFTIsSendComplete); const isRedeeming = useSelector(selectNFTIsRedeeming); const isRedeemComplete = useSelector(selectNFTIsRedeemComplete); - const preventNavigation = isSending || isSendComplete || isRedeeming; + const preventNavigation = + (isSending || isSendComplete || isRedeeming) && !isRedeemComplete; useEffect(() => { if (preventNavigation) { window.onbeforeunload = () => true; diff --git a/bridge_ui/src/components/Transfer/index.tsx b/bridge_ui/src/components/Transfer/index.tsx index be870b507..e91a56945 100644 --- a/bridge_ui/src/components/Transfer/index.tsx +++ b/bridge_ui/src/components/Transfer/index.tsx @@ -47,11 +47,14 @@ function Transfer() { const isSendComplete = useSelector(selectTransferIsSendComplete); const isRedeeming = useSelector(selectTransferIsRedeeming); const isRedeemComplete = useSelector(selectTransferIsRedeemComplete); - const preventNavigation = isSending || isSendComplete || isRedeeming; + const preventNavigation = + (isSending || isSendComplete || isRedeeming) && !isRedeemComplete; useEffect(() => { if (preventNavigation) { + console.log("add onbeforeunload"); window.onbeforeunload = () => true; return () => { + console.log("remove onbeforeunload"); window.onbeforeunload = null; }; }