• R/O
  • HTTP
  • SSH
  • HTTPS

Byone: Commit

Bytom Wallet for Chrome


Commit MetaInfo

Révision21f88ba27fe06a9c6ac3104aec621e8f7141809b (tree)
l'heure2020-10-30 12:03:57
AuteurZhiting Lin <zlin035@uott...>
CommiterZhiting Lin

Message de Log

update 0 amount reciever address

Change Summary

Modification

--- a/src/views/assetList.vue
+++ b/src/views/assetList.vue
@@ -336,7 +336,7 @@ export default {
336336 transaction.direct = "+";
337337 const resultAddr = inputAddresses.pop()
338338 transaction.address = (resultAddr && resultAddr.includes(' '))?resultAddr:address.short(resultAddr);
339- } else {
339+ } else if (Number(balanceObject[0].amount) < 0) {
340340 if(!transaction.type) {
341341 transaction.type = this.$t("common.transfer_out");
342342 }
@@ -344,6 +344,13 @@ export default {
344344 transaction.direct = "-";
345345 const resultAddr = outputAddresses.pop()
346346 transaction.address = (resultAddr && resultAddr.includes(' '))?resultAddr:address.short(resultAddr);
347+ }else{
348+ if(!transaction.type) {
349+ transaction.type = this.$t("common.transfer_out");
350+ }
351+
352+ const resultAddr = outputAddresses.pop() || this.address
353+ transaction.address = (resultAddr && resultAddr.includes(' '))?resultAddr:address.short(resultAddr);
347354 }
348355
349356 if(transaction.types.includes('in_crosschain')){
@@ -376,7 +383,11 @@ export default {
376383 transaction.type = this.$t("common.transfer_out");
377384 }
378385 transaction.val = 0
379- transaction.address = address.short(this.address)
386+ let resultAddr = transaction.outputs
387+ .find(output => output.address !== this.address)
388+ resultAddr = resultAddr? resultAddr.address : this.address
389+
390+ transaction.address = address.short(resultAddr)
380391
381392 formattedTransactions.push(transaction);
382393 }
--- a/src/views/delayTxList.vue
+++ b/src/views/delayTxList.vue
@@ -1,8 +1,4 @@
11 <style lang="scss" scoped>
2-.alias {
3- font-size: 13px;
4-}
5-
62 .transactions {
73 font-size: 15px;
84 height:calc(100% - 80px);
@@ -22,70 +18,51 @@ font-size: 15px;
2218 display: block;
2319 }
2420
25- .symbol{
26- display: flex;
27- align-items: center;
28- font-weight: 600;
29- font-size: 15px;
30- }
31-
32- .currency-banner{
33- display: flex;
34- justify-content: space-between;
35- padding: 20px;
36- align-items: center;
37- font-size: 15px;
38- font-weight: 600;
39- .addr{
40- font-weight: normal;
41- }
42- }
21+.back{
22+ width: 56px;
23+ height: 28px;
4324
44- .back{
45- width: 56px;
46- height: 28px;
25+ background: #EEEEEE;
26+ border-radius: 20px;
27+}
4728
48- background: #EEEEEE;
49- border-radius: 20px;
29+.header{
30+ display: flex;
31+ margin-bottom: 20px;
32+ h1{
33+ margin-left: 12px;
34+ font-size: 20px;
5035 }
36+}
5137
52- .header{
53- display: flex;
54- margin-bottom: 20px;
55- h1{
56- margin-left: 12px;
57- font-size: 20px;
58- }
59- }
38+.list-item a{
39+ display: flex;
40+ justify-content: space-between;
41+ width: 100%;
42+ color: rgba(0, 0, 0, 0.88);
43+ font-size: 14px;
44+}
6045
61- .list-item a{
62- display: flex;
63- justify-content: space-between;
64- width: 100%;
65- color: rgba(0, 0, 0, 0.88);
66- font-size: 14px;
46+.transaction-title{
47+ display: flex;
48+ font-weight: 600;
49+ font-size: 15px;
50+ margin: 16px 0;
51+ color: rgba(0, 0, 0, 0.24);
52+ div:not(:first-child) {
53+ margin-left: 25px;
6754 }
6855
69- .transaction-title{
70- display: flex;
71- font-weight: 600;
72- font-size: 15px;
73- margin: 16px 0;
74- color: rgba(0, 0, 0, 0.24);
75- div:not(:first-child) {
76- margin-left: 25px;
77- }
78-
79- div{
80- cursor: pointer;
81- }
82- }
83- .icon_circle_selected{
84- color: #06BE85;
85- font-size: 16px;
86- vertical-align: middle;
87- margin-right: 5px;
56+ div{
57+ cursor: pointer;
8858 }
59+}
60+.icon_circle_selected{
61+ color: #06BE85;
62+ font-size: 16px;
63+ vertical-align: middle;
64+ margin-right: 5px;
65+}
8966 </style>
9067
9168 <template>
@@ -140,12 +117,8 @@ font-size: 15px;
140117 import address from "@/utils/address";
141118 import query from "@/models/query";
142119 import transaction from "@/models/transaction";
143-import { camelize } from "@/utils/utils";
144120 import { BTM } from "@/utils/constants";
145-import { mapActions, mapGetters, mapState } from 'vuex'
146-import * as Actions from '@/store/constants';
147-import _ from 'lodash';
148-import { Number as Num } from "@/utils/Number"
121+import { mapGetters, mapState } from 'vuex'
149122 import moment from 'moment'
150123
151124 const EnterActive = 'animated faster fadeInLeft';
@@ -165,7 +138,6 @@ export default {
165138 enterActive: EnterActive,
166139 leaveActive: LeaveActive,
167140 currentBlockHeight:0,
168- currentTimeStamp:0
169141 };
170142 },
171143 watch: {
@@ -218,17 +190,6 @@ export default {
218190 $state.complete();
219191 }
220192 },
221- img:function (symbol) {
222- const _symbol = symbol.toLowerCase();
223- if(this.netType === 'vapor'){
224- return `https://cdn.blockmeta.com/resources/logo/vapor/${_symbol}.png`
225- }else{
226- return `https://cdn.blockmeta.com/resources/logo/bytom/${_symbol}.png`
227- }
228- },
229- onImgError: function(event) {
230- event.target.src = require(`@/assets/img/asset/${this.netType}.png`)
231- },
232193 blockmeta:function (txid) {
233194 if(this.netType === 'vapor'){
234195 return `https://vapor.blockmeta.com/tx/${txid}`
@@ -236,9 +197,6 @@ export default {
236197 return `https://blockmeta.com/tx/${txid}`
237198 }
238199 },
239- camelize: function (object) {
240- return camelize(object)
241- },
242200 close: function () {
243201 this.$router.go(-1)
244202 },
@@ -295,10 +253,6 @@ export default {
295253 });
296254 return formattedTransactions;
297255 },
298- ...mapActions([
299- Actions.UPDATE_STORED_BYTOM,
300- Actions.SET_LIST_VOTE
301- ])
302256 },
303257 async mounted() {
304258 if(this.language === 'zh' ||this.language === 'cn'){
--- 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='3.0.6' prodversionmin='64.0.3242' />
4+ <updatecheck codebase='http://localhost:8000/chrome-ext.crx' version='3.0.7' prodversionmin='64.0.3242' />
55 </app>
66 </gupdate>
\ No newline at end of file
Afficher sur ancien navigateur de dépôt.