Merge commit '9a3e0fdb06' into wallet/task/324

This commit is contained in:
Brendon Duncan 2018-05-21 09:22:56 -07:00
commit 7cc73405c4
12 changed files with 103 additions and 41 deletions

View file

@ -49,7 +49,6 @@
<a class="item item-icon-right item-heading" ui-sref="tabs.activity">
<span translate>Recent Transactions</span>
<i class="icon bp-arrow-right"></i>
<span class="badge badge-assertive m5t m10r" ng-show="notificationsN>3"> {{notificationsN}}</span>
</a>
<a class="item item-sub activity" ng-repeat="notification in notifications" ng-click="openNotificationModal(notification)">
<span ng-include="'views/includes/walletActivity.html'"></span>