Skip to content

Commit

Permalink
improved conf
Browse files Browse the repository at this point in the history
  • Loading branch information
MissMonacoin committed Mar 1, 2018
1 parent 2c9f510 commit 2dc4f00
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 111 deletions.
10 changes: 5 additions & 5 deletions component/manageCoin.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
</v-ons-alert-dialog>

<v-ons-modal :visible="loading">
<p style="text-align: center">
計算中。計算能力により時間がかかりますが終了しないでください。
<br><br>
<div class="spinner"></div>
</p>
<p style="text-align: center">
計算中。計算能力により時間がかかりますが終了しないでください。
<br><br>
<div class="spinner"></div>
</p>
</v-ons-modal>
<v-ons-dialog cancelable
:visible.sync="infoDlg"
Expand Down
2 changes: 0 additions & 2 deletions component/navigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ module.exports=require("../js/lang.js")({ja:require("./ja/navigator.html"),en:re
if(res.isCoinAddress&&res.isPrefixOk&&res.isValidAddress){
this.$store.commit("setSendUrl",res.url)
this.pageStack.push(require("./send.js"))
}else if(res.url){
this.$ons.notification.alert(res.url)
}
})
})
Expand Down
47 changes: 0 additions & 47 deletions dist/dist.js

This file was deleted.

2 changes: 1 addition & 1 deletion docs/a/index.html

Large diffs are not rendered by default.

47 changes: 0 additions & 47 deletions docs/wallet/dist/dist.js

This file was deleted.

11 changes: 8 additions & 3 deletions js/coinUtil.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ const storage = require("./storage")
const errors=require("./errors")
const axios=require("axios")

const addressRegExp = /^\w+:(?:\/\/)?(\w{32,36})\??/

exports.DEFAULT_LABEL_NAME = "Default"
exports.GAP_LIMIT=20
exports.GAP_LIMIT_FOR_CHANGE=20
Expand Down Expand Up @@ -189,7 +191,7 @@ exports.getBip21=(bip21Urn,address,query,addrUrl=false)=>{
queryStr+=encodeURIComponent(v)+"="+encodeURIComponent(query[v])+"&"
}
}
return "https://missmonacoin.github.io/monya/a/"+queryStr
return "https://monya-wallet.github.io/monya/a/"+queryStr
}

for(let v in query){
Expand Down Expand Up @@ -224,14 +226,17 @@ exports.parseUrl=url=>new Promise((resolve,reject)=>{
return resolve(ret)
}
ret.raw=raw
ret.protocol=raw.protocol.slice(0,-1),
ret.protocol=raw.protocol.slice(0,-1)
ret.isValidUrl=true

currencyList.each(v=>{
if(v.bip21===ret.protocol){
ret.isCoinAddress=true
ret.coinId=v.coinId
ret.address=raw.pathname||raw.hostname
const addrRes = addressRegExp.exec(url)
if(addrRes){
ret.address=addrRes[1]
}
if (v.isValidAddress(ret.address)) {
ret.isPrefixOk=true
}
Expand Down
3 changes: 0 additions & 3 deletions js/currency.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ module.exports=class{
case "zec":
this.lib=zecLib
break
case "pos":
this.lib=null
break
case "bch":
this.lib=bchLib
break
Expand Down
3 changes: 0 additions & 3 deletions js/currencyList.js
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,4 @@ exports.init =customCoins=>{
}
exports.isSingleWallet = (defaultCoins.length+customCoins.length)<2
}
exports.addCurrency=customCoin=>{
coins[customCoin.coinId]=customCoin
}
exports.isSingleWallet = false
Binary file added res/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 2dc4f00

Please sign in to comment.