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

Merge branch 'wallet/task/514' of https://github.com/Bitcoin-com/Wallet into wallet/task/514

Browse source
This commit is contained in:
Jean-Baptiste Dominguez 2018-08-07 15:02:43 +09:00
commit e6389567e0
4 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/js/controllers/review.controller.js
View file

@ -448,6 +448,7 @@ function reviewController(addressbookService, bitcoinCashJsService, bitcore, bit
vm.sendingTitle = gettextCatalog.getString('You are paying'); vm.sendingTitle = gettextCatalog.getString('You are paying');
vm.memo = vm.thirdParty.memo; vm.memo = vm.thirdParty.memo;
vm.memoExpanded = !!vm.memo; vm.memoExpanded = !!vm.memo;
vm.destination.name = vm.thirdParty.name;
txPayproData = { txPayproData = {
caTrusted: vm.thirdParty.caTrusted, caTrusted: vm.thirdParty.caTrusted,

2
src/js/services/incomingData.js
View file

@ -414,7 +414,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
var name = payProData.domain; var name = payProData.domain;
if (paymentUrl.indexOf('https://bitpay.com') > -1) { if (paymentUrl.indexOf('https://bitpay.com') > -1) {
name = 'bitpay'; name = 'BitPay';
} }
var thirdPartyData = { var thirdPartyData = {

1
src/sass/components/fee-summary.scss
View file

@ -21,6 +21,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;
width: 100%;
.fee-fiat { .fee-fiat {
&.positive { &.positive {

4
www/views/review.html
View file

@ -48,9 +48,9 @@
<p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p> <p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
</div> </div>
<div class="item-content item-content-avatar" <div class="item-content item-content-avatar"
ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70' && vm.thirdParty.name === 'bitpay'"> ng-if="vm.thirdParty && vm.thirdParty.id === 'bip70' && vm.thirdParty.name === 'BitPay'">
<img src="img/icon-bitpay.svg" class="bg"> <img src="img/icon-bitpay.svg" class="bg">
<h2>BitPay</h2> <h2>{{vm.destination.name}}</h2>
<p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p> <p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p>
<p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p> <p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p>
</div> </div>