From 7de7bec83cb003497e0dbbffd6bc2ce595da4ce2 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Sun, 18 Feb 2024 12:14:48 +0200 Subject: [PATCH 1/5] fixing requested changes --- .../ProvisionsPopup/ProvisionsPopup.tsx | 154 ++++++++++-------- 1 file changed, 83 insertions(+), 71 deletions(-) diff --git a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx index f5985c6745..d253b1108a 100644 --- a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx +++ b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx @@ -15,6 +15,11 @@ const ProvisionsPopup = () => { const gtmEventClickReadMore = () => gtmEvent("Provisions popup click"); const gtmEventClickClose = () => gtmEvent("Provisions popup close"); + const onClose = () => { + gtmEventClickClose(); + toggleModal(); + }; + return ( { transition={{ enter: { duration: 0.5 } }} > - { - gtmEventClickClose(); - toggleModal(); - }} - > - - - - STRK Starknet Provisions - + Read more + + + + + From 9a719a08f09bb85235bbf1ae9e98fef92c02a49f Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Sun, 18 Feb 2024 12:22:54 +0200 Subject: [PATCH 2/5] edit close modal --- .../src/components/ProvisionsPopup/ProvisionsPopup.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx index d253b1108a..aca7924eab 100644 --- a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx +++ b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx @@ -64,7 +64,10 @@ const ProvisionsPopup = () => { width="28px" height="28px" style={{ backgroundColor: "transparent" }} - onClick={onClose} + onClick={(e) => { + e.stopPropagation(); + onClose(); + }} > From 12edf1de4389ede4c9702162b8529a64c9602bf1 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Sun, 18 Feb 2024 14:55:06 +0200 Subject: [PATCH 3/5] editing transparent percent --- .../website/src/components/ProvisionsPopup/ProvisionsPopup.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx index aca7924eab..c210e0e5f9 100644 --- a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx +++ b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx @@ -32,8 +32,7 @@ const ProvisionsPopup = () => { bottom="0" right="0" left="0" - backgroundColor="rgba(0,0,0,0.3)" - backdropFilter="blur(2px)" + backgroundColor="rgba(0,0,0,0.7)" onClick={onClose} > Date: Sun, 18 Feb 2024 16:41:54 +0200 Subject: [PATCH 4/5] editing onClose finction --- .../src/components/ProvisionsPopup/ProvisionsPopup.tsx | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx index c210e0e5f9..6ddd55f076 100644 --- a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx +++ b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx @@ -15,7 +15,8 @@ const ProvisionsPopup = () => { const gtmEventClickReadMore = () => gtmEvent("Provisions popup click"); const gtmEventClickClose = () => gtmEvent("Provisions popup close"); - const onClose = () => { + const onClose = (event: React.MouseEvent) => { + event.stopPropagation(); gtmEventClickClose(); toggleModal(); }; @@ -33,7 +34,7 @@ const ProvisionsPopup = () => { right="0" left="0" backgroundColor="rgba(0,0,0,0.7)" - onClick={onClose} + onClick={(e) => onClose(e)} > { width="28px" height="28px" style={{ backgroundColor: "transparent" }} - onClick={(e) => { - e.stopPropagation(); - onClose(); - }} + onClick={(e) => onClose(e)} > From 54b88466c395baed87f8bcfb66dac6e1b0e1d866 Mon Sep 17 00:00:00 2001 From: Tal-Ben-Avi Date: Sun, 18 Feb 2024 17:17:15 +0200 Subject: [PATCH 5/5] changing onClick function call --- .../src/components/ProvisionsPopup/ProvisionsPopup.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx index 6ddd55f076..4376417cbc 100644 --- a/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx +++ b/workspaces/website/src/components/ProvisionsPopup/ProvisionsPopup.tsx @@ -34,7 +34,7 @@ const ProvisionsPopup = () => { right="0" left="0" backgroundColor="rgba(0,0,0,0.7)" - onClick={(e) => onClose(e)} + onClick={onClose} > { width="28px" height="28px" style={{ backgroundColor: "transparent" }} - onClick={(e) => onClose(e)} + onClick={onClose} >