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

Moved the fix for reading the QR code higher up the call stack, so it would only be used when needed.

Browse source
This commit is contained in:
Brendon Duncan 2018-05-24 18:56:05 -07:00
commit 576bb2098a
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/controllers/tab-scan.js
View file

@ -105,6 +105,9 @@ angular.module('copayApp.controllers').controller('tabScanController', function(
function handleSuccessfulScan(contents){ function handleSuccessfulScan(contents){
$log.debug('Scan returned: "' + contents + '"'); $log.debug('Scan returned: "' + contents + '"');
scannerService.pausePreview(); 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); incomingData.redir(contents);
} }

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

@ -11,10 +11,6 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
root.redir = function(data, shapeshiftData) { root.redir = function(data, shapeshiftData) {
var originalAddress = null; var originalAddress = null;
var noPrefixInAddress = 0; var noPrefixInAddress = 0;
// Sometimes (testing in Chrome, when reading QR Code) data is an object
// that has a string data.result.
data = data.result || data;
if (data.toLowerCase().indexOf('bitcoin') < 0) { if (data.toLowerCase().indexOf('bitcoin') < 0) {
noPrefixInAddress = 1; noPrefixInAddress = 1;