fix merge conflicts
This commit is contained in:
Marty Alcala
commit
64d81c55ba
47 changed files with 1035 additions and 406 deletions
18
www/img/ico-positive-feedback.svg
Normal file
18
www/img/ico-positive-feedback.svg
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 17.9 16.4" style="enable-background:new 0 0 17.9 16.4;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#CCCBCB;}
|
||||
.st1{fill:#E86C60;}
|
||||
.st2{fill:#DCDCDC;}
|
||||
.st3{fill:#EEEEEE;}
|
||||
</style>
|
||||
<path class="st0" d="M8.9,12.6c-0.1,0-0.1,0-0.2-0.1L0.2,7.1C0.1,7.1,0,6.9,0,6.8c0-0.1,0.1-0.3,0.2-0.3L8.9,1l8.7,5.4
|
||||
c0.1,0.1,0.2,0.2,0.2,0.3c0,0.1-0.1,0.3-0.2,0.3l-8.5,5.4C9.1,12.6,9,12.6,8.9,12.6z"/>
|
||||
<path class="st1" d="M8.9,6.8L8.7,6.6C8.4,6.3,5.5,3.9,5.5,2.1c0-1.2,0.9-2.1,2-2.1c0.5,0,1,0.2,1.4,0.6C9.3,0.2,9.8,0,10.3,0
|
||||
c1.1,0,2,0.9,2,2.1c0,1.8-2.9,4.2-3.2,4.5L8.9,6.8z"/>
|
||||
<path class="st2" d="M17.5,16.4C17.4,16.4,17.4,16.4,17.5,16.4l-8.9-5l9.2-4.6V16c0,0.1-0.1,0.2-0.1,0.3
|
||||
C17.6,16.3,17.6,16.4,17.5,16.4z"/>
|
||||
<path class="st3" d="M17.5,16.4H0.4c-0.2,0-0.4-0.2-0.4-0.4V6.8l17.7,8.9c0.2,0.1,0.2,0.3,0.2,0.4C17.8,16.3,17.6,16.4,17.5,16.4z"
|
||||
/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1,018 B |
10
www/img/ico-star-filled.svg
Normal file
10
www/img/ico-star-filled.svg
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 17.8 17.8" style="enable-background:new 0 0 17.8 17.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#F8E71C;}
|
||||
</style>
|
||||
<path class="st0" d="M17.7,6c-0.1-0.2-0.2-0.3-0.4-0.3h-5.5L9.3,0.3C9.2,0.1,9.1,0,8.9,0C8.7,0,8.6,0.1,8.5,0.3L5.9,5.8H0.4
|
||||
C0.3,5.8,0.1,5.9,0,6C0,6.2,0,6.4,0.1,6.5l4,4.2l-1.6,6.5c0,0.2,0,0.4,0.2,0.5c0.1,0.1,0.3,0.1,0.5,0l5.7-3.3l5.7,3.3
|
||||
c0.1,0,0.1,0.1,0.2,0.1c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.3,0.2-0.5l-1.6-6.5l4-4.2C17.8,6.4,17.8,6.2,17.7,6z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 654 B |
10
www/img/ico-star.svg
Normal file
10
www/img/ico-star.svg
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 17.8 17.8" style="enable-background:new 0 0 17.8 17.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#F2F2F2;}
|
||||
</style>
|
||||
<path class="st0" d="M17.7,6c-0.1-0.2-0.2-0.3-0.4-0.3h-5.5L9.3,0.3C9.2,0.1,9.1,0,8.9,0C8.7,0,8.6,0.1,8.5,0.3L5.9,5.8H0.4
|
||||
C0.3,5.8,0.1,5.9,0,6C0,6.2,0,6.4,0.1,6.5l4,4.2l-1.6,6.5c0,0.2,0,0.4,0.2,0.5c0.1,0.1,0.3,0.1,0.5,0l5.7-3.3l5.7,3.3
|
||||
c0.1,0,0.1,0.1,0.2,0.1c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.2-0.3,0.2-0.5l-1.6-6.5l4-4.2C17.8,6.4,17.8,6.2,17.7,6z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 654 B |
BIN
www/img/illustration-send-feedback.png
Normal file
BIN
www/img/illustration-send-feedback.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 36 KiB |
11
www/img/social-icons/ico-social-email.svg
Normal file
11
www/img/social-icons/ico-social-email.svg
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 92.8 92.8" style="enable-background:new 0 0 92.8 92.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#7A7A7A;}
|
||||
</style>
|
||||
<path class="st0" d="M46.4,0C20.8,0,0,20.8,0,46.4C0,72,20.8,92.8,46.4,92.8C72,92.8,92.8,72,92.8,46.4C92.8,20.8,72,0,46.4,0z
|
||||
M68.2,61.2c0,1.6-1.3,2.8-2.8,2.8H26c-1.6,0-2.8-1.3-2.8-2.8V38.1L45.7,55l22.5-16.9V61.2z M45.7,49.9L23.2,33
|
||||
c0-1.6,1.3-2.8,2.8-2.8h39.4c1.6,0,2.8,1.3,2.8,2.8L45.7,49.9z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 699 B |
10
www/img/social-icons/ico-social-facebook.svg
Normal file
10
www/img/social-icons/ico-social-facebook.svg
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 92.8 92.8" style="enable-background:new 0 0 92.8 92.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#3B5998;}
|
||||
</style>
|
||||
<path class="st0" d="M46.4,0C20.8,0,0,20.8,0,46.4s20.8,46.4,46.4,46.4C72,92.8,92.8,72,92.8,46.4S72,0,46.4,0z M59.4,29.3h-5.6
|
||||
c-2.5,0-3.7,1.4-3.7,3.8v6.8h8.7l-1.3,8.6H50v23.2h-9.1V48.5h-7.5v-8.6h7.5v-7.4c0-6.8,4.1-11.3,12.3-11.3c3.6,0,6.1,0.4,6.1,0.4
|
||||
V29.3z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 568 B |
12
www/img/social-icons/ico-social-googleplus.svg
Normal file
12
www/img/social-icons/ico-social-googleplus.svg
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 92.8 92.8" style="enable-background:new 0 0 92.8 92.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#DD4B39;}
|
||||
</style>
|
||||
<path class="st0" d="M46.4,0C20.8,0,0,20.8,0,46.4C0,72,20.8,92.8,46.4,92.8C72,92.8,92.8,72,92.8,46.4C92.8,20.8,72,0,46.4,0z
|
||||
M39.8,64.5c-9.9,0-18-8.1-18-18.1c0-10,8.1-18.1,18-18.1c4.7,0,8.9,1.8,12.1,4.7c-3.8,3.6-3.6,3.8-5.1,5.3c-1.8-1.5-3.9-2.6-7-2.6
|
||||
c-5.9,0-10.5,4.8-10.5,10.8c0,5.9,4.6,10.8,10.5,10.8c5.8,0,8.2-2.5,9.7-7.2c-2.8,0-9.7,0-9.7,0v-7.2h17.3
|
||||
C58.3,51.5,54.7,64.5,39.8,64.5z M78.5,47.7h-6.2v6.5h-4.5v-6.5h-6.4v-4.5h6.4v-6.3h4.5v6.3h6.2V47.7z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 860 B |
16
www/img/social-icons/ico-social-message.svg
Normal file
16
www/img/social-icons/ico-social-message.svg
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 92.8 92.8" style="enable-background:new 0 0 92.8 92.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#4A90E2;}
|
||||
.st1{fill:#93C8F4;}
|
||||
.st2{fill:#FFFFFF;}
|
||||
</style>
|
||||
<circle class="st0" cx="46.4" cy="46.4" r="46.4"/>
|
||||
<path class="st1" d="M68.2,52.2c0-7.3-7.9-13.3-17.7-13.3c-9.7,0-17.7,6-17.7,13.3s7.9,13.3,17.7,13.3c1.2,0,2.3-0.1,3.4-0.3
|
||||
l8.6,4.2c0.1,0.1,0.3,0.1,0.5,0.1c0.2,0,0.4-0.1,0.5-0.2c0.3-0.2,0.5-0.5,0.5-0.9v-7.8C66.7,58.4,68.2,55.5,68.2,52.2z"/>
|
||||
<path class="st2" d="M42.3,24.6c-12,0-21.8,7.8-21.8,17.4c0,3.7,1.4,7.2,4.2,10.2v10.3c0,0.4,0.2,0.7,0.5,0.9
|
||||
c0.2,0.1,0.4,0.2,0.5,0.2c0.2,0,0.3,0,0.5-0.1l9.7-4.8c2.1,0.5,4.3,0.8,6.5,0.8c12,0,21.8-7.8,21.8-17.4
|
||||
C64.1,32.4,54.3,24.6,42.3,24.6z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 980 B |
13
www/img/social-icons/ico-social-twitter.svg
Normal file
13
www/img/social-icons/ico-social-twitter.svg
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 92.8 92.8" style="enable-background:new 0 0 92.8 92.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#1DA1F2;}
|
||||
</style>
|
||||
<path class="st0" d="M46.4,0C20.8,0,0,20.8,0,46.4s20.8,46.4,46.4,46.4S92.8,72,92.8,46.4S72,0,46.4,0z M64.3,37.2v1.2
|
||||
c0,12.2-9.3,26.3-26.3,26.3c-5.2,0-10.1-1.1-14.2-3.8c0.7,0.1,1.5,0.2,2.2,0.2c4.3,0,8.3-1.9,11.5-4.4c-4,0-7.5-2.8-8.6-6.4
|
||||
c0.6,0.1,1.1,0.2,1.7,0.2c0.8,0,1.7-0.1,2.5-0.3c-4.2-0.8-7.4-4.6-7.4-9.1V41c1.3,0.7,2.7,1.1,4.2,1.1c-2.5-1.7-4.1-4.5-4.1-7.7
|
||||
c0-1.7,0.5-3.1,1.3-4.5c4.6,5.6,11.4,9.1,19,9.5c-0.2-0.7-0.2-1.4-0.2-2.1c0-5.1,4.1-9.2,9.2-9.2c2.7,0,5.1,1.1,6.8,2.9
|
||||
c2.1-0.4,4.1-1.2,5.8-2.2c-0.7,2.2-2.1,4-4.1,5.1c1.9-0.2,3.6-0.7,5.3-1.5C67.7,34.3,66.1,35.9,64.3,37.2z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 987 B |
20
www/img/social-icons/ico-social-whatsapp.svg
Normal file
20
www/img/social-icons/ico-social-whatsapp.svg
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 92.8 92.8" style="enable-background:new 0 0 92.8 92.8;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#3ACE01;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M47.8,26.5c-10.9,0-19.8,8.9-19.8,19.7c0,3.7,1,7.4,3,10.5l0.5,0.7l-2,7.3l7.5-2l0.7,0.4
|
||||
c3,1.8,6.5,2.8,10.1,2.8h0c10.9,0,19.7-8.9,19.8-19.7c0-5.3-2.1-10.2-5.8-14C58.1,28.6,53.1,26.6,47.8,26.5z M59.5,54.8
|
||||
c-0.5,1.4-2.9,2.7-4,2.8c-1,0.2-2.3,0.2-3.7-0.2c-0.9-0.3-2-0.6-3.4-1.3c-6-2.6-9.8-8.6-10.1-9c-0.3-0.4-2.4-3.2-2.4-6.1
|
||||
c0-2.9,1.5-4.4,2.1-5c0.5-0.6,1.2-0.7,1.6-0.7c0.4,0,0.8,0,1.1,0c0.4,0,0.9-0.1,1.3,1c0.5,1.2,1.7,4.1,1.8,4.4
|
||||
c0.1,0.3,0.2,0.6,0.1,1c-0.2,0.4-0.3,0.6-0.6,1c-0.3,0.3-0.6,0.8-0.9,1C42,44.1,41.7,44.5,42,45c0.3,0.6,1.5,2.5,3.3,4.1
|
||||
c2.3,2,4.2,2.6,4.8,2.9s0.9,0.2,1.3-0.1c0.3-0.4,1.5-1.7,1.9-2.3c0.4-0.6,0.8-0.5,1.3-0.3c0.5,0.2,3.5,1.6,4.1,1.9
|
||||
c0.6,0.3,1,0.4,1.1,0.7C59.9,52.2,59.9,53.4,59.5,54.8z"/>
|
||||
<path class="st0" d="M46.4,0C20.8,0,0,20.8,0,46.4C0,72,20.8,92.8,46.4,92.8S92.8,72,92.8,46.4C92.8,20.8,72,0,46.4,0z M47.8,70.1
|
||||
L47.8,70.1c-4,0-7.9-1-11.4-2.9l-12.6,3.3l3.4-12.3c-2.1-3.6-3.2-7.7-3.2-11.9c0-13.1,10.7-23.8,23.8-23.8c6.4,0,12.3,2.5,16.8,7
|
||||
c4.5,4.5,7,10.5,7,16.8C71.6,59.4,60.9,70.1,47.8,70.1z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.4 KiB |
|
|
@ -2,7 +2,7 @@
|
|||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-back-button>
|
||||
</ion-nav-back-button>
|
||||
<ion-nav-title>BitPay Visa<sup>®</sup> Card</ion-nav-title>
|
||||
<ion-nav-title>BitPay Visa<sup>®</sup> Card ({{card.lastFourDigits}})</ion-nav-title>
|
||||
<ion-nav-buttons side="secondary">
|
||||
<button class="button no-border" ui-sref="tabs.bitpayCard.preferences">
|
||||
<i class="icon ion-ios-settings"></i>
|
||||
|
|
|
|||
99
www/views/feedback/complete.html
Normal file
99
www/views/feedback/complete.html
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<ion-view id="complete">
|
||||
<ion-content scroll="false">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<a ui-sref="tabs.home"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
||||
</div>
|
||||
<div ng-show="skipped && isCordova">
|
||||
<div ng-show="score > 3">
|
||||
<div class="title" translate>Invite friends to BitPay Wallet!</div>
|
||||
<div class="text-center">
|
||||
<i class="icon addressbook-icon-svg">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<span translate>Share the love by inviting your friends.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="score <= 3">
|
||||
<div class="title" translate>Thank you!</div>
|
||||
<div class="subtitle">
|
||||
<span translate>A member of the team will review your feedback as soon as possible.</span>
|
||||
</div>
|
||||
<div class="subtitle" ng-if="score <= 3 || !isCordova">
|
||||
<span translate>If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.</span>
|
||||
</div>
|
||||
<div ng-if="score <= 3 || !isCordova">
|
||||
<div class="text-center">
|
||||
<i class="icon icon-svg">
|
||||
<img src="img/illustration-send-feedback.png"/>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="!skipped || !isCordova">
|
||||
<div class="title" translate>Thank you!</div>
|
||||
<div class="subtitle">
|
||||
<span translate>A member of the team will review your feedback as soon as possible.</span>
|
||||
</div>
|
||||
<div class="subtitle" ng-if="score <= 3 || !isCordova">
|
||||
<span translate>If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.</span>
|
||||
</div>
|
||||
<div ng-if="score <= 3 || !isCordova">
|
||||
<div class="text-center">
|
||||
<i class="icon icon-svg">
|
||||
<img src="img/illustration-send-feedback.png"/>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center" ng-if="score > 3 && isCordova">
|
||||
<span translate>Share the love by inviting your friends.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="share-buttons" ng-if="isCordova && score > 3">
|
||||
<div class="ng-hide" ng-show="socialsharing" ng-if="score >= 4">
|
||||
<div class="row">
|
||||
<div class="ng-hide" ng-show="facebook" ng-click="shareFacebook()">
|
||||
<i class="icon socialsharing-icon">
|
||||
<img src="img/social-icons/ico-social-facebook.svg"/>
|
||||
</i>
|
||||
<span>Facebook</span>
|
||||
</div>
|
||||
<div class="ng-hide" ng-show="twitter" ng-click="shareTwitter()">
|
||||
<i class="icon socialsharing-icon">
|
||||
<img src="img/social-icons/ico-social-twitter.svg"/>
|
||||
</i>
|
||||
<span>Twitter</span>
|
||||
</div>
|
||||
<div class="ng-hide" ng-show="googleplus" ng-click="shareGooglePlus()">
|
||||
<i class="icon socialsharing-icon">
|
||||
<img src="img/social-icons/ico-social-googleplus.svg"/>
|
||||
</i>
|
||||
<span>Google+</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="ng-hide" ng-show="email" ng-click="shareEmail()">
|
||||
<i class="icon socialsharing-icon">
|
||||
<img src="img/social-icons/ico-social-email.svg"/>
|
||||
</i>
|
||||
<span>Email</span>
|
||||
</div>
|
||||
<div class="ng-hide" ng-show="whatsapp" ng-click="shareWhatsapp()">
|
||||
<i class="icon socialsharing-icon">
|
||||
<img src="img/social-icons/ico-social-whatsapp.svg"/>
|
||||
</i>
|
||||
<span>Whatsapp</span>
|
||||
</div>
|
||||
<div ng-click="shareMessage()">
|
||||
<i class="icon socialsharing-icon">
|
||||
<img src="img/social-icons/ico-social-message.svg"/>
|
||||
</i>
|
||||
<span>Message</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
@ -1,18 +1,18 @@
|
|||
<ion-view id="rate-app-store">
|
||||
<ion-view id="rate-app">
|
||||
<ion-content scroll="false">
|
||||
<a class="right skip" ng-click="skip()">Skip</a>
|
||||
<div class="title">
|
||||
<span translate>Thank you!</span>
|
||||
<div>
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
<i class="icon icon-svg">
|
||||
<img src="img/ico-positive-feedback.svg" class="bg"/>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="subtitle">
|
||||
<div class="subtitle text-center">
|
||||
<span translate>5-star ratings help us get BitPay Wallet into more hands, and more users means more resoucers can be committed to the app!</span>
|
||||
</div>
|
||||
<div class="subtitle">
|
||||
<div class="subtitle text-center">
|
||||
<span class="text-bold" translate>Would you be willing to rate BitPay Wallet in the app store?</span>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
|
|
@ -3,12 +3,37 @@
|
|||
<span translate>How do you like BitPay Wallet?</span>
|
||||
<a ng-click="hideCard()" ><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
||||
</div>
|
||||
<div class="stars item item-sub">
|
||||
<button class="button icon ion-android-star" ng-click="setScore(1)" ng-class="{'gold': 1 <= score, 'subtle-gray': 1 > score}"></button>
|
||||
<button class="button icon ion-android-star" ng-click="setScore(2)" ng-class="{'gold': 2 <= score, 'subtle-gray': 2 > score}"></button>
|
||||
<button class="button icon ion-android-star" ng-click="setScore(3)" ng-class="{'gold': 3 <= score, 'subtle-gray': 3 > score}"></button>
|
||||
<button class="button icon ion-android-star" ng-click="setScore(4)" ng-class="{'gold': 4 <= score, 'subtle-gray': 4 > score}"></button>
|
||||
<button class="button icon ion-android-star" ng-click="setScore(5)" ng-class="{'gold': 5 == score, 'subtle-gray': 5 > score}"></button>
|
||||
<div class="row item item-sub" ng-class="{'row-margin': isModal}">
|
||||
<div class="col col-20">
|
||||
<i class="icon icon-svg" ng-click="setScore(1)">
|
||||
<img ng-if="1 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="1 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-20">
|
||||
<i class="icon icon-svg" ng-click="setScore(2)">
|
||||
<img ng-if="2 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="2 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-20">
|
||||
<i class="icon icon-svg" ng-click="setScore(3)">
|
||||
<img ng-if="3 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="3 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-20">
|
||||
<i class="icon icon-svg" ng-click="setScore(4)">
|
||||
<img ng-if="4 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="4 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-20">
|
||||
<i class="icon icon-svg" ng-click="setScore(5)">
|
||||
<img ng-if="5 == score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="5 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="feedback-flow-button" ng-if="button_title">
|
||||
<button type="submit" class="button button-standard button-primary" ng-click="goFeedbackFlow()">
|
||||
|
|
|
|||
51
www/views/feedback/send.html
Normal file
51
www/views/feedback/send.html
Normal file
|
|
@ -0,0 +1,51 @@
|
|||
<ion-view id="send-feedback">
|
||||
<a class="right skip" ng-click="sendFeedback(null,true)" href translate>Skip</a>
|
||||
<ion-content class="has-header" scroll="false">
|
||||
<div class="title">
|
||||
<span>{{reaction}}</span>
|
||||
</div>
|
||||
<div class="row item item-sub">
|
||||
<div class="col col-10">
|
||||
<i class="icon icon-svg" ng-click="setScore(1)">
|
||||
<img ng-if="1 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="1 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-10">
|
||||
<i class="icon icon-svg" ng-click="setScore(2)">
|
||||
<img ng-if="2 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="2 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-10">
|
||||
<i class="icon icon-svg" ng-click="setScore(3)">
|
||||
<img ng-if="3 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="3 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-10">
|
||||
<i class="icon icon-svg" ng-click="setScore(4)">
|
||||
<img ng-if="4 <= score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="4 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="col col-10">
|
||||
<i class="icon icon-svg" ng-click="setScore(5)">
|
||||
<img ng-if="5 == score" src="img/ico-star-filled.svg"/>
|
||||
<img ng-if="5 > score" src="img/ico-star.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="comment">
|
||||
<span translate>{{comment}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<textarea ng-model="feedback" placeholder="Is there anything we could do to improve your experience?" row="40"></textarea>
|
||||
</div>
|
||||
<div class="padding">
|
||||
<button ng-disabled="!feedback" type="submit" class="button button-full button-primary" ng-click="sendFeedback(feedback, false)" translate>
|
||||
Send
|
||||
</button>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
<ion-view id="send-feedback">
|
||||
<a class="right skip" ng-click="sendFeedback(null,true)" href translate>Skip</a>
|
||||
<ion-content class="has-header" scroll="false">
|
||||
<div class="title">
|
||||
<span>{{reaction}}</span>
|
||||
</div>
|
||||
<div class="star">
|
||||
<a><i ng-class="{'gold': 1 <= score, 'subtle-gray': 1 > score}" class="icon ion-android-star"></i></a>
|
||||
<a><i ng-class="{'gold': 2 <= score, 'subtle-gray': 2 > score}" class="icon ion-android-star"></i></a>
|
||||
<a><i ng-class="{'gold': 3 <= score, 'subtle-gray': 3 > score}" class="icon ion-android-star"></i></a>
|
||||
<a><i ng-class="{'gold': 4 <= score, 'subtle-gray': 4 > score}" class="icon ion-android-star"></i></a>
|
||||
<a><i ng-class="{'gold': 5 == score, 'subtle-gray': 5 > score}" class="icon ion-android-star"></i></a>
|
||||
</div>
|
||||
<div class="comment">
|
||||
<span translate>{{comment}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<textarea ng-model="feedback" placeholder="Is there anything we could do to improve your experience?" row="40"></textarea>
|
||||
</div>
|
||||
<div class="padding">
|
||||
<button ng-disabled="!feedback" type="submit" class="button button-full button-primary" ng-click="sendFeedback(feedback, false)" translate>
|
||||
Send
|
||||
</button>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
<ion-view id="thanks-feedback">
|
||||
<ion-content scroll="false">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<a ui-sref="tabs.home()"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
|
||||
</div>
|
||||
<div ng-show="skipped && isCordova">
|
||||
<div class="title" translate>Invite friends to BitPay Wallet!</div>
|
||||
<div>
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<span translate>Share the love by inviting your friends.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="!skipped || !isCordova">
|
||||
<div class="title" translate>Thank you!</div>
|
||||
<div class="subtitle">
|
||||
<span translate>A member of the team will review your feedback as soon as possible.</span>
|
||||
</div>
|
||||
<div class="subtitle" ng-if="score <= 3 || !isCordova">
|
||||
<span translate>If you have additional feedback, please let us know by tapping the "Send feedback" option in the Settings tab.</span>
|
||||
<div class="image">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center" ng-if="score > 3 && isCordova">
|
||||
<span translate>Share the love by inviting your friends.</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="share-buttons" ng-if="isCordova && score > 3">
|
||||
<div class="ng-hide" ng-show="socialsharing" ng-if="score >= 4">
|
||||
<div class="row">
|
||||
<div class="ng-hide" ng-show="facebook" ng-click="shareFacebook()">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
<span>Facebook</span>
|
||||
</div>
|
||||
<div class="ng-hide" ng-show="twitter" ng-click="shareTwitter()">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
<span>Twitter</span>
|
||||
</div>
|
||||
<div class="ng-hide" ng-show="googleplus" ng-click="shareGooglePlus()">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
<span>Google+</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="ng-hide" ng-show="email" ng-click="shareEmail()">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
<span>Email</span>
|
||||
</div>
|
||||
<div class="ng-hide" ng-show="whatsapp" ng-click="shareWhatsapp()">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
<span>Whatsapp</span>
|
||||
</div>
|
||||
<div ng-click="shareMessage()">
|
||||
<i class="icon zero-state-icon">
|
||||
<img src="img/address-book-add.svg"/>
|
||||
</i>
|
||||
<span>Message</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<ion-view>
|
||||
<ion-view id="bitpayCardPreferences">
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-back-button>
|
||||
</ion-nav-back-button>
|
||||
|
|
@ -10,12 +10,14 @@
|
|||
<div class="item item-divider" translate>
|
||||
Cards
|
||||
</div>
|
||||
<div class="item" ng-repeat="card in bitpayCards">
|
||||
xxxx-xxxx-xxxx-{{card.lastFourDigits}}
|
||||
</div>
|
||||
<div class="item item-divider"></div>
|
||||
<div class="item assertive" ng-click="remove()">
|
||||
Removes all data from this device
|
||||
<div class="item item-icon-right" ng-click="remove(card)" ng-repeat="card in bitpayCards">
|
||||
<span class="item-title">
|
||||
xxxx-xxxx-xxxx-{{card.lastFourDigits}}
|
||||
</span>
|
||||
<span class="item-subtitle">
|
||||
{{card.email}}
|
||||
</span>
|
||||
<i class="icon ion-trash-b assertive"></i>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<ion-view>
|
||||
<ion-view class="settings">
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-title>Wallet Service URL</ion-nav-title>
|
||||
<ion-nav-back-button>
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
</ion-nav-bar>
|
||||
<ion-content>
|
||||
|
||||
<div class="list">
|
||||
<label class="item item-input item-stacked-label no-border">
|
||||
<div class="list settings-list settings-input-group">
|
||||
<label class="item item-input item-stacked-label">
|
||||
<span class="input-label">Wallet Service URL</span>
|
||||
<input type="text" id="bwsurl" type="text" name="bwsurl" ng-model="bwsurl.value">
|
||||
<a class="postfix" on-tap="resetDefaultUrl()">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<div class="release ng-hide" ng-show="newRelease" ng-click="openExternalLink('https://github.com/bitpay/copay/releases/latest', true, 'Update Available', 'An update to this app is available. For your security, please update to the latest version.', 'View Update', 'Go Back')">
|
||||
<span translate>An update to this app is available</span><span><i class="icon bp-arrow-right"></i></span>
|
||||
</div>
|
||||
<div class="list card ng-hide" ng-show="!hideRateCard.value">
|
||||
<div class="list card ng-hide" ng-show="showRateCard.value">
|
||||
<span ng-include="'views/feedback/rateCard.html'"></span>
|
||||
</div>
|
||||
<div class="list card homeTip" ng-if="homeTip">
|
||||
|
|
@ -87,33 +87,31 @@
|
|||
<span class="tab-home__wallet__multisig-number" ng-if="wallet.n > 1">
|
||||
{{wallet.m}}-of-{{wallet.n}}
|
||||
</span>
|
||||
<span class="assertive" ng-if="wallet.error">{{wallet.error}}</span>
|
||||
</span>
|
||||
|
||||
</p>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="list card" ng-if="bitpayCardEnabled && bitpayCards[0] && externalServices.BitpayCard">
|
||||
<div class="item item-icon-right item-heading">
|
||||
<span translate>Cards</span>
|
||||
<a ui-sref="tabs.bitpayCardIntro"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||
</div>
|
||||
<div>
|
||||
<a ng-repeat="card in bitpayCards"
|
||||
ui-sref="tabs.bitpayCard({id:card.id})"
|
||||
ng-if="bitpayCardEnabled && bitpayCards[0]"
|
||||
class="item item-sub item-icon-left item-big-icon-left item-icon-right">
|
||||
<i class="icon big-icon-svg">
|
||||
<div class="bg icon-bitpay-card"></div>
|
||||
</i>
|
||||
<span>BitPay Visa® Card</span>
|
||||
<span>BitPay Visa® Card ({{card.lastFourDigits}})</span>
|
||||
<p>{{cardsHistory[card.id].balance ? '$' + cardsHistory[card.id].balance : 'Add funds to get started'|translate}}</p>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
</a>
|
||||
<a ui-sref="tabs.bitpayCardIntro"
|
||||
ng-if="bitpayCardEnabled && !bitpayCards[0] && externalServices.BitpayCard"
|
||||
class="item item-sub item-icon-left item-big-icon-left item-icon-right">
|
||||
<i class="icon big-icon-svg">
|
||||
<div class="bg icon-bitpay-card"></div>
|
||||
</i>
|
||||
<span>BitPay Visa® Card</span>
|
||||
<p translate>Add your card</p>
|
||||
<i class="icon bp-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
|
||||
</ion-nav-bar>
|
||||
<ion-content scroll="false">
|
||||
<div class="list card padding text-center" ng-if="!wallets[0]">
|
||||
<article class="list card padding text-center" ng-if="!wallets[0]">
|
||||
<span translate>No Wallet</span>
|
||||
</div>
|
||||
<div id="address" ng-if="wallets[0]">
|
||||
<article class="text-center" ng-if="!wallet">
|
||||
</article>
|
||||
<article id="address" ng-if="wallets[0]">
|
||||
<div id="address-info" class="text-center" ng-if="!wallet">
|
||||
<div class="row qr">
|
||||
<div class="text-center col center-block">
|
||||
<div style="height:225px; width:220px; margin:auto; background: white; padding-top: 25%;">
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
<article class="text-center" ng-if="wallet && !wallet.isComplete()">
|
||||
</div>
|
||||
<div id="address-info" class="text-center" ng-if="wallet && !wallet.isComplete()">
|
||||
<div class="incomplete">
|
||||
<div class="title">
|
||||
<span translate>Incomplete wallet</span>
|
||||
|
|
@ -44,17 +44,17 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
<article ng-if="wallet && wallet.isComplete()">
|
||||
</div>
|
||||
<div id="address-info" ng-if="wallet && wallet.isComplete()">
|
||||
<div class="row backup" ng-show="wallet.needsBackup" ng-click="openBackupNeededModal()">
|
||||
<div class="text-center col center-block">
|
||||
<i class="icon ion-alert"></i><span translate>Wallet not backed up</span><i class="icon ion-ios-arrow-thin-right"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row qr">
|
||||
<div class="text-center col center-block" copy-to-clipboard="addr">
|
||||
<qrcode ng-if="addr" size="220" data="bitcoin:{{addr}}" color="#334"></qrcode>
|
||||
<div ng-if="!addr" style="height:225px; width:220px; margin:auto; background: white; padding-top: 25%;">
|
||||
<div class="text-center col center-block" copy-to-clipboard="addr" ng-repeat="wallet in wallets track by $index" ng-class="walletPosition($index)">
|
||||
<qrcode ng-if="walletAddrs[wallet.id]" size="220" data="bitcoin:{{walletAddrs[wallet.id]}}" color="#334"></qrcode>
|
||||
<div ng-if="!walletAddrs[wallet.id]" style="height:225px; width:220px; margin:auto;padding-top: 25%;position:absolute;left:50%;top:50%;z-index:1;">
|
||||
...
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -72,20 +72,35 @@
|
|||
</div>
|
||||
</div>
|
||||
<div id="bit-address" class="row border-top">
|
||||
<div class="col col-90 center-block bit-address text-center">
|
||||
<div class="center-block bit-address text-center" ng-repeat="wallet in wallets track by $index" ng-class="walletPosition($index)">
|
||||
<div class="item item-icon-left item-icon-right">
|
||||
<i class="icon icon-svg receive-tab-bitcoin-icon"><img src="img/icon-bitcoin-symbol.svg"></i>
|
||||
<span class="bit-address-gen-address" ng-if="generatingAddress">...</span>
|
||||
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
|
||||
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="walletAddrs[wallet.id]">{{walletAddrs[wallet.id]}}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
<article id="wallets" ng-if="wallets[0]">
|
||||
<div class="list">
|
||||
<wallets wallets="wallets"></wallets>
|
||||
</div>
|
||||
</article>
|
||||
<article id="wallets" ng-if="wallets[0]">
|
||||
<div id="sidebar-wallet" class="list">
|
||||
<div id="wallet-list">
|
||||
<div class="wallet" ng-repeat="wallet in wallets track by $index" ng-click="setWallet($index)" ng-class="walletPosition($index)">
|
||||
<div class="card">
|
||||
<div class="item item-icon-left text-right" ng-class="{'noBalance': !wallet.status.availableBalanceStr}">
|
||||
<i class="icon big-icon-svg">
|
||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||
</i>
|
||||
<span class="wallet-name">{{wallet.name || wallet.id}}</span>
|
||||
<span class="item-note m10l">
|
||||
{{wallet.status.availableBalanceStr}}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<wallets id="wallet-slider" wallets="wallets" options="sliderOptions"></wallets>
|
||||
</article>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
Wallet not backed up
|
||||
</a>
|
||||
|
||||
<div class="p60b" ng-show="wallet && wallet.isComplete()" style="padding-top: 1rem;">
|
||||
<div class="p60b" ng-show="wallet && wallet.isComplete() && !walletNotRegistered" style="padding-top: 1rem;">
|
||||
<div class="oh pr m20t" ng-show="wallet.incorrectDerivation">
|
||||
<div class="text-center text-warning">
|
||||
<i class="fi-alert"></i>
|
||||
|
|
@ -152,25 +152,6 @@
|
|||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="oh pr m20t" ng-show="notAuthorized && !updatingStatus">
|
||||
<div class="text-center text-warning">
|
||||
<i class="fi-alert"></i>
|
||||
<span translate>
|
||||
WARNING: Wallet not registered
|
||||
</span>
|
||||
</div>
|
||||
<div class="text-center text-gray m15r m15l" translate>
|
||||
This wallet is not registered at the given Bitcore Wallet Service (BWS). You can recreate it from the local information.
|
||||
</div>
|
||||
<div class="text-center m10t ">
|
||||
<span class="button outline round dark-gray tiny"
|
||||
ng-click="recreate()">
|
||||
<span translate>Recreate</span>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="list" ng-if="txps[0]">
|
||||
<!-- <div class="item item-heading" translate>
|
||||
<span ng-show="requiresMultipleSignatures" translate>Payment Proposals</span>
|
||||
|
|
@ -193,7 +174,7 @@
|
|||
<!-- Transactions -->
|
||||
|
||||
<div class="oh pr m20t text-gray size-12 text-center"
|
||||
ng-show="!txHistory[0] && !updatingTxHistory && !txHistoryError && !updateStatusError && !notAuthorized" translate>
|
||||
ng-show="!txHistory[0] && !updatingTxHistory && !txHistoryError && !updateStatusError" translate>
|
||||
No transactions yet
|
||||
</div>
|
||||
|
||||
|
|
@ -283,6 +264,7 @@
|
|||
on-infinite="showMore()"
|
||||
distance="1%">
|
||||
</ion-infinite-scroll>
|
||||
</div>
|
||||
</ion-content>
|
||||
</div>
|
||||
</ion-view>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue