From 4454482c5377011efc977f4f1df645ee96c29ab8 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 17 Oct 2016 11:50:08 -0300 Subject: [PATCH 1/2] Fixes the back button after scan a qr code --- src/js/services/incomingData.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index b157704b8..0323f7ab3 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -1,11 +1,11 @@ 'use strict'; -angular.module('copayApp.services').factory('incomingData', function($log, $state, $window, bitcore, lodash) { +angular.module('copayApp.services').factory('incomingData', function($log, $state, $window, $timeout, bitcore, lodash) { var root = {}; root.redir = function(data) { - $log.debug('Processing incoming data:' +data); + $log.debug('Processing incoming data: ' + data); function sanitizeUri(data) { // Fixes when a region uses comma to separate decimals @@ -53,7 +53,8 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var amount = parsed.amount ? parsed.amount : ''; - $state.go('tabs.send').then(function() { + $state.go('tabs.send'); + $timeout(function() { if (parsed.r) { $state.transitionTo('tabs.send.confirm', {paypro: parsed.r}); } else { From f112ada22dcb829dac96dd802fe5f1fda63d3e6a Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Mon, 17 Oct 2016 12:07:14 -0300 Subject: [PATCH 2/2] Timeout is required to enable the back button --- src/js/services/incomingData.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 0323f7ab3..c0b41b1a2 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -54,6 +54,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat var amount = parsed.amount ? parsed.amount : ''; $state.go('tabs.send'); + // Timeout is required to enable the "Back" button $timeout(function() { if (parsed.r) { $state.transitionTo('tabs.send.confirm', {paypro: parsed.r});