diff --git a/src/js/controllers/tab-scan.js b/src/js/controllers/tab-scan.js index c29be53ad..83d6f733e 100644 --- a/src/js/controllers/tab-scan.js +++ b/src/js/controllers/tab-scan.js @@ -61,7 +61,10 @@ angular.module('copayApp.controllers').controller('tabScanController', function( $scope.$on("$ionicView.afterEnter", function() { // try initializing and refreshing status any time the view is entered - scannerService.gentleInitialize(); + if(!scannerService.isInitialized()) { + scannerService.gentleInitialize(); + } + activate(); }); function activate(){ @@ -102,6 +105,9 @@ angular.module('copayApp.controllers').controller('tabScanController', function( function handleSuccessfulScan(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. + contents = contents.result || contents; incomingData.redir(contents); } diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index b912c3233..a318e1157 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -11,7 +11,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat root.redir = function(data, shapeshiftData) { var originalAddress = null; var noPrefixInAddress = 0; - + if (data.toLowerCase().indexOf('bitcoin') < 0) { noPrefixInAddress = 1; }