Merge pull request #57 from MyEtherWallet/feature/additional-hw-wallets

Feature/additional hw wallets
MyEtherWallet · Aug 30, 2018 · a2424b7 · a2424b7 · mew-bot · Aug 30, 2018
2 parents cf415b6 + 4861706
commit a2424b7
Show file tree

Hide file tree

Showing 88 changed files with 32,128 additions and 946 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,8 @@
   "dependencies": {
     "vue": "^2.5.17",
     "vue-router": "^3.0.1",
-    "vuex": "^3.0.1"
+    "vuex": "^3.0.1",
+    "websocket": "^1.0.26"
   },
   "devDependencies": {
     "@ledgerhq/hw-app-eth": "^4.21.0",

diff --git a/src/App.vue b/src/App.vue
@@ -45,6 +45,8 @@ export default {
     const state = {
       web3: newWeb3,
       network: network,
+      customPaths:
+        store.get('customPaths') !== undefined ? store.get('customPaths') : {},
       wallet: null,
       account: {
         balance: 0

diff --git a/src/components/FaqContents/HowToBuyEthereumWithUSD.vue b/src/components/FaqContents/HowToBuyEthereumWithUSD.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <h1 
-      id="articleTitleGUIDEHowtobuyEthereumETHwithUSD" 
-      class="page__title" 
+    <h1
+      id="articleTitleGUIDEHowtobuyEthereumETHwithUSD"
+      class="page__title"
       itemprop="headline">[GUIDE] How to buy Ethereum (ETH) with USD</h1>
     <div class="content">
       <h3 id="hello-and-welcome-to-ethereum-">Hello and welcome to Ethereum!</h3>
@@ -118,17 +118,17 @@
 
     <div class="row">
       <p class="col">
-        <a 
-          href="https://github.com/MyEtherWallet/knowledge-base/blob/master/src/content/faq/how-to-buy-ethereum-with-usd.md" 
-          target="_blank" 
+        <a
+          href="https://github.com/MyEtherWallet/knowledge-base/blob/master/src/content/faq/how-to-buy-ethereum-with-usd.md"
+          target="_blank"
           rel="noopener noreferrer">
           Found a typo? Want to improve this article? <br> It's easy!
         </a>
       </p>
       <p class="col">
-        <a 
-          href="https://kb.myetherwallet.com/diving-deeper/how-to-submit-pull-request.html" 
-          target="_blank" 
+        <a
+          href="https://kb.myetherwallet.com/diving-deeper/how-to-submit-pull-request.html"
+          target="_blank"
           rel="noopener noreferrer">
           Don't know how to submit a pull request? <br> It's also easy!
         </a>

diff --git a/src/components/Notification/Notification.vue b/src/components/Notification/Notification.vue
@@ -17,9 +17,12 @@
       class="bootstrap-modal-wide nopadding"
       @show="countUnread">
       <template slot="modal-title">
-        <h5 class="modal-title"> {{ unreadCount > 1 ? 'Notifications':'Notification' }} <div
-          v-show="unreadCount > 0"
-          class="notification-count"><span>{{ unreadCount }}</span></div></h5>
+        <h5 class="modal-title"> {{ unreadCount > 1 ? 'Notifications':'Notification' }}
+          <div
+            v-show="unreadCount > 0"
+            class="notification-count"><span>{{ unreadCount }}</span>
+          </div>
+        </h5>
       </template>
       <div class="notification-item-container">
         <div v-if="sortedNotifications !== undefined && sortedNotifications.length > 0">
@@ -64,6 +67,9 @@ export default {
     }),
     sortedNotifications() {
       this.countUnread();
+
+      if (!this.notifications[this.$store.state.wallet.getAddressString()])
+        return [];
       // eslint-disable-next-line
       return this.notifications[this.$store.state.wallet.getAddressString()].sort((a, b) => {
         a = new Date(a.timestamp);
@@ -111,7 +117,6 @@ export default {
       this.$refs.notification.show();
     },
     expand(idx, notif) {
-      // e.target.nextElementSibling.classList.contains('unexpanded') ? e.target.nextElementSibling.classList.remove('unexpanded') : e.target.nextElementSibling.classList.add('unexpanded')
       const updatedNotif = notif;
       if (notif.expanded !== true) {
         updatedNotif.read = true;

diff --git a/src/containers/ConfirmationContainer/ConfirmationContainer.vue b/src/containers/ConfirmationContainer/ConfirmationContainer.vue
@@ -3,7 +3,19 @@
     <confirm-modal
       ref="confirmModal"
       :confirm-send-tx="sendTx"
-      :show-success="showSuccessModal"
+      :signed-tx="signedTx"
+      :fee="transactionFee"
+      :is-hardware-wallet="isHardwareWallet"
+      :gas-price="$store.state.gasPrice"
+      :from="fromAddress"
+      :to="toAddress"
+      :value="amount"
+      :gas="gasLimit"
+      :data="data"
+      :nonce="nonce + 1"/>
+    <confirm-modal
+      ref="offlineGenerateConfirmModal"
+      :confirm-send-tx="generateTx"
       :signed-tx="signedTx"
       :fee="transactionFee"
       :is-hardware-wallet="isHardwareWallet"
@@ -41,6 +53,18 @@ export default {
     'success-modal': SuccessModal,
     'confirm-sign-modal': ConfirmSignModal
   },
+  props: {
+    active: {
+      type: Boolean,
+      default: false
+    },
+    rawTx: {
+      type: Object,
+      default: function() {
+        return {};
+      }
+    }
+  },
   data() {
     return {
       isHardwareWallet: false,
@@ -64,6 +88,7 @@ export default {
       messageToSign: '',
       signedMessage: '',
       successMessage: '',
+      linkMessage: 'OK',
       dismissed: true
     };
   },
@@ -75,18 +100,35 @@ export default {
     }
   },
   created() {
-    this.$eventHub.$on('showSuccessModal', message => {
+    this.$eventHub.$on('showSuccessModal', (message, linkMessage) => {
       if (!message) message = null;
-      this.showSuccessModal(message);
+      this.showSuccessModal(message, linkMessage);
     });
 
+    this.$eventHub.$on(
+      'showConfirmModal',
+      (tx, isHardware, signer, resolve) => {
+        this.parseRawTx(tx);
+        this.isHardwareWallet = isHardware;
+        this.responseFunction = resolve;
+        this.successMessage = 'Sending Transaction';
+        // this.signer = signer(tx)
+        signer(tx).then(_response => {
+          this.signedTxObject = _response;
+          this.signedTx = this.signedTxObject.rawTransaction;
+        });
+        this.confirmationModalOpen();
+      }
+    );
+
     this.$eventHub.$on(
       'showTxConfirmModal',
       (tx, isHardware, signer, resolve) => {
         this.parseRawTx(tx);
         this.isHardwareWallet = isHardware;
         this.responseFunction = resolve;
         this.successMessage = 'Sending Transaction';
+        // this.signer = signer(tx)
         signer(tx).then(_response => {
           this.signedTxObject = _response;
           this.signedTx = this.signedTxObject.rawTransaction;
@@ -103,52 +145,62 @@ export default {
         signer(data).then(_response => {
           this.signedMessage = _response;
         });
+        // this.signer = signer(data)
         this.signConfirmationModalOpen();
       }
     );
-
-    this.$eventHub.$on('checkConnection', () => {
-      this.hardwareConnectCheck();
-    });
-
-    this.$on('bv::modal::hide', () => {
+  },
+  mounted() {
+    this.$refs.confirmModal.$refs.confirmation.$on('hidden', () => {
       if (this.dismissed) {
         this.reset();
       }
     });
+
+    this.$refs.successModal.$refs.success.$on('hide', () => {
+      this.successMessage = '';
+      this.linkMessage = 'OK';
+    });
   },
   methods: {
-    hardwareConnectCheck() {},
     confirmationModalOpen() {
       window.scrollTo(0, 0);
       this.$refs.confirmModal.$refs.confirmation.show();
     },
+    confirmationOfflineGenerateModalOpen() {
+      window.scrollTo(0, 0);
+      this.$refs.offlineGenerateConfirmModal.$refs.confirmation.show();
+    },
     signConfirmationModalOpen() {
       window.scrollTo(0, 0);
       this.$refs.signConfirmModal.$refs.signConfirmation.show();
     },
-    showSuccessModal(message) {
-      this.$refs.successModal.$refs.success.$on('hide', () => {
-        this.successMessage = '';
-      });
+    showSuccessModal(message, linkMessage) {
       this.reset();
       if (message !== null) this.successMessage = message;
+      if (linkMessage !== null) this.linkMessage = linkMessage;
       this.$refs.successModal.$refs.success.show();
     },
     parseRawTx(tx) {
       this.raw = tx;
-      this.nonce = tx.nonce;
+      this.nonce = +tx.nonce;
       this.data = tx.data;
-      this.gasLimit = tx.gas;
+      this.gasLimit = +tx.gas;
       this.toAddress = tx.to;
-      this.amount = tx.value;
+      this.amount = +tx.value;
+      // this.signedTx = this.signedTxObject.rawTransaction
     },
     messageReturn() {
       this.dismissed = false;
       this.responseFunction(this.signedMessage);
       this.$refs.signConfirmModal.$refs.signConfirmation.hide();
       this.showSuccessModal();
     },
+    generateTx() {
+      this.dismissed = false;
+      this.responseFunction(this.signedTxObject);
+      this.$refs.confirmModal.$refs.confirmation.hide();
+    },
     sendTx() {
       this.dismissed = false;
       this.responseFunction(this.signedTxObject);

diff --git a/src/containers/ConfirmationContainer/components/ConfirmSignModal/ConfirmSignModal.vue b/src/containers/ConfirmationContainer/components/ConfirmSignModal/ConfirmSignModal.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="modal-container">
-    <b-modal 
-      ref="signConfirmation" 
-      hide-footer 
+    <b-modal
+      ref="signConfirmation"
+      hide-footer
       centered
-      class="bootstrap-modal-wide confirmation-modal nopadding" 
+      class="bootstrap-modal-wide confirmation-modal nopadding"
       title="Confirmation">
       <div class="modal-content qrcode-modal">
         <div class="tx-info">
@@ -33,25 +33,25 @@
             <div class="button-with-helper">
               <div
                 ref="ConfirmAndSendButton"
-                :class="[signedMessage !== ''? '': 'disabled','submit-button large-round-button-green-filled clickable']" 
+                :class="[signedMessage !== ''? '': 'disabled','submit-button large-round-button-green-filled clickable']"
                 @click="signMessage">
                 Confirm Signing
               </div>
               <div class="tooltip-box-2">
                 <b-btn id="exPopover9">
-                  <img 
-                    class="icon" 
+                  <img
+                    class="icon"
                     src="~@/assets/images/icons/qr-code.svg">
                 </b-btn>
-                <b-popover 
-                  target="exPopover9" 
-                  triggers="hover focus" 
+                <b-popover
+                  target="exPopover9"
+                  triggers="hover focus"
                   placement="top">
                   <div class="qrcode-contents">
                     <p class="qrcode-title">Scan QR code to send/swap instantly</p>
                     <div class="qrcode-block">
-                      <qrcode 
-                        :options="{ size: 100 }" 
+                      <qrcode
+                        :options="{ size: 100 }"
                         value="Hello, World!"/>
                     </div>
                     <p class="qrcode-helper">What is that?</p>

diff --git a/src/containers/ConfirmationContainer/components/SuccessModal/SuccessModal.vue b/src/containers/ConfirmationContainer/components/SuccessModal/SuccessModal.vue
@@ -43,8 +43,8 @@ export default {
   },
   methods: {
     hideModal() {
-      if (this.linkTo !== undefined) {
-        this.$router(this.linkTo);
+      if (this.linkTo !== '/') {
+        this.$router.push({ path: this.linkTo });
       }
       this.$refs.success.hide();
     }

diff --git a/src/containers/FooterContainer/FooterContainer.vue b/src/containers/FooterContainer/FooterContainer.vue
@@ -25,15 +25,15 @@
               </p>
             </div>
             <div class="content-links mobile-hide">
-              <div 
-                v-for="(content, index) in item.contents" 
+              <div
+                v-for="(content, index) in item.contents"
                 :key="content.text+index">
-                <router-link 
-                  v-if="content.to !== undefined" 
+                <router-link
+                  v-if="content.to !== undefined"
                   :to="content.to"><p>{{ content.text }}</p></router-link>
-                <a 
-                  v-if="content.to === undefined" 
-                  :href="content.href" 
+                <a
+                  v-if="content.to === undefined"
+                  :href="content.href"
                   target="_blank"><p>{{ content.text }}</p></a>
               </div>
             </div>
@@ -49,22 +49,22 @@
             <div class="content-links">
               <p>{{ $t("footer.welcomeDes") }}</p>
 
-              <a 
-                href="https://etherscan.io/address/0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D" 
+              <a
+                href="https://etherscan.io/address/0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D"
                 target="_blank">
-                <p 
-                  class="crypto-link" 
+                <p
+                  class="crypto-link"
                   data-eth="0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D">
                   <img src="~@/assets/images/icons/eth.svg">
                   &nbsp;Ethereum Donation
                 </p>
               </a>
 
-              <a 
-                href="https://blockchain.info/address/1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9" 
+              <a
+                href="https://blockchain.info/address/1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9"
                 target="_blank">
-                <p 
-                  class="crypto-link" 
+                <p
+                  class="crypto-link"
                   data-btc="1DECAF2uSpFTP4L1fAHR8GCLrPqdwdLse9">
                   <img src="~@/assets/images/icons/btc.svg">
                   &nbsp;Bitcoin Donation

diff --git a/src/containers/HeaderContainer/HeaderContainer.vue b/src/containers/HeaderContainer/HeaderContainer.vue
@@ -167,8 +167,6 @@ export default {
     }
   },
   mounted() {
-    const self = this;
-
     if (this.$store.state.online) {
       this.online = true;
     } else {
@@ -188,12 +186,12 @@ export default {
     )[0].name;
 
     // On load, if page is not on top, apply small menu and show scroll top button
-    this.onPageScroll();
+    // this.onPageScroll();
 
     // On scroll,  if page is not on top, apply small menu and show scroll top button
-    window.onscroll = function() {
-      self.onPageScroll();
-    };
+    // window.onscroll = function() {
+    //   self.onPageScroll();
+    // };
   },
   methods: {
     languageItemClicked(e) {