Merge pull request MyEtherWallet#2396 from MyEtherWallet/bug/sentry-f…

…ixes/jess

Bug/sentry fixes/jess

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Bug
 
-
+- Sentry fixes j [#2396](https://github.com/MyEtherWallet/MyEtherWallet/pull/2396)
 - Fix address not getting returned for unable to validate addresses and disable swap when recalculating rates[#2397](https://github.com/MyEtherWallet/MyEtherWallet/pull/2397)
 - Fix errors from sentry [#2393](https://github.com/MyEtherWallet/MyEtherWallet/pull/2393)
 - Fix perkle network connection [#2389](https://github.com/MyEtherWallet/MyEtherWallet/pull/2389)

package-test.js

@@ -23,7 +23,13 @@ const EXCEPTIONS = [
   '@vue/test-utils',
   'graphql',
   '@myetherwallet/eth-token-balance',
-  '@makerdao/dai'
+  '@makerdao/dai',
+  'bootstrap-vue',
+  'web3',
+  'web3-core-helpers',
+  'web3-core-method',
+  'web3-core-requestmanager',
+  'web3-utils'
 ];
 const CUSTOM_DIST = {
   ['babel-core']: 'bridge'

src/dapps/Aave/Aave.scss

@@ -6,6 +6,10 @@
   grid-area: main;
   overflow: hidden;
 
+  .back-btn {
+    display: block;
+  }
+
   .header-container {
     border-bottom: 2px solid $light-grey-1;
   }

src/dapps/Aave/Aave.vue

@@ -17,6 +17,7 @@
         </div>
         <back-button
           v-if="$route.fullPath !== '/interface/dapps/aave/action'"
+          class="back-btn"
           :title="$t('common.exit-dapp')"
           :hide-border="true"
         />

src/dapps/Aave/components/ConfirmationModal/ConfirmationModal.scss

@@ -87,6 +87,10 @@
   }
 }
 
+.divider {
+  margin-bottom: 2.5rem;
+}
+
 .btn-container {
   text-align: center;
   button {

src/dapps/Aave/components/ConfirmationModal/ConfirmationModal.vue

@@ -122,7 +122,7 @@
               <p class="mt-4">{{ rateType }}</p>
             </div>
           </div>
-          <hr class="mt-4 mb-4" />
+          <hr class="mt-4 divider" />
           <div class="btn-container">
             <p v-if="isDisabled() && errorMsg" class="error-msg">
               {{ errorMsg }}

src/dapps/Aave/containers/ActionContainer/ActionContainer.vue

@@ -12,16 +12,16 @@
         <p class="token-balance">
           {{
             activeDepositTab
-              ? convertToFixed(token.user.principalATokenBalance)
-              : convertToFixed(token.user.currentBorrows)
+              ? convertToFixed(userToken.principalATokenBalance)
+              : convertToFixed(userToken.currentBorrows)
           }}
           <span class="token-name"> {{ token.symbol }} </span>
         </p>
         <p class="usd-amt">
           ${{
             activeDepositTab
-              ? convertToFixed(token.user.currentUnderlyingBalanceUSD)
-              : convertToFixed(token.user.currentBorrowsUSD)
+              ? convertToFixed(userToken.currentUnderlyingBalanceUSD)
+              : convertToFixed(userToken.currentBorrowsUSD)
           }}
         </p>
       </div>
@@ -160,6 +160,7 @@ export default {
       amount: null,
       ethPrice: 0,
       disableBtn: false,
+      userToken: {},
       token: { user: {}, price: {} },
       actionType: null,
       percentBtns: {
@@ -196,9 +197,9 @@ export default {
           this.token.price.priceInEth
         );
       } else if (this.actionTitle === this.actionTitles.repay) {
-        return this.token.user.currentBorrows;
+        return this.userToken.currentBorrows;
       } else if (this.actionTitle === this.actionTitles.withdraw) {
-        return this.token.user.principalATokenBalance;
+        return this.userToken.principalATokenBalance;
       }
       return false;
     }
@@ -210,7 +211,7 @@ export default {
           amount: this.convertToFixed(this.amountToCheck)
         });
       } else if (
-        this.amount === this.token.user.currentBorrows &&
+        this.amount === this.userToken.currentBorrows &&
         this.amount > this.token.tokenBalance
       ) {
         this.errorMsg = this.$t('dappsAave.cannot-exceed-tkn-bal', {
@@ -231,6 +232,8 @@ export default {
     if (this.online) {
       this.getEthPrice();
     }
+
+    this.userToken = this.token.user ? this.token.user : {};
   },
   methods: {
     ...mapActions('aave', ['setToken']),

src/dapps/ManageENS/containers/ManageENSContainer/ManageENSContainer.vue

@@ -365,9 +365,9 @@ export default {
           this.txtRecordInputs[type] !== '' &&
           !this.txtValidators[type](this.txtRecordInputs[type])
         )
-          return false;
+          return true;
       }
-      return true;
+      return false;
     }
   },
   watch: {

src/dapps/ManageENS/supportedTxt.js

@@ -11,6 +11,7 @@ const isUrl = function (input) {
 };
 
 const isEmail = function (input) {
+  if (!input) return;
   const atIndex = input.indexOf('@');
   const parsedEmailName = normalise(input.substr(0, atIndex));
   const parsedEmailHost = normalise(input.substr(atIndex + 1, input.length));
@@ -27,6 +28,7 @@ const isString = function (input) {
 };
 
 const isHandle = function (input) {
+  if (!input) return;
   const atIndex = input.indexOf('@');
   const parsedInput = normalise(input.substr(atIndex + 1, input.length));
   if (!isString(parsedInput)) return false;

src/layouts/InterfaceLayout/containers/InteractWithContractContainer/InteractWithContractContainer.vue

@@ -435,7 +435,8 @@ export default {
       switch (direction) {
         case 'forward':
           if (this.abi !== '') {
-            JSON.parse(this.abi).forEach(item => {
+            const jsonAbi = JSON.parse(this.abi) ? JSON.parse(this.abi) : [];
+            jsonAbi.forEach(item => {
               if (item.type !== 'constructor' && item.constant !== undefined) {
                 this.contractMethods.push(item);
               }