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

src/js/controllers/review.controller.js

@@ -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,

src/js/services/incomingData.js

@@ -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 = {

src/sass/components/fee-summary.scss

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

www/views/review.html

@@ -48,9 +48,9 @@
             <p ng-if="vm.destination.balanceAmount">{{vm.destination.balanceAmount}} {{vm.destination.balanceCurrency}}</p>
           </div>
           <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">
-            <h2>BitPay</h2>
+            <h2>{{vm.destination.name}}</h2>
             <p translate ng-if="!vm.paymentExpired">Payment expires: {{vm.remainingTimeStr}}</p>
             <p class="warning" translate ng-if="vm.paymentExpired">Payment request has expired</p>
           </div>