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

Transaction id fixed

Browse source
This commit is contained in:
Gabriel Masclef 2017-07-14 10:18:36 -03:00
commit 372b4697e7
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

11
www/views/preferencesNotifications.html
View file

@ -19,6 +19,12 @@
</div> </div>
</div> </div>
<div ng-if="PNEnabledByUser">
<ion-toggle ng-model="notifyIfTxConfirmed.value" toggle-class="toggle-balanced" ng-change="notifyIfTxConfirmedChange()" ng-if="usePushNotifications" ng-show="pushNotifications.value">
<span class="toggle-label" translate>Notify me when transactions are confirmed</span>
</ion-toggle>
</div>
<ion-toggle ng-model="emailNotifications.value" toggle-class="toggle-balanced" ng-change="emailNotificationsChange()"> <ion-toggle ng-model="emailNotifications.value" toggle-class="toggle-balanced" ng-change="emailNotificationsChange()">
<span class="toggle-label" translate>Enable email notifications</span> <span class="toggle-label" translate>Enable email notifications</span>
</ion-toggle> </ion-toggle>
@ -44,11 +50,6 @@
</form> </form>
</div> </div>
<div ng-if="PNEnabledByUser">
<ion-toggle ng-model="notifyIfTxConfirmed.value" toggle-class="toggle-balanced" ng-change="notifyIfTxConfirmedChange()" ng-if="usePushNotifications">
<span class="toggle-label" translate>Notify me when confirm transactions</span>
</ion-toggle>
</div>
</div> </div>
</ion-content> </ion-content>