Merge pull request #145 from JDonadio/feat/open-tx-modal
Open tx/txp modal without navigation
This commit is contained in:
Gustavo Maximiliano Cortez
GitHub
commit
e5b237bb7a
11 changed files with 226 additions and 84 deletions
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
<div ng-if="!fetchingNotifications">
|
||||
<div class="list card">
|
||||
<div class="item" ng-repeat="x in notifications" ng-click="x.action()">
|
||||
<div class="item" ng-repeat="notification in notifications" ng-click="openNotificationModal(notification)">
|
||||
<span ng-include="'views/includes/walletActivity.html'"></span>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<ion-modal-view ng-controller="txDetailsController" ng-init="init()" id="tx-details">
|
||||
<ion-header-bar align-title="center" class="bar-royal" ng-style="{'background-color':color}">
|
||||
<ion-header-bar align-title="center" class="bar-royal" ng-style="{'background-color': color}">
|
||||
<button class="button button-clear" ng-click="cancel()">
|
||||
{{'Close' | translate}}
|
||||
</button>
|
||||
|
|
@ -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"/>
|
||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': color}" class="bg"/>
|
||||
</i>
|
||||
|
||||
<div class="size-36" copy-to-clipboard="btx.amountStr">
|
||||
|
|
@ -30,23 +30,23 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-show="btx.action == 'sent'">
|
||||
<span translate>Sent from</span> {{wallet.credentials.walletName}}
|
||||
<div class="padding-vertical">
|
||||
<i class="icon ion-ios-arrow-thin-down size-24"></i>
|
||||
</div>
|
||||
<div ng-show="btx.action == 'sent'">
|
||||
<span translate>Sent from</span> {{wallet.credentials.walletName}}
|
||||
<div class="padding-vertical">
|
||||
<i class="icon ion-ios-arrow-thin-down size-24"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-show="btx.action == 'received'">
|
||||
<div class="padding-vertical">
|
||||
<i class="icon ion-ios-arrow-thin-up size-24"></i>
|
||||
</div>
|
||||
<span translate>Received Funds</span>
|
||||
<div ng-show="btx.action == 'received'">
|
||||
<div class="padding-vertical">
|
||||
<i class="icon ion-ios-arrow-thin-up size-24"></i>
|
||||
</div>
|
||||
<span translate>Received Funds</span>
|
||||
</div>
|
||||
|
||||
<div ng-show="btx.action == 'moved'">
|
||||
<span translate>Moved Funds</span>
|
||||
</div>
|
||||
<div ng-show="btx.action == 'moved'">
|
||||
<span translate>Moved Funds</span>
|
||||
</div>
|
||||
|
||||
<div ng-show="btx.action == 'invalid'">
|
||||
-
|
||||
|
|
@ -75,14 +75,22 @@
|
|||
</div>
|
||||
|
||||
<div class="item">
|
||||
<div translate>Created by</div>
|
||||
<span>{{btx.creatorName}}</span>
|
||||
<span class="item-note">
|
||||
<time>{{ btx.createdOn * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||
</span>
|
||||
<div ng-if="btx.action == 'received'">
|
||||
<span translate>Date</span>
|
||||
<span class="item-note">
|
||||
<time>{{ btx.time * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||
</span>
|
||||
</div>
|
||||
<div ng-if="btx.action == 'sent'">
|
||||
<div translate>Created by</div>
|
||||
<span>{{btx.creatorName}}</span>
|
||||
<span class="item-note">
|
||||
<time>{{ btx.createdOn * 1000 | amDateFormat:'MM/DD/YYYY HH:mm a'}}</time>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="item" ng-show="btx.action != 'received'" copy-to-clipboard="btx.feeStr">
|
||||
<div class="item" ng-if="btx.action != 'received' && btx.feeLevel" copy-to-clipboard="btx.feeStr">
|
||||
<div translate>Fee</div>
|
||||
<span class="enable_text_select">{{btx.feeLevel}} ({{btx.feeStr}})</span>
|
||||
<span class="right">
|
||||
|
|
|
|||
|
|
@ -30,12 +30,12 @@
|
|||
<span class="badge badge-assertive" ng-show="txpsN>3" translate> {{txpsN}}</span>
|
||||
</a>
|
||||
|
||||
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
|
||||
<a ng-repeat="tx in txps" class="item" ng-click="openTxpModal(tx)">
|
||||
<span ng-include="'views/includes/txp.html'"></span>
|
||||
</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="openNotificationModal(notification)">
|
||||
<span ng-include="'views/includes/walletActivity.html'"></span>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue