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

Merge pull request #157 from gabrielbazan7/fix/addEntrySend

Browse source 
fix okay button on status modal and others
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-22 11:57:12 -03:00 • committed by GitHub
commit c88df6c599
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/confirm.html
View file

@ -52,6 +52,6 @@
</div>
</div>
</ion-content>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
<accept class="accept-slide" ng-if="isCordova"></accept>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" ng-disabled="!fee" translate>Click to pay</button>
<accept class="accept-slide" ng-if="isCordova && fee"></accept>
</ion-view>

4
public/views/modals/tx-status.html
View file

@ -7,10 +7,10 @@
<div class="size-16 text-gray m10v">
<span translate>Sent</span>
</div>
<div class="text-center m20t" ng-if="entryExist">
<div class="text-center m20t" ng-if="entryExist || !fromSendTab">
<a class="button button-positive" ng-click="cancel()" translate>OKAY</a>
</div>
<div class="collect-address" ng-if="!entryExist">
<div class="collect-address" ng-if="!entryExist && fromSendTab">
<div class="row">
<p translate class="col">Would you like to add this address to your address book?</p>
</div>

2
public/views/modals/txp-details.html
View file

@ -162,5 +162,5 @@
</div>
</ion-content>
<button class="button button-block button-positive accept-button" ng-click="approve()" ng-if="!isCordova" translate>Click to pay</button>
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired"></accept>
<accept class="accept-slide" ng-if="tx.pendingForUs && canSign && !loading && !paymentExpired && isCordova"></accept>
</ion-modal-view>