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

Merge pull request #2734 from cmgustavo/bug/uri-payment-06

Browse source 
Bug/uri payment 06
This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-15 20:27:30 -03:00
commit 8fdbba8b41
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
public/views/paymentUri.html
View file

@ -5,20 +5,20 @@
</div>
<div class="content p20v row payment-uri" ng-controller="paymentUriController as payment">
<div class="large-12 columns" ng-init="uri = payment.checkBitcoinUri()">
<div class="panel text-center" ng-show="!uri">
<div class="large-12 columns" ng-init="payment.checkBitcoinUri()">
<div class="panel text-center" ng-if="!payment.uri">
<h1 translate>Bitcoin URI is NOT valid!</h1>
</div>
<div ng-show="uri">
<div ng-if="payment.uri">
<h1 translate>Make a payment to</h1>
<div class="panel size-14">
<div class="ellipsis"><b translate>Address</b>: {{uri.address.toString()}}</div>
<div ng-show="uri.amount"><b translate>Amount</b>: {{uri.amount}}</div>
<div ng-show="uri.message"><b translate>Message</b>: {{uri.message}}</div>
<div ng-show="uri.network == 'testnet'"><b translate>Network</b>: {{uri.network}}</div>
<div class="ellipsis"><b translate>Address</b>: {{payment.uri.address.toString()}}</div>
<div ng-show="payment.uri.amount"><b translate>Amount</b>: {{payment.uri.amount}}</div>
<div ng-show="payment.uri.message"><b translate>Message</b>: {{payment.uri.message}}</div>
<div ng-show="payment.uri.network == 'testnet'"><b translate>Network</b>: {{payment.uri.network}}</div>
</div>
<h2 translate>Select a wallet</h2>
<ul class="no-bullet" ng-init="wallets = payment.getWallets(uri.network)">
<ul class="no-bullet" ng-init="wallets = payment.getWallets(payment.uri.network)">
<li class="panel" ng-repeat="w in wallets">
<a ng-click="payment.selectWallet(w.id)">
<div class="avatar-wallet"

6
src/js/controllers/paymentUri.js
View file

@ -29,9 +29,11 @@ angular.module('copayApp.controllers').controller('paymentUriController',
var satToUnit = 1 / unitToSatoshi;
var unitName = config.unitName;
uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName;
if (uri.amount) {
uri.amount = strip(uri.amount * satToUnit) + ' ' + unitName;
}
uri.network = uri.address.network.name;
return uri;
this.uri = uri;
}
};

4
src/js/routes.js
View file

@ -112,7 +112,7 @@ angular
}
}
})
.state('uri-payment', {
.state('payment', {
url: '/uri-payment/:data',
templateUrl: 'views/paymentUri.html',
views: {
@ -385,7 +385,7 @@ angular
walletHome: 0,
copayers: -1,
cordova: -1,
uri-payment: -1,
payment: -1,
preferences: 11,
preferencesColor: 12,