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

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

View file

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

View file

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

View file

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