Merge pull request #106 from gabrielbazan7/feat/avatarSendView

avatar in send view

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
     });
   };
 });

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;
 

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
       })
     });
   };

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'

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;

src/sass/views/confirm.scss

@@ -0,0 +1,9 @@
+#view-confirm {
+
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
+  
+}

src/sass/views/tab-send.scss

@@ -11,4 +11,9 @@
         padding-bottom: 1px;
     }
   }
+  .send-gravatar {
+    left: 11px;
+    position: absolute;
+    top: 10px;
+  }
 }