diff --git a/src/App.vue b/src/App.vue
index f70a49827..e2ae2e213 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@
 -->
 <template>
   <div id="app">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 
diff --git a/src/components/Dashboard/DashboardChart.vue b/src/components/Dashboard/DashboardChart.vue
index 636f5a011..2d1db6a77 100644
--- a/src/components/Dashboard/DashboardChart.vue
+++ b/src/components/Dashboard/DashboardChart.vue
@@ -21,7 +21,9 @@
             :class="[portfolioChart.filter !== value ? 'chart_time-filter' : 'chart_time-filter selected']"
             @click="selectLabel(value)"
           >
-            <p class="chart_time-filter_value">{{ value }}</p>
+            <p class="chart_time-filter_value">
+              {{ value }}
+            </p>
           </div>
         </el-col>
       </el-row>
diff --git a/src/components/Dashboard/DashboardDonutChart.vue b/src/components/Dashboard/DashboardDonutChart.vue
index 19cc4c907..b5370df3b 100644
--- a/src/components/Dashboard/DashboardDonutChart.vue
+++ b/src/components/Dashboard/DashboardDonutChart.vue
@@ -7,7 +7,9 @@
     <el-row>
       <el-col :span="16">
         <div class="crypto_header">
-          <p class="crypto_header-title">Portfolio structure</p>
+          <p class="crypto_header-title">
+            Portfolio structure
+          </p>
         </div>
         <div class="list_crypto">
           <div class="list_crypto-content">
@@ -32,7 +34,7 @@
         :span="8"
         class="donut-chart"
       >
-        <donut-chart :data="filterPortfolio"/>
+        <donut-chart :data="filterPortfolio" />
       </el-col>
     </el-row>
   </el-card>
diff --git a/src/components/Dashboard/DashboardPage.vue b/src/components/Dashboard/DashboardPage.vue
index ea084096e..51b8a1187 100644
--- a/src/components/Dashboard/DashboardPage.vue
+++ b/src/components/Dashboard/DashboardPage.vue
@@ -4,8 +4,8 @@
 -->
 <template>
   <el-container
-    v-loading.fullscreen="isDashboardLoading"
     v-if="isDashboardLoading"
+    v-loading.fullscreen="isDashboardLoading"
   />
   <el-container v-else-if="hasNonEmptyWallets">
     <el-main class="column-fullheight">
@@ -17,7 +17,7 @@
           />
         </el-col>
         <el-col :span="8">
-          <dashboard-donut-chart :portfolio="portfolioPercent"/>
+          <dashboard-donut-chart :portfolio="portfolioPercent" />
         </el-col>
       </el-row>
       <el-row>
@@ -31,10 +31,10 @@
                 />
               </el-col>
               <el-col :span="1">
-                <div class="vertical_devider"/>
+                <div class="vertical_devider" />
               </el-col>
               <el-col :span="14">
-                <dashboard-chart :dashboard-chart-height="dashboardChartHeight"/>
+                <dashboard-chart :dashboard-chart-height="dashboardChartHeight" />
               </el-col>
             </el-card>
           </el-row>
diff --git a/src/components/Dashboard/DashboardPortfolio.vue b/src/components/Dashboard/DashboardPortfolio.vue
index d1f4e8702..56023377f 100644
--- a/src/components/Dashboard/DashboardPortfolio.vue
+++ b/src/components/Dashboard/DashboardPortfolio.vue
@@ -13,7 +13,9 @@
         class="portfolio_card-padding"
       >
         <div class="portfolio_header">
-          <p class="portfolio_header-title">My Portfolio</p>
+          <p class="portfolio_header-title">
+            My Portfolio
+          </p>
         </div>
         <div class="portfolio_current-price">
           <el-tooltip
@@ -23,7 +25,9 @@
             <p
               class="portfolio_current-price_value"
               justify="center"
-            >{{ price.value | formatNumberLong }} {{ currencySymbol }}</p>
+            >
+              {{ price.value | formatNumberLong }} {{ currencySymbol }}
+            </p>
           </el-tooltip>
         </div>
         <div class="portfolio_diff-price">
@@ -38,11 +42,13 @@
         </div>
       </el-col>
       <el-col :span="1">
-        <div class="vertical_devider"/>
+        <div class="vertical_devider" />
       </el-col>
       <el-col :span="15">
         <div class="chart_header">
-          <div class="chart_header-name">Portfolio history</div>
+          <div class="chart_header-name">
+            Portfolio history
+          </div>
           <div class="chart_header-filter">
             <div
               v-for="(value, index) in daysLabels"
@@ -50,11 +56,13 @@
               :class="[portfolioFilter !== value ? 'chart_time-filter' : 'chart_time-filter selected']"
               @click="selectLabel(value)"
             >
-              <p class="chart_time-filter_value">{{ value }}</p>
+              <p class="chart_time-filter_value">
+                {{ value }}
+              </p>
             </div>
           </div>
         </div>
-        <div class="chart_header-divider"/>
+        <div class="chart_header-divider" />
         <line-chart-portfolio
           v-loading="portfolioHistoryIsLoading"
           :data="chartData"
diff --git a/src/components/Dashboard/DashboardTable.vue b/src/components/Dashboard/DashboardTable.vue
index a94e19c25..763b9c96d 100644
--- a/src/components/Dashboard/DashboardTable.vue
+++ b/src/components/Dashboard/DashboardTable.vue
@@ -59,9 +59,15 @@
         justify="center"
         class="table_header"
       >
-        <div class="table_header-title currency">Currency</div>
-        <div class="table_header-title text-left balance">Balance</div>
-        <div class="table_header-title text-right changes">Changes</div>
+        <div class="table_header-title currency">
+          Currency
+        </div>
+        <div class="table_header-title text-left balance">
+          Balance
+        </div>
+        <div class="table_header-title text-right changes">
+          Changes
+        </div>
       </el-row>
       <el-row class="table_body">
         <div
@@ -70,8 +76,8 @@
         >
           <div
             v-for="(value, index) in sortedPortfolio"
-            :class="['table_body-item', portfolioChart.crypto === value.asset ? 'active' : '' ]"
             :key="index"
+            :class="['table_body-item', portfolioChart.crypto === value.asset ? 'active' : '' ]"
           >
             <div
               class="table_body-item_content"
diff --git a/src/components/Home.vue b/src/components/Home.vue
index 68eb3d4ac..21faa96b6 100644
--- a/src/components/Home.vue
+++ b/src/components/Home.vue
@@ -4,7 +4,7 @@
 -->
 <template>
   <el-container>
-    <Menu :quorum="accountQuorum"/>
+    <Menu :quorum="accountQuorum" />
     <el-main style="width: 100%; height: 100vh; padding: 0; padding-left: 160px;">
       <router-view />
     </el-main>
@@ -41,12 +41,6 @@ export default {
     this.getCustomAssets()
   },
 
-  updated () {
-    console.log(
-      this.accountQuorum
-    )
-  },
-
   mounted () {
     document.documentElement.style.setProperty('--show-loading', 'none')
   },
diff --git a/src/components/Home/Menu.vue b/src/components/Home/Menu.vue
index b12fce201..5ff54abc1 100644
--- a/src/components/Home/Menu.vue
+++ b/src/components/Home/Menu.vue
@@ -21,7 +21,9 @@
         <SvgIcon
           icon-name="Chart"
           icon-class="menu-icon"
-        ><ChartIcon/></SvgIcon>
+        >
+          <ChartIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -31,7 +33,9 @@
         <SvgIcon
           icon-name="Wallet"
           icon-class="menu-icon"
-        ><WalletIcon/></SvgIcon>
+        >
+          <WalletIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -47,13 +51,17 @@
           <SvgIcon
             icon-name="Exchange"
             icon-class="menu-icon"
-          ><ExchangeIcon/></SvgIcon>
+          >
+            <ExchangeIcon />
+          </SvgIcon>
         </el-badge>
         <SvgIcon
           v-else
           icon-name="Exchange"
           icon-class="menu-icon"
-        ><ExchangeIcon/></SvgIcon>
+        >
+          <ExchangeIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -63,7 +71,9 @@
         <SvgIcon
           icon-name="Report"
           icon-class="menu-icon"
-        ><ReportIcon/></SvgIcon>
+        >
+          <ReportIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -73,7 +83,9 @@
         <SvgIcon
           icon-name="Report"
           icon-class="menu-icon"
-        ><ReportIcon/></SvgIcon>
+        >
+          <ReportIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -92,13 +104,17 @@
           <SvgIcon
             icon-name="Transaction"
             icon-class="menu-icon"
-          ><TransactionsIcon/></SvgIcon>
+          >
+            <TransactionsIcon />
+          </SvgIcon>
         </el-badge>
         <SvgIcon
           v-else
           icon-name="Transaction"
           icon-class="menu-icon"
-        ><TransactionsIcon/></SvgIcon>
+        >
+          <TransactionsIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -108,7 +124,9 @@
         <SvgIcon
           icon-name="Settings"
           icon-class="menu-icon"
-        ><SettingsIcon/></SvgIcon>
+        >
+          <SettingsIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -122,7 +140,9 @@
         <SvgIcon
           icon-name="Logout"
           icon-class="menu-icon"
-        ><LogoutIcon/></SvgIcon>
+        >
+          <LogoutIcon />
+        </SvgIcon>
         <span
           slot="title"
           class="title-left"
@@ -178,7 +198,9 @@ export default {
       return this.$route.path
     },
     pendingTransactionsAmount () {
-      return this.pendingTransferTransactions.length + this.pendingSettingsTransactions.length
+      const transferTransactionsAmount = new Set(this.pendingTransferTransactions.map(({ id }) => id)).size
+      const settingsTransactionsAmount = new Set(this.pendingSettingsTransactions.map(({ id }) => id)).size
+      return transferTransactionsAmount + settingsTransactionsAmount
     }
   },
   watch: {
diff --git a/src/components/Login.vue b/src/components/Login.vue
index db2d923c0..b89ba26c2 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -67,7 +67,9 @@
             <div
               v-if="_isError($v.form.privateKey)"
               class="el-form-item__error"
-            >{{ _showError($v.form.privateKey) }}</div>
+            >
+              {{ _showError($v.form.privateKey) }}
+            </div>
           </el-form-item>
           <el-form-item
             label="Username"
@@ -85,7 +87,9 @@
             <div
               v-if="_isError($v.form.username)"
               class="el-form-item__error"
-            >{{ _showError($v.form.username) }}</div>
+            >
+              {{ _showError($v.form.username) }}
+            </div>
           </el-form-item>
           <el-form-item
             label="Node IP"
@@ -117,7 +121,9 @@
             <div
               v-if="_isError($v.form.nodeIp)"
               class="el-form-item__error"
-            >{{ _showError($v.form.nodeIp) }}</div>
+            >
+              {{ _showError($v.form.nodeIp) }}
+            </div>
           </el-form-item>
           <el-form-item class="auth-button-container">
             <el-row class="auth-button_actions">
diff --git a/src/components/Reports/ReportsPage.vue b/src/components/Reports/ReportsPage.vue
index d18eb9165..a04a08a65 100644
--- a/src/components/Reports/ReportsPage.vue
+++ b/src/components/Reports/ReportsPage.vue
@@ -132,7 +132,7 @@
             style="margin-top: 40px;"
             @click="downloadSeveral({ date }, 'pdf')"
           >
-            <fa-icon icon="download"/>
+            <fa-icon icon="download" />
             PDF
           </el-button>
         </el-col>
@@ -145,7 +145,7 @@
             style="margin-top: 40px;"
             @click="downloadSeveral({ date, assets: selectedWallets }, 'csv')"
           >
-            <fa-icon icon="download"/>
+            <fa-icon icon="download" />
             CSV
           </el-button>
         </el-col>
diff --git a/src/components/Settings/components/Leftside/CurrencyItem.vue b/src/components/Settings/components/Leftside/CurrencyItem.vue
index 884c3a37b..3c99ad05e 100644
--- a/src/components/Settings/components/Leftside/CurrencyItem.vue
+++ b/src/components/Settings/components/Leftside/CurrencyItem.vue
@@ -8,7 +8,9 @@
     title="Currency"
   >
     <el-row class="currencies_list">
-      <p class="list-title">Dashboard (Portfolio, Market, Balance and Changes)</p>
+      <p class="list-title">
+        Dashboard (Portfolio, Market, Balance and Changes)
+      </p>
       <el-col>
         <el-radio-group
           v-model="currentFiat"
@@ -20,12 +22,16 @@
             :label="value"
             class="currencies_list-select"
             border
-          >{{ value }}</el-radio>
+          >
+            {{ value }}
+          </el-radio>
         </el-radio-group>
       </el-col>
     </el-row>
     <el-row class="currencies_list">
-      <p class="list-title">Wallets (Market)</p>
+      <p class="list-title">
+        Wallets (Market)
+      </p>
       <el-col>
         <el-radio-group
           v-model="currentCrypto"
@@ -37,7 +43,9 @@
             :label="value"
             class="currencies_list-select"
             border
-          >{{ value }}</el-radio>
+          >
+            {{ value }}
+          </el-radio>
         </el-radio-group>
       </el-col>
     </el-row>
diff --git a/src/components/Settings/components/Rightside/PublicKeysCard.vue b/src/components/Settings/components/Rightside/PublicKeysCard.vue
index d135ac517..3221fd7da 100644
--- a/src/components/Settings/components/Rightside/PublicKeysCard.vue
+++ b/src/components/Settings/components/Rightside/PublicKeysCard.vue
@@ -49,7 +49,7 @@
                 class="settings-item_row-delete"
                 @click="removeKeyFormVisible = true; keyToRemove = pubKey"
               >
-                <fa-icon icon="trash-alt"/>
+                <fa-icon icon="trash-alt" />
               </el-button>
             </div>
           </template>
@@ -122,7 +122,8 @@
             type="danger"
             class="dialog-form_buttons action"
             @click="addPublicKey"
-          >Add
+          >
+            Add
           </el-button>
           <el-button
             class="dialog-form_buttons close"
@@ -151,7 +152,8 @@
             class="dialog-form_buttons action"
             type="danger"
             @click="removePublicKey"
-          >Remove
+          >
+            Remove
           </el-button>
           <el-button
             class="dialog-form_buttons close"
diff --git a/src/components/Settings/components/Rightside/SettingsCard.vue b/src/components/Settings/components/Rightside/SettingsCard.vue
index 9cc089349..53e3db513 100644
--- a/src/components/Settings/components/Rightside/SettingsCard.vue
+++ b/src/components/Settings/components/Rightside/SettingsCard.vue
@@ -9,9 +9,9 @@
       class="settings-card"
     >
       <div class="header_btn">
-        <slot name="header"/>
+        <slot name="header" />
       </div>
-      <slot name="content"/>
+      <slot name="content" />
     </el-card>
   </span>
 </template>
diff --git a/src/components/Settings/components/Rightside/WalletLimitsCard.vue b/src/components/Settings/components/Rightside/WalletLimitsCard.vue
index 46f7331b3..2a6a8c86f 100644
--- a/src/components/Settings/components/Rightside/WalletLimitsCard.vue
+++ b/src/components/Settings/components/Rightside/WalletLimitsCard.vue
@@ -49,7 +49,7 @@
                   class="settings-item_row-delete"
                   @click="removeAssetLimitVisible = true; limitToRemove = limit"
                 >
-                  <fa-icon icon="trash-alt"/>
+                  <fa-icon icon="trash-alt" />
                 </el-button>
               </span>
             </div>
@@ -115,8 +115,8 @@
               prop="amount"
             >
               <el-input
-                v-numeric
                 v-model="limitForm.amount"
+                v-numeric
                 type="number"
                 placeholder="0"
               />
@@ -184,8 +184,8 @@
             </el-form-item>
             <el-form-item label="Limit">
               <el-input
-                v-numeric
                 v-model="editLimitForm.amount"
+                v-numeric
                 type="number"
                 placeholder="0"
               />
@@ -233,7 +233,8 @@
             class="dialog-form_buttons action"
             type="danger"
             @click="onRemoveAssetLimit"
-          >Remove
+          >
+            Remove
           </el-button>
           <el-button
             class="dialog-form_buttons close"
diff --git a/src/components/Settings/components/Rightside/WhiteListCard.vue b/src/components/Settings/components/Rightside/WhiteListCard.vue
index 22afbd230..f2ba6a7d3 100644
--- a/src/components/Settings/components/Rightside/WhiteListCard.vue
+++ b/src/components/Settings/components/Rightside/WhiteListCard.vue
@@ -49,14 +49,16 @@
                     v-if="address[1] * 1000 > Date.now()"
                     class="pending"
                     type="info"
-                  >Pending</el-tag>
+                  >
+                    Pending
+                  </el-tag>
                 </el-tooltip>
                 <el-button
                   data-cy="removeAddress"
                   class="settings-item_row-delete"
                   @click="removeAddressFormVisible = true; addressToRemove = address[0]"
                 >
-                  <fa-icon icon="trash-alt"/>
+                  <fa-icon icon="trash-alt" />
                 </el-button>
               </div>
             </div>
@@ -109,7 +111,8 @@
             :loading="addingNewAddress"
             class="dialog-form_buttons action"
             @click="addWhiteAddress"
-          >Add
+          >
+            Add
           </el-button>
           <el-button
             class="dialog-form_buttons close"
@@ -137,7 +140,8 @@
             :loading="removingAddress"
             class="dialog-form_buttons action"
             @click="removeWhiteAddress"
-          >Remove
+          >
+            Remove
           </el-button>
           <el-button
             class="dialog-form_buttons close"
diff --git a/src/components/Settlements/SettlementsHistory.vue b/src/components/Settlements/SettlementsHistory.vue
index 86e889a2b..f57369752 100644
--- a/src/components/Settlements/SettlementsHistory.vue
+++ b/src/components/Settlements/SettlementsHistory.vue
@@ -13,7 +13,9 @@
       <template slot-scope="scope">
         <div class="transaction_details">
           <el-row>
-            <el-col :span="4">{{ formatDateLong(scope.row.from.date) }}</el-col>
+            <el-col :span="4">
+              {{ formatDateLong(scope.row.from.date) }}
+            </el-col>
             <el-col
               :span="5"
               class="transaction_details-amount"
@@ -26,8 +28,12 @@
             >
               <p>Fee: {{ scope.row.from.fee }} {{ assetName(scope.row.from.assetId) }}</p>
             </el-col>
-            <el-col :span="5">{{ scope.row.from.message }}</el-col>
-            <el-col :span="5">{{ scope.row.from.to }}</el-col>
+            <el-col :span="5">
+              {{ scope.row.from.message }}
+            </el-col>
+            <el-col :span="5">
+              {{ scope.row.from.to }}
+            </el-col>
           </el-row>
         </div>
       </template>
@@ -68,7 +74,7 @@
         {{ formatDate(scope.row.from.date) }}
       </template>
     </el-table-column>
-    <el-table-column width="200"/>
+    <el-table-column width="200" />
   </el-table>
 </template>
 
diff --git a/src/components/Settlements/SettlementsIncoming.vue b/src/components/Settlements/SettlementsIncoming.vue
index 228e6d57a..12aaccb29 100644
--- a/src/components/Settlements/SettlementsIncoming.vue
+++ b/src/components/Settlements/SettlementsIncoming.vue
@@ -14,7 +14,9 @@
         <template slot-scope="scope">
           <div class="transaction_details">
             <el-row>
-              <el-col :span="4">{{ formatDateLong(scope.row.to.date) }}</el-col>
+              <el-col :span="4">
+                {{ formatDateLong(scope.row.to.date) }}
+              </el-col>
               <el-col
                 :span="5"
                 class="transaction_details-amount"
@@ -27,8 +29,12 @@
               >
                 <p>Fee: {{ scope.row.from.fee }} {{ assetName(scope.row.from.assetId) }}</p>
               </el-col>
-              <el-col :span="5">{{ scope.row.from.message }}</el-col>
-              <el-col :span="5">{{ scope.row.from.to }}</el-col>
+              <el-col :span="5">
+                {{ scope.row.from.message }}
+              </el-col>
+              <el-col :span="5">
+                {{ scope.row.from.to }}
+              </el-col>
             </el-row>
           </div>
         </template>
@@ -110,7 +116,9 @@
           type="primary"
           class="fullwidth black clickable"
           @click="onAccept"
-        >Accept</el-button>
+        >
+          Accept
+        </el-button>
       </div>
     </el-dialog>
     <el-dialog
@@ -131,7 +139,9 @@
           type="danger"
           class="fullwidth"
           @click="onReject"
-        >Reject</el-button>
+        >
+          Reject
+        </el-button>
       </div>
     </el-dialog>
   </section>
diff --git a/src/components/Settlements/SettlementsOutgoing.vue b/src/components/Settlements/SettlementsOutgoing.vue
index 2b1d4f3a4..7b5aaf812 100644
--- a/src/components/Settlements/SettlementsOutgoing.vue
+++ b/src/components/Settlements/SettlementsOutgoing.vue
@@ -14,7 +14,9 @@
         <template slot-scope="scope">
           <div class="transaction_details">
             <el-row>
-              <el-col :span="4">{{ formatDateLong(scope.row.from.date) }}</el-col>
+              <el-col :span="4">
+                {{ formatDateLong(scope.row.from.date) }}
+              </el-col>
               <el-col
                 :span="5"
                 class="transaction_details-amount"
@@ -27,8 +29,12 @@
               >
                 <p>Fee: {{ scope.row.from.fee }} {{ assetName(scope.row.from.assetId) }}</p>
               </el-col>
-              <el-col :span="5">{{ scope.row.from.message }}</el-col>
-              <el-col :span="5">{{ scope.row.from.to }}</el-col>
+              <el-col :span="5">
+                {{ scope.row.from.message }}
+              </el-col>
+              <el-col :span="5">
+                {{ scope.row.from.to }}
+              </el-col>
             </el-row>
           </div>
         </template>
@@ -98,7 +104,9 @@
           type="danger"
           class="fullwidth"
           @click="onReject"
-        >Reject</el-button>
+        >
+          Reject
+        </el-button>
       </div>
     </el-dialog>
   </section>
diff --git a/src/components/Settlements/SettlementsPage.vue b/src/components/Settlements/SettlementsPage.vue
index 8def20840..c8ef8fb4e 100644
--- a/src/components/Settlements/SettlementsPage.vue
+++ b/src/components/Settlements/SettlementsPage.vue
@@ -19,15 +19,21 @@
             <router-link
               class="navlink"
               to="/settlements/history"
-            >History</router-link>
+            >
+              History
+            </router-link>
             <router-link
               class="navlink"
               to="/settlements/incoming"
-            >Incoming</router-link>
+            >
+              Incoming
+            </router-link>
             <router-link
               class="navlink"
               to="/settlements/outgoing"
-            >Outgoing</router-link>
+            >
+              Outgoing
+            </router-link>
           </div>
           <div>
             <el-button
@@ -60,12 +66,8 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex'
-import { lazyComponent } from '@router'
 
 export default {
-  components: {
-    NoAssetsCard: lazyComponent('common/NoAssetsCard')
-  },
   data () {
     return {}
   },
diff --git a/src/components/Signup.vue b/src/components/Signup.vue
index 2430dcfa9..300d0c7a7 100644
--- a/src/components/Signup.vue
+++ b/src/components/Signup.vue
@@ -37,7 +37,9 @@
             <div
               v-if="_isError($v.form.username)"
               class="el-form-item__error"
-            >{{ _showError($v.form.username) }}</div>
+            >
+              {{ _showError($v.form.username) }}
+            </div>
           </el-form-item>
           <el-form-item
             label="Public key"
@@ -83,7 +85,9 @@
             <div
               v-if="_isError($v.form.publicKey)"
               class="el-form-item__error"
-            >{{ _showError($v.form.publicKey) }}</div>
+            >
+              {{ _showError($v.form.publicKey) }}
+            </div>
           </el-form-item>
           <el-form-item
             label="Registration IP"
@@ -116,7 +120,9 @@
             <div
               v-if="_isError($v.form.nodeIp)"
               class="el-form-item__error"
-            >{{ _showError($v.form.nodeIp) }}</div>
+            >
+              {{ _showError($v.form.nodeIp) }}
+            </div>
           </el-form-item>
           <el-form-item class="auth-button-container">
             <el-row class="auth-button_actions">
diff --git a/src/components/Transactions/components/TransferTab.vue b/src/components/Transactions/components/TransferTab.vue
index 9a3721eb5..bd102f09e 100644
--- a/src/components/Transactions/components/TransferTab.vue
+++ b/src/components/Transactions/components/TransferTab.vue
@@ -21,9 +21,9 @@
             <el-table-column
               label="Amount"
             >
-              <template slot-scope="scope">
-                {{ scope.row.from === 'you' ? '−' : '+' }}{{ scope.row.amount }}
-                {{ availableAssets.find(w => w.assetId === scope.row.assetId).asset }}
+              <template slot-scope="nestedScope">
+                {{ nestedScope.row.from === 'you' ? '−' : '+' }}{{ nestedScope.row.amount }}
+                {{ availableAssets.find(w => w.assetId === nestedScope.row.assetId).asset }}
               </template>
             </el-table-column>
             <el-table-column
@@ -49,8 +49,10 @@
     >
       <template slot-scope="scope">
         <div>
-          <div v-if="scope.row[0].from === 'notary' || scope.row[0].to === 'notary'"/>
-          <div v-else>{{ scope.row[0].message }}</div>
+          <div v-if="scope.row[0].from === 'notary' || scope.row[0].to === 'notary'" />
+          <div v-else>
+            {{ scope.row[0].message }}
+          </div>
         </div>
       </template>
     </el-table-column>
diff --git a/src/components/Wallets/WalletMenuItem.vue b/src/components/Wallets/WalletMenuItem.vue
index e94207fbd..d81c4b293 100644
--- a/src/components/Wallets/WalletMenuItem.vue
+++ b/src/components/Wallets/WalletMenuItem.vue
@@ -13,8 +13,12 @@
       style="margin-right: 20px"
     />
     <div class="info-container">
-      <div class="label">{{ name }}</div>
-      <div class="asset">{{ asset }}</div>
+      <div class="label">
+        {{ name }}
+      </div>
+      <div class="asset">
+        {{ asset }}
+      </div>
     </div>
   </router-link>
 </template>
diff --git a/src/components/Wallets/WalletsPage.vue b/src/components/Wallets/WalletsPage.vue
index eb2645a6b..4feae3f62 100644
--- a/src/components/Wallets/WalletsPage.vue
+++ b/src/components/Wallets/WalletsPage.vue
@@ -62,7 +62,7 @@
       />
     </el-aside>
     <el-main class="column-fullheight wallet">
-      <router-view :key="$route.params.walletId"/>
+      <router-view :key="$route.params.walletId" />
     </el-main>
   </el-container>
   <el-container v-else>
diff --git a/src/components/Wallets/components/HistoryTable.vue b/src/components/Wallets/components/HistoryTable.vue
index 851772aa0..d4be1ed4b 100644
--- a/src/components/Wallets/components/HistoryTable.vue
+++ b/src/components/Wallets/components/HistoryTable.vue
@@ -13,7 +13,9 @@
               size="medium"
               type="primary"
               @click="$emit('update-history')"
-            >Refresh</el-button>
+            >
+              Refresh
+            </el-button>
           </div>
         </div>
         <el-table
@@ -30,7 +32,7 @@
                     <el-col :span="6">
                       {{ formatDateLong(scope.row.from.date) }}
                     </el-col>
-                    <el-col :span="18" >
+                    <el-col :span="18">
                       <p>
                         <span class="transaction_details-title">Type: </span>
                         <span>EXCHANGE</span>
diff --git a/src/components/Wallets/components/InfoCards.vue b/src/components/Wallets/components/InfoCards.vue
index cf231e387..17bdd3774 100644
--- a/src/components/Wallets/components/InfoCards.vue
+++ b/src/components/Wallets/components/InfoCards.vue
@@ -29,7 +29,9 @@
                   effect="dark"
                   placement="top-start"
                 >
-                  <h2 class="text-overflow">{{ wallet.amount | fitAmount }} {{ wallet.asset }}</h2>
+                  <h2 class="text-overflow">
+                    {{ wallet.amount | fitAmount }} {{ wallet.asset }}
+                  </h2>
                 </el-tooltip>
               </div>
               <div class="card_actions">
@@ -102,7 +104,9 @@
           >
             <div class="card_header-divided">
               <div class="card_header-title">
-                <div class="card_header-name">Market</div>
+                <div class="card_header-name">
+                  Market
+                </div>
                 <div class="card_header-filter">
                   <div
                     v-for="period in marketPeriods"
@@ -110,7 +114,9 @@
                     :class="[selectedMarketPeriod !== period ? 'chart_time-filter' : 'chart_time-filter selected']"
                     @click="selectedMarketPeriod = period"
                   >
-                    <p class="chart_time-filter_value">{{ period }}</p>
+                    <p class="chart_time-filter_value">
+                      {{ period }}
+                    </p>
                   </div>
                 </div>
               </div>
@@ -155,7 +161,9 @@
 
               <el-row>
                 <el-col :span="9">
-                  <p class="card-info-title">Market Cap</p>
+                  <p class="card-info-title">
+                    Market Cap
+                  </p>
                   <p
                     :title="`the market cap in ${settingsView.fiat}`"
                     class="card-info-amount--small"
@@ -170,7 +178,9 @@
                   </p>
                 </el-col>
                 <el-col :span="8">
-                  <p class="card-info-title">Volume ({{ selectedMarketPeriod }})</p>
+                  <p class="card-info-title">
+                    Volume ({{ selectedMarketPeriod }})
+                  </p>
                   <p
                     :title="`the amount ${wallet.asset} has been traded in ${selectedMarketPeriod} against ALL its trading pairs, in terms of ${settingsView.fiat}`"
                     class="card-info-amount--small"
@@ -185,7 +195,9 @@
                   </p>
                 </el-col>
                 <el-col :span="7">
-                  <p class="card-info-title">Circulating Supply</p>
+                  <p class="card-info-title">
+                    Circulating Supply
+                  </p>
                   <p
                     :title="`the total supply in ${wallet.asset}`"
                     class="card-info-amount--small"
diff --git a/src/components/Wallets/components/modals/DepositModal.vue b/src/components/Wallets/components/modals/DepositModal.vue
index 1c7006fad..f09100e95 100644
--- a/src/components/Wallets/components/modals/DepositModal.vue
+++ b/src/components/Wallets/components/modals/DepositModal.vue
@@ -14,10 +14,12 @@
     <div style="display: flex; flex-direction: column; align-items: center;">
       <div style="text-align: center; margin-bottom: 20px">
         <p>Scan QR code or send your {{ wallet.asset }} to</p>
-        <p><span
-          data-cy="deposit-address"
-          class="monospace"
-        >{{ walletAddress }}</span></p>
+        <p>
+          <span
+            data-cy="deposit-address"
+            class="monospace"
+          >{{ walletAddress }}</span>
+        </p>
       </div>
       <qrcode-vue
         :value="walletAddress"
diff --git a/src/components/Wallets/components/modals/TransferModal.vue b/src/components/Wallets/components/modals/TransferModal.vue
index 9254199f0..03214e49e 100644
--- a/src/components/Wallets/components/modals/TransferModal.vue
+++ b/src/components/Wallets/components/modals/TransferModal.vue
@@ -21,8 +21,8 @@
         prop="amount"
       >
         <el-input
-          v-numeric
           v-model="$v.transferForm.amount.$model"
+          v-numeric
           :class="[
             _isValid($v.transferForm.amount) ? 'border_success' : '',
             _isError($v.transferForm.amount) ? 'border_fail' : ''
diff --git a/src/components/Wallets/components/modals/WithdrawalModal.vue b/src/components/Wallets/components/modals/WithdrawalModal.vue
index 32c321b8e..b6ed0b158 100644
--- a/src/components/Wallets/components/modals/WithdrawalModal.vue
+++ b/src/components/Wallets/components/modals/WithdrawalModal.vue
@@ -21,8 +21,8 @@
         prop="amount"
       >
         <el-input
-          v-numeric
           v-model="$v.withdrawForm.amount.$model"
+          v-numeric
           :class="[
             _isValid($v.withdrawForm.amount) ? 'border_success' : '',
             _isError($v.withdrawForm.amount) ? 'border_fail' : ''
diff --git a/src/components/common/UploadTx.vue b/src/components/common/UploadTx.vue
index fe013001e..a79191830 100644
--- a/src/components/common/UploadTx.vue
+++ b/src/components/common/UploadTx.vue
@@ -15,9 +15,13 @@
     list-type="picture"
     accept=".bin"
   >
-    <i class="el-icon-plus image-uploader-icon"/>
-    <div class="message">Drop transaction here or <b>click to upload</b></div>
-    <div class="message-small">Transaction will be automatically send after validation</div>
+    <i class="el-icon-plus image-uploader-icon" />
+    <div class="message">
+      Drop transaction here or <b>click to upload</b>
+    </div>
+    <div class="message-small">
+      Transaction will be automatically send after validation
+    </div>
   </el-upload>
 </template>
 
diff --git a/src/components/common/modals/ConfirmModal.vue b/src/components/common/modals/ConfirmModal.vue
index fb508ed58..696fd37af 100644
--- a/src/components/common/modals/ConfirmModal.vue
+++ b/src/components/common/modals/ConfirmModal.vue
@@ -27,7 +27,9 @@
               You need to enter at least {{ approvalDialogMinAmountKeys }} key<span v-if="approvalDialogMinAmountKeys > 1">s</span>.
             </span>
           </p>
-          <p v-if="approvalDialogSignatures.length">This transaction already has {{ approvalDialogSignatures.length }} signature<span v-if="approvalDialogSignatures.length > 1">s</span></p>
+          <p v-if="approvalDialogSignatures.length">
+            This transaction already has {{ approvalDialogSignatures.length }} signature<span v-if="approvalDialogSignatures.length > 1">s</span>
+          </p>
         </el-row>
       </el-form-item>
 
diff --git a/src/components/common/modals/ExchangeModal.vue b/src/components/common/modals/ExchangeModal.vue
index 1ffc7e81b..b54678e37 100644
--- a/src/components/common/modals/ExchangeModal.vue
+++ b/src/components/common/modals/ExchangeModal.vue
@@ -22,8 +22,8 @@
         prop="offer_amount"
       >
         <el-input
-          v-numeric
           v-model="$v.exchangeForm.offer_amount.$model"
+          v-numeric
           :class="[
             _isValid($v.exchangeForm.offer_amount) ? 'border_success' : '',
             _isError($v.exchangeForm.offer_amount) ? 'border_fail' : ''
@@ -81,8 +81,8 @@
         prop="request_amount"
       >
         <el-input
-          v-numeric
           v-model="$v.exchangeForm.request_amount.$model"
+          v-numeric
           :class="[
             _isValid($v.exchangeForm.request_amount) ? 'border_success' : '',
             _isError($v.exchangeForm.request_amount) ? 'border_fail' : ''
diff --git a/src/components/common/modals/UploadTransactionModal.vue b/src/components/common/modals/UploadTransactionModal.vue
index 415b3f0c5..d18386b7f 100644
--- a/src/components/common/modals/UploadTransactionModal.vue
+++ b/src/components/common/modals/UploadTransactionModal.vue
@@ -43,7 +43,9 @@
       slot="footer"
       class="dialog-footer"
     >
-      <el-button @click="closeDialog">Cancel</el-button>
+      <el-button @click="closeDialog">
+        Cancel
+      </el-button>
     </div>
   </el-dialog>
 </template>
diff --git a/src/store/Account.js b/src/store/Account.js
index 2b1498ad6..b87d5b466 100644
--- a/src/store/Account.js
+++ b/src/store/Account.js
@@ -401,7 +401,8 @@ const getters = {
 
   accountQuorum (state, getters) {
     // User quorum is based on amount of signatories
-    return getters.accountSignatories.length
+    // return getters.accountSignatories.length
+    return state.accountQuorum
   },
 
   irohaQuorum (state, getters) {
@@ -724,7 +725,6 @@ const mutations = {
   [types.GET_ACCOUNT_QUORUM_REQUEST] (state) {},
 
   [types.GET_ACCOUNT_QUORUM_SUCCESS] (state, { quorum }) {
-    console.log(quorum)
     state.accountQuorum = quorum
   },