diff --git a/public/views/walletHome.html b/public/views/walletHome.html index d3e0b924c..be1a58509 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -1,19 +1,15 @@
+ ng-init="showPreferences = true" ng-show="!index.noFocusedWallet">
-
-
- You do not have a wallet +
+
+ You do not have any wallet
- -
- -
@@ -28,7 +24,7 @@ Updating Wallet...
- +
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 806e55855..a7a814f68 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -1646,12 +1646,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.isComplete = null; self.walletName = null; uxLanguage.update(); - - profileService.isDisclaimerAccepted(function(v) { - if (v) { - go.path('import'); - } - }); }); }); diff --git a/src/js/controllers/modals/confirmation.js b/src/js/controllers/modals/confirmation.js index c6f60aaf7..534e33740 100644 --- a/src/js/controllers/modals/confirmation.js +++ b/src/js/controllers/modals/confirmation.js @@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('confirmationController', func $scope.ok = function() { $scope.loading = true; $scope.okAction(); - $scope.cancel(); + $scope.confirmationModal.hide(); }; $scope.cancel = function() { diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js index 5dc6cf9d4..1e411a728 100644 --- a/src/js/controllers/preferencesDelete.js +++ b/src/js/controllers/preferencesDelete.js @@ -38,10 +38,10 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro if (err) { $scope.error = err.message || err; } else { + go.walletHome(); notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', { walletName: walletName })); - applicationService.restart(); } }); };