From 1c02338c6bfa5322662aea91cc3f2fd809979c4c Mon Sep 17 00:00:00 2001 From: mds <17163988+mds1@users.noreply.github.com> Date: Wed, 8 Jul 2020 15:39:46 -0700 Subject: [PATCH 1/2] Remove all lint and compiler errors --- .eslintrc.js | 1 + .vscode/settings.json | 1 + package-lock.json | 15 ++++++ package.json | 1 + src/components/WalletBackupPrompt.vue | 23 ++++----- src/components/WalletBalanceTransactions.vue | 12 +++-- src/pages/WalletBalance.vue | 8 +-- src/pages/WalletCreate.vue | 7 +-- src/pages/WalletHandler.vue | 6 ++- src/pages/WalletOpen.vue | 5 +- src/pages/WalletReceive.vue | 7 ++- src/pages/WalletRestore.vue | 51 +++++++++----------- src/store/main/actions.ts | 4 +- src/store/main/getters.ts | 2 +- src/store/main/state.ts | 4 +- src/utils/mixin-helpers.ts | 4 +- src/wallet/Wallet.ts | 2 + src/wallet/typings.d.ts | 1 + test/jest/jest.setup.js | 2 +- 19 files changed, 93 insertions(+), 63 deletions(-) create mode 100644 src/wallet/typings.d.ts diff --git a/.eslintrc.js b/.eslintrc.js index e66687d..0f2a3b2 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -88,6 +88,7 @@ module.exports = { quotes: ['warn', 'single', { avoidEscape: true }], '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/explicit-module-boundary-types': 'off', + '@typescript-eslint/ban-ts-comment': 'off', // allow debugger during development only 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', diff --git a/.vscode/settings.json b/.vscode/settings.json index dfbe494..09db8c7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,6 +9,7 @@ "typescript.tsdk": "node_modules/typescript/lib", "vetur.experimental.templateInterpolationService": true, "vetur.validation.template": false, + "vetur.validation.script": false, "html.format.enable": true, "json.format.enable": true, "javascript.format.enable": true, diff --git a/package-lock.json b/package-lock.json index ef1064f..af6c375 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5430,6 +5430,21 @@ } } }, + "@vue/composition-api": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.0.0-beta.2.tgz", + "integrity": "sha512-jPdh8cXJg3xurPfLMht5AmEOLnYXEZ9kenRWBnKcZHd+PennsW1LgcXDtiIGWQggE2DO/6/5T59Fx7PzwzNFsg==", + "requires": { + "tslib": "^2.0.0" + }, + "dependencies": { + "tslib": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz", + "integrity": "sha512-lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g==" + } + } + }, "@vue/test-utils": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.3.tgz", diff --git a/package.json b/package.json index ada4034..c041450 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ }, "dependencies": { "@quasar/extras": "^1.0.0", + "@vue/composition-api": "^1.0.0-beta.2", "bitcore-lib-cash": "^8.20.5", "bitcore-mnemonic": "^8.20.5", "browser-passworder": "^2.0.3", diff --git a/src/components/WalletBackupPrompt.vue b/src/components/WalletBackupPrompt.vue index b34e05c..b7fb987 100644 --- a/src/components/WalletBackupPrompt.vue +++ b/src/components/WalletBackupPrompt.vue @@ -208,8 +208,7 @@ diff --git a/src/pages/WalletBalance.vue b/src/pages/WalletBalance.vue index 4e54b54..b014ba4 100644 --- a/src/pages/WalletBalance.vue +++ b/src/pages/WalletBalance.vue @@ -1,7 +1,7 @@