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

handles invalid txs in history

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-07-15 10:08:40 -03:00
commit 17d8bd8082
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,9 +14,13 @@
<div class="modal-content fix-modals-touch"> <div class="modal-content fix-modals-touch">
<div class="header-modal text-center"> <div class="header-modal text-center">
<div class="size-42"> <div class="size-42" ng-show="btx.action != 'invalid'">
<span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}} {{settings.unitName}} <span ng-if="btx.action == 'received'">+</span><span ng-if="btx.action == 'sent'">-</span>{{btx.amountStr}} {{settings.unitName}}
</div> </div>
<div class="size-42" ng-show="btx.action == 'invalid'">
<span translate>- </span>
</div>
<div class="size-18 m5t text-gray" ng-show="btx.alternativeAmount"> <div class="size-18 m5t text-gray" ng-show="btx.alternativeAmount">
{{btx.alternativeAmount}} {{settings.alternativeIsoCode}} {{btx.alternativeAmount}} {{settings.alternativeIsoCode}}
</div> </div>
@ -36,6 +40,10 @@
</span> </span>
</span> </span>
</li> </li>
<li ng-if="btx.action == 'invalid'" class="line-b p10 oh">
<span class="right" translate>
This transaction becomed invalid. Possible due to a double spend attempt.
</span>
<li ng-if="btx.time" class="line-b p10 oh"> <li ng-if="btx.time" class="line-b p10 oh">
<span class="text-gray" translate>Date</span>: <span class="text-gray" translate>Date</span>:
<span class="right"> <span class="right">

6
public/views/walletHome.html
View file

@ -454,14 +454,20 @@
ng-style="{'background-color':index.backgroundColor}" translate>Received</span> ng-style="{'background-color':index.backgroundColor}" translate>Received</span>
<span class="label tu gray radius" ng-show="btx.action == 'sent'" translate>Sent</span> <span class="label tu gray radius" ng-show="btx.action == 'sent'" translate>Sent</span>
<span class="label tu gray radius" ng-show="btx.action == 'moved'" translate>Moved</span> <span class="label tu gray radius" ng-show="btx.action == 'moved'" translate>Moved</span>
<span class="label tu warning radius" ng-show="btx.action == 'invalid'" translate>Invalid</span>
</div> </div>
<div class="large-4 medium-4 small-4 columns"> <div class="large-4 medium-4 small-4 columns">
<span class="size-16"> <span class="size-16">
<span ng-if="btx.action == 'received'">+</span> <span ng-if="btx.action == 'received'">+</span>
<span ng-if="btx.action == 'sent'">-</span> <span ng-if="btx.action == 'sent'">-</span>
<span class="size-12" ng-if="btx.action == 'invalid'" translate>
(possible double spend)
</span>
<span ng-if="btx.action != 'invalid'">
{{btx.amountStr}} {{btx.amountStr}}
{{home.getUnitName()}} {{home.getUnitName()}}
</span>
</span> </span>
</div> </div>
<div class="large-4 medium-4 small-4 columns text-right"> <div class="large-4 medium-4 small-4 columns text-right">