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

Bitcoin Core to Bitcoin (BTC)

Browse source
This commit is contained in:
Kadir Sekha 2017-12-06 15:48:11 +09:00
commit 2f07290dea
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -9,7 +9,7 @@ For a list of frequently asked questions please visit the [Bitcoin.com Wallet FA
## Main Features
- Multiple wallet creation and management in-app
- Creates both Bitcoin Cash (BCH) and Bitcoin Core (BTC) wallets by default
- Creates both Bitcoin Cash (BCH) and Bitcoin (BTC) wallets by default
- Intuitive, multisignature security for personal or shared wallets
- Easy spending proposal flow for shared wallets and group payments
- [BIP32](https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki) Hierarchical deterministic (HD) address generation and wallet backups

20
src/js/services/incomingData.js
View file

@ -119,11 +119,11 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
if (parsed.r) {
payproService.getPayProDetails(parsed.r, function(err, details) {
if (err) {
if (addr && amount)
if (addr && amount)
goSend(addr, amount, message, coin);
else
else
popupService.showAlert(gettextCatalog.getString('Error'), err);
}
}
handlePayPro(details, coin);
});
} else {
@ -131,7 +131,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
}
return true;
// Cash URI with bitcoin core address version number?
// Cash URI with bitcoin (btc) address version number?
} else if (bitcore.URI.isValid(data.replace(/^bitcoincash:/,'bitcoin:'))) {
$log.debug('Handling bitcoincash URI with legacy address');
var coin = 'bch';
@ -148,10 +148,10 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
// Translate address
$log.debug('address transalated to:' + addr);
popupService.showConfirm(
gettextCatalog.getString('Bitcoin cash Payment'),
gettextCatalog.getString('Bitcoin cash Payment'),
gettextCatalog.getString('Payment address was translated to new Bitcoin Cash address format: ' + addr),
gettextCatalog.getString('OK'),
gettextCatalog.getString('Cancel'),
gettextCatalog.getString('OK'),
gettextCatalog.getString('Cancel'),
function(ret) {
if (!ret) return false;
@ -162,11 +162,11 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
if (parsed.r) {
payproService.getPayProDetails(parsed.r, function(err, details) {
if (err) {
if (addr && amount)
if (addr && amount)
goSend(addr, amount, message, coin);
else
else
popupService.showAlert(gettextCatalog.getString('Error'), err);
}
}
handlePayPro(details, coin);
});
} else {

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

@ -8,7 +8,7 @@
<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 Wallets</span>
<span translate>Bitcoin Cash (BCH)</span>
</div>
<a
ng-repeat="wallet in walletsBch track by $index"
@ -39,7 +39,7 @@
<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 Wallets</span>
<span translate>Bitcoin (BTC)</span>
</div>
<a
ng-repeat="wallet in walletsBtc track by $index"

2
www/views/preferencesFee.html
View file

@ -22,7 +22,7 @@
<span ng-if="loadingFee">...</span>
</div>
<div>
<span translate>Bitcoin Core (BTC) rate for this policy</span>:
<span translate>Bitcoin (BTC) rate for this policy</span>:
<span class="fee-rate" ng-if="feePerSatByteBtc">{{feePerSatByteBtc}} satoshis/byte</span>
<span ng-if="loadingFee">...</span>
</div>

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

@ -66,7 +66,7 @@
<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 Wallets</span>
<span translate>Bitcoin Cash (BCH)</span>
<a ui-sref="tabs.add({coin:'bch'})"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div>
<div>
@ -81,7 +81,7 @@
<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 Wallets</span>
<span translate>Bitcoin (BTC)</span>
<a ui-sref="tabs.add"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div>
<div>

4
www/views/tab-settings.html
View file

@ -89,7 +89,7 @@
<i class="icon bp-arrow-right"></i>
</a>
<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash Wallets' | translate}}</div>
<div class="item item-divider" ng-show="walletsBch[0]">{{'Bitcoin Cash (BCH)' | translate}}</div>
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': wallet.id})"
@ -97,7 +97,7 @@
<span ng-include="'views/includes/walletListSettings.html'"></span>
</a>
<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin Core Wallets' | translate}}</div>
<div class="item item-divider" ng-show="walletsBtc[0]">{{'Bitcoin (BTC)' | translate}}</div>
<a class="item item-icon-left item-icon-right" href
ui-sref="tabs.preferences({'walletId': wallet.id})"