• R/O
  • HTTP
  • SSH
  • HTTPS

Byone: Commit

Bytom Wallet for Chrome


Commit MetaInfo

Revisionff5f69d24460c2a7c32f5bbc5fd26f714207b544 (tree)
Time2020-09-16 10:41:11
AuthorZhiting Lin <zhiting.fly@gmai...>
CommiterGitHub

Log Message

Merge pull request #13 from movnetwork/dev

update to v3.0.2

Change Summary

Incremental Difference

--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
11 {
22 "name": "Byone",
33 "description": "Bytom Chrome Extension Wallet",
4- "version": "3.0.1",
4+ "version": "3.0.2",
55 "author": "zhiting.fly@8btc.com",
66 "license": "MIT",
77 "private": true,
--- a/src/assets/language/cn.js
+++ b/src/assets/language/cn.js
@@ -102,7 +102,8 @@ const cn = {
102102 },
103103 listAsset: {
104104 all:'全部',
105- fail:'失败'
105+ fail:'失败',
106+ main:'主链'
106107 },
107108 crossChain:{
108109 title:'跨链',
@@ -129,7 +130,7 @@ const cn = {
129130 votes:'票数',
130131 voteVotes:'投票票数',
131132 voteAccount:'投票账户',
132- vetoAccount:'取消投票账户'
133+ vetoAccount:'取消投票账户',
133134 },
134135 listCancel:{
135136 voted:'已投票',
--- a/src/assets/language/en.js
+++ b/src/assets/language/en.js
@@ -102,7 +102,8 @@ const en = {
102102 },
103103 listAsset: {
104104 all:'All',
105- fail:'Failed'
105+ fail:'Failed',
106+ main:'Chain'
106107 },
107108 crossChain:{
108109 title:'Cross Chain',
@@ -129,7 +130,7 @@ const en = {
129130 votes:'Votes',
130131 voteVotes:'Votes',
131132 voteAccount:'Vote Account',
132- vetoAccount:'Veto Account'
133+ vetoAccount:'Veto Account',
133134 },
134135 listCancel:{
135136 voted:'Voted',
--- a/src/manifest.js
+++ b/src/manifest.js
@@ -2,7 +2,7 @@ module.exports = {
22 manifest_version: 2,
33 name: 'Byone',
44 description: 'Bytom Wallet Chrome extension.',
5- version: '3.0.1',
5+ version: '3.0.2',
66 author: 'Bytom frontend, zhitinglin',
77 web_accessible_resources: ['js/inject.js'],
88 browser_action: {
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -56,11 +56,11 @@ export function removeFromArray(original, remove) {
5656
5757 export function getDomains(lang = 'en'){
5858 let domains = bappData.list.filter( l => l.link!== undefined).map(a => a.link.split('/')[2]);
59- const crossChainLink = "crosschain.bymov.io"
59+ const crossChainLink = "ofmf.bymov.io"
6060
6161 let domainMeta = {
62- "crosschain.bymov.io":{
63- icon: "https://crosschain.bymov.io/favicon.ico",
62+ "ofmf.bymov.io":{
63+ icon: "https://ofmf.bymov.io/favicon.ico",
6464 title: "MOV"
6565 }
6666 }
--- a/src/views/assetList.vue
+++ b/src/views/assetList.vue
@@ -320,7 +320,7 @@ export default {
320320 type_txs = ["transfer_in"];
321321 break;
322322 default:
323- type_txs = ['out_crosschain','in_crosschain',"ordinary"]
323+ type_txs = []
324324 break;
325325 }
326326
@@ -374,10 +374,16 @@ export default {
374374 transaction.address = (resultAddr && resultAddr.includes(' '))?resultAddr:address.short(resultAddr);
375375 }
376376
377+ if(transaction.types.includes('in_crosschain')){
378+ transaction.address = `${this.currentAsset.asset.symbol} ${this.$t("listAsset.main")}`
379+ }
377380 transaction.val = val ;
378381
379382 formattedTransactions.push(transaction);
380383 }else{
384+ if(!transaction.type) {
385+ transaction.type = this.$t("common.transfer_out");
386+ }
381387 transaction.val = 0
382388 transaction.address = address.short(this.address)
383389
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -291,7 +291,7 @@ input:checked + .slider:before {
291291 <i class="icon iconfont icon_recvice"></i>
292292 <div>{{ $t('main.receive') }}</div>
293293 </a>
294- <a class="color-white" href="http://crosschain.bymov.io/" target="_blank">
294+ <a class="color-white" href="https://ofmf.bymov.io/cross-chain" target="_blank">
295295 <i class="icon iconfont icon_cross"></i>
296296 <div>{{ $t('main.crossChain') }}</div>
297297 </a>
--- a/src/views/prompts/bappPrompt.vue
+++ b/src/views/prompts/bappPrompt.vue
@@ -224,7 +224,7 @@
224224 </div>
225225 </div>
226226 <div v-else v-for="(amountInput, index) in transaction.amounts" :key="index" class="amount-list">
227- <div>{{index ==0 && $t('transfer.amount') }}</div>
227+ <div>{{ index ==0 ? $t('transfer.amount'):'' }}</div>
228228 <div class="color-black font-bold">{{amountInput.amount}}<span class="uint uppercase">{{amountInput.alias || short(amountInput.asset) }}</span>
229229 </div>
230230 </div>
--- a/src/views/sendTransaction/transfer.vue
+++ b/src/views/sendTransaction/transfer.vue
@@ -206,6 +206,7 @@ import BigNumber from "bignumber.js"
206206 inBtc:'btcPrice'
207207 }
208208
209+ const mustNonZero = (value) => Number(value) > 0
209210 export default {
210211 components: {
211212 Confirm
@@ -237,7 +238,8 @@ export default {
237238 required
238239 },
239240 amount:{
240- required
241+ required,
242+ mustNonZero
241243 }
242244 }
243245 },
--- 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.1' prodversionmin='64.0.3242' />
4+ <updatecheck codebase='http://localhost:8000/chrome-ext.crx' version='3.0.2' prodversionmin='64.0.3242' />
55 </app>
66 </gupdate>
\ No newline at end of file
Show on old repository browser