Fix wrong type of function when download (#224)

d3ledger · Aug 23, 2019 · b738264 · b738264
1 parent 23ea05d
commit b738264
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 55 deletions.
diff --git a/src/components/Home/Menu.vue b/src/components/Home/Menu.vue
@@ -87,7 +87,7 @@
           v-if="pendingTransactionsAmount"
           :value="pendingTransactionsAmount"
           :max="9"
-          :class="[isMenuActive('transactions') ? 'badge active' : 'badge']"
+          :class="[isMenuActive('pendingTransactionsAmount') ? 'badge active' : 'badge']"
         >
           <SvgIcon
             icon-name="Transaction"
@@ -178,7 +178,7 @@ export default {
       return this.$route.path
     },
     pendingTransactionsAmount () {
-      return this.pendingTransferTransactions.length + this.pendingSettingsTransactions
+      return this.pendingTransferTransactions.length + this.pendingSettingsTransactions.length
     }
   },
   watch: {

diff --git a/src/components/Settings/components/Rightside/PublicKeysCard.vue b/src/components/Settings/components/Rightside/PublicKeysCard.vue
@@ -235,7 +235,8 @@ export default {
       'removeSignatory',
       'getSignatories',
       'createAddSignatoryTransaction',
-      'createRemoveSignatoryTransaction'
+      'createRemoveSignatoryTransaction',
+      'openUploadTransactionDialog'
     ]),
     addPublicKey () {
       this.$v.$touch()
@@ -246,6 +247,8 @@ export default {
       this.updateActiveTab(1)
       this.addingNewKey = false
       this.addKeyFormVisible = false
+
+      this.openUploadTransactionDialog()
     },
     removePublicKey () {
       if (this.accountSignatories.length === 1) {
@@ -257,6 +260,8 @@ export default {
       this.updateActiveTab(1)
       this.removingKey = false
       this.removeKeyFormVisible = false
+
+      this.openUploadTransactionDialog()
     },
     doCopy (key) {
       const onSuccess = (e) => this.$message(`You just copied: ${e.text}`)

diff --git a/src/components/Settings/components/Rightside/WhiteListCard.vue b/src/components/Settings/components/Rightside/WhiteListCard.vue
@@ -247,7 +247,8 @@ export default {
   methods: {
     ...mapActions([
       'setWhiteList',
-      'createSetWhiteListTransaction'
+      'createSetWhiteListTransaction',
+      'openUploadTransactionDialog'
     ]),
     addWhiteAddress () {
       this.$v.whitelistForm.$touch()
@@ -279,30 +280,7 @@ export default {
         address: ''
       }
 
-      // this.openApprovalDialog({ requiredMinAmount: this.accountQuorum })
-      //   .then(privateKeys => {
-      //     if (!privateKeys) return
-      //     this.addingNewAddress = true
-      //     return this.setWhiteList({
-      //       privateKeys,
-      //       whitelist,
-      //       type: this.walletType
-      //     })
-      //       .then(() => {
-      //         this.$message.success('Address successfully added')
-      //       })
-      //       .catch((err) => {
-      //         this.$message.error('Failed to add address')
-      //         console.error(err)
-      //       })
-      //   })
-      //   .finally(() => {
-      //     this.addAddressFormVisible = false
-      //     this.addingNewAddress = false
-      //     this.whitelistForm = {
-      //       address: ''
-      //     }
-      //   })
+      this.openUploadTransactionDialog()
     },
     removeWhiteAddress () {
       const whitelist = [
@@ -320,28 +298,7 @@ export default {
       this.removingAddress = false
       this.addressToRemove = null
 
-      // this.openApprovalDialog({ requiredMinAmount: this.accountQuorum })
-      //   .then(privateKeys => {
-      //     if (!privateKeys) return
-      //     this.removingAddress = true
-      //     return this.setWhiteList({
-      //       privateKeys,
-      //       whitelist,
-      //       type: this.walletType
-      //     })
-      //       .then(() => {
-      //         this.$message.success('Address successfully removed')
-      //       })
-      //       .catch((err) => {
-      //         this.$message.error('Failed to remove address')
-      //         console.error(err)
-      //       })
-      //   })
-      //   .finally(() => {
-      //     this.removeAddressFormVisible = false
-      //     this.removingAddress = false
-      //     this.addressToRemove = null
-      //   })
+      this.openUploadTransactionDialog()
     },
 
     onCloseWhiteAddressForm () {

diff --git a/src/components/Transactions/TransactionPage.vue b/src/components/Transactions/TransactionPage.vue
@@ -134,7 +134,7 @@
                     show-overflow-tooltip
                   >
                     <template slot-scope="scope">
-                      <div>
+                      <div class="transaction_description">
                         {{ scope.row.description }}
                       </div>
                     </template>
@@ -255,4 +255,8 @@ export default {
   text-transform: uppercase;
   padding: 0.7rem;
 }
+.transaction_description {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>
diff --git a/src/store/Account.js b/src/store/Account.js
@@ -1125,8 +1125,11 @@ const actions = {
   createPendingTransaction ({ commit, state }, { txStoreId }) {
     let transaction = state.rawUnsignedTransactions.getTransactionsList()[txStoreId]
     const objectTransaction = transaction.toObject()
-    const batch = findBatchFromRaw(state.rawUnsignedTransactions, objectTransaction.payload.batch)
-    transaction = txHelper.createTxListFromArray(txHelper.addBatchMeta(batch, 0))
+
+    if (objectTransaction.payload.batch) {
+      const batch = findBatchFromRaw(state.rawUnsignedTransactions, objectTransaction.payload.batch)
+      transaction = txHelper.createTxListFromArray(txHelper.addBatchMeta(batch, 0))
+    }
 
     transactionUtil.saveTransaction(transaction)
   },

diff --git a/src/util/store-util.js b/src/util/store-util.js
@@ -213,10 +213,12 @@ export function getSettingsTransactionsFrom (transactions, account) {
         switch (key) {
           case 'eth_whitelist': {
             type = 'ETH whitlist'
+            description = `New whitelist: ${JSON.parse(value.replace(/\\/g, '')).join(', ')}`
             break
           }
           case 'btc_whitelist': {
             type = 'BTC whitelist'
+            description = `New whitelist: ${JSON.parse(value.replace(/\\/g, '')).join(', ')}`
             break
           }
           case 'notifications': {
@@ -269,8 +271,9 @@ export function getSettingsTransactionsFrom (transactions, account) {
           id: idx
         }
       }
-
-      transformed.push(tx)
+      if (tx) {
+        transformed.push(tx)
+      }
     })
   })