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

Merge pull request #297 from Bitcoin-com/wallet/dev

Browse source 
Wallet/dev
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-23 14:40:54 +09:00 • committed by GitHub
commit 07ff264619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app-template/bitcoincom/appConfig.json
View file

@ -24,9 +24,9 @@
"windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c", "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229", "pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet", "description": "A Secure Bitcoin Wallet",
"version": "5.0.1", "version": "5.0.2",
"fullVersion": "5.0-rc2", "fullVersion": "5.0-rc3",
"androidVersion": "500100", "androidVersion": "500200",
"_extraCSS": "", "_extraCSS": "",
"_enabledExtensions": { "_enabledExtensions": {
"coinbase": false, "coinbase": false,

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

@ -31,7 +31,7 @@
<div ng-show="!showingPaymentReceived"> <div ng-show="!showingPaymentReceived">
<div> <div>
<button ng-show="addr" class="button button-standard button-small" ng-click="requestSpecificAmount()"> <button ng-show="addr" class="button button-standard button-small" ng-click="requestSpecificAmount()">
<span translate>Request Specific Amount</span> <span translate>Request Specific amount</span>
</button><br/><br/> </button><br/><br/>
</div> </div>
<div copy-to-clipboard="wallet.coin == 'bch' && bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + addr : addr"> <div copy-to-clipboard="wallet.coin == 'bch' && bchAddressType.type == 'cashaddr' ? 'bitcoincash:' + addr : addr">
@ -69,8 +69,8 @@
<!-- end of animation --> <!-- end of animation -->
<div ng-show="addr && wallet.coin == 'bch' && !showingPaymentReceived"> <div ng-show="addr && wallet.coin == 'bch' && !showingPaymentReceived">
<label class="item-input item-select"> <label class="item-input item-select">
<div class="input-label" translate> <div class="input-label">
Address Type: <span translate>Address Type</span>:
</div> </div>
<select ng-model="bchAddressType.type" ng-change="displayAddress(bchAddressType.type)"> <select ng-model="bchAddressType.type" ng-change="displayAddress(bchAddressType.type)">
<option value="cashaddr">Cash Address</option> <option value="cashaddr">Cash Address</option>