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

Merge pull request #1437 from isocolsky/fix/reconnect

Browse source 
On reconnect do not redirect to 'receive' tab
This commit is contained in:
Matias Alejo Garcia 2014-09-22 09:58:13 -03:00
commit 5e4593d93e
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
js/services/controllerUtils.js
View file

@ -55,10 +55,13 @@ angular.module('copayApp.services')
}); });
w.on('ready', function(myPeerID) { w.on('ready', function(myPeerID) {
$rootScope.wallet = w; $rootScope.wallet = w;
if ($rootScope.pendingPayment) { if ($rootScope.initialConnection) {
$location.path('send'); $rootScope.initialConnection = false;
} else { if ($rootScope.pendingPayment) {
$location.path('receive'); $location.path('send');
} else {
$location.path('receive');
}
} }
}); });
@ -139,6 +142,7 @@ angular.module('copayApp.services')
uriHandler.register(); uriHandler.register();
$rootScope.unitName = config.unitName; $rootScope.unitName = config.unitName;
$rootScope.txAlertCount = 0; $rootScope.txAlertCount = 0;
$rootScope.initialConnection = true;
$rootScope.reconnecting = false; $rootScope.reconnecting = false;
$rootScope.isCollapsed = true; $rootScope.isCollapsed = true;
$rootScope.$watch('txAlertCount', function(txAlertCount) { $rootScope.$watch('txAlertCount', function(txAlertCount) {