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

Merge pull request #6408 from Gamboster/feat/notifyTxConfirm

Browse source 
Confirmed transactions notifications as global settings
This commit is contained in:
Javier Donadío 2017-07-14 16:09:27 -03:00 • committed by GitHub
commit 875b8d1041
6 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
www/views/preferencesNotifications.html
View file

@ -19,6 +19,12 @@
</div>
</div>
<div ng-if="usePushNotifications && 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>
</ion-toggle>
</div>
<ion-toggle ng-model="emailNotifications.value" toggle-class="toggle-balanced" ng-change="emailNotificationsChange()">
<span class="toggle-label" translate>Enable email notifications</span>
</ion-toggle>
@ -43,6 +49,8 @@
</button>
</form>
</div>
</div>
</ion-content>
</ion-view>

16
www/views/tx-details.html
View file

@ -108,13 +108,15 @@ This transaction amount is too small compared to current Bitcoin network fees. S
</span>
</span>
</div>
<ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0"
class="toggle-unconfirmed"
ng-model="txNotification.value"
toggle-class="toggle-balanced"
ng-change="txConfirmNotificationChange()">
<span class="toggle-label" translate>Notify me if confirmed</span>
</ion-toggle>
<div ng-if="txsUnsubscribedForNotifications">
<ion-toggle ng-show="!btx.confirmations || btx.confirmations == 0"
class="toggle-unconfirmed"
ng-model="txNotification.value"
toggle-class="toggle-balanced"
ng-change="txConfirmNotificationChange()">
<span class="toggle-label" translate>Notify me if confirmed</span>
</ion-toggle>
</div>
<div ng-if="actionList[0]">
<div class="item item-divider" translate>Timeline</div>
<div class="item timeline-item" ng-class="{'action-created' : a.type == 'created' || a.type == 'accept', 'action-rejected' : a.type == 'reject'}" ng-repeat="a in actionList track by $index">