diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js
index fcfefd653..bad361d93 100644
--- a/src/js/controllers/create.js
+++ b/src/js/controllers/create.js
@@ -175,8 +175,6 @@ angular.module('copayApp.controllers').controller('createController',
function _create(opts) {
ongoingProcess.set('creatingWallet', true);
$timeout(function() {
- console.log(opts);
- return;
profileService.createWallet(opts, function(err, client) {
ongoingProcess.set('creatingWallet', false);
if (err) {
diff --git a/src/js/controllers/export.js b/src/js/controllers/export.js
index 4d7aed6c0..a5a90766b 100644
--- a/src/js/controllers/export.js
+++ b/src/js/controllers/export.js
@@ -1,9 +1,20 @@
'use strict';
angular.module('copayApp.controllers').controller('exportController',
- function($scope, $timeout, $log, $ionicHistory, backupService, walletService, storageService, profileService, platformInfo, gettextCatalog, $state, $stateParams, popupService) {
+ function($scope, $timeout, $log, $ionicHistory, $ionicScrollDelegate, backupService, walletService, storageService, profileService, platformInfo, gettextCatalog, $state, $stateParams, popupService) {
var wallet = profileService.getWallet($stateParams.walletId);
+ $scope.showAdvChange = function() {
+ $scope.showAdv = !$scope.showAdv;
+ $scope.resizeView();
+ };
+
+ $scope.resizeView = function() {
+ $timeout(function() {
+ $ionicScrollDelegate.resize();
+ });
+ };
+
var init = function() {
$scope.formData = {};
$scope.isEncrypted = wallet.isPrivKeyEncrypted();
diff --git a/src/js/controllers/join.js b/src/js/controllers/join.js
index 83150713a..c358b7fc9 100644
--- a/src/js/controllers/join.js
+++ b/src/js/controllers/join.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('joinController',
- function($scope, $rootScope, $timeout, $state, $ionicHistory, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
+ function($scope, $rootScope, $timeout, $state, $ionicHistory, $ionicScrollDelegate, profileService, configService, storageService, applicationService, gettext, gettextCatalog, lodash, ledger, trezor, platformInfo, derivationPathHelper, ongoingProcess, walletService, $log, $stateParams, popupService) {
var isChromeApp = platformInfo.isChromeApp;
var isDevel = platformInfo.isDevel;
@@ -12,6 +12,26 @@ angular.module('copayApp.controllers').controller('joinController',
$scope.derivationPath = derivationPathHelper.default;
$scope.account = 1;
+ $scope.showAdvChange = function() {
+ $scope.showAdv = !$scope.showAdv;
+ $scope.resizeView();
+ };
+
+ $scope.resizeView = function() {
+ $timeout(function() {
+ $ionicScrollDelegate.resize();
+ });
+ checkPasswordFields();
+ };
+
+ function checkPasswordFields() {
+ if (!$scope.encrypt) {
+ $scope.passphrase = $scope.createPassphrase = $scope.passwordSaved = null;
+ $timeout(function() {
+ $scope.$apply();
+ });
+ }
+ };
this.onQrCodeScanned = function(data) {
$scope.secret = data;
@@ -156,11 +176,10 @@ angular.module('copayApp.controllers').controller('joinController',
$state.transitionTo('tabs.copayers', {
walletId: client.credentials.walletId
});
- }, 100);
- }
- else $state.go('tabs.home')
+ });
+ } else $state.go('tabs.home');
});
- }, 100);
+ });
};
updateSeedSourceSelect();
diff --git a/www/views/join.html b/www/views/join.html
index f21080820..c1e559383 100644
--- a/www/views/join.html
+++ b/www/views/join.html
@@ -40,10 +40,12 @@
-