Skip to content

Commit 9e04c23

Browse files
SwenVanZantenSwenVanZanten
committed
update dependecies
1 parent 8d6b518 commit 9e04c23

11 files changed

Lines changed: 4373 additions & 5452 deletions

File tree

‎npm-shrinkwrap.json‎

Lines changed: 4233 additions & 5385 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -23,71 +23,72 @@
2323
"main": "background.js",
2424
"dependencies": {
2525
"@deadcanaries/granax": "^3.2.5",
26-
"@fortawesome/fontawesome-svg-core": "^1.2.30",
27-
"@fortawesome/free-solid-svg-icons": "^5.14.0",
26+
"@fortawesome/fontawesome-svg-core": "^1.2.32",
27+
"@fortawesome/free-solid-svg-icons": "^5.15.1",
2828
"@fortawesome/vue-fontawesome": "^0.1.10",
29-
"axios": "^0.19.2",
29+
"axios": "^0.21.0",
3030
"bitcore-wallet-client-xvg": "^8.1.1",
31-
"buefy": "^0.9.3",
32-
"bulma": "0.9.0",
31+
"buefy": "^0.9.4",
32+
"bulma": "0.9.1",
3333
"chai-as-promised": "^7.1.1",
34-
"core-js": "^3.6.5",
35-
"electron-log": "^4.2.4",
36-
"electron-updater": "^4.3.4",
34+
"core-js": "^3.8.0",
35+
"electron-log": "^4.3.0",
36+
"electron-updater": "^4.3.5",
3737
"electron-window-state": "^5.0.3",
3838
"keytar": "^5.6.0",
39-
"moment": "^2.27.0",
39+
"moment": "^2.29.1",
4040
"node-loader": "^0.6.0",
4141
"qrcode.vue": "^1.7.0",
4242
"sudo-prompt": "^9.2.1",
4343
"vue": "^2.6.12",
44-
"vue-class-component": "^7.2.5",
45-
"vue-i18n": "^8.21.0",
44+
"vue-class-component": "^7.2.6",
45+
"vue-i18n": "^8.22.2",
4646
"vue-property-decorator": "^8.5.1",
47-
"vue-router": "^3.4.3",
48-
"vuex": "^3.5.1",
47+
"vue-router": "^3.4.9",
48+
"vuex": "^3.6.0",
4949
"vuex-electron": "^1.0.3"
5050
},
5151
"devDependencies": {
5252
"@cypress/electron-plugin": "^1.1.0",
53-
"@types/chai": "^4.2.12",
54-
"@types/jest": "^25.2.3",
53+
"@types/chai": "^4.2.14",
54+
"@types/jest": "^26.0.15",
5555
"@types/mocha": "^7.0.2",
56-
"@types/node": "^12.12.55",
56+
"@types/node": "^12.19.7",
5757
"@types/sinon": "^7.5.2",
5858
"@typescript-eslint/eslint-plugin": "^2.34.0",
5959
"@typescript-eslint/parser": "^2.34.0",
60-
"@vue/cli-plugin-babel": "^4.5.4",
61-
"@vue/cli-plugin-e2e-cypress": "^4.5.4",
62-
"@vue/cli-plugin-eslint": "^4.5.4",
63-
"@vue/cli-plugin-router": "^4.5.4",
64-
"@vue/cli-plugin-typescript": "^4.5.4",
65-
"@vue/cli-plugin-unit-mocha": "^4.5.4",
66-
"@vue/cli-plugin-vuex": "^4.5.4",
67-
"@vue/cli-service": "^4.5.4",
60+
"@vue/cli-plugin-babel": "^4.5.9",
61+
"@vue/cli-plugin-e2e-cypress": "^4.5.9",
62+
"@vue/cli-plugin-eslint": "^4.5.9",
63+
"@vue/cli-plugin-router": "^4.5.9",
64+
"@vue/cli-plugin-typescript": "^4.5.9",
65+
"@vue/cli-plugin-unit-mocha": "^4.5.9",
66+
"@vue/cli-plugin-vuex": "^4.5.9",
67+
"@vue/cli-service": "^4.5.9",
6868
"@vue/eslint-config-standard": "^5.1.2",
6969
"@vue/eslint-config-typescript": "^5.1.0",
70-
"@vue/test-utils": "^1.0.5",
70+
"@vue/test-utils": "^1.1.1",
7171
"babel-core": "^7.0.0-bridge.0",
7272
"chai": "^4.2.0",
73-
"cypress": "^4.12.1",
74-
"electron": "^9.3.0",
75-
"electron-notarize": "^0.2.1",
73+
"cypress": "^6.0.0",
74+
"electron": "^9.3.5",
75+
"electron-builder": "^22.9.1",
76+
"electron-notarize": "^0.3.0",
7677
"electron-util": "^0.14.2",
77-
"eslint": "^6.8.0",
78-
"eslint-plugin-import": "^2.22.0",
78+
"eslint": "^7.14.0",
79+
"eslint-plugin-import": "^2.22.1",
7980
"eslint-plugin-node": "^11.1.0",
8081
"eslint-plugin-promise": "^4.2.1",
81-
"eslint-plugin-standard": "^4.0.1",
82-
"eslint-plugin-vue": "^6.2.2",
83-
"jest": "25.5.1",
84-
"sass": "^1.26.10",
82+
"eslint-plugin-standard": "^5.0.0",
83+
"eslint-plugin-vue": "^7.1.0",
84+
"jest": "26.6.3",
85+
"sass": "^1.29.0",
8586
"sass-loader": "^8.0.2",
86-
"sinon": "^9.0.3",
87-
"ts-jest": "25.5.1",
88-
"typescript": "^3.9.7",
87+
"sinon": "^9.2.1",
88+
"ts-jest": "26.4.4",
89+
"typescript": "^4.1.2",
8990
"vue-cli-plugin-electron-builder": "^1.4.6",
90-
"vue-jest": "^3.0.6",
91+
"vue-jest": "^3.0.7",
9192
"vue-template-compiler": "^2.6.12"
9293
}
9394
}

‎src/views/Authentication/AuthenticationModal.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<b-button @click="forgotPin = false" v-html="$i18n.t('settings.cancel')">Cancel</b-button>
1818
</div>
1919
<div class="column is-narrow">
20-
<b-button type="is-primary" @click="$emit('resetPin')" :label="$i18n.t('unlock.resetPin')"/>
20+
<b-button type="is-primary" @click="$emit('reset-pin')" :label="$i18n.t('unlock.resetPin')"/>
2121
</div>
2222
</div>
2323
</div>

‎src/views/Wallet/Create/Create.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ export default {
147147
createWallet () {
148148
this.confirmed = true
149149
150-
this.$emit('createWallet')
150+
this.$emit('create-wallet')
151151
},
152152
153153
showTermsOfUse () {

‎src/views/Wallet/Create/PaperKey.vue‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ import Mnemonic from 'bitcore-mnemonic'
7474
export default {
7575
name: 'PaperKey',
7676
props: {
77-
wallet: {
77+
value: {
7878
type: Object,
7979
required: true
8080
},
@@ -172,8 +172,10 @@ export default {
172172
return
173173
}
174174
175-
this.wallet.paperkey = this.paperkey.join(' ')
176-
175+
this.$emit('input', {
176+
...this.value,
177+
paperkey: this.paperkey.join(' ')
178+
})
177179
return this.$emit('next')
178180
},
179181

‎src/views/Wallet/Create/PassPhrase.vue‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default {
6969
name: 'PassPhrase',
7070
components: { RequirementMarker },
7171
props: {
72-
wallet: {
72+
value: {
7373
type: Object,
7474
required: true
7575
}
@@ -119,8 +119,10 @@ export default {
119119
return
120120
}
121121
122-
this.wallet.passphrase = this.passphrase
123-
122+
this.$emit('input', {
123+
...this.value,
124+
passphrase: this.passphrase
125+
})
124126
this.$emit('next')
125127
},
126128

‎src/views/Wallet/Create/WalletPreferences.vue‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
<b-field :label="$i18n.t('createWallet.walletName')">
2020
<b-input
2121
:placeholder="$i18n.t('createWallet.enterYourWalletName')"
22-
v-model="wallet.name"
22+
v-model="name"
2323
maxlength="15"
2424
/>
2525
</b-field>
2626

2727
<b-field :label="$i18n.t('createWallet.walletColor')">
28-
<b-select v-model="wallet.color" expanded>
28+
<b-select v-model="color" expanded>
2929
<option value="blue" selected v-html="$i18n.t('main.colors.blue')"/>
3030
<option value="red" v-html="$i18n.t('main.colors.red')"/>
3131
<option value="green" v-html="$i18n.t('main.colors.green')"/>
@@ -41,7 +41,7 @@
4141
<div class="box wallet-preferences__advanced__box" v-show="showAdvanced">
4242
<b-field v-if="!restore" :label="$i18n.t('createWallet.singleAddress')">
4343
<b-switch
44-
v-model="wallet.singleAddress"
44+
v-model="singleAddress"
4545
/>
4646
</b-field>
4747

@@ -50,7 +50,7 @@
5050
ref="vwsApi"
5151
type="url"
5252
:use-html5-validation="true"
53-
v-model="wallet.vwsApi"
53+
v-model="vwsApi"
5454
/>
5555
</b-field>
5656
</div>
@@ -80,11 +80,15 @@ export default {
8080
components: { WalletCard },
8181
data () {
8282
return {
83-
showAdvanced: false
83+
showAdvanced: false,
84+
name: '',
85+
color: 'blue',
86+
singleAddress: false,
87+
vwsApi: ''
8488
}
8589
},
8690
props: {
87-
wallet: {
91+
value: {
8892
type: Object,
8993
required: true
9094
},
@@ -94,6 +98,15 @@ export default {
9498
}
9599
},
96100
computed: {
101+
wallet () {
102+
return {
103+
...this.wallet,
104+
name: this.name,
105+
color: this.color,
106+
singleAddress: this.singleAddress,
107+
vwsApi: this.vwsApi
108+
}
109+
},
97110
nameLongEnough () {
98111
return this.wallet.name.length < 1 || this.wallet.name.length > 4
99112
},
@@ -107,12 +120,19 @@ export default {
107120
return this.wallet.name !== '' && this.nameLongEnough && this.nameNotTooLong && !this.nameExists
108121
}
109122
},
123+
created () {
124+
this.name = this.value.name
125+
this.color = this.value.color
126+
this.singleAddress = this.value.singleAddress
127+
this.vwsApi = this.value.vwsApi
128+
},
110129
methods: {
111130
proceed () {
112131
if (!this.preferencesAreValid) {
113132
return
114133
}
115134
135+
this.$emit('input', this.wallet)
116136
this.$emit('next')
117137
},
118138

‎src/views/Wallet/Create/WalletSetupView.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
<br/>
1616

1717
<b-step-item :label="$i18n.t('createWallet.preferences')" :clickable="false">
18-
<wallet-preferences :wallet="wallet" @next="next" :restore="restore"/>
18+
<wallet-preferences v-model="wallet" @next="next" :restore="restore"/>
1919
</b-step-item>
2020

2121
<b-step-item :label="$i18n.t('createWallet.paperKey')" :clickable="false">
22-
<paper-key :wallet="wallet" @next="next" :restore="restore"/>
22+
<paper-key v-model="wallet" @next="next" :restore="restore"/>
2323
</b-step-item>
2424

2525
<b-step-item :label="$i18n.t('createWallet.passPhrase')" :clickable="false">
26-
<pass-phrase :wallet="wallet" @next="next"/>
26+
<pass-phrase v-model="wallet" @next="next"/>
2727
</b-step-item>
2828

2929
<b-step-item :label="$i18n.t('createWallet.createWallet')" :clickable="false">

‎src/views/Wallet/Send/SendForm.vue‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<form @submit.prevent="$emit('input', value)">
2+
<form @submit.prevent="confirm">
33

44
<div class="block">
55
<h3 class="is-size-3 is-family-handwritten" v-html="$i18n.t('send.send')"/>
@@ -23,7 +23,7 @@
2323
<!-- </a>-->
2424
<!-- </p>-->
2525
<p class="control is-expanded">
26-
<input class="input" type="text" placeholder="Recipient XVG address" v-model="value.toAddress">
26+
<input class="input" type="text" placeholder="Recipient XVG address" v-model="toAddress">
2727
</p>
2828
</div>
2929
<div v-if="showHelp" class="help notification is-small" v-html="$i18n.t('send.recipientDetails')"/>
@@ -52,7 +52,7 @@
5252
<!-- </span>-->
5353
</p>
5454
<p class="control is-expanded">
55-
<input class="input" type="text" placeholder="Amount you want to send" v-model="value.amount">
55+
<input class="input" type="text" placeholder="Amount you want to send" v-model="amount">
5656
</p>
5757
<p class="control">
5858
<b-button :label="$i18n.t('send.sendMax')" @click="sendMax" :loading="loadingMax"/>
@@ -69,7 +69,7 @@
6969
</div>
7070
<div class="field-body">
7171
<div class="field is-expanded">
72-
<input class="input" type="text" placeholder="Gift to Swen" v-model="value.message">
72+
<input class="input" type="text" placeholder="Gift to Swen" v-model="message">
7373
<div v-if="showHelp" class="help notification" v-html="$i18n.t('send.internalMemoDetails')"/>
7474
</div>
7575
</div>
@@ -90,7 +90,7 @@
9090
<div class="columns">
9191
<div class="column">
9292
<div class="buttons is-centered">
93-
<a class="button is-light" v-html="$i18n.t('send.reset')"/>
93+
<a class="button is-light" v-html="$i18n.t('send.reset')" @click="reset"/>
9494
<button type="submit" class="button is-primary" v-html="$i18n.t('send.confirm')"/>
9595
</div>
9696
</div>
@@ -118,17 +118,40 @@ export default {
118118
return {
119119
showHelp: false,
120120
showMemo: false,
121-
loadingMax: false
121+
loadingMax: false,
122+
toAddress: '',
123+
amount: '',
124+
message: ''
122125
}
123126
},
127+
created () {
128+
this.toAddress = this.value.toAddress
129+
this.amount = this.value.amount
130+
this.message = this.value.message
131+
},
124132
methods: {
125133
sendMax () {
126134
this.loadingMax = true
127135
128136
this.wallet.getSendMaxInfo().then(info => {
129-
this.value.amount = info.amount / constants.satoshiDivider
137+
this.amount = info.amount / constants.satoshiDivider
130138
this.loadingMax = false
131139
})
140+
},
141+
142+
confirm () {
143+
this.$emit('input', {
144+
...this.value,
145+
toAddress: this.toAddress,
146+
amount: this.amount,
147+
message: this.message
148+
})
149+
},
150+
151+
reset () {
152+
this.toAddress = ''
153+
this.amount = 0
154+
this.message = ''
132155
}
133156
}
134157
}

0 commit comments

Comments
 (0)