diff --git a/cordova/build.sh b/cordova/build.sh index c0fb9ed30..6a99d667b 100755 --- a/cordova/build.sh +++ b/cordova/build.sh @@ -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 diff --git a/public/views/export.html b/public/views/export.html index eec227984..ecb4e507c 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -22,13 +22,13 @@ -
+
Failed to export
-
+
@@ -44,11 +44,35 @@
-

+
+
+ +
- - Do not include private key - +
+ Exporting Walelt: + {{index.walletName}} +
+
From/In the destination device, go to Add wallet > Import wallet and scan this QR code
+
+ + + +
+ + Do not include private key + +
@@ -68,7 +92,7 @@
-
+
-
- - -
-

Wallet Export

diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js index 423c11d22..d076759c7 100644 --- a/src/js/controllers/export.js +++ b/src/js/controllers/export.js @@ -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,