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

Merge pull request #5377 from gabrielbazan7/fix/scannerAddbook

Browse source 
fix addressbook add scanner and some refactors
This commit is contained in:
Gustavo Maximiliano Cortez 2017-01-03 09:27:05 -03:00 • committed by GitHub
commit 9fffc255b0
6 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/addressbookAdd.js
View file

@ -10,7 +10,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
'email': ''
};
$scope.onQrCodeScanned = function(data, addressbookForm) {
$scope.onQrCodeScannedAddressBook = function(data, addressbookForm) {
$timeout(function() {
var form = addressbookForm;
if (data && form) {

4
src/js/controllers/join.js
View file

@ -33,7 +33,7 @@ angular.module('copayApp.controllers').controller('joinController',
}
};
this.onQrCodeScanned = function(data) {
this.onQrCodeScannedJoin = function(data) {
$scope.secret = data;
if ($scope.joinForm) {
$scope.joinForm.secret.$setViewValue(data);
@ -44,7 +44,7 @@ angular.module('copayApp.controllers').controller('joinController',
if ($stateParams.url) {
var data = $stateParams.url;
data = data.replace('copay:', '');
this.onQrCodeScanned(data);
this.onQrCodeScannedJoin(data);
}
var updateSeedSourceSelect = function() {

7
src/js/controllers/onboarding/welcomeController.js
View file

@ -8,13 +8,6 @@ angular.module('copayApp.controllers').controller('welcomeController', function(
startupService.ready();
});
$scope.goImport = function(code) {
$state.go('onboarding.import', {
fromOnboarding: true,
code: code
});
};
$scope.createProfile = function() {
$log.debug('Creating profile');
profileService.createProfile(function(err) {