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

Merge branch 'master' of https://github.com/bitpay/copay into feat/balance-modal

Browse source
This commit is contained in:
Andy Phillipson 2016-12-13 17:49:09 -05:00
commit 58478b8113
60 changed files with 4475 additions and 2636 deletions
Download patch file Download diff file Expand all files Collapse all files

2
www/views/modals/terms.html
View file

@ -12,7 +12,7 @@
</ion-content>
<div id="agree-to-terms">
<div class="text-center">
<a ng-click="openExternalLink('https://copay.io/disclaimer', true, 'View Terms of Service', 'The official English Terms of Service are available on the BitPay website. Would you like to view them?', 'Open Website', 'Go Back')" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
<a ng-click="openExternalLink()" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
</div>
<div class="row">
<div class="col col-20">

6
www/views/modals/txp-details.html
View file

@ -164,13 +164,15 @@
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
click-send-status="sendStatus"
has-wallet-chosen="true">
Click to accept
</click-to-accept>
<slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
slide-on-confirm="onConfirm()"
slide-send-status="sendStatus">
slide-send-status="sendStatus"
has-wallet-chosen="true">
Slide to accept
</slide-to-accept>
<slide-to-accept-success