From e0ca693a05172dbfc9f8d3547ffbf46c2232dc41 Mon Sep 17 00:00:00 2001
From: blavenie <benoit.lavenier@e-is.pro>
Date: Mon, 24 Jul 2017 12:55:46 +0200
Subject: [PATCH] [fix] Display warning on empty wallet only once (in
wallet-service)
---
www/js/controllers/app-controllers.js | 20 --------------------
1 file changed, 20 deletions(-)
diff --git a/www/js/controllers/app-controllers.js b/www/js/controllers/app-controllers.js
index fd45419c9..f922c2337 100644
--- a/www/js/controllers/app-controllers.js
+++ b/www/js/controllers/app-controllers.js
@@ -200,26 +200,6 @@ function AppController($scope, $rootScope, $state, $ionicSideMenuDelegate, $q, $
// Load wallet data (after login)
$scope.loadWalletData = function(options) {
return csWallet.loadData(options)
- /*.catch(UIUtils.onError('ERROR.LOAD_WALLET_DATA_ERROR'))*/
-
- .then(function(walletData) {
- // Warn if wallet has been never used - see #167
- var showAlert = !csCurrency.data.initPhase && !csWallet.isNew() && csWallet.isNeverUsed() && (!csSettings.data.wallet || csSettings.data.wallet.alertIfUnusedWallet);
- if (!showAlert) return walletData;
-
- // Alert: wallet is empty !
- return UIUtils.loading.hide()
- .then(function(){
- return UIUtils.alert.confirm('CONFIRM.LOGIN_UNUSED_WALLET', 'CONFIRM.LOGIN_UNUSED_WALLET_TITLE',
- {
- okText: 'COMMON.BTN_CONTINUE'
- });
- })
- .then(function(confirm) {
- if (confirm) return walletData;
- return csWallet.logout();
- });
- })
.then(function(walletData) {
if (walletData) {
--
GitLab