diff --git a/README.md b/README.md index 50f9705f9..4f878a316 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index ae7d97609..00772131d 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -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 { diff --git a/www/views/includes/walletSelector.html b/www/views/includes/walletSelector.html index e624c8075..02ccf85bf 100644 --- a/www/views/includes/walletSelector.html +++ b/www/views/includes/walletSelector.html @@ -8,7 +8,7 @@