use contact icon - fix text size - refactor recipient icon type

src/js/controllers/amount.js

@@ -23,8 +23,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
     $scope.forceCurrency = data.stateParams.forceCurrency;
 
     $scope.showMenu = $ionicHistory.backView() && $ionicHistory.backView().stateName == 'tabs.send';
-    var isWallet = data.stateParams.isWallet || 'false';
+    $scope.recipientType = data.stateParams.recipientType || null;
-    $scope.isWallet = (isWallet.toString().trim().toLowerCase() == 'true' ? true : false);
     $scope.toAddress = data.stateParams.toAddress;
     $scope.toName = data.stateParams.toName;
     $scope.toEmail = data.stateParams.toEmail;
@@ -95,7 +94,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
   $scope.sendMax = function() {
     $scope.showSendMax = false;
     $state.transitionTo('tabs.send.confirm', {
-      isWallet: $scope.isWallet,
+      recipientType: $scope.recipientType,
       toAmount: null,
       toAddress: $scope.toAddress,
       toName: $scope.toName,
@@ -234,7 +233,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
         });
       } else {
         $state.transitionTo('tabs.send.confirm', {
-          isWallet: $scope.isWallet,
+          recipientType: $scope.recipientType,
           toAmount: (amount * unitToSatoshi).toFixed(0),
           toAddress: $scope.toAddress,
           toName: $scope.toName,

src/js/controllers/confirm.js

@@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
     toAmount = data.stateParams.toAmount;
     cachedSendMax = {};
     $scope.useSendMax = data.stateParams.useSendMax == 'true' ? true : false;
-    $scope.isWallet = data.stateParams.isWallet == 'true' ? true : false;
+    $scope.recipientType = data.stateParams.recipientType || null;
     $scope.toAddress = data.stateParams.toAddress;
     $scope.toName = data.stateParams.toName;
     $scope.toEmail = data.stateParams.toEmail;

src/js/controllers/tab-send.js

@@ -23,7 +23,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         originalList.push({
           color: v.color,
           name: v.name,
-          isWallet: true,
+          recipientType: 'wallet',
           getAddress: function(cb) {
             walletService.getAddress(v, false, cb);
           },
@@ -41,6 +41,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
           name: lodash.isObject(v) ? v.name : v,
           address: k,
           email: lodash.isObject(v) ? v.email : null,
+          recipientType: 'contact',
           getAddress: function(cb) {
             return cb(null, k);
           },
@@ -99,7 +100,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         }
         $log.debug('Got toAddress:' + addr + ' | ' + item.name);
         return $state.transitionTo('tabs.send.amount', {
-          isWallet: item.isWallet,
+          recipientType: item.recipientType,
           toAddress: addr,
           toName: item.name,
           toEmail: item.email,

src/js/directives/gravatar.js

@@ -12,10 +12,10 @@ angular.module('copayApp.directives')
         email: '@'
       },
       link: function(scope, el, attr) {
-        if(typeof scope.email === "string"){
+        if (typeof scope.email === "string") {
           scope.emailHash = md5.createHash(scope.email.toLowerCase() || '');
         }
       },
-      template: '<img class="gravatar" alt="{{ name }}" height="{{ height }}"  width="{{ width }}" src="https://secure.gravatar.com/avatar/{{ emailHash }}.jpg?s={{ width }}&d=identicon">'
+      template: '<img class="gravatar" alt="{{ name }}" height="{{ height }}"  width="{{ width }}" src="https://secure.gravatar.com/avatar/{{ emailHash }}.jpg?s={{ width }}&d=mm">'
     };
   });

src/js/routes.js

@@ -274,7 +274,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
      */
 
     .state('tabs.send.amount', {
-        url: '/amount/:isWallet/:toAddress/:toName/:toEmail/:toColor',
+        url: '/amount/:recipientType/:toAddress/:toName/:toEmail/:toColor',
         views: {
           'tab-send@tabs': {
             controller: 'amountController',
@@ -283,7 +283,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('tabs.send.confirm', {
-        url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:useSendMax',
+        url: '/confirm/:recipientType/:toAddress/:toName/:toAmount/:toEmail/:toColor/:description/:useSendMax',
         views: {
           'tab-send@tabs': {
             controller: 'confirmController',

src/sass/views/confirm.scss

@@ -14,4 +14,7 @@
       margin: 5px 0 0 8px;
     }
   }
+  .wallet-name {
+    margin-top: -3px;
+  }
 }

www/views/amount.html

@@ -18,15 +18,20 @@
       <div class="item item-no-bottom-border recipient-label" translate>Recipient</div>
 
       <div class="item item-text-wrap item-icon-left bitcoin-address">
-        <i class="icon big-icon-svg" ng-if="isWallet">
+        <i class="icon big-icon-svg" ng-if="recipientType == 'wallet'">
           <img src="img/icon-wallet.svg" ng-style="{'background-color': toColor}" class="bg"/>
         </i>
-        <span ng-if="!isWallet">
+        <span ng-if="recipientType == 'contact'">
           <i class="icon big-icon-svg" ng-if="isChromeApp">
             <img src="img/contact-placeholder.svg" class="bg"/>
           </i>
           <gravatar ng-if="!isChromeApp" class="send-gravatar" name="{{toName}}" height="30" width="30" email="{{toEmail}}"></gravatar>
         </span>
+        <span ng-if="!recipientType">
+          <i class="icon big-icon-svg">
+            <img src="img/contact-placeholder.svg" class="bg"/>
+          </i>
+        </span>
         <span class="m10l">{{toName || toAddress}}</span>
       </div>
     </div>

www/views/confirm.html

@@ -29,12 +29,8 @@
 
         <div class="item">
           <span class="label" translate>To</span>
-          <span class="payment-proposal-to" ng-if="!isWallet">
+          <span class="payment-proposal-to" ng-if="!recipientType">
-            <img ng-if="cardId" src="img/icon-card.svg" width="34">
+            <img src="img/icon-bitcoin-small.svg">
-            <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>
@@ -50,18 +46,18 @@
             <!-- <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">
+          <div class="wallet" ng-if="recipientType == 'wallet'">
             <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>
+              <span ng-if="toName" class="wallet-name">{{toName}}</span>
             </div>
           </div>
-          <div ng-if="toEmail && !isChromeApp" class="gravatar-contact">
+          <div ng-if="recipientType == 'contact' && !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>
+            <span ng-if="toName">{{toName}}</span>
           </div>
         </div>
         <a class="item item-icon-right" ng-hide="!useSendMax && (insufficientFunds || noMatchingWallet)" ng-click="showWalletSelector()">

www/views/tab-send.html

@@ -42,7 +42,7 @@
             <span translate>Add a Contact</span>
             <i class="icon bp-arrow-right"></i>
           </a>
-          <a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasContacts && !item.isWallet" ng-click="goToAmount(item)">
+          <a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasContacts && item.recipientType != 'wallet'" ng-click="goToAmount(item)">
             <i class="icon big-icon-svg">
               <img src="img/contact-placeholder.svg" class="bg"/ ng-if="isChromeApp">
               <gravatar class="send-gravatar" name="{{item.name}}" width="30" email="{{item.email}}" ng-if="!isChromeApp"></gravatar>
@@ -61,9 +61,9 @@
           <div class="item item-heading">
             <span translate>Transfer to Wallet</span>
           </div>
-          <a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.isWallet" ng-click="goToAmount(item)">
+          <a class="item item-icon-left item-icon-right" ng-repeat="item in list" ng-if="hasWallets && item.recipientType == 'wallet'" ng-click="goToAmount(item)">
-            <!-- <i ng-show="item.isWallet" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> -->
+            <!-- <i ng-show="item.recipientType == 'wallet'" class="icon ion-briefcase size-21" ng-style="{'color':item.color}"></i> -->
-            <i class="icon big-icon-svg" ng-if="item.isWallet">
+            <i class="icon big-icon-svg" ng-if="item.recipientType == 'wallet'">
               <img src="img/icon-wallet.svg" ng-style="{'background-color': item.color}" class="bg"/>
             </i>
             {{item.name}}