From 9472f095eb6002234881f0998f6a8de2f458231b Mon Sep 17 00:00:00 2001
From: JDonadio <tanojaja@gmail.com>
Date: Mon, 20 Feb 2017 10:25:52 -0500
Subject: [PATCH] use icon properly

---
 src/js/controllers/amount.js  |  4 +++-
 src/js/controllers/confirm.js |  8 ++++----
 src/js/routes.js              |  2 +-
 src/sass/views/confirm.scss   |  7 +++++++
 www/views/confirm.html        | 23 ++++++++++++++++++++---
 5 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 539d01234..9701a951e 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -100,6 +100,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
       toAddress: $scope.toAddress,
       toName: $scope.toName,
       toEmail: $scope.toEmail,
+      toColor: $scope.toColor,
       useSendMax: true,
     });
   };
@@ -237,7 +238,8 @@ angular.module('copayApp.controllers').controller('amountController', function($
           toAmount: (amount * unitToSatoshi).toFixed(0),
           toAddress: $scope.toAddress,
           toName: $scope.toName,
-          toEmail: $scope.toEmail
+          toEmail: $scope.toEmail,
+          toColor: $scope.toColor,
         });
       }
     }
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 5d38db39a..e2cadede5 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -14,11 +14,11 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     toAmount = data.stateParams.toAmount;
     cachedSendMax = {};
     $scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false;
-    var isWallet = data.stateParams.isWallet || 'false';
-    $scope.isWallet = (isWallet.toString().trim().toLowerCase() == 'true' ? true : false);
+    $scope.isWallet = data.stateParams.isWallet == 'true' ? true : false;
     $scope.toAddress = data.stateParams.toAddress;
     $scope.toName = data.stateParams.toName;
     $scope.toEmail = data.stateParams.toEmail;
+    $scope.toColor = data.stateParams.toColor;
     $scope.description = data.stateParams.description;
     $scope.paypro = data.stateParams.paypro;
     $scope.insufficientFunds = false;
@@ -503,8 +503,8 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     $log.debug('statusChangeHandler: ', processName, showName, isOn);
     if (
       (
-        processName === 'broadcastingTx' || 
-        ((processName === 'signingTx') && $scope.wallet.m > 1) || 
+        processName === 'broadcastingTx' ||
+        ((processName === 'signingTx') && $scope.wallet.m > 1) ||
         (processName == 'sendingTx' && !$scope.wallet.canSign() && !$scope.wallet.isPrivKeyExternal())
       ) && !isOn) {
       $scope.sendStatus = 'success';
diff --git a/src/js/routes.js b/src/js/routes.js
index a7c1e7c87..bbe78a4cd 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -283,7 +283,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('tabs.send.confirm', {
-        url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description/:useSendMax',
+        url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:useSendMax',
         views: {
           'tab-send@tabs': {
             controller: 'confirmController',
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
index 0f5288a41..0b542c8f2 100644
--- a/src/sass/views/confirm.scss
+++ b/src/sass/views/confirm.scss
@@ -7,4 +7,11 @@
   .tx-details-content > .scroll {
     padding-bottom: .25rem;
   }
+  .gravatar-contact {
+    display: flex;
+    margin-left: -3px;
+    span {
+      margin: 5px 0 0 8px;
+    }
+  }
 }
diff --git a/www/views/confirm.html b/www/views/confirm.html
index c4c1a1705..84230542e 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -26,11 +26,15 @@
           <span class="item-note" ng-if="!paymentExpired.value">{{remainingTimeStr.value}}</span>
           <span class="item-note" ng-if="paymentExpired.value" ng-style="{'color': 'red'}" translate>Expired</span>
         </div>
- 
+
         <div class="item">
           <span class="label" translate>To</span>
-          <span class="payment-proposal-to">
-            <img src="img/icon-bitcoin-small.svg">
+          <span class="payment-proposal-to" ng-if="!isWallet">
+            <img ng-if="cardId" src="img/icon-card.svg" width="34">
+            <i ng-if="isGiftCard" class="icon big-icon-svg">
+              <div class="bg icon-amazon"></div>
+            </i>
+            <img ng-if="isGlidera" src="img/glidera-logo.png" width="90"/>
 
             <div copy-to-clipboard="toAddress" ng-if="!paypro" class="ellipsis">
               <contact ng-if="!toName" address="{{toAddress}}"></contact>
@@ -46,6 +50,19 @@
             <!-- <contact ng-if="!tx.hasMultiplesOutputs" class="ellipsis" address="{{toAddress}}"></contact>
             <span ng-if="tx.hasMultiplesOutputs" translate>Multiple recipients</span> -->
           </span>
+          <div class="wallet" ng-if="isWallet">
+            <i class="icon big-icon-svg">
+              <img src="img/icon-wallet.svg" ng-style="{'background-color': toColor}" class="bg"/>
+            </i>
+            <div copy-to-clipboard="toAddress" class="ellipsis">
+              <contact ng-if="!toName" address="{{toAddress}}"></contact>
+              <span class="size-14" ng-if="toName">{{toName}}</span>
+            </div>
+          </div>
+          <div ng-if="toEmail && !isChromeApp" class="gravatar-contact">
+            <gravatar class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
+            <span class="size-14" ng-if="toName">{{toName}}</span>
+          </div>
         </div>
         <a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">
           <span class="label" translate>From</span>