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

Merge branch 'wallet/sprint/21' into wallet/task/562

Browse source 
# Conflicts:
#	src/js/controllers/tab-home.controller.js
This commit is contained in:
Sebastiaan Pasma 2018-09-05 14:07:23 +02:00
commit 70663492eb
No known key found for this signature in database
GPG key ID: 9A2B0C8B95A1D26F
49 changed files with 1593 additions and 808 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@
<i class="icon big-icon-svg theme-circle theme-circle-community">
<div class="bg icon-share"></div>
</i>
<span>Share the Wallet App</span>
<span translate>Share the Wallet App</span>
<i class="icon bp-arrow-right"></i>
</a>
</div>

42
www/views/includes/incomingDataMenu.html
View file

@ -9,21 +9,21 @@
<img src="img/icon-bitcoin-small.svg">
</div>
<div class="incoming-data-menu__url__text">
{{data}}
{{data.original}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" ng-click="addToAddressBook(data)">
<a class="incoming-data-menu__item item item-icon-right" ng-click="addToAddressBook(data.toAddress)">
<img src="img/icon-contacts.svg">
<div class="incoming-data-menu__item__text" translate>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)">
<a class="incoming-data-menu__item item item-icon-right" ng-click="sendPaymentToAddress(data.toAddress)">
<img src="img/icon-send-alt.svg">
<div class="incoming-data-menu__item__text" translate>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">
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data.original">
<img src="img/icon-paperclip.svg">
<div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
<i class="icon bp-arrow-right"></i>
@ -38,11 +38,11 @@
<div class="incoming-data-menu__header" translate>Text</div>
<div class="incoming-data-menu__url">
<div class="incoming-data-menu__url__text" style="border: 0;">
{{data}}
{{data.original}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data.original">
<img src="img/icon-paperclip.svg">
<div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
<i class="icon bp-arrow-right"></i>
@ -57,16 +57,40 @@
<div class="incoming-data-menu__header" translate>Private Key</div>
<div class="incoming-data-menu__url">
<div class="incoming-data-menu__url__text" style="border: 0;">
{{data}}
{{data.original}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" ng-click="scanPaperWallet(data)">
<a class="incoming-data-menu__item item item-icon-right" ng-click="scanPaperWallet(data.original)">
<img src="img/icon-import.svg">
<div class="incoming-data-menu__item__text" translate>Sweep paper wallet</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data">
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data.original">
<img src="img/icon-paperclip.svg">
<div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__cancel item" ng-click="hide()" translate>
Cancel
</a>
</div>
<div ng-if="type === 'url'">
<div class="incoming-data-menu__item head">
<div class="incoming-data-menu__header" translate>URL</div>
<div class="incoming-data-menu__url">
<div class="incoming-data-menu__url__text" style="border: 0;">
{{data.original}}
</div>
</div>
</div>
<a class="incoming-data-menu__item item item-icon-right" ng-click="goToUrl(data.original)">
<img src="img/icon-link-external.svg">
<div class="incoming-data-menu__item__text" translate>Open in web browser</div>
<i class="icon bp-arrow-right"></i>
</a>
<a class="incoming-data-menu__item item item-icon-right" copy-to-clipboard="data.original">
<img src="img/icon-paperclip.svg">
<div class="incoming-data-menu__item__text" translate>Copy to clipboard</div>
<i class="icon bp-arrow-right"></i>

12
www/views/paperWallet.html
View file

@ -1,6 +1,6 @@
<ion-view hide-tabs>
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Sweep paper wallet' | translate}}</ion-nav-title>
<ion-nav-title>{{'Sweep Paper Wallet' | translate}}</ion-nav-title>
<ion-nav-back-button>
</ion-nav-back-button>
</ion-nav-bar>
@ -45,19 +45,19 @@
</div>
<div ng-class="ng-hide" ng-show="noMatchingBchWallet">
<div class="text-center size-12 text-gray">
<span>No Bitcoin Cash wallet to transfer funds to found.</span>
<span translate>No Bitcoin Cash wallet to transfer funds to found.</span>
</div>
</div>
</div>
<div ng-class="ng-hide" ng-show="!bchBalance && readyToShow">
<div class="text-center">
<h4 class="text-bold" translate>No Bitcoin Cash found</h4>
<h4 class="text-bold" translate>No Bitcoin Cash found.</h4>
</div>
</div>
<div ng-class="ng-hide" ng-show="btcBalance">
<div class="row">
<div class="col text-center">
<h4 class="text-bold" translate>Bitcoin found:</h4>
<h4 class="text-bold" translate>Bitcoin Core found:</h4>
<div class="size-24">
<span>{{btcBalanceText}}</span>
<div class="size-14 amount-alternative">
@ -95,13 +95,13 @@
</div>
<div ng-class="ng-hide" ng-show="noMatchingBtcWallet">
<div class="text-center size-12 text-gray">
<span>No Bitcoin wallet to transfer funds to found.</span>
<span translate>No Bitcoin Core wallet to transfer funds to found.</span>
</div>
</div>
</div>
<div ng-class="ng-hide" ng-show="!btcBalance && readyToShow">
<div class="text-center">
<h4 class="text-bold" translate>No Bitcoin found</h4>
<h4 class="text-bold" translate>No Bitcoin Core found.</h4>
</div>
</div>
<slide-to-accept-success