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

Merge pull request #153 from gabrielbazan7/feat/addEntrySend

Browse source 
add addressbook entry when send success
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-21 19:18:55 -03:00 • committed by GitHub
commit 912789ccb6
8 changed files with 123 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/js/controllers/addressbookAdd.js
View file

@ -1,9 +1,11 @@
'use strict';
angular.module('copayApp.controllers').controller('addressbookAddController', function($scope, $state, $timeout, addressbookService, popupService) {
angular.module('copayApp.controllers').controller('addressbookAddController', function($scope, $state, $stateParams, $timeout, $ionicHistory, addressbookService, popupService) {
$scope.fromSendTab = $stateParams.fromSendTab;
$scope.addressbookEntry = {
'address': '',
'address': $stateParams.addressbookEntry || '',
'name': '',
'email': ''
};
@ -28,9 +30,15 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu
popupService.showAlert(err);
return;
}
$state.go('tabs.addressbook');
if ($scope.fromSendTab) $scope.goHome();
else $state.go('tabs.addressbook');
});
}, 100);
};
$scope.goHome = function() {
$ionicHistory.clearHistory();
$state.go('tabs.home');
};
});

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

@ -261,8 +261,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
return walletService.onlyPublish(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
$ionicHistory.clearHistory();
$state.go('tabs.home');
});
}
ongoingProcess.set('creatingTx', true);
@ -303,8 +301,6 @@ angular.module('copayApp.controllers').controller('confirmController', function(
function publishAndSign(wallet, txp) {
walletService.publishAndSign(wallet, txp, function(err, txp) {
if (err) return setSendError(err);
$ionicHistory.clearHistory();
$state.go('tabs.home');
});
};

19
src/js/controllers/modals/txStatus.js
View file

@ -1,10 +1,27 @@
'use strict';
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout) {
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $log, addressbookService) {
if ($scope.cb) $timeout($scope.cb, 100);
$scope.cancel = function() {
$scope.txStatusModal.hide();
};
$scope.save = function(addressbookEntry) {
$scope.txStatusModal.hide();
$state.go('tabs.send.addressbook', {
fromSendTab: true,
addressbookEntry: addressbookEntry
})
}
addressbookService.list(function(err, ab) {
if (err) $log.error(err);
if (ab[$scope.tx.toAddress]) {
$scope.entryExist = true;
$log.debug('Entry already exist');
}
})
});