Address without prefix not working bug fix.

Bitcoin-com · Sep 27, 2018 · 4015ad0 · 4015ad0
1 parent dba95d0
commit 4015ad0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/js/controllers/tab-scan.controller.js b/src/js/controllers/tab-scan.controller.js
@@ -106,7 +106,7 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
   });
 
   function handleSuccessfulScan(contents){
-    $log.debug('Scan returned: "' + contents + '"');
+    $log.debug('Scan returned: ', contents);
     scannerService.pausePreview();
     // Sometimes (testing in Chrome, when reading QR Code) data is an object
     // that has a string data.result.

diff --git a/src/js/directives/incomingDataMenu.js b/src/js/directives/incomingDataMenu.js
@@ -16,8 +16,8 @@ angular.module('copayApp.directives')
               scope.type = "url";
             } else if (scope.data.parsed.publicAddress) {
               scope.type = "bitcoinAddress";
-              var prefix = scope.data.parsed.isTestnet ? 'bchtest:' : 'bitcoincash:';
-              scope.data.toAddress = (prefix + scope.data.parsed.publicAddress.cashAddr) || scope.data.parsed.publicAddress.legacy || scope.data.parsed.publicAddress.bitpay;
+              var prefix = scope.data.coin === 'bch' ? (scope.data.parsed.isTestnet ? 'bchtest:' : 'bitcoincash:') : '';
+              scope.data.toAddress = (scope.data.parsed.publicAddress.cashAddr ? prefix + scope.data.parsed.publicAddress.cashAddr : false) || scope.data.parsed.publicAddress.legacy || scope.data.parsed.publicAddress.bitpay;
             } else {
               scope.type = "text";
             }