mirror of https://github.com/BTCPrivate/copay.git
Names fixes
This commit is contained in:
parent
372b4697e7
commit
a3949efbfd
|
@ -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,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) {
|
||||||
|
|
|
@ -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 = {
|
||||||
|
|
|
@ -80,7 +80,7 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
||||||
|
|
||||||
pushNotificationsEnabled: true,
|
pushNotificationsEnabled: true,
|
||||||
|
|
||||||
notifyIfTxConfirmed: {
|
confirmedTxsNotifications: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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"
|
||||||
|
|
Loading…
Reference in New Issue