Merge pull request #423 from JDonadio/fix/encrypted-02

Fix export/import wallet with encrypted pk
This commit is contained in:
Matias Alejo Garcia 2016-10-13 16:02:12 -03:00 committed by GitHub
commit 9667aa8e24
5 changed files with 130 additions and 69 deletions

View file

@ -5,17 +5,17 @@
</ion-nav-back-button>
</ion-nav-bar>
<ion-content ng-init="file = true">
<div class="row text-center top-tabs">
<div class="col" ng-click="file = true" ng-style="file && {'border-bottom-style': 'solid'}">
<ion-content>
<div class="row text-center">
<div class="col" ng-click="file.value = true" ng-style="file.value && {'border-bottom': '2px solid'}">
<span class="" translate>File/Text</span>
</div>
<div class="col" ng-click="file = false" ng-style="!file && {'border-bottom-style': 'solid'}">
<div class="col" ng-click="generateQrCode();" ng-style="!file.value && {'border-bottom': '2px solid'}">
<span class="" translate>QR Code</span>
</div>
</div>
<div ng-include="'views/tab-export-file.html'" ng-if="file"></div>
<div ng-include="'views/tab-export-qrCode.html'" ng-if="!file"></div>
<div ng-include="'views/tab-export-file.html'" ng-if="file.value"></div>
<div ng-include="'views/tab-export-qrCode.html'" ng-if="!file.value"></div>
</ion-content>
</ion-view>