• R/O
  • HTTP
  • SSH
  • HTTPS

Byone: Commit

Bytom Wallet for Chrome


Commit MetaInfo

Révision7426c7f9e96b0196e52f6e78212d26332542a4d0 (tree)
l'heure2019-10-17 12:03:19
AuteurZhiting Lin <zlin035@uott...>
CommiterZhiting Lin

Message de Log

update to v2.1.1

Change Summary

Modification

--- a/src/views/sendTransaction/transfer.vue
+++ b/src/views/sendTransaction/transfer.vue
@@ -162,6 +162,7 @@ import { BTM } from "@/utils/constants";
162162 import { Number as Num } from "@/utils/Number"
163163 import { mapActions, mapGetters, mapState } from 'vuex'
164164 import * as Actions from '@/store/constants';
165+ import _ from 'lodash'
165166
166167 const currencyInPrice = {
167168 in_cny: 'cny_price',
@@ -315,7 +316,7 @@ export default {
315316 transaction.build(this.account.guid, this.transaction.to, this.transaction.asset, Num.convertToNue(this.transaction.amount,this.selectAsset.decimals), this.transaction.fee, this.transaction.confirmations).then(result => {
316317 loader.hide();
317318 if(!this.transaction.fee){
318- this.transaction.fee = Number(result.fee / 100000000);
319+ this.transaction.fee = Number( _.sumBy(result, 'fee') / 100000000);
319320 }
320321 this.$router.push({ name: 'transfer-confirm', params: { account: this.account, transaction: this.transaction, rawData: result, assetAlias: this.selectAsset.symbol, type: this.$route.query.type } })
321322 }).catch(error => {
--- a/src/views/sendTransaction/transferConfirm.vue
+++ b/src/views/sendTransaction/transferConfirm.vue
@@ -195,7 +195,7 @@ export default {
195195 return {
196196 full: false,
197197 title:null,
198- rawData: {},
198+ rawData: [],
199199 account: {},
200200 transaction: {
201201 to: "",
@@ -249,11 +249,12 @@ export default {
249249 });
250250
251251 // rawData, password
252- transaction.transfer(this.account.guid, this.rawData, this.password)
252+
253+ Promise.all(this.rawData.map( (rawdata) => transaction.transfer(this.account.guid, rawdata, this.password)))
253254 .then(ret => {
254255 loader.hide();
255256 if(this.$route.params.type == 'popup'){
256- LocalStream.send({method:'transfer',action:'success', message:ret});
257+ LocalStream.send({method:'transfer',action:'success', message:ret[ret.length-1]});
257258 window.close();
258259 }
259260 this.$dialog.show({
--- a/src/views/sideMenu/menuSettings.vue
+++ b/src/views/sideMenu/menuSettings.vue
@@ -124,17 +124,19 @@ export default {
124124 account.list()
125125 .then(accounts => {
126126
127- console.log(accounts)
128127 bytom.accountList = accounts;
129128 if (accounts.length > 0) {
130129 bytom.currentAccount = accounts[0];
131130 }
132131
132+ account.setupNet(`${val.value}${this.netType}`);
133133 this[Actions.UPDATE_STORED_BYTOM](bytom)
134134 })
135135 .catch((errors) =>{
136136 bytom.accountList =[]
137- this[Actions.UPDATE_STORED_BYTOM](bytom)
137+
138+ account.setupNet(`${val.value}${this.netType}`);
139+ this[Actions.UPDATE_STORED_BYTOM](bytom)
138140 })
139141 }
140142 },
--- a/updates.xml
+++ b/updates.xml
@@ -1,6 +1,6 @@
11 <?xml version='1.0' encoding='UTF-8'?>
22 <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
33 <app appid='gnooapainaenaagmljnopepbheiaaaok'>
4- <updatecheck codebase='http://localhost:8000/chrome-ext.crx' version='2.1.0' />
4+ <updatecheck codebase='http://localhost:8000/chrome-ext.crx' version='2.1.1' />
55 </app>
66 </gupdate>
\ No newline at end of file
Afficher sur ancien navigateur de dépôt.