BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Names fixes

This commit is contained in:
Gabriel Masclef 2017-07-14 15:45:18 -03:00
parent 372b4697e7
commit a3949efbfd
6 changed files with 12 additions and 12 deletions
Show Stats 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) { walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err); if (err) return setSendError(err);
if (config.notifyIfTxConfirmed && config.notifyIfTxConfirmed.enabled) { if (config.confirmedTxsNotifications && config.confirmedTxsNotifications.enabled) {
txConfirmNotification.subscribe(wallet, { txConfirmNotification.subscribe(wallet, {
txid: txp.txid txid: txp.txid
}); });

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

@ -12,9 +12,9 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr
value: config.pushNotificationsEnabled value: config.pushNotificationsEnabled
}; };
var isNotifyTxEnabled = config.notifyIfTxConfirmed ? config.notifyIfTxConfirmed.enabled : false; var isConfirmedTxsNotificationsEnabled = config.confirmedTxsNotifications ? config.confirmedTxsNotifications.enabled : false;
$scope.notifyIfTxConfirmed = { $scope.confirmedTxsNotifications = {
value: isNotifyTxEnabled value: isConfirmedTxsNotificationsEnabled
}; };
$scope.latestEmail = { $scope.latestEmail = {
@ -47,11 +47,11 @@ angular.module('copayApp.controllers').controller('preferencesNotificationsContr
}); });
}; };
$scope.notifyIfTxConfirmedChange = function() { $scope.confirmedTxsNotificationsChange = function() {
if (!$scope.pushNotifications) return; if (!$scope.pushNotifications) return;
var opts = { var opts = {
notifyIfTxConfirmed: { confirmedTxsNotifications: {
enabled: $scope.notifyIfTxConfirmed.value enabled: $scope.confirmedTxsNotifications.value
} }
}; };
configService.set(opts, function(err) { 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.color = $scope.wallet.color;
$scope.copayerId = $scope.wallet.credentials.copayerId; $scope.copayerId = $scope.wallet.credentials.copayerId;
$scope.isShared = $scope.wallet.credentials.n > 1; $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) { txConfirmNotification.checkIfEnabled(txId, function(res) {
$scope.txNotification = { $scope.txNotification = {

2
src/js/services/configService.js
View File

@ -80,7 +80,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
pushNotificationsEnabled: true, pushNotificationsEnabled: true,
notifyIfTxConfirmed: { confirmedTxsNotifications: {
enabled: true, enabled: true,
}, },

4
www/views/preferencesNotifications.html
View File

@ -19,8 +19,8 @@
</div> </div>
</div> </div>
<div ng-if="PNEnabledByUser"> <div ng-if="usePushNotifications && pushNotifications.value">
<ion-toggle ng-model="notifyIfTxConfirmed.value" toggle-class="toggle-balanced" ng-change="notifyIfTxConfirmedChange()" ng-if="usePushNotifications" ng-show="pushNotifications.value"> <ion-toggle ng-model="confirmedTxsNotifications.value" toggle-class="toggle-balanced" ng-change="confirmedTxsNotificationsChange()">
<span class="toggle-label" translate>Notify me when transactions are confirmed</span> <span class="toggle-label" translate>Notify me when transactions are confirmed</span>
</ion-toggle> </ion-toggle>
</div> </div>

2
www/views/tx-details.html
View File

@ -108,7 +108,7 @@ This transaction amount is too small compared to current Bitcoin network fees. S
</span> </span>
</span> </span>
</div> </div>
<div ng-if="!notifyIfTxConfirmed"> <div ng-if="txsUnsubscribedForNotifications">
<ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0" <ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0"
class="toggle-unconfirmed" class="toggle-unconfirmed"
ng-model="txNotification.value" ng-model="txNotification.value"