anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'wallet/sprint/18' into wallet/task/335

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-06-25 16:05:17 +09:00 • committed by GitHub
commit 53c95b0413
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
38 changed files with 3973 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
www/img/qr-overlay-bch.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
www/img/qr-overlay-btc.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 44 KiB

BIN
www/misc/coin_received.mp3 Normal file
View file

Binary file not shown.

BIN
www/misc/coin_received.ogg Normal file
View file

Binary file not shown.

8
www/views/includes/walletSelector.html
View file

@ -8,8 +8,8 @@
<div class="header" ng-if="!walletsBtc[0] || !walletsBch[0]">{{title}}</div>
<div class="subheader" ng-if="walletsBch[0] && walletsBtc[0]">
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
<span translate>Bitcoin Cash (BCH)</span>
<div translate>Bitcoin Cash (BCH)</div>
<div translate class="subtitle">Instant transactions with low fees</div>
</div>
<a
ng-repeat="wallet in walletsBch track by $index"
@ -40,8 +40,8 @@
</a>
<div class="subheader" ng-if="walletsBtc[0] && walletsBch[0]" translate>
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
<span translate>Bitcoin Core (BTC)</span>
<div translate>Bitcoin Core (BTC)</div>
<div translate class="subtitle">Slow transactions with high fees</div>
</div>
<a
ng-repeat="wallet in walletsBtc track by $index"

8
www/views/tab-home.html
View file

@ -57,8 +57,8 @@
<div class="list card">
<div class="item item-icon-right item-heading">
<img class="wallet-coin-logo" src="img/bitcoin-cash-logo.svg" width="22">
<span translate>Bitcoin Cash (BCH)</span>
<div translate>Bitcoin Cash (BCH)</div>
<div translate class="subtitle">Instant transactions with low fees</div>
<a ui-sref="tabs.add({coin:'bch'})"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div>
<div>
@ -72,8 +72,8 @@
<div class="list card">
<div class="item item-icon-right item-heading">
<img class="wallet-coin-logo" src="img/icon-bitcoin.svg" width="18">
<span translate>Bitcoin Core (BTC)</span>
<div translate>Bitcoin Core (BTC)</div>
<div translate class="subtitle">Slow transactions with high fees</div>
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div>
<div>

2
www/views/tab-receive.html
View file

@ -41,7 +41,7 @@
</button>
</span>
<qrcode ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
<qrcode class="qr-icon qr-icon--{{ wallet.coin }}" ng-if="addr" size="220" data="{{ protocolHandler }}:{{addr}}" color="#334"></qrcode>
<div class="address-label">
<span class="ellipsis">{{addr}}</span>
<ion-spinner ng-show="!addr" class="spinner-dark" icon="crescent"></ion-spinner>