From 48442e7839982c1d6669e570a58c6bdc9c43fc32 Mon Sep 17 00:00:00 2001 From: aelf-lxy Date: Tue, 9 Apr 2024 11:06:30 +0800 Subject: [PATCH 1/5] feat: insert GTM --- .../containers/CreateProposal/index.jsx | 2 ++ template.ejs | 28 +++++++++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/pages/Proposal/containers/CreateProposal/index.jsx b/src/pages/Proposal/containers/CreateProposal/index.jsx index a6d2799bc..b6421c7ef 100644 --- a/src/pages/Proposal/containers/CreateProposal/index.jsx +++ b/src/pages/Proposal/containers/CreateProposal/index.jsx @@ -453,6 +453,7 @@ const CreateProposal = () => { address ); if (minedRes.status === "success") { + dataLayer.push({'event': 'apply-contract', 'contractAction': `${isUpdate}? 'update': 'deploy'`, 'approvalMode': 'withoutApproval'}); const { contractAddress, contractName, contractVersion } = minedRes; // open modal @@ -532,6 +533,7 @@ const CreateProposal = () => { address: currentWallet.address, }); } + dataLayer.push({'event': 'apply-contract', 'contractAction': `${isUpdate}? 'update': 'deploy'`, 'approvalMode': 'bpApproval'}); setApplyModal({ visible: true, title: proposalId diff --git a/template.ejs b/template.ejs index aea0fb9ba..6ac8050fc 100755 --- a/template.ejs +++ b/template.ejs @@ -2,24 +2,30 @@ + + + - <%= htmlWebpackPlugin.options.title %> + + <%= htmlWebpackPlugin.options.title %> + - - - -
+ + + \ No newline at end of file From 9b7ee7a301d76125ce37cd96a566d687b080be41 Mon Sep 17 00:00:00 2001 From: aelf-lxy Date: Tue, 9 Apr 2024 11:27:29 +0800 Subject: [PATCH 2/5] fix: add wrapper element --- template.ejs | 1 + 1 file changed, 1 insertion(+) diff --git a/template.ejs b/template.ejs index 6ac8050fc..6f1f2415f 100755 --- a/template.ejs +++ b/template.ejs @@ -26,6 +26,7 @@ +
\ No newline at end of file From 76a2c9df218ed7974e628a8271c4fee12a4d4f0d Mon Sep 17 00:00:00 2001 From: aelf-lxy Date: Tue, 9 Apr 2024 14:36:08 +0800 Subject: [PATCH 3/5] fix: change gtm code for test --- template.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template.ejs b/template.ejs index 6f1f2415f..9d6feaef9 100755 --- a/template.ejs +++ b/template.ejs @@ -10,7 +10,7 @@ }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); - })(window, document, 'script', 'dataLayer', 'GTM-5ZN6KPD4'); + })(window, document, 'script', 'dataLayer', 'GTM-WH4VG8K9'); @@ -23,7 +23,7 @@ <body> <!-- Google Tag Manager (noscript) --> - <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5ZN6KPD4" height="0" width="0" + <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WH4VG8K9" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) --> <div id="app" class="aelf-app"></div> From 2fe905710ff281caf757fb413fc9ea1d5bad6a87 Mon Sep 17 00:00:00 2001 From: aelf-lxy <xiyang.liu@aelf.io> Date: Tue, 9 Apr 2024 16:46:41 +0800 Subject: [PATCH 4/5] fix: change back gtm code for test --- template.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template.ejs b/template.ejs index 9d6feaef9..6f1f2415f 100755 --- a/template.ejs +++ b/template.ejs @@ -10,7 +10,7 @@ }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); - })(window, document, 'script', 'dataLayer', 'GTM-WH4VG8K9');</script> + })(window, document, 'script', 'dataLayer', 'GTM-5ZN6KPD4');</script> <!-- End Google Tag Manager --> <meta charset="UTF-8"> <title> @@ -23,7 +23,7 @@ <body> <!-- Google Tag Manager (noscript) --> - <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-WH4VG8K9" height="0" width="0" + <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-5ZN6KPD4" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> <!-- End Google Tag Manager (noscript) --> <div id="app" class="aelf-app"></div> From 0e6b8661ff70431e9ae598d5ed0f0796c73eb5f3 Mon Sep 17 00:00:00 2001 From: aelf-lxy <xiyang.liu@aelf.io> Date: Fri, 12 Apr 2024 14:37:24 +0800 Subject: [PATCH 5/5] fix: fix wrong ternary expression --- src/pages/Proposal/containers/CreateProposal/index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Proposal/containers/CreateProposal/index.jsx b/src/pages/Proposal/containers/CreateProposal/index.jsx index b6421c7ef..9b7a7c1be 100644 --- a/src/pages/Proposal/containers/CreateProposal/index.jsx +++ b/src/pages/Proposal/containers/CreateProposal/index.jsx @@ -453,7 +453,7 @@ const CreateProposal = () => { address ); if (minedRes.status === "success") { - dataLayer.push({'event': 'apply-contract', 'contractAction': `${isUpdate}? 'update': 'deploy'`, 'approvalMode': 'withoutApproval'}); + dataLayer.push({'event': 'apply-contract', 'contractAction': `${isUpdate ? 'update': 'deploy'}`, 'approvalMode': 'withoutApproval'}); const { contractAddress, contractName, contractVersion } = minedRes; // open modal @@ -533,7 +533,7 @@ const CreateProposal = () => { address: currentWallet.address, }); } - dataLayer.push({'event': 'apply-contract', 'contractAction': `${isUpdate}? 'update': 'deploy'`, 'approvalMode': 'bpApproval'}); + dataLayer.push({'event': 'apply-contract', 'contractAction': `${isUpdate ? 'update': 'deploy'}`, 'approvalMode': 'bpApproval'}); setApplyModal({ visible: true, title: proposalId