Clean up PR build

MyEtherWallet · Oct 8, 2020 · 1c572ed · 1c572ed · mew-bot · Oct 8, 2020
1 parent abb71d2
commit 1c572ed
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 29 deletions.
diff --git a/src/dapps/Unstoppable/containers/ClaimPendingContainer/ClaimPendingContainer.vue b/src/dapps/Unstoppable/containers/ClaimPendingContainer/ClaimPendingContainer.vue
@@ -4,7 +4,7 @@
       <h3>
         {{ $t('unstoppable.transfer-pending') }}
       </h3>
-      <h5 v-for="domain in domains" class="middle-copy">
+      <h5 v-for="domain in domains" :key="domain.name" class="middle-copy">
         <b>{{ domain.name }}</b>
         {{
           domain.status !== 'MINED'
@@ -75,20 +75,6 @@ export default {
       this.$router.push('/interface/dapps/unstoppable');
     }
   },
-  methods: {
-    etherscanLink(txHash) {
-      return 'https://etherscan.io/tx/' + txHash;
-    },
-    translateStatus(status) {
-      if (status === 'MINED') {
-        return 'unstoppable.confirmed';
-      }
-      if (status === 'PENDING') {
-        return 'unstoppable.pending';
-      }
-      return 'unstoppable.failed';
-    }
-  },
   mounted() {
     this.interval = setInterval(() => {
       fetch(
@@ -134,6 +120,20 @@ export default {
     if (this.interval) {
       clearInterval(this.interval);
     }
+  },
+  methods: {
+    etherscanLink(txHash) {
+      return 'https://etherscan.io/tx/' + txHash;
+    },
+    translateStatus(status) {
+      if (status === 'MINED') {
+        return 'unstoppable.confirmed';
+      }
+      if (status === 'PENDING') {
+        return 'unstoppable.pending';
+      }
+      return 'unstoppable.failed';
+    }
   }
 };
 </script>

diff --git a/src/dapps/Unstoppable/containers/CompletedContainer/CompletedContainer.vue b/src/dapps/Unstoppable/containers/CompletedContainer/CompletedContainer.vue
@@ -10,7 +10,11 @@
       </h3>
       <h5 class="middle-copy">
         {{ $t('unstoppable.following-been-claimed') }}:
-        <h4 v-for="domain of domainsClaimed" class="domain-container">
+        <h4
+          v-for="domain of domainsClaimed"
+          :key="`${domain.label}.${domain.extension}`"
+          class="domain-container"
+        >
           {{ domain.label + '.' + domain.extension }}
         </h4>
       </h5>
@@ -38,7 +42,9 @@ export default {
   props: {
     domainsClaimed: {
       type: Array,
-      default: ''
+      default: () => {
+        return [];
+      }
     },
     account: {
       type: Object,

diff --git a/src/dapps/Unstoppable/containers/ConfirmContainer/ConfirmContainer.vue b/src/dapps/Unstoppable/containers/ConfirmContainer/ConfirmContainer.vue
@@ -3,7 +3,10 @@
     <div class="confirm-container">
       <div class="domain-header">
         <div class="items-container">
-          <h4 v-for="cartItem of cart">
+          <h4
+            v-for="cartItem of cart"
+            :key="`${cartItem.label}.${cartItem.extension}`"
+          >
             {{ cartItem.label + '.' + cartItem.extension }} - ${{
               cartItem.price
             }}
@@ -54,7 +57,9 @@ export default {
   props: {
     cart: {
       type: Array,
-      default: []
+      default: () => {
+        return [];
+      }
     },
     account: {
       type: Object,

diff --git a/src/dapps/Unstoppable/containers/CryptoContainer/CryptoContainer.vue b/src/dapps/Unstoppable/containers/CryptoContainer/CryptoContainer.vue
@@ -3,7 +3,10 @@
     <div class="crypto-container">
       <div class="domain-header">
         <div class="items-container">
-          <h4 v-for="cartItem of cart">
+          <h4
+            v-for="cartItem of cart"
+            :key="`${cartItem.label}.${cartItem.extension}`"
+          >
             {{ cartItem.label + '.' + cartItem.extension }} - ${{
               cartItem.price
             }}
@@ -166,7 +169,9 @@ export default {
   props: {
     cart: {
       type: Array,
-      default: []
+      default: () => {
+        return [];
+      }
     },
     email: {
       type: String,

diff --git a/...toppable/containers/InitialUnstoppableStateContainer/InitialUnstoppableStateContainer.vue b/...toppable/containers/InitialUnstoppableStateContainer/InitialUnstoppableStateContainer.vue
@@ -57,7 +57,11 @@
           <span class="bold">{{ $t('unstoppable.cart') }}:</span>
           {{ cart.length }} {{ $t('unstoppable.items') }}
         </div>
-        <div v-for="cartItem of cart" class="cart-items-container">
+        <div
+          v-for="cartItem of cart"
+          :key="`${cartItem.label}.${cartItem.extension}`"
+          class="cart-items-container"
+        >
           <div class="cart-item-row">
             <span
               >{{ cartItem.label }}.{{ cartItem.extension }} - ${{
@@ -173,7 +177,9 @@ export default {
     },
     searchResults: {
       type: Array,
-      default: []
+      default: () => {
+        return [];
+      }
     },
     loading: {
       type: Boolean,
@@ -189,7 +195,9 @@ export default {
     },
     cart: {
       type: Array,
-      default: []
+      default: () => {
+        return [];
+      }
     },
     searchErr: {
       type: Boolean,

diff --git a/src/dapps/Unstoppable/containers/StripeContainer/StripeContainer.vue b/src/dapps/Unstoppable/containers/StripeContainer/StripeContainer.vue
@@ -3,7 +3,10 @@
     <div class="stripe-container">
       <div class="domain-header">
         <div class="items-container">
-          <h4 v-for="cartItem of cart">
+          <h4
+            v-for="cartItem of cart"
+            :key="cartItem.label + '.' + cartItem.extension"
+          >
             {{ cartItem.label + '.' + cartItem.extension }} - ${{
               cartItem.price
             }}
@@ -85,7 +88,9 @@ export default {
   props: {
     cart: {
       type: Array,
-      default: []
+      default: () => {
+        return [];
+      }
     },
     setTokenId: { type: Function, default: function () {} }
   },

diff --git a/src/layouts/ExtensionBrowserAction/components/AddWalletModal/AddWalletModal.vue b/src/layouts/ExtensionBrowserAction/components/AddWalletModal/AddWalletModal.vue
@@ -350,7 +350,7 @@
           <a
             ref="downloadLink"
             :href="downloadFile"
-            :download="walletName"
+            :download="downloadName !== '' ? downloadName : walletName"
             rel="noopener noreferrer"
           ></a>
         </div>
@@ -473,7 +473,8 @@ export default {
       showPaths: false,
       accounts: [],
       currentIndex: 0,
-      downloadFile: ''
+      downloadFile: '',
+      downloadName: ''
     };
   },
   computed: {
@@ -937,6 +938,7 @@ export default {
         const blob = createBlob(e.data.walletJson, 'mime');
         this.downloadFile = blob;
         this.file = e.data.walletJson;
+        this.downloadName = e.data.name;
         this.backupWallet();
         ExtensionHelpers.addWalletToStore(
           `0x${e.data.walletJson.address}`,

diff --git a/src/layouts/ExtensionBrowserAction/components/CxHeader/CxHeader.scss b/src/layouts/ExtensionBrowserAction/components/CxHeader/CxHeader.scss
@@ -158,7 +158,6 @@ a {
   max-height: 0;
 }
 
-
 .notification-menu-container {
   margin: 0 30px;
   display: flex;