Merge branch 'devop/matomo' of github.com:MyEtherWallet/MyEtherWallet into devop/seo-pages-setup

Author: gamalielhere

src/main/mainApp.vue

@@ -64,14 +64,17 @@ export default {
   },
   mounted() {
     EventBus.$on('swapTxBroadcasted', hash => {
-      this.trackSwap('swapTxBroadcasted', hash, this.network.type.name);
+      this.trackSwap('swapTxBroadcasted', hash, this.network.type.chainID);
     });
     EventBus.$on('swapTxReceivedReceipt', hash => {
-      this.trackSwap('swapTxReceivedReceipt', hash, this.network.type.name);
+      this.trackSwap('swapTxReceivedReceipt', hash, this.network.type.chainID);
     });
     EventBus.$on('swapTxFailed', hash => {
       const passedHash = hash === '0x' ? 'no hash' : hash;
-      this.trackSwap('swapTxFailed', passedHash, this.network.type.name);
+      this.trackSwap('swapTxFailed', passedHash, this.network.type.chainID);
+    });
+    EventBus.$on('swapTxNotBroadcastedFailed', () => {
+      this.trackSwap('swapTxNotBroadcastedFailed');
     });
     EventBus.$on(BUYSELL_EVENT, () => {
       this.openBuy();
@@ -119,6 +122,7 @@ export default {
     EventBus.$off('swapTxBroadcasted');
     EventBus.$off('swapTxReceivedReceipt');
     EventBus.$off('swapTxFailed');
+    EventBus.$off('swapTxNotBroadcastedFailed');
   },
   methods: {
     ...mapActions('global', ['setOnlineStatus']),

src/modules/confirmation/ModuleConfirmation.vue

@@ -730,7 +730,7 @@ export default {
               _this.trackSwap(
                 'swapTxReceivedReceipt',
                 hash,
-                this.network.type.name
+                this.network.type.chainID
               );
             }
           })
@@ -751,7 +751,7 @@ export default {
                 _this.trackSwap(
                   'swapTxBroadcasted',
                   hash,
-                  this.network.type.name
+                  this.network.type.chainID
                 );
               }
               _this.reset();
@@ -822,7 +822,7 @@ export default {
         this.trackSwap(
           'swapTransactionSuccessfullySent',
           param,
-          this.network.type.name
+          this.network.type.chainID
         );
       }
     },
@@ -836,7 +836,11 @@ export default {
         event
           .on('transactionHash', res => {
             if (this.isSwap) {
-              this.trackSwap('swapTxBroadcasted', res, this.network.type.name);
+              this.trackSwap(
+                'swapTxBroadcasted',
+                res,
+                this.network.type.chainID
+              );
             }
             this.showTxOverlay = false;
             this.showSuccess(res);
@@ -847,7 +851,7 @@ export default {
               this.trackSwap(
                 'swapTxReceivedReceipt',
                 hash,
-                this.network.type.name
+                this.network.type.chainID
               );
             }
           })
@@ -932,7 +936,7 @@ export default {
                   this.trackSwap(
                     'swapTxReceivedReceipt',
                     hash,
-                    this.network.type.name
+                    this.network.type.chainID
                   );
                 }
               })
@@ -941,9 +945,7 @@ export default {
                   if (this.rejectedError(e.message)) {
                     this.trackSwap('swapTxRejected');
                     throw new Error(e.message);
-                  }
-
-                  if (i + 1 === this.unsignedTxArr.length) {
+                  } else {
                     this.emitSwapTxFail(e);
                   }
                 }
@@ -987,12 +989,8 @@ export default {
       );
     },
     emitSwapTxFail(err) {
-      const receipt =
-        err.hasOwnProperty('receipt') &&
-        err.receipt.hasOwnProperty('transactionHash')
-          ? err.receipt.transactionHash
-          : '0x';
-      this.trackSwap('swapTxFailed', receipt, this.network.type.name);
+      const hash = err?.receipt?.transactionHash;
+      this.trackSwap('swapTxFailed', hash, this.network.type.chainID);
     },
     btnAction() {
       if (this.isSwap) {

src/utils/web3-provider/methods/eth_sendTransaction.js

@@ -109,6 +109,7 @@ export default async ({ payload, store, requestManager }, res, next) => {
          * Checks whether confirmInfo is true
          * if true, assume transaction is a swap
          */
+        let txHash;
         EventBus.$emit(event, params, _response => {
           if (_response.rejected) {
             res(new Error('User rejected action'));
@@ -128,6 +129,7 @@ export default async ({ payload, store, requestManager }, res, next) => {
               }
             })
             .once('transactionHash', hash => {
+              txHash = hash;
               if (store.state.wallet.instance !== null) {
                 const isTesting = locStore.get('mew-testing');
                 if (!isTesting) {
@@ -154,12 +156,7 @@ export default async ({ payload, store, requestManager }, res, next) => {
             })
             .on('error', err => {
               if (confirmInfo) {
-                const receipt =
-                  err.hasOwnProperty('receipt') &&
-                  err.receipt.hasOwnProperty('transactionHash')
-                    ? err.receipt.transactionHash
-                    : '0x';
-                EventBus.$emit('swapTxFailed', receipt);
+                EventBus.$emit('swapTxFailed', txHash);
               }
               res(err);
             });
@@ -168,10 +165,7 @@ export default async ({ payload, store, requestManager }, res, next) => {
     })
     .catch(e => {
       if (confirmInfo) {
-        const receipt = e.hasOwnProperty('receipt')
-          ? e.receipt.transactionHash
-          : '0x';
-        EventBus.$emit('swapTxFailed', receipt);
+        EventBus.$emit('swapTxNotBroadcastedFailed');
       }
       res(e);
     });