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

fix fingerprint setting, remove activity from home

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-09-01 16:23:27 -03:00
commit 333b4f45a0
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
9 changed files with 44 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/controllers/preferences.js
View file

@ -69,10 +69,12 @@ angular.module('copayApp.controllers').controller('preferencesController',
$scope.touchIdChange = function() {
var newStatus = $scope.touchIdEnabled;
walletService.setTouchId(wallet, newStatus, function(err) {
walletService.setTouchId(wallet, !!newStatus, function(err) {
if (err) {
$log.warn(err);
$scope.touchIdEnabled = !newStatus;
$timeout(function() {
$scope.$apply();
}, 1);
return;
}
$log.debug('Touch Id status changed: ' + newStatus);

48
src/js/controllers/tab-home.js
View file

@ -31,19 +31,19 @@ angular.module('copayApp.controllers').controller('tabHomeController',
wallet.status = status;
});
});
$scope.fetchingNotifications = true;
profileService.getNotifications({
limit: 3
}, function(err, n) {
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return;
}
$scope.fetchingNotifications = false;
setNotifications(n);
$ionicScrollDelegate.resize();
})
//
// $scope.fetchingNotifications = true;
// profileService.getNotifications({
// limit: 3
// }, function(err, n) {
// if (err) {
// console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
// return;
// }
// $scope.fetchingNotifications = false;
// setNotifications(n);
// $ionicScrollDelegate.resize();
// })
};
$scope.updateWallet = function(wallet) {
@ -55,17 +55,17 @@ angular.module('copayApp.controllers').controller('tabHomeController',
}
wallet.status = status;
profileService.getNotifications({
limit: 3
}, function(err, n) {
console.log('[tab-home.js.57]', n); //TODO
if (err) {
console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
return;
}
setNotifications(n);
$ionicScrollDelegate.resize();
})
// profileService.getNotifications({
// limit: 3
// }, function(err, n) {
// console.log('[tab-home.js.57]', n); //TODO
// if (err) {
// console.log('[tab-home.js.35:err:]', $log.error(err)); //TODO
// return;
// }
// setNotifications(n);
// $ionicScrollDelegate.resize();
// })
});
};

1
src/js/services/profileService.js
View file

@ -827,6 +827,7 @@ angular.module('copayApp.services')
prev;
// REMOVE (if we want 1-to-1 notification) ????
lodash.each(shown, function(x) {
if (prev && prev.walletId === x.walletId && prev.txpId && prev.txpId === x.txpId && prev.creatorId && prev.creatorId === x.creatorId) {
prev.types.push(x.type);

13
src/js/services/walletService.js
View file

@ -995,10 +995,17 @@ angular.module('copayApp.services').factory('walletService', function($log, $tim
};
root.setTouchId = function(wallet, enabled, cb) {
var opts = {
touchIdFor: {}
};
opts.touchIdFor[wallet.id] = enabled;
fingerprintService.check(wallet, function(err) {
if (err) return cb(err); {
$log.debug(err);
return;
if (err) {
opts.touchIdFor[wallet.id] = !enabled;
$log.debug('Error with fingerprint:' + err);
return cb(err);
}
configService.set(opts, cb);
});