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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-18 17:23:43 -04:00
commit 78bd523391
272 changed files with 8069 additions and 5496 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/js/directives/incomingDataMenu.js
View file

@ -21,16 +21,14 @@ angular.module('copayApp.directives')
};
scope.sendPaymentToAddress = function(bitcoinAddress) {
scope.showMenu = false;
$state.go('tabs.send');
$timeout(function() {
$state.go('tabs.send').then(function() {
$state.transitionTo('tabs.send.amount', {toAddress: bitcoinAddress});
}, 100);
});
};
scope.addToAddressBook = function(bitcoinAddress) {
scope.showMenu = false;
$timeout(function() {
$state.go('tabs.send');
$timeout(function() {
$state.go('tabs.send').then(function() {
$state.transitionTo('tabs.send.addressbook', {addressbookEntry: bitcoinAddress});
});
}, 100);