update dependecies

vergecurrency · Nov 28, 2020 · 9e04c23 · 9e04c23
1 parent 8d6b518
commit 9e04c23
Show file tree

Hide file tree

Showing 11 changed files with 4,373 additions and 5,452 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -23,71 +23,72 @@
   "main": "background.js",
   "dependencies": {
     "@deadcanaries/granax": "^3.2.5",
-    "@fortawesome/fontawesome-svg-core": "^1.2.30",
-    "@fortawesome/free-solid-svg-icons": "^5.14.0",
+    "@fortawesome/fontawesome-svg-core": "^1.2.32",
+    "@fortawesome/free-solid-svg-icons": "^5.15.1",
     "@fortawesome/vue-fontawesome": "^0.1.10",
-    "axios": "^0.19.2",
+    "axios": "^0.21.0",
     "bitcore-wallet-client-xvg": "^8.1.1",
-    "buefy": "^0.9.3",
-    "bulma": "0.9.0",
+    "buefy": "^0.9.4",
+    "bulma": "0.9.1",
     "chai-as-promised": "^7.1.1",
-    "core-js": "^3.6.5",
-    "electron-log": "^4.2.4",
-    "electron-updater": "^4.3.4",
+    "core-js": "^3.8.0",
+    "electron-log": "^4.3.0",
+    "electron-updater": "^4.3.5",
     "electron-window-state": "^5.0.3",
     "keytar": "^5.6.0",
-    "moment": "^2.27.0",
+    "moment": "^2.29.1",
     "node-loader": "^0.6.0",
     "qrcode.vue": "^1.7.0",
     "sudo-prompt": "^9.2.1",
     "vue": "^2.6.12",
-    "vue-class-component": "^7.2.5",
-    "vue-i18n": "^8.21.0",
+    "vue-class-component": "^7.2.6",
+    "vue-i18n": "^8.22.2",
     "vue-property-decorator": "^8.5.1",
-    "vue-router": "^3.4.3",
-    "vuex": "^3.5.1",
+    "vue-router": "^3.4.9",
+    "vuex": "^3.6.0",
     "vuex-electron": "^1.0.3"
   },
   "devDependencies": {
     "@cypress/electron-plugin": "^1.1.0",
-    "@types/chai": "^4.2.12",
-    "@types/jest": "^25.2.3",
+    "@types/chai": "^4.2.14",
+    "@types/jest": "^26.0.15",
     "@types/mocha": "^7.0.2",
-    "@types/node": "^12.12.55",
+    "@types/node": "^12.19.7",
     "@types/sinon": "^7.5.2",
     "@typescript-eslint/eslint-plugin": "^2.34.0",
     "@typescript-eslint/parser": "^2.34.0",
-    "@vue/cli-plugin-babel": "^4.5.4",
-    "@vue/cli-plugin-e2e-cypress": "^4.5.4",
-    "@vue/cli-plugin-eslint": "^4.5.4",
-    "@vue/cli-plugin-router": "^4.5.4",
-    "@vue/cli-plugin-typescript": "^4.5.4",
-    "@vue/cli-plugin-unit-mocha": "^4.5.4",
-    "@vue/cli-plugin-vuex": "^4.5.4",
-    "@vue/cli-service": "^4.5.4",
+    "@vue/cli-plugin-babel": "^4.5.9",
+    "@vue/cli-plugin-e2e-cypress": "^4.5.9",
+    "@vue/cli-plugin-eslint": "^4.5.9",
+    "@vue/cli-plugin-router": "^4.5.9",
+    "@vue/cli-plugin-typescript": "^4.5.9",
+    "@vue/cli-plugin-unit-mocha": "^4.5.9",
+    "@vue/cli-plugin-vuex": "^4.5.9",
+    "@vue/cli-service": "^4.5.9",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^5.1.0",
-    "@vue/test-utils": "^1.0.5",
+    "@vue/test-utils": "^1.1.1",
     "babel-core": "^7.0.0-bridge.0",
     "chai": "^4.2.0",
-    "cypress": "^4.12.1",
-    "electron": "^9.3.0",
-    "electron-notarize": "^0.2.1",
+    "cypress": "^6.0.0",
+    "electron": "^9.3.5",
+    "electron-builder": "^22.9.1",
+    "electron-notarize": "^0.3.0",
     "electron-util": "^0.14.2",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint": "^7.14.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-vue": "^6.2.2",
-    "jest": "25.5.1",
-    "sass": "^1.26.10",
+    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-vue": "^7.1.0",
+    "jest": "26.6.3",
+    "sass": "^1.29.0",
     "sass-loader": "^8.0.2",
-    "sinon": "^9.0.3",
-    "ts-jest": "25.5.1",
-    "typescript": "^3.9.7",
+    "sinon": "^9.2.1",
+    "ts-jest": "26.4.4",
+    "typescript": "^4.1.2",
     "vue-cli-plugin-electron-builder": "^1.4.6",
-    "vue-jest": "^3.0.6",
+    "vue-jest": "^3.0.7",
     "vue-template-compiler": "^2.6.12"
   }
 }
diff --git a/src/views/Authentication/AuthenticationModal.vue b/src/views/Authentication/AuthenticationModal.vue
@@ -17,7 +17,7 @@
             <b-button @click="forgotPin = false" v-html="$i18n.t('settings.cancel')">Cancel</b-button>
           </div>
           <div class="column is-narrow">
-            <b-button type="is-primary" @click="$emit('resetPin')" :label="$i18n.t('unlock.resetPin')"/>
+            <b-button type="is-primary" @click="$emit('reset-pin')" :label="$i18n.t('unlock.resetPin')"/>
           </div>
         </div>
       </div>

diff --git a/src/views/Wallet/Create/Create.vue b/src/views/Wallet/Create/Create.vue
@@ -147,7 +147,7 @@ export default {
     createWallet () {
       this.confirmed = true
 
-      this.$emit('createWallet')
+      this.$emit('create-wallet')
     },
 
     showTermsOfUse () {

diff --git a/src/views/Wallet/Create/PaperKey.vue b/src/views/Wallet/Create/PaperKey.vue
@@ -74,7 +74,7 @@ import Mnemonic from 'bitcore-mnemonic'
 export default {
   name: 'PaperKey',
   props: {
-    wallet: {
+    value: {
       type: Object,
       required: true
     },
@@ -172,8 +172,10 @@ export default {
         return
       }
 
-      this.wallet.paperkey = this.paperkey.join(' ')
-
+      this.$emit('input', {
+        ...this.value,
+        paperkey: this.paperkey.join(' ')
+      })
       return this.$emit('next')
     },
 

diff --git a/src/views/Wallet/Create/PassPhrase.vue b/src/views/Wallet/Create/PassPhrase.vue
@@ -69,7 +69,7 @@ export default {
   name: 'PassPhrase',
   components: { RequirementMarker },
   props: {
-    wallet: {
+    value: {
       type: Object,
       required: true
     }
@@ -119,8 +119,10 @@ export default {
         return
       }
 
-      this.wallet.passphrase = this.passphrase
-
+      this.$emit('input', {
+        ...this.value,
+        passphrase: this.passphrase
+      })
       this.$emit('next')
     },
 

diff --git a/src/views/Wallet/Create/WalletPreferences.vue b/src/views/Wallet/Create/WalletPreferences.vue
@@ -19,13 +19,13 @@
           <b-field :label="$i18n.t('createWallet.walletName')">
             <b-input
               :placeholder="$i18n.t('createWallet.enterYourWalletName')"
-              v-model="wallet.name"
+              v-model="name"
               maxlength="15"
             />
           </b-field>
 
           <b-field :label="$i18n.t('createWallet.walletColor')">
-            <b-select v-model="wallet.color" expanded>
+            <b-select v-model="color" expanded>
               <option value="blue" selected v-html="$i18n.t('main.colors.blue')"/>
               <option value="red" v-html="$i18n.t('main.colors.red')"/>
               <option value="green" v-html="$i18n.t('main.colors.green')"/>
@@ -41,7 +41,7 @@
           <div class="box wallet-preferences__advanced__box" v-show="showAdvanced">
             <b-field v-if="!restore" :label="$i18n.t('createWallet.singleAddress')">
               <b-switch
-                v-model="wallet.singleAddress"
+                v-model="singleAddress"
               />
             </b-field>
 
@@ -50,7 +50,7 @@
                 ref="vwsApi"
                 type="url"
                 :use-html5-validation="true"
-                v-model="wallet.vwsApi"
+                v-model="vwsApi"
               />
             </b-field>
           </div>
@@ -80,11 +80,15 @@ export default {
   components: { WalletCard },
   data () {
     return {
-      showAdvanced: false
+      showAdvanced: false,
+      name: '',
+      color: 'blue',
+      singleAddress: false,
+      vwsApi: ''
     }
   },
   props: {
-    wallet: {
+    value: {
       type: Object,
       required: true
     },
@@ -94,6 +98,15 @@ export default {
     }
   },
   computed: {
+    wallet () {
+      return {
+        ...this.wallet,
+        name: this.name,
+        color: this.color,
+        singleAddress: this.singleAddress,
+        vwsApi: this.vwsApi
+      }
+    },
     nameLongEnough () {
       return this.wallet.name.length < 1 || this.wallet.name.length > 4
     },
@@ -107,12 +120,19 @@ export default {
       return this.wallet.name !== '' && this.nameLongEnough && this.nameNotTooLong && !this.nameExists
     }
   },
+  created () {
+    this.name = this.value.name
+    this.color = this.value.color
+    this.singleAddress = this.value.singleAddress
+    this.vwsApi = this.value.vwsApi
+  },
   methods: {
     proceed () {
       if (!this.preferencesAreValid) {
         return
       }
 
+      this.$emit('input', this.wallet)
       this.$emit('next')
     },
 

diff --git a/src/views/Wallet/Create/WalletSetupView.vue b/src/views/Wallet/Create/WalletSetupView.vue
@@ -15,15 +15,15 @@
         <br/>
 
         <b-step-item :label="$i18n.t('createWallet.preferences')" :clickable="false">
-          <wallet-preferences :wallet="wallet" @next="next" :restore="restore"/>
+          <wallet-preferences v-model="wallet" @next="next" :restore="restore"/>
         </b-step-item>
 
         <b-step-item :label="$i18n.t('createWallet.paperKey')" :clickable="false">
-          <paper-key :wallet="wallet" @next="next" :restore="restore"/>
+          <paper-key v-model="wallet" @next="next" :restore="restore"/>
         </b-step-item>
 
         <b-step-item :label="$i18n.t('createWallet.passPhrase')" :clickable="false">
-          <pass-phrase :wallet="wallet" @next="next"/>
+          <pass-phrase v-model="wallet" @next="next"/>
         </b-step-item>
 
         <b-step-item :label="$i18n.t('createWallet.createWallet')" :clickable="false">

diff --git a/src/views/Wallet/Send/SendForm.vue b/src/views/Wallet/Send/SendForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <form @submit.prevent="$emit('input', value)">
+  <form @submit.prevent="confirm">
 
     <div class="block">
       <h3 class="is-size-3 is-family-handwritten" v-html="$i18n.t('send.send')"/>
@@ -23,7 +23,7 @@
 <!--                    </a>-->
 <!--                  </p>-->
                   <p class="control is-expanded">
-                    <input class="input" type="text" placeholder="Recipient XVG address" v-model="value.toAddress">
+                    <input class="input" type="text" placeholder="Recipient XVG address" v-model="toAddress">
                   </p>
                 </div>
                 <div v-if="showHelp" class="help notification is-small" v-html="$i18n.t('send.recipientDetails')"/>
@@ -52,7 +52,7 @@
 <!--                    </span>-->
                   </p>
                   <p class="control is-expanded">
-                    <input class="input" type="text" placeholder="Amount you want to send" v-model="value.amount">
+                    <input class="input" type="text" placeholder="Amount you want to send" v-model="amount">
                   </p>
                   <p class="control">
                     <b-button :label="$i18n.t('send.sendMax')" @click="sendMax" :loading="loadingMax"/>
@@ -69,7 +69,7 @@
             </div>
             <div class="field-body">
               <div class="field is-expanded">
-                <input class="input" type="text" placeholder="Gift to Swen" v-model="value.message">
+                <input class="input" type="text" placeholder="Gift to Swen" v-model="message">
                 <div v-if="showHelp" class="help notification" v-html="$i18n.t('send.internalMemoDetails')"/>
               </div>
             </div>
@@ -90,7 +90,7 @@
     <div class="columns">
       <div class="column">
         <div class="buttons is-centered">
-          <a class="button is-light" v-html="$i18n.t('send.reset')"/>
+          <a class="button is-light" v-html="$i18n.t('send.reset')" @click="reset"/>
           <button type="submit" class="button is-primary" v-html="$i18n.t('send.confirm')"/>
         </div>
       </div>
@@ -118,17 +118,40 @@ export default {
     return {
       showHelp: false,
       showMemo: false,
-      loadingMax: false
+      loadingMax: false,
+      toAddress: '',
+      amount: '',
+      message: ''
     }
   },
+  created () {
+    this.toAddress = this.value.toAddress
+    this.amount = this.value.amount
+    this.message = this.value.message
+  },
   methods: {
     sendMax () {
       this.loadingMax = true
 
       this.wallet.getSendMaxInfo().then(info => {
-        this.value.amount = info.amount / constants.satoshiDivider
+        this.amount = info.amount / constants.satoshiDivider
         this.loadingMax = false
       })
+    },
+
+    confirm () {
+      this.$emit('input', {
+        ...this.value,
+        toAddress: this.toAddress,
+        amount: this.amount,
+        message: this.message
+      })
+    },
+
+    reset () {
+      this.toAddress = ''
+      this.amount = 0
+      this.message = ''
     }
   }
 }