revert: ⏪️ intercom changes

gamalielhere · gamalielhere · commit 12b1999424b7 · 2022-08-03T18:58:04.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,4 @@
+### Release v6.6.3-hotfix.1
 ### fix
 
 * fix banner link, redo intercom [#4072](https://github.com/MyEtherWallet/MyEtherWallet/pull/4072)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myetherwallet",
-  "version": "6.6.3",
+  "version": "6.6.3-hotfix.1",
   "description": "Client side ethereum wallet",
   "scripts": {
     "build": "npm run update && vue-cli-service build",
@@ -48,6 +48,7 @@
     "@formatjs/intl-numberformat": "8.0.4",
     "@ledgerhq/hw-transport-web-ble": "6.27.1",
     "@lokalise/node-api": "7.3.1",
+    "@mathieustan/vue-intercom": "0.0.9",
     "@myetherwallet/eth2-keystore": "0.2.3",
     "@myetherwallet/mew-components": "1.3.0",
     "@myetherwallet/mewconnect-web-client": "2.2.0-beta.16",
diff --git a/public/index.html b/public/index.html
@@ -102,7 +102,7 @@
       hreflang="x-default"
       href="https://www.myetherwallet.com/"
     />
-    <script async="true" src="./intercom.js"></script>
+
   </head>
 
   <body>
diff --git a/public/intercom.js b/public/intercom.js
diff --git a/src/main/liveMain.js b/src/main/liveMain.js
@@ -10,6 +10,7 @@ import Vue from 'vue';
 import Router from 'vue-router';
 import { v4 as uuidv4 } from 'uuid';
 
+import VueIntercom from '@mathieustan/vue-intercom';
 import VueSocialSharing from 'vue-social-sharing';
 
 /**Dapps Store */
@@ -47,7 +48,7 @@ Vue.directive('lottie', LottieAnimation);
 Vue.filter('lokalise', lokalise);
 
 // eslint-disable-next-line
-// Vue.use(VueIntercom, { appId: 'ja20qe25' });
+Vue.use(VueIntercom, { appId: 'ja20qe25' });
 Vue.use(VueSocialSharing);
 
 //Router
@@ -62,6 +63,11 @@ new Vue({
   apolloProvider,
   vuetify,
   beforeCreate() {
+    const userId = this.$route.query.intercomid
+      ? this.$route.query.intercomid
+      : uuidv4();
+    this.$intercom.boot({ user_id: userId });
+
     if (locStore.get('mew-testing') === undefined) {
       locStore.set('mew-testing', false);
     }
@@ -74,17 +80,5 @@ new Vue({
     dappStoreBeforeCreate(this.$store);
     this.$store.dispatch('popups/setTracking');
   },
-  mounted() {
-    window.Intercom('shutdown');
-    this.bootIntercom();
-  },
-  methods: {
-    bootIntercom() {
-      const userId = this.$route.query.intercomid
-        ? this.$route.query.intercomid
-        : uuidv4();
-      window.Intercom('boot', { app_id: 'ja20qe25', user_id: userId });
-    }
-  },
   render: h => h(app)
 });

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+### Release v6.6.3-hotfix.1`
`1`	`2`	`### fix`
`2`	`3`
`3`	`4`	`* fix banner link, redo intercom [#4072](https://github.com/MyEtherWallet/MyEtherWallet/pull/4072)`