From bd657cb3fac4fcde67186e27217b3f0dcd257d58 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2020 11:36:07 +0000
Subject: [PATCH 01/48] fix(deps): update dependency fs-extra to v9 (#1853)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
---
 package.json |  2 +-
 yarn.lock    | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index 075dfc8826..0fa8c51bcf 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "electron-updater": "^4.1.2",
     "electron-window-state": "^5.0.3",
     "emittery": "^0.6.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^9.0.0",
     "getdomain": "^1.3.1",
     "got": "^9.6.0",
     "jsonschema": "^1.2.4",
diff --git a/yarn.lock b/yarn.lock
index 96300a0e10..9a26f76f90 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2276,6 +2276,11 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+at-least-node@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
+
 atob@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -6255,6 +6260,16 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.0.tgz#b6afc31036e247b2466dc99c29ae797d5d4580a3"
+  integrity sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==
+  dependencies:
+    at-least-node "^1.0.0"
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^1.0.0"
+
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -8424,6 +8439,15 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfile@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
+  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+  dependencies:
+    universalify "^1.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
 jsonschema@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.4.tgz#a46bac5d3506a254465bc548876e267c6d0d6464"
@@ -11905,14 +11929,6 @@ schema-utils@^2.6.5:
     ajv "^6.12.0"
     ajv-keywords "^3.4.1"
 
-schema-utils@^2.6.5:
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz#c758f0a7e624263073d396e29cd40aa101152d8a"
-  integrity sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==
-  dependencies:
-    ajv "^6.12.0"
-    ajv-keywords "^3.4.1"
-
 scrypt-js@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-2.0.3.tgz#bb0040be03043da9a012a2cea9fc9f852cfc87d4"
@@ -13570,6 +13586,11 @@ universalify@^0.1.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
+  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"

From b1d06ee2662a681641b469f43be6b288f0f67174 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Tue, 31 Mar 2020 00:11:42 -0300
Subject: [PATCH 02/48] chore: remove vue-i18n-extract and some readme tweaks
 (#1874)

---
 README.md    | 11 +----------
 package.json |  2 --
 yarn.lock    | 47 +----------------------------------------------
 3 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/README.md b/README.md
index cd5455a73c..0f20ea8e1c 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ brew cask install ark-desktop-wallet
 
 ## Translations
 
-Translations are no longer accepted for the Desktop Wallet. Our plan is to use plugins to provide languages in the near future.
+Translations are no longer accepted for the Desktop Wallet. We are using plugins to provide languages.
 
 ## Development
 
@@ -114,15 +114,6 @@ yarn test:e2e
 
 # Build the application and run end-to-end tests
 yarn test:e2e:full
-
-# List what translations are missing or unused on a specific language. It could capture suggestions that are not accurate
-yarn i18n 'src/renderer/i18n/locales/LANGUAGE.js'
-
-# List what English messages are missing or unused (English is the default language)
-yarn i18n:en-US
-
-# List what translations are missing or unused on every language
-yarn i18n:all
 ```
 
 </details>
diff --git a/package.json b/package.json
index 0fa8c51bcf..70a5377059 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",
     "build:web": "cross-env BUILD_TARGET=web node .electron-vue/build.js",
     "dev": "cross-env ENABLE_SCREENSHOT_PROTECTION=false node .electron-vue/dev-runner.js",
-    "i18n": "vue-i18n-extract report -v 'src/**/*.?(js|vue)' -l 'src/renderer/i18n/locales/en-US.js'",
     "lint": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter src __tests__",
     "lint:fix": "eslint --ext .js,.vue -f ./node_modules/eslint-friendly-formatter --fix src __tests__",
     "pack": "npm run pack:main && npm run pack:renderer",
@@ -191,7 +190,6 @@
     "typescript": "^3.5.3",
     "url-loader": "^4.0.0",
     "vue-html-loader": "^1.2.4",
-    "vue-i18n-extract": "^1.0.2",
     "vue-jest": "^3.0.4",
     "vue-loader": "^15.7.1",
     "vue-style-loader": "^4.1.2",
diff --git a/yarn.lock b/yarn.lock
index 9a26f76f90..3507cfd207 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3578,16 +3578,6 @@ cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
-cli-table3@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
-  integrity sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==
-  dependencies:
-    object-assign "^4.1.0"
-    string-width "^2.1.1"
-  optionalDependencies:
-    colors "^1.1.2"
-
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@@ -3737,11 +3727,6 @@ color@^3.1.0:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colors@^1.1.2:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
-  integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
-
 combined-stream@^1.0.6, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -4827,14 +4812,6 @@ dot-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
-dot-object@^1.7.1:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/dot-object/-/dot-object-1.9.0.tgz#6e3d6d8379f794c5174599ddf05528f5990f076e"
-  integrity sha512-7MPN6y7XhAO4vM4eguj5+5HNKLjJYfkVG1ZR1Aput4Q4TR6SYeSjhpVQ77IzJHoSHffKbDxBC+48aCiiRurDPw==
-  dependencies:
-    commander "^2.20.0"
-    glob "^7.1.4"
-
 dot-prop@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
@@ -5470,11 +5447,6 @@ eslint@^6.1.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-esm@^3.2.13:
-  version "3.2.25"
-  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
-  integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
-
 espree@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
@@ -7695,11 +7667,6 @@ is-utf8@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-valid-glob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
-
 is-whitespace@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
@@ -13939,18 +13906,6 @@ vue-html-loader@^1.2.4:
     loader-utils "^1.0.2"
     object-assign "^4.1.0"
 
-vue-i18n-extract@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/vue-i18n-extract/-/vue-i18n-extract-1.0.2.tgz#0a136e12d1634d6799e187aad81a7003d02f67a5"
-  integrity sha512-+zwDKvle4KcfloXZnj5hF01ViKDiFr5RMx5507D7oyDXpSleRpekF5YHgZa/+Ra6Go68//z0Nya58J9tKFsCjw==
-  dependencies:
-    cli-table3 "^0.5.1"
-    dot-object "^1.7.1"
-    esm "^3.2.13"
-    glob "^7.1.3"
-    is-valid-glob "^1.0.0"
-    yargs "^13.2.2"
-
 vue-i18n@^8.12.0:
   version "8.14.1"
   resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.14.1.tgz#0ca0a2742c14e0144481655157fffcc7cc313e50"
@@ -14941,7 +14896,7 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
-yargs@^13.2.2, yargs@^13.3.0:
+yargs@^13.3.0:
   version "13.3.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
   integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==

From 8d727c715654df415922c845fc15a4b9ec1aadd8 Mon Sep 17 00:00:00 2001
From: Edgar Goetzendorff <hello@dated.fun>
Date: Wed, 1 Apr 2020 13:43:44 +0200
Subject: [PATCH 03/48] fix: use margin instead of border as separator (#1866)

Co-authored-by: Alex Barnsley <8069294+alexbarnsley@users.noreply.github.com>
---
 src/renderer/components/Button/ButtonDropdown.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/Button/ButtonDropdown.vue b/src/renderer/components/Button/ButtonDropdown.vue
index 315f93b00c..c091609399 100644
--- a/src/renderer/components/Button/ButtonDropdown.vue
+++ b/src/renderer/components/Button/ButtonDropdown.vue
@@ -189,8 +189,8 @@ export default {
 
 <style>
 .ButtonDropdown__button--nolabel {
-  @apply .border-l .rounded-tl-none .rounded-bl-none;
-  border-left-color: var(--theme-header-text)
+  @apply .rounded-tl-none .rounded-bl-none;
+  margin-left: 1px;
 }
 .ButtonDropdown__list__item button {
   @apply .rounded-none;

From f473d9ecd9dd51e4f9d226a17fcdbb2c57c357fa Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Wed, 1 Apr 2020 15:01:03 +0300
Subject: [PATCH 04/48] ci: use changelog as body when drafting a release
 (#1868)

Co-authored-by: Alex Barnsley <8069294+alexbarnsley@users.noreply.github.com>
---
 .github/workflows/publish-release.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 93c7b794be..1e5a934c03 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -19,6 +19,14 @@ jobs:
           RELEASE_VERSION=$(cat package.json | jq -r '.version')
           echo "::set-output name=version::${RELEASE_VERSION}"
 
+      - name: Determine the release changelog
+        id: derive_release_changelog
+        run: |
+          CURRENT_VERSION=$(jq -r '.tag_name' <(curl https://api.github.com/repos/ArkEcosystem/desktop-wallet/releases/latest -s))
+          CHANGELOG_URL=$(echo "${{ secrets.CHANGELOG_SOURCE }}" | sed "s/__VERSION__/${CURRENT_VERSION}/g")
+          CHANGELOG=$(curl -s $CHANGELOG_URL)
+          echo "::set-output name=body::${CHANGELOG}"
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -29,6 +37,7 @@ jobs:
           release_name: Version ${{ steps.derive_release_version.outputs.version }}
           draft: true
           prerelease: false
+          body: ${{ steps.derive_release_changelog.outputs.body }}
 
   publish-linux:
     needs: ["create-release"]

From c27086c789740012982653674401bc6a4de6c04c Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Wed, 1 Apr 2020 09:21:22 -0300
Subject: [PATCH 05/48] fix: break words for long vendorfield (#1870)

---
 .../TransactionShow/TransactionShowMultiSignature.vue           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue b/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue
index 82ed2d9863..519803cbc1 100644
--- a/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue
+++ b/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue
@@ -165,6 +165,8 @@
         v-if="transaction.vendorField"
         :value="transaction.vendorField"
         :label="$t('TRANSACTION.VENDOR_FIELD')"
+        item-label-class="mb-auto"
+        item-value-class="max-w-xs break-words text-justify"
       />
 
       <ListDividedItem

From e561f7bb279a3822384b13296d1d278d7a97bd8a Mon Sep 17 00:00:00 2001
From: Edgar Goetzendorff <hello@dated.fun>
Date: Wed, 1 Apr 2020 14:42:37 +0200
Subject: [PATCH 06/48] feat: add additional filters to the plugin manager
 (#1871)

Co-authored-by: Breno Polanski <breno.polanski@gmail.com>
Co-authored-by: Alex Barnsley <8069294+alexbarnsley@users.noreply.github.com>
---
 __tests__/unit/store/modules/plugin.spec.js   | 44 +++++++++++++++++++
 .../PluginManagerButtonFilter.vue             |  4 +-
 src/renderer/i18n/locales/en-US.js            |  4 +-
 src/renderer/store/modules/plugin.js          |  8 ++++
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/__tests__/unit/store/modules/plugin.spec.js b/__tests__/unit/store/modules/plugin.spec.js
index d59a9faa24..af20905fc4 100644
--- a/__tests__/unit/store/modules/plugin.spec.js
+++ b/__tests__/unit/store/modules/plugin.spec.js
@@ -84,6 +84,50 @@ describe('PluginModule', () => {
     })
 
     describe('filtered', () => {
+      describe.only('when given a filter', () => {
+        beforeAll(() => {
+          store.replaceState(merge(
+            JSON.parse(JSON.stringify(initialState)),
+            {
+              plugin: {
+                available: {
+                  [availablePlugins[0].config.id]: {
+                    config: {
+                      ...availablePlugins[0].config,
+                      isOfficial: true
+                    }
+                  },
+                  [availablePlugins[1].config.id]: availablePlugins[1]
+                },
+                whitelisted: {
+                  global: {
+                    [availablePlugins[0].config.id]: {
+                      version: availablePlugins[0].config.version
+                    },
+                    [availablePlugins[1].config.id]: {
+                      isGrant: true,
+                      version: availablePlugins[1].config.version
+                    }
+                  }
+                }
+              }
+            }
+          ))
+        })
+
+        it('should filter official plugins only', () => {
+          expect(store.getters['plugin/filtered'](null, null, 'official').map(plugin => {
+            return plugin.config.id
+          })).toEqual([availablePlugins[0].config.id])
+        })
+
+        it('should filter funded plugins only', () => {
+          expect(store.getters['plugin/filtered'](null, null, 'funded').map(plugin => {
+            return plugin.config.id
+          })).toEqual([availablePlugins[1].config.id])
+        })
+      })
+
       describe('blacklisted plugins', () => {
         it('should filter out globally blacklisted plugins', () => {
           store.replaceState(merge(
diff --git a/src/renderer/components/PluginManager/PluginManagerButtons/PluginManagerButtonFilter.vue b/src/renderer/components/PluginManager/PluginManagerButtons/PluginManagerButtonFilter.vue
index e1cd8bbd9a..706432f944 100644
--- a/src/renderer/components/PluginManager/PluginManagerButtons/PluginManagerButtonFilter.vue
+++ b/src/renderer/components/PluginManager/PluginManagerButtons/PluginManagerButtonFilter.vue
@@ -59,7 +59,9 @@ export default {
     isOpen: false,
     filters: [
       'all',
-      'installed'
+      'installed',
+      'official',
+      'funded'
     ]
   }),
 
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index accf8ab808..a3315a554b 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -683,7 +683,9 @@ export default {
       },
       FILTERS: {
         ALL: 'all',
-        INSTALLED: 'installed'
+        INSTALLED: 'installed',
+        OFFICIAL: 'official',
+        FUNDED: 'funded'
       },
       NO_SEARCH_RESULTS: 'Unfortunately, searching for "{query}" returned no results',
       NO_RESULTS: 'There are no {filter} plugins with the category {category}',
diff --git a/src/renderer/store/modules/plugin.js b/src/renderer/store/modules/plugin.js
index c94c024123..61773b5335 100644
--- a/src/renderer/store/modules/plugin.js
+++ b/src/renderer/store/modules/plugin.js
@@ -31,6 +31,14 @@ export default {
       return uniqBy([...getters.installed, ...getters.available], 'config.id')
     },
 
+    official: (_, getters) => {
+      return getters.all.filter(plugin => plugin.config.isOfficial)
+    },
+
+    funded: (_, getters) => {
+      return getters.all.filter(plugin => getters.isGrant(plugin.config.id))
+    },
+
     filtered: (_, getters, __, rootGetters) => (query, category, filter) => {
       let plugins = getters[filter || 'all']
 

From 40d04811209deb2eb64442a2ade5f42b20bc1191 Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Sat, 4 Apr 2020 05:55:21 +0300
Subject: [PATCH 07/48] ci: use actions/checkout@v2 (#1882)

---
 .github/workflows/draft-artifacts.yml |  6 ++--
 .github/workflows/format.yml          | 48 +++++++++++++--------------
 .github/workflows/test.yml            |  8 ++---
 package.json                          | 12 +++----
 4 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/draft-artifacts.yml b/.github/workflows/draft-artifacts.yml
index c28b11b02d..a8d0acdb58 100644
--- a/.github/workflows/draft-artifacts.yml
+++ b/.github/workflows/draft-artifacts.yml
@@ -14,7 +14,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Cache node modules
         uses: actions/cache@v1
@@ -69,7 +69,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Cache node modules
         uses: actions/cache@v1
@@ -119,7 +119,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index daedbf4b44..9983ce44e6 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -1,35 +1,35 @@
 name: Format
 
 on:
-    pull_request:
-        paths:
-            - '**.css'
-            - '**.js'
-            - '**.ts'
-            - '**.vue'
+  pull_request:
+    paths:
+      - "**.css"
+      - "**.js"
+      - "**.ts"
+      - "**.vue"
 
 jobs:
-    eslint:
-        runs-on: ubuntu-latest
+  eslint:
+    runs-on: ubuntu-latest
 
-        steps:
-            - uses: actions/checkout@v1
+    steps:
+      - uses: actions/checkout@v1
 
-            - name: Update System
-              run: sudo apt-get update
+      - name: Update System
+        run: sudo apt-get update
 
-            - name: Ledger
-              run: sudo apt-get install libudev-dev libusb-1.0-0-dev
+      - name: Ledger
+        run: sudo apt-get install libudev-dev libusb-1.0-0-dev
 
-            - name: Install
-              run: yarn global add node-gyp && yarn install --frozen-lockfile && npm rebuild
+      - name: Install
+        run: yarn global add node-gyp && yarn install --frozen-lockfile && npm rebuild
 
-            - name: Run eslint
-              run: yarn lint:fix
+      - name: Run eslint
+        run: yarn lint:fix
 
-            - uses: stefanzweifel/git-auto-commit-action@v2.1.0
-              with:
-                  commit_message: "style: resolve style guide violations"
-                  branch: ${{ github.head_ref }}
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+      - uses: stefanzweifel/git-auto-commit-action@v4.1.2
+        with:
+          commit_message: "style: resolve style guide violations"
+          branch: ${{ github.head_ref }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f16f33967f..c92163b090 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Cache node modules
         uses: actions/cache@v1
@@ -58,7 +58,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Cache node modules
         uses: actions/cache@v1
@@ -113,7 +113,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Cache node modules
         uses: actions/cache@v1
@@ -155,7 +155,7 @@ jobs:
         node-version: [12.x]
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
diff --git a/package.json b/package.json
index 70a5377059..2c4331e22d 100644
--- a/package.json
+++ b/package.json
@@ -21,14 +21,14 @@
   "homepage": "https://github.com/ArkEcosystem/desktop-wallet#readme",
   "main": "./dist/electron/main.js",
   "scripts": {
-    "build": "node .electron-vue/build.js && electron-builder",
-    "build:win": "node .electron-vue/build.js && electron-builder --win --x64 --ia32",
+    "build": "node .electron-vue/build.js && electron-builder --publish never",
+    "build:win": "node .electron-vue/build.js && electron-builder --win --x64 --ia32 --publish never",
     "build:win:publish": "node .electron-vue/build.js && electron-builder --win --x64 --ia32 --publish onTagOrDraft",
-    "build:win32": "node .electron-vue/build.js && electron-builder --win --ia32",
-    "build:win64": "node .electron-vue/build.js && electron-builder --win --x64",
-    "build:mac": "node .electron-vue/build.js && electron-builder --mac",
+    "build:win32": "node .electron-vue/build.js && electron-builder --win --ia32 --publish never",
+    "build:win64": "node .electron-vue/build.js && electron-builder --win --x64 --publish never",
+    "build:mac": "node .electron-vue/build.js && electron-builder --mac --publish never",
     "build:mac:publish": "node .electron-vue/build.js && electron-builder --mac --publish onTagOrDraft",
-    "build:linux": "node .electron-vue/build.js && electron-builder --linux",
+    "build:linux": "node .electron-vue/build.js && electron-builder --linux --publish never",
     "build:linux:publish": "node .electron-vue/build.js && electron-builder --linux --publish onTagOrDraft",
     "build:dir": "node .electron-vue/build.js && electron-builder --dir",
     "build:clean": "cross-env BUILD_TARGET=clean node .electron-vue/build.js",

From ab96104073b9dab4ca7c7e0c77cb2ab25112bfd8 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:05:37 -0300
Subject: [PATCH 08/48] refactor: remove lodash findkey (#1894)

---
 src/renderer/components/Selection/SelectionTheme.vue   |  3 +--
 .../components/Transaction/TransactionModal.vue        | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/renderer/components/Selection/SelectionTheme.vue b/src/renderer/components/Selection/SelectionTheme.vue
index aec76e960e..8e75ae8dc9 100644
--- a/src/renderer/components/Selection/SelectionTheme.vue
+++ b/src/renderer/components/Selection/SelectionTheme.vue
@@ -23,7 +23,6 @@
 <script>
 import { ButtonSwitch } from '@/components/Button'
 import { SvgIcon } from '@/components/SvgIcon'
-import { findKey } from 'lodash'
 
 export default {
   name: 'SelectionTheme',
@@ -54,7 +53,7 @@ export default {
 
   methods: {
     emitInput (status) {
-      const theme = findKey(this.$options.themes, item => item === status)
+      const theme = Object.keys(this.$options.themes).find(theme => this.$options.themes[theme] === status)
       this.$emit('input', theme)
     }
   }
diff --git a/src/renderer/components/Transaction/TransactionModal.vue b/src/renderer/components/Transaction/TransactionModal.vue
index a612560537..1d4b24a4b1 100644
--- a/src/renderer/components/Transaction/TransactionModal.vue
+++ b/src/renderer/components/Transaction/TransactionModal.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { camelCase, includes, findKey } from 'lodash'
+import { camelCase, includes } from 'lodash'
 import { upperFirst } from '@/utils'
 import { TRANSACTION_GROUPS, TRANSACTION_TYPES } from '@config'
 import MultiSignature from '@/services/client-multisig'
@@ -105,7 +105,9 @@ export default {
         return 'MULTI_SIGN'
       }
 
-      const key = findKey(TRANSACTION_TYPES[`GROUP_${this.group}`], type => this.type === type)
+      const transactionTypes = TRANSACTION_TYPES[`GROUP_${this.group}`]
+      const key = Object.keys(transactionTypes).find(type => transactionTypes[type] === this.type)
+
       if (key === 'VOTE' && this.transaction.asset.votes.length) {
         if (this.transaction.asset.votes[0].substring(0, 1) === '-') {
           return 'UNVOTE'
@@ -119,7 +121,9 @@ export default {
         return 'TransactionModalMultiSign'
       }
 
-      const type = findKey(TRANSACTION_TYPES[`GROUP_${this.group}`], type => this.type === type)
+      const transactionTypes = TRANSACTION_TYPES[`GROUP_${this.group}`]
+      const type = Object.keys(transactionTypes).find(type => transactionTypes[type] === this.type)
+
       return `TransactionModal${upperFirst(camelCase(type))}`
     },
     typeName () {

From 5069a121efafdd6a240db4dd15b4cdf2dac9d4e3 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:05:59 -0300
Subject: [PATCH 09/48] chore: remove the cursor and opacity for avatar and
 background selection (#1893)

---
 src/renderer/pages/Profile/ProfileEdition.vue | 10 ++++++++++
 src/renderer/pages/Profile/ProfileNew.vue     | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/renderer/pages/Profile/ProfileEdition.vue b/src/renderer/pages/Profile/ProfileEdition.vue
index 22f9557b5c..8b05b651cf 100644
--- a/src/renderer/pages/Profile/ProfileEdition.vue
+++ b/src/renderer/pages/Profile/ProfileEdition.vue
@@ -897,8 +897,18 @@ export default {
 .ProfileEdition__name .ListDividedItem__value .InputText .InputField__wrapper {
   height: 0;
 }
+
 .ProfileEdition__avatar .InputGrid__container {
   grid-template-columns: repeat(4, 4rem) !important;
   grid-gap: 1rem !important;
 }
+.ProfileEdition__avatar .SelectionAvatar .InputGrid__container button:first-child,
+.ProfileEdition__avatar .SelectionAvatar .InputGrid__container button:first-child .InputGridItem {
+  @apply .cursor-default .opacity-100;
+}
+
+.ProfileEdition__background .SelectionBackgroundGrid .InputGrid__container button:first-child,
+.ProfileEdition__background .SelectionBackgroundGrid .InputGrid__container button:first-child .InputGridItem {
+  @apply .cursor-default .opacity-100;
+}
 </style>
diff --git a/src/renderer/pages/Profile/ProfileNew.vue b/src/renderer/pages/Profile/ProfileNew.vue
index 6ff90a55b6..e244c67a92 100644
--- a/src/renderer/pages/Profile/ProfileNew.vue
+++ b/src/renderer/pages/Profile/ProfileNew.vue
@@ -79,7 +79,7 @@
                 />
               </div>
 
-              <div class="flex items-center justify-between mt-5 pt-5 mb-2 border-t border-theme-line-separator border-dashed">
+              <div class="ProfileNew__avatar flex items-center justify-between mt-5 pt-5 mb-2 border-t border-theme-line-separator border-dashed">
                 <div class="mr-2">
                   <h5 class="mb-2">
                     {{ $t('COMMON.AVATAR') }}
@@ -169,7 +169,7 @@
                 />
               </div>
 
-              <div class="flex items-center justify-between">
+              <div class="ProfileNew__background flex items-center justify-between">
                 <div>
                   <h5 class="mb-2">
                     {{ $t('COMMON.BACKGROUND') }}
@@ -447,3 +447,15 @@ export default {
   }
 }
 </script>
+
+<style lang="postcss">
+.ProfileNew__avatar .SelectionAvatar .InputGrid__container button:first-child,
+.ProfileNew__avatar .SelectionAvatar .InputGrid__container button:first-child .InputGridItem {
+  @apply .cursor-default .opacity-100;
+}
+
+.ProfileNew__background .SelectionBackgroundGrid .InputGrid__container button:first-child,
+.ProfileNew__background .SelectionBackgroundGrid .InputGrid__container button:first-child .InputGridItem {
+  @apply .cursor-default .opacity-100;
+}
+</style>

From 4834c554da854ed3d1c9bdf2c65192ecf07e76c1 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:06:09 -0300
Subject: [PATCH 10/48] feat: add icon indicator for multisig wallets (#1877)

---
 src/renderer/assets/svg/multi-signature.svg   | 11 +++
 src/renderer/components/Wallet/WalletGrid.vue | 72 +++++++++++--------
 .../WalletHeadingPrimaryActions.vue           | 12 +++-
 .../components/Wallet/WalletTable.vue         | 22 ++++++
 src/renderer/i18n/locales/en-US.js            |  1 +
 5 files changed, 86 insertions(+), 32 deletions(-)
 create mode 100644 src/renderer/assets/svg/multi-signature.svg

diff --git a/src/renderer/assets/svg/multi-signature.svg b/src/renderer/assets/svg/multi-signature.svg
new file mode 100644
index 0000000000..c2de64287e
--- /dev/null
+++ b/src/renderer/assets/svg/multi-signature.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg viewBox="0 0 47 38" xmlns="http://www.w3.org/2000/svg">
+<switch>
+<g>
+<g opacity=".471">
+<path fill="currentColor" d="M32.3 9.1c1 1.8 2.9 3.1 5 3.1 3.1 0 5.8-2.8 5.8-6.1 0-3.2-2.7-6.1-5.8-6.1-2.4 0-4.6 1.7-5.4 4 .5.9.7 2 .7 3.1 0 .7-.1 1.4-.3 2zm-22.6 3c2.1 0 4-1.3 5-3.1-.2-.6-.3-1.3-.3-1.9 0-1.1.3-2.1.7-3.1-.8-2.3-3-4-5.4-4-3.1 0-5.8 2.8-5.8 6.1 0 3.2 2.7 6 5.8 6zm27.6 2.1c-2.6 0-5.1 1.5-6.9 3.9 4 2.4 6.9 7.6 6.9 13.6 0 .2 0 .4-.1.6 4.9 0 9.7-1.8 9.7-5.3.1-7.1-4.5-12.8-9.6-12.8zm-27.6-.1C4.6 14.1 0 19.9 0 27c0 3.6 4.9 5.3 9.7 5.3 0-.2-.1-.4-.1-.6 0-6 2.9-11.2 6.9-13.6-1.7-2.5-4.2-4-6.8-4z"/>
+</g>
+<path d="m23.5 17.8c3.1 0 5.8-2.8 5.8-6.1 0-3.2-2.7-6.1-5.8-6.1s-5.8 2.8-5.8 6.1c0 3.2 2.7 6.1 5.8 6.1zm0 2c-5.1 0-9.7 5.7-9.7 12.8s19.4 7.1 19.4 0-4.6-12.8-9.7-12.8z"/>
+</g>
+</switch>
+</svg>
diff --git a/src/renderer/components/Wallet/WalletGrid.vue b/src/renderer/components/Wallet/WalletGrid.vue
index 097d595d96..852516d921 100644
--- a/src/renderer/components/Wallet/WalletGrid.vue
+++ b/src/renderer/components/Wallet/WalletGrid.vue
@@ -69,41 +69,51 @@
               </div>
             </div>
 
-            <MenuDropdown
-              :ref="`dropdown-${wallet.id}`"
-              :items="contextMenuOptions(wallet)"
-              :is-highlighting="false"
-              :position="{ x: '100%', y: '-0.5rem' }"
-              :container-classes="'hidden group-hover:block'"
-              @select="onSelectDropdown(wallet, $event)"
-            >
-              <span
-                slot="handler"
-                class="WalletGrid__wallet__select p-2 text-theme-page-text-light hover:text-theme-page-text opacity-75"
-              >
-                <SvgIcon
-                  name="more"
-                  view-box="0 0 5 15"
-                  class="text-inherit"
-                />
-              </span>
+            <div class="flex items-center">
+              <SvgIcon
+                v-if="wallet.multiSignature"
+                v-tooltip="$t('PAGES.WALLET.MULTI_SIGNATURE_WALLET')"
+                class="w-5 h-5 text-theme-heading-text mr-2"
+                name="multi-signature"
+                view-box="0 0 16 16"
+              />
 
-              <template
-                slot="item"
-                slot-scope="itemScope"
+              <MenuDropdown
+                :ref="`dropdown-${wallet.id}`"
+                :items="contextMenuOptions(wallet)"
+                :is-highlighting="false"
+                :position="{ x: '100%', y: '-0.5rem' }"
+                :container-classes="'hidden group-hover:block'"
+                @select="onSelectDropdown(wallet, $event)"
               >
-                <div class="flex items-center hidden">
+                <span
+                  slot="handler"
+                  class="WalletGrid__wallet__select p-2 text-theme-page-text-light hover:text-theme-page-text opacity-75"
+                >
                   <SvgIcon
-                    :name="itemScope.item.icon"
-                    view-box="0 0 16 16"
-                    class="text-inherit flex-none mr-2"
+                    name="more"
+                    view-box="0 0 5 15"
+                    class="text-inherit"
                   />
-                  <span class="font-semibold">
-                    {{ itemScope.item.value }}
-                  </span>
-                </div>
-              </template>
-            </MenuDropdown>
+                </span>
+
+                <template
+                  slot="item"
+                  slot-scope="itemScope"
+                >
+                  <div class="flex items-center hidden">
+                    <SvgIcon
+                      :name="itemScope.item.icon"
+                      view-box="0 0 16 16"
+                      class="text-inherit flex-none mr-2"
+                    />
+                    <span class="font-semibold">
+                      {{ itemScope.item.value }}
+                    </span>
+                  </div>
+                </template>
+              </MenuDropdown>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue b/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
index 61eb1fe440..629d7c117c 100644
--- a/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
+++ b/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
@@ -3,6 +3,14 @@
     key="PrimaryActions"
     class="WalletHeading__PrimaryActions flex items-center"
   >
+    <SvgIcon
+      v-if="currentWallet.multiSignature"
+      v-tooltip="$t('PAGES.WALLET.MULTI_SIGNATURE_WALLET')"
+      class="w-5 h-5 text-theme-heading-text opacity-50"
+      name="multi-signature"
+      view-box="0 0 16 16"
+    />
+
     <button
       v-tooltip="{
         content: isVoting ? $t('PAGES.WALLET_SHOW.VOTING_FOR', { delegate: walletVote.username }) : $t('PAGES.WALLET_SHOW.NO_VOTE'),
@@ -106,6 +114,7 @@ import { ButtonDropdown, ButtonModal, ButtonReload } from '@/components/Button'
 import { ModalQrCode } from '@/components/Modal'
 import { TransactionModal } from '@/components/Transaction'
 import { ContactRenameModal } from '@/components/Contact'
+import SvgIcon from '@/components/SvgIcon'
 
 export default {
   name: 'WalletHeadingPrimaryActions',
@@ -118,7 +127,8 @@ export default {
     ButtonReload,
     ModalQrCode,
     TransactionModal,
-    ContactRenameModal
+    ContactRenameModal,
+    SvgIcon
   },
 
   data () {
diff --git a/src/renderer/components/Wallet/WalletTable.vue b/src/renderer/components/Wallet/WalletTable.vue
index a662d6a4bc..78f1248a01 100644
--- a/src/renderer/components/Wallet/WalletTable.vue
+++ b/src/renderer/components/Wallet/WalletTable.vue
@@ -57,6 +57,21 @@
           </span>
         </div>
 
+        <div
+          v-else-if="data.column.field === 'multisignature'"
+          class="flex items-center justify-center"
+        >
+          <span>
+            <SvgIcon
+              v-if="data.row.multiSignature"
+              v-tooltip="$t('PAGES.WALLET.MULTI_SIGNATURE_WALLET')"
+              class="w-5 h-5 text-theme-heading-text"
+              name="multi-signature"
+              view-box="0 0 16 16"
+            />
+          </span>
+        </div>
+
         <div
           v-else-if="data.column.field === 'vote'"
         >
@@ -176,6 +191,13 @@ export default {
           thClass: !this.showVotedDelegates ? 'w-full' : '',
           tdClass: !this.showVotedDelegates ? 'w-full' : ''
         },
+        {
+          label: '',
+          field: 'multisignature',
+          sortable: false,
+          thClass: 'text-center not-sortable',
+          tdClass: 'text-center'
+        },
         {
           label: this.$t('PAGES.WALLET_ALL.VOTING_FOR'),
           field: 'vote',
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index a3315a554b..c9c4037a50 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -795,6 +795,7 @@ export default {
       DELEGATES: 'Delegates',
       IPFS: 'IPFS',
       MULTI_SIGNATURE: 'Multisignature',
+      MULTI_SIGNATURE_WALLET: 'Multisignature wallet',
       STATISTICS: 'Statistics',
       SIGN_VERIFY: 'Sign',
       PURCHASE: 'Purchase {ticker}'

From 682a6fb06ca5ba4f9837b6ef3c33683ab73b514c Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:06:28 -0300
Subject: [PATCH 11/48] chore: adjust the window size to its content not to
 show scroll bar (#1883)

---
 src/main/menu.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/menu.js b/src/main/menu.js
index 3a30550581..3354d8601a 100644
--- a/src/main/menu.js
+++ b/src/main/menu.js
@@ -12,12 +12,13 @@ export default function ({ createLoadingWindow }) {
   const about = {
     label: 'About',
     click: () => aboutWindow({
+      adjust_window_size: true,
       icon_path: isProduction
         ? path.resolve(__dirname, './static/128x128.png')
         : path.resolve(__dirname, '../../build/icons/128x128.png'),
       copyright: [
         `<p style="text-align: center">Distributed under ${packageJson.license} license</p>`,
-        '<p>Flag icons made by <a href="http://www.freepik.com/" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">flaticon.com</a> are licensed by <a href="http://creativecommons.org/licenses/by/3.0/"  title="Creative Commons BY 3.0" target="_blank">CC 3.0 BY</a></p>'
+        '<p>Flag icons made by <a href="https://www.freepik.com/" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">flaticon.com</a> are licensed by <a href="https://creativecommons.org/licenses/by/3.0/" title="Creative Commons BY 3.0">CC 3.0 BY</a></p>'
       ],
       package_json_dir: path.resolve(__dirname, '../../'),
       css_path: isProduction ? path.resolve(__dirname, 'styles.css') : null,
@@ -30,12 +31,12 @@ export default function ({ createLoadingWindow }) {
     submenu: [
       {
         label: 'Settings',
+        accelerator: 'CmdOrCtrl+,',
         click: (_, focusedWindow) => {
           if (focusedWindow && focusedWindow.webContents) {
             focusedWindow.webContents.send('app:preferences')
           }
-        },
-        accelerator: 'CommandOrControl+,'
+        }
       }
     ]
   }

From 1738e283fa9fe5d8b4b39f73864da799c930fce1 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:06:44 -0300
Subject: [PATCH 12/48] refactor: plugin sliders into single component to
 reduce duplication (#1873)

---
 .../unit/components/Slider/Navigation.spec.js |  20 ++
 .../unit/components/Slider/Pagination.spec.js |  36 +++
 .../components/Slider/SliderImage.spec.js     | 109 +++++++
 .../Slider/SliderImageModal.spec.js           |  37 +++
 .../PluginDetailsModal.vue                    |  21 +-
 .../PluginManagerModals/PluginImageModal.vue  | 240 ---------------
 .../PluginManagerModals/index.js              |   2 -
 .../components/PluginManager/PluginSlider.vue | 239 ---------------
 .../components/PluginManager/index.js         |   4 +-
 src/renderer/components/Slider/Navigation.vue |  87 ++++++
 src/renderer/components/Slider/Pagination.vue |  48 +++
 .../components/Slider/SliderImage.vue         | 281 ++++++++++++++++++
 .../components/Slider/SliderImageModal.vue    |  76 +++++
 src/renderer/components/Slider/index.js       |   7 +
 14 files changed, 718 insertions(+), 489 deletions(-)
 create mode 100755 __tests__/unit/components/Slider/Navigation.spec.js
 create mode 100755 __tests__/unit/components/Slider/Pagination.spec.js
 create mode 100755 __tests__/unit/components/Slider/SliderImage.spec.js
 create mode 100755 __tests__/unit/components/Slider/SliderImageModal.spec.js
 delete mode 100644 src/renderer/components/PluginManager/PluginManagerModals/PluginImageModal.vue
 delete mode 100644 src/renderer/components/PluginManager/PluginSlider.vue
 create mode 100755 src/renderer/components/Slider/Navigation.vue
 create mode 100755 src/renderer/components/Slider/Pagination.vue
 create mode 100755 src/renderer/components/Slider/SliderImage.vue
 create mode 100755 src/renderer/components/Slider/SliderImageModal.vue
 create mode 100755 src/renderer/components/Slider/index.js

diff --git a/__tests__/unit/components/Slider/Navigation.spec.js b/__tests__/unit/components/Slider/Navigation.spec.js
new file mode 100755
index 0000000000..b1ba9cfa95
--- /dev/null
+++ b/__tests__/unit/components/Slider/Navigation.spec.js
@@ -0,0 +1,20 @@
+import { mount } from '@vue/test-utils'
+import Navigation from '@/components/Slider/Navigation'
+
+describe('Navigation', () => {
+  it('should render', () => {
+    const wrapper = mount(Navigation)
+    expect(wrapper.isVueInstance()).toBeTruthy()
+  })
+
+  it('should accept css class', () => {
+    const wrapper = mount(Navigation, {
+      propsData: {
+        leftButtonClass: 'ml-6',
+        rightButtonClass: 'mr-6'
+      }
+    })
+    expect(wrapper.vm.leftButtonClass).toBe('ml-6')
+    expect(wrapper.vm.rightButtonClass).toBe('mr-6')
+  })
+})
diff --git a/__tests__/unit/components/Slider/Pagination.spec.js b/__tests__/unit/components/Slider/Pagination.spec.js
new file mode 100755
index 0000000000..a055651e84
--- /dev/null
+++ b/__tests__/unit/components/Slider/Pagination.spec.js
@@ -0,0 +1,36 @@
+import { mount } from '@vue/test-utils'
+import Pagination from '@/components/Slider/Pagination'
+
+describe('Pagination', () => {
+  it('should render', () => {
+    const wrapper = mount(Pagination, {
+      propsData: {
+        currentIndex: 1,
+        pageCount: 2
+      }
+    })
+    expect(wrapper.isVueInstance()).toBeTruthy()
+  })
+
+  it('should render an inactive button', () => {
+    const wrapper = mount(Pagination, {
+      propsData: {
+        currentIndex: 1,
+        pageCount: 2
+      }
+    })
+    const pagination = wrapper.find('.Pagination__page')
+    expect(pagination.contains('.bg-theme-button')).toBeTruthy()
+  })
+
+  it('should render an active button', () => {
+    const wrapper = mount(Pagination, {
+      propsData: {
+        currentIndex: 0,
+        pageCount: 2
+      }
+    })
+    const pagination = wrapper.find('.Pagination__page')
+    expect(pagination.contains('.bg-theme-button-active')).toBeTruthy()
+  })
+})
diff --git a/__tests__/unit/components/Slider/SliderImage.spec.js b/__tests__/unit/components/Slider/SliderImage.spec.js
new file mode 100755
index 0000000000..1122517f29
--- /dev/null
+++ b/__tests__/unit/components/Slider/SliderImage.spec.js
@@ -0,0 +1,109 @@
+import { mount } from '@vue/test-utils'
+import { SliderImage } from '@/components/Slider'
+
+const images = [
+  'preview-1.png',
+  'preview-2.png',
+  'preview-3.png',
+  'preview-4.png'
+]
+
+let wrapper
+const createWrapper = (component, propsData) => {
+  component = component || SliderImage
+  propsData = propsData || {
+    isRow: true,
+    images
+  }
+
+  wrapper = mount(component, {
+    propsData
+  })
+}
+
+describe('SliderImage', () => {
+  beforeEach(() => {
+    createWrapper()
+  })
+
+  it('should render', () => {
+    expect(wrapper.isVueInstance()).toBeTruthy()
+  })
+
+  it('should render images in row (thumbnails)', () => {
+    const sliderImage = wrapper.find('.SliderImage__container')
+    expect(sliderImage.contains('.SliderImage__container--row')).toBeTruthy()
+  })
+
+  it('should render images in stack', () => {
+    createWrapper(SliderImage, {
+      isRow: false,
+      images
+    })
+    const sliderImage = wrapper.find('.SliderImage__container')
+    expect(sliderImage.contains('.SliderImage__container--stack')).toBeTruthy()
+  })
+
+  it('should render if has images', () => {
+    expect(wrapper.vm.hasImages).toEqual(true)
+  })
+
+  it('should show navigation if "showNavigation" is true', () => {
+    createWrapper(SliderImage, {
+      isRow: true,
+      showNavigation: true,
+      images
+    })
+    const { showNavigation, pageCount } = wrapper.vm
+    expect(showNavigation && pageCount > 1).toEqual(true)
+  })
+
+  it('should not show navigation if "showNavigation" is false', () => {
+    createWrapper(SliderImage, {
+      isRow: true,
+      showNavigation: false,
+      images
+    })
+    const { showNavigation, pageCount } = wrapper.vm
+    expect(showNavigation && pageCount > 1).toEqual(false)
+  })
+
+  it('should show pagination if "showPagination" is true', () => {
+    createWrapper(SliderImage, {
+      isRow: true,
+      showPagination: true,
+      images
+    })
+    const { showPagination, pageCount } = wrapper.vm
+    expect(showPagination && pageCount > 1).toEqual(true)
+  })
+
+  it('should not show pagination if "showPagination" is false', () => {
+    createWrapper(SliderImage, {
+      isRow: true,
+      showPagination: false,
+      images
+    })
+    const { showPagination, pageCount } = wrapper.vm
+    expect(showPagination && pageCount > 1).toEqual(false)
+  })
+
+  it('should not show navigation and pagination if page count is less than 1', () => {
+    createWrapper(SliderImage, {
+      isRow: true,
+      images: [
+        'preview-1.png'
+      ]
+    })
+    expect(wrapper.vm.pageCount > 1).toEqual(false)
+  })
+
+  it('should show two images per page', () => {
+    createWrapper(SliderImage, {
+      isRow: true,
+      perPage: 2,
+      images
+    })
+    expect(wrapper.vm.perPage).toBe(2)
+  })
+})
diff --git a/__tests__/unit/components/Slider/SliderImageModal.spec.js b/__tests__/unit/components/Slider/SliderImageModal.spec.js
new file mode 100755
index 0000000000..a194710e83
--- /dev/null
+++ b/__tests__/unit/components/Slider/SliderImageModal.spec.js
@@ -0,0 +1,37 @@
+import { mount } from '@vue/test-utils'
+import { SliderImageModal } from '@/components/Slider'
+
+const images = [
+  'preview-1.png',
+  'preview-2.png',
+  'preview-3.png',
+  'preview-4.png'
+]
+
+const stubs = {
+  Portal: '<div><slot/></div>'
+}
+
+let wrapper
+const createWrapper = (component, propsData) => {
+  component = component || SliderImageModal
+  propsData = propsData || {
+    images,
+    closeImage: jest.fn()
+  }
+
+  wrapper = mount(component, {
+    propsData,
+    stubs
+  })
+}
+
+describe('SliderImageModal', () => {
+  beforeEach(() => {
+    createWrapper()
+  })
+
+  it('should render', () => {
+    expect(wrapper.isVueInstance()).toBeTruthy()
+  })
+})
diff --git a/src/renderer/components/PluginManager/PluginManagerModals/PluginDetailsModal.vue b/src/renderer/components/PluginManager/PluginManagerModals/PluginDetailsModal.vue
index 394f1b4d08..0fc74c6d0b 100644
--- a/src/renderer/components/PluginManager/PluginManagerModals/PluginDetailsModal.vue
+++ b/src/renderer/components/PluginManager/PluginManagerModals/PluginDetailsModal.vue
@@ -130,9 +130,18 @@
       </a>
 
       <div class="mt-6">
-        <PluginSlider
-          :plugin="plugin"
-        />
+        <SliderImage
+          :is-row="true"
+          :images="plugin.images"
+        >
+          <template slot-scope="{ imageIndex, closeImage }">
+            <SliderImageModal
+              :images="plugin.images"
+              :image-index="imageIndex"
+              :close-image="closeImage"
+            />
+          </template>
+        </SliderImage>
       </div>
 
       <div class="PluginDetailsModal__stats">
@@ -181,9 +190,10 @@
 <script>
 import { PLUGINS } from '@config'
 import { ButtonGeneric, ButtonIconGeneric } from '@/components/Button'
-import { PluginLogo, PluginManagerCheckmark, PluginManagerGrants, PluginSlider } from '@/components/PluginManager'
+import { PluginLogo, PluginManagerCheckmark, PluginManagerGrants } from '@/components/PluginManager'
 import { ModalWindow } from '@/components/Modal'
 import { PluginManagerButtonSwitch } from '@/components/PluginManager/PluginManagerButtons'
+import { SliderImage, SliderImageModal } from '@/components/Slider'
 import SvgIcon from '@/components/SvgIcon'
 import domain from 'getdomain'
 
@@ -198,7 +208,8 @@ export default {
     PluginManagerButtonSwitch,
     ModalWindow,
     PluginLogo,
-    PluginSlider,
+    SliderImage,
+    SliderImageModal,
     SvgIcon
   },
 
diff --git a/src/renderer/components/PluginManager/PluginManagerModals/PluginImageModal.vue b/src/renderer/components/PluginManager/PluginManagerModals/PluginImageModal.vue
deleted file mode 100644
index 2d33f1e0a4..0000000000
--- a/src/renderer/components/PluginManager/PluginManagerModals/PluginImageModal.vue
+++ /dev/null
@@ -1,240 +0,0 @@
-<template>
-  <ModalWindow
-    modal-classes="PluginImageModal"
-    aacontainer-classes="PluginImageModal max-w-md"
-    @close="emitClose"
-  >
-    <div class="flex flex-col">
-      <div class="PluginSlider">
-        <div class="relative w-full h-full">
-          <!-- Images -->
-          <transition-group
-            :name="sliderClass"
-            tag="div"
-            class="flex flex-no-wrap h-full"
-            @after-leave="transitionEnd"
-          >
-            <div
-              v-for="imageId in [currentIndex]"
-              :key="imageId"
-              class="PluginSlider__slide"
-            >
-              <img :src="`data:image/png;base64,${images[imageId]}`">
-            </div>
-          </transition-group>
-        </div>
-
-        <!-- Left Button -->
-        <div
-          class="PluginSlider__left"
-          @click="previousImage"
-        >
-          <SvgIcon
-            name="caret-left"
-            view-box="0 0 12 12"
-          />
-        </div>
-
-        <!-- Right Button -->
-        <div
-          class="PluginSlider__right"
-          @click="nextImage"
-        >
-          <SvgIcon
-            name="caret-right"
-            view-box="0 0 12 12"
-          />
-        </div>
-      </div>
-
-      <div class="flex flex-inline mt-4 justify-center">
-        <div
-          v-for="page in images.length"
-          :key="page"
-          class="PluginSlider__page"
-          :class="{
-            'bg-theme-button': currentIndex + 1 !== page,
-            'bg-theme-button-active': currentIndex + 1 === page
-          }"
-          @click="goToPage(page)"
-        />
-      </div>
-    </div>
-  </ModalWindow>
-</template>
-
-<script>
-import { ModalWindow } from '@/components/Modal'
-import SvgIcon from '@/components/SvgIcon/SvgIcon'
-
-export default {
-  name: 'PluginImageModal',
-
-  components: {
-    ModalWindow,
-    SvgIcon
-  },
-
-  props: {
-    images: {
-      type: Array,
-      required: true
-    },
-
-    imageIndex: {
-      type: Number,
-      required: false,
-      default: 0
-    }
-  },
-
-  data: (vm) => ({
-    currentIndex: vm.imageIndex,
-    isTransitioning: false,
-    sliderClass: 'slides-right'
-  }),
-
-  mounted () {
-    document.addEventListener('keyup', this.onArrowKeys, false)
-  },
-
-  destroyed () {
-    document.removeEventListener('keyup', this.onArrowKeys)
-  },
-
-  methods: {
-    emitClose () {
-      this.$emit('close')
-    },
-
-    transitionEnd () {
-      this.isTransitioning = false
-    },
-
-    previousImage () {
-      if (this.isTransitioning) {
-        return
-      }
-
-      this.isTransitioning = true
-      if (this.currentIndex === 0) {
-        this.sliderClass = 'slides-right'
-        this.currentIndex = this.images.length - 1
-      } else {
-        this.sliderClass = 'slides-left'
-        this.currentIndex--
-      }
-    },
-
-    nextImage () {
-      if (this.isTransitioning) {
-        return
-      }
-
-      this.isTransitioning = true
-      if (this.currentIndex >= this.images.length - 1) {
-        this.sliderClass = 'slides-left'
-        this.currentIndex = 0
-      } else {
-        this.sliderClass = 'slides-right'
-        this.currentIndex++
-      }
-    },
-
-    goToPage (page) {
-      if (page < this.currentIndex + 1) {
-        this.sliderClass = 'slides-left'
-      } else if (page > this.currentIndex + 1) {
-        this.sliderClass = 'slides-right'
-      } else {
-        return
-      }
-
-      this.isTransitioning = true
-      this.currentIndex = page - 1
-    },
-
-    onArrowKeys (event) {
-      if (event.key === 'ArrowLeft') {
-        this.transitionEnd()
-        this.previousImage()
-      } else if (event.key === 'ArrowRight') {
-        this.transitionEnd()
-        this.nextImage()
-      }
-    }
-  }
-}
-</script>
-
-<style>
-.PluginImageModal .ModalWindow__container__content {
-  @apply .p-4;
-}
-.PluginImageModal article {
-  @apply .flex .mt-0;
-}
-</style>
-
-<style scoped>
-.PluginSlider {
-  @apply .flex-1 .relative .overflow-x-hidden .select-none;
-  width: 640px;
-  height: 550px;
-}
-
-.PluginSlider__slide {
-  @apply .absolute .flex .flex-none .h-full .w-full .pin .overflow-hidden .justify-center;
-}
-
-.PluginSlider__slide img {
-  max-width: none;
-  height: max-content;
-  @apply .m-auto .max-h-full;
-}
-
-.PluginSlider__left,
-.PluginSlider__right {
-  @apply .absolute .rounded .bg-theme-button .text-theme-button-text .flex .pin-y .my-auto .cursor-pointer .shadow;
-  width: 35px;
-  height: 35px;
-}
-
-.PluginSlider__left:hover,
-.PluginSlider__right:hover {
-  @apply .bg-theme-button-active;
-}
-
-.PluginSlider__left {
-  @apply .pin-l .ml-6;
-  padding-right: 0.125rem;
-}
-
-.PluginSlider__right {
-  @apply .pin-r .mr-6;
-}
-
-.PluginSlider__left .SvgIcon,
-.PluginSlider__right .SvgIcon {
-  @apply .m-auto;
-}
-
-.PluginSlider__page {
-  @apply .rounded-full .p-1 .mx-1 .cursor-pointer;
-}
-
-.slides-right-leave-active,
-.slides-right-enter-active,
-.slides-left-leave-active,
-.slides-left-enter-active {
-  transition: 0.5s;
-}
-.slides-left-leave-to,
-.slides-right-enter {
-  transform: translate(100%, 0);
-}
-.slides-left-enter,
-.slides-right-leave-to {
-  transform: translate(-100%, 0);
-}
-</style>
diff --git a/src/renderer/components/PluginManager/PluginManagerModals/index.js b/src/renderer/components/PluginManager/PluginManagerModals/index.js
index d58986e377..54e79ec4cb 100644
--- a/src/renderer/components/PluginManager/PluginManagerModals/index.js
+++ b/src/renderer/components/PluginManager/PluginManagerModals/index.js
@@ -1,7 +1,6 @@
 import PluginBlacklistDisclaimerModal from './PluginBlacklistDisclaimerModal'
 import PluginBlacklistModal from './PluginBlacklistModal'
 import PluginDetailsModal from './PluginDetailsModal'
-import PluginImageModal from './PluginImageModal'
 import PluginInstallModal from './PluginInstallModal'
 import PluginManageBlacklistModal from './PluginManageBlacklistModal'
 import PluginPermissionsModal from './PluginPermissionsModal'
@@ -12,7 +11,6 @@ export {
   PluginBlacklistDisclaimerModal,
   PluginBlacklistModal,
   PluginDetailsModal,
-  PluginImageModal,
   PluginInstallModal,
   PluginManageBlacklistModal,
   PluginPermissionsModal,
diff --git a/src/renderer/components/PluginManager/PluginSlider.vue b/src/renderer/components/PluginManager/PluginSlider.vue
deleted file mode 100644
index 7f24bf66f0..0000000000
--- a/src/renderer/components/PluginManager/PluginSlider.vue
+++ /dev/null
@@ -1,239 +0,0 @@
-<template>
-  <div v-if="hasImages">
-    <div class="PluginSlider">
-      <div class="overflow-x-hidden relative w-full h-full">
-        <!-- Images -->
-        <transition-group
-          :name="sliderClass"
-          tag="div"
-          class="flex flex-no-wrap h-full"
-          @after-leave="transitionEnd"
-        >
-          <div
-            v-for="pageId in [currentIndex]"
-            :key="pageId"
-            class="PluginSlider__slide"
-          >
-            <div
-              v-for="(image, imageId) in getPageImages(pageId)"
-              :key="imageId"
-              class="flex w-1/3 justify-center overflow-hidden mx-1 rounded-xl"
-            >
-              <img
-                :src="`data:image/png;base64,${image}`"
-                class="m-auto h-full arounded-xl"
-                @click="openImage(imageId)"
-              >
-            </div>
-          </div>
-        </transition-group>
-      </div>
-
-      <!-- Left Button -->
-      <div
-        v-if="pageCount > 1"
-        class="PluginSlider__left"
-        @click="previousImage"
-      >
-        <SvgIcon
-          name="caret-left"
-          view-box="0 0 12 12"
-        />
-      </div>
-
-      <!-- Right Button -->
-      <div
-        v-if="pageCount > 1"
-        class="PluginSlider__right"
-        @click="nextImage"
-      >
-        <SvgIcon
-          name="caret-right"
-          view-box="0 0 12 12"
-        />
-      </div>
-    </div>
-
-    <div
-      v-if="pageCount > 1"
-      class="flex mt-4 justify-center"
-    >
-      <div
-        v-for="page in pageCount"
-        :key="page"
-        class="PluginSlider__page"
-        :class="{
-          'bg-theme-button': currentIndex + 1 !== page,
-          'bg-theme-button-active': currentIndex + 1 === page
-        }"
-        @click="goToPage(page)"
-      />
-    </div>
-
-    <PluginImageModal
-      v-if="selectedImage !== null"
-      :image-index="selectedImage"
-      :images="images"
-      @close="selectedImage = null"
-    />
-  </div>
-</template>
-
-<script>
-import PluginImageModal from '@/components/PluginManager/PluginManagerModals/PluginImageModal'
-import SvgIcon from '@/components/SvgIcon/SvgIcon'
-
-export default {
-  name: 'PluginSlider',
-
-  components: {
-    PluginImageModal,
-    SvgIcon
-  },
-
-  props: {
-    plugin: {
-      type: Object,
-      required: true
-    }
-  },
-
-  data: (vm) => ({
-    perPage: 3,
-    currentIndex: 0,
-    isTransitioning: false,
-    sliderClass: 'slides-right',
-    images: vm.plugin.images,
-    selectedImage: null
-  }),
-
-  computed: {
-    hasImages () {
-      return this.images && this.images.length > 0
-    },
-
-    pageCount () {
-      return Math.ceil(this.images.length / this.perPage)
-    }
-  },
-
-  methods: {
-    getPageImages (pageIndex) {
-      return this.images.slice(pageIndex * this.perPage, (pageIndex * this.perPage) + this.perPage)
-    },
-
-    transitionEnd () {
-      this.isTransitioning = false
-    },
-
-    previousImage () {
-      if (this.isTransitioning) {
-        return
-      }
-
-      this.isTransitioning = true
-      if (this.currentIndex === 0) {
-        this.sliderClass = 'slides-right'
-        this.currentIndex = this.pageCount - 1
-      } else {
-        this.sliderClass = 'slides-left'
-        this.currentIndex--
-      }
-    },
-
-    nextImage () {
-      if (this.isTransitioning) {
-        return
-      }
-
-      this.isTransitioning = true
-      if (this.currentIndex >= this.pageCount - 1) {
-        this.sliderClass = 'slides-left'
-        this.currentIndex = 0
-      } else {
-        this.sliderClass = 'slides-right'
-        this.currentIndex++
-      }
-    },
-
-    goToPage (page) {
-      if (page < this.currentIndex + 1) {
-        this.sliderClass = 'slides-left'
-      } else if (page > this.currentIndex + 1) {
-        this.sliderClass = 'slides-right'
-      } else {
-        return
-      }
-
-      this.isTransitioning = true
-      this.currentIndex = page - 1
-    },
-
-    openImage (imageId) {
-      this.selectedImage = this.currentIndex * this.perPage + imageId
-    }
-  }
-}
-</script>
-
-<style scoped>
-.PluginSlider {
-  @apply .relative .select-none;
-  height: 150px;
-}
-
-.PluginSlider__slide {
-  @apply .absolute .flex .flex-none .h-full .pin .overflow-hidden;
-}
-.PluginSlider__slide img {
-  max-width: none;
-}
-.PluginSlider__slide img:hover {
-  @apply .cursor-pointer .opacity-75;
-}
-
-.PluginSlider__left,
-.PluginSlider__right {
-  @apply .absolute .rounded .bg-theme-button .text-theme-button-text .flex .pin-y .my-auto .cursor-pointer .shadow;
-  width: 35px;
-  height: 35px;
-}
-
-.PluginSlider__left:hover,
-.PluginSlider__right:hover {
-  @apply .bg-theme-button-active;
-}
-
-.PluginSlider__left {
-  @apply .pin-l .-ml-2;
-  padding-right: 0.125rem;
-}
-
-.PluginSlider__right {
-  @apply .pin-r .-mr-2;
-}
-
-.PluginSlider__left .SvgIcon,
-.PluginSlider__right .SvgIcon {
-  @apply .m-auto;
-}
-
-.PluginSlider__page {
-  @apply .rounded-full .p-1 .mx-1 .cursor-pointer;
-}
-
-.slides-right-leave-active,
-.slides-right-enter-active,
-.slides-left-leave-active,
-.slides-left-enter-active {
-  transition: 0.5s;
-}
-.slides-left-leave-to,
-.slides-right-enter {
-  transform: translate(100%, 0);
-}
-.slides-left-enter,
-.slides-right-leave-to {
-  transform: translate(-100%, 0);
-}
-</style>
diff --git a/src/renderer/components/PluginManager/index.js b/src/renderer/components/PluginManager/index.js
index f7ac804d3f..8c00107e47 100644
--- a/src/renderer/components/PluginManager/index.js
+++ b/src/renderer/components/PluginManager/index.js
@@ -5,7 +5,6 @@ import PluginManagerSearchBar from './PluginManagerSearchBar'
 import PluginManagerSideMenu from './PluginManagerSideMenu'
 import PluginManagerTable from './PluginManagerTable'
 import PluginLogo from './PluginLogo'
-import PluginSlider from './PluginSlider'
 
 export * from './PluginManagerModals'
 
@@ -16,6 +15,5 @@ export {
   PluginManagerSearchBar,
   PluginManagerSideMenu,
   PluginManagerTable,
-  PluginLogo,
-  PluginSlider
+  PluginLogo
 }
diff --git a/src/renderer/components/Slider/Navigation.vue b/src/renderer/components/Slider/Navigation.vue
new file mode 100755
index 0000000000..afc6e236df
--- /dev/null
+++ b/src/renderer/components/Slider/Navigation.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="Navigation">
+    <!-- Left Button -->
+    <div
+      class="Navigation__left"
+      :class="leftButtonClass"
+      @click="triggerPageAdvance('backward')"
+    >
+      <SvgIcon
+        name="caret-left"
+        view-box="0 0 12 12"
+      />
+    </div>
+
+    <!-- Right Button -->
+    <div
+      class="Navigation__right"
+      :class="rightButtonClass"
+      @click="triggerPageAdvance('forward')"
+    >
+      <SvgIcon
+        name="caret-right"
+        view-box="0 0 12 12"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import SvgIcon from '@/components/SvgIcon/SvgIcon'
+
+export default {
+  name: 'Navigation',
+
+  components: {
+    SvgIcon
+  },
+
+  props: {
+    leftButtonClass: {
+      type: String,
+      required: false,
+      default: null
+    },
+
+    rightButtonClass: {
+      type: String,
+      required: false,
+      default: null
+    }
+  },
+
+  methods: {
+    triggerPageAdvance (direction) {
+      this.$emit('navigationclick', direction)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.Navigation__left,
+.Navigation__right {
+  @apply .absolute .rounded .bg-theme-button .text-theme-button-text .flex .pin-y .my-auto .cursor-pointer .shadow;
+  width: 35px;
+  height: 35px;
+}
+
+.Navigation__left:hover,
+.Navigation__right:hover {
+  @apply .bg-theme-button-active;
+}
+
+.Navigation__left {
+  @apply .pin-l;
+  padding-right: 0.125rem;
+}
+
+.Navigation__right {
+  @apply .pin-r;
+}
+
+.Navigation__left .SvgIcon,
+.Navigation__right .SvgIcon {
+  @apply .m-auto;
+}
+</style>
diff --git a/src/renderer/components/Slider/Pagination.vue b/src/renderer/components/Slider/Pagination.vue
new file mode 100755
index 0000000000..b515c3e80d
--- /dev/null
+++ b/src/renderer/components/Slider/Pagination.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="Pagination">
+    <div
+      v-for="page in pageCount"
+      :key="page"
+      class="Pagination__page"
+      :class="{
+        'bg-theme-button': currentIndex + 1 !== page,
+        'bg-theme-button-active': currentIndex + 1 === page
+      }"
+      @click="goToPage(page)"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Pagination',
+
+  props: {
+    currentIndex: {
+      type: Number,
+      required: true
+    },
+
+    pageCount: {
+      type: Number,
+      required: true
+    }
+  },
+
+  methods: {
+    goToPage (page) {
+      this.$emit('paginationclick', page)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.Pagination {
+  @apply .flex .mt-4 .justify-center;
+}
+
+.Pagination__page {
+  @apply .rounded-full .p-1 .mx-1 .cursor-pointer;
+}
+</style>
diff --git a/src/renderer/components/Slider/SliderImage.vue b/src/renderer/components/Slider/SliderImage.vue
new file mode 100755
index 0000000000..91478e68c5
--- /dev/null
+++ b/src/renderer/components/Slider/SliderImage.vue
@@ -0,0 +1,281 @@
+<template>
+  <div
+    v-if="hasImages"
+    class="SliderImage"
+    :class="{
+      'flex flex-col': !isRow
+    }"
+  >
+    <div
+      class="SliderImage__container"
+      :class="{
+        'SliderImage__container--row': isRow,
+        'SliderImage__container--stack': !isRow
+      }"
+    >
+      <div
+        class="SliderImage__container__content"
+        :class="{
+          'overflow-x-hidden': isRow
+        }"
+      >
+        <transition-group
+          :name="sliderClass"
+          tag="div"
+          class="flex flex-no-wrap h-full"
+          @after-leave="transitionEnd"
+        >
+          <div
+            v-for="index in [currentIndex]"
+            :key="index"
+            class="SliderImage__slide"
+            :class="{
+              'SliderImage__slide--stack w-full justify-center': !isRow
+            }"
+          >
+            <div
+              v-if="isRow"
+              class="SliderImage__slide SliderImage__slide--row"
+            >
+              <div
+                v-for="(image, imageId) in getPageImages(index)"
+                :key="imageId"
+                class="flex w-1/3 justify-center overflow-hidden mx-1 rounded-xl border-2 border-theme-line-separator hover:border-grey"
+              >
+                <img
+                  :src="`data:image/png;base64,${image}`"
+                  class="m-auto h-full"
+                  @click="openImage(imageId)"
+                >
+              </div>
+            </div>
+
+            <img
+              v-else
+              :src="`data:image/png;base64,${images[index]}`"
+            >
+          </div>
+        </transition-group>
+      </div>
+
+      <Navigation
+        v-if="showNavigation && pageCount > 1"
+        :left-button-class="isRow ? '-ml-2' : 'ml-6'"
+        :right-button-class="isRow ? '-mr-2' : 'mr-6'"
+        @navigationclick="handleNavigation"
+      />
+    </div>
+
+    <Pagination
+      v-if="showPagination && pageCount > 1"
+      :current-index="currentIndex"
+      :page-count="pageCount"
+      @paginationclick="goToPage"
+    />
+
+    <slot
+      :image-index="selectedImage"
+      :close-image="closeImage"
+    />
+  </div>
+</template>
+
+<script>
+import Navigation from './Navigation.vue'
+import Pagination from './Pagination.vue'
+
+export default {
+  name: 'SliderImage',
+
+  components: {
+    Navigation,
+    Pagination
+  },
+
+  props: {
+    isRow: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+
+    images: {
+      type: Array,
+      required: true,
+      default: null
+    },
+
+    imageIndex: {
+      type: Number,
+      required: false,
+      default: 0
+    },
+
+    perPage: {
+      type: Number,
+      required: false,
+      default: 3
+    },
+
+    showNavigation: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+
+    showPagination: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  },
+
+  data: (vm) => ({
+    currentIndex: vm.imageIndex,
+    isTransitioning: false,
+    sliderClass: 'slides-right',
+    selectedImage: null
+  }),
+
+  computed: {
+    hasImages () {
+      return this.images && this.images.length > 0
+    },
+
+    pageCount () {
+      return this.isRow ? Math.ceil(this.images.length / this.perPage) : this.images.length
+    }
+  },
+
+  mounted () {
+    if (!this.isRow) {
+      document.addEventListener('keyup', this.onArrowKeys, false)
+    }
+  },
+
+  destroyed () {
+    if (!this.isRow) {
+      document.removeEventListener('keyup', this.onArrowKeys)
+    }
+  },
+
+  methods: {
+    getPageImages (pageIndex) {
+      return this.images.slice(pageIndex * this.perPage, (pageIndex * this.perPage) + this.perPage)
+    },
+
+    transitionEnd () {
+      this.isTransitioning = false
+    },
+
+    handleNavigation (direction) {
+      if (this.isTransitioning) {
+        return
+      }
+
+      const imageCount = this.isRow ? this.pageCount - 1 : this.images.length - 1
+
+      this.isTransitioning = true
+
+      if (direction === 'backward') {
+        if (this.currentIndex === 0) {
+          this.sliderClass = 'slides-right'
+          this.currentIndex = imageCount
+        } else {
+          this.sliderClass = 'slides-left'
+          this.currentIndex--
+        }
+      } else if (direction === 'forward') {
+        if (this.currentIndex >= imageCount) {
+          this.sliderClass = 'slides-left'
+          this.currentIndex = 0
+        } else {
+          this.sliderClass = 'slides-right'
+          this.currentIndex++
+        }
+      }
+    },
+
+    goToPage (page) {
+      if (page < this.currentIndex + 1) {
+        this.sliderClass = 'slides-left'
+      } else if (page > this.currentIndex + 1) {
+        this.sliderClass = 'slides-right'
+      } else {
+        return
+      }
+
+      this.isTransitioning = true
+      this.currentIndex = page - 1
+    },
+
+    onArrowKeys (event) {
+      if (event.key === 'ArrowLeft') {
+        this.transitionEnd()
+        this.handleNavigation('backward')
+      } else if (event.key === 'ArrowRight') {
+        this.transitionEnd()
+        this.handleNavigation('forward')
+      }
+    },
+
+    openImage (imageId) {
+      this.selectedImage = this.currentIndex * this.perPage + imageId
+    },
+
+    closeImage () {
+      this.selectedImage = null
+    }
+  }
+}
+</script>
+
+<style scoped>
+.SliderImage__container {
+  @apply .relative .select-none;
+}
+.SliderImage__container--row {
+  height: 150px;
+}
+.SliderImage__container--stack {
+  @apply .flex-1 .overflow-x-hidden;
+  width: 640px;
+  height: 550px;
+}
+
+.SliderImage__container__content {
+  @apply .w-full .h-full .relative;
+}
+
+.SliderImage__slide {
+  @apply .absolute .flex .flex-none .h-full .pin .overflow-hidden;
+}
+
+.SliderImage__slide--row img {
+  max-width: none;
+}
+.SliderImage__slide--row img:hover {
+  @apply .cursor-pointer .opacity-75;
+}
+
+.SliderImage__slide--stack img {
+  max-width: none;
+  height: max-content;
+  @apply .m-auto .max-h-full;
+}
+
+.slides-right-leave-active,
+.slides-right-enter-active,
+.slides-left-leave-active,
+.slides-left-enter-active {
+  transition: 0.5s;
+}
+.slides-left-leave-to,
+.slides-right-enter {
+  transform: translate(100%, 0);
+}
+.slides-left-enter,
+.slides-right-leave-to {
+  transform: translate(-100%, 0);
+}
+</style>
diff --git a/src/renderer/components/Slider/SliderImageModal.vue b/src/renderer/components/Slider/SliderImageModal.vue
new file mode 100755
index 0000000000..e3dc87eb76
--- /dev/null
+++ b/src/renderer/components/Slider/SliderImageModal.vue
@@ -0,0 +1,76 @@
+<template>
+  <ModalWindow
+    v-if="imageIndex !== null"
+    modal-classes="SliderImageModal"
+    @close="emitClose"
+  >
+    <SliderImage
+      :images="images"
+      :image-index="imageIndex"
+      :show-navigation="showNavigation"
+      :show-pagination="showPagination"
+    />
+  </ModalWindow>
+</template>
+
+<script>
+import { ModalWindow } from '@/components/Modal'
+import SliderImage from './SliderImage'
+
+export default {
+  name: 'SliderImageModal',
+
+  components: {
+    ModalWindow,
+    SliderImage
+  },
+
+  props: {
+    images: {
+      type: Array,
+      required: true,
+      default: null
+    },
+
+    imageIndex: {
+      type: Number,
+      required: false,
+      default: 0
+    },
+
+    showNavigation: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+
+    showPagination: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+
+    closeImage: {
+      type: Function,
+      required: true,
+      default: null
+    }
+  },
+
+  methods: {
+    emitClose () {
+      this.closeImage()
+      this.$emit('close')
+    }
+  }
+}
+</script>
+
+<style>
+.SliderImageModal .ModalWindow__container__content {
+  @apply .p-4;
+}
+.SliderImageModal article {
+  @apply .flex .mt-0;
+}
+</style>
diff --git a/src/renderer/components/Slider/index.js b/src/renderer/components/Slider/index.js
new file mode 100755
index 0000000000..ffb2243c9e
--- /dev/null
+++ b/src/renderer/components/Slider/index.js
@@ -0,0 +1,7 @@
+import SliderImage from './SliderImage'
+import SliderImageModal from './SliderImageModal'
+
+export {
+  SliderImage,
+  SliderImageModal
+}

From ab1b3a586f0c1069e4e7089d2ad821917f673e8e Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:06:57 -0300
Subject: [PATCH 13/48] fix: break words for long vendorfield in the tooltip
 (#1885)

---
 .../Transaction/TransactionTable/TransactionTable.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/Transaction/TransactionTable/TransactionTable.vue b/src/renderer/components/Transaction/TransactionTable/TransactionTable.vue
index fe0d9164ad..d8fed8f44c 100644
--- a/src/renderer/components/Transaction/TransactionTable/TransactionTable.vue
+++ b/src/renderer/components/Transaction/TransactionTable/TransactionTable.vue
@@ -22,7 +22,7 @@
               v-show="isDashboard"
               v-tooltip="{
                 content: data.row.vendorField,
-                classes: 'text-xs',
+                classes: 'max-w-xs break-words text-justify text-xs',
                 trigger: 'hover',
                 container: '.TransactionTable'
               }"

From c7eda7f32793da0a2ead9f4a7db2708e604ddf59 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:07:05 -0300
Subject: [PATCH 14/48] fix: highlight text color on qrcode modal (#1884)

---
 src/renderer/components/Modal/ModalQrCodeScanner.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/Modal/ModalQrCodeScanner.vue b/src/renderer/components/Modal/ModalQrCodeScanner.vue
index ec4e503171..674dfce968 100644
--- a/src/renderer/components/Modal/ModalQrCodeScanner.vue
+++ b/src/renderer/components/Modal/ModalQrCodeScanner.vue
@@ -44,7 +44,7 @@
 
         <span
           :class="{
-            'absolute pin-b pin-x text-center py-4 bg-black-transparent': !isLoading
+            'absolute pin-b pin-x text-center py-4 bg-black-transparent text-theme-explanation-text': !isLoading
           }"
         >
           {{ $t('MODAL_QR_SCANNER.INSTRUCTION') }}

From 9243d8c318b95d549c96f120ccc0c61fe18f9d83 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 06:07:24 +0300
Subject: [PATCH 15/48] chore(deps): update dependency chalk to v4 (#1878)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2c4331e22d..6e6dd53727 100644
--- a/package.json
+++ b/package.json
@@ -138,7 +138,7 @@
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-register": "^6.26.0",
     "cfonts": "^2.4.2",
-    "chalk": "^3.0.0",
+    "chalk": "^4.0.0",
     "codecov": "^3.6.5",
     "copy-webpack-plugin": "^5.0.2",
     "cross-env": "^7.0.0",
diff --git a/yarn.lock b/yarn.lock
index 3507cfd207..456784d19e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3382,6 +3382,14 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72"
+  integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 change-case@3.0.x:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.0.2.tgz#fd48746cce02f03f0a672577d1d3a8dc2eceb037"

From 14c5a5615c5a17f4527ace154de55c6205a79896 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 06:07:32 +0300
Subject: [PATCH 16/48] chore(deps): update dependency electron-notarize to
 ^0.3.0 (#1869)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6e6dd53727..baf0ef3d3f 100644
--- a/package.json
+++ b/package.json
@@ -149,7 +149,7 @@
     "electron-builder": "22.4.1",
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^2.2.4",
-    "electron-notarize": "^0.2.1",
+    "electron-notarize": "^0.3.0",
     "eslint": "^6.1.0",
     "eslint-config-standard": "^14.0.0",
     "eslint-friendly-formatter": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 456784d19e..630ecaad47 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5004,10 +5004,10 @@ electron-log@^4.0.0:
   resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.0.6.tgz#7d4244082a6f5ae3838f3fa4cd7271f8dd610bf1"
   integrity sha512-inoIFKld98aRAp/l5IzLFx8Oc9sp+SKlTCrVgZKWK+qcI92rT574Ybgcah5dU8G3485vc7ClFIEfCf/IERyBJA==
 
-electron-notarize@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.2.1.tgz#759e8006decae19134f82996ed910db26d9192cc"
-  integrity sha512-oZ6/NhKeXmEKNROiFmRNfytqu3cxqC95sjooG7kBXQVEUSQkZnbiAhxVh5jXngL881G197pbwpeVPJyM7Ikmxw==
+electron-notarize@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.3.0.tgz#b93c606306eac558b250c78ff95273ddb9fedf0a"
+  integrity sha512-tuDw8H0gcDOalNLv6RM2CwGvUXU60MPGZRDEmd0ppX+yP5XqL8Ec2DuXyz9J7WQSA3aRCfzIgH8C5CAivDYWMw==
   dependencies:
     debug "^4.1.1"
     fs-extra "^8.1.0"

From 5ebf23686a1326e9bb85410454ddeedb779afcf6 Mon Sep 17 00:00:00 2001
From: Edgar Goetzendorff <hello@dated.fun>
Date: Thu, 9 Apr 2020 05:07:44 +0200
Subject: [PATCH 17/48] fix: don't show error when canceling open file dialog
 (#1881)

---
 .../TransactionFormTransfer.vue               | 58 ++++++++++---------
 src/renderer/mixins/electron.js               |  2 +-
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
index d4541c89be..163c976e92 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
@@ -492,42 +492,44 @@ export default {
       try {
         const raw = await this.electron_readFile()
 
-        try {
-          const transaction = JSON.parse(raw)
+        if (raw) {
+          try {
+            const transaction = JSON.parse(raw)
 
-          if (parseInt(transaction.type, 10) !== TRANSACTION_TYPES.GROUP_1.TRANSFER) {
-            throw new Error(this.$t('VALIDATION.INVALID_TYPE'))
-          }
+            if (parseInt(transaction.type, 10) !== TRANSACTION_TYPES.GROUP_1.TRANSFER) {
+              throw new Error(this.$t('VALIDATION.INVALID_TYPE'))
+            }
 
-          if (transaction.recipientId) {
-            if (WalletService.validateAddress(transaction.recipientId, this.session_network.version)) {
-              this.$refs.recipient.model = transaction.recipientId
-            } else {
-              throw new Error(this.$t('VALIDATION.RECIPIENT_DIFFERENT_NETWORK', [
-                this.wallet_truncate(transaction.recipientId)
-              ]))
+            if (transaction.recipientId) {
+              if (WalletService.validateAddress(transaction.recipientId, this.session_network.version)) {
+                this.$refs.recipient.model = transaction.recipientId
+              } else {
+                throw new Error(this.$t('VALIDATION.RECIPIENT_DIFFERENT_NETWORK', [
+                  this.wallet_truncate(transaction.recipientId)
+                ]))
+              }
             }
-          }
 
-          if (transaction.amount) {
-            this.$refs.amount.model = this.currency_subToUnit(transaction.amount, this.session_network)
-          }
+            if (transaction.amount) {
+              this.$refs.amount.model = this.currency_subToUnit(transaction.amount, this.session_network)
+            }
 
-          if (transaction.fee) {
-            this.$refs.fee.$refs.input.model = this.currency_subToUnit(transaction.fee, this.session_network)
-          }
+            if (transaction.fee) {
+              this.$refs.fee.$refs.input.model = this.currency_subToUnit(transaction.fee, this.session_network)
+            }
 
-          if (transaction.vendorField) {
-            this.$refs.vendorField.model = transaction.vendorField
-          }
+            if (transaction.vendorField) {
+              this.$refs.vendorField.model = transaction.vendorField
+            }
 
-          this.$success(this.$t('TRANSACTION.SUCCESS.LOAD_FROM_FILE'))
-        } catch (error) {
-          if (error.name === 'SyntaxError') {
-            error.message = this.$t('VALIDATION.INVALID_FORMAT')
-          }
+            this.$success(this.$t('TRANSACTION.SUCCESS.LOAD_FROM_FILE'))
+          } catch (error) {
+            if (error.name === 'SyntaxError') {
+              error.message = this.$t('VALIDATION.INVALID_FORMAT')
+            }
 
-          this.$error(`${this.$t('TRANSACTION.ERROR.LOAD_FROM_FILE')}: ${error.message}`)
+            this.$error(`${this.$t('TRANSACTION.ERROR.LOAD_FROM_FILE')}: ${error.message}`)
+          }
         }
       } catch (error) {
         this.$error(`${this.$t('TRANSACTION.ERROR.LOAD_FROM_FILE')}: ${error.message}`)
diff --git a/src/renderer/mixins/electron.js b/src/renderer/mixins/electron.js
index 560860a17a..523f9df427 100644
--- a/src/renderer/mixins/electron.js
+++ b/src/renderer/mixins/electron.js
@@ -66,7 +66,7 @@ export default {
         filters
       })
 
-      if (!filePaths) return
+      if (!filePaths || !filePaths.length) return
 
       if (options.restrictToPath && !validatePath(options.restrictToPath, filePaths[0])) {
         throw new Error(`Path "${filePaths[0]}" not allowed`)

From 1f7953d59055484c6a029239d757746e8668245b Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:18:32 -0300
Subject: [PATCH 18/48] fix: exclude empty wallets and don't show success
 message when canceling a save file dialog (#1892)

---
 src/renderer/components/Modal/ModalExportWallets.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/Modal/ModalExportWallets.vue b/src/renderer/components/Modal/ModalExportWallets.vue
index 7d4c1993e6..3ec69d3e05 100644
--- a/src/renderer/components/Modal/ModalExportWallets.vue
+++ b/src/renderer/components/Modal/ModalExportWallets.vue
@@ -86,7 +86,7 @@ export default {
         },
         excludeEmpty: {
           active: false,
-          filter: el => el.balance
+          filter: el => Number(el.balance)
         },
         excludeLedger: {
           active: false,
@@ -253,12 +253,17 @@ export default {
 
       try {
         const path = await this.electron_writeFile(raw, defaultPath)
-        this.$success(this.$t('MODAL_EXPORT_WALLETS.SUCCESS.EXPORT_WALLETS', { path }))
+
+        if (path) {
+          this.$success(this.$t('MODAL_EXPORT_WALLETS.SUCCESS.EXPORT_WALLETS', { path }))
+          this.emitClose()
+        } else {
+          return
+        }
       } catch (e) {
         this.$error(this.$t('MODAL_EXPORT_WALLETS.ERROR.EXPORT_WALLETS'))
       } finally {
         this.isExporting = false
-        this.emitClose()
       }
     }
   },

From 72ef1a6f7d4accba902b670104bde7ffe79d870e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 06:18:56 +0300
Subject: [PATCH 19/48] chore(deps): update dependency html-webpack-plugin to
 v4 (#1858)

---
 .electron-vue/dev-runner.js |   4 +-
 package.json                |   2 +-
 yarn.lock                   | 104 ++++++++++++++++++++++++++++++++++--
 3 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/.electron-vue/dev-runner.js b/.electron-vue/dev-runner.js
index 7d3de6a6fc..783de60b31 100644
--- a/.electron-vue/dev-runner.js
+++ b/.electron-vue/dev-runner.js
@@ -9,6 +9,8 @@ const webpack = require('webpack')
 const WebpackDevServer = require('webpack-dev-server')
 const webpackHotMiddleware = require('webpack-hot-middleware')
 
+const HtmlWebpackPlugin = require('html-webpack-plugin')
+
 const mainConfig = require('./webpack.main.config')
 const rendererConfig = require('./webpack.renderer.config')
 
@@ -50,7 +52,7 @@ function startRenderer () {
     })
 
     compiler.hooks.compilation.tap('compilation', compilation => {
-      compilation.hooks.htmlWebpackPluginAfterEmit.tapAsync('html-webpack-plugin-after-emit', (data, cb) => {
+      HtmlWebpackPlugin.getHooks(compilation).afterEmit.tapAsync('html-webpack-plugin-after-emit', (data, cb) => {
         hotMiddleware.publish({ action: 'reload' })
         cb()
       })
diff --git a/package.json b/package.json
index baf0ef3d3f..0bb9cd0cf0 100644
--- a/package.json
+++ b/package.json
@@ -161,7 +161,7 @@
     "eslint-plugin-vue": "^6.0.0",
     "file-loader": "^6.0.0",
     "glob-all": "^3.1.0",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.0.0",
     "husky": "^4.0.0",
     "intl": "^1.2.5",
     "jest": "^24.9.0",
diff --git a/yarn.lock b/yarn.lock
index 630ecaad47..7c76d0778c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3274,6 +3274,14 @@ camel-case@3.0.x, camel-case@^3.0.0:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
+camel-case@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
+  integrity sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==
+  dependencies:
+    pascal-case "^3.1.1"
+    tslib "^1.10.0"
+
 camelcase-css@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
@@ -3562,6 +3570,13 @@ clean-css@4.2.x, clean-css@^4.2.1:
   dependencies:
     source-map "~0.6.0"
 
+clean-css@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
+  integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
+  dependencies:
+    source-map "~0.6.0"
+
 clean-stack@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -3771,6 +3786,11 @@ commander@^4.0.0, commander@^4.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.0.tgz#545983a0603fe425bc672d66c9e3c89c42121a83"
   integrity sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==
 
+commander@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
 commander@~2.19.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -4820,6 +4840,14 @@ dot-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
+dot-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
+  integrity sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==
+  dependencies:
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
 dot-prop@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz#c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"
@@ -6800,7 +6828,7 @@ he@1.1.x:
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
   integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
 
-he@1.2.x, he@^1.1.0, he@^1.1.1:
+he@1.2.x, he@^1.1.0, he@^1.1.1, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -6881,6 +6909,19 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
   integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
 
+html-minifier-terser@^5.0.1:
+  version "5.0.5"
+  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.5.tgz#8f12f639789f04faa9f5cf2ff9b9f65607f21f8b"
+  integrity sha512-cBSFFghQh/uHcfSiL42KxxIRMF7A144+3E44xdlctIjxEmkEfCvouxNyFH2wysXk1fCGBPwtcr3hDWlGTfkDew==
+  dependencies:
+    camel-case "^4.1.1"
+    clean-css "^4.2.3"
+    commander "^4.1.1"
+    he "^1.2.0"
+    param-case "^3.0.3"
+    relateurl "^0.2.7"
+    terser "^4.6.3"
+
 html-minifier@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-2.1.7.tgz#9051d6fcbbcf214ed307e1ad74f432bb9ad655cc"
@@ -6920,6 +6961,18 @@ html-webpack-plugin@^3.2.0:
     toposort "^1.0.0"
     util.promisify "1.0.0"
 
+html-webpack-plugin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.1.tgz#f5e5ec9cd40967e691df3ffce91bb65c6c0123ad"
+  integrity sha512-L6JkRGdvcZcA/zYbELcGvdQKAPtH8mfRE7R5u9/9kXZlZyhteQoae43XPfRS9QEIrMGU/myoRT3X4Ysw1ISyfw==
+  dependencies:
+    html-minifier-terser "^5.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.15"
+    pretty-error "^2.1.1"
+    tapable "^1.1.3"
+    util.promisify "1.0.0"
+
 htmlparser2@^3.3.0, htmlparser2@^3.8.3, htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -9038,6 +9091,13 @@ lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
+lower-case@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
+  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
+  dependencies:
+    tslib "^1.10.0"
+
 lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -9656,6 +9716,14 @@ no-case@^2.2.0, no-case@^2.3.2:
   dependencies:
     lower-case "^1.1.1"
 
+no-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
+  integrity sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==
+  dependencies:
+    lower-case "^2.0.1"
+    tslib "^1.10.0"
+
 nock@^11.0.0-beta.31:
   version "11.3.6"
   resolved "https://registry.yarnpkg.com/nock/-/nock-11.3.6.tgz#cd87eb47ed9755d6d1e04dee1d56722267cb3283"
@@ -10316,6 +10384,14 @@ param-case@2.1.x, param-case@^2.1.0:
   dependencies:
     no-case "^2.2.0"
 
+param-case@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
+  integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==
+  dependencies:
+    dot-case "^3.0.3"
+    tslib "^1.10.0"
+
 parent-module@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -10402,6 +10478,14 @@ pascal-case@^2.0.0:
     camel-case "^3.0.0"
     upper-case-first "^1.1.0"
 
+pascal-case@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
+  integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==
+  dependencies:
+    no-case "^3.0.3"
+    tslib "^1.10.0"
+
 pascalcase@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -10933,7 +11017,7 @@ pretty-bytes@^5.3.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz#f2849e27db79fb4d6cfe24764fc4134f165989f2"
   integrity sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==
 
-pretty-error@^2.0.2:
+pretty-error@^2.0.2, pretty-error@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
   integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
@@ -11480,7 +11564,7 @@ regjsparser@^0.6.0:
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@0.2.x:
+relateurl@0.2.x, relateurl@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
@@ -13057,6 +13141,15 @@ terser@^4.1.2:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+terser@^4.6.3:
+  version "4.6.7"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz#478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"
+  integrity sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 test-exclude@^5.2.3:
   version "5.2.3"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
@@ -13355,6 +13448,11 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
+tslib@^1.10.0:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
+  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
+
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"

From 173ab83801c8ccdf391cbafdf44405d5adbc5a59 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2020 06:19:34 +0300
Subject: [PATCH 20/48] chore(deps): update dependency eslint-loader to v4
 (#1886)

---
 package.json |  2 +-
 yarn.lock    | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 0bb9cd0cf0..0d71ba504d 100644
--- a/package.json
+++ b/package.json
@@ -153,7 +153,7 @@
     "eslint": "^6.1.0",
     "eslint-config-standard": "^14.0.0",
     "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^3.0.0",
+    "eslint-loader": "^4.0.0",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.2.1",
diff --git a/yarn.lock b/yarn.lock
index 7c76d0778c..5f51be3df7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5332,16 +5332,16 @@ eslint-import-resolver-node@^0.3.2:
     debug "^2.6.9"
     resolve "^1.5.0"
 
-eslint-loader@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.2.tgz#5a627316a51d6f41d357b9f6f0554e91506cdd6e"
-  integrity sha512-S5VnD+UpVY1PyYRqeBd/4pgsmkvSokbHqTXAQMpvCyRr3XN2tvSLo9spm2nEpqQqh9dezw3os/0zWihLeOg2Rw==
+eslint-loader@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-4.0.0.tgz#ab096ce9168fa167e4159afff66692c173fc7b79"
+  integrity sha512-QoaFRdh3oXt5i2uonSjO8dDnncsG05w7qvA7yYMvGDne8zAEk9R+R1rsfunp3OKVdO5mAJelf1x2Z1kYp664kA==
   dependencies:
-    fs-extra "^8.1.0"
-    loader-fs-cache "^1.0.2"
-    loader-utils "^1.2.3"
-    object-hash "^1.3.1"
-    schema-utils "^2.2.0"
+    fs-extra "^9.0.0"
+    loader-fs-cache "^1.0.3"
+    loader-utils "^2.0.0"
+    object-hash "^2.0.3"
+    schema-utils "^2.6.5"
 
 eslint-module-utils@^2.4.0:
   version "2.4.1"
@@ -8719,13 +8719,13 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-loader-fs-cache@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz#54cedf6b727e1779fd8f01205f05f6e88706f086"
-  integrity sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==
+loader-fs-cache@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz#f08657646d607078be2f0a032f8bd69dd6f277d9"
+  integrity sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==
   dependencies:
     find-cache-dir "^0.1.1"
-    mkdirp "0.5.1"
+    mkdirp "^0.5.1"
 
 loader-runner@^2.4.0:
   version "2.4.0"
@@ -10047,10 +10047,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-hash@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
-  integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
+object-hash@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
+  integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
 
 object-inspect@^1.6.0:
   version "1.6.0"
@@ -11972,7 +11972,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.0, schema-utils@^2.2.0:
+schema-utils@^2.0.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.4.1.tgz#e89ade5d056dc8bcaca377574bb4a9c4e1b8be56"
   integrity sha512-RqYLpkPZX5Oc3fw/kHHHyP56fg5Y+XBpIpV8nCg0znIALfq3OH+Ea9Hfeac9BAMwG5IICltiZ0vxFvJQONfA5w==

From 0e24e538c78952519a7abfeb4f2d8162d18fb43f Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 00:20:17 -0300
Subject: [PATCH 21/48] fix: add clearTimeout to the button clipboard component
 (#1880)

---
 src/renderer/components/Button/ButtonClipboard.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/renderer/components/Button/ButtonClipboard.vue b/src/renderer/components/Button/ButtonClipboard.vue
index f9ad016f9f..9f72356965 100644
--- a/src/renderer/components/Button/ButtonClipboard.vue
+++ b/src/renderer/components/Button/ButtonClipboard.vue
@@ -47,7 +47,8 @@ export default {
   data: () => ({
     isCopying: false,
     isCopySupported: true,
-    copyText: ''
+    copyText: '',
+    timeout: null
   }),
 
   mounted () {
@@ -60,6 +61,10 @@ export default {
     }
   },
 
+  beforeDestroy () {
+    clearTimeout(this.timeout)
+  },
+
   methods: {
     copy () {
       const textArea = document.createElement('textarea')
@@ -70,8 +75,8 @@ export default {
       textArea.select()
 
       this.isCopying = true
-      setTimeout(() => (this.isCopying = false), 1000)
-      setTimeout(() => (this.copyText = this.$t('BUTTON_CLIPBOARD.COPY_TO_CLIPBOARD', [this.subject])), 1500)
+      this.timeout = setTimeout(() => (this.isCopying = false), 1000)
+      this.timeout = setTimeout(() => (this.copyText = this.$t('BUTTON_CLIPBOARD.COPY_TO_CLIPBOARD', [this.subject])), 1500)
 
       try {
         document.execCommand('copy')

From 0c2654179b9e1779b5b0b704fc7c09e4b615f362 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Thu, 9 Apr 2020 23:06:46 -0300
Subject: [PATCH 22/48] refactor: update code to install vue-devtools (#1896)

---
 src/main/index.dev.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/index.dev.js b/src/main/index.dev.js
index d0da5a5ae8..d94ea34921 100644
--- a/src/main/index.dev.js
+++ b/src/main/index.dev.js
@@ -14,9 +14,9 @@ require('electron-debug')({ showDevTools: true })
 require('electron-log')
 
 // Install `vue-devtools`
-require('electron').app.on('ready', () => {
-  let installExtension = require('electron-devtools-installer')
-  installExtension.default(installExtension.VUEJS_DEVTOOLS)
+require('electron').app.whenReady().then(() => {
+  const { default: installExtension, VUEJS_DEVTOOLS } = require('electron-devtools-installer')
+  installExtension(VUEJS_DEVTOOLS)
     .then(() => {})
     .catch(err => {
       console.log('Unable to install `vue-devtools`: \n', err)

From 845cee3eb9e985a3aac885186340fc70fe826fdd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2020 05:07:14 +0300
Subject: [PATCH 23/48] chore(deps): update dependency
 electron-devtools-installer to v3 (#1889)

---
 package.json |  2 +-
 yarn.lock    | 80 +++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 0d71ba504d..cb2a54dd80 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "electron": "^8.0.0",
     "electron-builder": "22.4.1",
     "electron-debug": "^3.0.1",
-    "electron-devtools-installer": "^2.2.4",
+    "electron-devtools-installer": "^3.0.0",
     "electron-notarize": "^0.3.0",
     "eslint": "^6.1.0",
     "eslint-config-standard": "^14.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5f51be3df7..b54f95263d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7,11 +7,6 @@
   resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f"
   integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==
 
-"7zip@0.0.6":
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
-  integrity sha1-nK+xca+CMpSQNTtIFvAzR6oVCjA=
-
 "@arkecosystem/client@^1.0.5":
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/@arkecosystem/client/-/client-1.0.5.tgz#757426afdb9ab7b13464fd0acebf5f17abbdddaf"
@@ -4156,11 +4151,6 @@ cross-spawn@^7.0.1:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cross-unzip@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f"
-  integrity sha1-UYO8R6CVWb78+YzEZXlkmZNZNy8=
-
 crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -4973,15 +4963,14 @@ electron-debug@^3.0.1:
     electron-is-dev "^1.1.0"
     electron-localshortcut "^3.1.0"
 
-electron-devtools-installer@^2.2.4:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.4.tgz#261a50337e37121d338b966f07922eb4939a8763"
-  integrity sha512-b5kcM3hmUqn64+RUcHjjr8ZMpHS2WJ5YO0pnG9+P/RTdx46of/JrEjuciHWux6pE+On6ynWhHJF53j/EDJN0PA==
+electron-devtools-installer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-3.0.0.tgz#b5c439708746ed36f7b0220e18657567bca275d8"
+  integrity sha512-zll3w/8PvnPiGmL5tBtgSSoSjWnUljsOjJYsYYU12PKLljzWyfD6S75LKTZFn21VYxVbae2OwmjM5uFStLp6nQ==
   dependencies:
-    "7zip" "0.0.6"
-    cross-unzip "0.0.2"
-    rimraf "^2.5.2"
-    semver "^5.3.0"
+    rimraf "^3.0.2"
+    semver "^7.2.1"
+    unzip-crx "^0.2.0"
 
 electron-dl@^3.0.0:
   version "3.0.0"
@@ -8496,6 +8485,16 @@ jsqr@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsqr/-/jsqr-1.2.0.tgz#f93fc65fa7d1ded78b1bcb020fa044352b04261a"
   integrity sha512-wKcQS9QC2VHGk7aphWCp1RrFyC0CM6fMgC5prZZ2KV/Lk6OKNoCod9IR6bao+yx3KPY0gZFC5dc+h+KFzCI0Wg==
 
+jszip@^3.1.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.3.0.tgz#29d72c21a54990fa885b11fc843db320640d5271"
+  integrity sha512-EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw==
+  dependencies:
+    lie "~3.3.0"
+    pako "~1.0.2"
+    readable-stream "~2.3.6"
+    set-immediate-shim "~1.0.1"
+
 keccak@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/keccak/-/keccak-2.1.0.tgz#734ea53f2edcfd0f42cdb8d5f4c358fef052752b"
@@ -8620,6 +8619,13 @@ lie@3.1.1:
   dependencies:
     immediate "~3.0.5"
 
+lie@~3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
+  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
+  dependencies:
+    immediate "~3.0.5"
+
 lines-and-columns@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -10363,6 +10369,11 @@ pako@^1.0.10:
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
   integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
 
+pako@~1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
+
 pako@~1.0.5:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.7.tgz#2473439021b57f1516c82f58be7275ad8ef1bb27"
@@ -11808,7 +11819,7 @@ rimraf@2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
+rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -11822,6 +11833,13 @@ rimraf@^3.0.0:
   dependencies:
     glob "^7.1.3"
 
+rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -12068,6 +12086,11 @@ semver@^7.1.2, semver@^7.1.3:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
   integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
 
+semver@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.1.tgz#d997aa36bdbb00b501ae4ac4c7d17e9f7a587ae5"
+  integrity sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -12151,6 +12174,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
+set-immediate-shim@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -13690,6 +13718,15 @@ unused-filename@^2.1.0:
     modify-filename "^1.1.0"
     path-exists "^4.0.0"
 
+unzip-crx@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/unzip-crx/-/unzip-crx-0.2.0.tgz#4c0baa8bdac756256754beca7843c13d7b858c18"
+  integrity sha1-TAuqi9rHViVnVL7KeEPBPXuFjBg=
+  dependencies:
+    jszip "^3.1.0"
+    mkdirp "^0.5.1"
+    yaku "^0.16.6"
+
 upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
@@ -14926,6 +14963,11 @@ yaeti@^0.0.6:
   resolved "https://registry.yarnpkg.com/yaeti/-/yaeti-0.0.6.tgz#f26f484d72684cf42bedfb76970aa1608fbf9577"
   integrity sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=
 
+yaku@^0.16.6:
+  version "0.16.7"
+  resolved "https://registry.yarnpkg.com/yaku/-/yaku-0.16.7.tgz#1d195c78aa9b5bf8479c895b9504fd4f0847984e"
+  integrity sha1-HRlceKqbW/hHnIlblQT9TwhHmE4=
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"

From 5f6200aace9ce84d3fdf3a9141184a9d246a33c5 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Wed, 29 Apr 2020 10:43:47 -0300
Subject: [PATCH 24/48] fix: break words or truncate if the name of the wallet
 is long (#1901)

---
 ...TransactionConfirmBridgechainRegistration.spec.js |  2 +-
 .../TransactionConfirmBridgechainResignation.spec.js |  2 +-
 .../TransactionConfirmBridgechainUpdate.spec.js      |  2 +-
 .../TransactionConfirmBusinessRegistration.spec.js   |  2 +-
 .../TransactionConfirmBusinessResignation.spec.js    |  2 +-
 .../TransactionConfirmBusinessUpdate.spec.js         |  2 +-
 .../TransactionConfirmDelegateRegistration.spec.js   |  2 +-
 .../TransactionConfirmDelegateResignation.spec.js    |  2 +-
 .../TransactionConfirmIpfs.spec.js                   |  2 +-
 .../TransactionConfirmMultiPayment.spec.js           |  2 +-
 .../TransactionConfirmMultiSignature.spec.js         |  2 +-
 .../TransactionConfirmSecondSignature.spec.js        |  2 +-
 .../TransactionConfirmTransfer.spec.js               |  4 ++--
 .../TransactionConfirmVote.spec.js                   |  2 +-
 src/renderer/components/Input/InputField.vue         |  2 +-
 .../TransactionConfirmBridgechainRegistration.vue    |  5 ++++-
 .../TransactionConfirmBridgechainResignation.vue     |  5 ++++-
 .../TransactionConfirmBridgechainUpdate.vue          |  5 ++++-
 .../TransactionConfirmBusinessRegistration.vue       |  5 ++++-
 .../TransactionConfirmBusinessResignation.vue        |  5 ++++-
 .../TransactionConfirmBusinessUpdate.vue             |  5 ++++-
 .../TransactionConfirmDelegateRegistration.vue       |  5 ++++-
 .../TransactionConfirmDelegateResignation.vue        |  5 ++++-
 .../TransactionConfirm/TransactionConfirmIpfs.vue    |  5 ++++-
 .../TransactionConfirmMultiPayment.vue               |  5 ++++-
 .../TransactionConfirmMultiSignature.vue             |  5 ++++-
 .../TransactionConfirmSecondSignature.vue            |  5 ++++-
 .../TransactionConfirmTransfer.vue                   | 10 ++++++++--
 .../TransactionConfirm/TransactionConfirmVote.vue    |  5 ++++-
 .../TransactionFormBridgechainResignation.vue        |  9 +++++++--
 .../TransactionFormBridgechain/mixin.vue             |  9 +++++++--
 .../TransactionFormBusinessResignation.vue           |  9 +++++++--
 .../TransactionFormBusiness/mixin.vue                |  9 +++++++--
 .../TransactionFormDelegateRegistration.vue          |  9 +++++++--
 .../TransactionFormDelegateResignation.vue           |  9 +++++++--
 .../TransactionForm/TransactionFormIpfs.vue          |  9 +++++++--
 .../TransactionForm/TransactionFormMultiPayment.vue  |  9 +++++++--
 .../TransactionFormMultiSignature.vue                |  9 +++++++--
 .../TransactionFormSecondSignature.vue               |  9 +++++++--
 .../TransactionForm/TransactionFormTransfer.vue      |  9 +++++++--
 .../TransactionForm/TransactionFormVote.vue          |  9 +++++++--
 .../Transaction/TransactionShow/TransactionShow.vue  | 12 +++++++++++-
 .../TransactionShowMultiSignature.vue                | 11 +++++++++++
 43 files changed, 182 insertions(+), 56 deletions(-)

diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.spec.js
index 9e793ac65e..a2c51eca9f 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.spec.js
@@ -60,7 +60,7 @@ describe('TransactionConfirmBridgechainRegistration', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmBridgechainRegistration__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmBridgechainRegistration__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output name', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.spec.js
index a967374ad9..ac96c63029 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.spec.js
@@ -43,7 +43,7 @@ describe('TransactionConfirmBridgechainResignation', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmBridgechainResignation__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmBridgechainResignation__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.spec.js
index 3867c781fe..259e651a22 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.spec.js
@@ -57,7 +57,7 @@ describe('TransactionConfirmBridgechainUpdate', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmBridgechainUpdate__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmBridgechainUpdate__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output seed nodes', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.spec.js
index dc1d6d3c83..31d606fdbd 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.spec.js
@@ -54,7 +54,7 @@ describe('TransactionConfirmBusinessRegistration', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmBusinessRegistration__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmBusinessRegistration__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output name', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.spec.js
index dd3bc742be..3fc2b03a60 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.spec.js
@@ -43,7 +43,7 @@ describe('TransactionConfirmBusinessResignation', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmBusinessResignation__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmBusinessResignation__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.spec.js
index 38fc3d6c24..13ee0cb118 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.spec.js
@@ -54,7 +54,7 @@ describe('TransactionConfirmBusinessUpdate', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmBusinessUpdate__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmBusinessUpdate__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output name', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.spec.js
index c5db5b1c33..a891232894 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.spec.js
@@ -47,7 +47,7 @@ describe('TransactionConfirmDelegateRegistration', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmDelegateRegistration__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmDelegateRegistration__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output username', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.spec.js
index 1ba684b9e8..f6d30940a6 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.spec.js
@@ -39,7 +39,7 @@ describe('TransactionConfirmDelegateResignation', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmDelegateResignation__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmDelegateResignation__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.spec.js
index 8399b7134b..ac15e0d0e0 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.spec.js
@@ -39,7 +39,7 @@ describe('TransactionConfirmIpfs', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmIpfs__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmIpfs__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js
index fe327e8fee..387b2471ba 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js
@@ -61,7 +61,7 @@ describe('TransactionConfirmMultiPayment', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmMultiPayment__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmMultiPayment__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output recipients', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.spec.js
index ca17c0b11d..712bfb1f04 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.spec.js
@@ -39,7 +39,7 @@ describe('TransactionConfirmMultiSignature', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmMultiSignature__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmMultiSignature__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.spec.js
index d462509f04..088f08d924 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.spec.js
@@ -39,7 +39,7 @@ describe('TransactionConfirmSecondSignature', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmSecondSignature__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmSecondSignature__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.spec.js
index f93e40182c..5a6062b956 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.spec.js
@@ -47,7 +47,7 @@ describe('TransactionConfirmTransfer', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmTransfer__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmTransfer__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
 
     it('should output amount', () => {
@@ -55,7 +55,7 @@ describe('TransactionConfirmTransfer', () => {
     })
 
     it('should output recipientLabel', () => {
-      expect(wrapper.find('.TransactionConfirmTransfer__recipient .ListDividedItem__value span').text()).toBe('recipient-address')
+      expect(wrapper.find('.TransactionConfirmTransfer__recipient .ListDividedItem__value span:first-child').text()).toBe('formatted-recipient-address')
     })
 
     it('should output vendorField', () => {
diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmVote.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmVote.spec.js
index 076221c61e..e922a48375 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmVote.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmVote.spec.js
@@ -39,7 +39,7 @@ describe('TransactionConfirmVote', () => {
     })
 
     it('should output senderLabel', () => {
-      expect(wrapper.find('.TransactionConfirmVote__sender .ListDividedItem__value span').text()).toBe('address-1')
+      expect(wrapper.find('.TransactionConfirmVote__sender .ListDividedItem__value span:first-child').text()).toBe('formatted-address-1')
     })
   })
 
diff --git a/src/renderer/components/Input/InputField.vue b/src/renderer/components/Input/InputField.vue
index 2fee7da6ae..292761b3bd 100644
--- a/src/renderer/components/Input/InputField.vue
+++ b/src/renderer/components/Input/InputField.vue
@@ -22,7 +22,7 @@
     </div>
     <p
       v-show="warningText || helperText"
-      class="InputField__helper text-theme-page-text-light text-xs mt-1"
+      class="InputField__helper text-theme-page-text-light text-xs mt-1 break-words"
     >
       <slot name="helper">
         {{ warningText || helperText }}
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.vue
index 71e9919048..0e09b77ed0 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainRegistration.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmBridgechainRegistration__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.vue
index 5cdf03dfe6..d4073dbffc 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainResignation.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmBridgechainResignation__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.vue
index 155caebea7..3eeab2fcfe 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBridgechain/TransactionConfirmBridgechainUpdate.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmBridgechainUpdate__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.vue
index 30a4bb52ad..ef086be573 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessRegistration.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmBusinessRegistration__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.vue
index 48589f7382..92a576c018 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessResignation.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmBusinessResignation__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.vue
index 7bd43dfdc5..1577f3d074 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmBusiness/TransactionConfirmBusinessUpdate.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmBusinessUpdate__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.vue
index e2b088e967..9698e80af7 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateRegistration.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmDelegateRegistration__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.vue
index 43920f6d89..0dc3ef1533 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmDelegateResignation.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmDelegateResignation__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.vue
index 219ec3cc4a..f6b4f815b8 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmIpfs.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmIpfs__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
index a6835e1f3f..50a383c152 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmMultiPayment__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.vue
index 6061d5ddde..53f6dc96b0 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiSignature.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmMultiSignature__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.vue
index 4044f9fefa..4a442d1d7e 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmSecondSignature.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmSecondSignature__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.vue
index fc6b959c56..41815f42d5 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmTransfer.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmTransfer__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
@@ -26,8 +29,11 @@
     <ListDividedItem
       class="TransactionConfirmTransfer__recipient"
       :label="$t('TRANSACTION.RECIPIENT')"
+      item-value-class="w-full"
     >
-      {{ recipientLabel }}
+      <span class="break-words">
+        {{ recipientLabel }}
+      </span>
       <span
         v-if="recipientLabel !== transaction.recipientId"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmVote.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmVote.vue
index 4760c47c0b..09221b94f1 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmVote.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmVote.vue
@@ -6,8 +6,11 @@
     <ListDividedItem
       class="TransactionConfirmVote__sender"
       :label="$t('TRANSACTION.SENDER')"
+      item-value-class="w-full"
     >
-      {{ senderLabel }}
+      <span class="break-words">
+        {{ senderLabel }}
+      </span>
       <span
         v-if="senderLabel !== currentWallet.address"
         class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/TransactionFormBridgechainResignation.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/TransactionFormBridgechainResignation.vue
index c4cf6b650a..666e6fc283 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/TransactionFormBridgechainResignation.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/TransactionFormBridgechainResignation.vue
@@ -5,8 +5,13 @@
   >
     <template v-if="!bridgechain.isResigned">
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/mixin.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/mixin.vue
index d1b7b599ce..896ab41cf9 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/mixin.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormBridgechain/mixin.vue
@@ -5,8 +5,13 @@
   >
     <template>
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/TransactionFormBusinessResignation.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/TransactionFormBusinessResignation.vue
index 2193b8179a..9c601cf7fa 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/TransactionFormBusinessResignation.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/TransactionFormBusinessResignation.vue
@@ -5,8 +5,13 @@
   >
     <template v-if="canResignBusiness">
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/mixin.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/mixin.vue
index 11a9ea852f..858d717c73 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/mixin.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormBusiness/mixin.vue
@@ -5,8 +5,13 @@
   >
     <template>
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateRegistration.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateRegistration.vue
index 1134648e8b..68e5e79948 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateRegistration.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateRegistration.vue
@@ -5,8 +5,13 @@
   >
     <template v-if="!currentWallet.isDelegate">
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateResignation.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateResignation.vue
index 3c95ae2dfc..4e3b886d59 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateResignation.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormDelegateResignation.vue
@@ -5,8 +5,13 @@
   >
     <template v-if="canResign">
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormIpfs.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormIpfs.vue
index 2b98951bb7..9c277c310e 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormIpfs.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormIpfs.vue
@@ -5,8 +5,13 @@
   >
     <template>
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue
index e494d69e5c..4813eafab8 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue
@@ -7,8 +7,13 @@
       v-if="senderLabel"
       :is-floating-label="true"
     >
-      <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-        {{ senderLabel }}
+      <ListDividedItem
+        :label="$t('TRANSACTION.SENDER')"
+        item-value-class="w-full"
+      >
+        <span class="break-words">
+          {{ senderLabel }}
+        </span>
         <span
           v-if="senderLabel !== currentWallet.address"
           class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiSignature.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiSignature.vue
index bc4571c896..1b2fbf7f0b 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiSignature.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiSignature.vue
@@ -7,8 +7,13 @@
       v-if="senderLabel"
       :is-floating-label="true"
     >
-      <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-        {{ senderLabel }}
+      <ListDividedItem
+        :label="$t('TRANSACTION.SENDER')"
+        item-value-class="w-full"
+      >
+        <span class="break-words">
+          {{ senderLabel }}
+        </span>
         <span
           v-if="senderLabel !== currentWallet.address"
           class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormSecondSignature.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormSecondSignature.vue
index f58d33b9d6..338ed75644 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormSecondSignature.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormSecondSignature.vue
@@ -5,8 +5,13 @@
   >
     <template v-if="!currentWallet.secondPublicKey">
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
index 163c976e92..226ba0a8db 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
@@ -7,8 +7,13 @@
       v-if="senderLabel"
       :is-floating-label="true"
     >
-      <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-        {{ senderLabel }}
+      <ListDividedItem
+        :label="$t('TRANSACTION.SENDER')"
+        item-value-class="w-full"
+      >
+        <span class="break-words">
+          {{ senderLabel }}
+        </span>
         <span
           v-if="senderLabel !== currentWallet.address"
           class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormVote.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormVote.vue
index 579c1d56cc..7c19dbdf91 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormVote.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormVote.vue
@@ -5,8 +5,13 @@
       class="TransactionFormVote__delegate-details"
     >
       <ListDivided :is-floating-label="true">
-        <ListDividedItem :label="$t('TRANSACTION.SENDER')">
-          {{ senderLabel }}
+        <ListDividedItem
+          :label="$t('TRANSACTION.SENDER')"
+          item-value-class="w-full"
+        >
+          <span class="break-words">
+            {{ senderLabel }}
+          </span>
           <span
             v-if="senderLabel !== currentWallet.address"
             class="text-sm text-theme-page-text-light"
diff --git a/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue b/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue
index 2d25b18703..9a35cbcfec 100644
--- a/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue
+++ b/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue
@@ -89,6 +89,7 @@
       />
 
       <ListDividedItem
+        class="TransactionShow__Sender"
         :label="$t('TRANSACTION.SENDER')"
         item-value-class="flex items-center"
       >
@@ -118,6 +119,7 @@
 
       <ListDividedItem
         v-if="showRecipient"
+        class="TransactionShow__Recipient"
         :label="$t('TRANSACTION.RECIPIENT')"
         item-value-class="flex items-center"
       >
@@ -422,10 +424,18 @@ export default {
   max-height: 80vh;
 }
 
+.TransactionShow__Sender .ListDividedItem__value,
+.TransactionShow__Recipient .ListDividedItem__value {
+  @apply .max-w-xs;
+}
+.TransactionShow__Sender .ListDividedItem__value .WalletAddress,
+.TransactionShow__Recipient .ListDividedItem__value .WalletAddress {
+  @apply .truncate;
+}
+
 .TransactionShow__Recipients {
   @apply .pb-0;
 }
-
 .TransactionShow__Recipients.ListDividedItem > div {
   @apply .flex-col .items-start;
 }
diff --git a/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue b/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue
index 519803cbc1..a289fd7c6d 100644
--- a/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue
+++ b/src/renderer/components/Transaction/TransactionShow/TransactionShowMultiSignature.vue
@@ -77,6 +77,7 @@
       </ListDividedItem>
 
       <ListDividedItem
+        class="TransactionShowMultiSignature__Sender"
         :label="$t('TRANSACTION.SENDER')"
         item-value-class="flex items-center"
       >
@@ -106,6 +107,7 @@
 
       <ListDividedItem
         v-if="transaction.recipient"
+        class="TransactionShowMultiSignature__Recipient"
         :label="$t('TRANSACTION.RECIPIENT')"
         item-value-class="flex items-center"
       >
@@ -346,4 +348,13 @@ export default {
 .TransactionShowMultiSignature {
   min-width: 35rem
 }
+
+.TransactionShowMultiSignature__Sender .ListDividedItem__value,
+.TransactionShowMultiSignature__Recipient .ListDividedItem__value {
+  @apply .max-w-xs;
+}
+.TransactionShowMultiSignature__Sender .ListDividedItem__value .WalletAddress,
+.TransactionShowMultiSignature__Recipient .ListDividedItem__value .WalletAddress {
+  @apply .truncate;
+}
 </style>

From 7d540756e3e50ce30ddcada1e287b69f913915e3 Mon Sep 17 00:00:00 2001
From: Simon <sleepdefic1t@users.noreply.github.com>
Date: Wed, 29 Apr 2020 07:10:13 -0700
Subject: [PATCH 25/48] chore(config): add plugin comment (#1907)

---
 config/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/index.js b/config/index.js
index 2ccf516d39..c6be9d1558 100644
--- a/config/index.js
+++ b/config/index.js
@@ -113,6 +113,8 @@ exports.MARKET = {
   }
 }
 
+// This section handles fetching Desktop-Wallet Plugins from the NPM registry.
+// It should remain "ARK" unless intentionally implementing a custom package.
 exports.PLUGINS = {
   adapters: ['npm'],
   pluginsUrl: 'https://raw.githubusercontent.com/ark-ecosystem-desktop-plugins/config/master/plugins.json',

From 104c0e38f78621bc3ab0d49a1d1426aeabfe6c63 Mon Sep 17 00:00:00 2001
From: Davi Figueiredo <davi.mello.28@gmail.com>
Date: Mon, 4 May 2020 17:06:42 -0300
Subject: [PATCH 26/48] feat: fetch remote fees from node api (#1822)

---
 .../unit/components/Input/InputFee.spec.js    | 75 ++++++----------
 src/renderer/components/Input/InputFee.vue    | 17 ++--
 src/renderer/services/client.js               | 89 ++++++++++++-------
 src/renderer/utils/index.js                   | 10 ++-
 4 files changed, 105 insertions(+), 86 deletions(-)

diff --git a/__tests__/unit/components/Input/InputFee.spec.js b/__tests__/unit/components/Input/InputFee.spec.js
index cdc6d5f283..080636a500 100644
--- a/__tests__/unit/components/Input/InputFee.spec.js
+++ b/__tests__/unit/components/Input/InputFee.spec.js
@@ -275,27 +275,33 @@ describe('InputFee', () => {
   })
 
   describe('prepareFeeStatistics', () => {
-    describe('when the average fee of the network is more than the V1 fee', () => {
+    describe('when any fee of the network is more than the V1 max fee', () => {
       beforeEach(() => {
         mockNetwork.feeStatistics = [{
           type: 0,
           fees: {
-            avgFee: 1000 * 1e8,
-            maxFee: 0.03 * 1e8,
-            minFee: 0.0006 * 1e8
+            avgFee: 900 * 1e8,
+            maxFee: 1000 * 1e8,
+            minFee: 800 * 1e8
           }
         }]
       })
 
-      it('should use the V1 fee as average always', () => {
+      it('should use the V1 max fee', () => {
         const wrapper = mountComponent()
 
+        const maxV1fee = new BigNumber(wrapper.vm.maxV1fee * 1e-8)
+
+        expect(wrapper.vm.feeChoices.MAXIMUM).toBeInstanceOf(BigNumber)
+        expect(wrapper.vm.feeChoices.MAXIMUM).toEqual(maxV1fee)
         expect(wrapper.vm.feeChoices.AVERAGE).toBeInstanceOf(BigNumber)
-        expect(wrapper.vm.feeChoices.AVERAGE.toString()).toEqual('0.1')
+        expect(wrapper.vm.feeChoices.AVERAGE).toEqual(maxV1fee)
+        expect(wrapper.vm.feeChoices.MINIMUM).toBeInstanceOf(BigNumber)
+        expect(wrapper.vm.feeChoices.MINIMUM).toEqual(maxV1fee)
       })
     })
 
-    describe('when the average fee of the network is less than the V1 fee', () => {
+    describe('when any fee of the network is less than the V1 max fee', () => {
       beforeEach(() => {
         mockNetwork.feeStatistics = [{
           type: 0,
@@ -307,64 +313,37 @@ describe('InputFee', () => {
         }]
       })
 
-      it('should use it as average', () => {
+      it('should use it as the fee', () => {
         const wrapper = mountComponent()
 
+        expect(wrapper.vm.feeChoices.MAXIMUM).toBeInstanceOf(BigNumber)
+        expect(wrapper.vm.feeChoices.MAXIMUM).toBeWithin(0.03, 0.03000001)
         expect(wrapper.vm.feeChoices.AVERAGE).toBeInstanceOf(BigNumber)
-        expect(wrapper.vm.feeChoices.AVERAGE).toBeWithin(0.0048, 0.0048000001)
+        expect(wrapper.vm.feeChoices.AVERAGE).toBeWithin(0.0048, 0.00480001)
+        expect(wrapper.vm.feeChoices.MINIMUM).toBeInstanceOf(BigNumber)
+        expect(wrapper.vm.feeChoices.MINIMUM).toBeWithin(0.0006, 0.00060001)
       })
     })
 
-    describe('when the maximum fee of the network is more than the V1 fee', () => {
+    describe('when the network returns no statistics', () => {
       beforeEach(() => {
-        mockNetwork.feeStatistics = [{
-          type: 0,
-          fees: {
-            avgFee: 0.0048 * 1e8,
-            maxFee: 1000 * 1e8,
-            minFee: 0.0006 * 1e8
-          }
-        }]
+        mockNetwork.feeStatistics = []
       })
 
-      it('should use the V1 fee as maximum always', () => {
+      it('should use V1 max fee for maximum', () => {
         const wrapper = mountComponent()
 
-        expect(wrapper.vm.feeChoices.MAXIMUM).toBeInstanceOf(BigNumber)
-        expect(wrapper.vm.feeChoices.MAXIMUM.toString()).toEqual('0.1')
-      })
-    })
-
-    describe('when the maximum fee of the network is less than the V1 fee', () => {
-      beforeEach(() => {
-        mockNetwork.feeStatistics = [{
-          type: 0,
-          fees: {
-            avgFee: 0.0048 * 1e8,
-            maxFee: 0.03 * 1e8,
-            minFee: 0.0006 * 1e8
-          }
-        }]
-      })
-
-      it('should use it as maximum', () => {
-        const wrapper = mountComponent()
+        const maxV1fee = (wrapper.vm.maxV1fee * 1e-8).toString()
 
         expect(wrapper.vm.feeChoices.MAXIMUM).toBeInstanceOf(BigNumber)
-        expect(wrapper.vm.feeChoices.MAXIMUM).toBeWithin(0.03, 0.03000001)
-      })
-    })
-
-    describe('when the network returns no statistics', () => {
-      beforeEach(() => {
-        mockNetwork.feeStatistics = []
+        expect(wrapper.vm.feeChoices.MAXIMUM.toString()).toBe(maxV1fee)
       })
 
-      it('should use it as maximum', () => {
+      it('should use the absolute minimum fee (0.00000001) for minimum', () => {
         const wrapper = mountComponent()
 
-        expect(wrapper.vm.feeChoices.MAXIMUM).toBeInstanceOf(BigNumber)
-        expect(wrapper.vm.feeChoices.MAXIMUM.toString()).toBe('0.1')
+        expect(wrapper.vm.feeChoices.MINIMUM).toBeInstanceOf(BigNumber)
+        expect(wrapper.vm.feeChoices.MINIMUM.toString()).toBe('0.00000001')
       })
     })
   })
diff --git a/src/renderer/components/Input/InputFee.vue b/src/renderer/components/Input/InputFee.vue
index 898b88e3ff..c325dfa54a 100644
--- a/src/renderer/components/Input/InputFee.vue
+++ b/src/renderer/components/Input/InputFee.vue
@@ -191,28 +191,31 @@ export default {
 
       return {
         avgFee: this.maxV1fee,
-        maxFee: this.maxV1fee
+        maxFee: this.maxV1fee,
+        minFee: 1
       }
     },
     lastFee () {
       return this.$store.getters['session/lastFeeByType'](this.transactionType, this.transactionGroup)
     },
     feeChoiceMin () {
-      return this.feeChoices.MINIMUM
+      return this.currency_subToUnit(1)
     },
     feeChoiceMax () {
       return this.isAdvancedFee ? this.feeChoices.MAXIMUM.multipliedBy(10) : this.feeChoices.MAXIMUM
     },
     feeChoices () {
-      const { avgFee, maxFee } = this.feeStatistics
+      const { avgFee, maxFee, minFee } = this.feeStatistics
 
-      // Even if the network provides average or maximum fees higher than V1, they will be corrected
+      // If any of the fees are higher than the maximum V1 fee, than use the maximum.
       const average = this.currency_subToUnit(avgFee < this.maxV1fee ? avgFee : this.maxV1fee)
+      const minimum = this.currency_subToUnit(minFee < this.maxV1fee ? minFee : this.maxV1fee)
+      const maximum = this.currency_subToUnit(maxFee < this.maxV1fee ? maxFee : this.maxV1fee)
 
       const fees = {
-        MINIMUM: this.currency_subToUnit(1),
+        MINIMUM: minimum,
         AVERAGE: average,
-        MAXIMUM: this.currency_subToUnit(maxFee < this.maxV1fee ? maxFee : this.maxV1fee),
+        MAXIMUM: maximum,
         INPUT: average,
         ADVANCED: average
       }
@@ -220,7 +223,7 @@ export default {
       return this.lastFee ? Object.assign({}, { LAST: this.currency_subToUnit(this.lastFee) }, fees) : fees
     },
     minimumError () {
-      const min = this.feeChoices.MINIMUM
+      const min = this.feeChoiceMin
       const fee = this.currency_format(min, { currency: this.currency, currencyDisplay: 'code' })
       return this.$t('INPUT_FEE.ERROR.LESS_THAN_MINIMUM', { fee })
     },
diff --git a/src/renderer/services/client.js b/src/renderer/services/client.js
index e9d87abbb2..5bf24b3185 100644
--- a/src/renderer/services/client.js
+++ b/src/renderer/services/client.js
@@ -7,6 +7,7 @@ import TransactionService from '@/services/transaction'
 import { TransactionBuilderService } from './crypto/transaction-builder.service'
 import { TransactionSigner } from './crypto/transaction-signer'
 import BigNumber from '@/plugins/bignumber'
+import { cammelToUpperSnake } from '@/utils'
 
 export default class ClientService {
   /**
@@ -73,43 +74,71 @@ export default class ClientService {
   }
 
   static async fetchFeeStatistics (server, timeout) {
+    let data
+
     try {
-      const { body } = await ClientService.newConnection(server, timeout)
+      const response = await ClientService.newConnection(server, timeout)
         .api('node')
         .fees(7)
 
-      if (!body.data[0]) {
-        return Object.values(TRANSACTION_GROUPS)
-          .filter(group => !!body.data[group])
-          .reduce((accumulator, group) => {
-            accumulator[group] = Object.keys(body.data[group]).map(key => {
-              const fee = body.data[group][key]
-
-              return {
-                type: TRANSACTION_TYPES[`GROUP_${group}`][key.toUpperCase()],
-                fees: {
-                  minFee: Number(fee.min),
-                  maxFee: Number(fee.max),
-                  avgFee: Number(fee.avg)
-                }
-              }
-            })
-
-            return accumulator
-          }, {})
-      }
-
-      return body.data.map(fee => ({
-        type: Number(fee.type),
-        fees: {
-          minFee: Number(fee.min),
-          maxFee: Number(fee.max),
-          avgFee: Number(fee.avg)
-        }
-      }))
+      data = response.body.data
     } catch (error) {
       return []
     }
+
+    /*
+      The peer can send 2 types of response: an Array and and Object.
+      In case it sends an Object, the fees should be parsed according to the
+      transaction groups and types from @config.
+    */
+
+    // Case it is an Object
+    if (!Array.isArray(data)) {
+      // Remove the groups that are not in the response
+      const groupsIds = Object.values(TRANSACTION_GROUPS).filter(groupId => !!data[groupId])
+
+      const parsedFees = groupsIds.reduce((accumulator, groupId) => {
+        const retrivedTypeNames = Object.keys(data[groupId])
+
+        // Parse the fees and add to accumulator
+        accumulator[groupId] = retrivedTypeNames.map(typeName => {
+          const fees = data[groupId][typeName]
+
+          /*
+            Notice that the types are in different format.
+            Response is in cammelCase. Eg: 'bussinesUpdate'
+            @config is in UPPER_SNAKE_CASE. Eg: 'BUSSINES_UPDATE'
+          */
+          const groupName = `GROUP_${groupId}`
+          const parsedTypeName = cammelToUpperSnake(typeName)
+
+          const type = TRANSACTION_TYPES[groupName][parsedTypeName]
+
+          return {
+            type,
+            fees: {
+              minFee: Number(fees.min),
+              maxFee: Number(fees.max),
+              avgFee: Number(fees.avg)
+            }
+          }
+        })
+
+        return accumulator
+      }, {})
+
+      return parsedFees
+    }
+
+    // Case the response is an Array
+    return data.map(fee => ({
+      type: Number(fee.type),
+      fees: {
+        minFee: Number(fee.min),
+        maxFee: Number(fee.max),
+        avgFee: Number(fee.avg)
+      }
+    }))
   }
 
   constructor () {
diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js
index 25117c8b73..d507fffd04 100644
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -43,11 +43,19 @@ const max = nums => {
   }
 }
 
+/**
+ * Converts cammelCaseString to UPPER_CAMMEL_CASE_STRING.
+ * @param {string} string The cammelCaseString
+ * @returns {string} The UPPER_CAMMEL_CASE.
+ */
+const cammelToUpperSnake = string => string.split(/(?=[A-Z])/).join('_').toUpperCase()
+
 export {
   upperFirst,
   capitalize,
   isNil,
   min,
   max,
-  sortByProps
+  sortByProps,
+  cammelToUpperSnake
 }

From 9923ca6d0c88fcb0b2043e3e498cb49c180d162f Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Tue, 5 May 2020 12:35:38 -0300
Subject: [PATCH 27/48] refactor: transfer & multipayment in single modal
 (#1904)

---
 .../TransactionConfirmMultiPayment.spec.js    |   4 +-
 .../TransactionFormMultiPayment.spec.js       | 950 ------------------
 .../TransactionFormTransfer.spec.js           | 619 ++++++++++--
 src/renderer/components/Input/InputFee.vue    |   4 +-
 .../TransactionConfirmMultiPayment.vue        |   6 +-
 .../TransactionForm/TransactionForm.vue       |   2 -
 .../TransactionFormMultiPayment.vue           | 449 ---------
 .../TransactionFormTransfer.vue               | 407 ++++++--
 .../Transaction/TransactionForm/index.js      |   2 -
 .../Transaction/TransactionModal.vue          |   2 +-
 ...tList.vue => TransactionRecipientList.vue} |  21 +-
 .../TransactionShow/TransactionShow.vue       |   6 +-
 src/renderer/components/Transaction/index.js  |   4 +-
 .../WalletHeadingPrimaryActions.vue           |  96 +-
 src/renderer/i18n/locales/en-US.js            |  10 +-
 15 files changed, 905 insertions(+), 1677 deletions(-)
 delete mode 100644 __tests__/unit/components/Transaction/TransactionForm/TransactionFormMultiPayment.spec.js
 delete mode 100644 src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue
 rename src/renderer/components/Transaction/{TransactionMultiPaymentList.vue => TransactionRecipientList.vue} (85%)

diff --git a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js
index 387b2471ba..261f8e2cee 100644
--- a/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.spec.js
@@ -70,8 +70,8 @@ describe('TransactionConfirmMultiPayment', () => {
       for (const recipientIndex in wrapper.vm.transaction.asset.payments) {
         const recipient = wrapper.vm.transaction.asset.payments[recipientIndex]
         const recipientElement = recipients.at(recipientIndex)
-        const addressText = recipientElement.find('.TransactionMultiPaymentList__recipient').text().replace('TRANSACTION.RECIPIENT:', '')
-        const amountText = recipientElement.find('.TransactionMultiPaymentList__amount').text().replace('TRANSACTION.AMOUNT:', '')
+        const addressText = recipientElement.find('.TransactionRecipientList__recipient').text().replace('TRANSACTION.RECIPIENT:', '')
+        const amountText = recipientElement.find('.TransactionRecipientList__amount').text().replace('TRANSACTION.AMOUNT:', '')
 
         expect(addressText.trim()).toBe(recipient.address)
         expect(amountText.trim()).toBe(recipient.amount)
diff --git a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormMultiPayment.spec.js b/__tests__/unit/components/Transaction/TransactionForm/TransactionFormMultiPayment.spec.js
deleted file mode 100644
index 377b9cd395..0000000000
--- a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormMultiPayment.spec.js
+++ /dev/null
@@ -1,950 +0,0 @@
-import { createLocalVue, mount } from '@vue/test-utils'
-import { Identities } from '@arkecosystem/crypto'
-import Vuelidate from 'vuelidate'
-import cloneDeep from 'lodash/cloneDeep'
-import installI18n from '../../../__utils__/i18n'
-import { VENDOR_FIELD } from '@config'
-import { TransactionFormMultiPayment } from '@/components/Transaction/TransactionForm'
-import CurrencyMixin from '@/mixins/currency'
-import BigNumber from '@/plugins/bignumber'
-import WalletService from '@/services/wallet'
-
-const localVue = createLocalVue()
-localVue.use(Vuelidate)
-const i18n = installI18n(localVue)
-
-const globalNetwork = Object.freeze({
-  id: 'network-1',
-  fractionDigits: 8,
-  token: 'ARK',
-  version: 23,
-  wif: 170,
-  market: {
-    enabled: false
-  },
-  nethash: 'nethash-1'
-})
-
-let wrapper
-const createWrapper = (component, wallet, network, props = {}) => {
-  component = component || TransactionFormMultiPayment
-
-  if (wallet === undefined) {
-    wallet = {
-      id: 'test-wallet'
-    }
-  }
-
-  if (wallet && !Object.prototype.hasOwnProperty.call(wallet, 'passphrase')) {
-    wallet.passphrase = null
-  }
-
-  if (wallet && !Object.prototype.hasOwnProperty.call(wallet, 'address')) {
-    wallet.address = 'address-1'
-  }
-
-  if (wallet && !Object.prototype.hasOwnProperty.call(wallet, 'balance')) {
-    wallet.balance = (1000 * 1e8).toString()
-  }
-
-  const mountNetwork = network || cloneDeep(globalNetwork)
-
-  wrapper = mount(TransactionFormMultiPayment, {
-    i18n,
-    localVue,
-    sync: false,
-    propsData: props,
-    mocks: {
-      $client: {
-        buildMultiPayment: jest.fn((transactionData) => transactionData)
-      },
-      $error: jest.fn(),
-      $success: jest.fn(),
-      $store: {
-        getters: {
-          'profile/byId': jest.fn(() => ({
-            id: 'profile-1',
-            name: 'profile-1',
-            networkId: 'network-1'
-          })),
-          'session/currency': 'EUR',
-          get 'ledger/isConnected' () {
-            return true
-          },
-          get 'ledger/wallets' () {
-            return [{
-              address: 'ledger-address-1'
-            }]
-          },
-          'wallet/byProfileId': jest.fn(() => [wallet]),
-          'wallet/contactsByProfileId': jest.fn(() => []),
-          'transaction/staticFee': jest.fn(() => null),
-          get 'session/profileId' () {
-            return 'profile-1'
-          },
-          'session/lastFeeByType': jest.fn(() => (1 * 1e8).toString()),
-          'network/byToken': jest.fn(() => mountNetwork),
-          'network/byId': jest.fn(() => mountNetwork),
-          'profile/byCompatibleAddress': jest.fn(() => []),
-          get 'profile/all' () {
-            return [{
-              id: 'profile-1',
-              name: 'profile-1',
-              networkId: 'network-1'
-            }, {
-              id: 'profile-2',
-              name: 'profile-2',
-              networkId: 'network-1'
-            }]
-          }
-        }
-      },
-      $synchronizer: {
-        appendFocus: jest.fn()
-      },
-      currency_subToUnit: jest.fn(CurrencyMixin.methods.currency_subToUnit),
-      currency_format: jest.fn(CurrencyMixin.methods.currency_format),
-      currency_toBuilder: jest.fn(CurrencyMixin.methods.currency_toBuilder),
-      currency_simpleFormatCrypto: jest.fn(CurrencyMixin.methods.currency_simpleFormatCrypto),
-      currency_unitToSub: jest.fn(CurrencyMixin.methods.currency_unitToSub),
-      formatter_networkCurrency: jest.fn(),
-      session_network: mountNetwork,
-      wallet_formatAddress: jest.fn(address => `formatted-${address}`),
-      wallet_truncate: jest.fn(address => address),
-      wallet_name: jest.fn(address => address),
-      wallet_fromRoute: wallet
-    },
-    stubs: {
-      Identicon: true,
-      Portal: true
-    }
-  })
-}
-
-describe('TransactionFormMultiPayment', () => {
-  beforeEach(() => {
-    createWrapper()
-  })
-
-  it('should have multi-payment transaction type', () => {
-    expect(wrapper.vm.$options.transactionType).toBe(6)
-  })
-
-  describe('data', () => {
-    it('should has properties', () => {
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'step')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'amount')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'recipientId')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'form')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'recipients')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'fee')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'passphrase')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'walletPassword')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'vendorField')).toBe(true)
-    })
-  })
-
-  describe('template', () => {
-    it('should render', () => {
-      expect(wrapper.contains('.TransactionFormMultiPayment')).toBe(true)
-    })
-
-    it('should have recipient field', () => {
-      expect(wrapper.contains('.TransactionFormMultiPayment__recipient')).toBe(true)
-    })
-
-    it('should have amount field', () => {
-      expect(wrapper.contains('.TransactionFormMultiPayment__amount')).toBe(true)
-    })
-
-    it('should have add button', () => {
-      expect(wrapper.contains('.TransactionFormMultiPayment__add')).toBe(true)
-    })
-
-    describe('step 2', () => {
-      beforeEach(() => {
-        wrapper.vm.step = 2
-      })
-
-      it('should have vendorfield', () => {
-        expect(wrapper.contains('.TransactionFormMultiPayment__vendorfield')).toBe(true)
-      })
-
-      it('should have fee field', () => {
-        expect(wrapper.contains('.TransactionFormMultiPayment__fee')).toBe(true)
-      })
-
-      describe('ledger notice', () => {
-        it('should show if wallet is a ledger', async () => {
-          createWrapper(null, {
-            isLedger: true
-          })
-
-          wrapper.vm.step = 2
-
-          await wrapper.vm.$nextTick()
-
-          expect(wrapper.contains('.TransactionFormMultiPayment__ledger-notice')).toBe(true)
-        })
-
-        it('should show if wallet is not a ledger', async () => {
-          createWrapper(null, {
-            isLedger: false
-          })
-
-          wrapper.vm.step = 2
-
-          await wrapper.vm.$nextTick()
-
-          expect(wrapper.contains('.TransactionFormMultiPayment__ledger-notice')).toBe(false)
-        })
-      })
-
-      describe('password field', () => {
-        it('should show if wallet does have a password', async () => {
-          createWrapper(null, {
-            passphrase: 'password'
-          })
-
-          wrapper.vm.step = 2
-
-          await wrapper.vm.$nextTick()
-
-          expect(wrapper.contains('.TransactionFormMultiPayment__password')).toBe(true)
-        })
-
-        it('should not show if wallet does not have a password', () => {
-          expect(wrapper.contains('.TransactionFormMultiPayment__password')).toBe(false)
-        })
-      })
-
-      describe('passphrase field', () => {
-        it('should show if wallet does not have a password', () => {
-          expect(wrapper.contains('.TransactionFormMultiPayment__passphrase')).toBe(true)
-        })
-
-        it('should not show if wallet does have a password', async () => {
-          createWrapper(null, {
-            passphrase: 'password'
-          })
-
-          wrapper.vm.step = 2
-
-          await wrapper.vm.$nextTick()
-
-          expect(wrapper.contains('.TransactionFormMultiPayment__passphrase')).toBe(false)
-        })
-      })
-    })
-
-    describe('prev button', () => {
-      it('should be enabled if on second form', async () => {
-        wrapper.vm.step = 2
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.find('.TransactionFormMultiPayment__prev').attributes('disabled')).toBeFalsy()
-      })
-
-      it('should be disabled if on step 1', async () => {
-        wrapper.vm.step = 1
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.find('.TransactionFormMultiPayment__prev').attributes('disabled')).toBe('disabled')
-      })
-    })
-
-    describe('next button', () => {
-      it('should be enabled if recipients form is valid', async () => {
-        wrapper.vm.step = 1
-        wrapper.vm.$v.form.recipients.$model = [{
-          address: 'address-2',
-          amount: 10
-        }, {
-          address: 'address-2',
-          amount: 10
-        }]
-        wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
-        wrapper.vm.$v.form.passphrase.$model = 'passphrase'
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.find('.TransactionFormMultiPayment__next').attributes('disabled')).toBeFalsy()
-      })
-
-      it('should be enabled if both forms are valid', async () => {
-        wrapper.vm.step = 2
-        wrapper.vm.$v.form.recipients.$model = [{
-          address: 'address-2',
-          amount: 10
-        }, {
-          address: 'address-2',
-          amount: 10
-        }]
-        wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
-        wrapper.vm.$v.form.passphrase.$model = 'passphrase'
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.find('.TransactionFormMultiPayment__next').attributes('disabled')).toBeFalsy()
-      })
-
-      it('should be disabled if form is invalid', async () => {
-        wrapper.vm.$v.form.$touch()
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.find('.TransactionFormMultiPayment__next').attributes('disabled')).toBe('disabled')
-      })
-    })
-  })
-
-  describe('computed', () => {
-    describe('alternativeCurrency', () => {
-      it('should return correct data', () => {
-        expect(wrapper.vm.alternativeCurrency).toEqual('EUR')
-      })
-
-      it('should update data', () => {
-        wrapper.vm.$store.getters['session/currency'] = 'GBP'
-
-        expect(wrapper.vm.alternativeCurrency).toEqual('GBP')
-      })
-    })
-
-    describe('amountTooLowError', () => {
-      it('should return formatted value', () => {
-        const $tSpy = jest.fn(translation => translation)
-        const simpleFormatCryptoSpy = jest.fn(CurrencyMixin.methods.currency_simpleFormatCrypto)
-        const response = TransactionFormMultiPayment.computed.amountTooLowError.call({
-          walletNetwork: globalNetwork,
-          $t: $tSpy,
-          currency_simpleFormatCrypto: simpleFormatCryptoSpy,
-          session_network: globalNetwork
-        })
-
-        expect($tSpy).toHaveBeenCalledWith('INPUT_CURRENCY.ERROR.LESS_THAN_MINIMUM', {
-          amount: '0.00000001 ARK'
-        })
-        expect(response).toBe('INPUT_CURRENCY.ERROR.LESS_THAN_MINIMUM')
-        expect(simpleFormatCryptoSpy).toHaveBeenCalledWith('0.00000001')
-      })
-
-      it('should return formatted value with different fraction digits', () => {
-        const $tSpy = jest.fn(translation => translation)
-        const simpleFormatCryptoSpy = jest.fn(CurrencyMixin.methods.currency_simpleFormatCrypto)
-        const response = TransactionFormMultiPayment.computed.amountTooLowError.call({
-          walletNetwork: {
-            ...globalNetwork,
-            fractionDigits: 2
-          },
-          $t: $tSpy,
-          currency_simpleFormatCrypto: simpleFormatCryptoSpy,
-          session_network: globalNetwork
-        })
-
-        expect($tSpy).toHaveBeenCalledWith('INPUT_CURRENCY.ERROR.LESS_THAN_MINIMUM', {
-          amount: '0.01 ARK'
-        })
-        expect(response).toBe('INPUT_CURRENCY.ERROR.LESS_THAN_MINIMUM')
-        expect(simpleFormatCryptoSpy).toHaveBeenCalledWith('0.01')
-      })
-    })
-
-    describe('notEnoughBalanceError', () => {
-      it('should return a formatted value', () => {
-        const $tSpy = jest.fn(translation => translation)
-        const formatterNetworkCurrencySpy = jest.fn(value => value)
-        const response = TransactionFormMultiPayment.computed.notEnoughBalanceError.call({
-          currentWallet: {
-            balance: (10 * 1e8).toString()
-          },
-          $t: $tSpy,
-          formatter_networkCurrency: formatterNetworkCurrencySpy,
-          session_network: globalNetwork
-        })
-
-        expect(response).toBe('TRANSACTION_FORM.ERROR.NOT_ENOUGH_BALANCE')
-        expect($tSpy).toHaveBeenCalledWith('TRANSACTION_FORM.ERROR.NOT_ENOUGH_BALANCE', {
-          balance: '1000000000'
-        })
-        expect(formatterNetworkCurrencySpy).toHaveBeenCalledWith('1000000000')
-      })
-    })
-
-    describe('minimumAmount', () => {
-      it('should return the correct value', () => {
-        expect(wrapper.vm.minimumAmount + '').toBe('0.00000001')
-      })
-    })
-
-    describe('maximumAvailableAmount', () => {
-      it('should return value', () => {
-        wrapper.vm.$v.form.fee.$model = 0.1
-        expect(wrapper.vm.maximumAvailableAmount).toEqual((new BigNumber(1000)).minus(0.1))
-      })
-
-      it('should return value including all recipients', async () => {
-        wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('test')
-        wrapper.vm.$v.amount.$model = 10
-
-        await wrapper.vm.$nextTick()
-        wrapper.vm.addRecipient()
-        await wrapper.vm.$nextTick()
-
-        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('test')
-        wrapper.vm.$v.amount.$model = 20
-
-        await wrapper.vm.$nextTick()
-        wrapper.vm.addRecipient()
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.maximumAvailableAmount).toEqual((new BigNumber(1000)).minus(0.1).minus(30))
-      })
-
-      it('should return value based on different fee', () => {
-        wrapper.vm.form.fee = 10
-
-        expect(wrapper.vm.maximumAvailableAmount).toEqual((new BigNumber(1000)).minus(10))
-      })
-    })
-
-    describe('vendorFieldLabel', () => {
-      it('should return value', () => {
-        expect(wrapper.vm.vendorFieldLabel).toBe('TRANSACTION.VENDOR_FIELD - VALIDATION.MAX_LENGTH')
-      })
-    })
-
-    describe('vendorFieldHelperText', () => {
-      describe('default max length', () => {
-        let $tSpy
-        beforeEach(() => {
-          $tSpy = jest.spyOn(wrapper.vm, '$t')
-        })
-
-        afterEach(() => {
-          $tSpy.mockRestore()
-        })
-
-        it('should return null if vendorfield is empty', () => {
-          wrapper.vm.form.vendorField = ''
-
-          expect(wrapper.vm.vendorFieldHelperText).toBe(null)
-          expect($tSpy).not.toHaveBeenCalledWith('VALIDATION.VENDOR_FIELD.LIMIT_REACHED', [VENDOR_FIELD.defaultMaxLength])
-        })
-
-        it('should return length warning if equal to max', () => {
-          wrapper.vm.form.vendorField = ''.padStart(VENDOR_FIELD.defaultMaxLength, '-')
-
-          expect(wrapper.vm.vendorFieldHelperText).toBe('VALIDATION.VENDOR_FIELD.LIMIT_REACHED')
-          expect($tSpy).toHaveBeenCalledWith('VALIDATION.VENDOR_FIELD.LIMIT_REACHED', [VENDOR_FIELD.defaultMaxLength])
-        })
-
-        it('should return length warning if less than max', () => {
-          wrapper.vm.form.vendorField = ''.padStart(VENDOR_FIELD.defaultMaxLength - 10, '-')
-
-          expect(wrapper.vm.vendorFieldHelperText).toBe('VALIDATION.VENDOR_FIELD.LIMIT_REMAINING')
-          expect($tSpy).toHaveBeenCalledWith('VALIDATION.VENDOR_FIELD.LIMIT_REMAINING', [
-            10,
-            VENDOR_FIELD.defaultMaxLength
-          ])
-        })
-      })
-
-      describe('network max length', () => {
-        let $tSpy
-
-        beforeEach(() => {
-          const network = {
-            ...cloneDeep(globalNetwork),
-            vendorField: {
-              maxLength: 20
-            }
-          }
-          createWrapper(null, undefined, network)
-          $tSpy = jest.spyOn(wrapper.vm, '$t')
-        })
-
-        afterEach(() => {
-          $tSpy.mockRestore()
-        })
-
-        it('should return null if vendorfield is empty', () => {
-          wrapper.vm.form.vendorField = ''
-
-          expect(wrapper.vm.vendorFieldHelperText).toBe(null)
-          expect($tSpy).not.toHaveBeenCalledWith('VALIDATION.VENDOR_FIELD.LIMIT_REACHED', [20])
-        })
-
-        it('should return length warning if equal to max', () => {
-          wrapper.vm.form.vendorField = ''.padStart(20, '-')
-
-          expect(wrapper.vm.walletNetwork.vendorField.maxLength).toBe(20)
-          expect(wrapper.vm.vendorFieldHelperText).toBe('VALIDATION.VENDOR_FIELD.LIMIT_REACHED')
-          expect($tSpy).toHaveBeenCalledWith('VALIDATION.VENDOR_FIELD.LIMIT_REACHED', [20])
-        })
-
-        it('should return length warning if less than max', () => {
-          wrapper.vm.form.vendorField = ''.padStart(20 - 5, '-')
-
-          expect(wrapper.vm.vendorFieldHelperText).toBe('VALIDATION.VENDOR_FIELD.LIMIT_REMAINING')
-          expect($tSpy).toHaveBeenCalledWith('VALIDATION.VENDOR_FIELD.LIMIT_REMAINING', [
-            5,
-            20
-          ])
-        })
-      })
-    })
-
-    describe('vendorFieldMaxLength', () => {
-      it('should return network max length', () => {
-        createWrapper(null, undefined, {
-          ...cloneDeep(globalNetwork),
-          vendorField: {
-            maxLength: 20
-          }
-        })
-
-        expect(wrapper.vm.vendorFieldMaxLength).toBe(20)
-      })
-
-      it('should return default max length if network does not have vendorField max', () => {
-        expect(wrapper.vm.vendorFieldMaxLength).toBe(VENDOR_FIELD.defaultMaxLength)
-      })
-    })
-
-    describe('recipientWarning', () => {
-      it('should return null if recipientId is not dirty', () => {
-        expect(wrapper.vm.recipientWarning).toBe(null)
-      })
-
-      it('should return message for duplicate recipients', () => {
-        wrapper.vm.$v.form.recipients.$model = [{
-          address: 'address-2',
-          amount: 10
-        }]
-        wrapper.vm.$v.recipientId.$model = 'address-2'
-
-        expect(wrapper.vm.recipientWarning).toBe('TRANSACTION.MULTI_PAYMENT.WARNING_DUPLICATE')
-      })
-    })
-
-    describe('maximumRecipients', () => {
-      it('should return default if no constants', () => {
-        expect(wrapper.vm.maximumRecipients).toBe(500)
-      })
-
-      it('should return default if no network value', () => {
-        const network = {
-          ...cloneDeep(globalNetwork),
-          constants: {}
-        }
-
-        createWrapper(null, undefined, network)
-
-        expect(wrapper.vm.maximumRecipients).toBe(500)
-      })
-
-      it('should return network constant', () => {
-        const network = {
-          ...cloneDeep(globalNetwork),
-          constants: {
-            multiPaymentLimit: 20
-          }
-        }
-
-        createWrapper(null, undefined, network)
-
-        expect(wrapper.vm.maximumRecipients).toBe(20)
-      })
-    })
-  })
-
-  describe('methods', () => {
-    describe('getTransactionData', () => {
-      it('should return correct data with passphrase', () => {
-        wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
-        wrapper.vm.$v.form.passphrase.$model = 'passphrase'
-        wrapper.vm.$v.form.recipients.$model = [{
-          address: 'address-2',
-          amount: (1 * 1e8).toString()
-        }]
-
-        expect(wrapper.vm.getTransactionData()).toEqual({
-          address: 'address-1',
-          passphrase: 'passphrase',
-          recipients: [{
-            address: 'address-2',
-            amount: (1 * 1e8).toString()
-          }],
-          fee: new BigNumber(0.1 * 1e8),
-          vendorField: 'vendorfield test',
-          wif: undefined,
-          networkWif: 170,
-          multiSignature: undefined
-        })
-      })
-
-      it('should return correct data with passphrase and second passphrase', () => {
-        createWrapper(null, {
-          address: 'address-1',
-          passphrase: null,
-          secondPublicKey: Identities.PublicKey.fromPassphrase('second passphrase')
-        })
-
-        wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
-        wrapper.vm.$v.form.passphrase.$model = 'passphrase'
-        wrapper.vm.$v.form.secondPassphrase.$model = 'second passphrase'
-        wrapper.vm.$v.form.recipients.$model = [{
-          address: 'address-2',
-          amount: (1 * 1e8).toString()
-        }]
-
-        expect(wrapper.vm.getTransactionData()).toEqual({
-          address: 'address-1',
-          passphrase: 'passphrase',
-          secondPassphrase: 'second passphrase',
-          recipients: [{
-            address: 'address-2',
-            amount: (1 * 1e8).toString()
-          }],
-          fee: new BigNumber(0.1 * 1e8),
-          vendorField: 'vendorfield test',
-          wif: undefined,
-          networkWif: 170,
-          multiSignature: undefined
-        })
-      })
-    })
-
-    describe('buildTransaction', () => {
-      it('should build transfer', async () => {
-        const transactionData = {
-          type: 6,
-          typeGroup: 1
-        }
-
-        const response = await wrapper.vm.buildTransaction(transactionData, true, true)
-
-        expect(wrapper.vm.$client.buildMultiPayment).toHaveBeenCalledWith(transactionData, true, true)
-        expect(response).toBe(transactionData)
-      })
-
-      it('should build transfer with default arguments', async () => {
-        const transactionData = {
-          type: 6,
-          typeGroup: 1
-        }
-
-        const response = await wrapper.vm.buildTransaction(transactionData)
-
-        expect(wrapper.vm.$client.buildMultiPayment).toHaveBeenCalledWith(transactionData, false, false)
-        expect(response).toBe(transactionData)
-      })
-    })
-
-    describe('transactionError', () => {
-      it('should generate transaction error', () => {
-        wrapper.vm.transactionError()
-
-        expect(wrapper.vm.$error).toHaveBeenCalledWith('TRANSACTION.ERROR.VALIDATION.MULTI_PAYMENT')
-      })
-    })
-
-    describe('addRecipient', () => {
-      it('should add current recipient to list', async () => {
-        const address = Identities.Address.fromPassphrase('passphrase')
-        wrapper.vm.$v.recipientId.$model = address
-        wrapper.vm.$v.amount.$model = 100
-
-        await wrapper.vm.$nextTick()
-
-        wrapper.vm.addRecipient()
-
-        expect(wrapper.vm.$v.form.recipients.$model).toEqual([{
-          address: address,
-          amount: new BigNumber(100 * 1e8)
-        }])
-      })
-
-      it('should reset current recipient', async () => {
-        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
-        wrapper.vm.$v.amount.$model = 100
-
-        await wrapper.vm.$nextTick()
-
-        wrapper.vm.addRecipient()
-
-        expect(wrapper.vm.$v.recipientId.$model).toBe('')
-        expect(wrapper.vm.$v.amount.$model).toBe('')
-      })
-
-      it('should do nothing if invalid address', async () => {
-        WalletService.validateAddress.mockReturnValue(false)
-
-        wrapper.vm.$v.recipientId.$model = 'invalid address'
-        wrapper.vm.$v.amount.$model = 100
-
-        await wrapper.vm.$nextTick()
-
-        wrapper.vm.addRecipient()
-
-        expect(wrapper.vm.$v.form.recipients.$model).toEqual([])
-
-        WalletService.validateAddress.mockReturnValue(true)
-      })
-
-      it('should do nothing if invalid fee', async () => {
-        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
-        wrapper.vm.$v.amount.$model = ''
-
-        await wrapper.vm.$nextTick()
-
-        wrapper.vm.addRecipient()
-
-        expect(wrapper.vm.$v.form.recipients.$model).toEqual([])
-      })
-    })
-
-    describe('previousStep', () => {
-      it('should go from step 2 to step 1', () => {
-        wrapper.vm.step = 2
-
-        wrapper.vm.previousStep()
-
-        expect(wrapper.vm.step).toBe(1)
-      })
-
-      it('should do nothing on step 1', () => {
-        wrapper.vm.step = 1
-
-        wrapper.vm.previousStep()
-
-        expect(wrapper.vm.step).toBe(1)
-      })
-    })
-
-    describe('nextStep', () => {
-      it('should go from step 1 to step 2', () => {
-        wrapper.vm.step = 1
-
-        wrapper.vm.nextStep()
-
-        expect(wrapper.vm.step).toBe(2)
-      })
-
-      it('should submit form data on step 2', async () => {
-        const spy = jest.spyOn(wrapper.vm, 'onSubmit').mockImplementation()
-
-        wrapper.vm.step = 2
-
-        await wrapper.vm.$nextTick()
-
-        wrapper.vm.nextStep()
-
-        expect(spy).toHaveBeenCalledTimes(1)
-      })
-    })
-
-    describe('emitRemoveRecipient', () => {
-      it('should remove recipient at index', () => {
-        wrapper.vm.$v.form.recipients.$model = [{
-          address: 'address-1',
-          amount: 10
-        }, {
-          address: 'address-2',
-          amount: 10
-        }, {
-          address: 'address-3',
-          amount: 10
-        }]
-
-        wrapper.vm.emitRemoveRecipient(1)
-
-        expect(wrapper.vm.$v.form.recipients.$model).toEqual([{
-          address: 'address-1',
-          amount: 10
-        }, {
-          address: 'address-3',
-          amount: 10
-        }])
-      })
-
-      it('should do nothing if index does not exist', () => {
-        const recipients = [{
-          address: 'address-1',
-          amount: 10
-        }, {
-          address: 'address-2',
-          amount: 10
-        }]
-
-        wrapper.vm.$v.form.recipients.$model = recipients
-
-        wrapper.vm.emitRemoveRecipient(3)
-
-        expect(wrapper.vm.$v.form.recipients.$model).toBe(recipients)
-      })
-    })
-  })
-
-  describe('validations', () => {
-    describe('recipientId', () => {
-      it('should be required if not set', () => {
-        wrapper.vm.$v.recipientId.$model = ''
-
-        expect(wrapper.vm.$v.recipientId.required).toBe(false)
-      })
-
-      it('should not be required if set', () => {
-        wrapper.vm.$v.recipientId.$model = 'test'
-
-        expect(wrapper.vm.$v.recipientId.required).toBe(true)
-      })
-
-      it('should not be valid', async () => {
-        WalletService.validateAddress.mockReturnValue(false)
-
-        wrapper.vm.$v.recipientId.$model = 'test'
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.$refs.recipient.$v.$invalid).toBe(true)
-        expect(wrapper.vm.$v.recipientId.isValid).toBe(false)
-
-        WalletService.validateAddress.mockReturnValue(true)
-      })
-
-      it('should not be valid if no recipient field', async () => {
-        wrapper.vm.$refs.recipient = null
-        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.$refs.recipient).toBe(null)
-        expect(wrapper.vm.$v.recipientId.isValid).toBe(false)
-      })
-
-      it('should be valid', async () => {
-        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.$refs.recipient.$v.$invalid).toBe(false)
-        expect(wrapper.vm.$v.recipientId.isValid).toBe(true)
-      })
-    })
-
-    describe('amount', () => {
-      it('should be required if not set', () => {
-        wrapper.vm.$v.amount.$model = ''
-
-        expect(wrapper.vm.$v.amount.required).toBe(false)
-      })
-
-      it('should not be required if set', () => {
-        wrapper.vm.$v.amount.$model = '10'
-
-        expect(wrapper.vm.$v.amount.required).toBe(true)
-      })
-
-      it('should not be valid', async () => {
-        wrapper.vm.$v.amount.$model = 'test'
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.$refs.amount.$v.$invalid).toBe(true)
-        expect(wrapper.vm.$v.amount.isValid).toBe(false)
-      })
-
-      it('should not be valid if no amount field', async () => {
-        wrapper.vm.$refs.amount = null
-        wrapper.vm.$v.amount.$model = 'test'
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.$refs.amount).toBe(null)
-        expect(wrapper.vm.$v.amount.isValid).toBe(false)
-      })
-
-      it('should be valid', async () => {
-        wrapper.vm.$v.amount.$model = 10
-
-        await wrapper.vm.$nextTick()
-
-        expect(wrapper.vm.$refs.amount.$v.$invalid).toBe(false)
-        expect(wrapper.vm.$v.amount.isValid).toBe(true)
-      })
-    })
-
-    describe('form', () => {
-      describe('recipients', () => {
-        it('should not be above minimum if not set', () => {
-          wrapper.vm.$v.form.recipients.$model = []
-
-          expect(wrapper.vm.$v.form.recipients.aboveMinimum).toBe(false)
-        })
-
-        it('should not be above minimum if not enough', () => {
-          wrapper.vm.$v.form.recipients.$model = [{
-            address: 'address-1',
-            amount: 10
-          }]
-
-          expect(wrapper.vm.$v.form.recipients.aboveMinimum).toBe(false)
-        })
-
-        it('should be above minimum if set', () => {
-          wrapper.vm.$v.form.recipients.$model = [{
-            address: 'address-1',
-            amount: 10
-          }, {
-            address: 'address-1',
-            amount: 10
-          }]
-
-          expect(wrapper.vm.$v.form.recipients.aboveMinimum).toBe(true)
-        })
-
-        it('should not be below or equal to maximum if too many', () => {
-          const network = {
-            ...cloneDeep(globalNetwork),
-            constants: {
-              multiPaymentLimit: 2
-            }
-          }
-
-          createWrapper(null, undefined, network)
-
-          wrapper.vm.$v.form.recipients.$model = [{
-            address: 'address-1',
-            amount: 10
-          }, {
-            address: 'address-1',
-            amount: 10
-          }, {
-            address: 'address-1',
-            amount: 10
-          }]
-
-          expect(wrapper.vm.$v.form.recipients.belowOrEqualMaximum).toBe(false)
-        })
-
-        it('should be below or equal to maximum if set', () => {
-          wrapper.vm.$v.form.recipients.$model = [{
-            address: 'address-1',
-            amount: 10
-          }]
-
-          expect(wrapper.vm.$v.form.recipients.belowOrEqualMaximum).toBe(true)
-        })
-      })
-    })
-  })
-})
diff --git a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js b/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
index 0003cdb9e2..9776b43220 100644
--- a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
@@ -22,7 +22,10 @@ const globalNetwork = Object.freeze({
   market: {
     enabled: false
   },
-  nethash: 'nethash-1'
+  nethash: 'nethash-1',
+  constants: {
+    aip11: true
+  }
 })
 
 let wrapper
@@ -56,7 +59,8 @@ const createWrapper = (component, wallet, network, props = {}) => {
     propsData: props,
     mocks: {
       $client: {
-        buildTransfer: jest.fn((transactionData) => transactionData)
+        buildTransfer: jest.fn((transactionData) => transactionData),
+        buildMultiPayment: jest.fn((transactionData) => transactionData)
       },
       $error: jest.fn(),
       $success: jest.fn(),
@@ -102,19 +106,20 @@ const createWrapper = (component, wallet, network, props = {}) => {
       $synchronizer: {
         appendFocus: jest.fn()
       },
-      session_network: mountNetwork,
-      currency_simpleFormatCrypto: jest.fn(CurrencyMixin.methods.currency_simpleFormatCrypto),
       currency_subToUnit: jest.fn(CurrencyMixin.methods.currency_subToUnit),
-      formatter_networkCurrency: jest.fn(),
       currency_format: jest.fn(CurrencyMixin.methods.currency_format),
       currency_toBuilder: jest.fn(CurrencyMixin.methods.currency_toBuilder),
+      currency_simpleFormatCrypto: jest.fn(CurrencyMixin.methods.currency_simpleFormatCrypto),
       currency_unitToSub: jest.fn(CurrencyMixin.methods.currency_unitToSub),
+      formatter_networkCurrency: jest.fn(),
+      session_network: mountNetwork,
       wallet_formatAddress: jest.fn(address => `formatted-${address}`),
       wallet_truncate: jest.fn(address => address),
       wallet_name: jest.fn(address => address),
       wallet_fromRoute: wallet
     },
     stubs: {
+      Identicon: true,
       Portal: true
     }
   })
@@ -151,17 +156,18 @@ describe('TransactionFormTransfer', () => {
 
   describe('data', () => {
     it('should has properties', () => {
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'recipientId')).toBe(true)
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'amount')).toBe(true)
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'isSendAllActive')).toBe(true)
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'previousAmount')).toBe(true)
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'showConfirmSendAll')).toBe(true)
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'wallet')).toBe(true)
       expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'form')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'amount')).toBe(true)
+      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'recipients')).toBe(true)
       expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'fee')).toBe(true)
       expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'passphrase')).toBe(true)
       expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'walletPassword')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'recipientId')).toBe(true)
       expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data.form, 'vendorField')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'isSendAllActive')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'previousAmount')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'wallet')).toBe(true)
-      expect(Object.prototype.hasOwnProperty.call(wrapper.vm._data, 'showConfirmSendAll')).toBe(true)
     })
   })
 
@@ -178,16 +184,12 @@ describe('TransactionFormTransfer', () => {
       expect(wrapper.contains('.TransactionFormTransfer__amount')).toBe(true)
     })
 
-    it('should have send all switch', () => {
-      expect(wrapper.contains('.TransactionFormTransfer__send-all')).toBe(true)
-    })
-
-    it('should have vendorfield', () => {
-      expect(wrapper.contains('.TransactionFormTransfer__vendorfield')).toBe(true)
+    it('should have add button', () => {
+      expect(wrapper.contains('.TransactionFormTransfer__add')).toBe(true)
     })
 
-    it('should have fee field', () => {
-      expect(wrapper.contains('.TransactionFormTransfer__fee')).toBe(true)
+    it('should have send all switch', () => {
+      expect(wrapper.contains('.TransactionFormTransfer__send-all')).toBe(true)
     })
 
     describe('wallet selection', () => {
@@ -230,39 +232,16 @@ describe('TransactionFormTransfer', () => {
       })
     })
 
-    describe('password field', () => {
-      it('should show if wallet does have a password', () => {
-        createWrapper(null, {
-          passphrase: 'password'
-        })
-
-        expect(wrapper.contains('.TransactionFormTransfer__password')).toBe(true)
-      })
-
-      it('should show if wallet does not have a password', () => {
-        expect(wrapper.contains('.TransactionFormTransfer__password')).toBe(false)
-      })
-    })
-
-    describe('passphrase field', () => {
-      it('should show if wallet does not have a password', () => {
-        expect(wrapper.contains('.TransactionFormTransfer__passphrase')).toBe(true)
-      })
-
-      it('should not show if wallet does have a password', () => {
-        createWrapper(null, {
-          passphrase: 'password'
-        })
-
-        expect(wrapper.contains('.TransactionFormTransfer__passphrase')).toBe(false)
-      })
-    })
-
     describe('next button', () => {
-      it('should be enabled if form is valid', async () => {
+      it('should be enabled if recipients form is valid', async () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }, {
+          address: 'address-2',
+          amount: 10
+        }]
         wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.amount.$model = 1
-        wrapper.vm.$v.form.recipientId.$model = 'address-2'
         wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
         wrapper.vm.$v.form.passphrase.$model = 'passphrase'
 
@@ -294,6 +273,55 @@ describe('TransactionFormTransfer', () => {
       })
     })
 
+    describe('isMultiPayment', () => {
+      it('should return false if it is a normal transaction', () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }]
+
+        expect(wrapper.vm.isMultiPayment).toBe(false)
+      })
+
+      it('should return true if it is multipayment transaction', () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }, {
+          address: 'address-3',
+          amount: 10
+        }]
+
+        expect(wrapper.vm.isMultiPayment).toBe(true)
+      })
+    })
+
+    describe('hasAip11', () => {
+      it('should return true if it is aip11', () => {
+        const response = TransactionFormTransfer.computed.walletNetwork.call({
+          session_network: globalNetwork,
+          currentWallet: null
+        })
+
+        expect(response.constants.aip11).toBe(true)
+      })
+
+      it('should return false if aip11 is false', () => {
+        const response = TransactionFormTransfer.computed.walletNetwork.call({
+          session_network: {
+            ...globalNetwork,
+            constants: {
+              ...globalNetwork.constants,
+              aip11: false
+            }
+          },
+          currentWallet: null
+        })
+
+        expect(response.constants.aip11).toBe(false)
+      })
+    })
+
     describe('amountTooLowError', () => {
       it('should return formatted value', () => {
         const $tSpy = jest.fn(translation => translation)
@@ -334,12 +362,6 @@ describe('TransactionFormTransfer', () => {
     })
 
     describe('notEnoughBalanceError', () => {
-      it('should return empty if no wallet', () => {
-        createWrapper(null, null)
-
-        expect(wrapper.vm.notEnoughBalanceError).toBe('')
-      })
-
       it('should return a formatted value', () => {
         const $tSpy = jest.fn(translation => translation)
         const formatterNetworkCurrencySpy = jest.fn(value => value)
@@ -367,16 +389,30 @@ describe('TransactionFormTransfer', () => {
     })
 
     describe('maximumAvailableAmount', () => {
-      it('should return zero if no wallet', () => {
-        createWrapper(null, null)
-
-        expect(wrapper.vm.maximumAvailableAmount).toEqual(new BigNumber('0'))
-      })
-
       it('should return value', () => {
+        wrapper.vm.$v.form.fee.$model = 0.1
         expect(wrapper.vm.maximumAvailableAmount).toEqual((new BigNumber(1000)).minus(0.1))
       })
 
+      it('should return value including all recipients', async () => {
+        wrapper.vm.$v.form.fee.$model = 0.1
+        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('test')
+        wrapper.vm.$v.amount.$model = 10
+
+        await wrapper.vm.$nextTick()
+        wrapper.vm.addRecipient()
+        await wrapper.vm.$nextTick()
+
+        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('test')
+        wrapper.vm.$v.amount.$model = 20
+
+        await wrapper.vm.$nextTick()
+        wrapper.vm.addRecipient()
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.maximumAvailableAmount).toEqual((new BigNumber(1000)).minus(0.1).minus(30))
+      })
+
       it('should return value based on different fee', () => {
         wrapper.vm.form.fee = 10
 
@@ -689,6 +725,52 @@ describe('TransactionFormTransfer', () => {
         expect(wrapper.vm.vendorFieldMaxLength).toBe(VENDOR_FIELD.defaultMaxLength)
       })
     })
+
+    describe('recipientWarning', () => {
+      it('should return null if recipientId is not dirty', () => {
+        expect(wrapper.vm.recipientWarning).toBe(null)
+      })
+
+      it('should return message for duplicate recipients', () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }]
+        wrapper.vm.$v.recipientId.$model = 'address-2'
+
+        expect(wrapper.vm.recipientWarning).toBe('TRANSACTION.MULTI_PAYMENT.WARNING_DUPLICATE')
+      })
+    })
+
+    describe('maximumRecipients', () => {
+      it('should return default if no constants', () => {
+        expect(wrapper.vm.maximumRecipients).toBe(500)
+      })
+
+      it('should return default if no network value', () => {
+        const network = {
+          ...cloneDeep(globalNetwork),
+          constants: {}
+        }
+
+        createWrapper(null, undefined, network)
+
+        expect(wrapper.vm.maximumRecipients).toBe(500)
+      })
+
+      it('should return network constant', () => {
+        const network = {
+          ...cloneDeep(globalNetwork),
+          constants: {
+            multiPaymentLimit: 20
+          }
+        }
+
+        createWrapper(null, undefined, network)
+
+        expect(wrapper.vm.maximumRecipients).toBe(20)
+      })
+    })
   })
 
   describe('watch', () => {
@@ -707,7 +789,7 @@ describe('TransactionFormTransfer', () => {
     })
 
     it('should check trigger recipient validation', async () => {
-      const spy = jest.spyOn(wrapper.vm.$v.form.recipientId, '$touch', 'get')
+      const spy = jest.spyOn(wrapper.vm.$v.recipientId, '$touch', 'get')
 
       wrapper.vm.wallet = {
         balance: 0,
@@ -730,19 +812,23 @@ describe('TransactionFormTransfer', () => {
 
   describe('methods', () => {
     describe('getTransactionData', () => {
-      it('should return correct data with passphrase', () => {
+      it('should return correct data with passphrase for normal transaction', () => {
         wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.amount.$model = 1
-        wrapper.vm.$v.form.recipientId.$model = 'address-2'
         wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
         wrapper.vm.$v.form.passphrase.$model = 'passphrase'
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: (1 * 1e8).toString()
+        }]
+        wrapper.vm.$v.recipientId.$model = wrapper.vm.$v.form.recipients.$model[0].address
+        wrapper.vm.$v.amount.$model = wrapper.vm.$v.form.recipients.$model[0].amount
 
         expect(wrapper.vm.getTransactionData()).toEqual({
           address: 'address-1',
           passphrase: 'passphrase',
           recipientId: 'address-2',
+          amount: (1 * 1e8).toString(),
           fee: new BigNumber(0.1 * 1e8),
-          amount: new BigNumber(1 * 1e8),
           vendorField: 'vendorfield test',
           wif: undefined,
           networkWif: 170,
@@ -751,6 +837,36 @@ describe('TransactionFormTransfer', () => {
         })
       })
 
+      it('should return correct data with passphrase for multipayment transaction', () => {
+        wrapper.vm.$v.form.fee.$model = 0.1
+        wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
+        wrapper.vm.$v.form.passphrase.$model = 'passphrase'
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: (1 * 1e8).toString()
+        }, {
+          address: 'address-3',
+          amount: (1 * 1e8).toString()
+        }]
+
+        expect(wrapper.vm.getTransactionData()).toEqual({
+          address: 'address-1',
+          passphrase: 'passphrase',
+          recipients: [{
+            address: 'address-2',
+            amount: (1 * 1e8).toString()
+          }, {
+            address: 'address-3',
+            amount: (1 * 1e8).toString()
+          }],
+          fee: new BigNumber(0.1 * 1e8),
+          vendorField: 'vendorfield test',
+          wif: undefined,
+          networkWif: 170,
+          multiSignature: undefined
+        })
+      })
+
       it('should return correct data with passphrase and second passphrase', () => {
         createWrapper(null, {
           address: 'address-1',
@@ -759,30 +875,39 @@ describe('TransactionFormTransfer', () => {
         })
 
         wrapper.vm.$v.form.fee.$model = 0.1
-        wrapper.vm.$v.form.amount.$model = 1
-        wrapper.vm.$v.form.recipientId.$model = 'address-2'
         wrapper.vm.$v.form.vendorField.$model = 'vendorfield test'
         wrapper.vm.$v.form.passphrase.$model = 'passphrase'
         wrapper.vm.$v.form.secondPassphrase.$model = 'second passphrase'
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: (1 * 1e8).toString()
+        }, {
+          address: 'address-3',
+          amount: (1 * 1e8).toString()
+        }]
 
         expect(wrapper.vm.getTransactionData()).toEqual({
           address: 'address-1',
           passphrase: 'passphrase',
-          recipientId: 'address-2',
           secondPassphrase: 'second passphrase',
+          recipients: [{
+            address: 'address-2',
+            amount: (1 * 1e8).toString()
+          }, {
+            address: 'address-3',
+            amount: (1 * 1e8).toString()
+          }],
           fee: new BigNumber(0.1 * 1e8),
-          amount: new BigNumber(1 * 1e8),
           vendorField: 'vendorfield test',
           wif: undefined,
           networkWif: 170,
-          networkId: 'network-1',
           multiSignature: undefined
         })
       })
     })
 
     describe('buildTransaction', () => {
-      it('should build transfer', async () => {
+      it('should build normal transaction', async () => {
         const transactionData = {
           type: 0,
           typeGroup: 2
@@ -794,7 +919,27 @@ describe('TransactionFormTransfer', () => {
         expect(response).toBe(transactionData)
       })
 
-      it('should build transfer with default arguments', async () => {
+      it('should build multipayment transaction', async () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }, {
+          address: 'address-3',
+          amount: 10
+        }]
+
+        const transactionData = {
+          type: 6,
+          typeGroup: 1
+        }
+
+        const response = await wrapper.vm.buildTransaction(transactionData, true, true)
+
+        expect(wrapper.vm.$client.buildMultiPayment).toHaveBeenCalledWith(transactionData, true, true)
+        expect(response).toBe(transactionData)
+      })
+
+      it('should build normal transaction with default arguments', async () => {
         const transactionData = {
           type: 0,
           typeGroup: 2
@@ -805,6 +950,26 @@ describe('TransactionFormTransfer', () => {
         expect(wrapper.vm.$client.buildTransfer).toHaveBeenCalledWith(transactionData, false, false)
         expect(response).toBe(transactionData)
       })
+
+      it('should build multipayment transaction with default arguments', async () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }, {
+          address: 'address-3',
+          amount: 10
+        }]
+
+        const transactionData = {
+          type: 6,
+          typeGroup: 1
+        }
+
+        const response = await wrapper.vm.buildTransaction(transactionData)
+
+        expect(wrapper.vm.$client.buildMultiPayment).toHaveBeenCalledWith(transactionData, false, false)
+        expect(response).toBe(transactionData)
+      })
     })
 
     describe('populateSchema', () => {
@@ -829,8 +994,8 @@ describe('TransactionFormTransfer', () => {
 
         wrapper.vm.populateSchema()
 
-        expect(wrapper.vm.form.amount).toBe((10 * 1e8).toString())
-        expect(wrapper.vm.form.recipientId).toBe('address-5')
+        expect(wrapper.vm.amount).toBe((10 * 1e8).toString())
+        expect(wrapper.vm.recipientId).toBe('address-5')
         expect(wrapper.vm.form.vendorField).toBe('test vendorfield')
       })
 
@@ -957,11 +1122,25 @@ describe('TransactionFormTransfer', () => {
     })
 
     describe('transactionError', () => {
-      it('should generate transaction error', () => {
+      it('should generate error for normal transaction', () => {
         wrapper.vm.transactionError()
 
         expect(wrapper.vm.$error).toHaveBeenCalledWith('TRANSACTION.ERROR.VALIDATION.TRANSFER')
       })
+
+      it('should generate error for multipayment transaction', () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-2',
+          amount: 10
+        }, {
+          address: 'address-3',
+          amount: 10
+        }]
+
+        wrapper.vm.transactionError()
+
+        expect(wrapper.vm.$error).toHaveBeenCalledWith('TRANSACTION.ERROR.VALIDATION.MULTI_PAYMENT')
+      })
     })
 
     describe('emitNext', () => {
@@ -1022,7 +1201,7 @@ describe('TransactionFormTransfer', () => {
       it('should trigger send all', () => {
         const spy = jest.spyOn(wrapper.vm, 'confirmSendAll').mockImplementation()
 
-        wrapper.vm.form.amount = 50
+        wrapper.vm.amount = 50
         wrapper.vm.setSendAll(true)
 
         expect(spy).toHaveBeenCalledTimes(1)
@@ -1031,15 +1210,13 @@ describe('TransactionFormTransfer', () => {
 
       it('should trigger when disabled', () => {
         const spy = jest.spyOn(wrapper.vm, 'ensureAvailableAmount').mockImplementation()
-        const spySet = jest.spyOn(wrapper.vm, '$set')
 
-        wrapper.vm.form.amount = 10
+        wrapper.vm.amount = 50
         wrapper.vm.previousAmount = 50
         wrapper.vm.setSendAll(false)
 
         expect(spy).toHaveBeenCalledTimes(1)
-        expect(spySet).toHaveBeenNthCalledWith(1, wrapper.vm.form, 'amount', 50)
-        expect(wrapper.vm.form.amount).toEqual(50)
+        expect(wrapper.vm.amount).toEqual(50)
         expect(wrapper.vm.previousAmount).toEqual('')
         expect(wrapper.vm.isSendAllActive).toEqual(false)
       })
@@ -1048,13 +1225,13 @@ describe('TransactionFormTransfer', () => {
         const spy = jest.spyOn(wrapper.vm, 'ensureAvailableAmount').mockImplementation()
         const spySet = jest.spyOn(wrapper.vm, '$set')
 
-        wrapper.vm.form.amount = 10
+        wrapper.vm.amount = 10
         wrapper.vm.previousAmount = 50
         wrapper.vm.setSendAll(false, false)
 
         expect(spy).toHaveBeenCalled()
         expect(spySet).not.toHaveBeenCalled()
-        expect(wrapper.vm.form.amount).toEqual(10)
+        expect(wrapper.vm.amount).toEqual(10)
         expect(wrapper.vm.previousAmount).toEqual('')
         expect(wrapper.vm.isSendAllActive).toEqual(false)
       })
@@ -1062,9 +1239,7 @@ describe('TransactionFormTransfer', () => {
 
     describe('ensureAvailableAmount', () => {
       it('should set amount to max if send all is enabled', async () => {
-        const spySet = jest.spyOn(wrapper.vm, '$set')
-
-        wrapper.vm.form.amount = 0
+        wrapper.vm.amount = new BigNumber('999.9')
         wrapper.vm.isSendAllActive = true
 
         await wrapper.vm.$nextTick()
@@ -1073,21 +1248,20 @@ describe('TransactionFormTransfer', () => {
 
         expect(wrapper.vm.isSendAllActive).toBe(true)
         expect(wrapper.vm.canSendAll).toBe(true)
-        expect(spySet).toHaveBeenNthCalledWith(1, wrapper.vm.form, 'amount', new BigNumber('999.9'))
-        expect(wrapper.vm.form.amount).toEqual(new BigNumber('999.9'))
+        expect(wrapper.vm.amount).toEqual(new BigNumber('999.9'))
       })
 
       it('should not set amount to max if send all is disabled', async () => {
         const spySet = jest.spyOn(wrapper.vm, '$set')
 
-        wrapper.vm.form.amount = 10
+        wrapper.vm.amount = 10
 
         await wrapper.vm.$nextTick()
 
         wrapper.vm.ensureAvailableAmount()
 
         expect(spySet).not.toHaveBeenCalled()
-        expect(wrapper.vm.form.amount).toEqual(10)
+        expect(wrapper.vm.amount).toEqual(10)
       })
     })
 
@@ -1120,6 +1294,113 @@ describe('TransactionFormTransfer', () => {
       })
     })
 
+    describe('addRecipient', () => {
+      it('should add current recipient to list', async () => {
+        const address = Identities.Address.fromPassphrase('passphrase')
+        wrapper.vm.$v.recipientId.$model = address
+        wrapper.vm.$v.amount.$model = 100
+
+        await wrapper.vm.$nextTick()
+
+        wrapper.vm.addRecipient()
+
+        expect(wrapper.vm.$v.form.recipients.$model).toEqual([{
+          address: address,
+          amount: new BigNumber(100 * 1e8),
+          sendAll: false
+        }])
+      })
+
+      it('should reset current recipient', async () => {
+        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
+        wrapper.vm.$v.amount.$model = 100
+
+        await wrapper.vm.$nextTick()
+
+        wrapper.vm.addRecipient()
+
+        expect(wrapper.vm.$v.recipientId.$model).toBe('')
+        expect(wrapper.vm.$v.amount.$model).toBe('')
+      })
+
+      it('should do nothing if invalid address', async () => {
+        WalletService.validateAddress.mockReturnValue(false)
+
+        wrapper.vm.$v.recipientId.$model = 'invalid address'
+        wrapper.vm.$v.amount.$model = 100
+
+        await wrapper.vm.$nextTick()
+
+        wrapper.vm.addRecipient()
+
+        expect(wrapper.vm.$v.form.recipients.$model).toEqual([])
+
+        WalletService.validateAddress.mockReturnValue(true)
+      })
+
+      it('should do nothing if invalid fee', async () => {
+        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
+        wrapper.vm.$v.amount.$model = ''
+
+        await wrapper.vm.$nextTick()
+
+        wrapper.vm.addRecipient()
+
+        expect(wrapper.vm.$v.form.recipients.$model).toEqual([])
+      })
+    })
+
+    describe('emitRemoveRecipient', () => {
+      it('should remove recipient at index', () => {
+        wrapper.vm.$v.form.recipients.$model = [{
+          address: 'address-1',
+          amount: 10
+        }, {
+          address: 'address-2',
+          amount: 10
+        }, {
+          address: 'address-3',
+          amount: 10
+        }]
+
+        wrapper.vm.emitRemoveRecipient(1)
+
+        expect(wrapper.vm.$v.form.recipients.$model).toEqual([{
+          address: 'address-1',
+          amount: 10
+        }, {
+          address: 'address-3',
+          amount: 10
+        }])
+      })
+
+      it('should do nothing if index does not exist', () => {
+        const recipients = [{
+          address: 'address-1',
+          amount: 10
+        }, {
+          address: 'address-2',
+          amount: 10
+        }]
+
+        wrapper.vm.$v.form.recipients.$model = recipients
+
+        wrapper.vm.emitRemoveRecipient(3)
+
+        expect(wrapper.vm.$v.form.recipients.$model).toBe(recipients)
+      })
+    })
+
+    describe('nextStep', () => {
+      it('should submit form data', async () => {
+        const spy = jest.spyOn(wrapper.vm, 'onSubmit').mockImplementation()
+
+        wrapper.vm.nextStep()
+
+        expect(spy).toHaveBeenCalledTimes(0)
+      })
+    })
+
     describe('loadTransaction', () => {
       let $tSpy
       beforeEach(() => {
@@ -1147,7 +1428,7 @@ describe('TransactionFormTransfer', () => {
           WalletService.validateAddress = jest.fn(() => false)
 
           wrapper.vm.electron_readFile = jest.fn(async () => {
-            return '{ "type": "0", "recipientId": "AJAAfMJj1w6U5A3t6BGA7NYZsaVve6isMm" }'
+            return '{ "type": "0", "recipientId": "AJAAfMJj1w6U5A3t6BGA7NYZsaVve6isMm", "amount": "10" }'
           })
 
           await wrapper.vm.loadTransaction()
@@ -1177,15 +1458,21 @@ describe('TransactionFormTransfer', () => {
 
           expect($tSpy).toHaveBeenCalledWith('TRANSACTION.SUCCESS.LOAD_FROM_FILE')
           expect(wrapper.vm.$success).toHaveBeenCalledWith('TRANSACTION.SUCCESS.LOAD_FROM_FILE')
-          expect(wrapper.vm.form.recipientId).toEqual('AJAAfMJj1w6U5A3t6BGA7NYZsaVve6isMm')
+          expect(wrapper.vm.recipientId).toEqual('AJAAfMJj1w6U5A3t6BGA7NYZsaVve6isMm')
+          expect(wrapper.vm.amount).toEqual('20')
           expect(wrapper.vm.form.fee).toEqual('0.1')
-          expect(wrapper.vm.form.amount).toEqual('20')
           expect(wrapper.vm.form.vendorField).toEqual('vendorfield test')
         })
 
         it('should display a success alert', async () => {
+          const json = JSON.stringify({
+            type: 0,
+            recipientId: 'AJAAfMJj1w6U5A3t6BGA7NYZsaVve6isMm',
+            amount: (20 * 1e8).toString()
+          })
+
           wrapper.vm.electron_readFile = jest.fn(async () => {
-            return '{ "type": "0" }'
+            return json
           })
 
           await wrapper.vm.loadTransaction()
@@ -1220,4 +1507,146 @@ describe('TransactionFormTransfer', () => {
       })
     })
   })
+
+  describe('validations', () => {
+    describe('recipientId', () => {
+      it('should be required if not set', () => {
+        wrapper.vm.$v.recipientId.$model = ''
+
+        expect(wrapper.vm.$v.recipientId.required).toBe(false)
+      })
+
+      it('should not be required if set', () => {
+        wrapper.vm.$v.recipientId.$model = 'test'
+
+        expect(wrapper.vm.$v.recipientId.required).toBe(true)
+      })
+
+      it('should not be valid', async () => {
+        WalletService.validateAddress.mockReturnValue(false)
+
+        wrapper.vm.$v.recipientId.$model = 'test'
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$refs.recipient.$v.$invalid).toBe(true)
+        expect(wrapper.vm.$v.recipientId.isValid).toBe(false)
+
+        WalletService.validateAddress.mockReturnValue(true)
+      })
+
+      it('should not be valid if no recipient field', async () => {
+        wrapper.vm.$refs.recipient = null
+        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$refs.recipient).toBe(null)
+        expect(wrapper.vm.$v.recipientId.isValid).toBe(false)
+      })
+
+      it('should be valid', async () => {
+        wrapper.vm.$v.recipientId.$model = Identities.Address.fromPassphrase('passphrase')
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$refs.recipient.$v.$invalid).toBe(false)
+        expect(wrapper.vm.$v.recipientId.isValid).toBe(true)
+      })
+    })
+
+    describe('amount', () => {
+      it('should be required if not set', () => {
+        wrapper.vm.$v.amount.$model = ''
+
+        expect(wrapper.vm.$v.amount.required).toBe(false)
+      })
+
+      it('should not be required if set', () => {
+        wrapper.vm.$v.amount.$model = '10'
+
+        expect(wrapper.vm.$v.amount.required).toBe(true)
+      })
+
+      it('should not be valid', async () => {
+        wrapper.vm.$v.amount.$model = 'test'
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$refs.amount.$v.$invalid).toBe(true)
+        expect(wrapper.vm.$v.amount.isValid).toBe(false)
+      })
+
+      it('should not be valid if no amount field', async () => {
+        wrapper.vm.$refs.amount = null
+        wrapper.vm.$v.amount.$model = 'test'
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$refs.amount).toBe(null)
+        expect(wrapper.vm.$v.amount.isValid).toBe(false)
+      })
+
+      it('should be valid', async () => {
+        wrapper.vm.$v.amount.$model = 10
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$refs.amount.$v.$invalid).toBe(false)
+        expect(wrapper.vm.$v.amount.isValid).toBe(true)
+      })
+    })
+
+    describe('form', () => {
+      describe('recipients', () => {
+        it('should not be above minimum if not set', () => {
+          wrapper.vm.$v.form.recipients.$model = []
+
+          expect(wrapper.vm.$v.form.recipients.aboveMinimum).toBe(false)
+        })
+
+        it('should be above minimum if set', () => {
+          wrapper.vm.$v.form.recipients.$model = [{
+            address: 'address-1',
+            amount: 10
+          }]
+
+          expect(wrapper.vm.$v.form.recipients.aboveMinimum).toBe(true)
+        })
+
+        it('should not be below or equal to maximum if too many', () => {
+          const network = {
+            ...cloneDeep(globalNetwork),
+            constants: {
+              multiPaymentLimit: 2
+            }
+          }
+
+          createWrapper(null, undefined, network)
+
+          wrapper.vm.$v.form.recipients.$model = [{
+            address: 'address-1',
+            amount: 10
+          }, {
+            address: 'address-1',
+            amount: 10
+          }, {
+            address: 'address-1',
+            amount: 10
+          }]
+
+          expect(wrapper.vm.$v.form.recipients.belowOrEqualMaximum).toBe(false)
+        })
+
+        it('should be below or equal to maximum if set', () => {
+          wrapper.vm.$v.form.recipients.$model = [{
+            address: 'address-1',
+            amount: 10
+          }]
+
+          expect(wrapper.vm.$v.form.recipients.belowOrEqualMaximum).toBe(true)
+        })
+      })
+    })
+  })
 })
diff --git a/src/renderer/components/Input/InputFee.vue b/src/renderer/components/Input/InputFee.vue
index c325dfa54a..10d22e7763 100644
--- a/src/renderer/components/Input/InputFee.vue
+++ b/src/renderer/components/Input/InputFee.vue
@@ -179,9 +179,7 @@ export default {
         if (feeStatistics[0]) {
           transactionStatistics = Object.values(feeStatistics).find(feeConfig => feeConfig.type === this.transactionType)
         } else if (feeStatistics[this.transactionGroup]) {
-          transactionStatistics = Object.values(feeStatistics[this.transactionGroup]).find(feeConfig => {
-            return feeConfig.type === this.transactionType
-          })
+          transactionStatistics = Object.values(feeStatistics[this.transactionGroup]).find(feeConfig => feeConfig.type === this.transactionType)
         }
 
         if (transactionStatistics) {
diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
index 50a383c152..442465f543 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
@@ -31,7 +31,7 @@
       :label="`${$t('TRANSACTION.RECIPIENTS')} - ${payments.length}`"
       item-value-class="items-center"
     >
-      <TransactionMultiPaymentList
+      <TransactionRecipientList
         :title="null"
         :items="payments"
         readonly
@@ -59,7 +59,7 @@
 <script>
 import { TRANSACTION_TYPES } from '@config'
 import { ListDivided, ListDividedItem } from '@/components/ListDivided'
-import TransactionMultiPaymentList from '@/components/Transaction/TransactionMultiPaymentList'
+import TransactionRecipientList from '@/components/Transaction/TransactionRecipientList'
 
 export default {
   name: 'TransactionConfirmMultiPayment',
@@ -71,7 +71,7 @@ export default {
   components: {
     ListDivided,
     ListDividedItem,
-    TransactionMultiPaymentList
+    TransactionRecipientList
   },
 
   computed: {
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionForm.vue b/src/renderer/components/Transaction/TransactionForm/TransactionForm.vue
index 713d1174ee..1dc27e42c4 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionForm.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionForm.vue
@@ -13,7 +13,6 @@ import { TRANSACTION_GROUPS } from '@config'
 import TransactionFormDelegateRegistration from './TransactionFormDelegateRegistration'
 import TransactionFormDelegateResignation from './TransactionFormDelegateResignation'
 import TransactionFormIpfs from './TransactionFormIpfs'
-import TransactionFormMultiPayment from './TransactionFormMultiPayment'
 import TransactionFormMultiSign from './TransactionFormMultiSign'
 import TransactionFormMultiSignature from './TransactionFormMultiSignature'
 import TransactionFormTransfer from './TransactionFormTransfer'
@@ -29,7 +28,6 @@ export default {
     TransactionFormDelegateRegistration,
     TransactionFormDelegateResignation,
     TransactionFormIpfs,
-    TransactionFormMultiPayment,
     TransactionFormMultiSign,
     TransactionFormMultiSignature,
     TransactionFormTransfer,
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue
deleted file mode 100644
index 4813eafab8..0000000000
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormMultiPayment.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<template>
-  <form
-    class="TransactionFormMultiPayment flex flex-col"
-    @submit.prevent
-  >
-    <ListDivided
-      v-if="senderLabel"
-      :is-floating-label="true"
-    >
-      <ListDividedItem
-        :label="$t('TRANSACTION.SENDER')"
-        item-value-class="w-full"
-      >
-        <span class="break-words">
-          {{ senderLabel }}
-        </span>
-        <span
-          v-if="senderLabel !== currentWallet.address"
-          class="text-sm text-theme-page-text-light"
-        >
-          {{ currentWallet.address }}
-        </span>
-      </ListDividedItem>
-    </ListDivided>
-
-    <div
-      v-if="step === 1"
-    >
-      <InputAddress
-        ref="recipient"
-        v-model="$v.recipientId.$model"
-        :label="$t('TRANSACTION.RECIPIENT')"
-        :pub-key-hash="walletNetwork.version"
-        :show-suggestions="true"
-        :is-disabled="!currentWallet"
-        :warning-text="recipientWarning"
-        name="recipientId"
-        class="TransactionFormMultiPayment__recipient mb-5 mr-4 flex-1"
-      />
-
-      <div
-        class="flex"
-      >
-        <InputCurrency
-          ref="amount"
-          v-model="$v.amount.$model"
-          :alternative-currency="alternativeCurrency"
-          :currency="walletNetwork.token"
-          :is-invalid="$v.amount.$dirty && $v.amount.$invalid"
-          :label="$t('TRANSACTION.AMOUNT')"
-          :minimum-error="amountTooLowError"
-          :minimum-amount="minimumAmount"
-          :maximum-amount="maximumAvailableAmount"
-          :maximum-error="notEnoughBalanceError"
-          :required="true"
-          :is-disabled="!currentWallet"
-          :wallet-network="walletNetwork"
-          class="TransactionFormMultiPayment__amount flex-1"
-        />
-
-        <ButtonGeneric
-          :disabled="!validStep1"
-          :label="$t('TRANSACTION.MULTI_PAYMENT.BUTTON_ADD')"
-          class="TransactionFormMultiPayment__add py-1 flex-inline h-8 mt-4 ml-4"
-          @click="addRecipient"
-        />
-      </div>
-
-      <TransactionMultiPaymentList
-        :items="$v.form.recipients.$model"
-        :max-items="maximumRecipients"
-        :show-count="true"
-        :is-invalid="hasMoreThanMaximumRecipients"
-        :required="true"
-        class="TransactionModalMultiPayment__recipients mt-4"
-        @remove="emitRemoveRecipient"
-      />
-    </div>
-
-    <div v-if="step === 2">
-      <InputText
-        ref="vendorField"
-        v-model="$v.form.vendorField.$model"
-        :label="vendorFieldLabel"
-        :bip39-warning="true"
-        :helper-text="vendorFieldHelperText"
-        :maxlength="vendorFieldMaxLength"
-        name="vendorField"
-        class="TransactionFormMultiPayment__vendorfield mb-5"
-      />
-
-      <InputFee
-        ref="fee"
-        :currency="walletNetwork.token"
-        :transaction-type="$options.transactionType"
-        :is-disabled="!currentWallet"
-        :wallet="currentWallet"
-        :wallet-network="walletNetwork"
-        class="TransactionFormMultiPayment__fee"
-        @input="onFee"
-      />
-
-      <div v-if="!isMultiSignature">
-        <div
-          v-if="currentWallet.isLedger"
-          class="TransactionFormMultiPayment__ledger-notice mt-10"
-        >
-          {{ $t('TRANSACTION.LEDGER_SIGN_NOTICE') }}
-        </div>
-
-        <InputPassword
-          v-else-if="currentWallet.passphrase"
-          ref="password"
-          v-model="$v.form.walletPassword.$model"
-          :label="$t('TRANSACTION.PASSWORD')"
-          :is-required="true"
-          class="TransactionFormMultiPayment__password mt-4"
-        />
-
-        <PassphraseInput
-          v-else
-          ref="passphrase"
-          v-model="$v.form.passphrase.$model"
-          :address="currentWallet.address"
-          :pub-key-hash="walletNetwork.version"
-          :is-disabled="!currentWallet"
-          class="TransactionFormMultiPayment__passphrase mt-4"
-        />
-      </div>
-
-      <PassphraseInput
-        v-if="currentWallet.secondPublicKey"
-        ref="secondPassphrase"
-        v-model="$v.form.secondPassphrase.$model"
-        :label="$t('TRANSACTION.SECOND_PASSPHRASE')"
-        :pub-key-hash="walletNetwork.version"
-        :public-key="currentWallet.secondPublicKey"
-        class="TransactionFormMultiPayment__second-passphrase mt-5"
-      />
-    </div>
-
-    <footer class="mt-4 flex justify-between items-center">
-      <div class="self-start">
-        <button
-          :disabled="step === 1"
-          class="TransactionFormMultiPayment__prev blue-button"
-          @click="previousStep"
-        >
-          {{ $t('COMMON.PREV') }}
-        </button>
-
-        <button
-          :disabled="!isFormValid"
-          class="TransactionFormMultiPayment__next blue-button"
-          @click="nextStep"
-        >
-          {{ $t('COMMON.NEXT') }}
-        </button>
-      </div>
-    </footer>
-
-    <ModalLoader
-      :message="$t('ENCRYPTION.DECRYPTING')"
-      :visible="showEncryptLoader"
-    />
-    <ModalLoader
-      :message="$t('TRANSACTION.LEDGER_SIGN_WAIT')"
-      :visible="showLedgerLoader"
-    />
-  </form>
-</template>
-
-<script>
-import { required } from 'vuelidate/lib/validators'
-import { TRANSACTION_TYPES, VENDOR_FIELD } from '@config'
-import { ButtonGeneric } from '@/components/Button'
-import { InputAddress, InputCurrency, InputPassword, InputText, InputFee } from '@/components/Input'
-import { ListDivided, ListDividedItem } from '@/components/ListDivided'
-import { ModalLoader } from '@/components/Modal'
-import { PassphraseInput } from '@/components/Passphrase'
-import TransactionMultiPaymentList from '@/components/Transaction/TransactionMultiPaymentList'
-import mixin from './mixin'
-
-export default {
-  name: 'TransactionFormMultiPayment',
-
-  transactionType: TRANSACTION_TYPES.GROUP_1.MULTI_PAYMENT,
-
-  components: {
-    ButtonGeneric,
-    InputAddress,
-    InputCurrency,
-    InputPassword,
-    InputText,
-    InputFee,
-    ListDivided,
-    ListDividedItem,
-    ModalLoader,
-    PassphraseInput,
-    TransactionMultiPaymentList
-  },
-
-  mixins: [mixin],
-
-  data: () => ({
-    step: 1,
-    amount: '',
-    recipientId: '',
-    form: {
-      recipients: [],
-      fee: 0,
-      passphrase: '',
-      walletPassword: '',
-      vendorField: ''
-    }
-  }),
-
-  computed: {
-    alternativeCurrency () {
-      return this.$store.getters['session/currency']
-    },
-
-    validStep1 () {
-      if (!this.$v.recipientId.$dirty || this.$v.recipientId.$invalid) {
-        return false
-      }
-
-      if (!this.$v.amount.$dirty || this.$v.amount.$invalid) {
-        return false
-      }
-
-      return true
-    },
-
-    isFormValid () {
-      if (this.step === 1) {
-        return !this.$v.form.recipients.$invalid
-      }
-
-      return !this.$v.form.$invalid
-    },
-
-    hasMoreThanMaximumRecipients () {
-      return this.form.recipients.length > this.maximumRecipients
-    },
-
-    // Customize the message to display the minimum amount as subunit
-    amountTooLowError () {
-      const { fractionDigits } = this.walletNetwork
-      const minimumAmount = Math.pow(10, -fractionDigits)
-
-      return this.$t('INPUT_CURRENCY.ERROR.LESS_THAN_MINIMUM', {
-        amount: this.currency_simpleFormatCrypto(minimumAmount.toFixed(fractionDigits))
-      })
-    },
-
-    notEnoughBalanceError () {
-      return this.$t('TRANSACTION_FORM.ERROR.NOT_ENOUGH_BALANCE', {
-        balance: this.formatter_networkCurrency(this.currentWallet.balance)
-      })
-    },
-
-    minimumAmount () {
-      return this.currency_subToUnit(1)
-    },
-
-    maximumAvailableAmount () {
-      let availableAmount = this.currency_subToUnit(this.currentWallet.balance).minus(this.form.fee)
-
-      for (const recipient of this.form.recipients) {
-        availableAmount = availableAmount.minus(this.currency_subToUnit(recipient.amount))
-      }
-
-      return availableAmount
-    },
-
-    vendorFieldLabel () {
-      return `${this.$t('TRANSACTION.VENDOR_FIELD')} - ${this.$t('VALIDATION.MAX_LENGTH', [this.vendorFieldMaxLength])}`
-    },
-
-    vendorFieldHelperText () {
-      const vendorFieldLength = this.form.vendorField.length
-
-      if (vendorFieldLength === this.vendorFieldMaxLength) {
-        return this.$t('VALIDATION.VENDOR_FIELD.LIMIT_REACHED', [this.vendorFieldMaxLength])
-      } else if (vendorFieldLength) {
-        return this.$t('VALIDATION.VENDOR_FIELD.LIMIT_REMAINING', [
-          this.vendorFieldMaxLength - vendorFieldLength,
-          this.vendorFieldMaxLength
-        ])
-      }
-
-      return null
-    },
-
-    vendorFieldMaxLength () {
-      const vendorField = this.walletNetwork.vendorField
-
-      if (vendorField) {
-        return vendorField.maxLength
-      }
-
-      return VENDOR_FIELD.defaultMaxLength
-    },
-
-    recipientWarning () {
-      if (!this.$v.recipientId.$dirty) {
-        return null
-      }
-
-      if (this.form.recipients.some(recipient => recipient.address === this.$v.recipientId.$model)) {
-        return this.$t('TRANSACTION.MULTI_PAYMENT.WARNING_DUPLICATE')
-      }
-
-      return null
-    },
-
-    maximumRecipients () {
-      if (!this.session_network.constants || !this.session_network.constants.multiPaymentLimit) {
-        return 500
-      }
-
-      return this.session_network.constants.multiPaymentLimit
-    }
-  },
-
-  mounted () {
-    this.$v.recipientId.$touch()
-  },
-
-  methods: {
-    getTransactionData () {
-      const transactionData = {
-        address: this.currentWallet.address,
-        recipients: this.form.recipients,
-        vendorField: this.form.vendorField,
-        passphrase: this.form.passphrase,
-        fee: this.getFee(),
-        wif: this.form.wif,
-        networkWif: this.walletNetwork.wif,
-        multiSignature: this.currentWallet.multiSignature
-      }
-
-      if (this.currentWallet.secondPublicKey) {
-        transactionData.secondPassphrase = this.form.secondPassphrase
-      }
-
-      return transactionData
-    },
-
-    async buildTransaction (transactionData, isAdvancedFee = false, returnObject = false) {
-      return this.$client.buildMultiPayment(transactionData, isAdvancedFee, returnObject)
-    },
-
-    transactionError () {
-      this.$error(this.$t('TRANSACTION.ERROR.VALIDATION.MULTI_PAYMENT'))
-    },
-
-    addRecipient () {
-      if (this.$v.recipientId.$invalid || this.$v.amount.$invalid) {
-        return
-      }
-
-      this.$v.form.recipients.$model.push({
-        address: this.recipientId,
-        amount: this.currency_unitToSub(this.amount)
-      })
-
-      this.$refs.recipient.reset()
-      this.$v.recipientId.$reset()
-      this.$v.amount.$model = ''
-      this.$refs.amount.reset()
-    },
-
-    previousStep () {
-      if (this.step === 2) {
-        this.step = 1
-      }
-    },
-
-    nextStep () {
-      if (this.step === 1) {
-        this.step = 2
-      } else {
-        this.form.fee = this.$refs.fee.fee
-        this.onSubmit()
-      }
-    },
-
-    emitRemoveRecipient (index) {
-      if (!Object.prototype.hasOwnProperty.call(this.$v.form.recipients.$model, index)) {
-        return
-      }
-
-      this.$v.form.recipients.$model = [
-        ...this.form.recipients.slice(0, index),
-        ...this.form.recipients.slice(index + 1)
-      ]
-    }
-  },
-
-  validations: {
-    recipientId: {
-      required,
-      isValid () {
-        if (this.$refs.recipient) {
-          return !this.$refs.recipient.$v.$invalid
-        }
-
-        return false
-      }
-    },
-
-    amount: {
-      required,
-      isValid () {
-        if (this.$refs.amount) {
-          return !this.$refs.amount.$v.$invalid
-        }
-
-        return false
-      }
-    },
-
-    form: {
-      recipients: {
-        aboveMinimum () {
-          return this.form.recipients.length > 1
-        },
-
-        belowOrEqualMaximum () {
-          return this.form.recipients.length <= this.maximumRecipients
-        }
-      },
-      fee: mixin.validators.fee,
-      passphrase: mixin.validators.passphrase,
-      secondPassphrase: mixin.validators.secondPassphrase,
-      vendorField: {},
-      walletPassword: mixin.validators.walletPassword
-    }
-  }
-}
-</script>
-
-<style>
-.TransactionModalMultiPayment__recipients .InputEditableList__list {
-  max-height: 13rem;
-}
-</style>
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
index 226ba0a8db..879ab46121 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
@@ -26,7 +26,7 @@
     <WalletSelection
       v-if="schema && schema.address"
       v-model="$v.wallet.$model"
-      :compatible-address="$v.form.recipientId.$model"
+      :compatible-address="$v.recipientId.$model"
       class="TransactionFormTransfer__wallet mb-5"
       profile-class="mb-5"
       @select="ensureAvailableAmount"
@@ -34,11 +34,12 @@
 
     <InputAddress
       ref="recipient"
-      v-model="$v.form.recipientId.$model"
+      v-model="$v.recipientId.$model"
       :label="$t('TRANSACTION.RECIPIENT')"
       :pub-key-hash="walletNetwork.version"
       :show-suggestions="true"
       :is-disabled="!currentWallet"
+      :warning-text="recipientWarning"
       name="recipientId"
       class="TransactionFormTransfer__recipient mb-5"
     />
@@ -46,10 +47,10 @@
     <div class="flex items-baseline mb-5">
       <InputCurrency
         ref="amount"
-        v-model="$v.form.amount.$model"
+        v-model="$v.amount.$model"
         :alternative-currency="alternativeCurrency"
         :currency="walletNetwork.token"
-        :is-invalid="$v.form.amount.$dirty && $v.form.amount.$invalid"
+        :is-invalid="$v.amount.$dirty && $v.amount.$invalid"
         :label="$t('TRANSACTION.AMOUNT')"
         :minimum-error="amountTooLowError"
         :minimum-amount="minimumAmount"
@@ -63,41 +64,70 @@
         @input="setSendAll(false, false)"
       />
 
+      <ButtonGeneric
+        v-if="hasAip11"
+        :disabled="!isValidRecipient"
+        :label="$t('TRANSACTION.BUTTON_ADD')"
+        class="TransactionFormTransfer__add py-1 flex-inline h-8 mt-4 mr-3"
+        @click="addRecipient"
+      />
+
       <InputSwitch
         v-model="isSendAllActive"
         :text="$t('TRANSACTION.SEND_ALL')"
-        :is-disabled="!canSendAll || !currentWallet"
+        :is-disabled="isRecipientSendAll || !canSendAll || !currentWallet"
         class="TransactionFormTransfer__send-all"
         @change="setSendAll"
       />
     </div>
 
+    <TransactionRecipientList
+      v-if="hasAip11"
+      :items="$v.form.recipients.$model"
+      :max-items="maximumRecipients"
+      :show-count="true"
+      :is-invalid="hasMoreThanMaximumRecipients"
+      :required="true"
+      class="TransactionFormTransfer__recipients mt-4"
+      @remove="emitRemoveRecipient"
+    />
+
     <InputText
       ref="vendorField"
       v-model="$v.form.vendorField.$model"
       :label="vendorFieldLabel"
       :bip39-warning="true"
       :helper-text="vendorFieldHelperText"
-      :is-disabled="!currentWallet"
       :maxlength="vendorFieldMaxLength"
       name="vendorField"
       class="TransactionFormTransfer__vendorfield mb-5"
     />
 
-    <InputFee
-      ref="fee"
-      :currency="walletNetwork.token"
-      :transaction-type="$options.transactionType"
-      :is-disabled="!currentWallet"
-      :wallet="currentWallet"
-      :wallet-network="walletNetwork"
-      class="TransactionFormTransfer__fee"
-      @input="onFee"
-    />
+    <div class="mt-4">
+      <InputFee
+        ref="fee"
+        :currency="walletNetwork.token"
+        :transaction-type="transactionTypeFee"
+        :is-disabled="!currentWallet"
+        :wallet="currentWallet"
+        :wallet-network="walletNetwork"
+        class="TransactionFormTransfer__fee"
+        :class="{
+          'TransactionFormTransfer__fee--helper': isMultiPayment && insufficientFundsError
+        }"
+        @input="onFee"
+      />
+      <p
+        v-if="isMultiPayment && insufficientFundsError"
+        class="text-red-dark text-theme-page-text-light text-xs"
+      >
+        {{ insufficientFundsError }}
+      </p>
+    </div>
 
     <div v-if="!isMultiSignature">
       <div
-        v-if="currentWallet && currentWallet.isLedger"
+        v-if="isLedger"
         class="TransactionFormTransfer__ledger-notice mt-10"
       >
         {{ $t('TRANSACTION.LEDGER_SIGN_NOTICE') }}
@@ -136,9 +166,9 @@
     <footer class="mt-10 flex justify-between items-center">
       <div class="self-start">
         <button
-          :disabled="$v.form.$invalid"
+          :disabled="!isFormValid"
           class="TransactionFormTransfer__next blue-button"
-          @click="onSubmit"
+          @click="nextStep"
         >
           {{ $t('COMMON.NEXT') }}
         </button>
@@ -185,11 +215,13 @@
 <script>
 import { required } from 'vuelidate/lib/validators'
 import { TRANSACTION_TYPES, VENDOR_FIELD } from '@config'
+import { ButtonGeneric } from '@/components/Button'
 import { InputAddress, InputCurrency, InputPassword, InputSwitch, InputText, InputFee } from '@/components/Input'
 import { ListDivided, ListDividedItem } from '@/components/ListDivided'
 import { ModalConfirmation, ModalLoader } from '@/components/Modal'
 import { PassphraseInput } from '@/components/Passphrase'
 import SvgIcon from '@/components/SvgIcon'
+import TransactionRecipientList from '@/components/Transaction/TransactionRecipientList'
 import WalletSelection from '@/components/Wallet/WalletSelection'
 import WalletService from '@/services/wallet'
 import mixin from './mixin'
@@ -200,6 +232,7 @@ export default {
   transactionType: TRANSACTION_TYPES.GROUP_1.TRANSFER,
 
   components: {
+    ButtonGeneric,
     InputAddress,
     InputCurrency,
     InputPassword,
@@ -212,6 +245,7 @@ export default {
     ModalLoader,
     PassphraseInput,
     SvgIcon,
+    TransactionRecipientList,
     WalletSelection
   },
 
@@ -226,18 +260,19 @@ export default {
   },
 
   data: () => ({
+    recipientId: '',
+    amount: '',
+    isSendAllActive: false,
+    previousAmount: '',
+    showConfirmSendAll: false,
+    wallet: null,
     form: {
-      amount: '',
+      recipients: [],
       fee: 0,
       passphrase: '',
       walletPassword: '',
-      recipientId: '',
       vendorField: ''
-    },
-    isSendAllActive: false,
-    previousAmount: '',
-    wallet: null,
-    showConfirmSendAll: false
+    }
   }),
 
   computed: {
@@ -245,6 +280,46 @@ export default {
       return this.$store.getters['session/currency']
     },
 
+    isValidRecipient () {
+      if (!this.$v.recipientId.$dirty || this.$v.recipientId.$invalid) {
+        return false
+      }
+
+      if (!this.$v.amount.$dirty || this.$v.amount.$invalid) {
+        return false
+      }
+
+      return true
+    },
+
+    isFormValid () {
+      if (this.isMultiPayment) {
+        return !this.$v.form.$invalid && !this.insufficientFundsError
+      }
+
+      return !this.$v.form.$invalid
+    },
+
+    isMultiPayment () {
+      return this.form.recipients.length > 1
+    },
+
+    isLedger () {
+      return this.currentWallet && !!this.currentWallet.isLedger
+    },
+
+    hasAip11 () {
+      return this.walletNetwork.constants && !!this.walletNetwork.constants.aip11 && !this.isLedger
+    },
+
+    hasMoreThanMaximumRecipients () {
+      return this.form.recipients.length > this.maximumRecipients
+    },
+
+    transactionTypeFee () {
+      return this.isMultiPayment ? TRANSACTION_TYPES.GROUP_1.MULTI_PAYMENT : TRANSACTION_TYPES.GROUP_1.TRANSFER
+    },
+
     // Customize the message to display the minimum amount as subunit
     amountTooLowError () {
       const { fractionDigits } = this.walletNetwork
@@ -274,7 +349,49 @@ export default {
         return this.currency_subToUnit(0)
       }
 
-      return this.currency_subToUnit(this.currentWallet.balance).minus(this.form.fee)
+      if (!this.hasAip11) {
+        return this.currency_subToUnit(this.currentWallet.balance).minus(this.form.fee)
+      }
+
+      let availableAmount = this.currency_subToUnit(this.currentWallet.balance).minus(this.form.fee)
+
+      for (const recipient of this.form.recipients) {
+        if (!recipient.sendAll) {
+          availableAmount = availableAmount.minus(this.currency_subToUnit(recipient.amount))
+        }
+      }
+
+      return availableAmount
+    },
+
+    totalAmount () {
+      const amount = this.currency_toBuilder(0)
+
+      for (const recipient of this.$v.form.recipients.$model) {
+        amount.add(recipient.amount)
+      }
+
+      return amount.value
+    },
+
+    insufficientFundsError () {
+      if (!this.currentWallet) {
+        return null
+      }
+
+      const funds = this.currency_unitToSub(this.currency_subToUnit(this.currentWallet.balance))
+      const totalAmount = this.currency_unitToSub(this.currency_subToUnit(this.totalAmount).plus(this.form.fee))
+
+      if (funds.isLessThan(totalAmount)) {
+        const balance = this.formatter_networkCurrency(this.currentWallet.balance)
+        return this.$t('TRANSACTION.ERROR.NOT_ENOUGH_BALANCE', { balance })
+      }
+
+      return null
+    },
+
+    isRecipientSendAll () {
+      return this.form.recipients.some(recipient => !!recipient.sendAll)
     },
 
     canSendAll () {
@@ -340,13 +457,34 @@ export default {
       }
 
       return VENDOR_FIELD.defaultMaxLength
+    },
+
+    recipientWarning () {
+      if (!this.$v.recipientId.$dirty) {
+        return null
+      }
+
+      if (this.form.recipients.some(recipient => recipient.address === this.$v.recipientId.$model)) {
+        return this.$t('TRANSACTION.MULTI_PAYMENT.WARNING_DUPLICATE')
+      }
+
+      return null
+    },
+
+    maximumRecipients () {
+      if (!this.session_network.constants || !this.session_network.constants.multiPaymentLimit) {
+        return 500
+      }
+
+      return this.session_network.constants.multiPaymentLimit
     }
   },
 
   watch: {
     wallet () {
       this.ensureAvailableAmount()
-      this.$v.form.recipientId.$touch()
+      this.$v.recipientId.$touch()
+      this.$v.amount.$touch()
     }
   },
 
@@ -363,17 +501,28 @@ export default {
     getTransactionData () {
       const transactionData = {
         address: this.currentWallet.address,
-        amount: this.currency_unitToSub(this.form.amount),
-        recipientId: this.form.recipientId,
         vendorField: this.form.vendorField,
         passphrase: this.form.passphrase,
         fee: this.getFee(),
         wif: this.form.wif,
         networkWif: this.walletNetwork.wif,
-        networkId: this.walletNetwork.id,
         multiSignature: this.currentWallet.multiSignature
       }
 
+      if (this.isMultiPayment) {
+        transactionData.recipients = this.form.recipients
+      } else {
+        if (this.hasAip11) {
+          transactionData.recipientId = this.form.recipients[0].address
+          transactionData.amount = this.getAmountNormalTransaction()
+        } else {
+          transactionData.recipientId = this.recipientId
+          transactionData.amount = this.currency_unitToSub(this.amount)
+        }
+
+        transactionData.networkId = this.walletNetwork.id
+      }
+
       if (this.currentWallet.secondPublicKey) {
         transactionData.secondPassphrase = this.form.secondPassphrase
       }
@@ -381,8 +530,28 @@ export default {
       return transactionData
     },
 
+    getAmountNormalTransaction () {
+      if (this.insufficientFundsError) {
+        return this.currency_unitToSub(this.currency_subToUnit(this.form.recipients[0].amount).minus(this.form.fee))
+      }
+
+      return this.form.recipients[0].amount
+    },
+
     async buildTransaction (transactionData, isAdvancedFee = false, returnObject = false) {
-      return this.$client.buildTransfer(transactionData, isAdvancedFee, returnObject)
+      if (this.isMultiPayment) {
+        return this.$client.buildMultiPayment(transactionData, isAdvancedFee, returnObject)
+      } else {
+        return this.$client.buildTransfer(transactionData, isAdvancedFee, returnObject)
+      }
+    },
+
+    transactionError () {
+      if (this.isMultiPayment) {
+        this.$error(this.$t('TRANSACTION.ERROR.VALIDATION.MULTI_PAYMENT'))
+      } else {
+        this.$error(this.$t('TRANSACTION.ERROR.VALIDATION.TRANSFER'))
+      }
     },
 
     populateSchema () {
@@ -390,9 +559,10 @@ export default {
         return
       }
 
-      this.$set(this.form, 'amount', this.schema.amount || '')
-      this.$set(this.form, 'recipientId', this.schema.address || '')
+      this.$set(this, 'amount', this.schema.amount || '')
+      this.$set(this, 'recipientId', this.schema.address || '')
       this.$set(this.form, 'vendorField', this.schema.vendorField || '')
+
       if (this.schema.wallet) {
         const currentProfileId = this.$store.getters['session/profileId']
         const ledgerWallets = this.$store.getters['ledger/isConnected'] ? this.$store.getters['ledger/wallets'] : []
@@ -442,30 +612,48 @@ export default {
       }
     },
 
-    transactionError () {
-      this.$error(this.$t('TRANSACTION.ERROR.VALIDATION.TRANSFER'))
-    },
+    addRecipient () {
+      if (this.$v.recipientId.$invalid || this.$v.amount.$invalid) {
+        return
+      }
 
-    emitNext (transaction) {
-      this.$emit('next', {
-        transaction,
-        wallet: this.senderWallet
+      this.$v.form.recipients.$model.push({
+        address: this.recipientId,
+        amount: this.isSendAllActive ? 0 : this.currency_unitToSub(this.amount),
+        sendAll: this.isSendAllActive
       })
+
+      if (this.isSendAllActive) {
+        this.previousAmount = ''
+        this.isSendAllActive = false
+      }
+
+      this.$refs.recipient.reset()
+      this.$v.recipientId.$reset()
+      this.$refs.amount.reset()
+      this.$v.amount.$model = ''
     },
 
-    onFee (fee) {
-      this.$set(this.form, 'fee', fee)
-      this.ensureAvailableAmount()
+    emitRemoveRecipient (index) {
+      if (!Object.prototype.hasOwnProperty.call(this.$v.form.recipients.$model, index)) {
+        return
+      }
+
+      this.$v.form.recipients.$model = [
+        ...this.form.recipients.slice(0, index),
+        ...this.form.recipients.slice(index + 1)
+      ]
     },
 
     setSendAll (isActive, setPreviousAmount = true) {
       if (isActive) {
         this.confirmSendAll()
-        this.previousAmount = this.form.amount
+        this.previousAmount = this.amount
       } else {
         if (setPreviousAmount && !!this.previousAmount) {
-          this.$set(this.form, 'amount', this.previousAmount)
+          this.$v.amount.$model = this.previousAmount
         }
+
         this.previousAmount = ''
         this.isSendAllActive = isActive
         this.ensureAvailableAmount()
@@ -474,7 +662,7 @@ export default {
 
     ensureAvailableAmount () {
       if (this.isSendAllActive && this.canSendAll) {
-        this.$set(this.form, 'amount', this.maximumAvailableAmount)
+        this.$v.amount.$model = this.maximumAvailableAmount
       }
     },
 
@@ -493,6 +681,31 @@ export default {
       this.isSendAllActive = false
     },
 
+    async nextStep () {
+      if (this.hasAip11) {
+        for await (const recipient of this.$v.form.recipients.$model) {
+          if (recipient.sendAll) {
+            recipient.amount = this.currency_unitToSub(this.maximumAvailableAmount)
+            break
+          }
+        }
+      }
+
+      this.onSubmit()
+    },
+
+    onFee (fee) {
+      this.$v.form.fee.$model = fee
+      this.ensureAvailableAmount()
+    },
+
+    emitNext (transaction) {
+      this.$emit('next', {
+        transaction,
+        wallet: this.senderWallet
+      })
+    },
+
     async loadTransaction () {
       try {
         const raw = await this.electron_readFile()
@@ -501,22 +714,43 @@ export default {
           try {
             const transaction = JSON.parse(raw)
 
-            if (parseInt(transaction.type, 10) !== TRANSACTION_TYPES.GROUP_1.TRANSFER) {
+            if (parseInt(transaction.type, 10) !== TRANSACTION_TYPES.GROUP_1.TRANSFER && parseInt(transaction.type, 10) !== TRANSACTION_TYPES.GROUP_1.MULTI_PAYMENT) {
               throw new Error(this.$t('VALIDATION.INVALID_TYPE'))
             }
 
-            if (transaction.recipientId) {
+            if (this.hasAip11 && Object.prototype.hasOwnProperty.call(transaction, 'asset') && Object.prototype.hasOwnProperty.call(transaction.asset, 'payments')) {
+              this.$refs.recipient.reset()
+              this.$refs.amount.reset()
+              this.$v.form.recipients.$model = []
+
+              transaction.asset.payments.forEach(payment => {
+                if (payment.recipientId && payment.amount) {
+                  if (WalletService.validateAddress(payment.recipientId, this.session_network.version)) {
+                    const amount = this.currency_unitToSub(this.currency_subToUnit(payment.amount, this.session_network), this.session_network)
+
+                    this.$v.form.recipients.$model.push({
+                      address: payment.recipientId,
+                      amount
+                    })
+                  } else {
+                    throw new Error(this.$t('VALIDATION.RECIPIENT_DIFFERENT_NETWORK', [
+                      this.wallet_truncate(payment.recipientId)
+                    ]))
+                  }
+                }
+              })
+            } else if (transaction.recipientId && transaction.amount) {
               if (WalletService.validateAddress(transaction.recipientId, this.session_network.version)) {
+                this.$v.form.recipients.$model = []
                 this.$refs.recipient.model = transaction.recipientId
+                this.$refs.amount.model = this.currency_subToUnit(transaction.amount, this.session_network)
               } else {
                 throw new Error(this.$t('VALIDATION.RECIPIENT_DIFFERENT_NETWORK', [
                   this.wallet_truncate(transaction.recipientId)
                 ]))
               }
-            }
-
-            if (transaction.amount) {
-              this.$refs.amount.model = this.currency_subToUnit(transaction.amount, this.session_network)
+            } else {
+              throw new Error(this.$t('VALIDATION.INVALID_FORMAT'))
             }
 
             if (transaction.fee) {
@@ -543,41 +777,64 @@ export default {
   },
 
   validations: {
+    recipientId: {
+      required,
+      isValid () {
+        if (this.$refs.recipient) {
+          return !this.$refs.recipient.$v.$invalid
+        }
+
+        return false
+      }
+    },
+    amount: {
+      required,
+      isValid () {
+        if (this.$refs.amount) {
+          return !this.$refs.amount.$v.$invalid
+        }
+
+        return false
+      }
+    },
     wallet: {},
     form: {
+      recipients: {
+        aboveMinimum () {
+          if (!this.hasAip11) {
+            return true
+          }
+
+          return this.form.recipients.length >= 1
+        },
+        belowOrEqualMaximum () {
+          return this.form.recipients.length <= this.maximumRecipients
+        }
+      },
       fee: mixin.validators.fee,
       passphrase: mixin.validators.passphrase,
       secondPassphrase: mixin.validators.secondPassphrase,
       vendorField: {},
-      walletPassword: mixin.validators.walletPassword,
-
-      recipientId: {
-        required,
-        isValid () {
-          if (this.$refs.recipient) {
-            return !this.$refs.recipient.$v.$invalid
-          }
-          return false
-        }
-      },
-
-      amount: {
-        required,
-        isValid () {
-          if (this.$refs.amount) {
-            return !this.$refs.amount.$v.$invalid
-          }
-          return false
-        }
-      }
+      walletPassword: mixin.validators.walletPassword
     }
   }
 }
 </script>
 
 <style>
+.TransactionFormTransfer__recipients .InputEditableList__list {
+  max-height: 13rem;
+}
+
+.TransactionFormTransfer__fee.TransactionFormTransfer__fee--helper {
+  margin-bottom: 0;
+}
+.TransactionFormTransfer__fee--helper .InputField__helper {
+  display: none;
+}
+
 .SendAllConfirmation .ModalConfirmation__container {
   min-width: calc(var(--contact-identicon-xl) + 74px * 2);
-  max-width: calc(var(--contact-identicon-xl) + 74px * 2 + 50px)
+  max-width: calc(var(--contact-identicon-xl) + 74px * 2 + 50px);
 }
 </style>
diff --git a/src/renderer/components/Transaction/TransactionForm/index.js b/src/renderer/components/Transaction/TransactionForm/index.js
index 09b21fd430..3284cfa179 100644
--- a/src/renderer/components/Transaction/TransactionForm/index.js
+++ b/src/renderer/components/Transaction/TransactionForm/index.js
@@ -2,7 +2,6 @@ import TransactionForm from './TransactionForm'
 import TransactionFormDelegateRegistration from './TransactionFormDelegateRegistration'
 import TransactionFormDelegateResignation from './TransactionFormDelegateResignation'
 import TransactionFormIpfs from './TransactionFormIpfs'
-import TransactionFormMultiPayment from './TransactionFormMultiPayment'
 import TransactionFormMultiSign from './TransactionFormMultiSign'
 import TransactionFormMultiSignature from './TransactionFormMultiSignature'
 import TransactionFormSecondSignature from './TransactionFormSecondSignature'
@@ -15,7 +14,6 @@ export {
   TransactionFormDelegateRegistration,
   TransactionFormDelegateResignation,
   TransactionFormIpfs,
-  TransactionFormMultiPayment,
   TransactionFormMultiSign,
   TransactionFormMultiSignature,
   TransactionFormSecondSignature,
diff --git a/src/renderer/components/Transaction/TransactionModal.vue b/src/renderer/components/Transaction/TransactionModal.vue
index 1d4b24a4b1..4a5c95e123 100644
--- a/src/renderer/components/Transaction/TransactionModal.vue
+++ b/src/renderer/components/Transaction/TransactionModal.vue
@@ -387,6 +387,7 @@ export default {
 .TransactionModalTransfer {
   /* To allow more space on the fee slider */
   min-width: 38rem;
+  max-height: 100%;
 }
 
 .TransactionModalBridgechainRegistration,
@@ -394,7 +395,6 @@ export default {
 .TransactionModalBusinessRegistration,
 .TransactionModalBusinessUpdate,
 .TransactionModalIpfs,
-.TransactionModalMultiPayment,
 .TransactionModalMultiSignature {
   min-width: 35rem;
   max-height: 80vh;
diff --git a/src/renderer/components/Transaction/TransactionMultiPaymentList.vue b/src/renderer/components/Transaction/TransactionRecipientList.vue
similarity index 85%
rename from src/renderer/components/Transaction/TransactionMultiPaymentList.vue
rename to src/renderer/components/Transaction/TransactionRecipientList.vue
index 9935a7fb70..8c0713f79d 100644
--- a/src/renderer/components/Transaction/TransactionMultiPaymentList.vue
+++ b/src/renderer/components/Transaction/TransactionRecipientList.vue
@@ -8,8 +8,8 @@
     :required="required"
     :helper-text="helperText"
     :is-invalid="isInvalid"
-    :no-items-message="$t('TRANSACTION.MULTI_PAYMENT.NO_RECIPIENTS')"
-    class="TransactionMultiPaymentList"
+    :no-items-message="$t('TRANSACTION.NO_RECIPIENTS')"
+    class="TransactionRecipientList"
     @remove="emitRemove"
   >
     <div
@@ -23,7 +23,7 @@
       />
 
       <div class="flex-1 px-4">
-        <div class="TransactionMultiPaymentList__recipient flex py-1">
+        <div class="TransactionRecipientList__recipient flex py-1">
           <span class="font-bold mr-1">
             {{ $t('TRANSACTION.RECIPIENT') }}:
           </span>
@@ -41,12 +41,19 @@
           </span>
         </div>
 
-        <div class="TransactionMultiPaymentList__amount flex py-1">
+        <div class="TransactionRecipientList__amount flex py-1">
           <span class="font-bold mr-1">
             {{ $t('TRANSACTION.AMOUNT') }}:
           </span>
 
-          <span>
+          <span
+            v-if="item.sendAll"
+            class="font-bold uppercase"
+          >
+            {{ $t('COMMON.ALL') }}
+          </span>
+
+          <span v-else>
             {{ formatter_networkCurrency(item.amount) }}
           </span>
         </div>
@@ -62,7 +69,7 @@ import WalletAddress from '@/components/Wallet/WalletAddress'
 import WalletIdenticon from '@/components/Wallet/WalletIdenticon'
 
 export default {
-  name: 'TransactionMultiPaymentList',
+  name: 'TransactionRecipientList',
 
   components: {
     InputEditableList,
@@ -75,7 +82,7 @@ export default {
       type: String,
       required: false,
       default: function () {
-        return this.$t('TRANSACTION.MULTI_PAYMENT.RECIPIENTS')
+        return this.$t('TRANSACTION.RECIPIENTS')
       }
     },
 
diff --git a/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue b/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue
index 9a35cbcfec..1a294ac88a 100644
--- a/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue
+++ b/src/renderer/components/Transaction/TransactionShow/TransactionShow.vue
@@ -232,7 +232,7 @@
         :label="$t('TRANSACTION.RECIPIENTS')"
         item-value-class="items-center"
       >
-        <TransactionMultiPaymentList
+        <TransactionRecipientList
           :title="null"
           :items="transaction.asset.payments"
           :show-links="true"
@@ -263,7 +263,7 @@ import { ListDivided, ListDividedItem } from '@/components/ListDivided'
 import { ModalWindow } from '@/components/Modal'
 import { ButtonClipboard, ButtonGeneric } from '@/components/Button'
 import SvgIcon from '@/components/SvgIcon'
-import { TransactionAmount, TransactionMultiPaymentList, TransactionStatusIcon } from '@/components/Transaction'
+import { TransactionAmount, TransactionRecipientList, TransactionStatusIcon } from '@/components/Transaction'
 import WalletAddress from '@/components/Wallet/WalletAddress'
 import WalletService from '@/services/wallet'
 import truncateMiddle from '@/filters/truncate-middle'
@@ -279,7 +279,7 @@ export default {
     ButtonClipboard,
     SvgIcon,
     TransactionAmount,
-    TransactionMultiPaymentList,
+    TransactionRecipientList,
     TransactionStatusIcon,
     WalletAddress
   },
diff --git a/src/renderer/components/Transaction/index.js b/src/renderer/components/Transaction/index.js
index feca642b34..f744906440 100644
--- a/src/renderer/components/Transaction/index.js
+++ b/src/renderer/components/Transaction/index.js
@@ -1,8 +1,8 @@
 import TransactionAmount from './TransactionAmount'
 import TransactionDetail from './TransactionDetail'
 import TransactionModal from './TransactionModal'
-import TransactionMultiPaymentList from './TransactionMultiPaymentList'
 import TransactionPeerList from './TransactionPeerList'
+import TransactionRecipientList from './TransactionRecipientList'
 import TransactionStatusIcon from './TransactionStatusIcon'
 
 export * from './TransactionForm'
@@ -11,8 +11,8 @@ export {
   TransactionAmount,
   TransactionDetail,
   TransactionModal,
-  TransactionMultiPaymentList,
   TransactionPeerList,
+  TransactionRecipientList,
   TransactionStatusIcon
 }
 
diff --git a/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue b/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
index 629d7c117c..fb6af83d21 100644
--- a/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
+++ b/src/renderer/components/Wallet/WalletHeading/WalletHeadingPrimaryActions.vue
@@ -62,55 +62,27 @@
       </template>
     </ButtonModal>
 
-    <ButtonDropdown
+    <ButtonModal
       v-show="!currentWallet.isContact"
-      :items="sendOptions"
-      classes="option-heading-button px-3 py-2"
-      class="mr-2"
+      :class="buttonStyle"
+      :label="$t('TRANSACTION.SEND')"
+      icon="send"
+      view-box="0 0 12 12"
     >
-      <ButtonModal
-        slot="primaryButton"
-        class="option-heading-button px-3 py-2 h-full"
-        :class="{
-          'rounded-tr-none': hasSendOptions,
-          'rounded-br-none': hasSendOptions
-        }"
-        :label="$t('TRANSACTION.SEND')"
-        icon="send"
-        view-box="0 0 12 12"
-      >
-        <template slot-scope="{ toggle, isOpen }">
-          <TransactionModal
-            v-if="isOpen"
-            :type="0"
-            @cancel="closeTransactionModal(toggle, isOpen)"
-            @sent="closeTransactionModal(toggle, isOpen)"
-          />
-        </template>
-      </ButtonModal>
-
-      <ButtonModal
-        slot="button"
-        slot-scope="{ item, triggerClose }"
-        :label="item.label"
-        class="option-heading-button whitespace-no-wrap w-full"
-        @toggle="triggerClose"
-      >
-        <template slot-scope="{ toggle, isOpen }">
-          <TransactionModal
-            v-if="isOpen"
-            :type="item.type"
-            @cancel="closeTransactionModal(toggle, isOpen)"
-            @sent="closeTransactionModal(toggle, isOpen)"
-          />
-        </template>
-      </ButtonModal>
-    </ButtonDropdown>
+      <template slot-scope="{ toggle, isOpen }">
+        <TransactionModal
+          v-if="isOpen"
+          :type="0"
+          @cancel="closeTransactionModal(toggle, isOpen)"
+          @sent="closeTransactionModal(toggle, isOpen)"
+        />
+      </template>
+    </ButtonModal>
   </div>
 </template>
 
 <script>
-import { ButtonDropdown, ButtonModal, ButtonReload } from '@/components/Button'
+import { ButtonModal, ButtonReload } from '@/components/Button'
 import { ModalQrCode } from '@/components/Modal'
 import { TransactionModal } from '@/components/Transaction'
 import { ContactRenameModal } from '@/components/Contact'
@@ -122,7 +94,6 @@ export default {
   inject: ['switchToTab', 'walletVote'],
 
   components: {
-    ButtonDropdown,
     ButtonModal,
     ButtonReload,
     ModalQrCode,
@@ -131,11 +102,9 @@ export default {
     SvgIcon
   },
 
-  data () {
-    return {
-      isRefreshing: false
-    }
-  },
+  data: () => ({
+    isRefreshing: false
+  }),
 
   computed: {
     buttonStyle () {
@@ -146,39 +115,10 @@ export default {
       return this.wallet_fromRoute
     },
 
-    currentNetwork () {
-      return this.session_network
-    },
-
     doesNotExist () {
       return !this.$store.getters['wallet/byAddress'](this.currentWallet.address)
     },
 
-    hasAip11 () {
-      return this.currentNetwork.constants ? !!this.currentNetwork.constants.aip11 : false
-    },
-
-    sendOptions () {
-      const options = []
-
-      if (!this.hasAip11) {
-        return options
-      }
-
-      if (!this.currentWallet.isLedger) {
-        options.push({
-          label: this.$t('TRANSACTION.TYPE.MULTI_PAYMENT'),
-          type: 6
-        })
-      }
-
-      return options
-    },
-
-    hasSendOptions () {
-      return !!this.sendOptions.length
-    },
-
     isVoting () {
       return !!this.walletVote.username
     }
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index c9c4037a50..68216857f2 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -1029,6 +1029,7 @@ export default {
       LOAD_FROM_FILE: 'Failed to load transaction file',
       EXPIRED: 'Transaction expired before it was processed: {transactionId}',
       FEE_TOO_LOW: 'Transaction could not be sent because the fee ({fee}) is too low',
+      NOT_ENOUGH_BALANCE: 'The total amount of the recipients + fee is greater than the balance ({balance}) of the wallet',
       NOTHING_SENT: 'The transaction could not be sent. Please check your network connection or change peer',
       WRONG_NONCE: 'The transaction could not be sent. Wrong nonce provided',
       NETWORK_NOT_CONFIGURED: 'Network not configured',
@@ -1072,9 +1073,6 @@ export default {
       UNVOTE_DELEGATE: 'Unvote delegate {delegate}'
     },
     MULTI_PAYMENT: {
-      BUTTON_ADD: 'Add',
-      NO_RECIPIENTS: 'There are no recipients',
-      RECIPIENTS: 'Recipients',
       TOTAL_AMOUNT: 'Total amount',
       WARNING_DUPLICATE: 'The address is already a recipient'
     },
@@ -1116,10 +1114,11 @@ export default {
     },
     AMOUNT: 'Amount',
     BLOCK_ID: 'Block ID',
-    BUSINESS_NAME: 'Business Name',
     BRIDGECHAIN_NAME: 'Bridgechain Name',
+    BUSINESS_NAME: 'Business Name',
+    BUTTON_ADD: 'Add',
     CONFIRMATION_COUNT: '{confirmations} Confirmations',
-    CONFIRM_SEND_ALL: 'This will enable sending all of your tokens from the current wallet in this transaction.',
+    CONFIRM_SEND_ALL: 'This will enable sending all of your tokens from the current wallet in this transaction. The selected transfer fee will be deducted from the send amount.',
     CONFIRM_SEND_ALL_TITLE: 'Send all your tokens?',
     CONFIRM_SEND_ALL_NOTE: 'Note: once sent, this cannot be undone.',
     CONFIRMATIONS: 'Confirmations',
@@ -1136,6 +1135,7 @@ export default {
     LOAD_FROM_FILE: 'Load transaction from file',
     MULTIPLE: 'Multiple',
     NONCE: 'Nonce',
+    NO_RECIPIENTS: 'There are no recipient(s)',
     OPEN_IN_EXPLORER: 'Open in Explorer',
     PASSPHRASE: 'Passphrase',
     PASSWORD: 'Encryption Password',

From 53e2993893e19912a67d2fa53b7b41a80c7fa953 Mon Sep 17 00:00:00 2001
From: Simon <sleepdefic1t@users.noreply.github.com>
Date: Fri, 8 May 2020 23:58:01 -0700
Subject: [PATCH 28/48] chore(ledger): fix payload encoding (#1899)

---
 .../unit/services/ledger-service.spec.js      |  4 +--
 __tests__/unit/services/transaction.spec.js   |  4 ++-
 __tests__/unit/store/modules/ledger.spec.js   | 12 +++----
 src/renderer/services/ledger-service.js       | 31 +++++++++----------
 src/renderer/services/transaction.js          | 11 +++----
 src/renderer/store/modules/ledger.js          | 20 ++++++------
 6 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/__tests__/unit/services/ledger-service.spec.js b/__tests__/unit/services/ledger-service.spec.js
index 7f64774f09..a2c8dd09b7 100644
--- a/__tests__/unit/services/ledger-service.spec.js
+++ b/__tests__/unit/services/ledger-service.spec.js
@@ -56,7 +56,7 @@ describe('LedgerService', () => {
 
   describe('signTransaction', () => {
     it('should run', async () => {
-      const response = await ledgerService.signTransaction('44\'/1\'/0\'/0/0', '1234')
+      const response = await ledgerService.signTransaction('44\'/1\'/0\'/0/0', Buffer.from([1, 2, 3, 4]))
 
       expect(response).toBeTruthy()
       expect(ledgerService.ledger.signTransaction).toHaveBeenCalledTimes(1)
@@ -67,7 +67,7 @@ describe('LedgerService', () => {
     it('should run', async () => {
       ledgerService.ledger.signMessage.mockClear()
 
-      const response = await ledgerService.signMessage('44\'/1\'/0\'/0/0', Buffer.from('1234'))
+      const response = await ledgerService.signMessage('44\'/1\'/0\'/0/0', Buffer.from('1234', 'utf-8'))
 
       expect(response).toBeTruthy()
       expect(ledgerService.ledger.signMessage).toHaveBeenCalledTimes(1)
diff --git a/__tests__/unit/services/transaction.spec.js b/__tests__/unit/services/transaction.spec.js
index 6fcb70f241..7e19a545f7 100644
--- a/__tests__/unit/services/transaction.spec.js
+++ b/__tests__/unit/services/transaction.spec.js
@@ -28,7 +28,9 @@ describe('Services > Transaction', () => {
 
   describe('getBytes', () => {
     it('should return the transaction bytes', () => {
-      expect(TransactionService.getBytes(transactionFixture)).toEqual('00f0eb920302275d8577a0ec2b75fc8683282d53c5db76ebc54514a80c2854e419b793ea259a17ee9f689978490631699e01ca0fc2edbecb5ee0390000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000008096980000000000')
+      const transactionBytes = TransactionService.getBytes(transactionFixture)
+      expect(transactionBytes).toBeInstanceOf(Buffer)
+      expect(transactionBytes).toEqual(Buffer.from('00f0eb920302275d8577a0ec2b75fc8683282d53c5db76ebc54514a80c2854e419b793ea259a17ee9f689978490631699e01ca0fc2edbecb5ee0390000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000008096980000000000', 'hex'))
     })
   })
 
diff --git a/__tests__/unit/store/modules/ledger.spec.js b/__tests__/unit/store/modules/ledger.spec.js
index 2ef15619ad..8366ba659c 100644
--- a/__tests__/unit/store/modules/ledger.spec.js
+++ b/__tests__/unit/store/modules/ledger.spec.js
@@ -227,11 +227,11 @@ describe('ledger store module', () => {
 
       const response = await store.dispatch('ledger/signTransaction', {
         accountIndex: 1,
-        transactionHex: 'abc'
+        transactionBytes: Buffer.from([1, 2, 3, 4])
       })
 
       expect(response).toBe('SIGNATURE')
-      expect(spy).toHaveBeenNthCalledWith(1, '44\'/1234\'/1\'/0/0', 'abc')
+      expect(spy).toHaveBeenNthCalledWith(1, '44\'/1234\'/1\'/0/0', Buffer.from([1, 2, 3, 4]))
 
       spy.mockRestore()
     })
@@ -244,7 +244,7 @@ describe('ledger store module', () => {
       await disconnectLedger()
       await expect(store.dispatch('ledger/signTransaction', {
         accountIndex: 1,
-        transactionHex: 'abc'
+        transactionBytes: Buffer.from('abc', 'utf-8')
       })).rejects.toThrow(/.*Ledger not connected$/)
     })
   })
@@ -258,11 +258,11 @@ describe('ledger store module', () => {
 
       const response = await store.dispatch('ledger/signMessage', {
         accountIndex: 1,
-        messageHex: 'abc'
+        messageBytes: Buffer.from('abc', 'utf-8')
       })
 
       expect(response).toBe('SIGNATURE')
-      expect(spy).toHaveBeenNthCalledWith(1, '44\'/1234\'/1\'/0/0', 'abc')
+      expect(spy).toHaveBeenNthCalledWith(1, '44\'/1234\'/1\'/0/0', Buffer.from('abc', 'utf-8'))
 
       spy.mockRestore()
     })
@@ -275,7 +275,7 @@ describe('ledger store module', () => {
       await disconnectLedger()
       await expect(store.dispatch('ledger/signMessage', {
         accountIndex: 1,
-        messageHex: 'abc'
+        messageBytes: Buffer.from('abc', 'utf-8')
       })).rejects.toThrow(/.*Ledger not connected$/)
     })
   })
diff --git a/src/renderer/services/ledger-service.js b/src/renderer/services/ledger-service.js
index c792a95686..4b47ff2a64 100644
--- a/src/renderer/services/ledger-service.js
+++ b/src/renderer/services/ledger-service.js
@@ -97,8 +97,8 @@ class LedgerService {
 
   /**
    * Get public key from ledger wallet.
-   * @param  {Number} path Path for wallet location.
-   * @return {(String|Boolean)}
+   * @param  {string} path Path for wallet location.
+   * @return {Promise<string>}
    */
   async getPublicKey (path) {
     return this.__performAction(async () => {
@@ -108,32 +108,31 @@ class LedgerService {
 
   /**
    * Sign transaction for ledger wallet.
-   * @param  {Number} path Path for wallet location.
-   * @param  {String} transactionHex Hex of transaction.
-   * @return {(String|Boolean)}
+   * @param  {string} path Path for wallet location.
+   * @param  {Buffer} transactionBytes bytes of transaction.
+   * @return {Promise<string>}
    */
-  async signTransaction (path, transactionHex) {
+  async signTransaction (path, transactionBytes) {
     return this.__performAction(async () => {
-      return this.ledger.signTransaction(path, transactionHex)
+      return this.ledger.signTransaction(path, transactionBytes)
     })
   }
 
   /**
-   * Sign message for ledger wallet.
-   * @param  {Number} path Path for wallet location.
-   * @param  {String} messageHex Hex to sign.
-   * @return {(String|Boolean)}
+   * Sign message for wallet.
+   * @param  {string} path Path for wallet location.
+   * @param  {Buffer} messageBytes bytes to sign.
+   * @return {Promise<string>}
    */
-  async signMessage (path, messageHex) {
+  async signMessage (path, messageBytes) {
     return this.__performAction(async () => {
-      return this.ledger.signMessage(path, Buffer.from(messageHex, 'hex'))
+      return this.ledger.signMessage(path, messageBytes)
     })
   }
 
   /**
-   * Get version of ledger wallet.
-   * @param  {Number} path Path for wallet location.
-   * @return {(String|Boolean)}
+   * Get version from ledger app.
+   * @return {Promise<string>}
    */
   async getVersion () {
     return this.__performAction(async () => {
diff --git a/src/renderer/services/transaction.js b/src/renderer/services/transaction.js
index 7db0f485d5..d0ec5a5dcd 100644
--- a/src/renderer/services/transaction.js
+++ b/src/renderer/services/transaction.js
@@ -15,13 +15,13 @@ export default class TransactionService {
   /*
    * Get bytes for transaction.
    * @param {Object} transaction
-   * @return {String}
+   * @return {Buffer}
    */
   static getBytes (transaction) {
     return Transactions.Serializer.getBytes(transaction, {
       excludeSignature: true,
       excludeSecondSignature: true
-    }).toString('hex')
+    })
   }
 
   /**
@@ -96,9 +96,8 @@ export default class TransactionService {
       transaction.recipientId = wallet.address
     }
 
-    const transactionBytes = this.getBytes(transaction)
     transaction.signature = await vm.$store.dispatch('ledger/signTransaction', {
-      transactionHex: transactionBytes.toString('hex'),
+      transactionBytes: this.getBytes(transaction),
       accountIndex: wallet.ledgerIndex
     })
 
@@ -149,12 +148,12 @@ export default class TransactionService {
   /*
    * Sign message with Ledger.
    * @param {Object} wallet
-   * @param {String} message
+   * @param {string} message
    * @return {Object}
    */
   static async ledgerSignMessage (wallet, message, vm) {
     const signature = await vm.$store.dispatch('ledger/signMessage', {
-      messageHex: Buffer.from(message).toString('hex'),
+      messageBytes: Buffer.from(message, 'utf-8'),
       accountIndex: wallet.ledgerIndex
     })
 
diff --git a/src/renderer/store/modules/ledger.js b/src/renderer/store/modules/ledger.js
index 2c49fbc127..10821658e9 100644
--- a/src/renderer/store/modules/ledger.js
+++ b/src/renderer/store/modules/ledger.js
@@ -467,7 +467,7 @@ export default {
     /**
      * Get address and public key from ledger wallet.
      * @param  {Number} accountIndex Index of wallet to get data for.
-     * @return {(String|Boolean)}
+     * @return {Promise<string>}
      */
     async getVersion ({ dispatch }) {
       try {
@@ -517,7 +517,7 @@ export default {
     /**
      * Get public key from ledger wallet.
      * @param  {Number} [accountIndex] Index of wallet to get public key for.
-     * @return {(String|Boolean)}
+     * @return {Promise<string>}
      */
     async getPublicKey ({ dispatch }, accountIndex) {
       try {
@@ -534,16 +534,16 @@ export default {
     /**
      * Sign transaction for ledger wallet.
      * @param  {Object} obj
-     * @param  {String} obj.transactionHex Hex of transaction.
+     * @param  {Buffer} obj.transactionBytes Bytes of transaction.
      * @param  {Number} obj.accountIndex Index of wallet to sign transaction for.
-     * @return {(String|Boolean)}
+     * @return {Promise<string>}
      */
-    async signTransaction ({ dispatch }, { transactionHex, accountIndex } = {}) {
+    async signTransaction ({ dispatch }, { transactionBytes, accountIndex } = {}) {
       try {
         return await dispatch('action', {
           action: 'signTransaction',
           accountIndex,
-          data: transactionHex
+          data: transactionBytes
         })
       } catch (error) {
         logger.error(error)
@@ -554,16 +554,16 @@ export default {
     /**
      * Sign message for ledger wallet.
      * @param  {Object} obj
-     * @param  {String} obj.messageHex Hex to sign.
+     * @param  {Buffer} obj.messageBytes Bytes to sign.
      * @param  {Number} obj.accountIndex Index of wallet to sign transaction for.
-     * @return {(String|Boolean)}
+     * @return {Promise<string>}
      */
-    async signMessage ({ dispatch }, { messageHex, accountIndex } = {}) {
+    async signMessage ({ dispatch }, { messageBytes, accountIndex } = {}) {
       try {
         return await dispatch('action', {
           action: 'signMessage',
           accountIndex,
-          data: messageHex
+          data: messageBytes
         })
       } catch (error) {
         logger.error(error)

From fb05a51571be5137556e3da2ef71fe4fd916d377 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 May 2020 09:58:49 +0300
Subject: [PATCH 29/48] chore(deps): update dependency ts-loader to v7 (#1902)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index cb2a54dd80..a0f122e2ac 100644
--- a/package.json
+++ b/package.json
@@ -186,7 +186,7 @@
     "tailwindcss": "^0.7.4",
     "tempy": "^0.5.0",
     "ts-jest": "^25.0.0",
-    "ts-loader": "^6.0.4",
+    "ts-loader": "^7.0.0",
     "typescript": "^3.5.3",
     "url-loader": "^4.0.0",
     "vue-html-loader": "^1.2.4",
diff --git a/yarn.lock b/yarn.lock
index b54f95263d..982429b86a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13455,10 +13455,10 @@ ts-jest@^25.0.0:
     semver "^5.5"
     yargs-parser "^16.1.0"
 
-ts-loader@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-6.0.4.tgz#bc331ad91a887a60632d94c9f79448666f2c4b63"
-  integrity sha512-p2zJYe7OtwR+49kv4gs7v4dMrfYD1IPpOtqiSPCbe8oR+4zEBtdHwzM7A7M91F+suReqgzZrlClk4LRSSp882g==
+ts-loader@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-7.0.2.tgz#465bc904aea4c331e9550e7c7d75dd17a0b7c24c"
+  integrity sha512-DwpZFB67RoILQHx42dMjSgv2STpacsQu5X+GD/H9ocd8IhU0m8p3b/ZrIln2KmcucC6xep2PdEMEblpWT71euA==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"

From 150c07310a266b6f5a9279a69b2ed6c3a7a89601 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 May 2020 09:58:59 +0300
Subject: [PATCH 30/48] fix(deps): update dependency animate.css to v4 (#1916)

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a0f122e2ac..6a3a242c05 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "@fortawesome/vue-fontawesome": "^0.1.6",
     "@ledgerhq/hw-transport-node-hid-singleton": "^5.7.0",
     "about-window": "^1.13.1",
-    "animate.css": "^3.7.0",
+    "animate.css": "^4.0.0",
     "async": "^3.0.0",
     "bignumber.js": "^9.0.0",
     "bip38": "^3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 982429b86a..33503ae3ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1916,10 +1916,10 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-animate.css@^3.7.0:
-  version "3.7.2"
-  resolved "https://registry.yarnpkg.com/animate.css/-/animate.css-3.7.2.tgz#e73e0d50e92cb1cfef1597d9b38a9481020e08ea"
-  integrity sha512-0bE8zYo7C0KvgOYrSVfrzkbYk6IOTVPNqkiHg2cbyF4Pq/PXzilz4BRWA3hwEUBoMp5VBgrC29lQIZyhRWdBTw==
+animate.css@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/animate.css/-/animate.css-4.0.0.tgz#28b13e476cbb7cf936b2d71b07f46ca87e9a14b3"
+  integrity sha512-/BZp99OByWGftfTt2KoYcfER0k5jum82h16+ZIb3S6ghz1nMXIVCtwZYjgVAc+WNO5vHN/8+cypdhSP0maayiw==
 
 ansi-align@^3.0.0:
   version "3.0.0"

From df2e9d2c98cb66dc7b1c9c3fdfc6372895aa5576 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 May 2020 09:59:13 +0300
Subject: [PATCH 31/48] chore(deps): update dependency eslint to v7 (#1917)

---
 package.json |   2 +-
 yarn.lock    | 241 ++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 184 insertions(+), 59 deletions(-)

diff --git a/package.json b/package.json
index 6a3a242c05..d225dd3930 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,7 @@
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^3.0.0",
     "electron-notarize": "^0.3.0",
-    "eslint": "^6.1.0",
+    "eslint": "^7.0.0",
     "eslint-config-standard": "^14.0.0",
     "eslint-friendly-formatter": "^4.0.1",
     "eslint-loader": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 33503ae3ec..dabbc040a0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1822,11 +1822,16 @@ acorn-globals@^4.1.0:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
-acorn-jsx@^5.0.0, acorn-jsx@^5.0.2:
+acorn-jsx@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.2.tgz#84b68ea44b373c4f8686023a551f61a21b7c4a4f"
   integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==
 
+acorn-jsx@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
+  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
+
 acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
@@ -1842,10 +1847,10 @@ acorn@^6.0.1, acorn@^6.0.7, acorn@^6.2.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz#0087509119ffa4fc0a0041d1e93a417e68cb856e"
   integrity sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==
 
-acorn@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+acorn@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
 aes-js@3.0.0:
   version "3.0.0"
@@ -1938,11 +1943,18 @@ ansi-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
   integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
 
-ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ansi-escapes@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
   integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
 
+ansi-escapes@^4.2.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
+  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  dependencies:
+    type-fest "^0.11.0"
+
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -3596,6 +3608,13 @@ cli-cursor@^2.0.0, cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-truncate@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@@ -4122,7 +4141,7 @@ cross-spawn-async@^2.1.1:
     lru-cache "^4.0.0"
     which "^1.2.8"
 
-cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5:
+cross-spawn@6.0.5, cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -4151,6 +4170,15 @@ cross-spawn@^7.0.1:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+cross-spawn@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6"
+  integrity sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
 crypto-browserify@3.12.0, crypto-browserify@^3.11.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
@@ -4491,7 +4519,7 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@~0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -5410,7 +5438,7 @@ eslint-scope@^5.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.4.0, eslint-utils@^1.4.2:
+eslint-utils@^1.4.0:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz#166a5180ef6ab7eb462f162fd0e6f2463d7309ab"
   integrity sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==
@@ -5429,45 +5457,44 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@^6.1.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz#828e4c469697d43bb586144be152198b91e96ed6"
-  integrity sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==
+eslint@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.0.0.tgz#c35dfd04a4372110bd78c69a8d79864273919a08"
+  integrity sha512-qY1cwdOxMONHJfGqw52UOpZDeqXy8xmD0u8CT6jIstil72jkhURC704W8CFyTPDPllz4z4lu0Ql1+07PG/XdIg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
     debug "^4.0.1"
     doctrine "^3.0.0"
     eslint-scope "^5.0.0"
-    eslint-utils "^1.4.2"
+    eslint-utils "^2.0.0"
     eslint-visitor-keys "^1.1.0"
-    espree "^6.1.1"
-    esquery "^1.0.1"
+    espree "^7.0.0"
+    esquery "^1.2.0"
     esutils "^2.0.2"
     file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
     glob-parent "^5.0.0"
-    globals "^11.7.0"
+    globals "^12.1.0"
     ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.4.1"
+    inquirer "^7.0.0"
     is-glob "^4.0.0"
     js-yaml "^3.13.1"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
+    levn "^0.4.1"
     lodash "^4.17.14"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.2"
+    optionator "^0.9.1"
     progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
     table "^5.2.3"
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
@@ -5481,13 +5508,13 @@ espree@^5.0.0:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-espree@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de"
-  integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==
+espree@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.0.0.tgz#8a7a60f218e69f120a842dc24c5a88aa7748a74e"
+  integrity sha512-/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw==
   dependencies:
-    acorn "^7.0.0"
-    acorn-jsx "^5.0.2"
+    acorn "^7.1.1"
+    acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.1.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
@@ -5507,6 +5534,13 @@ esquery@^1.0.1:
   dependencies:
     estraverse "^4.0.0"
 
+esquery@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
+  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -5519,6 +5553,11 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
+estraverse@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642"
+  integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw==
+
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -5932,7 +5971,7 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.4:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -6014,6 +6053,13 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -6533,11 +6579,18 @@ global@~4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^12.1.0:
+  version "12.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
+  integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
+  dependencies:
+    type-fest "^0.8.1"
+
 globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
@@ -7282,23 +7335,23 @@ ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
 
-inquirer@^6.4.1:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca"
-  integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==
+inquirer@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29"
+  integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==
   dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
+    ansi-escapes "^4.2.1"
+    chalk "^3.0.0"
+    cli-cursor "^3.1.0"
     cli-width "^2.0.0"
     external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.12"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.4.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
     through "^2.3.6"
 
 inquirer@~3.3.0:
@@ -8604,7 +8657,15 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@^0.3.0, levn@~0.3.0:
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
+levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
@@ -9014,7 +9075,7 @@ lodash.unescape@4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
   integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
 
-lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.15.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -9637,6 +9698,11 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nan@^2.12.1, nan@^2.13.1, nan@^2.13.2, nan@^2.14.0:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
@@ -10190,7 +10256,7 @@ optimist@~0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optionator@^0.8.1, optionator@^0.8.2:
+optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
@@ -10202,6 +10268,18 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -10995,6 +11073,11 @@ prebuild-install@^5.3.3:
     tunnel-agent "^0.6.0"
     which-pm-runs "^1.0.0"
 
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -11536,6 +11619,11 @@ regexpp@^3.0.0:
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
   integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
 
+regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+
 regexpu-core@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6"
@@ -11785,6 +11873,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -11894,6 +11990,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-async@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
+
 run-parallel@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
@@ -11918,13 +12019,20 @@ rx-lite@*, rx-lite@^4.0.8:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
   integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=
 
-rxjs@^6.3.3, rxjs@^6.4.0:
+rxjs@^6.3.3:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
   integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.3:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec"
+  integrity sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==
+  dependencies:
+    tslib "^1.9.0"
+
 rxjs@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
@@ -12071,7 +12179,7 @@ semver-diff@^3.1.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
+semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -12838,10 +12946,10 @@ strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
-strip-json-comments@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
-  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+strip-json-comments@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
+  integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==
 
 stubs@^3.0.0:
   version "3.0.0"
@@ -13515,6 +13623,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
+
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
@@ -13527,6 +13642,11 @@ type-detect@^4.0.0, type-detect@^4.0.5:
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
+type-fest@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"
+  integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==
+
 type-fest@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.12.0.tgz#f57a27ab81c68d136a51fd71467eff94157fa1ee"
@@ -14737,6 +14857,11 @@ window-size@^1.1.1:
     define-property "^1.0.0"
     is-number "^3.0.0"
 
+word-wrap@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"

From ee301c5b07cc4d659729afbea1e73949eae20afe Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Sat, 9 May 2020 04:02:31 -0300
Subject: [PATCH 32/48] refactor: replace some lodash methods with native
 alternatives (#1897)

---
 .../App/AppSidemenu/AppSidemenuSettings.vue   |  4 +-
 .../components/Collapse/CollapseAccordion.vue |  2 +-
 .../components/Input/InputAddress.vue         |  5 +-
 .../components/Input/InputCurrency.vue        |  5 +-
 .../components/Input/InputDelegate.vue        |  5 +-
 .../components/Input/InputGrid/InputGrid.vue  |  2 +-
 .../Menu/MenuDropdown/MenuDropdown.vue        |  3 +-
 .../PluginManager/PluginManagerSideMenu.vue   |  3 +-
 .../Selection/mixin-selection-image.js        |  3 +-
 .../Transaction/TransactionModal.vue          |  4 +-
 src/renderer/pages/Contact/ContactAll.vue     |  4 +-
 src/renderer/pages/Profile/ProfileEdition.vue |  3 +-
 src/renderer/pages/Wallet/WalletAll.vue       |  4 +-
 src/renderer/pages/Wallet/WalletNew.vue       |  2 +-
 src/renderer/services/client.js               |  4 +-
 .../plugin-manager/setup/languages-setup.js   |  2 +-
 .../plugin-manager/setup/themes-setup.js      |  2 +-
 src/renderer/services/synchronizer.js         |  7 +--
 src/renderer/store/index.js                   |  4 +-
 src/renderer/store/modules/network.js         |  3 +-
 src/renderer/store/modules/peer.js            |  3 +-
 src/renderer/utils/index.js                   | 54 ++++++++++++-------
 22 files changed, 75 insertions(+), 53 deletions(-)

diff --git a/src/renderer/components/App/AppSidemenu/AppSidemenuSettings.vue b/src/renderer/components/App/AppSidemenu/AppSidemenuSettings.vue
index 72c9aeae2b..319ea91cb0 100644
--- a/src/renderer/components/App/AppSidemenu/AppSidemenuSettings.vue
+++ b/src/renderer/components/App/AppSidemenu/AppSidemenuSettings.vue
@@ -168,13 +168,13 @@
 </template>
 
 <script>
+import os from 'os'
 import { MARKET } from '@config'
+import { isEmpty } from '@/utils'
 import { ModalConfirmation } from '@/components/Modal'
 import { MenuNavigationItem, MenuOptions, MenuOptionsItem, MenuDropdown } from '@/components/Menu'
 import { ButtonSwitch } from '@/components/Button'
 import { PluginManageBlacklistModal } from '@/components/PluginManager/PluginManagerModals'
-import { isEmpty } from 'lodash'
-import os from 'os'
 
 export default {
   name: 'AppSidemenuOptionsSettings',
diff --git a/src/renderer/components/Collapse/CollapseAccordion.vue b/src/renderer/components/Collapse/CollapseAccordion.vue
index 331bab241e..5bbdb57505 100644
--- a/src/renderer/components/Collapse/CollapseAccordion.vue
+++ b/src/renderer/components/Collapse/CollapseAccordion.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import { isEmpty } from 'lodash'
+import { isEmpty } from '@/utils'
 
 export default {
   name: 'CollapseAccordion',
diff --git a/src/renderer/components/Input/InputAddress.vue b/src/renderer/components/Input/InputAddress.vue
index e65a860f03..fee547c861 100644
--- a/src/renderer/components/Input/InputAddress.vue
+++ b/src/renderer/components/Input/InputAddress.vue
@@ -69,7 +69,8 @@ import Cycled from 'cycled'
 import InputField from './InputField'
 import WalletService from '@/services/wallet'
 import truncate from '@/filters/truncate'
-import { includes, isEmpty, orderBy, unionBy } from 'lodash'
+import { orderBy, unionBy } from 'lodash'
+import { isEmpty } from '@/utils'
 
 export default {
   name: 'InputAddress',
@@ -215,7 +216,7 @@ export default {
         const value = wallet.name || wallet.address
         const searchValue = value.toLowerCase()
 
-        if (includes(searchValue, this.inputValue.toLowerCase())) {
+        if (searchValue && searchValue.includes(this.inputValue.toLowerCase())) {
           wallets[wallet.address] = value
         }
 
diff --git a/src/renderer/components/Input/InputCurrency.vue b/src/renderer/components/Input/InputCurrency.vue
index 30b896a3c0..764275c5c0 100644
--- a/src/renderer/components/Input/InputCurrency.vue
+++ b/src/renderer/components/Input/InputCurrency.vue
@@ -38,11 +38,10 @@
 </template>
 
 <script>
-import { includes } from 'lodash'
 import { required } from 'vuelidate/lib/validators'
 import { MARKET } from '@config'
-import InputField from './InputField'
 import BigNumber from '@/plugins/bignumber'
+import InputField from './InputField'
 
 /**
  * This component uses a String value internally to avoid several problems, such
@@ -378,7 +377,7 @@ export default {
         ...Object.keys(MARKET.currencies),
         ...Object.values(MARKET.currencies).map(currency => currency.symbol)
       ]
-      return includes(currencies, currency)
+      return currencies.includes(currency)
     },
 
     reset () {
diff --git a/src/renderer/components/Input/InputDelegate.vue b/src/renderer/components/Input/InputDelegate.vue
index d0d712ef7b..bef13aae10 100644
--- a/src/renderer/components/Input/InputDelegate.vue
+++ b/src/renderer/components/Input/InputDelegate.vue
@@ -60,12 +60,13 @@
 
 <script>
 import { required } from 'vuelidate/lib/validators'
+import Cycled from 'cycled'
+import { orderBy } from 'lodash'
+import { isEmpty } from '@/utils'
 import { ButtonModal } from '@/components/Button'
 import ModalQrCodeScanner from '@/components/Modal/ModalQrCodeScanner'
 import { MenuDropdown } from '@/components/Menu'
-import Cycled from 'cycled'
 import InputField from './InputField'
-import { isEmpty, orderBy } from 'lodash'
 
 export default {
   name: 'InputDelegate',
diff --git a/src/renderer/components/Input/InputGrid/InputGrid.vue b/src/renderer/components/Input/InputGrid/InputGrid.vue
index 0ac994efb0..359c58faca 100644
--- a/src/renderer/components/Input/InputGrid/InputGrid.vue
+++ b/src/renderer/components/Input/InputGrid/InputGrid.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import { flatten } from 'lodash'
+import { flatten } from '@/utils'
 import InputGridItem from './InputGridItem'
 import InputGridModal from './InputGridModal'
 
diff --git a/src/renderer/components/Menu/MenuDropdown/MenuDropdown.vue b/src/renderer/components/Menu/MenuDropdown/MenuDropdown.vue
index 54da4ad462..4075ec1b03 100644
--- a/src/renderer/components/Menu/MenuDropdown/MenuDropdown.vue
+++ b/src/renderer/components/Menu/MenuDropdown/MenuDropdown.vue
@@ -62,7 +62,8 @@
 </template>
 
 <script>
-import { zipObject, isEmpty } from 'lodash'
+import { zipObject } from 'lodash'
+import { isEmpty } from '@/utils'
 import MenuDropdownItem from './MenuDropdownItem'
 import MenuDropdownHandler from './MenuDropdownHandler'
 
diff --git a/src/renderer/components/PluginManager/PluginManagerSideMenu.vue b/src/renderer/components/PluginManager/PluginManagerSideMenu.vue
index 9742983d28..dc0d78b050 100644
--- a/src/renderer/components/PluginManager/PluginManagerSideMenu.vue
+++ b/src/renderer/components/PluginManager/PluginManagerSideMenu.vue
@@ -39,7 +39,6 @@
 </template>
 
 <script>
-import { concat } from 'lodash'
 import { PLUGINS } from '@config'
 import { PluginManagerButtonMenu } from '@/components/PluginManager/PluginManagerButtons'
 
@@ -60,7 +59,7 @@ export default {
 
   computed: {
     pluginCategories () {
-      return concat(['all'], PLUGINS.categories.filter(category => !['theme', 'language'].includes(category)))
+      return ['all'].concat(PLUGINS.categories.filter(category => !['theme', 'language'].includes(category)))
     },
 
     otherCategories () {
diff --git a/src/renderer/components/Selection/mixin-selection-image.js b/src/renderer/components/Selection/mixin-selection-image.js
index 8fea32a2f3..62ad19ae7e 100644
--- a/src/renderer/components/Selection/mixin-selection-image.js
+++ b/src/renderer/components/Selection/mixin-selection-image.js
@@ -1,5 +1,6 @@
 import path from 'path'
-import { flatten, sortBy } from 'lodash'
+import { sortBy } from 'lodash'
+import { flatten } from '@/utils'
 import imageManager from '@/services/image-manager'
 
 export default {
diff --git a/src/renderer/components/Transaction/TransactionModal.vue b/src/renderer/components/Transaction/TransactionModal.vue
index 4a5c95e123..d16ac00e22 100644
--- a/src/renderer/components/Transaction/TransactionModal.vue
+++ b/src/renderer/components/Transaction/TransactionModal.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { camelCase, includes } from 'lodash'
+import { camelCase } from 'lodash'
 import { upperFirst } from '@/utils'
 import { TRANSACTION_GROUPS, TRANSACTION_TYPES } from '@config'
 import MultiSignature from '@/services/client-multisig'
@@ -81,7 +81,7 @@ export default {
       type: Number,
       required: true,
       validator: value => {
-        return value === TRANSACTION_TYPES.MULTI_SIGN || includes(TRANSACTION_TYPES.GROUP_1, value)
+        return value === TRANSACTION_TYPES.MULTI_SIGN || Object.values(TRANSACTION_TYPES.GROUP_1).includes(value)
       }
     },
 
diff --git a/src/renderer/pages/Contact/ContactAll.vue b/src/renderer/pages/Contact/ContactAll.vue
index 0ace0f0163..e07370c5eb 100644
--- a/src/renderer/pages/Contact/ContactAll.vue
+++ b/src/renderer/pages/Contact/ContactAll.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script>
-import { isEqual, some } from 'lodash'
+import { isEqual } from 'lodash'
 import { ButtonLayout } from '@/components/Button'
 import { ContactRemovalConfirmation, ContactRenameModal } from '@/components/Contact'
 import { WalletGrid, WalletIdenticonPlaceholder } from '@/components/Wallet'
@@ -161,7 +161,7 @@ export default {
     },
 
     showVotedDelegates () {
-      return some(this.contacts, contact => Object.prototype.hasOwnProperty.call(contact, 'vote'))
+      return this.contacts.some(contact => Object.prototype.hasOwnProperty.call(contact, 'vote'))
     }
   },
 
diff --git a/src/renderer/pages/Profile/ProfileEdition.vue b/src/renderer/pages/Profile/ProfileEdition.vue
index 8b05b651cf..5f34d0f227 100644
--- a/src/renderer/pages/Profile/ProfileEdition.vue
+++ b/src/renderer/pages/Profile/ProfileEdition.vue
@@ -369,8 +369,9 @@
 </template>
 
 <script>
-import { clone, isEmpty } from 'lodash'
+import { clone } from 'lodash'
 import { BIP39, I18N, MARKET, PLUGINS } from '@config'
+import { isEmpty } from '@/utils'
 import { ButtonSwitch } from '@/components/Button'
 import { InputText } from '@/components/Input'
 import { ListDivided, ListDividedItem } from '@/components/ListDivided'
diff --git a/src/renderer/pages/Wallet/WalletAll.vue b/src/renderer/pages/Wallet/WalletAll.vue
index e34f92916a..ee27662593 100644
--- a/src/renderer/pages/Wallet/WalletAll.vue
+++ b/src/renderer/pages/Wallet/WalletAll.vue
@@ -145,7 +145,7 @@
 </template>
 
 <script>
-import { isEqual, some, uniqBy } from 'lodash'
+import { isEqual, uniqBy } from 'lodash'
 import { ButtonLayout } from '@/components/Button'
 import Loader from '@/components/utils/Loader'
 import { ProfileAvatar } from '@/components/Profile'
@@ -263,7 +263,7 @@ export default {
     },
 
     showVotedDelegates () {
-      return some(this.selectableWallets, wallet => Object.prototype.hasOwnProperty.call(wallet, 'vote'))
+      return this.selectableWallets.some(wallet => Object.prototype.hasOwnProperty.call(wallet, 'vote'))
     }
   },
 
diff --git a/src/renderer/pages/Wallet/WalletNew.vue b/src/renderer/pages/Wallet/WalletNew.vue
index e4d023f7a6..24fbfc38eb 100644
--- a/src/renderer/pages/Wallet/WalletNew.vue
+++ b/src/renderer/pages/Wallet/WalletNew.vue
@@ -266,8 +266,8 @@
 </template>
 
 <script>
-import { flatten } from 'lodash'
 import { required } from 'vuelidate/lib/validators'
+import { flatten } from '@/utils'
 import { ButtonClipboard, ButtonReload } from '@/components/Button'
 import { InputPassword, InputSwitch, InputText } from '@/components/Input'
 import { MenuStep, MenuStepItem } from '@/components/Menu'
diff --git a/src/renderer/services/client.js b/src/renderer/services/client.js
index 5bf24b3185..5a06f3e58d 100644
--- a/src/renderer/services/client.js
+++ b/src/renderer/services/client.js
@@ -7,7 +7,7 @@ import TransactionService from '@/services/transaction'
 import { TransactionBuilderService } from './crypto/transaction-builder.service'
 import { TransactionSigner } from './crypto/transaction-signer'
 import BigNumber from '@/plugins/bignumber'
-import { cammelToUpperSnake } from '@/utils'
+import { camelToUpperSnake } from '@/utils'
 
 export default class ClientService {
   /**
@@ -110,7 +110,7 @@ export default class ClientService {
             @config is in UPPER_SNAKE_CASE. Eg: 'BUSSINES_UPDATE'
           */
           const groupName = `GROUP_${groupId}`
-          const parsedTypeName = cammelToUpperSnake(typeName)
+          const parsedTypeName = camelToUpperSnake(typeName)
 
           const type = TRANSACTION_TYPES[groupName][parsedTypeName]
 
diff --git a/src/renderer/services/plugin-manager/setup/languages-setup.js b/src/renderer/services/plugin-manager/setup/languages-setup.js
index ab07a560cb..9d0f356a24 100644
--- a/src/renderer/services/plugin-manager/setup/languages-setup.js
+++ b/src/renderer/services/plugin-manager/setup/languages-setup.js
@@ -1,8 +1,8 @@
 import path from 'path'
 import fs from 'fs'
 import { normalizeJson } from '../utils/normalize-json'
-import { isEmpty } from 'lodash'
 import { I18N } from '@config'
+import { isEmpty } from '@/utils'
 
 export function create (plugin, pluginObject, sandbox, profileId) {
   return async () => {
diff --git a/src/renderer/services/plugin-manager/setup/themes-setup.js b/src/renderer/services/plugin-manager/setup/themes-setup.js
index 3c0f48dc39..3db8f10eaa 100644
--- a/src/renderer/services/plugin-manager/setup/themes-setup.js
+++ b/src/renderer/services/plugin-manager/setup/themes-setup.js
@@ -1,7 +1,7 @@
 import path from 'path'
 import fs from 'fs'
 import { normalizeJson } from '../utils/normalize-json'
-import { isEmpty } from 'lodash'
+import { isEmpty } from '@/utils'
 
 export function create (plugin, pluginObject, sandbox, profileId) {
   return async () => {
diff --git a/src/renderer/services/synchronizer.js b/src/renderer/services/synchronizer.js
index 757fc859d2..165a6e8b8f 100644
--- a/src/renderer/services/synchronizer.js
+++ b/src/renderer/services/synchronizer.js
@@ -1,4 +1,5 @@
-import { flatten, includes, pullAll } from 'lodash'
+import { pullAll } from 'lodash'
+import { flatten } from '@/utils'
 import { announcements, fees, ledger, market, peer, wallets } from './synchronizer/'
 /**
  * This class adds the possibility to define actions (not to confuse with Vuex actions)
@@ -194,14 +195,14 @@ export default class Synchronizer {
      */
     const run = (options = {}) => {
       Object.keys(this.actions).forEach(actionId => {
-        if (!includes(this.paused, actionId)) {
+        if (!this.paused.includes(actionId)) {
           const action = this.actions[actionId]
 
           if (!action.isCalling) {
             if (options.immediate) {
               this.call(actionId)
             } else {
-              const mode = includes(this.focused, actionId) ? 'focus' : 'default'
+              const mode = this.focused.includes(actionId) ? 'focus' : 'default'
               const { interval } = action[mode]
 
               // A `null` interval means no interval, so the action does not run
diff --git a/src/renderer/store/index.js b/src/renderer/store/index.js
index bb11f55bda..5b332692ae 100644
--- a/src/renderer/store/index.js
+++ b/src/renderer/store/index.js
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
 import localforage from 'localforage'
-import { merge, pullAll, keys } from 'lodash'
+import { merge, pullAll } from 'lodash'
 
 import packageJson from '@package.json'
 
@@ -48,7 +48,7 @@ const vuexMigrations = new VuexPersistMigrations({
   }
 })
 
-const modulesWithoutPersistence = pullAll(keys(modules), ['delegate', 'market', 'updater'])
+const modulesWithoutPersistence = pullAll(Object.keys(modules), ['delegate', 'market', 'updater'])
 
 const vuexPersist = new VuexPersistence({
   key: 'ark-desktop',
diff --git a/src/renderer/store/modules/network.js b/src/renderer/store/modules/network.js
index 733f133e4d..a25d2eaafc 100644
--- a/src/renderer/store/modules/network.js
+++ b/src/renderer/store/modules/network.js
@@ -1,7 +1,8 @@
 import BaseModule from '../base'
-import { cloneDeep, isEmpty } from 'lodash'
+import { cloneDeep } from 'lodash'
 import { Managers } from '@arkecosystem/crypto'
 import { NETWORKS } from '@config'
+import { isEmpty } from '@/utils'
 import eventBus from '@/plugins/event-bus'
 import NetworkModel from '@/models/network'
 import Client from '@/services/client'
diff --git a/src/renderer/store/modules/peer.js b/src/renderer/store/modules/peer.js
index 0a303b519c..dc4e8509d7 100644
--- a/src/renderer/store/modules/peer.js
+++ b/src/renderer/store/modules/peer.js
@@ -1,8 +1,9 @@
-import { isEmpty, random, shuffle } from 'lodash'
+import { random, shuffle } from 'lodash'
 import { PeerDiscovery } from '@arkecosystem/peers'
 import ClientService from '@/services/client'
 import config from '@config'
 import i18n from '@/i18n'
+import { isEmpty } from '@/utils'
 import PeerModel from '@/models/peer'
 import Vue from 'vue'
 
diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js
index d507fffd04..a68756ce9d 100644
--- a/src/renderer/utils/index.js
+++ b/src/renderer/utils/index.js
@@ -1,11 +1,11 @@
 import sortByProps from './sort-by-props'
 
 /**
- * Converts the first character of `string` to upper case
- * @param {String} str
- * @return {String} Return the converted string
+ * Converts camelCaseString to UPPER_CAMEL_CASE_STRING
+ * @param {String} String the camelCaseString
+ * @returns {String} The UPPER_CAMEL_CASE
  */
-const upperFirst = str => `${str.charAt(0).toUpperCase()}${str.slice(1)}`
+const camelToUpperSnake = string => string.split(/(?=[A-Z])/).join('_').toUpperCase()
 
 /**
  * Converts the first character of `string` to upper case and the remaining to lower case
@@ -14,6 +14,20 @@ const upperFirst = str => `${str.charAt(0).toUpperCase()}${str.slice(1)}`
  */
 const capitalize = str => `${str.charAt(0).toUpperCase()}${str.slice(1).toLowerCase()}`
 
+/**
+ * Flattens `array` a single level deep
+ * @param {Array} arr
+ * @return {Array} Return the new flattened array
+ */
+const flatten = arr => arr.reduce((a, b) => a.concat(b), [])
+
+/**
+ * Checks if `value` is an empty object, collection, map, or set
+ * @param {*} val
+ * @return {Boolean} Return `true` if `value` is empty, else `false`
+ */
+const isEmpty = val => [Object, Array].includes((val || {}).constructor) && !Object.entries((val || {})).length
+
 /**
  * Checks if `value` is `null` or `undefined`
  * @param {*} val
@@ -22,40 +36,42 @@ const capitalize = str => `${str.charAt(0).toUpperCase()}${str.slice(1).toLowerC
 const isNil = val => val === null || val === undefined
 
 /**
- * Computes the minimum value of `array`
+ * Computes the maximum value of `array`
  * @param {Array} nums
- * @return {*} Return the minimum value
+ * @return {*} Return the maximum value
  */
-const min = nums => {
+const max = nums => {
   if (nums.length) {
-    return Math.min(...nums)
+    return Math.max(...nums)
   }
 }
 
 /**
- * Computes the maximum value of `array`
+ * Computes the minimum value of `array`
  * @param {Array} nums
- * @return {*} Return the maximum value
+ * @return {*} Return the minimum value
  */
-const max = nums => {
+const min = nums => {
   if (nums.length) {
-    return Math.max(...nums)
+    return Math.min(...nums)
   }
 }
 
 /**
- * Converts cammelCaseString to UPPER_CAMMEL_CASE_STRING.
- * @param {string} string The cammelCaseString
- * @returns {string} The UPPER_CAMMEL_CASE.
+ * Converts the first character of `string` to upper case
+ * @param {String} str
+ * @return {String} Return the converted string
  */
-const cammelToUpperSnake = string => string.split(/(?=[A-Z])/).join('_').toUpperCase()
+const upperFirst = str => `${str.charAt(0).toUpperCase()}${str.slice(1)}`
 
 export {
-  upperFirst,
+  camelToUpperSnake,
   capitalize,
+  flatten,
+  isEmpty,
   isNil,
-  min,
   max,
+  min,
   sortByProps,
-  cammelToUpperSnake
+  upperFirst
 }

From fac7e777bae3a2e2a68b32ca2373496ddfb744d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 May 2020 10:39:19 +0300
Subject: [PATCH 33/48] chore(deps): update dependency electron-builder to
 v22.6.0 (#1903)

---
 package.json |   2 +-
 yarn.lock    | 218 +++++++++++++++++++++++++++++----------------------
 2 files changed, 124 insertions(+), 96 deletions(-)

diff --git a/package.json b/package.json
index d225dd3930..72575b2a1f 100644
--- a/package.json
+++ b/package.json
@@ -146,7 +146,7 @@
     "del": "^5.0.0",
     "devtron": "^1.4.0",
     "electron": "^8.0.0",
-    "electron-builder": "22.4.1",
+    "electron-builder": "22.6.0",
     "electron-debug": "^3.0.1",
     "electron-devtools-installer": "^3.0.0",
     "electron-notarize": "^0.3.0",
diff --git a/yarn.lock b/yarn.lock
index dabbc040a0..87d08b6dca 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -950,13 +950,13 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
-"@develar/schema-utils@~2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.1.0.tgz#eceb1695bfbed6f6bb84666d5d3abe5e1fd54e17"
-  integrity sha512-qjCqB4ctMig9Gz5bd6lkdFr3bO6arOdQqptdBSpF1ZpCnjofieCciEzkoS9ujY9cMGyllYSCSmBJ3x9OKHXzoA==
+"@develar/schema-utils@~2.6.5":
+  version "2.6.5"
+  resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6"
+  integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==
   dependencies:
-    ajv "^6.1.0"
-    ajv-keywords "^3.1.0"
+    ajv "^6.12.0"
+    ajv-keywords "^3.4.1"
 
 "@electron/get@^1.0.1":
   version "1.7.6"
@@ -2033,37 +2033,37 @@ anymatch@^3.0.3:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-app-builder-bin@3.5.5:
-  version "3.5.5"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.5.tgz#c83200dccd8df5ccb2a5adcd41b2a76bacfb531a"
-  integrity sha512-ZcHzJ9Xl+azPqdKzXZKdRZmkNmbxHHZyl4cbobNf8qMQpoPChpcov8riVrZSbu/0cT/JqJ8LOwJjy1OAwbChaQ==
+app-builder-bin@3.5.8:
+  version "3.5.8"
+  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-3.5.8.tgz#4b96cf7d114171b20f32138082dc7cf20f16b85d"
+  integrity sha512-ni3q7QTfQNWHNWuyn5x3FZu6GnQZv+TFnfgk5++svqleKEhHGqS1mIaKsh7x5pBX6NFXU3/+ktk98wA/AW4EXw==
 
-app-builder-lib@22.4.1, app-builder-lib@~22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.4.1.tgz#9d73b2834e434fb65fc9571ae3fed3c1470b6915"
-  integrity sha512-epwUzIM+2pcdy/If9koTP74CKx4v7xGPj75a2Z5cM4rrGN9yVZ3eDUBbfF0e0qE4Qmcv5pd0BAZJ26bGm8NWsQ==
+app-builder-lib@22.6.0:
+  version "22.6.0"
+  resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-22.6.0.tgz#65782fa8fc96180a22c008eb78c1355349bb0b86"
+  integrity sha512-ky2aLYy92U+Gh6dKq/e8/bNmCotp6/GMhnX8tDZPv9detLg9WuBnWWi1ktBPlpbl1DREusy+TIh+9rgvfduQoA==
   dependencies:
     "7zip-bin" "~5.0.3"
-    "@develar/schema-utils" "~2.1.0"
+    "@develar/schema-utils" "~2.6.5"
     async-exit-hook "^2.0.1"
     bluebird-lst "^1.0.9"
-    builder-util "22.4.1"
-    builder-util-runtime "8.6.2"
+    builder-util "22.6.0"
+    builder-util-runtime "8.7.0"
     chromium-pickle-js "^0.2.0"
     debug "^4.1.1"
-    ejs "^3.0.1"
-    electron-publish "22.4.1"
-    fs-extra "^8.1.0"
+    ejs "^3.1.2"
+    electron-publish "22.6.0"
+    fs-extra "^9.0.0"
     hosted-git-info "^3.0.4"
     is-ci "^2.0.0"
-    isbinaryfile "^4.0.4"
+    isbinaryfile "^4.0.6"
     js-yaml "^3.13.1"
     lazy-val "^1.0.4"
     minimatch "^3.0.4"
     normalize-package-data "^2.5.0"
-    read-config-file "5.0.2"
+    read-config-file "6.0.0"
     sanitize-filename "^1.6.3"
-    semver "^7.1.3"
+    semver "^7.3.2"
     temp-file "^3.3.7"
 
 aproba@^1.0.3, aproba@^1.1.1:
@@ -2256,6 +2256,11 @@ async-limiter@~1.0.0:
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
+async@0.9.x:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+  integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=
+
 async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -3115,31 +3120,31 @@ builder-util-runtime@8.3.0:
     debug "^4.1.1"
     sax "^1.2.4"
 
-builder-util-runtime@8.6.2:
-  version "8.6.2"
-  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.6.2.tgz#8270e15b012d8d3b110f3e327b0fd8b0e07b1686"
-  integrity sha512-9QnIBISfhgQ2BxtRLidVqf/v5HD73vSKZDllpUmGd2L6VORGQk7cZAPmPtw4HQM3gPBelyVJ5yIjMNZ8xjmd1A==
+builder-util-runtime@8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-8.7.0.tgz#e48ad004835c8284662e8eaf47a53468c66e8e8d"
+  integrity sha512-G1AqqVM2vYTrSFR982c1NNzwXKrGLQjVjaZaWQdn4O6Z3YKjdMDofw88aD9jpyK9ZXkrCxR0tI3Qe9wNbyTlXg==
   dependencies:
     debug "^4.1.1"
     sax "^1.2.4"
 
-builder-util@22.4.1, builder-util@~22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.4.1.tgz#49cce9f06a62cdccda66d5efa82077040fa1f462"
-  integrity sha512-+ysLc7cC4w6P7rBxmZ5X2aU3QvcwFoWCl1us+mcUKdsGmJAtFUMPJqueeptdxjyPrPShIUOKHzA8uk5A3d1fHg==
+builder-util@22.6.0:
+  version "22.6.0"
+  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-22.6.0.tgz#25a3aca05d2c44949f0600282264dace8d289ee7"
+  integrity sha512-jgdES2ExJYkuXC3DEaGAjFctKNA81C4QDy8zdoc+rqdSqheTizuDNtZg02uMFklmUES4V4fggmqds+Y7wraqng==
   dependencies:
     "7zip-bin" "~5.0.3"
     "@types/debug" "^4.1.5"
     "@types/fs-extra" "^8.1.0"
-    app-builder-bin "3.5.5"
+    app-builder-bin "3.5.8"
     bluebird-lst "^1.0.9"
-    builder-util-runtime "8.6.2"
-    chalk "^3.0.0"
+    builder-util-runtime "8.7.0"
+    chalk "^4.0.0"
     debug "^4.1.1"
-    fs-extra "^8.1.0"
+    fs-extra "^9.0.0"
     is-ci "^2.0.0"
     js-yaml "^3.13.1"
-    source-map-support "^0.5.16"
+    source-map-support "^0.5.19"
     stat-mode "^1.0.0"
     temp-file "^3.3.7"
 
@@ -4720,15 +4725,14 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-dmg-builder@22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.4.1.tgz#ab80d3d6e4ed8a1d38beddbfe97c8f7a794dd932"
-  integrity sha512-hEemh7n0zoVt7zPPwvn7iOttP03oENjJ4ApttPmt8oDnX8T4q42MjGWyDlLkPMplMJfoTxkkNqmm296f0OYM8Q==
+dmg-builder@22.6.0:
+  version "22.6.0"
+  resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-22.6.0.tgz#78c3dee24f5713f4844d458949041e31fe7eec30"
+  integrity sha512-rJxuGhHIpcuDGBtWZMM8aLxkbZNgYO2MO5dUerDIBXebhX1K8DA23iz/uZ8ahcRNgWEv57b8GDqJbXKEfr5T0A==
   dependencies:
-    app-builder-lib "~22.4.1"
-    bluebird-lst "^1.0.9"
-    builder-util "~22.4.1"
-    fs-extra "^8.1.0"
+    app-builder-lib "22.6.0"
+    builder-util "22.6.0"
+    fs-extra "^9.0.0"
     iconv-lite "^0.5.1"
     js-yaml "^3.13.1"
     sanitize-filename "^1.6.3"
@@ -4945,35 +4949,37 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-ejs@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.0.1.tgz#30c8f6ee9948502cc32e85c37a3f8b39b5a614a5"
-  integrity sha512-cuIMtJwxvzumSAkqaaoGY/L6Fc/t6YvoP9/VIaK0V/CyqKLEQ8sqODmYfy/cjXEdZ9+OOL8TecbJu+1RsofGDw==
+ejs@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.2.tgz#a9986e6920a60f2a3229e87d4f0f3c073209874c"
+  integrity sha512-zFuywxrAWtX5Mk2KAuoJNkXXbfezpNA0v7i+YC971QORguPekpjpAgeOv99YWSdKXwj7JxI2QAWDeDkE8fWtXw==
+  dependencies:
+    jake "^10.6.1"
 
 ejs@~2.5.6:
   version "2.5.9"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.9.tgz#7ba254582a560d267437109a68354112475b0ce5"
   integrity sha512-GJCAeDBKfREgkBtgrYSf9hQy9kTb3helv0zGdzqhM7iAkW8FA/ZF97VQDbwFiwIT8MQLLOe5VlPZOEvZAqtUAQ==
 
-electron-builder@22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.4.1.tgz#7a7a2cbd9955c90cecc36de32ecba7f565265bab"
-  integrity sha512-13CjZcGeJS+c3EKRwFT/Oty5Niif5g1FwDioBLEbjkPCPQgxdtDsr+rJtCu9qxkiKDYpAoPS+t/clNk0efONvQ==
+electron-builder@22.6.0:
+  version "22.6.0"
+  resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-22.6.0.tgz#3ac81634e27026892d66f3a52568e65a7d28d26a"
+  integrity sha512-aLHlB6DTfjJ3MI4AUIFeWnwIozNgNlbOk2c2sTHxB10cAKp0dBVSPZ7xF5NK0uwDhElvRzJQubnHtJD6zKg42Q==
   dependencies:
     "@types/yargs" "^15.0.4"
-    app-builder-lib "22.4.1"
+    app-builder-lib "22.6.0"
     bluebird-lst "^1.0.9"
-    builder-util "22.4.1"
-    builder-util-runtime "8.6.2"
-    chalk "^3.0.0"
-    dmg-builder "22.4.1"
-    fs-extra "^8.1.0"
+    builder-util "22.6.0"
+    builder-util-runtime "8.7.0"
+    chalk "^4.0.0"
+    dmg-builder "22.6.0"
+    fs-extra "^9.0.0"
     is-ci "^2.0.0"
     lazy-val "^1.0.4"
-    read-config-file "5.0.2"
+    read-config-file "6.0.0"
     sanitize-filename "^1.6.3"
     update-notifier "^4.1.0"
-    yargs "^15.1.0"
+    yargs "^15.3.1"
 
 electron-chromedriver@^8.0.0-beta.7:
   version "8.0.0-beta.7"
@@ -5057,17 +5063,17 @@ electron-notarize@^0.3.0:
     debug "^4.1.1"
     fs-extra "^8.1.0"
 
-electron-publish@22.4.1:
-  version "22.4.1"
-  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.4.1.tgz#a7fcf166786f7d5957f19a70ee8389f219769ba5"
-  integrity sha512-nwKNum3KXm+01rtWX2pc1jhazdzDy2zYnQx+zmXphZchjd6UOMX3ZN0xyZUCKugw5ZliflT6LkgbrcBXBtYD3A==
+electron-publish@22.6.0:
+  version "22.6.0"
+  resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-22.6.0.tgz#11dca595cfe3c0fdbc364c28dbb8838a1c6ec799"
+  integrity sha512-+v05SBf9qR7Os5au+fifloNHy5QxHQkUGudBj68YaTb43Pn37UkwRxSc49Lf13s4wW32ohM45g8BOVInPJEdnA==
   dependencies:
     "@types/fs-extra" "^8.1.0"
     bluebird-lst "^1.0.9"
-    builder-util "~22.4.1"
-    builder-util-runtime "8.6.2"
-    chalk "^3.0.0"
-    fs-extra "^8.1.0"
+    builder-util "22.6.0"
+    builder-util-runtime "8.7.0"
+    chalk "^4.0.0"
+    fs-extra "^9.0.0"
     lazy-val "^1.0.4"
     mime "^2.4.4"
 
@@ -6095,6 +6101,13 @@ file-uri-to-path@1.0.0:
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
   integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
 
+filelist@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.1.tgz#f10d1a3ae86c1694808e8f20906f43d4c9132dbb"
+  integrity sha512-8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ==
+  dependencies:
+    minimatch "^3.0.4"
+
 fill-range@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@@ -7800,10 +7813,10 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
 
-isbinaryfile@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.4.tgz#6803f81a8944201c642b6e17da041e24deb78712"
-  integrity sha512-pEutbN134CzcjlLS1myKX/uxNjwU5eBVSprvkpv3+3dqhBHUZLIWJQowC40w5c0Zf19vBY8mrZl88y5J4RAPbQ==
+isbinaryfile@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
+  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -7898,6 +7911,16 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
+jake@^10.6.1:
+  version "10.6.1"
+  resolved "https://registry.yarnpkg.com/jake/-/jake-10.6.1.tgz#c9c476cfd6e726ef600ee9bb2b880d5425ff8c79"
+  integrity sha512-pHUK3+V0BjOb1XSi95rbBksrMdIqLVC9bJqDnshVyleYsET3H0XAq+3VB2E3notcYvv4wRdRHn13p7vobG+wfQ==
+  dependencies:
+    async "0.9.x"
+    chalk "^2.4.2"
+    filelist "^1.0.1"
+    minimatch "^3.0.4"
+
 jest-changed-files@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.9.0.tgz#08d8c15eb79a7fa3fc98269bc14b451ee82f8039"
@@ -8488,13 +8511,6 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.1.tgz#81b6cb04e9ba496f1c7005d07b4368a2638f90b6"
-  integrity sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==
-  dependencies:
-    minimist "^1.2.0"
-
 json5@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
@@ -11424,16 +11440,15 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
-read-config-file@5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-5.0.2.tgz#55e005e5a447a9ce5806358d7b22cb7cefb6436d"
-  integrity sha512-tVt1lsiSjs+FtL/vtfCivqtKR1UNk3BB3uPJQvJqkgtAYDvZjo0xyXFYSVmzaTcO+Jdi5G7O2K2vDV+p1M/oug==
+read-config-file@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299"
+  integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA==
   dependencies:
     dotenv "^8.2.0"
     dotenv-expand "^5.1.0"
-    fs-extra "^8.1.0"
     js-yaml "^3.13.1"
-    json5 "^2.1.1"
+    json5 "^2.1.2"
     lazy-val "^1.0.4"
 
 read-file-stdin@^0.2.0:
@@ -12189,7 +12204,7 @@ semver@^7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^7.1.2, semver@^7.1.3:
+semver@^7.1.2:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
   integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==
@@ -12199,6 +12214,11 @@ semver@^7.2.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.1.tgz#d997aa36bdbb00b501ae4ac4c7d17e9f7a587ae5"
   integrity sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==
 
+semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -12529,10 +12549,10 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-source-map-support@^0.5.16:
-  version "0.5.16"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
-  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+source-map-support@^0.5.19:
+  version "0.5.19"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
+  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -15134,6 +15154,14 @@ yargs-parser@^16.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^18.1.1:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@12.0.5:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -15185,10 +15213,10 @@ yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.1"
 
-yargs@^15.1.0:
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219"
-  integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==
+yargs@^15.3.1:
+  version "15.3.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
+  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
   dependencies:
     cliui "^6.0.0"
     decamelize "^1.2.0"
@@ -15200,7 +15228,7 @@ yargs@^15.1.0:
     string-width "^4.2.0"
     which-module "^2.0.0"
     y18n "^4.0.0"
-    yargs-parser "^16.1.0"
+    yargs-parser "^18.1.1"
 
 yargs@~1.2.6:
   version "1.2.6"

From 420e1a48d0836d03e2c6cf02c0d6f089804922ac Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Sat, 9 May 2020 04:55:40 -0300
Subject: [PATCH 34/48] refactor: remove v2 from endpoint requests (#1913)

---
 .../components/Network/NetworkModal.spec.js   |   2 +-
 __tests__/unit/services/client.spec.js        |  24 ++--
 __tests__/unit/store/modules/delegate.spec.js |   4 +-
 __tests__/unit/store/modules/ledger.spec.js   |   4 +-
 __tests__/unit/store/modules/peer.spec.js     |  42 +++----
 .../unit/store/modules/transaction.spec.js    |   2 +-
 package.json                                  |   2 +-
 src/renderer/services/client.js               |   4 +-
 src/renderer/store/modules/peer.js            |   4 +-
 yarn.lock                                     | 108 +++++++-----------
 10 files changed, 83 insertions(+), 113 deletions(-)

diff --git a/__tests__/unit/components/Network/NetworkModal.spec.js b/__tests__/unit/components/Network/NetworkModal.spec.js
index 57bc107b21..01c6eb7fe4 100644
--- a/__tests__/unit/components/Network/NetworkModal.spec.js
+++ b/__tests__/unit/components/Network/NetworkModal.spec.js
@@ -136,7 +136,7 @@ describe('NetworkModal', () => {
 
       it('should fetch data and populate', async () => {
         nock('http://1.2.3.4')
-          .get('/api/v2/node/configuration')
+          .get('/api/node/configuration')
           .reply(200, {
             data: {
               nethash: 1234,
diff --git a/__tests__/unit/services/client.spec.js b/__tests__/unit/services/client.spec.js
index 7487b043cb..d5d0b2a561 100644
--- a/__tests__/unit/services/client.spec.js
+++ b/__tests__/unit/services/client.spec.js
@@ -202,7 +202,7 @@ describe('Services > Client', () => {
     it('should create a new connection', () => {
       const connection = ClientService.newConnection('http://localhost')
 
-      expect(connection.host).toBe('http://localhost/api/v2')
+      expect(connection.host).toBe('http://localhost/api')
     })
 
     it('should set timeout if provided', () => {
@@ -225,7 +225,7 @@ describe('Services > Client', () => {
   describe('fetchNetworkConfig', () => {
     const mockEndpoint = (config) => {
       nock('http://127.0.0.1')
-        .get('/api/v2/node/configuration')
+        .get('/api/node/configuration')
         .reply(200, {
           data: config
         })
@@ -294,7 +294,7 @@ describe('Services > Client', () => {
       }
 
       nock('http://127.0.0.1')
-        .get('/api/v2/node/configuration/crypto')
+        .get('/api/node/configuration/crypto')
         .reply(200, {
           data: cryptoConfig
         })
@@ -306,7 +306,7 @@ describe('Services > Client', () => {
   describe('fetchFeeStatistics', () => {
     const mockEndpoint = (config) => {
       nock('http://127.0.0.1')
-        .get('/api/v2/node/fees')
+        .get('/api/node/fees')
         .query({ days: 7 })
         .reply(200, {
           data: config
@@ -364,7 +364,7 @@ describe('Services > Client', () => {
 
     it('should return empty array on error', async () => {
       nock('http://127.0.0.1')
-        .get('/api/v2/node/fees')
+        .get('/api/node/fees')
         .query({ days: 7 })
         .reply(500)
 
@@ -376,13 +376,13 @@ describe('Services > Client', () => {
     it('should return formatted host', () => {
       client.host = 'http://6.6.6.6'
 
-      expect(client.host).toEqual('http://6.6.6.6/api/v2')
+      expect(client.host).toEqual('http://6.6.6.6/api')
     })
 
     it('should update current client', () => {
       client.host = 'http://7.7.7.7'
 
-      expect(client.client.host).toEqual('http://7.7.7.7/api/v2')
+      expect(client.client.host).toEqual('http://7.7.7.7/api')
     })
   })
 
@@ -396,7 +396,7 @@ describe('Services > Client', () => {
       }
 
       nock('http://127.0.0.1:4003')
-        .get('/api/v2/node/syncing')
+        .get('/api/node/syncing')
         .reply(200, {
           data: response
         })
@@ -444,7 +444,7 @@ describe('Services > Client', () => {
       }
 
       nock('http://127.0.0.1:4003')
-        .get('/api/v2/delegates/USERNAME/voters')
+        .get('/api/delegates/USERNAME/voters')
         .reply(200, {
           meta,
           data: {}
@@ -562,7 +562,7 @@ describe('Services > Client', () => {
       }
 
       nock('http://127.0.0.1:4003')
-        .get('/api/v2/businesses/BUSINESS_ID/bridgechains?page=1&limit=50&orderBy=name%3Aasc')
+        .get('/api/businesses/BUSINESS_ID/bridgechains?page=1&limit=50&orderBy=name%3Aasc')
         .reply(200, response)
 
       expect(await client.fetchBusinessBridgechains('BUSINESS_ID')).toEqual(response)
@@ -2046,7 +2046,7 @@ describe('Services > Client', () => {
   describe('broadcastTransaction', () => {
     beforeEach(() => {
       nock('http://127.0.0.1:4003')
-        .post('/api/v2/transactions')
+        .post('/api/transactions')
         .reply(200, {
           data: 'transaction'
         })
@@ -2118,7 +2118,7 @@ describe('Services > Client', () => {
 
         for (const ip of ['1.1.1.1', '2.2.2.2']) {
           nock(`http://${ip}:8080`)
-            .post('/api/v2/transactions')
+            .post('/api/transactions')
             .reply(200, {
               data: `broadcast transaction for ${ip}`
             })
diff --git a/__tests__/unit/store/modules/delegate.spec.js b/__tests__/unit/store/modules/delegate.spec.js
index 3bbec17449..52c6fd4b22 100644
--- a/__tests__/unit/store/modules/delegate.spec.js
+++ b/__tests__/unit/store/modules/delegate.spec.js
@@ -55,7 +55,7 @@ describe('delegate store module', () => {
     describe('load', () => {
       it('should fetch delegates from api', async () => {
         nock('http://127.0.0.1')
-          .get('/api/v2/delegates')
+          .get('/api/delegates')
           .query({ page: 1, limit: 100, orderBy: 'rank:asc' })
           .reply(200, {
             data: delegates,
@@ -74,7 +74,7 @@ describe('delegate store module', () => {
 
         for (let page = 1; page <= pageCount; page++) {
           nock('http://127.0.0.1')
-            .get('/api/v2/delegates')
+            .get('/api/delegates')
             .query({ page, limit: 100, orderBy: 'rank:asc' })
             .reply(200, {
               data: delegates.map(delegate => ({ ...delegate, address: `${delegate.address}-${page}` })),
diff --git a/__tests__/unit/store/modules/ledger.spec.js b/__tests__/unit/store/modules/ledger.spec.js
index 8366ba659c..b8df7dee17 100644
--- a/__tests__/unit/store/modules/ledger.spec.js
+++ b/__tests__/unit/store/modules/ledger.spec.js
@@ -360,7 +360,7 @@ describe('ledger store module', () => {
     it('should load all wallets with multi-wallet search', async () => {
       nock('http://127.0.0.1')
         .persist()
-        .post('/api/v2/wallets/search')
+        .post('/api/wallets/search')
         .reply(200, {
           data: ledgerWallets.slice(0, 9)
         })
@@ -374,7 +374,7 @@ describe('ledger store module', () => {
 
       nock('http://127.0.0.1')
         .persist()
-        .post('/api/v2/wallets/search')
+        .post('/api/wallets/search')
         .reply(200, {
           data: ledgerWallets.slice(0, 9)
         })
diff --git a/__tests__/unit/store/modules/peer.spec.js b/__tests__/unit/store/modules/peer.spec.js
index a08bc802df..19de569365 100644
--- a/__tests__/unit/store/modules/peer.spec.js
+++ b/__tests__/unit/store/modules/peer.spec.js
@@ -81,7 +81,7 @@ describe('peer store module', () => {
   it('should get & set current peer', async () => {
     for (const peer of peers) {
       nock(`http://${peer.ip}:${peer.port}`)
-        .get('/api/v2/transactions/fees')
+        .get('/api/transactions/fees')
         .reply(200, {
           data: {
             send: 1,
@@ -122,23 +122,23 @@ describe('peer store module', () => {
     for (const peer of peers) {
       nock(`http://${peer.ip}:${peer.port}`)
         .persist()
-        .get('/api/v2/node/syncing')
+        .get('/api/node/syncing')
         .reply(200, {
           data: {
             height: 20000
           }
         })
-        .get('/api/v2/node/configuration')
+        .get('/api/node/configuration')
         .reply(200, {
           data: {
             nethash
           }
         })
-        .get('/api/v2/blocks/getEpoch')
+        .get('/api/blocks/getEpoch')
         .reply(200, {
           epoch: new Date()
         })
-        .get('/api/v2/transactions/fees')
+        .get('/api/transactions/fees')
         .reply(200, {
           data: {
             send: 1,
@@ -147,7 +147,7 @@ describe('peer store module', () => {
             vote: 1
           }
         })
-        .get('/api/v2/peers')
+        .get('/api/peers')
         .reply(200, {
           data: peerResponse
         })
@@ -167,7 +167,7 @@ describe('peer store module', () => {
 
     nock(`http://${goodPeer1.ip}:${goodPeer1.ports['@arkecosystem/core-api']}`)
       .persist()
-      .get('/api/v2/transactions/fees')
+      .get('/api/transactions/fees')
       .reply(200, {
         data: {
           send: 1,
@@ -180,7 +180,7 @@ describe('peer store module', () => {
     for (const peer of refreshPeers) {
       nock(`http://${peer.ip}:${peer.ports['@arkecosystem/core-api']}`)
         .persist()
-        .get('/api/v2/peers')
+        .get('/api/peers')
         .reply(200, {
           data: refreshPeers
         })
@@ -205,13 +205,13 @@ describe('peer store module', () => {
     client.host = host
 
     nock(host)
-      .get('/api/v2/node/syncing')
+      .get('/api/node/syncing')
       .reply(200, {
         data: {
           height: 21000
         }
       })
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(200, {
         data: {
           constants: {},
@@ -229,7 +229,7 @@ describe('peer store module', () => {
   it('should update current peer status', async () => {
     nock(`http://${goodPeer1.ip}:${goodPeer1.port}`)
       .persist()
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(200, {
         data: {
           constants: {
@@ -238,13 +238,13 @@ describe('peer store module', () => {
           nethash
         }
       })
-      .get('/api/v2/node/syncing')
+      .get('/api/node/syncing')
       .reply(200, {
         data: {
           height: 10000
         }
       })
-      .get('/api/v2/transactions/fees')
+      .get('/api/transactions/fees')
       .reply(200, {
         data: {
           send: 1,
@@ -268,14 +268,14 @@ describe('peer store module', () => {
 
   it('should validate a v2 peer successfully', async () => {
     nock(`http://${goodPeer1.ip}:${goodPeer1.port}`)
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(200, {
         data: {
           constants: {},
           nethash
         }
       })
-      .get('/api/v2/node/syncing')
+      .get('/api/node/syncing')
       .reply(200, {
         data: {
           height: 10002
@@ -293,14 +293,14 @@ describe('peer store module', () => {
 
   it('should validate a v2 https peer successfully', async () => {
     nock(`https://${goodPeer1.ip}:${goodPeer1.port}`)
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(200, {
         data: {
           constants: {},
           nethash
         }
       })
-      .get('/api/v2/node/syncing')
+      .get('/api/node/syncing')
       .reply(200, {
         data: {
           height: 10002
@@ -322,7 +322,7 @@ describe('peer store module', () => {
 
   it('should fail validating a v2 peer due to bad network url', async () => {
     nock(`http://${goodPeer1.ip}:${goodPeer1.port}`)
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(400)
 
     const response = await store.dispatch('peer/validatePeer', { ...goodPeer1, timeout: 100 })
@@ -331,14 +331,14 @@ describe('peer store module', () => {
 
   it('should fail validating a v2 peer due to bad sync status url', async () => {
     nock(`http://${goodPeer1.ip}:${goodPeer1.port}`)
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(200, {
         data: {
           constants: {},
           nethash
         }
       })
-      .get('/api/v2/node/syncing')
+      .get('/api/node/syncing')
       .reply(400)
 
     const response = await store.dispatch('peer/validatePeer', { ...goodPeer1, timeout: 100 })
@@ -348,7 +348,7 @@ describe('peer store module', () => {
   it('should fail validating a v2 peer because of wrong nethash', async () => {
     nock(`http://${goodPeer1.ip}:${goodPeer1.port}`)
       .persist()
-      .get('/api/v2/node/configuration')
+      .get('/api/node/configuration')
       .reply(200, {
         data: {
           constants: {},
diff --git a/__tests__/unit/store/modules/transaction.spec.js b/__tests__/unit/store/modules/transaction.spec.js
index 4876a0f6d9..de02b5f9b7 100644
--- a/__tests__/unit/store/modules/transaction.spec.js
+++ b/__tests__/unit/store/modules/transaction.spec.js
@@ -205,7 +205,7 @@ describe('TransactionModule', () => {
   describe('dispatch updateStaticFees', () => {
     it('should return update all fees on v2', async () => {
       nock('http://127.0.0.1:4003')
-        .get('/api/v2/transactions/fees')
+        .get('/api/transactions/fees')
         .reply(200, {
           data: {
             transfer: 1,
diff --git a/package.json b/package.json
index 72575b2a1f..aecc3fa4ae 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "@arkecosystem/core-magistrate-crypto": "^2.6.27",
     "@arkecosystem/crypto": "^2.6.27",
     "@arkecosystem/ledger-transport": "^1.0.5",
-    "@arkecosystem/peers": "^0.2.1",
+    "@arkecosystem/peers": "^0.3.0",
     "@arkecosystem/platform-sdk": "^0.0.2",
     "@babel/runtime": "^7.4.2",
     "@fortawesome/fontawesome-svg-core": "^1.2.21",
diff --git a/src/renderer/services/client.js b/src/renderer/services/client.js
index 5a06f3e58d..3e5621d2ed 100644
--- a/src/renderer/services/client.js
+++ b/src/renderer/services/client.js
@@ -18,7 +18,7 @@ export default class ClientService {
    * @return {Connection}
    */
   static newConnection (server, timeout) {
-    return new Connection(`${server}/api/v2`).withOptions({
+    return new Connection(`${server}/api`).withOptions({
       timeout: timeout || 5000
     })
   }
@@ -151,7 +151,7 @@ export default class ClientService {
   }
 
   set host (host) {
-    this.__host = `${host}/api/v2`
+    this.__host = `${host}/api`
     this.client = ClientService.newConnection(host)
   }
 
diff --git a/src/renderer/store/modules/peer.js b/src/renderer/store/modules/peer.js
index dc4e8509d7..4a7cf3e77c 100644
--- a/src/renderer/store/modules/peer.js
+++ b/src/renderer/store/modules/peer.js
@@ -310,12 +310,12 @@ export default {
         const peerUrl = getBaseUrl(getters.current())
 
         return PeerDiscovery.new({
-          networkOrHost: `${peerUrl}/api/v2/peers`
+          networkOrHost: `${peerUrl}/api/peers`
         })
       }
 
       return PeerDiscovery.new({
-        networkOrHost: `${network.server}/api/v2/peers`
+        networkOrHost: `${network.server}/api/peers`
       })
     },
 
diff --git a/yarn.lock b/yarn.lock
index 87d08b6dca..694eb40a72 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -80,16 +80,17 @@
   resolved "https://registry.yarnpkg.com/@arkecosystem/ledger-transport/-/ledger-transport-1.0.5.tgz#7b3a1186709d7bfeb680fe428223a7a402bb22cd"
   integrity sha512-xag/HeOrkiY3nGnvF6SpP5gEBjXbx6lKjjR+RsQU4bqIfJKhxQmaOw+mGKxwFp/lJ5uEyObn1SNbRnMu0HLvsg==
 
-"@arkecosystem/peers@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@arkecosystem/peers/-/peers-0.2.1.tgz#980c56dd20cb91afef16985e83af92f7bbaceea1"
-  integrity sha512-26qdArNjgX2nJEiVQOaAVd2taA3y4HNGTyzj/4/7Zu7n8QTn2PDDjn2zOdWNeKeMMDQFmnBYHrPtGjOWONLOWQ==
+"@arkecosystem/peers@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@arkecosystem/peers/-/peers-0.3.0.tgz#793a8d7254201b45f28212e33282a9d15ca6de3f"
+  integrity sha512-cHMQHhZBVeYqXaKs9A//OtAOSLNyLRwiZqdazuOvuXXfaTLz26BXD90lsWevO3LZlN9YF2GLHwNNQwrWXKWEtg==
   dependencies:
-    got "^9.6.0"
     is-url-superb "^3.0.0"
+    ky "^0.19.0"
+    ky-universal "^0.5.0"
     lodash.orderby "^4.6.0"
-    nock "^11.0.0-beta.31"
-    semver "^6.2.0"
+    nock "^12.0.0"
+    semver "^7.1.0"
 
 "@arkecosystem/platform-sdk@^0.0.2":
   version "0.0.2"
@@ -1796,6 +1797,13 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 about-window@^1.13.1:
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/about-window/-/about-window-1.13.1.tgz#a81401aa8c27155c9541aaa16408104cdaeb0a25"
@@ -2211,11 +2219,6 @@ assert@^1.1.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assertion-error@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
-  integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
-
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
@@ -3362,18 +3365,6 @@ cfonts@^2.4.2:
     change-case "^3.1.0"
     window-size "^1.1.1"
 
-chai@^4.1.2:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-4.2.0.tgz#760aa72cf20e3795e84b12877ce0e83737aa29e5"
-  integrity sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==
-  dependencies:
-    assertion-error "^1.1.0"
-    check-error "^1.0.2"
-    deep-eql "^3.0.1"
-    get-func-name "^2.0.0"
-    pathval "^1.1.0"
-    type-detect "^4.0.5"
-
 chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -3491,11 +3482,6 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.6.0"
     color-convert "^0.5.3"
 
-check-error@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82"
-  integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=
-
 cheerio@^1.0.0-rc.3:
   version "1.0.0-rc.3"
   resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
@@ -4500,13 +4486,6 @@ dedent@^0.7.0:
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
   integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
 
-deep-eql@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-3.0.1.tgz#dfc9404400ad1c8fe023e7da1df1c147c4b444df"
-  integrity sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==
-  dependencies:
-    type-detect "^4.0.0"
-
 deep-equal@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz#3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"
@@ -5677,6 +5656,11 @@ ethjs-util@0.1.6:
     is-hex-prefixed "1.0.0"
     strip-hex-prefix "1.0.0"
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 eventemitter2@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-5.0.1.tgz#6197a095d5fb6b57e8942f6fd7eaad63a09c9452"
@@ -6412,11 +6396,6 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=
-
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz#6f7764f88ea11e0b514bd9bd860a132259992ca4"
@@ -8632,6 +8611,19 @@ kleur@^3.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
+ky-universal@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/ky-universal/-/ky-universal-0.5.0.tgz#16d5fe881fb98e54732a4f0b7d531d44cbf701cb"
+  integrity sha512-O+0wjCua5i45lYBZrBy8TyRDRVodtsmzVC/MlE5FN7ZMFu/Icz7ekbZ85sdFw0F/JwGhXZTaKjXq9IgUGwGedQ==
+  dependencies:
+    abort-controller "^3.0.0"
+    node-fetch "^2.6.0"
+
+ky@^0.19.0:
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/ky/-/ky-0.19.1.tgz#c533884028c83f78167d12905dfecaf6dd760bec"
+  integrity sha512-ZwciYrfaWpDI72U2HAruuGYGFW3PCfGNdWWSANGGssg9BGm4rRJ9s/sApiiRpj+8Y245/hlZW9c60zudLr6iwA==
+
 latest-version@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
@@ -9812,18 +9804,6 @@ no-case@^3.0.3:
     lower-case "^2.0.1"
     tslib "^1.10.0"
 
-nock@^11.0.0-beta.31:
-  version "11.3.6"
-  resolved "https://registry.yarnpkg.com/nock/-/nock-11.3.6.tgz#cd87eb47ed9755d6d1e04dee1d56722267cb3283"
-  integrity sha512-54MSX4qeRnhwQQ2PSHlHc6pM6zNf7Dq9ni0BTFTurnDbUUssXl2Jy3E95ffaE8rZ/W/FWa9VSfzWDDnbdAsoTg==
-  dependencies:
-    chai "^4.1.2"
-    debug "^4.1.0"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.17.13"
-    mkdirp "^0.5.0"
-    propagate "^2.0.0"
-
 nock@^12.0.0:
   version "12.0.0"
   resolved "https://registry.yarnpkg.com/nock/-/nock-12.0.0.tgz#f405309bbf305d9a5bba2e9718aab4463edc9572"
@@ -9864,7 +9844,7 @@ node-emoji@^1.8.1:
   dependencies:
     lodash.toarray "^4.4.0"
 
-node-fetch@^2.2.0:
+node-fetch@^2.2.0, node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
@@ -10693,11 +10673,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pathval@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.0.tgz#b942e6d4bde653005ef6b71361def8727d0645e0"
-  integrity sha1-uULm1L3mUwBe9rcTYd74cn0GReA=
-
 pbkdf2@^3.0.3, pbkdf2@^3.0.9:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -12204,6 +12179,11 @@ semver@^7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
+semver@^7.1.0, semver@^7.3.2:
+  version "7.3.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
+  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+
 semver@^7.1.2:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6"
@@ -12214,11 +12194,6 @@ semver@^7.2.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.2.1.tgz#d997aa36bdbb00b501ae4ac4c7d17e9f7a587ae5"
   integrity sha512-aHhm1pD02jXXkyIpq25qBZjr3CQgg8KST8uX0OWXch3xE6jw+1bfbWnCjzMwojsTquroUmKFHNzU6x26mEiRxw==
 
-semver@^7.3.2:
-  version "7.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
-  integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
-
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -13657,11 +13632,6 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-detect@^4.0.0, type-detect@^4.0.5:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
-  integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
-
 type-fest@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1"

From 7c77e12152e14202cddd8ad4d611752d11d688f8 Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Mon, 18 May 2020 18:50:23 +0300
Subject: [PATCH 35/48] fix: timeout NPM requests and continue execution
 (#1923)

---
 src/renderer/App.vue                          | 13 ++++++++--
 src/renderer/services/plugin-manager.js       | 24 +++++++++++++------
 .../plugin-manager/adapters/npm-adapter.js    |  9 ++++---
 src/renderer/services/wallet.js               |  4 ++--
 src/renderer/store/modules/network.js         |  4 ++--
 src/renderer/utils/http.js                    |  9 +++++++
 6 files changed, 47 insertions(+), 16 deletions(-)
 create mode 100644 src/renderer/utils/http.js

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 37ed7a2ca0..e29731e04a 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -289,7 +289,12 @@ export default {
   methods: {
     async loadEssential () {
       // We need to await plugins in order for all plugins to load properly
-      await this.$plugins.init(this)
+      try {
+        await this.$plugins.init(this)
+      } catch {
+        this.$error('Failed to load plugins. NPM might be down.')
+      }
+
       await this.$store.dispatch('network/load')
       const currentProfileId = this.$store.getters['session/profileId']
       await this.$store.dispatch('session/reset')
@@ -332,7 +337,11 @@ export default {
 
       ipcRenderer.send('splashscreen:app-ready')
 
-      await Promise.all([this.$plugins.fetchPluginsFromAdapter(), this.$plugins.fetchPluginsList()])
+      try {
+        await Promise.all([this.$plugins.fetchPluginsFromAdapter(), this.$plugins.fetchPluginsList()])
+      } catch {
+        this.$error('Failed to load plugins. NPM might be down.')
+      }
     },
 
     __watchProfile () {
diff --git a/src/renderer/services/plugin-manager.js b/src/renderer/services/plugin-manager.js
index 60f3209342..f61c41a170 100644
--- a/src/renderer/services/plugin-manager.js
+++ b/src/renderer/services/plugin-manager.js
@@ -4,7 +4,6 @@ import { I18N, PLUGINS } from '@config'
 import { dayjs } from '@/services/datetime'
 import * as fs from 'fs'
 import * as fsExtra from 'fs-extra'
-import got from 'got'
 import { partition } from 'lodash'
 import { upperFirst } from '@/utils'
 import * as path from 'path'
@@ -17,6 +16,7 @@ import { PluginSandbox } from './plugin-manager/plugin-sandbox'
 import { PluginSetup } from './plugin-manager/plugin-setup'
 import { validatePluginPath } from './plugin-manager/utils/validate-plugin-path'
 import validatePackageName from 'validate-npm-package-name'
+import { reqwest } from '@/utils/http'
 
 let rootPath = path.resolve(__dirname, '../../../')
 if (process.env.NODE_ENV === 'production') {
@@ -207,7 +207,13 @@ export class PluginManager {
   }
 
   async fetchLogo (url) {
-    const { body } = await got(url, { encoding: null })
+    const {
+      body
+    } = await reqwest(url, {
+      encoding: null,
+      timeout: 100,
+      retry: 0
+    })
     return body.toString('base64')
   }
 
@@ -219,7 +225,7 @@ export class PluginManager {
     const requests = []
     for (const imageUrl of images) {
       requests.push(
-        got(imageUrl, { encoding: null }).then(response => response.body.toString('base64'))
+        reqwest(imageUrl, { encoding: null }).then(response => response.body.toString('base64'))
       )
     }
 
@@ -241,13 +247,13 @@ export class PluginManager {
 
       try {
         plugin.logo = await this.fetchLogo(plugin.logo)
-      } catch (error) {
+      } catch {
         plugin.logo = null
       }
 
       try {
         plugin.images = await this.fetchImages(plugin.images)
-      } catch (error) {
+      } catch {
         plugin.images = []
       }
 
@@ -290,7 +296,7 @@ export class PluginManager {
     const { owner, repository, branch } = this.parsePluginUrl(url)
 
     const baseUrl = `https://raw.githubusercontent.com/${owner}/${repository}/${branch}`
-    const { body } = await got(`${baseUrl}/package.json`, { json: true })
+    const { body } = await reqwest(`${baseUrl}/package.json`, { json: true })
 
     let plugin
 
@@ -367,7 +373,11 @@ export class PluginManager {
 
   async fetchPluginsList () {
     try {
-      const { body } = await got(`${PLUGINS.pluginsUrl}?ts=${(new Date()).getTime()}`, { json: true })
+      const {
+        body
+      } = await reqwest(`${PLUGINS.pluginsUrl}?ts=${(new Date()).getTime()}`, {
+        json: true
+      })
       this.app.$store.dispatch('plugin/setWhitelisted', { scope: 'global', plugins: body.plugins })
       this.app.$store.dispatch('plugin/setBlacklisted', { scope: 'global', plugins: body.blacklist })
     } catch (error) {
diff --git a/src/renderer/services/plugin-manager/adapters/npm-adapter.js b/src/renderer/services/plugin-manager/adapters/npm-adapter.js
index ea286ba6fd..1978cbcefa 100644
--- a/src/renderer/services/plugin-manager/adapters/npm-adapter.js
+++ b/src/renderer/services/plugin-manager/adapters/npm-adapter.js
@@ -1,7 +1,7 @@
 import { PLUGINS } from '@config'
 import { chunk } from 'lodash'
-import got from 'got'
 import packageJson from 'package-json'
+import { reqwest } from '@/utils/http'
 
 const CHUNKSIZE = 50
 
@@ -47,7 +47,9 @@ class NpmAdapter {
   async fetchPlugins (options = {}) {
     const keywords = PLUGINS.keywords.join(' ')
 
-    const { body } = await got('/-/v1/search', {
+    const {
+      body
+    } = await reqwest('/-/v1/search', {
       query: {
         text: `keywords:${keywords}`,
         from: options.from || 0,
@@ -55,7 +57,8 @@ class NpmAdapter {
         t: Date.now()
       },
       baseUrl: this.baseUrl,
-      json: true
+      json: true,
+      timeout: 3000
     })
 
     return {
diff --git a/src/renderer/services/wallet.js b/src/renderer/services/wallet.js
index 5334181145..faefa241f9 100644
--- a/src/renderer/services/wallet.js
+++ b/src/renderer/services/wallet.js
@@ -2,8 +2,8 @@ import * as bip39 from 'bip39'
 import { Crypto, Identities } from '@arkecosystem/crypto'
 import { version as mainnetVersion } from '@config/networks/mainnet'
 import store from '@/store'
-import got from 'got'
 import { CryptoUtils } from './crypto/utils'
+import { reqwest } from '@/utils/http'
 
 export default class WalletService {
   /*
@@ -106,7 +106,7 @@ export default class WalletService {
     }
 
     const neoUrl = 'https://neoscan.io/api/main_net/v1/get_last_transactions_by_address/'
-    const response = await got(neoUrl + address, {
+    const response = await reqwest(neoUrl + address, {
       json: true
     })
 
diff --git a/src/renderer/store/modules/network.js b/src/renderer/store/modules/network.js
index a25d2eaafc..cc11264dd1 100644
--- a/src/renderer/store/modules/network.js
+++ b/src/renderer/store/modules/network.js
@@ -6,8 +6,8 @@ import { isEmpty } from '@/utils'
 import eventBus from '@/plugins/event-bus'
 import NetworkModel from '@/models/network'
 import Client from '@/services/client'
-import got from 'got'
 import Vue from 'vue'
+import { reqwest } from '@/utils/http'
 
 export default new BaseModule(NetworkModel, {
 
@@ -100,7 +100,7 @@ export default new BaseModule(NetworkModel, {
 
         if (network.knownWalletsUrl) {
           try {
-            const knownWallets = await got(network.knownWalletsUrl, {
+            const knownWallets = await reqwest(network.knownWalletsUrl, {
               json: true
             })
             network.knownWallets = knownWallets.body
diff --git a/src/renderer/utils/http.js b/src/renderer/utils/http.js
new file mode 100644
index 0000000000..6addff1694
--- /dev/null
+++ b/src/renderer/utils/http.js
@@ -0,0 +1,9 @@
+import got from 'got'
+
+export const reqwest = (url, options = {}) => got(url, {
+  ...{
+    timeout: 1000,
+    retry: 0
+  },
+  ...options
+})

From 6fcf597fb5de40658b77e41180e2a59bbe7c69aa Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Mon, 18 May 2020 18:50:36 +0300
Subject: [PATCH 36/48] fix: ensure that password has value before validating
 it and better regex (#1927)

---
 .../components/Input/InputPassword.spec.js    | 26 ++++++++++--
 .../components/Input/InputPassword.vue        | 41 ++++++++++++++-----
 src/renderer/i18n/locales/en-US.js            |  2 +
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/__tests__/unit/components/Input/InputPassword.spec.js b/__tests__/unit/components/Input/InputPassword.spec.js
index b60938e629..d85b347ebe 100644
--- a/__tests__/unit/components/Input/InputPassword.spec.js
+++ b/__tests__/unit/components/Input/InputPassword.spec.js
@@ -75,9 +75,29 @@ describe('InputPassword', () => {
     })
   })
 
+  describe('when the password does not include a lowercase character', () => {
+    it('should provide feedback about it', () => {
+      mountData.propsData.value = 'A123'
+      mountData.propsData.minLength = 2
+      const wrapper = mount(InputPassword, mountData)
+
+      expect(wrapper.vm.passwordFeedback()).toEqual('VALIDATION.PASSWORD.LOWER_CASE')
+    })
+  })
+
+  describe('when the password does not include an uppercase character', () => {
+    it('should provide feedback about it', () => {
+      mountData.propsData.value = 'a123'
+      mountData.propsData.minLength = 2
+      const wrapper = mount(InputPassword, mountData)
+
+      expect(wrapper.vm.passwordFeedback()).toEqual('VALIDATION.PASSWORD.UPPER_CASE')
+    })
+  })
+
   describe('when the password does not include a number', () => {
     it('should provide feedback about it', () => {
-      mountData.propsData.value = 'aaaabbbb'
+      mountData.propsData.value = 'aB'
       mountData.propsData.minLength = 2
       const wrapper = mount(InputPassword, mountData)
 
@@ -87,7 +107,7 @@ describe('InputPassword', () => {
 
   describe('when the password does not include a special character', () => {
     it('should provide feedback about it', () => {
-      mountData.propsData.value = 'aaaa0000'
+      mountData.propsData.value = 'aB0'
       mountData.propsData.minLength = 2
       const wrapper = mount(InputPassword, mountData)
 
@@ -97,7 +117,7 @@ describe('InputPassword', () => {
 
   describe('when the password follows all the constraints', () => {
     it('should not provide feedback', () => {
-      const value = 'aaaa000+'
+      const value = 'aB1+'
       mountData.propsData.value = value
       mountData.propsData.minLength = value.length
       const wrapper = mount(InputPassword, mountData)
diff --git a/src/renderer/components/Input/InputPassword.vue b/src/renderer/components/Input/InputPassword.vue
index 503c1869fb..8d8fa181ba 100644
--- a/src/renderer/components/Input/InputPassword.vue
+++ b/src/renderer/components/Input/InputPassword.vue
@@ -195,9 +195,21 @@ export default {
 
       if (this.minLength && this.model.length < this.minLength) {
         return this.$t('VALIDATION.PASSWORD.TOO_SHORT', [this.minLength])
-      } else if (!this.model.match(/[0-9]+/)) {
+      }
+
+      if (!this.model.match(/[a-z]/)) {
+        return this.$t('VALIDATION.PASSWORD.LOWER_CASE')
+      }
+
+      if (!this.model.match(/[A-Z]/)) {
+        return this.$t('VALIDATION.PASSWORD.UPPER_CASE')
+      }
+
+      if (!this.model.match(/[0-9]/)) {
         return this.$t('VALIDATION.PASSWORD.NUMBERS')
-      } else if (!this.model.match(/[^a-zA-Z0-9]+/)) {
+      }
+
+      if (!this.model.match(/\W|_/)) {
         return this.$t('VALIDATION.PASSWORD.SPECIAL_CHARACTERS')
       }
 
@@ -217,22 +229,29 @@ export default {
 
         return true
       },
-      isValid () {
-        if (!this.isRequired && !this.model.length) {
+      isValid (value) {
+        if (!value) {
+          return false
+        }
+
+        if (!this.isRequired && !value.length) {
           return true
-        } else if (!this.isCreate) {
+        }
+
+        if (!this.isCreate) {
           return true
         }
 
-        if (this.minLength && this.model.length < this.minLength) {
-          return false
-        } else if (!this.model.match(/[0-9]+/)) {
-          return false
-        } else if (!this.model.match(/[^a-zA-Z0-9]+/)) {
+        if (this.minLength && value.length < this.minLength) {
           return false
         }
 
-        return true
+        const containsLowercase = /[a-z]/.test(value)
+        const containsUppercase = /[A-Z]/.test(value)
+        const containsNumbers = /[0-9]/.test(value)
+        const containsSpecial = /\W|_/.test(value)
+
+        return containsLowercase && containsUppercase && containsNumbers && containsSpecial
       }
     }
   }
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index 68216857f2..611597f871 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -182,6 +182,8 @@ export default {
     },
     PASSWORD: {
       TOO_SHORT: 'Your password must be at least {0} characters long',
+      LOWER_CASE: 'Your password must contain at least 1 lowercase character',
+      UPPER_CASE: 'Your password must contain at least 1 uppercase character',
       NUMBERS: 'Your password must contain at least 1 number',
       SPECIAL_CHARACTERS: 'Your password must contain at least 1 special character',
       NO_MATCH: 'Your passwords do not match'

From 1f9ba7fee7ef1ac1a5bc7bdbc700cc85cf67a839 Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Mon, 18 May 2020 18:51:26 +0300
Subject: [PATCH 37/48] fix: use local seed list if peer discovery fails
 (#1924)

---
 src/renderer/store/modules/peer/devnet.json   |  21 ++
 src/renderer/store/modules/peer/fallback.js   |   4 +
 .../store/modules/{peer.js => peer/index.js}  |  79 ++++--
 src/renderer/store/modules/peer/mainnet.json  | 257 ++++++++++++++++++
 4 files changed, 339 insertions(+), 22 deletions(-)
 create mode 100644 src/renderer/store/modules/peer/devnet.json
 create mode 100644 src/renderer/store/modules/peer/fallback.js
 rename src/renderer/store/modules/{peer.js => peer/index.js} (89%)
 create mode 100644 src/renderer/store/modules/peer/mainnet.json

diff --git a/src/renderer/store/modules/peer/devnet.json b/src/renderer/store/modules/peer/devnet.json
new file mode 100644
index 0000000000..4a11cd8552
--- /dev/null
+++ b/src/renderer/store/modules/peer/devnet.json
@@ -0,0 +1,21 @@
+[{
+    "ip": "167.114.29.51",
+    "port": 4002
+  },
+  {
+    "ip": "167.114.29.52",
+    "port": 4002
+  },
+  {
+    "ip": "167.114.29.53",
+    "port": 4002
+  },
+  {
+    "ip": "167.114.29.54",
+    "port": 4002
+  },
+  {
+    "ip": "167.114.29.55",
+    "port": 4002
+  }
+]
diff --git a/src/renderer/store/modules/peer/fallback.js b/src/renderer/store/modules/peer/fallback.js
new file mode 100644
index 0000000000..b2920b3c25
--- /dev/null
+++ b/src/renderer/store/modules/peer/fallback.js
@@ -0,0 +1,4 @@
+export const fallbackSeeds = {
+  'ark.mainnet': require('./mainnet.json'),
+  'ark.devnet': require('./devnet.json')
+}
diff --git a/src/renderer/store/modules/peer.js b/src/renderer/store/modules/peer/index.js
similarity index 89%
rename from src/renderer/store/modules/peer.js
rename to src/renderer/store/modules/peer/index.js
index 4a7cf3e77c..49b3d47de0 100644
--- a/src/renderer/store/modules/peer.js
+++ b/src/renderer/store/modules/peer/index.js
@@ -6,6 +6,7 @@ import i18n from '@/i18n'
 import { isEmpty } from '@/utils'
 import PeerModel from '@/models/peer'
 import Vue from 'vue'
+import { fallbackSeeds } from './fallback'
 
 const getBaseUrl = (peer) => {
   const scheme = peer.isHttps ? 'https://' : 'http://'
@@ -13,6 +14,29 @@ const getBaseUrl = (peer) => {
   return `${scheme}${peer.ip}:${peer.port}`
 }
 
+const discoverPeers = async (peerDiscovery) => {
+  peerDiscovery.withLatency(300).sortBy('latency')
+
+  const peers = await peerDiscovery.findPeersWithPlugin('core-api', {
+    additional: [
+      'height',
+      'latency'
+    ]
+  })
+
+  if (peers && peers.length) {
+    return peers
+  }
+
+  return peerDiscovery.findPeersWithPlugin('core-wallet-api', {
+    additional: [
+      'height',
+      'latency',
+      'version'
+    ]
+  })
+}
+
 export default {
   namespaced: true,
 
@@ -323,35 +347,46 @@ export default {
      * Refresh peer list.
      * @return {void}
      */
-    async refresh ({ dispatch }, network = null) {
+    async refresh ({ dispatch, rootGetters }, network = null) {
       let peers = []
 
       try {
-        const peerDiscovery = await dispatch('getPeerDiscovery', network)
+        peers = await discoverPeers(await dispatch('getPeerDiscovery', network))
 
-        peerDiscovery.withLatency(300)
-          .sortBy('latency')
+        throw new Error('xxx')
+      } catch (error) {
+        if (!network) {
+          network = rootGetters['session/network']
+        }
 
-        peers = await peerDiscovery
-          .findPeersWithPlugin('core-api', {
-            additional: [
-              'height',
-              'latency'
-            ]
-          })
+        const networkLookup = {
+          'ark.mainnet': 'mainnet',
+          'ark.devnet': 'devnet'
+        }
+
+        if (networkLookup[network.id]) {
+          console.log('Could not refresh peer list. Using fallback seeds: ', error)
+
+          let peerDiscoveryFailed = true
+
+          while (peerDiscoveryFailed) {
+            try {
+              const seeds = fallbackSeeds[network.id]
+              const seed = seeds[Math.floor(Math.random() * seeds.length)]
+              const peerDiscovery = await PeerDiscovery.new({ networkOrHost: `http://${seed.ip}:4003/api/peers` })
+
+              peers = await discoverPeers(peerDiscovery)
 
-        if (!peers.length) {
-          peers = await peerDiscovery
-            .findPeersWithPlugin('core-wallet-api', {
-              additional: [
-                'height',
-                'latency',
-                'version'
-              ]
-            })
+              peerDiscoveryFailed = false
+            } catch (error) {
+              peerDiscoveryFailed = true
+
+              console.error('Could not refresh peer list:', error)
+            }
+          }
+        } else {
+          console.error('Could not refresh peer list:', error)
         }
-      } catch (error) {
-        console.error('Could not refresh peer list:', error)
       }
 
       if (!peers.length) {
diff --git a/src/renderer/store/modules/peer/mainnet.json b/src/renderer/store/modules/peer/mainnet.json
new file mode 100644
index 0000000000..9bbfe7e751
--- /dev/null
+++ b/src/renderer/store/modules/peer/mainnet.json
@@ -0,0 +1,257 @@
+[{
+    "ip": "5.196.105.32",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.33",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.34",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.35",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.36",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.37",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.38",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.39",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.136",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.137",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.138",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.139",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.140",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.141",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.142",
+    "port": 4001
+  },
+  {
+    "ip": "178.32.65.143",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.40",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.41",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.42",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.43",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.44",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.45",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.46",
+    "port": 4001
+  },
+  {
+    "ip": "5.196.105.47",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.32",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.33",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.34",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.35",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.36",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.37",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.38",
+    "port": 4001
+  },
+  {
+    "ip": "54.38.120.39",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.32",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.33",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.34",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.35",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.36",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.37",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.38",
+    "port": 4001
+  },
+  {
+    "ip": "151.80.125.39",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.104",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.105",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.106",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.107",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.108",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.109",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.110",
+    "port": 4001
+  },
+  {
+    "ip": "213.32.41.111",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.22.92",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.22.93",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.22.94",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.22.95",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.52.96",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.52.97",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.52.98",
+    "port": 4001
+  },
+  {
+    "ip": "5.135.52.99",
+    "port": 4001
+  },
+  {
+    "ip": "51.255.105.52",
+    "port": 4001
+  },
+  {
+    "ip": "51.255.105.53",
+    "port": 4001
+  },
+  {
+    "ip": "51.255.105.54",
+    "port": 4001
+  },
+  {
+    "ip": "51.255.105.55",
+    "port": 4001
+  },
+  {
+    "ip": "46.105.160.104",
+    "port": 4001
+  },
+  {
+    "ip": "46.105.160.105",
+    "port": 4001
+  },
+  {
+    "ip": "46.105.160.106",
+    "port": 4001
+  },
+  {
+    "ip": "46.105.160.107",
+    "port": 4001
+  }
+]

From 2f6d9785a244e76b2d98e494253fb73fbbff193b Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Tue, 19 May 2020 04:50:13 +0300
Subject: [PATCH 38/48] fix: remove debug error (#1938)

---
 src/renderer/store/modules/peer/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/renderer/store/modules/peer/index.js b/src/renderer/store/modules/peer/index.js
index 49b3d47de0..d39a75f451 100644
--- a/src/renderer/store/modules/peer/index.js
+++ b/src/renderer/store/modules/peer/index.js
@@ -352,8 +352,6 @@ export default {
 
       try {
         peers = await discoverPeers(await dispatch('getPeerDiscovery', network))
-
-        throw new Error('xxx')
       } catch (error) {
         if (!network) {
           network = rootGetters['session/network']

From b533eb236e52450ddeb5121f58d143e7baa17b0a Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Wed, 20 May 2020 11:36:42 -0300
Subject: [PATCH 39/48] feat: auto-add the recipient if loading the modal using
 a URI (#1936)

---
 .../TransactionFormTransfer.spec.js           |  6 ++---
 .../TransactionFormTransfer.vue               | 23 ++++++++++++++++---
 src/renderer/i18n/locales/en-US.js            |  1 +
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js b/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
index 9776b43220..f411efe54b 100644
--- a/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
+++ b/__tests__/unit/components/Transaction/TransactionForm/TransactionFormTransfer.spec.js
@@ -986,16 +986,16 @@ describe('TransactionFormTransfer', () => {
       it('should load in schema form data', () => {
         wrapper.setProps({
           schema: {
-            amount: (10 * 1e8).toString(),
             address: 'address-5',
+            amount: 100,
             vendorField: 'test vendorfield'
           }
         })
 
         wrapper.vm.populateSchema()
 
-        expect(wrapper.vm.amount).toBe((10 * 1e8).toString())
-        expect(wrapper.vm.recipientId).toBe('address-5')
+        expect(wrapper.vm.form.recipients[0].address).toBe('address-5')
+        expect(wrapper.vm.form.recipients[0].amount).toEqual(new BigNumber(100 * 1e8))
         expect(wrapper.vm.form.vendorField).toBe('test vendorfield')
       })
 
diff --git a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
index 879ab46121..256172c450 100644
--- a/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
+++ b/src/renderer/components/Transaction/TransactionForm/TransactionFormTransfer.vue
@@ -559,9 +559,26 @@ export default {
         return
       }
 
-      this.$set(this, 'amount', this.schema.amount || '')
-      this.$set(this, 'recipientId', this.schema.address || '')
-      this.$set(this.form, 'vendorField', this.schema.vendorField || '')
+      try {
+        if (this.schema.address && this.schema.amount) {
+          if (WalletService.validateAddress(this.schema.address, this.session_network.version)) {
+            this.$v.form.recipients.$model = []
+            this.$v.form.recipients.$model.push({
+              address: this.schema.address,
+              amount: this.currency_unitToSub(this.schema.amount),
+              sendAll: false
+            })
+          } else {
+            throw new Error(this.$t('VALIDATION.RECIPIENT_DIFFERENT_NETWORK', [
+              this.wallet_truncate(this.schema.address)
+            ]))
+          }
+        }
+
+        this.$set(this.form, 'vendorField', this.schema.vendorField || '')
+      } catch (error) {
+        this.$error(`${this.$t('TRANSACTION.ERROR.LOAD_FROM_URI')}: ${error.message}`)
+      }
 
       if (this.schema.wallet) {
         const currentProfileId = this.$store.getters['session/profileId']
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index 611597f871..958d3b8ad3 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -1135,6 +1135,7 @@ export default {
     LEDGER_SIGN_FAILED: 'Could not sign transaction with Ledger',
     LEDGER_USER_DECLINED: 'User declined',
     LOAD_FROM_FILE: 'Load transaction from file',
+    LOAD_FROM_URI: 'Load transaction from URI',
     MULTIPLE: 'Multiple',
     NONCE: 'Nonce',
     NO_RECIPIENTS: 'There are no recipient(s)',

From 54422dc39eb5f4d2f02eda2c1558abaea5c8ca0d Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Fri, 22 May 2020 10:27:09 -0300
Subject: [PATCH 40/48] feat: reload multisignature list when adding/updating
 the ms peer (#1888)

---
 .../Wallet/WalletMultiSignature/WalletMultiSignature.vue         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/components/Wallet/WalletMultiSignature/WalletMultiSignature.vue b/src/renderer/components/Wallet/WalletMultiSignature/WalletMultiSignature.vue
index c3345fa685..5d42296ab5 100644
--- a/src/renderer/components/Wallet/WalletMultiSignature/WalletMultiSignature.vue
+++ b/src/renderer/components/Wallet/WalletMultiSignature/WalletMultiSignature.vue
@@ -88,6 +88,7 @@ export default {
       if (await MultiSignature.performHandshake(peer)) {
         await this.$store.dispatch('session/setMultiSignaturePeer', peer)
         await this.$store.dispatch('profile/setMultiSignaturePeer', peer)
+        this.$eventBus.emit('wallet:reload:multi-signature')
         this.$success(`${this.$t('PEER.CONNECTED')}: ${peer.host}:${peer.port}`)
 
         if (closeTrigger) {

From bb727cb18b7b7725b98ca4b610f126674e99a76a Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Fri, 22 May 2020 10:45:48 -0300
Subject: [PATCH 41/48] fix: does not show success message when canceling a
 save file dialog (#1957)

---
 .../TransactionConfirm/TransactionConfirm.vue       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirm.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirm.vue
index 5d0d7c1f6d..25fc0e5126 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirm.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirm.vue
@@ -170,9 +170,14 @@ export default {
 
       try {
         const path = await this.electron_writeFile(raw, defaultPath)
-        this.$success(this.$t('TRANSACTION.SUCCESS.SAVE_OFFLINE', { path }))
-      } catch (e) {
-        this.$error(this.$t('TRANSACTION.ERROR.SAVE_OFFLINE', { error: e.message }))
+
+        if (path) {
+          this.$success(this.$t('TRANSACTION.SUCCESS.SAVE_OFFLINE', { path }))
+        } else {
+          return
+        }
+      } catch (error) {
+        this.$error(this.$t('TRANSACTION.ERROR.SAVE_OFFLINE', { error: error.message }))
       }
     }
   }
@@ -181,7 +186,7 @@ export default {
 
 <style lang="postcss" scoped>
 .TransactionConfirm__send-button:hover > span {
-  @apply .bg-blue
+  @apply .bg-blue;
 }
 .TransactionConfirm__send-button,
 .TransactionConfirm__send-button > span {

From a227b8b887c69ae208c72c26690e30fc0f523c71 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 18:33:17 +0300
Subject: [PATCH 42/48] chore(deps): bump websocket-extensions from 0.1.3 to
 0.1.4 (#2039)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 694eb40a72..bc4ed60435 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14750,9 +14750,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 wgxpath@~1.0.0:
   version "1.0.0"

From f36d78990960dccce8678ef2629a7e5f06003383 Mon Sep 17 00:00:00 2001
From: Simon <sleepdefic1t@users.noreply.github.com>
Date: Wed, 10 Jun 2020 06:40:18 -0400
Subject: [PATCH 43/48] feat(ledger): add schnorr support (#2026)

---
 .../@arkecosystem/ledger-transport.js         |  2 +
 .../unit/services/ledger-service.spec.js      | 20 ++++++
 __tests__/unit/services/transaction.spec.js   | 10 +--
 __tests__/unit/store/modules/ledger.spec.js   | 62 +++++++++++++++++++
 package.json                                  |  2 +-
 src/renderer/services/ledger-service.js       | 35 ++++++++++-
 src/renderer/services/transaction.js          |  9 ++-
 src/renderer/store/modules/ledger.js          | 50 ++++++++++++++-
 yarn.lock                                     | 15 +++--
 9 files changed, 188 insertions(+), 17 deletions(-)

diff --git a/__tests__/unit/__mocks__/@arkecosystem/ledger-transport.js b/__tests__/unit/__mocks__/@arkecosystem/ledger-transport.js
index 10f59bc606..d322671c36 100644
--- a/__tests__/unit/__mocks__/@arkecosystem/ledger-transport.js
+++ b/__tests__/unit/__mocks__/@arkecosystem/ledger-transport.js
@@ -2,7 +2,9 @@ export class ARKTransport {
   constructor () {
     this.getPublicKey = jest.fn(() => '0278a28d0eac9916ef46613d9dbac706acc218e64864d4b4c1fcb0c759b6205b2b')
     this.signMessage = jest.fn(() => 'SIGNATURE')
+    this.signMessageWithSchnorr = jest.fn(() => 'SIGNATURE')
     this.signTransaction = jest.fn(() => 'SIGNATURE')
+    this.signTransactionWithSchnorr = jest.fn(() => 'SIGNATURE')
     this.getVersion = jest.fn(() => '1.0.0')
   }
 }
diff --git a/__tests__/unit/services/ledger-service.spec.js b/__tests__/unit/services/ledger-service.spec.js
index a2c8dd09b7..183ba8247f 100644
--- a/__tests__/unit/services/ledger-service.spec.js
+++ b/__tests__/unit/services/ledger-service.spec.js
@@ -63,6 +63,15 @@ describe('LedgerService', () => {
     })
   })
 
+  describe('signTransactionWithSchnorr', () => {
+    it('should run', async () => {
+      const response = await ledgerService.signTransactionWithSchnorr('44\'/1\'/0\'/0/0', '1234')
+
+      expect(response).toBeTruthy()
+      expect(ledgerService.ledger.signTransactionWithSchnorr).toHaveBeenCalledTimes(1)
+    })
+  })
+
   describe('signMessage', () => {
     it('should run', async () => {
       ledgerService.ledger.signMessage.mockClear()
@@ -74,6 +83,17 @@ describe('LedgerService', () => {
     })
   })
 
+  describe('signMessageWithSchnorr', () => {
+    it('should run', async () => {
+      ledgerService.ledger.signMessageWithSchnorr.mockClear()
+
+      const response = await ledgerService.signMessageWithSchnorr('44\'/1\'/0\'/0/0', Buffer.from('1234'))
+
+      expect(response).toBeTruthy()
+      expect(ledgerService.ledger.signMessageWithSchnorr).toHaveBeenCalledTimes(1)
+    })
+  })
+
   it('should queue an action', async () => {
     const response = await ledgerService.__performAction(async () => {
       return true
diff --git a/__tests__/unit/services/transaction.spec.js b/__tests__/unit/services/transaction.spec.js
index 7e19a545f7..0afa9a8ef4 100644
--- a/__tests__/unit/services/transaction.spec.js
+++ b/__tests__/unit/services/transaction.spec.js
@@ -842,7 +842,7 @@ describe('Services > Transaction', () => {
     })
   })
 
-  describe('ledgerSign', () => {
+  describe('ledgerSignWithSchnorr', () => {
     const vmMock = {
       $store: {
         // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -875,7 +875,7 @@ describe('Services > Transaction', () => {
       spyTranslate.mockRestore()
     })
 
-    it('should sign the transaction', async () => {
+    it('should schnorr sign the transaction', async () => {
       transactionObject.sign(senderPassphrase)
       const transactionJson = transactionObject.getStruct()
 
@@ -884,7 +884,7 @@ describe('Services > Transaction', () => {
       const signature = transactionObject.data.signature
 
       spyDispatch.mockImplementation((key) => {
-        if (key === 'ledger/signTransaction') {
+        if (key === 'ledger/signTransactionWithSchnorr') {
           return signature
         }
       })
@@ -910,7 +910,7 @@ describe('Services > Transaction', () => {
       const signature = transactionObject.data.signature
 
       spyDispatch.mockImplementation((key) => {
-        if (key === 'ledger/signTransaction') {
+        if (key === 'ledger/signTransactionWithSchnorr') {
           return signature
         }
       })
@@ -943,7 +943,7 @@ describe('Services > Transaction', () => {
       const signature = transactionObject.data.signature
 
       spyDispatch.mockImplementation((key) => {
-        if (key === 'ledger/signTransaction') {
+        if (key === 'ledger/signTransactionWithSchnorr') {
           return signature
         }
       })
diff --git a/__tests__/unit/store/modules/ledger.spec.js b/__tests__/unit/store/modules/ledger.spec.js
index b8df7dee17..bbfd9b5288 100644
--- a/__tests__/unit/store/modules/ledger.spec.js
+++ b/__tests__/unit/store/modules/ledger.spec.js
@@ -249,6 +249,37 @@ describe('ledger store module', () => {
     })
   })
 
+  describe('signTransactionWithSchnorr', () => {
+    it('should call ledger service', async () => {
+      await store.dispatch('ledger/connect')
+      await store.dispatch('ledger/setSlip44', 1234)
+
+      const spy = jest.spyOn(ledgerService, 'signTransactionWithSchnorr').mockReturnValue('SIGNATURE')
+
+      const response = await store.dispatch('ledger/signTransactionWithSchnorr', {
+        accountIndex: 1,
+        transactionBytes: 'abc'
+      })
+
+      expect(response).toBe('SIGNATURE')
+      expect(spy).toHaveBeenNthCalledWith(1, '44\'/1234\'/1\'/0/0', 'abc')
+
+      spy.mockRestore()
+    })
+
+    it('should fail with invalid accountIndex', async () => {
+      await expect(store.dispatch('ledger/signTransactionWithSchnorr')).rejects.toThrow(/.*accountIndex must be a Number$/)
+    })
+
+    it('should fail when not connected', async () => {
+      await disconnectLedger()
+      await expect(store.dispatch('ledger/signTransactionWithSchnorr', {
+        accountIndex: 1,
+        transactionBytes: 'abc'
+      })).rejects.toThrow(/.*Ledger not connected$/)
+    })
+  })
+
   describe('signMessage', () => {
     it('should call ledger service', async () => {
       await store.dispatch('ledger/connect')
@@ -280,6 +311,37 @@ describe('ledger store module', () => {
     })
   })
 
+  describe('signMessageWithSchnorr', () => {
+    it('should call ledger service', async () => {
+      await store.dispatch('ledger/connect')
+      await store.dispatch('ledger/setSlip44', 1234)
+
+      const spy = jest.spyOn(ledgerService, 'signMessageWithSchnorr').mockReturnValue('SIGNATURE')
+
+      const response = await store.dispatch('ledger/signMessageWithSchnorr', {
+        accountIndex: 1,
+        messageBytes: 'abc'
+      })
+
+      expect(response).toBe('SIGNATURE')
+      expect(spy).toHaveBeenNthCalledWith(1, '44\'/1234\'/1\'/0/0', 'abc')
+
+      spy.mockRestore()
+    })
+
+    it('should fail with invalid accountIndex', async () => {
+      await expect(store.dispatch('ledger/signMessageWithSchnorr')).rejects.toThrow(/.*accountIndex must be a Number$/)
+    })
+
+    it('should fail when not connected', async () => {
+      await disconnectLedger()
+      await expect(store.dispatch('ledger/signMessageWithSchnorr', {
+        accountIndex: 1,
+        messageBytes: 'abc'
+      })).rejects.toThrow(/.*Ledger not connected$/)
+    })
+  })
+
   describe('reloadWallets', () => {
     let spyGetWallet
     let spyCryptoGetAddress
diff --git a/package.json b/package.json
index aecc3fa4ae..63cb9ac5c0 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "@arkecosystem/client": "^1.0.5",
     "@arkecosystem/core-magistrate-crypto": "^2.6.27",
     "@arkecosystem/crypto": "^2.6.27",
-    "@arkecosystem/ledger-transport": "^1.0.5",
+    "@arkecosystem/ledger-transport": "^1.1.2",
     "@arkecosystem/peers": "^0.3.0",
     "@arkecosystem/platform-sdk": "^0.0.2",
     "@babel/runtime": "^7.4.2",
diff --git a/src/renderer/services/ledger-service.js b/src/renderer/services/ledger-service.js
index 4b47ff2a64..1124c5fcec 100644
--- a/src/renderer/services/ledger-service.js
+++ b/src/renderer/services/ledger-service.js
@@ -107,7 +107,7 @@ class LedgerService {
   }
 
   /**
-   * Sign transaction for ledger wallet.
+   * Sign transaction for ledger wallet using ecdsa signatures.
    * @param  {string} path Path for wallet location.
    * @param  {Buffer} transactionBytes bytes of transaction.
    * @return {Promise<string>}
@@ -119,7 +119,24 @@ class LedgerService {
   }
 
   /**
-   * Sign message for wallet.
+   * Sign transaction for ledger wallet using schnorr signatures.
+   * @param  {string} path Path for wallet location.
+   * @param  {Buffer} transactionBytes bytes of transaction.
+   * @return {Promise<string>}
+   */
+  async signTransactionWithSchnorr (path, transactionBytes) {
+    return this.__performAction(async () => {
+      try {
+        return await this.ledger.signTransactionWithSchnorr(path, transactionBytes)
+      } catch {
+        console.warn('Schnorr Signatures Unsupported; Trying Ecdsa..')
+        return this.ledger.signTransaction(path, transactionBytes)
+      }
+    })
+  }
+
+  /**
+   * Sign message for ledger wallet using ecdsa signatures.
    * @param  {string} path Path for wallet location.
    * @param  {Buffer} messageBytes bytes to sign.
    * @return {Promise<string>}
@@ -131,7 +148,19 @@ class LedgerService {
   }
 
   /**
-   * Get version from ledger app.
+   * Sign message for ledger wallet using schnorr signatures.
+   * @param  {string} path Path for wallet location.
+   * @param  {Buffer} messageBytes bytes to sign.
+   * @return {Promise<string>}
+   */
+  async signMessageWithSchnorr (path, messageBytes) {
+    return this.__performAction(async () => {
+      return this.ledger.signMessageWithSchnorr(path, messageBytes)
+    })
+  }
+
+  /**
+   * Get version of ledger wallet.
    * @return {Promise<string>}
    */
   async getVersion () {
diff --git a/src/renderer/services/transaction.js b/src/renderer/services/transaction.js
index d0ec5a5dcd..ceaeb069c8 100644
--- a/src/renderer/services/transaction.js
+++ b/src/renderer/services/transaction.js
@@ -96,8 +96,13 @@ export default class TransactionService {
       transaction.recipientId = wallet.address
     }
 
-    transaction.signature = await vm.$store.dispatch('ledger/signTransaction', {
-      transactionBytes: this.getBytes(transaction),
+    const operation = transaction.version >= 2
+      ? 'ledger/signTransactionWithSchnorr'
+      : 'ledger/signTransaction'
+
+    const transactionBytes = this.getBytes(transaction)
+    transaction.signature = await vm.$store.dispatch(operation, {
+      transactionBytes: transactionBytes,
       accountIndex: wallet.ledgerIndex
     })
 
diff --git a/src/renderer/store/modules/ledger.js b/src/renderer/store/modules/ledger.js
index 10821658e9..d8a677cd74 100644
--- a/src/renderer/store/modules/ledger.js
+++ b/src/renderer/store/modules/ledger.js
@@ -532,7 +532,7 @@ export default {
     },
 
     /**
-     * Sign transaction for ledger wallet.
+     * Sign transaction for ledger wallet using ecdsa signatures.
      * @param  {Object} obj
      * @param  {Buffer} obj.transactionBytes Bytes of transaction.
      * @param  {Number} obj.accountIndex Index of wallet to sign transaction for.
@@ -552,7 +552,27 @@ export default {
     },
 
     /**
-     * Sign message for ledger wallet.
+     * Sign transaction for ledger wallet using schnorr signatures.
+     * @param  {Object} obj
+     * @param  {String} obj.transactionBytes Bytes of transaction.
+     * @param  {Number} obj.accountIndex Index of wallet to sign transaction for.
+     * @return {(String|Boolean)}
+     */
+    async signTransactionWithSchnorr ({ dispatch }, { transactionBytes, accountIndex } = {}) {
+      try {
+        return await dispatch('action', {
+          action: 'signTransactionWithSchnorr',
+          accountIndex,
+          data: transactionBytes
+        })
+      } catch (error) {
+        logger.error(error)
+        throw new Error(`Could not sign transaction: ${error}`)
+      }
+    },
+
+    /**
+     * Sign message for ledger wallet using ecdsa signatures.
      * @param  {Object} obj
      * @param  {Buffer} obj.messageBytes Bytes to sign.
      * @param  {Number} obj.accountIndex Index of wallet to sign transaction for.
@@ -571,6 +591,26 @@ export default {
       }
     },
 
+    /**
+     * Sign message for ledger wallet using schnorr signatures.
+     * @param  {Object} obj
+     * @param  {String} obj.messageBytes Bytes to sign.
+     * @param  {Number} obj.accountIndex Index of wallet to sign transaction for.
+     * @return {(String|Boolean)}
+     */
+    async signMessageWithSchnorr ({ dispatch }, { messageBytes, accountIndex } = {}) {
+      try {
+        return await dispatch('action', {
+          action: 'signMessageWithSchnorr',
+          accountIndex,
+          data: messageBytes
+        })
+      } catch (error) {
+        logger.error(error)
+        throw new Error(`Could not sign message: ${error}`)
+      }
+    },
+
     /**
      * Action method to act as a wrapper for ledger methods
      * @param {Object} obj
@@ -614,9 +654,15 @@ export default {
         async signTransaction () {
           return ledgerService.signTransaction(path, data)
         },
+        async signTransactionWithSchnorr () {
+          return ledgerService.signTransactionWithSchnorr(path, data)
+        },
         async signMessage () {
           return ledgerService.signMessage(path, data)
         },
+        async signMessageWithSchnorr () {
+          return ledgerService.signMessageWithSchnorr(path, data)
+        },
         async getVersion () {
           return ledgerService.getVersion()
         }
diff --git a/yarn.lock b/yarn.lock
index bc4ed60435..583c98bb27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -75,10 +75,12 @@
     tiny-glob "^0.2.6"
     wif "^2.0.6"
 
-"@arkecosystem/ledger-transport@^1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@arkecosystem/ledger-transport/-/ledger-transport-1.0.5.tgz#7b3a1186709d7bfeb680fe428223a7a402bb22cd"
-  integrity sha512-xag/HeOrkiY3nGnvF6SpP5gEBjXbx6lKjjR+RsQU4bqIfJKhxQmaOw+mGKxwFp/lJ5uEyObn1SNbRnMu0HLvsg==
+"@arkecosystem/ledger-transport@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@arkecosystem/ledger-transport/-/ledger-transport-1.1.2.tgz#bac586bbbe6efaa103f1fc9a37deed364f15832d"
+  integrity sha512-c2jKvdxKEucCCOq3E7KXv4gYj7r12YOzYL7+gIpyT1BlwRfUZcZTFIHYSR1t/LE01ISencJkt1eXC/K3wfkQ2A==
+  dependencies:
+    "@ledgerhq/errors" "^5.13.1"
 
 "@arkecosystem/peers@^0.3.0":
   version "0.3.0"
@@ -1207,6 +1209,11 @@
     "@ledgerhq/logs" "^5.6.0"
     rxjs "^6.5.4"
 
+"@ledgerhq/errors@^5.13.1":
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.15.0.tgz#e5d5b5ad48fc07f6308b78b065242e158bc044a2"
+  integrity sha512-ZlLhR7qaChPgEbvcqOptRepWGm8VhhwOM6kC1gx3WErutbtaOjUX8lLA4ButWFU2f+xTl2rS/5c86wC7qGqGXQ==
+
 "@ledgerhq/errors@^5.7.0":
   version "5.7.0"
   resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.7.0.tgz#2bff5ae2e178e69c64002d47c0f0f0c9c502a9b0"

From 463d4f5c64efcc02eb016036ff58168c88e7af77 Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Wed, 10 Jun 2020 14:02:18 +0300
Subject: [PATCH 44/48] fix: show indicator that no network connection is
 established (#2084)

---
 src/renderer/SplashScreen.vue      | 9 ++++++++-
 src/renderer/i18n/locales/en-US.js | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/renderer/SplashScreen.vue b/src/renderer/SplashScreen.vue
index 99babce6c1..a5f63d887d 100644
--- a/src/renderer/SplashScreen.vue
+++ b/src/renderer/SplashScreen.vue
@@ -16,7 +16,7 @@
       </div>
 
       <div class="text-sm mb-2">
-        {{ $t('COMMON.INITIALIZING') }}
+        {{ loadingMessage }}
       </div>
     </div>
 
@@ -74,6 +74,13 @@ export default {
   computed: {
     version () {
       return packageJson.version
+    },
+    loadingMessage () {
+      if (window.navigator.onLine) {
+        return this.$t('COMMON.INITIALIZING')
+      }
+
+      return this.$t('COMMON.NO_INTERNET_CONNECTION')
     }
   }
 }
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index 958d3b8ad3..116976855d 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -27,6 +27,7 @@ export default {
     HIDE_WALLET_BUTTON_TEXT: 'Hide text from wallet buttons',
     IS_MARKET_CHART_ENABLED: 'Price chart on the dashboard',
     INITIALIZING: 'Initializing...',
+    NO_INTERNET_CONNECTION: 'Initialization is taking longer than expected. Please check your internet connectivity.',
     LANGUAGE: 'Application Language',
     LEDGER: 'Ledger',
     LEDGER_WALLET: 'This is a Ledger wallet',

From 9aacc5a316840df28d18e9e2031300588b88c1c6 Mon Sep 17 00:00:00 2001
From: Brian Faust <faustbrian@users.noreply.github.com>
Date: Wed, 10 Jun 2020 14:02:24 +0300
Subject: [PATCH 45/48] fix: add missing LOAD_FROM_URI error translation
 (#2083)

---
 src/renderer/i18n/locales/en-US.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index 116976855d..ef84ca427b 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -1030,6 +1030,7 @@ export default {
       BRIDGECHAIN_UPDATE: 'Bridgechain update was unsuccessful',
       SAVE_OFFLINE: 'Failed to save transaction file: {error}',
       LOAD_FROM_FILE: 'Failed to load transaction file',
+      LOAD_FROM_URI: 'Failed to load transaction URI',
       EXPIRED: 'Transaction expired before it was processed: {transactionId}',
       FEE_TOO_LOW: 'Transaction could not be sent because the fee ({fee}) is too low',
       NOT_ENOUGH_BALANCE: 'The total amount of the recipients + fee is greater than the balance ({balance}) of the wallet',

From 805f5174a30be2184ddfdadfeacd5c035eac0146 Mon Sep 17 00:00:00 2001
From: Breno Polanski <breno.polanski@gmail.com>
Date: Wed, 10 Jun 2020 11:17:04 -0300
Subject: [PATCH 46/48] feat: detect offline and online changes (#2088)

---
 src/renderer/App.vue               | 16 +++++++++++++++-
 src/renderer/i18n/locales/en-US.js |  4 ++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index e29731e04a..533eeb1523 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -118,7 +118,8 @@ export default {
     isReady: false,
     isUriTransactionOpen: false,
     uriTransactionSchema: {},
-    aliveRouteComponents: []
+    aliveRouteComponents: [],
+    onLineStatus: window.navigator.onLine || false
   }),
 
   keepableRoutes: Object.freeze({
@@ -254,6 +255,13 @@ export default {
     },
     language (value) {
       this.applyPluginLanguage(value)
+    },
+    onLineStatus (connected) {
+      if (connected) {
+        this.$success(this.$t('COMMON.INTERNET_STATUS.WITH_INTERNET_CONNECTION'))
+      } else {
+        this.$error(this.$t('COMMON.INTERNET_STATUS.NO_INTERNET_CONNECTION'))
+      }
     }
   },
 
@@ -284,9 +292,15 @@ export default {
 
   mounted () {
     this.__watchProcessURL()
+    window.addEventListener('online', this.updateOnlineStatus)
+    window.addEventListener('offline', this.updateOnlineStatus)
   },
 
   methods: {
+    updateOnlineStatus (event) {
+      this.onLineStatus = event.type === 'online'
+    },
+
     async loadEssential () {
       // We need to await plugins in order for all plugins to load properly
       try {
diff --git a/src/renderer/i18n/locales/en-US.js b/src/renderer/i18n/locales/en-US.js
index ef84ca427b..03940ed28b 100644
--- a/src/renderer/i18n/locales/en-US.js
+++ b/src/renderer/i18n/locales/en-US.js
@@ -28,6 +28,10 @@ export default {
     IS_MARKET_CHART_ENABLED: 'Price chart on the dashboard',
     INITIALIZING: 'Initializing...',
     NO_INTERNET_CONNECTION: 'Initialization is taking longer than expected. Please check your internet connectivity.',
+    INTERNET_STATUS: {
+      NO_INTERNET_CONNECTION: 'No internet connection. Please check your internet connectivity!',
+      WITH_INTERNET_CONNECTION: 'Internet connectivity established!'
+    },
     LANGUAGE: 'Application Language',
     LEDGER: 'Ledger',
     LEDGER_WALLET: 'This is a Ledger wallet',

From 003d0316e56e527bef4370b2a06bf52992c856e1 Mon Sep 17 00:00:00 2001
From: Edgar Goetzendorff <hello@dated.fun>
Date: Thu, 18 Jun 2020 03:34:37 +0200
Subject: [PATCH 47/48] fix: full width on recipients list (#2166)

---
 .../TransactionConfirm/TransactionConfirmMultiPayment.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
index 442465f543..2d68e821a6 100644
--- a/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
+++ b/src/renderer/components/Transaction/TransactionConfirm/TransactionConfirmMultiPayment.vue
@@ -29,7 +29,7 @@
     <ListDividedItem
       class="TransactionConfirmMultiPayment__recipients"
       :label="`${$t('TRANSACTION.RECIPIENTS')} - ${payments.length}`"
-      item-value-class="items-center"
+      item-value-class="items-center w-full"
     >
       <TransactionRecipientList
         :title="null"

From 7886967a83de177c194148b775ee09de13584dee Mon Sep 17 00:00:00 2001
From: Alex Barnsley <8069294+alexbarnsley@users.noreply.github.com>
Date: Mon, 22 Jun 2020 12:35:59 +0100
Subject: [PATCH 48/48] chore: bump version (#2213)

---
 .github/workflows/draft-artifacts.yml | 24 ++++++++++++------------
 .github/workflows/publish-release.yml | 22 +++++++++++-----------
 .github/workflows/test.yml            | 24 ++++++++++++------------
 package.json                          |  2 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/draft-artifacts.yml b/.github/workflows/draft-artifacts.yml
index a8d0acdb58..233e100c57 100644
--- a/.github/workflows/draft-artifacts.yml
+++ b/.github/workflows/draft-artifacts.yml
@@ -46,20 +46,20 @@ jobs:
       # - name: Upload .AppImage
       #   uses: actions/upload-artifact@master
       #   with:
-      #     name: ark-desktop-wallet-linux-2.9.1.AppImage
-      #     path: build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage
+      #     name: ark-desktop-wallet-linux-2.9.2.AppImage
+      #     path: build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage
 
       # - name: Upload .tar.gz
       #   uses: actions/upload-artifact@master
       #   with:
-      #     name: ark-desktop-wallet-linux-2.9.1.tar.gz
-      #     path: build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz
+      #     name: ark-desktop-wallet-linux-2.9.2.tar.gz
+      #     path: build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz
 
       - name: Upload .deb
         uses: actions/upload-artifact@master
         with:
-          name: ark-desktop-wallet-linux-2.9.1-${{ github.sha }}.deb
-          path: build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb
+          name: ark-desktop-wallet-linux-2.9.2-${{ github.sha }}.deb
+          path: build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb
 
   build-macOS:
     runs-on: macos-latest
@@ -102,14 +102,14 @@ jobs:
       # - name: Upload .zip
       #   uses: actions/upload-artifact@master
       #   with:
-      #     name: ark-desktop-wallet-mac-2.9.1.zip
-      #     path: build/target/ark-desktop-wallet-mac-2.9.1.zip
+      #     name: ark-desktop-wallet-mac-2.9.2.zip
+      #     path: build/target/ark-desktop-wallet-mac-2.9.2.zip
 
       - name: Upload .dmg
         uses: actions/upload-artifact@v1
         with:
-          name: ark-desktop-wallet-mac-2.9.1-${{ github.sha }}.dmg
-          path: build/target/ark-desktop-wallet-mac-2.9.1.dmg
+          name: ark-desktop-wallet-mac-2.9.2-${{ github.sha }}.dmg
+          path: build/target/ark-desktop-wallet-mac-2.9.2.dmg
 
   build-windows:
     runs-on: windows-latest
@@ -137,5 +137,5 @@ jobs:
       - name: Upload .exe
         uses: actions/upload-artifact@v1
         with:
-          name: ark-desktop-wallet-win-2.9.1-${{ github.sha }}.exe
-          path: build/target/ark-desktop-wallet-win-2.9.1.exe
+          name: ark-desktop-wallet-win-2.9.2-${{ github.sha }}.exe
+          path: build/target/ark-desktop-wallet-win-2.9.2.exe
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 1e5a934c03..606541e5e1 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -82,28 +82,28 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Calculate Checksums for AppImage
-        run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage
+        run: shasum -a 256 build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage
 
       - name: Calculate Checksums for TAR
-        run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz
+        run: shasum -a 256 build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz
 
       - name: Calculate Checksums for DEB
-        run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb
+        run: shasum -a 256 build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb
 
       - name: VirusTotal Scan for AppImage
         run: |
           UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
-          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage' | jq -r .permalink
+          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage' | jq -r .permalink
 
       - name: VirusTotal Scan for TAR
         run: |
           UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
-          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz' | jq -r .permalink
+          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz' | jq -r .permalink
 
       - name: VirusTotal Scan for DEB
         run: |
           UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
-          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb' | jq -r .permalink
+          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb' | jq -r .permalink
 
   publish-macos:
     needs: ["create-release"]
@@ -148,20 +148,20 @@ jobs:
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
 
       - name: Calculate Checksums for DMG
-        run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.1.dmg
+        run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.2.dmg
 
       - name: Calculate Checksums for ZIP
-        run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.1.zip
+        run: shasum -a 256 build/target/ark-desktop-wallet-mac-2.9.2.zip
 
       - name: VirusTotal Scan for DMG
         run: |
           UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
-          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.1.dmg' | jq -r .permalink
+          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.2.dmg' | jq -r .permalink
 
       - name: VirusTotal Scan for ZIP
         run: |
           UPLOAD_URL=$(curl -s --location --url 'https://www.virustotal.com/vtapi/v2/file/scan/upload_url?apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' | jq -r .upload_url)
-          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.1.zip' | jq -r .permalink
+          curl -s --url "$UPLOAD_URL" --form 'apikey=${{ secrets.VIRUSTOTAL_TOKEN }}' --form 'file=@build/target/ark-desktop-wallet-mac-2.9.2.zip' | jq -r .permalink
 
   publish-windows:
     needs: ["create-release"]
@@ -199,5 +199,5 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Calculate Checksums for EXE
-        run: Get-FileHash build/target/ark-desktop-wallet-win-2.9.1.exe -Algorithm SHA256 | Format-List
+        run: Get-FileHash build/target/ark-desktop-wallet-win-2.9.2.exe -Algorithm SHA256 | Format-List
         shell: powershell
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c92163b090..5be30e9c28 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -90,20 +90,20 @@ jobs:
       # - name: Upload .AppImage
       #   uses: actions/upload-artifact@master
       #   with:
-      #     name: ark-desktop-wallet-linux-2.9.1.AppImage
-      #     path: build/target/ark-desktop-wallet-linux-x86_64-2.9.1.AppImage
+      #     name: ark-desktop-wallet-linux-2.9.2.AppImage
+      #     path: build/target/ark-desktop-wallet-linux-x86_64-2.9.2.AppImage
 
       # - name: Upload .tar.gz
       #   uses: actions/upload-artifact@master
       #   with:
-      #     name: ark-desktop-wallet-linux-2.9.1.tar.gz
-      #     path: build/target/ark-desktop-wallet-linux-x64-2.9.1.tar.gz
+      #     name: ark-desktop-wallet-linux-2.9.2.tar.gz
+      #     path: build/target/ark-desktop-wallet-linux-x64-2.9.2.tar.gz
 
       - name: Upload .deb
         uses: actions/upload-artifact@master
         with:
-          name: ark-desktop-wallet-linux-2.9.1-${{ github.sha }}.deb
-          path: build/target/ark-desktop-wallet-linux-amd64-2.9.1.deb
+          name: ark-desktop-wallet-linux-2.9.2-${{ github.sha }}.deb
+          path: build/target/ark-desktop-wallet-linux-amd64-2.9.2.deb
 
   build-macOS:
     runs-on: macos-latest
@@ -138,14 +138,14 @@ jobs:
       # - name: Upload .zip
       #   uses: actions/upload-artifact@master
       #   with:
-      #     name: ark-desktop-wallet-mac-2.9.1.zip
-      #     path: build/target/ark-desktop-wallet-mac-2.9.1.zip
+      #     name: ark-desktop-wallet-mac-2.9.2.zip
+      #     path: build/target/ark-desktop-wallet-mac-2.9.2.zip
 
       - name: Upload .dmg
         uses: actions/upload-artifact@v1
         with:
-          name: ark-desktop-wallet-mac-2.9.1-${{ github.sha }}.dmg
-          path: build/target/ark-desktop-wallet-mac-2.9.1.dmg
+          name: ark-desktop-wallet-mac-2.9.2-${{ github.sha }}.dmg
+          path: build/target/ark-desktop-wallet-mac-2.9.2.dmg
 
   build-windows:
     runs-on: windows-latest
@@ -173,5 +173,5 @@ jobs:
       - name: Upload .exe
         uses: actions/upload-artifact@v1
         with:
-          name: ark-desktop-wallet-win-2.9.1-${{ github.sha }}.exe
-          path: build/target/ark-desktop-wallet-win-2.9.1.exe
+          name: ark-desktop-wallet-win-2.9.2-${{ github.sha }}.exe
+          path: build/target/ark-desktop-wallet-win-2.9.2.exe
diff --git a/package.json b/package.json
index 63cb9ac5c0..1d19fdda89 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "ark-desktop-wallet",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ArkEcosystem/desktop-wallet.git"