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

@ -18,11 +18,11 @@
<div class="send-amount-tool-input amount">
<div class="primary-amount"
ng-class="{long: amountModel.amount.length > 5, 'very-long': amountModel.amount.length > 10}">
<span class="primary-amount-display">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
<span class="primary-amount-display text-selectable">{{ amountModel.amount || 0 }}</span><span class="unit">{{unit}}</span>
</div>
<span ng-show="globalResult">{{globalResult}} {{unit}}</span>
<div class="alternative-amount">
<span>{{alternativeAmount || '0.00'}} {{alternativeUnit}}</span>
<span class="text-selectable">{{alternativeAmount || '0.00'}}</span> <span>{{alternativeUnit}}</span>
</div>
<div class="switch-currencies" ng-click="changeUnit()"><img src="img/icon-convert.svg"></div>
</div>

View file

@ -4,7 +4,7 @@
Close
</button>
<div class="title" translate>
Search Transactions
Search Transactions ({{wallet.coin}})
</div>
</ion-header-bar>
@ -18,6 +18,18 @@
</div>
<div class="list">
<div class="wallet-details__list" ng-show="filteredTxHistory.length === 0 && search != ''">
<div class="text-gray text-center p10t">
{{'No results found'|translate}}
</div>
<div class="p10t text-center">
<button class="button button-small button-primary" ng-click="searchOnBlockchain(search)" translate>
<span ng-if="searchTermIsTxId">{{'Show Transaction on Blockchain'|translate}}</span>
<span ng-if="searchTermIsAddress">{{'Show Address on Blockchain'|translate}}</span>
<span ng-if="!searchTermIsAddress && !searchTermIsTxId">{{'Search on Blockchain'|translate}}</span>
</button>
</div>
</div>
<div class="wallet-details__list" ng-show="txHistory[0]">
<div ng-repeat="btx in txHistorySearchResults track by $index" ng-click="openTx(btx)">
<span ng-include="'views/includes/walletHistory.html'"></span>

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>