anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #106 from gabrielbazan7/feat/avatarSendView

Browse source 
avatar in send view
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-14 10:13:32 -03:00 • committed by GitHub
commit d4b9fa99f2
10 changed files with 32 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/amount.js
View file

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

1
src/js/controllers/confirm.js
View file

@ -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;

6
src/js/controllers/tab-send.js
View file

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