From a8ccbb2afe194dac567117e6cc343e483f29c0fa Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Sun, 25 Apr 2021 14:53:54 +0300
Subject: [PATCH 01/20] Added gtm and implemented wallet connect events

---
 src/gtm/gtm.ts                        |  6 ++++++
 src/main.ts                           |  1 +
 src/store/modules/wallet/ethWallet.ts | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 src/gtm/gtm.ts

diff --git a/src/gtm/gtm.ts b/src/gtm/gtm.ts
new file mode 100644
index 000000000..ea9714a8e
--- /dev/null
+++ b/src/gtm/gtm.ts
@@ -0,0 +1,6 @@
+(function(w:any,d:any,s:any,l:any,i:any)
+{w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});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-TCBKR7W');
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 78ae5c207..06263124b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,6 +13,7 @@ import "bootstrap-vue/dist/bootstrap-vue.css";
 import "@/assets/_scss/main.scss";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { fab, fal, fas, far } from "@/assets/fontawesome";
+import './gtm/gtm.ts'
 
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { sync } from "vuex-router-sync";
diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index b35a948c1..7561c9c04 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -57,9 +57,27 @@ export class EthereumModule extends VuexModule.With({
   }
 
   @action async connect() {
+    const dataLayer = window.dataLayer as {}[];
+
     try {
+      dataLayer.push({
+        "event": "CE Wallet Connect Select a Wallet Popup",
+        "event_properties": {}
+      });
       await onboard.walletSelect();
+      const state = onboard.getState();
+      dataLayer.push({
+        "event": "CE Wallet Connect Wallet Icon Click",
+        "event_properties": {
+          "wallet_id": state.address,
+          "wallet_name": state.wallet.name
+        }
+      });
       await onboard.walletCheck();
+      dataLayer.push({
+        "event": "CE Wallet Connect",
+        "event_properties": {}
+      });
     } catch (e) {
       console.error(e, "was the error");
       throw new Error(`error: ${e}`);

From 4f40b86f07b29c80a39f08d3b88cc4c66c49e514 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Sun, 25 Apr 2021 17:17:50 +0300
Subject: [PATCH 02/20] Added the conversion events and logs

---
 src/components/modals/ModalBase.vue     |  8 ++++++--
 src/components/modals/ModalTxAction.vue | 12 +++++++++++-
 src/components/swap/SwapMarket.vue      | 19 ++++++++++++++++++-
 src/store/modules/swap/ethBancor.ts     | 23 ++++++++++++++++++++---
 4 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/src/components/modals/ModalBase.vue b/src/components/modals/ModalBase.vue
index b992aee66..ee2c67256 100644
--- a/src/components/modals/ModalBase.vue
+++ b/src/components/modals/ModalBase.vue
@@ -20,7 +20,7 @@
                 icon="chevron-left"
                 :class="darkMode ? 'text-dark' : 'text-light'"
                 class="cursor"
-                @click="onHide"
+                @click="hide"
               />
             </div>
             <span
@@ -38,7 +38,7 @@
               v-else
               class="cursor font-size-lg"
               :class="darkMode ? 'text-dark' : 'text-light'"
-              @click="onHide"
+              @click="hide"
               icon="times"
             />
           </b-col>
@@ -94,6 +94,10 @@ export default class ModalBase extends BaseComponent {
     ];
   }
 
+  hide() {
+    this.show = false;
+  }
+
   @Emit("onHide")
   onHide() {
     this.show = false;
diff --git a/src/components/modals/ModalTxAction.vue b/src/components/modals/ModalTxAction.vue
index 465b9b0e8..6d76aefcd 100644
--- a/src/components/modals/ModalTxAction.vue
+++ b/src/components/modals/ModalTxAction.vue
@@ -1,5 +1,10 @@
 <template>
-  <modal-base v-model="txMetaData.showTxModal" size="sm" @input="close">
+  <modal-base
+    v-model="txMetaData.showTxModal"
+    size="sm"
+    @input="close"
+    @onHide="onHideCallBack"
+  >
     <div
       v-if="showSlotContent"
       class="text-center"
@@ -100,6 +105,7 @@ export default class ModalTxAction extends BaseComponent {
   @Prop({ required: false }) icon?: string;
   @Prop({ default: "primary" }) iconVariant!: string;
   @Prop({ required: false }) redirectOnSuccess?: string;
+  @Prop() onHide!: Function;
 
   get currentStatus() {
     if (this.txMetaData.sections.length)
@@ -134,6 +140,10 @@ export default class ModalTxAction extends BaseComponent {
     selectedPromptReceiver$.next(id);
   }
 
+  onHideCallBack() {
+    this.onHide();
+  }
+
   async close() {
     if (this.txMetaData.txBusy) return;
     if (this.redirectOnSuccess && this.txMetaData.success) {
diff --git a/src/components/swap/SwapMarket.vue b/src/components/swap/SwapMarket.vue
index eed1c4482..7b307a629 100644
--- a/src/components/swap/SwapMarket.vue
+++ b/src/components/swap/SwapMarket.vue
@@ -85,6 +85,7 @@
       :title="$t('confirm_token_swap')"
       icon="exchange-alt"
       :tx-meta.sync="txMeta"
+      :onHide="onHide"
     >
       <gray-border-block>
         <label-content-split
@@ -306,7 +307,6 @@ export default class SwapAction extends BaseTxAction {
   }
 
   async initSwap() {
-    // @ts-ignore
     this.openModal();
     if (this.txMeta.txBusy) return;
     this.txMeta.txBusy = true;
@@ -336,11 +336,28 @@ export default class SwapAction extends BaseTxAction {
       });
       this.setDefault();
     } catch (e) {
+      //if (e.message.includes('rejected'))
+      // dataLayer.push({
+      //   "event": "CE Conversion Wallet Confirmation Reject",
+      //   "event_properties": {}
+      // });
+      //else
+      // dataLayer.push({
+      //   "event": "CE Conversion Failed",
+      //   "event_properties": {}
+      // });
       this.txMeta.txError = e.message;
     } finally {
       this.txMeta.txBusy = false;
     }
   }
+  onHide() {
+    // dataLayer.push({
+    //   "event": "CE Conversion Receipt Confirmation Reject",
+    //   "event_properties": {}
+    // });
+    console.log("HIDED");
+  }
 
   lastReturn: { from: ViewAmount; to: ViewAmount } = {
     from: {
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index 974242657..06e85e2cd 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6184,7 +6184,6 @@ export class EthBancorModule
         description: "Done!"
       }
     ];
-
     onUpdate!(0, steps);
 
     const fromTokenDecimals = await this.getDecimalsByTokenAddress(
@@ -6207,7 +6206,12 @@ export class EthBancorModule
     });
 
     const ethPath = generateEthPath(fromSymbol, relays);
+    const dataLayer = window.dataLayer as {}[];
 
+    dataLayer.push({
+      "event": "CE Conversion Swap Click",
+      "event_properties": {}
+    });
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
       owner: this.currentUser,
@@ -6217,6 +6221,10 @@ export class EthBancorModule
       onPrompt
     });
 
+    dataLayer.push({
+      "event": "CE Conversion Receipt Confirmation Request",
+      "event_properties": {}
+    });
     onUpdate!(2, steps);
 
     const networkContract = buildNetworkContract(this.contracts.BancorNetwork);
@@ -6234,10 +6242,19 @@ export class EthBancorModule
         0
       ),
       onConfirmation: () =>
-        this.spamBalances([fromTokenContract, toTokenContract]),
+        {
+          // dataLayer.push({
+          //   "event": "CE Conversion Wallet Confirmation Request",
+          //   "event_properties": {}
+          // });
+          console.log('SUCCESS')
+          return this.spamBalances([fromTokenContract, toTokenContract])
+        },
       resolveImmediately: true,
       ...(fromIsEth && { value: fromWei }),
-      onHash: () => onUpdate!(3, steps)
+      onHash: () => {
+        console.log('Confirm')
+        return onUpdate!(3, steps)}
     });
     onUpdate!(4, steps);
 

From 8890070251e8fae1f6b2f3664fee64575365cf14 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 28 Apr 2021 11:36:24 +0300
Subject: [PATCH 03/20] Removed gtag and cleared stale code

---
 package.json                            |  1 -
 src/App.vue                             |  5 -----
 src/components/pool/ModalPoolAction.vue | 16 ----------------
 src/main.ts                             |  9 ---------
 yarn.lock                               |  5 -----
 5 files changed, 36 deletions(-)

diff --git a/package.json b/package.json
index 24d244810..574932163 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,6 @@
     "vue-analytics": "^5.17.2",
     "vue-class-component": "^7.2.3",
     "vue-content-loader": "^2.0.0",
-    "vue-gtag": "^1.14.0",
     "vue-i18n": "8.24.3",
     "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.5.1",
diff --git a/src/App.vue b/src/App.vue
index 4ee4e36a8..26b7c9d6f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -128,12 +128,7 @@ export default class App extends BaseComponent {
 
     try {
       await vxm.bancor.init(initParams);
-      // @ts-ignore
       this.loading = false;
-      // @ts-ignore
-      this.$gtag.event("initBancor", {
-        event_category: this.$route.params.service
-      });
     } catch (e) {
       await wait(1000);
       try {
diff --git a/src/components/pool/ModalPoolAction.vue b/src/components/pool/ModalPoolAction.vue
index e5ce5d100..c02aba5f1 100644
--- a/src/components/pool/ModalPoolAction.vue
+++ b/src/components/pool/ModalPoolAction.vue
@@ -148,24 +148,8 @@ export default class ModalPoolAction extends BaseComponent {
         txResult = await vxm.bancor.addLiquidity(params);
       else txResult = await vxm.bancor.removeLiquidity(params);
       this.success = txResult;
-      // @ts-ignore
-      this.$gtag.event(
-        this.withdrawLiquidity ? "removeLiquidity" : "addLiquidity",
-        {
-          event_category: "success",
-          event_label: this.$route.params.account
-        }
-      );
     } catch (e) {
       this.error = e.message;
-      // @ts-ignore
-      this.$gtag.event(
-        this.withdrawLiquidity ? "removeLiquidity" : "addLiquidity",
-        {
-          event_category: "error",
-          event_label: this.$route.params.account
-        }
-      );
     } finally {
       this.txBusy = false;
     }
diff --git a/src/main.ts b/src/main.ts
index 06263124b..9a576193d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,7 +19,6 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { sync } from "vuex-router-sync";
 import { firebase } from "@firebase/app";
 import "@firebase/analytics";
-import VueGtag from "vue-gtag";
 
 const appVersion = JSON.parse(
   unescape(escape(JSON.stringify(require("../package.json"))))
@@ -60,14 +59,6 @@ const firebaseConfig = {
 
 firebase.initializeApp(firebaseConfig);
 
-Vue.use(
-  VueGtag,
-  {
-    config: { id: "UA-174155472-1" }
-  },
-  router
-);
-
 Vue.use(BootstrapVue);
 
 library.add(...fas, ...fab, ...fal, ...far);
diff --git a/yarn.lock b/yarn.lock
index a85263cc2..380f19510 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20564,11 +20564,6 @@ vue-functional-data-merge@^3.1.0:
   resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657"
   integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA==
 
-vue-gtag@^1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/vue-gtag/-/vue-gtag-1.14.0.tgz#da835752fa26b459ef076db757a78b4e94a69976"
-  integrity sha512-jutSxDedzckzPxOV1dOfV3rWqlfw5uzXOGGxDiOiq5o1UiGerpCOP4uWlO7CfwmujJotMaxgo0xR/TXsc2TLqA==
-
 vue-hot-reload-api@^2.3.0:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"

From a3748625b38a3da716a5b350e9e05e5615808394 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 28 Apr 2021 13:41:55 +0300
Subject: [PATCH 04/20] added a wrapper for gtm

---
 src/components/swap/SwapMarket.vue    |  6 ++---
 src/gtm/index.ts                      | 13 ++++++++++
 src/store/modules/swap/ethBancor.ts   | 37 ++++++++++++++-------------
 src/store/modules/wallet/ethWallet.ts | 23 +++++++++--------
 4 files changed, 47 insertions(+), 32 deletions(-)
 create mode 100644 src/gtm/index.ts

diff --git a/src/components/swap/SwapMarket.vue b/src/components/swap/SwapMarket.vue
index 7b307a629..f186b83e0 100644
--- a/src/components/swap/SwapMarket.vue
+++ b/src/components/swap/SwapMarket.vue
@@ -337,12 +337,12 @@ export default class SwapAction extends BaseTxAction {
       this.setDefault();
     } catch (e) {
       //if (e.message.includes('rejected'))
-      // dataLayer.push({
+      // sendGTMEvent({
       //   "event": "CE Conversion Wallet Confirmation Reject",
       //   "event_properties": {}
       // });
       //else
-      // dataLayer.push({
+      // sendGTMEvent({
       //   "event": "CE Conversion Failed",
       //   "event_properties": {}
       // });
@@ -352,7 +352,7 @@ export default class SwapAction extends BaseTxAction {
     }
   }
   onHide() {
-    // dataLayer.push({
+    // sendGTMEvent({
     //   "event": "CE Conversion Receipt Confirmation Reject",
     //   "event_properties": {}
     // });
diff --git a/src/gtm/index.ts b/src/gtm/index.ts
new file mode 100644
index 000000000..d9ce85d50
--- /dev/null
+++ b/src/gtm/index.ts
@@ -0,0 +1,13 @@
+export const sendGTMEvent = (e: any) => {
+  let data: any = {};
+  if (e["dataLayer"]) data = e["dataLayer"];
+
+  if (e["event"]) data["event"] = e["event"];
+
+  data["event_properties"] = e["event_properties"] ? e["event_properties"] : {};
+  data["user_properties"] = e["user_properties"] ? e["user_properties"] : {};
+  data["ga_event"] = e["ga_event"];
+
+  const dataLayer = window.dataLayer as {}[];
+  dataLayer.push(data);
+};
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index 06e85e2cd..0367fe78a 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -234,6 +234,7 @@ import {
 } from "@/api/observables/keeperDao";
 import { createOrder } from "@/api/orderSigning";
 import { tokens$ } from "@/api/observables/pools";
+import { sendGTMEvent } from "@/gtm";
 
 keeperTokens$.subscribe(token =>
   vxm.ethBancor.setDaoTokens(token.map(x => x.address))
@@ -6207,11 +6208,11 @@ export class EthBancorModule
 
     const ethPath = generateEthPath(fromSymbol, relays);
     const dataLayer = window.dataLayer as {}[];
-
-    dataLayer.push({
-      "event": "CE Conversion Swap Click",
-      "event_properties": {}
+    sendGTMEvent({
+      event: "CE Conversion Swap Click",
+      event_properties: {}
     });
+
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
       owner: this.currentUser,
@@ -6221,9 +6222,9 @@ export class EthBancorModule
       onPrompt
     });
 
-    dataLayer.push({
-      "event": "CE Conversion Receipt Confirmation Request",
-      "event_properties": {}
+    sendGTMEvent({
+      event: "CE Conversion Receipt Confirmation Request",
+      event_properties: {}
     });
     onUpdate!(2, steps);
 
@@ -6241,20 +6242,20 @@ export class EthBancorModule
         zeroAddress,
         0
       ),
-      onConfirmation: () =>
-        {
-          // dataLayer.push({
-          //   "event": "CE Conversion Wallet Confirmation Request",
-          //   "event_properties": {}
-          // });
-          console.log('SUCCESS')
-          return this.spamBalances([fromTokenContract, toTokenContract])
-        },
+      onConfirmation: () => {
+        // sendGTMEvent({
+        //   "event": "CE Conversion Wallet Confirmation Request",
+        //   "event_properties": {}
+        // });
+        console.log("SUCCESS");
+        return this.spamBalances([fromTokenContract, toTokenContract]);
+      },
       resolveImmediately: true,
       ...(fromIsEth && { value: fromWei }),
       onHash: () => {
-        console.log('Confirm')
-        return onUpdate!(3, steps)}
+        console.log("Confirm");
+        return onUpdate!(3, steps);
+      }
     });
     onUpdate!(4, steps);
 
diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index 7561c9c04..5d9aba878 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -6,6 +6,7 @@ import { fromWei, isAddress, toHex, toWei } from "web3-utils";
 import { shrinkToken } from "@/api/eth/helpers";
 import { vxm } from "@/store";
 import { EthNetworks, getWeb3, Provider, web3 } from "@/api/web3";
+import { sendGTMEvent } from "@/gtm";
 
 const tx = (data: any) =>
   new Promise((resolve, reject) => {
@@ -60,23 +61,23 @@ export class EthereumModule extends VuexModule.With({
     const dataLayer = window.dataLayer as {}[];
 
     try {
-      dataLayer.push({
-        "event": "CE Wallet Connect Select a Wallet Popup",
-        "event_properties": {}
+      sendGTMEvent({
+        event: "CE Wallet Connect Select a Wallet Popup",
+        event_properties: {}
       });
       await onboard.walletSelect();
       const state = onboard.getState();
-      dataLayer.push({
-        "event": "CE Wallet Connect Wallet Icon Click",
-        "event_properties": {
-          "wallet_id": state.address,
-          "wallet_name": state.wallet.name
+      sendGTMEvent({
+        event: "CE Wallet Connect Wallet Icon Click",
+        event_properties: {
+          wallet_id: state.address,
+          wallet_name: state.wallet.name
         }
       });
       await onboard.walletCheck();
-      dataLayer.push({
-        "event": "CE Wallet Connect",
-        "event_properties": {}
+      sendGTMEvent({
+        event: "CE Wallet Connect",
+        event_properties: {}
       });
     } catch (e) {
       console.error(e, "was the error");

From d8b6a846f3c3bad392a07f54bc84cc8fa5388913 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Thu, 29 Apr 2021 12:46:30 +0300
Subject: [PATCH 05/20] added more methods to the wrapper and made it more
 modular, added the dataLayer init

---
 src/gtm/gtm.ts                        |  6 ----
 src/gtm/index.ts                      | 50 ++++++++++++++++++++++-----
 src/main.ts                           |  1 -
 src/store/modules/swap/ethBancor.ts   | 11 ++----
 src/store/modules/wallet/ethWallet.ts | 24 ++++---------
 5 files changed, 51 insertions(+), 41 deletions(-)
 delete mode 100644 src/gtm/gtm.ts

diff --git a/src/gtm/gtm.ts b/src/gtm/gtm.ts
deleted file mode 100644
index ea9714a8e..000000000
--- a/src/gtm/gtm.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-(function(w:any,d:any,s:any,l:any,i:any)
-{w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});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-TCBKR7W');
\ No newline at end of file
diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index d9ce85d50..db499f1e0 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -1,13 +1,47 @@
-export const sendGTMEvent = (e: any) => {
-  let data: any = {};
-  if (e["dataLayer"]) data = e["dataLayer"];
-
-  if (e["event"]) data["event"] = e["event"];
+export const googleTagManager = (id: string, name: string | null) => {
+  if (window.dataLayer) return;
+  window.dataLayer = [
+    {
+      wallet: {
+        id: id,
+        name: name
+      }
+    }
+  ];
+  init(window, document, "script", "dataLayer", "GTM-TCBKR7W");
+  const dataLayer = window.dataLayer as {}[];
+  dataLayer.push({
+    event: "VP " + window.location.pathname,
+    page: {
+      path: window.location.pathname
+    }
+  });
+};
 
-  data["event_properties"] = e["event_properties"] ? e["event_properties"] : {};
-  data["user_properties"] = e["user_properties"] ? e["user_properties"] : {};
-  data["ga_event"] = e["ga_event"];
+const init = (w: any, d: any, s: any, l: any, i: any) => {
+  w[l] = w[l] || [];
+  w[l].push({ "gtm.start": new Date().getTime(), event: "gtm.js" });
+  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);
+};
 
+const sendGTM = (data: {}) => {
   const dataLayer = window.dataLayer as {}[];
   dataLayer.push(data);
 };
+
+export const sendGTMEvent = (event: string, event_properties: {} = {}) =>
+  sendGTM({
+    event: "CE " + event,
+    event_properties: event_properties
+  });
+
+export const sendGTMPath = (path: string, event_properties: {} = {}) =>
+  sendGTM({
+    event: "VP " + path,
+    event_properties: event_properties
+  });
diff --git a/src/main.ts b/src/main.ts
index 9a576193d..9971eef21 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,7 +13,6 @@ import "bootstrap-vue/dist/bootstrap-vue.css";
 import "@/assets/_scss/main.scss";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { fab, fal, fas, far } from "@/assets/fontawesome";
-import './gtm/gtm.ts'
 
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { sync } from "vuex-router-sync";
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index 0367fe78a..7ceabc495 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6207,11 +6207,7 @@ export class EthBancorModule
     });
 
     const ethPath = generateEthPath(fromSymbol, relays);
-    const dataLayer = window.dataLayer as {}[];
-    sendGTMEvent({
-      event: "CE Conversion Swap Click",
-      event_properties: {}
-    });
+    sendGTMEvent("Conversion Swap Click");
 
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
@@ -6222,10 +6218,7 @@ export class EthBancorModule
       onPrompt
     });
 
-    sendGTMEvent({
-      event: "CE Conversion Receipt Confirmation Request",
-      event_properties: {}
-    });
+    sendGTMEvent("Conversion Receipt Confirmation Request");
     onUpdate!(2, steps);
 
     const networkContract = buildNetworkContract(this.contracts.BancorNetwork);
diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index 5d9aba878..a4ff094be 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -6,7 +6,7 @@ import { fromWei, isAddress, toHex, toWei } from "web3-utils";
 import { shrinkToken } from "@/api/eth/helpers";
 import { vxm } from "@/store";
 import { EthNetworks, getWeb3, Provider, web3 } from "@/api/web3";
-import { sendGTMEvent } from "@/gtm";
+import { sendGTMEvent, googleTagManager } from "@/gtm";
 
 const tx = (data: any) =>
   new Promise((resolve, reject) => {
@@ -58,27 +58,16 @@ export class EthereumModule extends VuexModule.With({
   }
 
   @action async connect() {
-    const dataLayer = window.dataLayer as {}[];
-
     try {
-      sendGTMEvent({
-        event: "CE Wallet Connect Select a Wallet Popup",
-        event_properties: {}
-      });
+      sendGTMEvent("Wallet Connect Select a Wallet Popup");
       await onboard.walletSelect();
       const state = onboard.getState();
-      sendGTMEvent({
-        event: "CE Wallet Connect Wallet Icon Click",
-        event_properties: {
-          wallet_id: state.address,
-          wallet_name: state.wallet.name
-        }
+      sendGTMEvent("Wallet Connect Wallet Icon Click", {
+        wallet_id: state.address,
+        wallet_name: state.wallet.name
       });
       await onboard.walletCheck();
-      sendGTMEvent({
-        event: "CE Wallet Connect",
-        event_properties: {}
-      });
+      sendGTMEvent("Wallet Connect");
     } catch (e) {
       console.error(e, "was the error");
       throw new Error(`error: ${e}`);
@@ -93,6 +82,7 @@ export class EthereumModule extends VuexModule.With({
 
   @action async checkAlreadySignedIn() {
     const previouslySelectedWallet = localStorage.getItem(selectedWeb3Wallet);
+    googleTagManager(vxm.wallet.currentUser, previouslySelectedWallet);
 
     if (previouslySelectedWallet) {
       await onboard.walletSelect(previouslySelectedWallet);

From 65503544e755b06451931d1dbb1b8b599c824738 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Thu, 29 Apr 2021 13:01:16 +0300
Subject: [PATCH 06/20] Added VP route on every route change

---
 src/gtm/index.ts    | 16 ++++++----------
 src/router/index.ts |  4 ++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index db499f1e0..2c82ad2d5 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -9,13 +9,7 @@ export const googleTagManager = (id: string, name: string | null) => {
     }
   ];
   init(window, document, "script", "dataLayer", "GTM-TCBKR7W");
-  const dataLayer = window.dataLayer as {}[];
-  dataLayer.push({
-    event: "VP " + window.location.pathname,
-    page: {
-      path: window.location.pathname
-    }
-  });
+  sendGTMPath(window.location.pathname);
 };
 
 const init = (w: any, d: any, s: any, l: any, i: any) => {
@@ -31,7 +25,7 @@ const init = (w: any, d: any, s: any, l: any, i: any) => {
 
 const sendGTM = (data: {}) => {
   const dataLayer = window.dataLayer as {}[];
-  dataLayer.push(data);
+  if (dataLayer) dataLayer.push(data);
 };
 
 export const sendGTMEvent = (event: string, event_properties: {} = {}) =>
@@ -40,8 +34,10 @@ export const sendGTMEvent = (event: string, event_properties: {} = {}) =>
     event_properties: event_properties
   });
 
-export const sendGTMPath = (path: string, event_properties: {} = {}) =>
+export const sendGTMPath = (path: string) =>
   sendGTM({
     event: "VP " + path,
-    event_properties: event_properties
+    page: {
+      path
+    }
   });
diff --git a/src/router/index.ts b/src/router/index.ts
index 09fc2d195..03fa0cb00 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -29,6 +29,7 @@ import RestakeRewards from "@/components/rewards/RestakeRewards.vue";
 import WithdrawRewards from "@/components/rewards/WithdrawRewards.vue";
 import LimitOrderTable from "@/components/swap/LimitOrderTable.vue";
 import VoteLegacy from "@/components/vote/VoteLegacy.vue";
+import { sendGTMPath } from "@/gtm";
 
 Vue.use(Router);
 
@@ -377,6 +378,9 @@ const setPreferredService = (service: string) => {
 };
 
 router.beforeEach((to, from, next) => {
+  if (from.path !== to.path) {
+    sendGTMPath(to.path);
+  }
   if (to.meta && to.meta.feature) {
     const service = services.find(
       service => service.namespace == to.params.service

From 583ecd63a833abdaec4c586252476f98edeb7f99 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Thu, 29 Apr 2021 14:40:19 +0300
Subject: [PATCH 07/20] Added from and to path, changed wallet connect events

---
 src/gtm/index.ts                      | 56 ++++++++++++++++++++-------
 src/router/index.ts                   |  2 +-
 src/store/modules/wallet/ethWallet.ts | 14 ++++---
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index 2c82ad2d5..579a4993b 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -1,15 +1,16 @@
 export const googleTagManager = (id: string, name: string | null) => {
   if (window.dataLayer) return;
-  window.dataLayer = [
-    {
-      wallet: {
-        id: id,
-        name: name
+  if (id && name)
+    window.dataLayer = [
+      {
+        wallet: {
+          id: id,
+          name: name
+        }
       }
-    }
-  ];
+    ];
   init(window, document, "script", "dataLayer", "GTM-TCBKR7W");
-  sendGTMPath(window.location.pathname);
+  sendGTMPath(undefined, window.location.pathname);
 };
 
 const init = (w: any, d: any, s: any, l: any, i: any) => {
@@ -28,16 +29,45 @@ const sendGTM = (data: {}) => {
   if (dataLayer) dataLayer.push(data);
 };
 
-export const sendGTMEvent = (event: string, event_properties: {} = {}) =>
+export const sendGTMEvent = (
+  event: string,
+  ga_event_category: string,
+  event_properties: {} = {}
+) =>
   sendGTM({
     event: "CE " + event,
-    event_properties: event_properties
+    event_properties: event_properties,
+    ga_event: {
+      category: ga_event_category
+    }
+  });
+
+export const sendWalletEvent = (
+  event: string,
+  ga_event_category: string,
+  id: string,
+  name: string
+) =>
+  sendGTM({
+    event: "CE " + event,
+    ga_event: {
+      category: ga_event_category
+    },
+    user_properties: {
+      wallet_id: id,
+      wallet_name: name
+    },
+    wallet: {
+      id,
+      name
+    }
   });
 
-export const sendGTMPath = (path: string) =>
+export const sendGTMPath = (from: string | undefined, to: string) =>
   sendGTM({
-    event: "VP " + path,
+    event: "VP " + to,
     page: {
-      path
+      from_path: from,
+      to_path: to
     }
   });
diff --git a/src/router/index.ts b/src/router/index.ts
index 03fa0cb00..4e87d3f1a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -379,7 +379,7 @@ const setPreferredService = (service: string) => {
 
 router.beforeEach((to, from, next) => {
   if (from.path !== to.path) {
-    sendGTMPath(to.path);
+    sendGTMPath(from.path, to.path);
   }
   if (to.meta && to.meta.feature) {
     const service = services.find(
diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index a4ff094be..7d2bcf9af 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -6,7 +6,7 @@ import { fromWei, isAddress, toHex, toWei } from "web3-utils";
 import { shrinkToken } from "@/api/eth/helpers";
 import { vxm } from "@/store";
 import { EthNetworks, getWeb3, Provider, web3 } from "@/api/web3";
-import { sendGTMEvent, googleTagManager } from "@/gtm";
+import { sendGTMEvent, googleTagManager, sendWalletEvent } from "@/gtm";
 
 const tx = (data: any) =>
   new Promise((resolve, reject) => {
@@ -59,15 +59,19 @@ export class EthereumModule extends VuexModule.With({
 
   @action async connect() {
     try {
-      sendGTMEvent("Wallet Connect Select a Wallet Popup");
+      sendGTMEvent("Wallet Connect Select a Wallet Popup", "Wallet Connect");
       await onboard.walletSelect();
       const state = onboard.getState();
-      sendGTMEvent("Wallet Connect Wallet Icon Click", {
-        wallet_id: state.address,
+      sendGTMEvent("Wallet Connect Wallet Icon Click", "Wallet Connect", {
         wallet_name: state.wallet.name
       });
       await onboard.walletCheck();
-      sendGTMEvent("Wallet Connect");
+      sendWalletEvent(
+        "Wallet Connect",
+        "Wallet Connect",
+        state.address,
+        state.wallet.name ?? ""
+      );
     } catch (e) {
       console.error(e, "was the error");
       throw new Error(`error: ${e}`);

From dd30b116a643817285e0d1a634404fc710acb480 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Thu, 29 Apr 2021 14:43:09 +0300
Subject: [PATCH 08/20] even call fix

---
 src/store/modules/swap/ethBancor.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index 7ceabc495..a089e03f2 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6207,7 +6207,7 @@ export class EthBancorModule
     });
 
     const ethPath = generateEthPath(fromSymbol, relays);
-    sendGTMEvent("Conversion Swap Click");
+    sendGTMEvent("Conversion Swap Click", "Conversion");
 
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
@@ -6218,7 +6218,7 @@ export class EthBancorModule
       onPrompt
     });
 
-    sendGTMEvent("Conversion Receipt Confirmation Request");
+    sendGTMEvent("Conversion Receipt Confirmation Request", "Conversion");
     onUpdate!(2, steps);
 
     const networkContract = buildNetworkContract(this.contracts.BancorNetwork);

From e6a4e8d3731c83ffb5540136788128e27a8aaa72 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Mon, 3 May 2021 12:00:54 +0300
Subject: [PATCH 09/20] Added the conversion events

---
 src/components/modals/ModalTxAction.vue |  2 +-
 src/components/swap/SwapMarket.vue      | 67 +++++++++++++++++++------
 src/store/modules/swap/ethBancor.ts     | 44 ++++++++++++----
 3 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/src/components/modals/ModalTxAction.vue b/src/components/modals/ModalTxAction.vue
index 6d76aefcd..60de4e14f 100644
--- a/src/components/modals/ModalTxAction.vue
+++ b/src/components/modals/ModalTxAction.vue
@@ -141,7 +141,7 @@ export default class ModalTxAction extends BaseComponent {
   }
 
   onHideCallBack() {
-    this.onHide();
+    if (this.txMetaData.stepIndex === 1) this.onHide();
   }
 
   async close() {
diff --git a/src/components/swap/SwapMarket.vue b/src/components/swap/SwapMarket.vue
index 1d353e3f5..ada28ef1b 100644
--- a/src/components/swap/SwapMarket.vue
+++ b/src/components/swap/SwapMarket.vue
@@ -153,6 +153,8 @@ import { addNotification } from "@/components/compositions/notifications";
 import { wethTokenContractAddress } from "@/store/modules/swap/ethBancor";
 import { compareString } from "@/api/helpers";
 import wait from "waait";
+import { sendGTMEvent } from "@/gtm";
+import { EthNetworks } from "@/api/web3";
 
 @Component({
   components: {
@@ -307,6 +309,22 @@ export default class SwapAction extends BaseTxAction {
   }
 
   async initSwap() {
+    const conversion = {
+      conversion_type: "Market",
+      conversion_approve: "Unlimited",
+      conversion_blockchain: "ethereum",
+      conversion_blockchain_network:
+        vxm.ethBancor.currentNetwork === EthNetworks.Ropsten
+          ? "Ropsten"
+          : "MainNet",
+      conversion_settings:
+        this.slippageTolerance === 0.005 ? "Regular" : "Advanced",
+      conversion_token_pair: this.token1.symbol + "/" + this.token2.symbol,
+      conversion_from_token: this.token1.symbol,
+      conversion_to_token: this.token2.symbol,
+      conversion_from_amount: this.amount1,
+      conversion_to_amount: this.amount2
+    };
     this.openModal();
     if (this.txMeta.txBusy) return;
     this.txMeta.txBusy = true;
@@ -336,27 +354,46 @@ export default class SwapAction extends BaseTxAction {
       });
       this.setDefault();
     } catch (e) {
-      //if (e.message.includes('rejected'))
-      // sendGTMEvent({
-      //   "event": "CE Conversion Wallet Confirmation Reject",
-      //   "event_properties": {}
-      // });
-      //else
-      // sendGTMEvent({
-      //   "event": "CE Conversion Failed",
-      //   "event_properties": {}
-      // });
+      if (e.message.includes("User denied"))
+        sendGTMEvent(
+          "Conversion Wallet Confirmation Reject",
+          "Conversion",
+          conversion
+        );
+      else
+        sendGTMEvent("Conversion Failed", "Conversion", {
+          conversion,
+          error: e.message
+        });
+
       this.txMeta.txError = e.message;
     } finally {
       this.txMeta.txBusy = false;
     }
   }
+
   onHide() {
-    // sendGTMEvent({
-    //   "event": "CE Conversion Receipt Confirmation Reject",
-    //   "event_properties": {}
-    // });
-    console.log("HIDED");
+    const conversion = {
+      conversion_type: "Market",
+      conversion_approve: "Unlimited",
+      conversion_blockchain: "ethereum",
+      conversion_blockchain_network:
+        vxm.ethBancor.currentNetwork === EthNetworks.Ropsten
+          ? "Ropsten"
+          : "MainNet",
+      conversion_settings:
+        this.slippageTolerance === 0.005 ? "Regular" : "Advanced",
+      conversion_token_pair: this.token1.symbol + "/" + this.token2.symbol,
+      conversion_from_token: this.token1.symbol,
+      conversion_to_token: this.token2.symbol,
+      conversion_from_amount: this.amount1,
+      conversion_to_amount: this.amount2
+    };
+    sendGTMEvent(
+      "Conversion Receipt Confirmation Reject",
+      "Conversion",
+      conversion
+    );
   }
 
   lastReturn: { from: ViewAmount; to: ViewAmount } = {
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index f7d71686a..af82d04ec 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -2496,9 +2496,11 @@ export class EthBancorModule
             resolve(txHash);
           }
         })
-        .on("confirmation", () => {
-          if (onConfirmation) onConfirmation(txHash);
-          resolve(txHash);
+        .on("confirmation", (confirmationNumber: number) => {
+          if (confirmationNumber === 1) {
+            if (onConfirmation) onConfirmation(txHash);
+            resolve(txHash);
+          }
         })
         .on("error", (error: any) => reject(error));
     });
@@ -6021,9 +6023,25 @@ export class EthBancorModule
       fromId: from.id,
       toId: to.id
     });
+    const conversion = {
+      conversion_type: "Market",
+      conversion_approve: "Unlimited",
+      conversion_blockchain: "ethereum",
+      conversion_blockchain_network:
+        vxm.ethBancor.currentNetwork === EthNetworks.Ropsten
+          ? "Ropsten"
+          : "MainNet",
+      conversion_settings:
+        this.slippageTolerance === 0.005 ? "Regular" : "Advanced",
+      conversion_token_pair: fromSymbol + "/" + toToken.symbol,
+      conversion_from_token: fromSymbol,
+      conversion_to_token: toToken.symbol,
+      conversion_from_amount: fromAmount,
+      conversion_to_amount: to.amount
+    };
 
     const ethPath = generateEthPath(fromSymbol, relays);
-    sendGTMEvent("Conversion Swap Click", "Conversion");
+    sendGTMEvent("Conversion Swap Click", "Conversion", conversion);
 
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
@@ -6034,7 +6052,11 @@ export class EthBancorModule
       onPrompt
     });
 
-    sendGTMEvent("Conversion Receipt Confirmation Request", "Conversion");
+    sendGTMEvent(
+      "Conversion Receipt Confirmation Request",
+      "Conversion",
+      conversion
+    );
     onUpdate!(2, steps);
 
     const networkContract = buildNetworkContract(this.contracts.BancorNetwork);
@@ -6052,17 +6074,17 @@ export class EthBancorModule
         0
       ),
       onConfirmation: () => {
-        // sendGTMEvent({
-        //   "event": "CE Conversion Wallet Confirmation Request",
-        //   "event_properties": {}
-        // });
-        console.log("SUCCESS");
+        sendGTMEvent("Conversion Success", "Conversion", conversion);
         return this.spamBalances([fromTokenContract, toTokenContract]);
       },
       resolveImmediately: true,
       ...(fromIsEth && { value: fromWei }),
       onHash: () => {
-        console.log("Confirm");
+        sendGTMEvent(
+          "Conversion Wallet Confirmation Request",
+          "Conversion",
+          conversion
+        );
         return onUpdate!(3, steps);
       }
     });

From 8d8640ff0ba4692e77be9a3664601e69a581be46 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Tue, 4 May 2021 18:49:41 +0300
Subject: [PATCH 10/20] Fixed missing events

---
 src/components/modals/ModalTxAction.vue |  2 +-
 src/gtm/index.ts                        |  1 +
 src/store/modules/swap/ethBancor.ts     | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/modals/ModalTxAction.vue b/src/components/modals/ModalTxAction.vue
index 60de4e14f..aac22e63c 100644
--- a/src/components/modals/ModalTxAction.vue
+++ b/src/components/modals/ModalTxAction.vue
@@ -141,7 +141,7 @@ export default class ModalTxAction extends BaseComponent {
   }
 
   onHideCallBack() {
-    if (this.txMetaData.stepIndex === 1) this.onHide();
+    if (this.txMetaData.stepIndex <= 1) this.onHide();
   }
 
   async close() {
diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index 579a4993b..bc7c44652 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -37,6 +37,7 @@ export const sendGTMEvent = (
   sendGTM({
     event: "CE " + event,
     event_properties: event_properties,
+    user_properties: {},
     ga_event: {
       category: ga_event_category
     }
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index af82d04ec..7c5cc90d6 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6032,7 +6032,7 @@ export class EthBancorModule
           ? "Ropsten"
           : "MainNet",
       conversion_settings:
-        this.slippageTolerance === 0.005 ? "Regular" : "Advanced",
+        vxm.bancor.slippageTolerance === 0.005 ? "Regular" : "Advanced",
       conversion_token_pair: fromSymbol + "/" + toToken.symbol,
       conversion_from_token: fromSymbol,
       conversion_to_token: toToken.symbol,
@@ -6051,7 +6051,6 @@ export class EthBancorModule
       tokenAddress: fromTokenContract,
       onPrompt
     });
-
     sendGTMEvent(
       "Conversion Receipt Confirmation Request",
       "Conversion",
@@ -6074,7 +6073,18 @@ export class EthBancorModule
         0
       ),
       onConfirmation: () => {
-        sendGTMEvent("Conversion Success", "Conversion", conversion);
+        sendGTMEvent("Conversion Success", "Conversion", {
+          conversion,
+          conversion_success: {
+            conversion_market_eth_usd_rate: "",
+            conversion_market_token_rate: fromToken.price?.toFixed(10)
+          },
+          transaction: {
+            transaction_category: "Conversion",
+            transaction_id: confirmedHash,
+            transaction_revenue: ""
+          }
+        });
         return this.spamBalances([fromTokenContract, toTokenContract]);
       },
       resolveImmediately: true,

From 2acf5481d3a14b6669dc1de3db958a623a9afe31 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Tue, 4 May 2021 19:23:54 +0300
Subject: [PATCH 11/20] Changed swap market and limit to use state instead of
 routes.

---
 src/components/swap/SwapHome.vue    | 17 ++++++++++-------
 src/components/swap/SwapLimit.vue   |  8 ++++----
 src/router/index.ts                 | 15 +--------------
 src/store/modules/swap/ethBancor.ts |  1 +
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/src/components/swap/SwapHome.vue b/src/components/swap/SwapHome.vue
index bc048cd3a..3f4218a67 100644
--- a/src/components/swap/SwapHome.vue
+++ b/src/components/swap/SwapHome.vue
@@ -3,7 +3,7 @@
     <b-button-group class="d-flex w-100 text-center mt-2 mb-3 pt-3">
       <b-button
         id="market"
-        @click="$router.push({ name: 'Swap' })"
+        @click="limit = false"
         :variant="
           limit ? 'outline-primary' + (darkMode ? '-dark' : '') : 'primary'
         "
@@ -11,7 +11,7 @@
       </b-button>
       <b-button
         id="limit"
-        @click="$router.push({ name: 'SwapLimit' })"
+        @click="limit = true"
         :variant="
           !limit ? 'outline-primary' + (darkMode ? '-dark' : '') : 'primary'
         "
@@ -36,7 +36,8 @@
     >
       {{ $t("trade_at_pre_det") }}
     </b-popover>
-    <router-view />
+    <swap-limit v-if="limit" />
+    <swap-market v-else />
   </content-block>
 </template>
 
@@ -44,16 +45,18 @@
 import { Component } from "vue-property-decorator";
 import ContentBlock from "@/components/common/ContentBlock.vue";
 import BaseComponent from "@/components/BaseComponent.vue";
+import SwapMarket from "@/components/swap/SwapMarket.vue";
+import SwapLimit from "@/components/swap/SwapLimit.vue";
 
 @Component({
   components: {
-    ContentBlock
+    ContentBlock,
+    SwapLimit,
+    SwapMarket
   }
 })
 export default class SwapHome extends BaseComponent {
-  get limit() {
-    return this.$route.name === "SwapLimit";
-  }
+  limit = false;
 }
 </script>
 
diff --git a/src/components/swap/SwapLimit.vue b/src/components/swap/SwapLimit.vue
index 9bd350ac9..b8985ff8a 100644
--- a/src/components/swap/SwapLimit.vue
+++ b/src/components/swap/SwapLimit.vue
@@ -438,7 +438,7 @@ export default class SwapLimit extends BaseTxAction {
     }
 
     this.$router.replace({
-      name: "SwapLimit",
+      name: "Swap",
       query: {
         from: id,
         to: to
@@ -455,7 +455,7 @@ export default class SwapLimit extends BaseTxAction {
     }
 
     this.$router.replace({
-      name: "SwapLimit",
+      name: "Swap",
       query: {
         from: from,
         to: id
@@ -465,7 +465,7 @@ export default class SwapLimit extends BaseTxAction {
 
   invertSelection() {
     this.$router.replace({
-      name: "SwapLimit",
+      name: "Swap",
       query: {
         from: this.token2.id,
         to: this.token1.id
@@ -746,7 +746,7 @@ export default class SwapLimit extends BaseTxAction {
       if (this.$route.query.from) defaultQuery.from = this.$route.query.from;
       // @ts-ignore
       if (this.$route.query.to) defaultQuery.to = this.$route.query.to;
-      await this.$router.replace({ name: "SwapLimit", query: defaultQuery });
+      await this.$router.replace({ name: "Swap", query: defaultQuery });
     }
   }
 }
diff --git a/src/router/index.ts b/src/router/index.ts
index 46cf475e8..db02b6e10 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -6,8 +6,6 @@ import Navigation from "@/components/layout/Navigation.vue";
 import { services } from "@/api/helpers";
 import PoolActions from "@/components/pool/PoolActions.vue";
 import SwapHome from "@/components/swap/SwapHome.vue";
-import SwapMarket from "@/components/swap/SwapMarket.vue";
-import SwapLimit from "@/components/swap/SwapLimit.vue";
 import CreateHome from "@/views/CreateHome.vue";
 import DataSummary from "@/components/data/DataSummary.vue";
 import Portfolio from "@/views/Portfolio.vue";
@@ -225,18 +223,7 @@ export const router = new Router({
         key: "swap",
         feature: "Trade"
       },
-      children: [
-        {
-          path: "",
-          name: "Swap",
-          component: SwapMarket
-        },
-        {
-          path: "limit",
-          name: "SwapLimit",
-          component: SwapLimit
-        }
-      ]
+      name: "Swap"
     },
     {
       path: "/:service/data",
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index 7c5cc90d6..93e6c4cd8 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6023,6 +6023,7 @@ export class EthBancorModule
       fromId: from.id,
       toId: to.id
     });
+
     const conversion = {
       conversion_type: "Market",
       conversion_approve: "Unlimited",

From 48706e2457c3c5f9b6a68df64e4e57a265a55d3d Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 16:21:52 +0300
Subject: [PATCH 12/20] Changed event order

---
 src/store/modules/swap/ethBancor.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index 93e6c4cd8..5265b9aa5 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6044,6 +6044,11 @@ export class EthBancorModule
     const ethPath = generateEthPath(fromSymbol, relays);
     sendGTMEvent("Conversion Swap Click", "Conversion", conversion);
 
+    sendGTMEvent(
+      "Conversion Receipt Confirmation Request",
+      "Conversion",
+      conversion
+    );
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
       owner: this.currentUser,
@@ -6052,11 +6057,6 @@ export class EthBancorModule
       tokenAddress: fromTokenContract,
       onPrompt
     });
-    sendGTMEvent(
-      "Conversion Receipt Confirmation Request",
-      "Conversion",
-      conversion
-    );
     onUpdate!(2, steps);
 
     const networkContract = buildNetworkContract(this.contracts.BancorNetwork);
@@ -6064,6 +6064,12 @@ export class EthBancorModule
     const expectedReturn = to.amount;
     const expectedReturnWei = expandToken(expectedReturn, toTokenDecimals);
 
+    sendGTMEvent(
+      "Conversion Wallet Confirmation Request",
+      "Conversion",
+      conversion
+    );
+
     const confirmedHash = await this.resolveTxOnConfirmation({
       tx: networkContract.methods.convertByPath(
         ethPath.path,
@@ -6091,11 +6097,7 @@ export class EthBancorModule
       resolveImmediately: true,
       ...(fromIsEth && { value: fromWei }),
       onHash: () => {
-        sendGTMEvent(
-          "Conversion Wallet Confirmation Request",
-          "Conversion",
-          conversion
-        );
+        sendGTMEvent("Conversion Wallet Confirmed", "Conversion", conversion);
         return onUpdate!(3, steps);
       }
     });

From 224af52c340c2621b9a190f88ebfb348d1c8705d Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 16:29:38 +0300
Subject: [PATCH 13/20] added eth usd price

---
 src/store/modules/swap/ethBancor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index d380514e2..be0854ec4 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6083,7 +6083,7 @@ export class EthBancorModule
         sendGTMEvent("Conversion Success", "Conversion", {
           conversion,
           conversion_success: {
-            conversion_market_eth_usd_rate: "",
+            conversion_market_eth_usd_rate: this.stats.nativeTokenPrice.price,
             conversion_market_token_rate: fromToken.price?.toFixed(10)
           },
           transaction: {

From 0f9b923a5437842f578b656b5742a5614c3e6fac Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 17:16:57 +0300
Subject: [PATCH 14/20] added gtm to staging header

---
 firebase.json | 75 +++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 41 deletions(-)

diff --git a/firebase.json b/firebase.json
index 8ad7f2cac..95d3dca90 100644
--- a/firebase.json
+++ b/firebase.json
@@ -1,46 +1,39 @@
 {
-  "hosting": [ {
-    "target": "production",
-    "public": "dist",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ],
-    "rewrites": [
-      {
-        "source": "**",
-        "destination": "/index.html"
-      }
-    ],
-    "headers": [
-      {
-        "source": "**/*",
-        "headers": [
-          {
-            "key": "X-Content-Type-Options",
-            "value": "nosniff"
-          },
-          {
-            "key": "X-Frame-Options",
-            "value": "DENY"
-          },
-          {
-            "key": "X-XSS-Protection",
-            "value": "1; mode=block"
-          }
-        ]
-      }
-    ]
-  },
+  "hosting": [
     {
-      "target": "staging",
+      "target": "production",
       "public": "dist",
-      "ignore": [
-        "firebase.json",
-        "**/.*",
-        "**/node_modules/**"
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
+      "rewrites": [
+        {
+          "source": "**",
+          "destination": "/index.html"
+        }
       ],
+      "headers": [
+        {
+          "source": "**/*",
+          "headers": [
+            {
+              "key": "X-Content-Type-Options",
+              "value": "nosniff"
+            },
+            {
+              "key": "X-Frame-Options",
+              "value": "DENY"
+            },
+            {
+              "key": "X-XSS-Protection",
+              "value": "1; mode=block"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "target": "staging",
+      "public": "dist",
+      "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
       "rewrites": [
         {
           "source": "**",
@@ -53,7 +46,7 @@
           "headers": [
             {
               "key": "Content-Security-Policy",
-              "value": "frame-ancestors 'self' https://bancor-v2-beta.web.app https://bancor.network https://*.bancor.network; default-src 'self'; connect-src  https://bancor.network https://ropsten-ptdczarhfq-nw.a.run.app/welcome wss://*.blocknative.com https://*.bancor.network https://*.keeperdao.com https://*.sentry.io https://raw.githubusercontent.com/Velua/eth-tokens-registry/master/tokens.json wss://*.alchemyapi.io; font-src https://fonts.gstatic.com; img-src 'self' data: https://etherscan.io https://*.etherscan.io https://raw.githubusercontent.com https://storage.googleapis.com; script-src 'self' 'unsafe-eval' https://www.google-analytics.com/analytics.js https://www.googletagmanager.com/gtag/js; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com/;"
+              "value": "frame-ancestors 'self' https://bancor-v2-beta.web.app https://bancor.network https://*.bancor.network; default-src 'self'; connect-src  https://bancor.network https://ropsten-ptdczarhfq-nw.a.run.app/welcome wss://*.blocknative.com https://*.bancor.network https://*.keeperdao.com https://*.sentry.io https://raw.githubusercontent.com/Velua/eth-tokens-registry/master/tokens.json wss://*.alchemyapi.io; font-src https://fonts.gstatic.com; img-src 'self' data: https://etherscan.io https://*.etherscan.io https://raw.githubusercontent.com https://storage.googleapis.com; script-src 'self' 'unsafe-eval' https://www.google-analytics.com/analytics.js https://www.googletagmanager.com/gtag/js https://www.googletagmanager.com/gtm.js?id=GTM-TCBKR7W; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com/;"
             },
             {
               "key": "X-Content-Type-Options",
@@ -72,4 +65,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

From 1bf9e8588083328cb64b14e1e2ac8873643d3ae5 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 17:32:05 +0300
Subject: [PATCH 15/20] one more

---
 firebase.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/firebase.json b/firebase.json
index 95d3dca90..a41553a5c 100644
--- a/firebase.json
+++ b/firebase.json
@@ -44,10 +44,6 @@
         {
           "source": "**/*",
           "headers": [
-            {
-              "key": "Content-Security-Policy",
-              "value": "frame-ancestors 'self' https://bancor-v2-beta.web.app https://bancor.network https://*.bancor.network; default-src 'self'; connect-src  https://bancor.network https://ropsten-ptdczarhfq-nw.a.run.app/welcome wss://*.blocknative.com https://*.bancor.network https://*.keeperdao.com https://*.sentry.io https://raw.githubusercontent.com/Velua/eth-tokens-registry/master/tokens.json wss://*.alchemyapi.io; font-src https://fonts.gstatic.com; img-src 'self' data: https://etherscan.io https://*.etherscan.io https://raw.githubusercontent.com https://storage.googleapis.com; script-src 'self' 'unsafe-eval' https://www.google-analytics.com/analytics.js https://www.googletagmanager.com/gtag/js https://www.googletagmanager.com/gtm.js?id=GTM-TCBKR7W; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com/;"
-            },
             {
               "key": "X-Content-Type-Options",
               "value": "nosniff"

From 37e3f95ca2e60c17bd3983e75d9cdc03bc4a063f Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 18:06:28 +0300
Subject: [PATCH 16/20] Undefined instead of empty

---
 src/gtm/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index bc7c44652..a4c93a070 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -32,12 +32,12 @@ const sendGTM = (data: {}) => {
 export const sendGTMEvent = (
   event: string,
   ga_event_category: string,
-  event_properties: {} = {}
+  event_properties: {} | undefined = undefined
 ) =>
   sendGTM({
     event: "CE " + event,
     event_properties: event_properties,
-    user_properties: {},
+    user_properties: undefined,
     ga_event: {
       category: ga_event_category
     }

From 2886bc27dd7148f48b8de464462e313e68e017ff Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 19:00:29 +0300
Subject: [PATCH 17/20] Changed event order and added undefined to VP paths

---
 src/components/modals/ModalTxAction.vue | 14 +++++++-------
 src/components/swap/SwapMarket.vue      | 10 +++++++++-
 src/gtm/index.ts                        |  4 +++-
 src/store/modules/swap/ethBancor.ts     | 22 ++++++----------------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/modals/ModalTxAction.vue b/src/components/modals/ModalTxAction.vue
index aac22e63c..f598f2d33 100644
--- a/src/components/modals/ModalTxAction.vue
+++ b/src/components/modals/ModalTxAction.vue
@@ -142,13 +142,6 @@ export default class ModalTxAction extends BaseComponent {
 
   onHideCallBack() {
     if (this.txMetaData.stepIndex <= 1) this.onHide();
-  }
-
-  async close() {
-    if (this.txMetaData.txBusy) return;
-    if (this.redirectOnSuccess && this.txMetaData.success) {
-      await this.$router.replace({ name: this.redirectOnSuccess });
-    }
     this.txMetaData = {
       showTxModal: false,
       txBusy: false,
@@ -159,5 +152,12 @@ export default class ModalTxAction extends BaseComponent {
       prompt: null
     };
   }
+
+  async close() {
+    if (this.txMetaData.txBusy) return;
+    if (this.redirectOnSuccess && this.txMetaData.success) {
+      await this.$router.replace({ name: this.redirectOnSuccess });
+    }
+  }
 }
 </script>
diff --git a/src/components/swap/SwapMarket.vue b/src/components/swap/SwapMarket.vue
index 8ea1a1faf..bbe9a73cb 100644
--- a/src/components/swap/SwapMarket.vue
+++ b/src/components/swap/SwapMarket.vue
@@ -326,7 +326,15 @@ export default class SwapAction extends BaseTxAction {
       conversion_from_amount: this.amount1,
       conversion_to_amount: this.amount2
     };
-    this.openModal();
+    sendGTMEvent("Conversion Swap Click", "Conversion", conversion);
+    const notLoggedIn = this.openModal();
+    if (!notLoggedIn)
+      sendGTMEvent(
+        "Conversion Receipt Confirmation Request",
+        "Conversion",
+        conversion
+      );
+
     if (this.txMeta.txBusy) return;
     this.txMeta.txBusy = true;
     try {
diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index a4c93a070..670a5a07f 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -70,5 +70,7 @@ export const sendGTMPath = (from: string | undefined, to: string) =>
     page: {
       from_path: from,
       to_path: to
-    }
+    },
+    user_properties: undefined,
+    ga_event: undefined
   });
diff --git a/src/store/modules/swap/ethBancor.ts b/src/store/modules/swap/ethBancor.ts
index be0854ec4..06415519c 100644
--- a/src/store/modules/swap/ethBancor.ts
+++ b/src/store/modules/swap/ethBancor.ts
@@ -6042,13 +6042,7 @@ export class EthBancorModule
     };
 
     const ethPath = generateEthPath(fromSymbol, relays);
-    sendGTMEvent("Conversion Swap Click", "Conversion", conversion);
 
-    sendGTMEvent(
-      "Conversion Receipt Confirmation Request",
-      "Conversion",
-      conversion
-    );
     onUpdate!(1, steps);
     await this.triggerApprovalIfRequired({
       owner: this.currentUser,
@@ -6081,16 +6075,12 @@ export class EthBancorModule
       ),
       onConfirmation: () => {
         sendGTMEvent("Conversion Success", "Conversion", {
-          conversion,
-          conversion_success: {
-            conversion_market_eth_usd_rate: this.stats.nativeTokenPrice.price,
-            conversion_market_token_rate: fromToken.price?.toFixed(10)
-          },
-          transaction: {
-            transaction_category: "Conversion",
-            transaction_id: confirmedHash,
-            transaction_revenue: ""
-          }
+          ...conversion,
+          conversion_market_eth_usd_rate: this.stats.nativeTokenPrice.price,
+          conversion_market_token_rate: fromToken.price?.toFixed(10),
+          transaction_category: "Conversion",
+          transaction_id: confirmedHash,
+          transaction_revenue: ""
         });
         return this.spamBalances([fromTokenContract, toTokenContract]);
       },

From a01156e0d9fee46f80e13cca3df7a50ec9730cfb Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 19:27:52 +0300
Subject: [PATCH 18/20] added dark and light mode tracking

---
 src/gtm/index.ts                      | 9 +++++++--
 src/router/index.ts                   | 3 ++-
 src/store/modules/wallet/ethWallet.ts | 9 +++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index 670a5a07f..23ea16c97 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -64,7 +64,11 @@ export const sendWalletEvent = (
     }
   });
 
-export const sendGTMPath = (from: string | undefined, to: string) =>
+export const sendGTMPath = (
+  from: string | undefined,
+  to: string,
+  darkMode: boolean = false
+) =>
   sendGTM({
     event: "VP " + to,
     page: {
@@ -72,5 +76,6 @@ export const sendGTMPath = (from: string | undefined, to: string) =>
       to_path: to
     },
     user_properties: undefined,
-    ga_event: undefined
+    ga_event: undefined,
+    theme: darkMode ? "Dark" : "Light"
   });
diff --git a/src/router/index.ts b/src/router/index.ts
index db02b6e10..5e06c2a3c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -26,6 +26,7 @@ import WithdrawRewards from "@/components/rewards/WithdrawRewards.vue";
 import LimitOrderTable from "@/components/swap/LimitOrderTable.vue";
 import VoteLegacy from "@/components/vote/VoteLegacy.vue";
 import { sendGTMPath } from "@/gtm";
+import { vxm } from "@/store";
 
 Vue.use(Router);
 
@@ -354,7 +355,7 @@ const setPreferredService = (service: string) => {
 
 router.beforeEach((to, from, next) => {
   if (from.path !== to.path) {
-    sendGTMPath(from.path, to.path);
+    sendGTMPath(from.path, to.path, vxm.general.darkMode);
   }
   if (to.meta && to.meta.feature) {
     const service = services.find(
diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index 7d2bcf9af..65e06ffab 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -79,18 +79,19 @@ export class EthereumModule extends VuexModule.With({
   }
 
   @action async nativeBalanceChange(nativeBalance: string) {
-    vxm.ethBancor.updateUserBalances([
-      { balance: fromWei(nativeBalance), id: ethReserveAddress }
-    ]);
+    if (nativeBalance)
+      vxm.ethBancor.updateUserBalances([
+        { balance: fromWei(nativeBalance), id: ethReserveAddress }
+      ]);
   }
 
   @action async checkAlreadySignedIn() {
     const previouslySelectedWallet = localStorage.getItem(selectedWeb3Wallet);
-    googleTagManager(vxm.wallet.currentUser, previouslySelectedWallet);
 
     if (previouslySelectedWallet) {
       await onboard.walletSelect(previouslySelectedWallet);
     }
+    googleTagManager(this.loggedInAccount, previouslySelectedWallet);
   }
 
   @action async getBalance({

From a9d1b57db7eda99c17ee5755778f6148f1f9d631 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 19:43:08 +0300
Subject: [PATCH 19/20] Changed wallet category name

---
 src/store/modules/wallet/ethWallet.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index 65e06ffab..0daabaa00 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -59,16 +59,16 @@ export class EthereumModule extends VuexModule.With({
 
   @action async connect() {
     try {
-      sendGTMEvent("Wallet Connect Select a Wallet Popup", "Wallet Connect");
+      sendGTMEvent("Wallet Connect Select a Wallet Popup", "Wallet");
       await onboard.walletSelect();
       const state = onboard.getState();
-      sendGTMEvent("Wallet Connect Wallet Icon Click", "Wallet Connect", {
+      sendGTMEvent("Wallet Connect Wallet Icon Click", "Wallet", {
         wallet_name: state.wallet.name
       });
       await onboard.walletCheck();
       sendWalletEvent(
         "Wallet Connect",
-        "Wallet Connect",
+        "Wallet",
         state.address,
         state.wallet.name ?? ""
       );

From ea2ca8efdb2221a80f70c83a8693fc33ef35b071 Mon Sep 17 00:00:00 2001
From: Ran Cohen <ran@bancor.network>
Date: Wed, 5 May 2021 20:11:23 +0300
Subject: [PATCH 20/20] changed theme location

---
 src/gtm/index.ts                      | 6 +++---
 src/store/modules/wallet/ethWallet.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gtm/index.ts b/src/gtm/index.ts
index 23ea16c97..e808dcfe3 100644
--- a/src/gtm/index.ts
+++ b/src/gtm/index.ts
@@ -73,9 +73,9 @@ export const sendGTMPath = (
     event: "VP " + to,
     page: {
       from_path: from,
-      to_path: to
+      to_path: to,
+      theme: darkMode ? "Dark" : "Light"
     },
     user_properties: undefined,
-    ga_event: undefined,
-    theme: darkMode ? "Dark" : "Light"
+    ga_event: undefined
   });
diff --git a/src/store/modules/wallet/ethWallet.ts b/src/store/modules/wallet/ethWallet.ts
index 0daabaa00..d89022d87 100644
--- a/src/store/modules/wallet/ethWallet.ts
+++ b/src/store/modules/wallet/ethWallet.ts
@@ -59,7 +59,7 @@ export class EthereumModule extends VuexModule.With({
 
   @action async connect() {
     try {
-      sendGTMEvent("Wallet Connect Select a Wallet Popup", "Wallet");
+      sendGTMEvent("Wallet Connect Select Wallet Popup", "Wallet");
       await onboard.walletSelect();
       const state = onboard.getState();
       sendGTMEvent("Wallet Connect Wallet Icon Click", "Wallet", {