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

fix conflicts

Browse source
This commit is contained in:
Mario Colque 2014-04-20 22:54:28 -03:00
commit 009d7b75b8
13 changed files with 261 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/controllers/send.js
View file

@ -28,13 +28,6 @@ angular.module('copay.send').controller('SendController',
form.amount.$pristine = true;
// TODO: check if createTx has an error.
$rootScope.flashMessage = { message: 'You send a proposal transaction succefully', type: 'success'};
$rootScope.flashMessage = { message: 'Your transaction proposal has been sent successfully', type: 'success'};
};
$scope.sendTest = function() {
var w = $rootScope.wallet;
w.createTx( 'mimoZNLcP2rrMRgdeX5PSnR7AjCqQveZZ4', '12345',function() {
$rootScope.$digest();
});
};
});