From c8a27dabc18b546cba49b676fbbbb3079489bda8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?=
Date: Thu, 3 Aug 2017 10:17:38 -0300
Subject: [PATCH] hide wallet name if alias exists
---
src/js/controllers/preferencesDelete.js | 5 ++---
www/views/preferencesDeleteWallet.html | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/js/controllers/preferencesDelete.js b/src/js/controllers/preferencesDelete.js
index 21c1d1c64..8283f93c5 100644
--- a/src/js/controllers/preferencesDelete.js
+++ b/src/js/controllers/preferencesDelete.js
@@ -2,7 +2,7 @@
angular.module('copayApp.controllers').controller('preferencesDeleteWalletController',
function($scope, $ionicHistory, gettextCatalog, lodash, profileService, $state, ongoingProcess, popupService, pushNotificationsService) {
-
+
$scope.$on("$ionicView.beforeEnter", function(event, data) {
if (!data.stateParams || !data.stateParams.walletId) {
popupService.showAlert(null, gettextCatalog.getString('No wallet selected'), function() {
@@ -17,8 +17,7 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
});
return;
}
- $scope.alias = lodash.isEqual($scope.wallet.name, $scope.wallet.credentials.walletName) ? null : $scope.wallet.name + ' ';
- $scope.walletName = $scope.wallet.credentials.walletName;
+ $scope.walletName = $scope.wallet.name;
});
$scope.showDeletePopup = function() {
diff --git a/www/views/preferencesDeleteWallet.html b/www/views/preferencesDeleteWallet.html
index 3d5202c9b..1a7bfbc03 100644
--- a/www/views/preferencesDeleteWallet.html
+++ b/www/views/preferencesDeleteWallet.html
@@ -18,7 +18,7 @@