Google Tag Manager

firebase.json

@@ -1,46 +1,9 @@
 {
-  "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": "**",
@@ -52,9 +15,35 @@
           "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; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com/;"
+              "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": "**",
+          "destination": "/index.html"
+        }
+      ],
+      "headers": [
+        {
+          "source": "**/*",
+          "headers": [
             {
               "key": "X-Content-Type-Options",
               "value": "nosniff"
@@ -72,4 +61,4 @@
       ]
     }
   ]
-}
+}

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.4",
     "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.5.1",

src/App.vue

@@ -163,12 +163,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 {

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;

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,11 +140,8 @@ export default class ModalTxAction extends BaseComponent {
     selectedPromptReceiver$.next(id);
   }
 
-  async close() {
-    if (this.txMetaData.txBusy) return;
-    if (this.redirectOnSuccess && this.txMetaData.success) {
-      await this.$router.replace({ name: this.redirectOnSuccess });
-    }
+  onHideCallBack() {
+    if (this.txMetaData.stepIndex <= 1) this.onHide();
     this.txMetaData = {
       showTxModal: false,
       txBusy: false,
@@ -149,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>

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;
     }

src/components/swap/SwapHome.vue

@@ -3,15 +3,15 @@
     <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'
         "
         >{{ $t("market") }}
       </b-button>
       <b-button
         id="limit"
-        @click="$router.push({ name: 'SwapLimit' })"
+        @click="limit = true"
         :variant="
           !limit ? 'outline-primary' + (darkMode ? '-dark' : '') : 'primary'
         "
@@ -36,24 +36,27 @@
     >
       {{ $t("trade_at_pre_det") }}
     </b-popover>
-    <router-view />
+    <swap-limit v-if="limit" />
+    <swap-market v-else />
   </content-block>
 </template>
 
 <script lang="ts">
 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>
 

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 });
     }
   }
 }