Fix conflict

www/views/confirm.html

@@ -23,17 +23,18 @@
         <div class="item">
           <span class="label" translate>To</span>
           <span class="payment-proposal-to" copy-to-clipboard="toAddress">
-            <img ng-if="isWallet" src="img/icon-bitcoin-small.svg">
+            <img ng-if="!cardId" src="img/icon-bitcoin-small.svg">
+            <img ng-if="cardId" src="img/icon-card.svg" width="34">
             <i ng-if="cardId" class="icon big-icon-svg">
               <div class="bg icon-bitpay-card"></div>
             </i>
             <span ng-show="toName">{{toName}}</span>
+            <contact class="ellipsis" address="{{toAddress}}">{{toAddress}}</contact>
             <div ng-show="_paypro" ng-click="openPPModal(_paypro)">
               <i ng-show="_paypro.verified && _paypro.caTrusted" class="ion-locked" style="color:green"></i>
               <i ng-show="!_paypro.caTrusted" class="ion-unlocked" style="color:red"></i>
               {{_paypro.domain}}
             </div>
-            <contact class="ellipsis" address="{{toAddress}}">{{toAddress}}</contact>
             <!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>
             <span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
           </span>

www/views/tab-home.html

@@ -78,8 +78,6 @@
               {{wallet.m}}-of-{{wallet.n}}
             </span>
           </span>
-        </span>
-
           <p>
           <span ng-if="!wallet.isComplete()" class="assertive" translate>
             Incomplete
@@ -92,6 +90,7 @@
           </p>
           <i class="icon bp-arrow-right"></i>
         </a>
+
         <a ng-repeat="card in bitpayCards"
            ui-sref="tabs.bitpayCard({id:card.id})"
            ng-if="bitpayCardEnabled && bitpayCards[0]"
@@ -114,6 +113,7 @@
           <i class="icon bp-arrow-right"></i>
         </a>
       </div>
+    </div>
 
     <div class="list card" ng-if="wallets[0] && externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
       <div class="item item-sub item-icon-right item-heading" translate>