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

Merge pull request #4916 from msalcala11/scanHandling

Browse source 
Scan handling
This commit is contained in:
Matias Alejo Garcia 2016-10-28 11:28:37 -03:00 • committed by GitHub
commit ab1191695b
31 changed files with 575 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

12
www/views/confirm.html
View file

@ -20,7 +20,7 @@
</div>
</div>
<div class="info">
<div class="item single-line" ng-if="_paypro">
<div class="item single-line" ng-if="paypro">
<span class="label" translate>Payment Expires:</span>
<span class="item-note" ng-if="!paymentExpired.value">{{remainingTimeStr.value}}</span>
<span class="item-note" ng-if="paymentExpired.value" ng-style="{'color': 'red'}" translate>Expired</span>
@ -31,15 +31,15 @@
<img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
<img ng-if="cardId" src="img/icon-card.svg" width="34">
<div copy-to-clipboard="toAddress" ng-if="!_paypro" class="ellipsis">
<div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
<contact ng-if="!toName" address="{{toAddress}}"></contact>
<span class="m15l size-14" ng-if="toName">{{toName}}</span>
</div>
<div ng-if="_paypro" ng-click="openPPModal(_paypro)" class="m15l size-14 w100p pointer">
<i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
<i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
<span class="ellipsis" ng-show="!toName">{{_paypro.domain || _paypro.toAddress}}</span>
<div ng-if="paypro" ng-click="openPPModal(paypro)" class="m15l size-14 w100p pointer">
<i ng-show="paypro.verified && paypro.caTrusted" class="ion-locked" style="color:green"></i>
<i ng-show="!paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
<span class="ellipsis" ng-show="!toName">{{paypro.domain || paypro.toAddress}}</span>
<span ng-show="toName">{{toName}}</span>
</div>
<!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>

6
www/views/includes/actionSheet.html
View file

@ -1,10 +1,8 @@
<div
class="bp-action-sheet__backdrop"
ng-class="{'fade-in': show}"
ng-class="{'fade-in': revealMenu}"
ng-click="hide()">
</div>
<div class="bp-action-sheet__sheet" ng-class="{'slide-up': show}">
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
<div class="header">Send from</div>
<div class="bp-action-sheet__sheet" ng-class="{'slide-up': revealMenu}">
<ng-transclude></ng-transclude>
</div>

78
www/views/includes/incomingDataMenu.html Normal file
View file

@ -0,0 +1,78 @@
<action-sheet
action-sheet-show="showMenu">
<div ng-if="type === 'url'">
<div class="incoming-data-menu__item head">
<div class="incoming-data-menu__header">Website</div>
<div class="incoming-data-menu__url">
<div class="incoming-data-menu__url__icon">
<img ng-hide="https" src="img/icon-lock-x.svg" style="height: 22px;">
<img ng-show="https" src="img/icon-lock-green.svg" style="height: 22px;">
</div>
<div class="incoming-data-menu__url__text">
{{data}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" ng-click="goToUrl(data)">
<img src="img/icon-link-external.svg">
<div class="incoming-data-menu__item__text">Open website</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__cancel item" ng-click="hide()">
Cancel
</a>
</div>
<div ng-if="type === 'bitcoinAddress'">
<div class="incoming-data-menu__item head">
<div class="incoming-data-menu__header">Bitcoin Address</div>
<div class="incoming-data-menu__url">
<div class="incoming-data-menu__url__icon">
<img src="img/icon-bitcoin-small.svg">
</div>
<div class="incoming-data-menu__url__text">
{{data}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" ng-click="addToAddressBook(data)">
<img src="img/icon-contacts.svg">
<div class="incoming-data-menu__item__text">Add as a contact</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__item item item-icon-right" ng-click="sendPaymentToAddress(data)">
<img src="img/icon-send-alt.svg">
<div class="incoming-data-menu__item__text">Send payment to this address</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
<img src="img/icon-paperclip.svg">
<div class="incoming-data-menu__item__text">Copy to clipboard</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__cancel item" ng-click="hide()">
Cancel
</a>
</div>
<div ng-if="type === 'text'">
<div class="incoming-data-menu__item head">
<div class="incoming-data-menu__header">Text</div>
<div class="incoming-data-menu__url">
<div class="incoming-data-menu__url__text" style="border: 0;">
{{data}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
<img src="img/icon-paperclip.svg">
<div class="incoming-data-menu__item__text">Copy to clipboard</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__cancel item" ng-click="hide()">
Cancel
</a>
</div>
</action-sheet>

2
www/views/includes/walletSelector.html
View file

@ -1,4 +1,6 @@
<action-sheet action-sheet-show="show" class="wallet-selector">
<img class="back-arrow" src="img/icon-back-arrow.svg" ng-click="hide()">
<div class="header">Send from</div>
<a
ng-repeat="w in wallets track by $index"
class="item item-icon-left item-big-icon-left item-icon-right wallet"

26
www/views/modals/paypro.html
View file

@ -19,38 +19,38 @@
</div>
<div class="item">
{{'Pay To'|translate}}
<span class="item-note">{{_paypro.domain}}</span>
<span class="item-note">{{paypro.domain}}</span>
</div>
<div class="item" ng-if="_paypro.toAddress">
<div class="item" ng-if="paypro.toAddress">
{{'Address'|translate}}
<span class="item-note">{{_paypro.toAddress}}</span>
<span class="item-note">{{paypro.toAddress}}</span>
</div>
<div class="item">
{{'Certified by'|translate}}
<span class="item-note">
<span ng-show="_paypro.caTrusted">
<span ng-show="paypro.caTrusted">
<i class="ion-locked" style="color:green"></i>
{{_paypro.caName}}<br>
{{paypro.caName}}<br>
<span translate>(Trusted)</span>
</span>
<span ng-show="!_paypro.caTrusted">
<span ng-show="_paypro.selfSigned">
<span ng-show="!paypro.caTrusted">
<span ng-show="paypro.selfSigned">
<i class="ion-unlocked" style="color:red"></i> <span translate>Self-signed Certificate</span>
</span>
<span ng-show="!_paypro.selfSigned">
<i class="ion-locked" style="color:yellow"></i>{{_paypro.caName}}<br>
<span ng-show="!paypro.selfSigned">
<i class="ion-locked" style="color:yellow"></i>{{paypro.caName}}<br>
<span translate>WARNING: UNTRUSTED CERTIFICATE</span>
</span>
</span>
</span>
</div>
<div class="item" ng-if="_paypro.memo">
<div class="item" ng-if="paypro.memo">
{{'Memo'|translate}}
<span class="item-note wrapword">{{_paypro.memo}}</span>
<span class="item-note wrapword">{{paypro.memo}}</span>
</div>
<div class="item" ng-if="_paypro.expires">
<div class="item" ng-if="paypro.expires">
{{'Expires'|translate}}
<span class="item-note">{{_paypro.expires * 1000 | amTimeAgo }}</span>
<span class="item-note">{{paypro.expires * 1000 | amTimeAgo }}</span>
</div>
</div>
</ion-content>

1
www/views/tab-scan.html
View file

@ -42,4 +42,5 @@
</div>
</div>
</ion-content>
</ion-view>