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

Merge pull request #567 from yemel/fix/import-wallet-open

Browse source 
Add error message on wallet import while the wallet is already open
This commit is contained in:
Gustavo Maximiliano Cortez 2014-06-05 16:57:56 -03:00
commit 0e880dc378
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/import.js
View file

@ -21,6 +21,10 @@ angular.module('copayApp.controllers').controller('ImportController',
$rootScope.wallet = w; $rootScope.wallet = w;
controllerUtils.startNetwork($rootScope.wallet); controllerUtils.startNetwork($rootScope.wallet);
$rootScope.wallet.on('connectionError', function() {
var message = "Looks like you are already connected to this wallet, please logout from it and try importing it again.";
$rootScope.$flashMessage = { message: message, type: 'error'};
});
}); });
}; };

2
server.js
View file

@ -1,6 +1,6 @@
var server = require('./app'); var server = require('./app');
var port = process.env.PORT || 3000; var port = process.env.PORT || 3000;
server.start(port, function(loc){ server.start(port, function(loc) {
console.log('Listening at: ' + loc); console.log('Listening at: ' + loc);
}); });