anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4434 from cmgustavo/bug/no-wallets-02

Browse source 
Fix UI delete wallets
This commit is contained in:
Matias Alejo Garcia 2016-06-17 09:36:43 -03:00 • committed by GitHub
commit 468c3babcf
4 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/views/walletHome.html
View file

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

6
src/js/controllers/index.js
View file

@ -1646,12 +1646,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.isComplete = null; self.isComplete = null;
self.walletName = null; self.walletName = null;
uxLanguage.update(); uxLanguage.update();
profileService.isDisclaimerAccepted(function(v) {
if (v) {
go.path('import');
}
});
}); });
}); });

2
src/js/controllers/modals/confirmation.js
View file

@ -5,7 +5,7 @@ angular.module('copayApp.controllers').controller('confirmationController', func
$scope.ok = function() { $scope.ok = function() {
$scope.loading = true; $scope.loading = true;
$scope.okAction(); $scope.okAction();
$scope.cancel(); $scope.confirmationModal.hide();
}; };
$scope.cancel = function() { $scope.cancel = function() {

2
src/js/controllers/preferencesDelete.js
View file

@ -38,10 +38,10 @@ angular.module('copayApp.controllers').controller('preferencesDeleteWalletContro
if (err) { if (err) {
$scope.error = err.message || err; $scope.error = err.message || err;
} else { } else {
go.walletHome();
notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', { notification.success(gettextCatalog.getString('Success'), gettextCatalog.getString('The wallet "{{walletName}}" was deleted', {
walletName: walletName walletName: walletName
})); }));
applicationService.restart();
} }
}); });
}; };