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 @@
Recipient
-
+
{{toName || toAddress}}
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 @@
-
+
@@ -23,7 +23,7 @@
-
+
{{toAddress}}
{{toName}}
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 @@
No Wallet - Contact
-
+
{{item.name}}
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 77955cf2a..e0d11efac 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -235,7 +235,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
template: ''
})
.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;
+ }
}