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

add advanced options - refresh QR

Browse source
This commit is contained in:
Javier 2016-06-29 15:18:49 -03:00
commit 1c1196ee84
3 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cordova/build.sh
View file

@ -155,6 +155,9 @@ if [ ! -d $PROJECT ]; then
cordova plugin add cordova-plugin-disable-bitcode
checkOK
cordova plugin add cordova-plugin-android-fingerprint-auth
checkOK
cordova plugin add cordova-plugin-screen-orientation
checkOK

43
public/views/export.html
View file

@ -22,13 +22,13 @@
</div>
</div>
<div ng-show="!backupWalletPlainText && !exportQR">
<div ng-show="!backupWalletPlainText">
<div class="text-warning size-14 m20b" ng-show="error">
<i class="fi-alert size-12"></i>
<span translate>Failed to export</span>
</div>
<form>
<form ng-show="!exportQR">
<div class="row">
<div class="columns">
<label for="password" translate>Set up a password </label>
@ -44,11 +44,35 @@
</div>
</form>
<h4></h4>
<div class="m20t text-gray" ng-show="exportQR">
<div class="text-center">
<qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
</div>
<ion-toggle ng-model="noSignEnabled" toggle-class="toggle-balanced" class="r0">
<span class="toggle-label" translate>Do not include private key</span>
</ion-toggle>
<div class="text-center size-18 m10t" ng-style="{color: index.backgroundColor}">
<span translate>Exporting Walelt: </span>
<span>{{index.walletName}}</span>
</div>
<div class="text-center size-12 m10" translate>From/In the destination device, go to Add wallet > Import wallet and scan this QR code</div>
</div>
<div class="row">
<div class="columns m15t">
<a class="button outline light-gray expand tiny p10i" ng-click="showAdvanced = !showAdvanced">
<i class="fi-widget m3r"></i>
<span translate ng-hide="showAdvanced">Show advanced options</span>
<span translate ng-hide="!showAdvanced">Hide advanced options</span>
<i ng-if="!showAdvanced" class="icon-arrow-down4"></i>
<i ng-if="showAdvanced" class="icon-arrow-up4"></i>
</a>
</div>
</div>
<div ng-show="showAdvanced">
<ion-toggle ng-model="noSignEnabled" toggle-class="toggle-balanced" class="r0" ng-change="noSignEnabledChange()">
<span class="toggle-label" translate>Do not include private key</span>
</ion-toggle>
</div>
<div class="box-notification" ng-show="!index.canSign">
<span class="text-warning size-14">
@ -68,7 +92,7 @@
</span>
</div>
<div class="row">
<div class="row" ng-show="!exportQR">
<div class="columns">
<button class="black round expand m20t" ng-click="downloadWalletBackup()"
ng-disabled="(!password || password != repeatpassword)"
@ -95,11 +119,6 @@
</div>
</div>
<div class="containter text-center" ng-show="exportQR">
<qrcode size="220" version="8" error-correction-level="M" data="{{exportWalletInfo}}"></qrcode>
<span translate></span>
</div>
<div class="row" ng-show="backupWalletPlainText">
<div class="large-12 columns">
<h3 translate>Wallet Export</h3>

12
src/js/controllers/export.js
View file

@ -12,7 +12,8 @@ angular.module('copayApp.controllers').controller('exportController',
$scope.error = null;
$scope.init = function(state) {
$scope.QROpts = false;
$scope.noSignEnabled = false;
$scope.showAdvanced = false;
prevState = state || 'walletHome';
fingerprintService.check(fc, function(err) {
@ -35,6 +36,13 @@ angular.module('copayApp.controllers').controller('exportController',
});
};
$scope.noSignEnabledChange = function() {
$scope.exportWalletInfo = encodeWalletInfo();
$timeout(function() {
$scope.$apply();
}, 1);
};
$scope.$on('$destroy', function() {
walletService.lock(fc);
});
@ -60,7 +68,7 @@ angular.module('copayApp.controllers').controller('exportController',
};
var info;
if (c.canSign()) {
if (c.canSign() && !$scope.noSignEnabled) {
if (c.mnemonic) {
info = {
type: encodingType.mnemonic,