From 2f07290deaa89d6a67218cf521dde8c94767b9db Mon Sep 17 00:00:00 2001 From: Kadir Sekha Date: Wed, 6 Dec 2017 15:48:11 +0900 Subject: [PATCH] Bitcoin Core to Bitcoin (BTC) --- README.md | 2 +- src/js/services/incomingData.js | 20 ++++++++++---------- www/views/includes/walletSelector.html | 4 ++-- www/views/preferencesFee.html | 2 +- www/views/tab-home.html | 4 ++-- www/views/tab-settings.html | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) 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 @@
- Bitcoin Cash Wallets + Bitcoin Cash (BCH)
- Bitcoin Core Wallets + Bitcoin (BTC) ...
- Bitcoin Core (BTC) rate for this policy: + Bitcoin (BTC) rate for this policy: {{feePerSatByteBtc}} satoshis/byte ...
diff --git a/www/views/tab-home.html b/www/views/tab-home.html index 0b17464f4..0ba8e8eb2 100644 --- a/www/views/tab-home.html +++ b/www/views/tab-home.html @@ -66,7 +66,7 @@
- Bitcoin Cash Wallets + Bitcoin Cash (BCH)
@@ -81,7 +81,7 @@
- Bitcoin Core Wallets + Bitcoin (BTC)
diff --git a/www/views/tab-settings.html b/www/views/tab-settings.html index 2a03a3352..ae4a11879 100644 --- a/www/views/tab-settings.html +++ b/www/views/tab-settings.html @@ -89,7 +89,7 @@ -
{{'Bitcoin Cash Wallets' | translate}}
+
{{'Bitcoin Cash (BCH)' | translate}}
-
{{'Bitcoin Core Wallets' | translate}}
+
{{'Bitcoin (BTC)' | translate}}