fix conflics
This commit is contained in:
parent
4fe58ec446
commit
194e5fed54
7 changed files with 55 additions and 30 deletions
|
|
@ -50,9 +50,11 @@ angular.module('copayApp.controllers').controller('SendController',
|
|||
|
||||
var address = form.address.$modelValue;
|
||||
var amount = (form.amount.$modelValue * 100) | 0;
|
||||
var commentText = form.comment.$modelValue;
|
||||
|
||||
var w = $rootScope.wallet;
|
||||
w.createTx(address, amount, comment, function() {
|
||||
|
||||
w.createTx(address, amount, commentText, function() {
|
||||
$scope.loading = false;
|
||||
$rootScope.$flashMessage = {
|
||||
message: 'The transaction proposal has been created',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue