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

Merge branch 'master' of github.com:bitpay/copay

Browse source
This commit is contained in:
Jason Dreyzehner 2016-11-16 18:21:25 -05:00
commit 8b7ab38f2b
10 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

14
www/views/confirm.html
View file

@ -7,7 +7,7 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-class="{'slide-to-pay': isCordova && !insuffientFunds && !noMatchingWallet}">
<ion-content ng-class="{'add-bottom-for-cta': !insuffientFunds && !noMatchingWallet}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -77,13 +77,13 @@
</div>
</div>
</div>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
</ion-content>
<click-to-accept
ng-click="approve(statusChangeHandler)"
ng-if="!isCordova && wallets[0]"
click-send-status="sendStatus">
Click to pay
</click-to-accept>
<slide-to-accept
ng-if="isCordova && wallets[0]"
slide-on-confirm="onConfirm()"

9
www/views/feedback/complete.html
View file

@ -1,4 +1,11 @@
<ion-view id="complete" hide-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-buttons side="secondary">
<a ng-show="!fromSettings" class="close-button" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content scroll="false">
<a class="close-button" ng-click="close()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
<div class="complete-layout">
@ -7,7 +14,7 @@
<div class="title" ng-switch-when="true" translate>Thank you!</div>
<div ng-switch-default>
<div class="title" translate>Share BitPay</div>
<img src="img/ico-positive-feedback.svg" class="share-the-love-illustration"/>
<img src="img/ico-positive-feedback.svg" class="share-the-love-illustration"/>
</div>
</div>
<div class="subtitle" ng-show="!skipped && !rated" translate>A member of the team will review your feedback as soon as possible.</div>

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

@ -11,7 +11,7 @@
</button>
</ion-header-bar>
<ion-content ng-init="updateCopayerList()" ng-class="{'slide-to-pay': tx.pendingForUs && canSign && !hasClick}">
<ion-content ng-init="updateCopayerList()" ng-class="{'add-bottom-for-cta': tx.pendingForUs && canSign}">
<div class="list">
<div class="item head">
<div class="sending-label">
@ -150,12 +150,6 @@
</div>
</div>
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
<div class="m30t text-center" ng-if="tx.canBeRemoved || (tx.status == 'accepted' && !tx.broadcastedOn)">
<div class="size-12 padding proposal-deletion-help" ng-show="!tx.isGlidera && isShared" translate>
* A payment proposal can be deleted if 1) you are the creator, and no other copayer has signed, or 2) 24 hours have passed since the proposal was created.
@ -167,6 +161,12 @@
</div>
</ion-content>
<click-to-accept
ng-click="onConfirm(statusChangeHandler)"
ng-if="tx.pendingForUs && canSign && !paymentExpired && hasClick"
click-send-status="sendStatus">
Click to accept
</click-to-accept>
<slide-to-accept
ng-if="tx.pendingForUs && canSign && !paymentExpired && !hasClick"
slide-on-confirm="onConfirm()"

2
www/views/tab-settings.html
View file

@ -36,7 +36,7 @@
<span translate>Send Feedback</span>
<i class="icon bp-arrow-right"></i>
</a>
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.feedback.shareApp({score: 4, skipped: true})">
<a ng-if="isCordova" class="item item-icon-left item-icon-right" ui-sref="tabs.shareApp({score: 4, skipped: true, fromSettings: true})">
<i class="icon big-icon-svg">
<img src="img/icon-send-feedback.svg" class="bg"/>
</i>