From c21d447031c00b4876ec67298a14585f907b2199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= <gabrielbazan7@hotmail.com>
Date: Wed, 14 Sep 2016 10:04:16 -0300
Subject: [PATCH] avatar in send view

---
 public/views/amount.html       | 2 +-
 public/views/confirm.html      | 4 ++--
 public/views/tab-send.html     | 2 +-
 src/js/controllers/amount.js   | 2 ++
 src/js/controllers/confirm.js  | 1 +
 src/js/controllers/tab-send.js | 6 ++++--
 src/js/routes.js               | 4 ++--
 src/sass/views/amount.scss     | 6 +++++-
 src/sass/views/confirm.scss    | 9 +++++++++
 src/sass/views/tab-send.scss   | 5 +++++
 10 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 src/sass/views/confirm.scss

diff --git a/public/views/amount.html b/public/views/amount.html
index cc39806df..e06f6ae9a 100644
--- a/public/views/amount.html
+++ b/public/views/amount.html
@@ -13,7 +13,7 @@
       <div class="item item-no-bottom-border" translate>Recipient</div>
 
       <div class="item item-text-wrap item-icon-left bitcoin-address">
-        <i class="icon ion-ios-person-outline"></i>
+        <gravatar class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
         <span>{{toName || toAddress}}</span>
       </div>
     </div>
diff --git a/public/views/confirm.html b/public/views/confirm.html
index a36da1bc9..c763a8dfd 100644
--- a/public/views/confirm.html
+++ b/public/views/confirm.html
@@ -1,4 +1,4 @@
-<ion-view>
+<ion-view id="view-confirm">
   <ion-nav-bar class="bar-royal">
     <ion-nav-back-button>
       <i class="icon ion-ios-arrow-thin-left"></i>
@@ -23,7 +23,7 @@
       </div>
 
       <div class="item item-icon-left">
-        <i class="icon ion-ios-person-outline"></i>
+        <gravatar class="send-gravatar" name="{{toName}}" width="30" email="{{toEmail}}"></gravatar>
         <label translate>To</label> {{toAddress}}
         <p ng-show="toName">{{toName}}</p>
 
diff --git a/public/views/tab-send.html b/public/views/tab-send.html
index 4da7003e1..c7d278453 100644
--- a/public/views/tab-send.html
+++ b/public/views/tab-send.html
@@ -24,7 +24,7 @@
       <div class="item text-center" ng-show="!list[0]" translate>No Wallet - Contact</div>
       <a class="item item-icon-left" ng-repeat="item in list" 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.isWallet" class="icon ion-ios-person-outline"></i>
+        <gravatar class="send-gravatar" ng-show="!item.isWallet" name="{{item.name}}" width="30" email="{{item.email}}"></gravatar>
         {{item.name}}
       </a>
     </div>
diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js
index 285771d19..c68f6bfab 100644
--- a/src/js/controllers/amount.js
+++ b/src/js/controllers/amount.js
@@ -50,6 +50,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
 
     $scope.toAddress = $stateParams.toAddress;
     $scope.toName = $stateParams.toName;
+    $scope.toEmail = $stateParams.toEmail;
 
     var config = configService.getSync().wallet.settings;
     $scope.unitName = config.unitName;
@@ -191,6 +192,7 @@ angular.module('copayApp.controllers').controller('amountController', function($
       toAmount: amount * unitToSatoshi,
       toAddress: $scope.toAddress,
       toName: $scope.toName,
+      toEmail: $scope.toEmail
     });
   };
 });
diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js
index 58ca12906..b8929324f 100644
--- a/src/js/controllers/confirm.js
+++ b/src/js/controllers/confirm.js
@@ -102,6 +102,7 @@ angular.module('copayApp.controllers').controller('confirmController', function(
 
     $scope.toAddress = $stateParams.toAddress;
     $scope.toName = $stateParams.toName;
+    $scope.toEmail = $stateParams.toEmail;
     $scope.description = $stateParams.description;
     $scope.paypro = $stateParams.paypro;
 
diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js
index a9756e008..d483f92c6 100644
--- a/src/js/controllers/tab-send.js
+++ b/src/js/controllers/tab-send.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, addressbookService, profileService, lodash, $state, walletService, incomingData ) {
+angular.module('copayApp.controllers').controller('tabSendController', function($scope, $log, $timeout, addressbookService, profileService, lodash, $state, walletService, incomingData) {
 
   var originalList;
 
@@ -30,6 +30,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
         contacts.push({
           name: lodash.isObject(v) ? v.name : v,
           address: k,
+          email: lodash.isObject(v) ? v.email : null,
           getAddress: function(cb) {
             return cb(null, k);
           },
@@ -76,7 +77,8 @@ angular.module('copayApp.controllers').controller('tabSendController', function(
       $log.debug('Got toAddress:' + addr + ' | ' + item.name);
       return $state.transitionTo('send.amount', {
         toAddress: addr,
-        toName: item.name
+        toName: item.name,
+        toEmail: item.email
       })
     });
   };
diff --git a/src/js/routes.js b/src/js/routes.js
index 0c2158085..b73cfc5fe 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -235,7 +235,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         template: '<ion-nav-view name="send"></ion-nav-view>'
       })
       .state('send.amount', {
-        url: '/amount/:toAddress/:toName',
+        url: '/amount/:toAddress/:toName/:toEmail',
         views: {
           'send': {
             templateUrl: 'views/amount.html'
@@ -243,7 +243,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         }
       })
       .state('send.confirm', {
-        url: '/confirm/:toAddress/:toName/:toAmount/:description/:paypro',
+        url: '/confirm/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro',
         views: {
           'send': {
             templateUrl: 'views/confirm.html'
diff --git a/src/sass/views/amount.scss b/src/sass/views/amount.scss
index d89984be6..e459a46dd 100644
--- a/src/sass/views/amount.scss
+++ b/src/sass/views/amount.scss
@@ -9,7 +9,11 @@
       padding-left: 48px;
     }
   }
-
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
   .amount-pane {
     position: absolute;
     top: 125px;
diff --git a/src/sass/views/confirm.scss b/src/sass/views/confirm.scss
new file mode 100644
index 000000000..250509796
--- /dev/null
+++ b/src/sass/views/confirm.scss
@@ -0,0 +1,9 @@
+#view-confirm {
+
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
+  
+}
diff --git a/src/sass/views/tab-send.scss b/src/sass/views/tab-send.scss
index 44d2a2b1b..bc8664ec0 100644
--- a/src/sass/views/tab-send.scss
+++ b/src/sass/views/tab-send.scss
@@ -11,4 +11,9 @@
         padding-bottom: 1px;
     }
   }
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
 }