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

wip

Browse source
This commit is contained in:
Javier 2016-09-20 12:02:45 -03:00
commit ae266e397b
6 changed files with 95 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

50
public/views/includes/walletActivity.html
View file

@ -1,65 +1,65 @@
<span class="wallet-activity">
<div ng-if="x.type == 'NewCopayer' && x.wallet.n>1" translate>
Copayer joined
<div ng-if="notification.type == 'NewCopayer' && notification.wallet.n>1" translate>
Copayer joined
</div>
<div ng-if="x.type == 'NewCopayer' && x.wallet.n==1" translate>
<div ng-if="notification.type == 'NewCopayer' && notification.wallet.n==1" translate>
Wallet created
</div>
<div ng-if="x.type == 'NewOutgoingTx'">
<div ng-if="notification.type == 'NewOutgoingTx'">
<span translate>Payment Sent </span>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</div>
<div ng-if="x.type == 'NewIncomingTx'">
<div ng-if="notification.type == 'NewIncomingTx'">
<span translate>Payment Received</span>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</div>
<div ng-if="x.type == 'TxProposalRemoved'">
<span translate>Proposal Deleted</span>:
<b>{{x.message}}</b>
<div ng-if="notification.type == 'TxProposalRemoved'">
<span translate>Proposal Deleted</span>:
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}:
{{notification.amountStr}}:
</div>
</div>
<div ng-if="x.type == 'TxProposalRejectedBy'">
<div ng-if="notification.type == 'TxProposalRejectedBy'">
<span translate>Proposal Rejected</span>:
<b>{{x.message}}</b>
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}:
{{notification.amountStr}}:
</div>
</div>
<span ng-if="x.type == 'NewTxProposal'">
<span ng-if="notification.type == 'NewTxProposal'">
<span translate>New Proposal</span>:
<b>{{x.message}}</b>
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</span>
<span ng-if="x.type == 'TxProposalAcceptedBy'">
<span ng-if="notification.type == 'TxProposalAcceptedBy'">
<span translate>Proposal Accepted</span>:
<b>{{x.message}}</b>
<b>{{notification.message}}</b>
<div class="wallet-activity-amount">
{{x.amountStr}}
{{notification.amountStr}}
</div>
</span>
<p class="wallet-activity-note">
<!-- {{x.types}} -->
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':x.wallet.color}"></i>
<span ng-if="x.creatorName" class="wallet-activity-note-child">{{ x.creatorName}}@</span>
<span class="wallet-activity-note-child">{{x.wallet.name}}</span>
<time class="wallet-activity-note-child">{{ x.createdOn * 1000 | amTimeAgo}}</time>
<!-- {{notification.types}} -->
<i class="icon ion-record wallet-activity-note-child" ng-style="{'color':notification.wallet.color}"></i>
<span ng-if="notification.creatorName" class="wallet-activity-note-child">{{ notification.creatorName}}@</span>
<span class="wallet-activity-note-child">{{notification.wallet.name}}</span>
<time class="wallet-activity-note-child">{{ notification.createdOn * 1000 | amTimeAgo}}</time>
</p>
</span>

6
public/views/modals/tx-details.html
View file

@ -9,11 +9,11 @@
</ion-header-bar>
<ion-content>
<div class="header-modal text-center" ng-init="getAlternativeAmount(btx); showRate = false">
<div class="header-modal text-center" ng-init="showRate = false">
<div ng-show="btx.action != 'invalid'">
<i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
<i class="icon big-icon-svg" ng-if="color">
<img src="img/icon-wallet.svg" ng-style="{'background-color': color}" class="bg"/>
</i>
<div class="size-36" copy-to-clipboard="btx.amountStr">

4
public/views/tab-home.html
View file

@ -35,7 +35,7 @@
</a>
</div>
<div class="list card" ng-if="notifications.length > 0">
<div class="list card" ng-if="notifications[0]">
<a class="item item-icon-right item-heading" ui-sref="tabs.activity" translate>
Recent Activity
<i class="icon nav-item-arrow-right"></i>
@ -44,7 +44,7 @@
<ion-spinner icon="lines"></ion-spinner>
<div translate>Updating activity. Please stand by</div>
</span>
<a class="item" ng-repeat="x in notifications" ng-click="x.action()">
<a class="item" ng-repeat="notification in notifications" ng-click="openTxModal(notification)">
<span ng-include="'views/includes/walletActivity.html'"></span>
</a>
</div>