Merge pull request #413 from Adamant-im/stage

v2.12.0

README.md

@@ -44,18 +44,6 @@ yarn run build
 yarn run lint
 ```
 
-### Run your unit tests
-
-```
-yarn run test:unit
-```
-
-### Run your end-to-end tests
-
-```
-yarn run test:e2e
-```
-
 ### Run electron version
 
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "author": "ADAMANT Foundation <[email protected]>",
   "license": "GPLv3",
   "description": "Decentralized Messenger",
@@ -21,92 +21,107 @@
     "@liskhq/lisk-cryptography": "2.3.0",
     "@liskhq/lisk-transactions": "2.3.1",
     "@mdi/font": "^5.9.55",
-    "@stablelib/utf8": "^1.0.0",
-    "@zxing/library": "0.18.3",
-    "abi-decoder": "^2.3.0",
+    "@stablelib/utf8": "^1.0.1",
+    "@zxing/library": "0.18.6",
+    "abi-decoder": "^2.4.0",
     "axios": "^0.21.1",
     "b64-to-blob": "^1.2.19",
     "bignumber.js": "^9.0.1",
-    "bip39": "^3.0.3",
-    "bitcoinjs-lib": "^4.0.2",
+    "bip39": "^3.0.4",
+    "bitcoinjs-lib": "^5.2.0",
     "bytebuffer": "^5.0.1",
     "coininfo": "^5.1.0",
-    "core-js": "^3.8.3",
-    "dayjs": "^1.10.3",
+    "core-js": "^3.15.2",
+    "dayjs": "^1.10.6",
     "deepmerge": "^4.2.2",
     "detect-browser": "^5.2.0",
-    "dompurify": "^2.2.6",
+    "dompurify": "^2.3.0",
     "ed2curve": "^0.3.0",
-    "ethereumjs-tx": "^2.1.2",
-    "ethereumjs-util": "^7.0.7",
     "file-saver": "^2.0.5",
     "hdkey": "^2.0.1",
-    "idb": "^3.0.2",
-    "js-base64": "^3.6.0",
+    "idb": "^6.1.2",
+    "js-base64": "^3.6.1",
     "js-md5": "^0.7.3",
-    "lodash": "^4.17.20",
-    "marked": "^1.2.7",
+    "lodash": "^4.17.21",
+    "marked": "^2.1.3",
     "notifyjs": "^3.0.0",
-    "pbkdf2": "^3.1.1",
+    "pbkdf2": "^3.1.2",
     "promise-queue": "^2.2.5",
     "qrcode": "^1.4.4",
-    "qs": "^6.9.6",
+    "qs": "^6.10.1",
     "register-service-worker": "^1.7.2",
-    "rxjs": "^6.6.3",
-    "semver": "^7.3.4",
+    "semver": "^7.3.5",
     "simple-audio": "^1.0.1",
     "socket.io-client": "^2.4.0",
     "sodium-browserify-tweetnacl": "^0.2.6",
     "throttle-promise": "^1.0.4",
     "visibilityjs": "^2.0.2",
-    "vue": "^2.5.17",
-    "vue-i18n": "^8.0.0",
-    "vue-router": "^3.0.1",
-    "vue-scrollto": "^2.11.0",
-    "vuetify": "^1.5.16",
-    "vuex": "^3.0.1",
-    "vuex-persist": "^2.0.0",
-    "web3": "^0.20.6"
+    "vue": "^2.6.14",
+    "vue-i18n": "^8.24.5",
+    "vue-router": "^3.5.2",
+    "vue-scrollto": "^2.20.0",
+    "vuetify": "^1.5.24",
+    "vuex": "^3.6.2",
+    "vuex-persist": "^2.3.0",
+    "web3-eth": "^1.4.0",
+    "web3-utils": "^1.4.0"
   },
   "devDependencies": {
-    "@kazupon/vue-i18n-loader": "^0.3.0",
-    "@vue/cli-plugin-babel": "^3.0.1",
-    "@vue/cli-plugin-e2e-cypress": "^3.0.1",
-    "@vue/cli-plugin-eslint": "^3.0.1",
-    "@vue/cli-plugin-pwa": "^3.0.1",
-    "@vue/cli-plugin-unit-jest": "^3.0.1",
-    "@vue/cli-service": "^3.0.1",
-    "@vue/eslint-config-standard": "^3.0.3",
-    "@vue/test-utils": "^1.0.0-beta.25",
+    "@intlify/vue-i18n-loader": "^1.1.0",
+    "@babel/core": "7.14.8",
+    "@babel/eslint-parser": "^7.14.7",
+    "@vue/babel-preset-app": "^4.5.13",
+    "@vue/cli-plugin-babel": "^4.5.13",
+    "@vue/cli-plugin-e2e-cypress": "^4.5.13",
+    "@vue/cli-plugin-eslint": "^4.5.13",
+    "@vue/cli-plugin-pwa": "^4.5.13",
+    "@vue/cli-plugin-unit-jest": "^4.5.13",
+    "@vue/cli-service": "^4.5.13",
+    "@vue/eslint-config-standard": "^6.0.0",
+    "@vue/test-utils": "^1.2.1",
     "babel-core": "7.0.0-bridge.0",
-    "babel-jest": "^23.0.1",
+    "babel-jest": "^27.0.6",
     "babel-plugin-rewire": "^1.2.0",
-    "cross-env": "^5.2.0",
+    "cross-env": "^7.0.3",
     "electron": "^3.0.0",
-    "lorem-ipsum": "^1.0.6",
-    "sinon": "^7.2.2",
-    "stylus": "^0.54.5",
+    "eslint": "^7.31.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-plugin-vue": "^7.14.0",
+    "lorem-ipsum": "^2.0.3",
+    "sinon": "^11.1.2",
+    "stylus": "^0.54.8",
     "stylus-loader": "^3.0.2",
-    "uuid": "^3.3.2",
-    "vue-cli-plugin-electron-builder": "^1.4.0",
-    "vue-cli-plugin-i18n": "^0.5.0",
-    "vue-cli-plugin-vuetify": "^0.4.5",
-    "vue-cli-plugin-webpack-bundle-analyzer": "^1.2.0",
-    "vue-template-compiler": "^2.5.17",
-    "vuetify-loader": "^1.2.2"
+    "uuid": "^8.3.2",
+    "vue-cli-plugin-electron-builder": "^2.1.1",
+    "vue-cli-plugin-i18n": "^2.1.2",
+    "vue-cli-plugin-vuetify": "^2.4.1",
+    "vue-cli-plugin-webpack-bundle-analyzer": "^4.0.0",
+    "vue-jest": "^3.0.7",
+    "vue-template-compiler": "^2.6.14",
+    "vuetify-loader": "^1.7.2"
   },
   "eslintConfig": {
     "root": true,
     "env": {
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
+      "plugin:vue/recommended",
       "@vue/standard"
     ],
-    "rules": {},
+    "rules": {
+      "no-useless-catch": "off",
+      "vue/require-default-prop": "off",
+      "vue/require-prop-types": "off",
+      "vue/no-unused-components": "off",
+      "vue/no-template-shadow": "off",
+      "vue/no-lone-template": "off"
+    },
     "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser"
     }
   },
   "postcss": {
@@ -142,7 +157,7 @@
       "jest-serializer-vue"
     ],
     "testMatch": [
-      "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/**/*.(test|spec).(js|jsx|ts|tsx)"
+      "**/__tests__/**/*.(test|spec).(js|jsx|ts|tsx)"
     ],
     "testURL": "http://localhost/",
     "setupFiles": [

src/App.vue

@@ -1,5 +1,8 @@
 <template>
-  <v-app :dark="isDarkTheme" class="application--linear-gradient">
+  <v-app
+    :dark="isDarkTheme"
+    class="application--linear-gradient"
+  >
     <warning-on-addresses-dialog v-model="showWarningOnAddressesDialog" />
     <component :is="layout">
       <router-view />
@@ -13,23 +16,12 @@ import WarningOnAddressesDialog from '@/components/WarningOnAddressesDialog'
 import Notifications from '@/lib/notifications'
 
 export default {
-  created () {
-    this.setLocale()
-  },
-  mounted () {
-    this.notifications = new Notifications(this)
-    this.notifications.start()
-  },
-  beforeDestroy () {
-    this.notifications.stop()
-    this.$store.dispatch('stopInterval')
+  components: {
+    WarningOnAddressesDialog
   },
   data: () => ({
     showWarningOnAddressesDialog: false
   }),
-  components: {
-    WarningOnAddressesDialog
-  },
   computed: {
     layout () {
       return this.$route.meta.layout || 'default'
@@ -44,6 +36,17 @@ export default {
       return this.$store.getters['options/isLoginViaPassword']
     }
   },
+  created () {
+    this.setLocale()
+  },
+  mounted () {
+    this.notifications = new Notifications(this)
+    this.notifications.start()
+  },
+  beforeDestroy () {
+    this.notifications.stop()
+    this.$store.dispatch('stopInterval')
+  },
   methods: {
     setLocale () {
       // Set language from `localStorage`.

src/background.js

@@ -32,13 +32,14 @@ function createWindow () {
   win.on('closed', () => {
     win = null
   })
-  var template = [{
+  const template = [{
     label: 'ADAMANT Messenger',
     submenu: [
       { label: 'About', selector: 'orderFrontStandardAboutPanel:' },
       { type: 'separator' },
       { label: 'Quit', accelerator: 'Command+Q', click: function () { app.quit() } }
-    ] }, {
+    ]
+  }, {
     label: 'Edit',
     submenu: [
       { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' },
@@ -48,11 +49,12 @@ function createWindow () {
       { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' },
       { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' },
       { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' }
-    ] }
+    ]
+  }
   ]
   if (process.platform === 'darwin') {
     Menu.setApplicationMenu(Menu.buildFromTemplate(template))
-    var darkMode = true
+    const darkMode = true
     // if (systemPreferences.isDarkMode()) {
     //   darkMode = true;
     // }