Merge pull request #1365 from torusresearch/fix/browser-list-confirm-…

…modal Confirm modal and browser list fixes
torusresearch · Dec 14, 2020 · 76cb1eb · 76cb1eb
2 parents b72d528 + 28ccaf7
commit 76cb1eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/app/src/components/Tkey/TkeyDeviceDetected/TkeyDeviceDetected.vue b/app/src/components/Tkey/TkeyDeviceDetected/TkeyDeviceDetected.vue
@@ -150,7 +150,10 @@ export default {
         .map((x) => {
           const share = this.allDeviceShares[x]
           const dateFormated = new Date(share.dateAdded).toLocaleString()
-          share.browserList = share.browsers.map((browser) => browser.browserName).join(', ')
+          share.browserList = share.browsers
+            .map((browser) => browser.browserName)
+            .slice(0, 3)
+            .join(', ')
           share.dateFormated = dateFormated
           return share
         })

diff --git a/app/src/components/Tkey/TkeyInputView/TkeyInputView.vue b/app/src/components/Tkey/TkeyInputView/TkeyInputView.vue
@@ -195,7 +195,6 @@ export default {
         .map((x) => {
           const share = this.allDeviceShares[x]
           const dateFormated = new Date(share.dateAdded).toLocaleString()
-          share.browserList = share.browsers.map((browser) => browser.browserName).join(', ')
           share.dateFormated = dateFormated
           return share
         })

diff --git a/app/src/views/Wallet/Wallet.vue b/app/src/views/Wallet/Wallet.vue
@@ -79,17 +79,7 @@ export default {
     },
     currentConfirmModal() {
       if (this.confirmModals.length > 0) {
-        const {
-          txType: type,
-          txParams,
-          selectedCurrency,
-          currencyData,
-          balance,
-          networkType: network,
-          jwtToken,
-          tokenRates,
-          origin,
-        } = this.confirmModals[0]
+        const { type, txParams, selectedCurrency, currencyData, balance, network, jwtToken, tokenRates, origin } = this.confirmModals[0]
         return {
           type,
           txParams,