Skip to content

Commit faf3dd9

Browse files
author
Izuho Fujiwara
authored
Merge pull request #57 from monya-wallet/master
Update v3.9.0
2 parents 5dd5ec4 + 06a8237 commit faf3dd9

36 files changed

+654
-404
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ jobs:
4444
wget https://services.gradle.org/distributions/gradle-4.1-bin.zip -qO gradle.zip
4545
sudo unzip gradle.zip -d /opt
4646
export PATH="$PATH:/opt/gradle-4.1/bin/"
47+
sudo echo $ANDROID_SDK_LICENSE_VOLUMES > $ANDROID_HOME/licenses/android-sdk-license
4748
sdkmanager tools "build-tools;26.0.2" "platform-tools" "platforms;android-26" "platforms;android-25"
4849
cd cordovaProj
4950
npm i
5051
cordova platform add android
51-
cordova build android --debug
52+
cordova build android --release
5253
5354
- store_artifacts:
5455
path: cordovaProj/platforms/android/build/outputs/apk/

‎component/about.html‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,45 @@
11
<v-ons-page data-page="about">
22
<custom-bar title="このアプリについて" menu="true"></custom-bar>
33
<div>
4-
<h1><!--t:AppName--></h1>
4+
<h1>&nbsp;<!--t:AppName--></h1>
55
<v-ons-list>
66
<v-ons-list-item @click="forceUpdate">
77
<div class="center">バージョン</div>
8-
<div class="right"><!--t:Version-->,<!--t:Timestamp-->,<!--t:FlavorName--></div>
8+
<div class="right"><!--t:Version--></div>
99
</v-ons-list-item>
10+
<v-ons-list-item>
11+
<div class="center">フレーバーネーム</div>
12+
<div class="right"><!--t:FlavorName--></div>
13+
</v-ons-list-item>
14+
<v-ons-list-item>
15+
<div class="center">ビルドブロック</div>
16+
<div class="right"><!--t:Timestamp--></div>
17+
</v-ons-list-item>
18+
1019
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('monya_wallet')">
11-
<div class="center">作った人</div>
12-
<div class="right">もにゃ 開発チーム</div>
20+
<div class="center">公式Twitter</div>
21+
<div class="right">もにゃ</div>
1322
</v-ons-list-item>
14-
<v-ons-list-item modifier="chevron tappable" @click="openLink('https://missmonacoin.github.io')">作者に寄付する</v-ons-list-item>
15-
16-
<v-ons-list-header>バックエンドをお借りした方々(敬称略)</v-ons-list-header>
17-
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('fujiwaraizuho')">
18-
<div class="center">BitZeny</div>
19-
<div class="right">fujishan</div>
23+
24+
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('sanyodensan')">
25+
<div class="center">開発・運営</div>
26+
<div class="right">三洋電産</div>
2027
</v-ons-list-item>
2128

22-
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('tomotomo__9696')">
23-
<div class="center">BitZeny</div>
24-
<div class="right">tomotomo9696</div>
29+
<v-ons-list-header>テスト協力 (敬称略)</v-ons-list-header>
30+
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('meronpan_umeee')">
31+
<div class="center">エロんぱん 様</div>
2532
</v-ons-list-item>
26-
27-
<v-ons-list-header>翻訳協力</v-ons-list-header>
33+
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('samurai_zeny')">
34+
<div class="center">侍日本代表 様</div>
35+
</v-ons-list-item>
36+
37+
<v-ons-list-header>翻訳協力 (敬称略)</v-ons-list-header>
2838
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('dianmuhaiyan')">
29-
<div class="center">Haiyan</div>
39+
<div class="center">Haiyan 様</div>
3040
</v-ons-list-item>
31-
32-
<v-ons-list-item modifier="chevron tappable" @click="openLink('https://bitcointalk.org/index.php?action=profile;u=669983')">
33-
<div class="center">hitobb</div>
41+
<v-ons-list-item modifier="chevron tappable" @click="goToTwitter('askmona_2477')">
42+
<div class="center">hitobb 様</div>
3443
</v-ons-list-item>
3544

3645
</v-ons-list-item>
@@ -39,7 +48,6 @@ <h1><!--t:AppName--></h1>
3948
<v-ons-list-item @click="openLink('https://github.com/monya-wallet/monya/blob/master/LICENSE')">
4049
<div class="center">ライセンス</div>
4150
<div class="right">MIT License</div>
42-
4351
</v-ons-list-item>
4452
</v-ons-list>
4553
</div>

‎component/confirm.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ module.exports=require("../js/lang.js")({ja:require("./ja/confirm.html"),en:requ
100100
(new Audio(cur.sound)).play()
101101
}
102102
this.$store.commit("setFinishNextPage",{infoId:"sent",payload:{
103-
txId:res.txid
103+
txId: res.txid,
104+
coinId: this.coinType
104105
}})
105106
this.$emit("pop")
106107
this.$emit("pop")

‎component/createTx.html‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎component/createTx.js‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎component/finished.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
<div class="succeeded" data-img="0"></div>
44
<p v-if="infoId==='createdWallet'">ウォレットを作成しました！</p>
55
<p v-if="infoId==='reset'">ウォレットを消去しました</p>
6-
<p v-if="infoId==='sent'">送金しました！{{payload.txId}}</p>
6+
<p v-if="infoId==='sent'">送金しました！</p>
7+
<v-ons-button v-if="infoId==='sent'" modifier="large" @click="openExplorer" class="ok">エクスプローラを開く</v-ons-button>
78
<v-ons-button modifier="large" @click="start" class="ok">OK</v-ons-button>
89
</div>
910
<v-ons-modal :visible="loading">
1011
<p style="text-align: center">
1112
<br><br>
1213
<div class="spinner"></div>
1314
</p>
14-
</v-ons-modal>
15+
</v-ons-modal>
1516
</v-ons-page>

‎component/finished.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
SOFTWARE.
2323
*/
2424
const coinUtil = require("../js/coinUtil.js")
25+
const currencyList = require("../js/currencyList.js")
2526
module.exports=require("../js/lang.js")({ja:require("./ja/finished.html"),en:require("./en/finished.html")})({
2627
data(){
2728
return {
@@ -42,6 +43,10 @@ module.exports=require("../js/lang.js")({ja:require("./ja/finished.html"),en:req
4243
this.$store.commit("setFinishNextPage",{infoId:"",payload:{}})
4344
})
4445

46+
},
47+
48+
openExplorer(){
49+
currencyList.get(this.payload.coinId).openExplorer({txId:this.payload.txId});
4550
}
4651
},
4752
computed:{

‎component/invoice.html‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55
<div>
66
<div id="currencySelector">
77
<v-ons-carousel swipeable overscrollable centered direction="horizontal" item-height="50px" item-width="50px" :index="currencyIndex">
8-
<v-ons-carousel-item class="currencyIcon monappy" @click="currencyIndex=-1" v-show="monappyEnabled">
9-
<div class="checked" v-show="currencyIndex===-1"></div>
10-
</v-ons-carousel-item>
118

129
<v-ons-carousel-item v-for="(crc,i) in currency" class="currencyIcon" :style="{'background-image':'url('+crc.icon+')'}" @click="currencyIndex=i">
1310
<div class="checked" v-show="currencyIndex===i"></div>
1411
</v-ons-carousel-item>
1512
</v-ons-carousel>
1613
</div>
1714
<div id="simple">
18-
<div class="label" v-show="currencyIndex===-1">このQRコードを読み取ってMonappyにログインして、送金してください。指示がある場合は、「匿名で送る」チェックを外してください。</div>
1915
<div id="qrArea">
2016
<div id="qrcode">
2117
<img :src="qrDataUrl||''" alt="QR code" id="qrcodeImage"/>
@@ -30,14 +26,8 @@
3026
<v-ons-button @click="share" modifier="quiet" v-if="shareable">
3127
<v-ons-icon icon="fa-share-square-o"></v-ons-icon>共有
3228
</v-ons-button>
29+
3330
<v-ons-list>
34-
35-
<v-ons-list-item v-show="currencyIndex===-1">
36-
<div class="center">送金先Monappy ID</div>
37-
<div class="right">
38-
<span class="atmark">@</span><v-ons-input v-model="monappyDestination" placeholder="Monappy ID" @change="changeMonappy" @input="monappyNotExist=false;" :class="{monappyNotExist:monappyNotExist}" modifier="underbar"></v-ons-input>
39-
</div>
40-
</v-ons-list-item>
4131
<v-ons-list-item v-show="currencyIndex!==-1">
4232
<div class="center">受信アドレスのラベル</div>
4333
<div class="right">

‎component/invoice.js‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ const qrcode = require("qrcode")
2525
const currencyList = require("../js/currencyList")
2626
const storage = require("../js/storage")
2727
const coinUtil = require("../js/coinUtil")
28-
const monappyApi=require("../js/monappyApi")
2928

3029
module.exports=require("../js/lang.js")({ja:require("./ja/invoice.html"),en:require("./en/invoice.html")})({
3130
data(){
@@ -45,17 +44,11 @@ module.exports=require("../js/lang.js")({ja:require("./ja/invoice.html"),en:requ
4544
fiat:0,
4645
price:0,
4746
fiatTicker:this.$store.state.fiat,
48-
requestMonappy:false,
4947

50-
51-
monappyEnabled:false,
52-
monappyDestination:"",
5348
orderDlg:false,
5449

55-
5650
orders:[],
5751
onOrder:[],
58-
monappyNotExist:false,
5952

6053
isAddrUrl:false
6154
}
@@ -96,17 +89,6 @@ module.exports=require("../js/lang.js")({ja:require("./ja/invoice.html"),en:requ
9689
this.price=res
9790
})
9891
},
99-
changeMonappy(){
100-
this.generateQR()
101-
this.monappyNotExist=false
102-
if (this.monappyDestination) {
103-
monappyApi.getAddress(this.monappyDestination).then(r=>{
104-
this.monappyNotExist=!r
105-
}).catch(r=>{
106-
this.monappyNotExist=true
107-
})
108-
}
109-
},
11092
share(event){
11193
const targetRect = event.target.getBoundingClientRect(),
11294
targetBounds = targetRect.left + ',' + targetRect.top + ',' + targetRect.width + ',' + targetRect.height;
@@ -125,9 +107,6 @@ module.exports=require("../js/lang.js")({ja:require("./ja/invoice.html"),en:requ
125107
},
126108
computed:{
127109
url(){
128-
if(this.currencyIndex===-1){
129-
return "https://monappy.jp/users/send/@"+this.monappyDestination+"?amount="+parseFloat(this.amount)+"&message="+encodeURIComponent(this.message)
130-
}
131110
if(!this.currency[this.currencyIndex]){
132111
return
133112
}
@@ -181,8 +160,6 @@ module.exports=require("../js/lang.js")({ja:require("./ja/invoice.html"),en:requ
181160
mounted(){
182161
storage.get("settings").then((data)=>{
183162
if(!data){data={}}
184-
this.monappyEnabled=data.monappy&&data.monappy.enabled;
185-
this.monappyDestination=(data.monappy&&data.monappy.myUserId)||""
186163
})
187164
this.generateQR()
188165
this.getPrice()

‎component/manageCoin.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@
8181
<div class="right"><v-ons-input :value="info.masterPub" readonly=readonly></v-ons-input></div>
8282
</v-ons-list-item>
8383
<v-ons-list-item @click="changeServer">
84-
<div class="center">APIエンドポイント</div>
85-
<div class="right">{{info.apiEndpoint}}</div>
84+
<div class="center">URL</div>
85+
<div class="right">{{info.explorer}}</div>
8686
</v-ons-list-item>
8787
<v-ons-list-header>ブロック</v-ons-list-header>
8888
<v-ons-list-item v-for="b in info.blocks" @click="openBlock(b.hash)">

0 commit comments

Comments
 (0)