Fix UI delete wallets

This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-16 19:28:37 -03:00
parent 6d9bc56144
commit 610c116d7a
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
4 changed files with 12 additions and 18 deletions

View File

@ -1,19 +1,15 @@
<div class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="showPreferences = true">
ng-init="showPreferences = true" ng-show="!index.noFocusedWallet">
</div>
<div ng-controller="walletHomeController as home">
<div class="row columns m20tp" ng-show="index.noFocusedWallet">
<div class="text-center text-warning m20b">
<i class="fi-alert"></i> <span translate>You do not have a wallet</span>
<div class="row columns m30tp" ng-show="index.noFocusedWallet">
<div class="text-center size-12 text-warning m20b">
<i class="fi-alert"></i> <span translate>You do not have any wallet</span>
</div>
<button class="button black round expand" href ui-sref="add" translate>Create</button>
<div class="text-center text-gray p20v" href ui-sref="preferencesGlobal">
<button class=" outline round dark-gray tiny" translate>Settings</button>
</div>
</div>
<div class="onGoingProcess" ng-show="index.updating">
@ -28,7 +24,7 @@
<span translate>Updating Wallet...</span>
</div>
</div>
<div class="oh" ng-show="!index.noFocusedWallet">

View File

@ -563,7 +563,8 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.backgroundColor = config.colorFor[self.walletId] || '#4A90E2';
var fc = profileService.focusedClient;
fc.backgroundColor = self.backgroundColor;
if (isCordova && StatusBar.isVisible) {
if (isCordova) {
StatusBar.show();
StatusBar.backgroundColorByHexString(fc.backgroundColor);
}
};
@ -1655,13 +1656,10 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.noFocusedWallet = true;
self.isComplete = null;
self.walletName = null;
if (isCordova && StatusBar.isVisible) {
StatusBar.hide();
}
uxLanguage.update();
profileService.isDisclaimerAccepted(function(v) {
if (v) {
go.path('import');
}
});
});
});

View File

@ -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() {

View File

@ -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();
}
});
};