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

Names fixes

Browse source
This commit is contained in:
Gabriel Masclef 2017-07-14 15:45:18 -03:00
commit a3949efbfd
6 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -509,7 +509,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
if (config.notifyIfTxConfirmed && config.notifyIfTxConfirmed.enabled) {
if (config.confirmedTxsNotifications && config.confirmedTxsNotifications.enabled) {
txConfirmNotification.subscribe(wallet, {
txid: txp.txid
});

12
src/js/controllers/preferencesNotifications.js
View file

@ -12,9 +12,9 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr
value: config.pushNotificationsEnabled
};
var isNotifyTxEnabled = config.notifyIfTxConfirmed ? config.notifyIfTxConfirmed.enabled : false;
$scope.notifyIfTxConfirmed = {
value: isNotifyTxEnabled
var isConfirmedTxsNotificationsEnabled = config.confirmedTxsNotifications ? config.confirmedTxsNotifications.enabled : false;
$scope.confirmedTxsNotifications = {
value: isConfirmedTxsNotificationsEnabled
};
$scope.latestEmail = {
@ -47,11 +47,11 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr
});
};
$scope.notifyIfTxConfirmedChange = function() {
$scope.confirmedTxsNotificationsChange = function() {
if (!$scope.pushNotifications) return;
var opts = {
notifyIfTxConfirmed: {
enabled: $scope.notifyIfTxConfirmed.value
confirmedTxsNotifications: {
enabled: $scope.confirmedTxsNotifications.value
}
};
configService.set(opts, function(err) {

2
src/js/controllers/tx-details.js
View file

@ -13,7 +13,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio
$scope.color = $scope.wallet.color;
$scope.copayerId = $scope.wallet.credentials.copayerId;
$scope.isShared = $scope.wallet.credentials.n > 1;
$scope.notifyIfTxConfirmed = config.notifyIfTxConfirmed ? config.notifyIfTxConfirmed.enabled : false;
$scope.txsUnsubscribedForNotifications = config.confirmedTxsNotifications ? !config.confirmedTxsNotifications.enabled : true;
txConfirmNotification.checkIfEnabled(txId, function(res) {
$scope.txNotification = {