diff --git a/public/views/add.html b/public/views/add.html index b41d8bd08..4b24c8da7 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -10,7 +10,7 @@ - +

Create new wallet

diff --git a/public/views/create.html b/public/views/create.html index c379f7d72..66a67492c 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -1,13 +1,22 @@ - - + + + {{'Create new wallet' | translate}} + + + + - - - + +
+
+ Personal Wallet +
+
+ Shared Wallet +
+
- - - - -
+
+
+
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html index be899d465..5d3295c00 100644 --- a/public/views/tab-create-personal.html +++ b/public/views/tab-create-personal.html @@ -1,125 +1,109 @@ - - - - - - {{'Create new wallet' | translate}} - +
- +
+ - + + Show advanced options + Hide advanced options + -
- +
+ - - Show advanced options - Hide advanced options - + -
+ - +
+
+ WARNING: The password cannot be recovered. Be sure to write it down. The wallet can not be restored without the password. +
+
- - - - -
-
- WARNING: The password cannot be recovered. Be sure to write it down. The wallet can not be restored without the password. -
-
- - + - + - + - + - - Testnet - + + + Testnet + - - Single Address Wallet - For audit purposes - + + Single Address Wallet + For audit purposes + -
-
+
+
- + - + - -
-
+ diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html index 2d5dc1ccf..9b1fc4409 100644 --- a/public/views/tab-create-shared.html +++ b/public/views/tab-create-shared.html @@ -1,159 +1,145 @@ - - - - - - {{'Create new wallet' | translate}} - +
- +
+ - + -
- + - + - + + Show advanced options + Hide advanced options + - +
- - Show advanced options - Hide advanced options - + -
+ - + - +
+
+ WARNING: The password cannot be recovered. Be sure to write it down. The wallet can not be restored without the password. +
+
- - -
-
- WARNING: The password cannot be recovered. Be sure to write it down. The wallet can not be restored without the password. -
-
- - + - + - + - + - - Testnet - + + Testnet + - - Single Address Wallet - For audit purposes - + + Single Address Wallet + For audit purposes + -
-
+
+
- + - + - -
-
+ diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 1faf089f7..17716d589 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -190,27 +190,6 @@ angular.module('copayApp.controllers').controller('createController', }, 100); } - this.formFocus = function(what) { - if (!this.isWindowsPhoneApp) return - - if (what && what == 'my-name') { - this.hideWalletName = true; - this.hideTabs = true; - } else if (what && what == 'wallet-name') { - this.hideTabs = true; - } else { - this.hideWalletName = false; - this.hideTabs = false; - } - $timeout(function() { - $rootScope.$digest(); - }, 1); - }; - - $scope.$on("$destroy", function() { - $rootScope.hideWalletNavigation = false; - }); - updateSeedSourceSelect(1); self.setSeedSource(); }); diff --git a/src/js/routes.js b/src/js/routes.js index 7660ebf31..f7857c67a 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -301,7 +301,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('tabs.create', { url: '/create', - abstract: true, + // abstract: true, templateUrl: 'views/create.html', views: { 'tab-home': { @@ -309,22 +309,22 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, } }) - .state('tabs.create.personal', { - url: '/tab-create-personal', - views: { - 'tab-create-personal': { - templateUrl: 'views/tab-create-personal.html', - }, - } - }) - .state('tabs.create.shared', { - url: '/tab-create-shared', - views: { - 'tab-create-shared': { - templateUrl: 'views/tab-create-shared.html', - }, - } - }) + // .state('tabs.create.personal', { + // url: '/tab-create-personal', + // views: { + // 'tab-create-personal': { + // templateUrl: 'views/tab-create-personal.html', + // }, + // } + // }) + // .state('tabs.create.shared', { + // url: '/tab-create-shared', + // views: { + // 'tab-create-shared': { + // templateUrl: 'views/tab-create-shared.html', + // }, + // } + // }) /* * @@ -812,21 +812,21 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr $ionicPlatform.registerBackButtonAction(function(e) { - var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : ''; - var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : ''; + var fromDisclaimer = $ionicHistory.currentStateName().match(/disclaimer/) ? 'true' : ''; + var fromTabs = $ionicHistory.currentStateName().match(/tabs/) ? 'true' : ''; - if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) { - ionic.Platform.exitApp(); - } else if ($ionicHistory.backView() && !fromTabs) { - $ionicHistory.goBack(); - } else { - $rootScope.backButtonPressedOnceToExit = true; - window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit')); - setInterval(function() { - $rootScope.backButtonPressedOnceToExit = false; - }, 5000); - } - e.preventDefault(); + if ($rootScope.backButtonPressedOnceToExit || fromDisclaimer) { + ionic.Platform.exitApp(); + } else if ($ionicHistory.backView() && !fromTabs) { + $ionicHistory.goBack(); + } else { + $rootScope.backButtonPressedOnceToExit = true; + window.plugins.toast.showShortBottom(gettextCatalog.getString('Press again to exit')); + setInterval(function() { + $rootScope.backButtonPressedOnceToExit = false; + }, 5000); + } + e.preventDefault(); }, 101); $ionicPlatform.on('pause', function() {