From d43a1737a0b313620e6009457cce477a787526c5 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Wed, 9 Aug 2017 09:27:08 +0200
Subject: [PATCH] allow show toast after transfer sent
---
www/js/controllers/transfer-controllers.js | 11 +++++++----
www/js/controllers/wallet-controllers.js | 7 +------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/www/js/controllers/transfer-controllers.js b/www/js/controllers/transfer-controllers.js
index 9c3c4fbca..f31635e58 100644
--- a/www/js/controllers/transfer-controllers.js
+++ b/www/js/controllers/transfer-controllers.js
@@ -108,7 +108,7 @@ function TransferController($scope, $controller, UIUtils, csWot, csWallet) {
};
}
-function TransferModalController($scope, $q, $translate, $filter, BMA, csWallet, UIUtils, Modals,
+function TransferModalController($scope, $q, $translate, $timeout, $filter, BMA, csWallet, UIUtils, Modals,
csCurrency, csSettings, parameters) {
'ngInject';
@@ -244,11 +244,14 @@ function TransferModalController($scope, $q, $translate, $filter, BMA, csWallet,
return csWallet.transfer($scope.formData.destPub, amount, $scope.formData.comment, $scope.formData.useRelative);
})
.then(function() {
+ UIUtils.loading.hide();
return $scope.closeModal(true);
})
- .then(UIUtils.loading.hide)
- .then(function() {
- UIUtils.toast.show('INFO.TRANSFER_SENT');
+ .then(function(res) {
+ $timeout(function() {
+ UIUtils.toast.show('INFO.TRANSFER_SENT');
+ }, 500);
+ return res;
})
.catch(UIUtils.onError('ERROR.SEND_TX_FAILED'));
});
diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js
index 3af2dc7ce..a2c6b03ef 100644
--- a/www/js/controllers/wallet-controllers.js
+++ b/www/js/controllers/wallet-controllers.js
@@ -601,12 +601,7 @@ function WalletTxController($scope, $filter, $ionicPopover, $state, $timeout, UI
UIUtils.alert.info('INFO.NOT_ENOUGH_CREDIT');
return;
}
- Modals.showTransfer()
- .then(function(done){
- if (done) {
- UIUtils.toast.show('INFO.TRANSFER_SENT');
- }
- });
+ return Modals.showTransfer();
};
$scope.showHelpTip = function(index, isTour) {
--
GitLab