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

Fix amazon

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-23 13:05:50 -03:00
commit 6955f8728d
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
4 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,11 +3,14 @@
angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $ionicHistory, $log, addressbookService) {
if ($scope.cb) $timeout($scope.cb, 100);
$scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount";
$scope.cancel = function() {
$ionicHistory.removeBackView();
$state.go('tabs.home');
$scope.txStatusModal.hide();
if ($scope.fromSendTab) {
$ionicHistory.removeBackView();
$state.go('tabs.home');
}
};
$scope.save = function(addressbookEntry) {
@ -23,7 +26,6 @@ angular.module('copayApp.controllers').controller('txStatusController', function
});
}
$scope.fromSendTab = $ionicHistory.viewHistory().backView.stateName === "tabs.send.amount";
addressbookService.list(function(err, ab) {
if (err) $log.error(err);
if (ab[$scope.tx.toAddress]) {