From 801378104353c7755a6cecb4e61b27791fe94a04 Mon Sep 17 00:00:00 2001 From: JDonadio Date: Wed, 8 Mar 2017 16:19:29 -0300 Subject: [PATCH] fix import QR code from main scan button --- src/js/routes.js | 2 +- src/js/services/incomingData.js | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/js/routes.js b/src/js/routes.js index cfab39815..e84db5292 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -327,7 +327,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.add.import', { - url: '/import', + url: '/import/:code', views: { 'tab-home@tabs': { templateUrl: 'views/import.html', diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 566c40faa..0c730ed79 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -220,8 +220,15 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat data: data, type: 'privateKey' }); - } else { + } else if (data && ((data.substring(0, 2) == '1|') || (data.substring(0, 2) == '2|') || (data.substring(0, 2) == '3|'))) { + $state.go('tabs.home').then(function() { + $state.transitionTo('tabs.add.import', { + code: data + }); + }); + return true; + } else { if ($state.includes('tabs.scan')) { root.showMenu({ data: data,