diff --git a/public/views/add.html b/public/views/add.html index 5920fdcc2..2e2d68854 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -10,7 +10,7 @@ - +

Create new wallet

@@ -20,7 +20,7 @@
- +

Import wallet

diff --git a/public/views/create.html b/public/views/create.html index 4acf9fa4e..b59bd3859 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -1,183 +1,13 @@ - - - - - - Create new wallet - + + - + + + -
-
- -
-
- -
-
+ + + -
- {{create.error|translate}} -
- -
- -
- - - - - - - - - - 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. -
-
- - - - - - - - - - - - Testnet - - - - Single Address Wallet - For audit purposes - - -
-
- - - - - -
-
+
- diff --git a/public/views/export.html b/public/views/export.html index 5710d48af..eba245e82 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -1,131 +1,13 @@ + + - - - Export Wallet - - - - - + + + -

-
-
- File/Text -
-
- QR Code -
-
+ + + -
-
- - Failed to export -
- -
- - -
- -
-
- -
-
From the destination device, go to Add wallet > Import wallet and scan this QR code
-
- -
-
Exporting via QR not supported for this wallet
-
- - - Show advanced options - Hide advanced options - - - - Do not include private key - - -
- - - - WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. - - -
- -
- - - - WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. - - -
- - - - -
-

Export options

- - -
-
- -
-
-

Wallet Export

-
- -
-
- - Copy this text as it is to a safe place (notepad or email) -
-
-
-
+
diff --git a/public/views/import.html b/public/views/import.html index 01da6a065..2b99964ff 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -1,239 +1,17 @@ - - - - - - Import wallet - + + - + + + -
-
- -
-
- -
-
- -
-
+ + + -
+ + + -
-
-
Could not access the wallet at the server. Please check:
-
    -
  • The password of the recovery phrase (if set)
  • -
  • The derivation path
  • -
  • The wallet service URL
  • -
-
- NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there. -
-
- -
- {{error|translate}} -
-
- -
-
- -
-
- -
-
- -
-
- - - Show advanced options - Hide advanced options - - -
- - - - - - - - - Testnet - -
-
- - -
-
- -
- -
- {{error|translate}} -
- -
- -
- - - - - - - - - Show advanced options - Hide advanced options - - -
- - - -
-
- - -
-
- -
-
- {{error|translate}} -
- -
- -
-
- No hardware wallets supported on this device -
-
- -
-
- - - - - - - Shared Wallet - - - - Show advanced options - Hide advanced options - - -
- - - -
-
- - -
- -
-
- -
+
- diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index c052ab067..866846037 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -19,7 +19,7 @@ Sweep paper wallet -
+
Export Wallet
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html new file mode 100644 index 000000000..8114e1739 --- /dev/null +++ b/public/views/tab-create-personal.html @@ -0,0 +1,129 @@ + + + + + + Create new wallet + + + + +
+ {{create.error|translate}} +
+ +
+ +
+ + + + 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. +
+
+ + + + + + + + + + + + Testnet + + + + Single Address Wallet + For audit purposes + + +
+
+ + + + + +
+
+
diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html new file mode 100644 index 000000000..758d8ef3f --- /dev/null +++ b/public/views/tab-create-shared.html @@ -0,0 +1,161 @@ + + + + + Create new wallet + + + + +
+ {{create.error|translate}} +
+ +
+ +
+ + + + + + + + + + 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. +
+
+ + + + + + + + + + + + Testnet + + + + Single Address Wallet + For audit purposes + + +
+
+ + + + + +
+
diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html new file mode 100644 index 000000000..912953e07 --- /dev/null +++ b/public/views/tab-export-file.html @@ -0,0 +1,102 @@ + + Export Wallet + + + + + + + +
+
+ + Failed to export +
+ +
+ + +
+ + + Show advanced options + Hide advanced options + + + + Do not include private key + + +
+ + + + WARNING: The private key of this wallet is not available. The export allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ +
+ + + + WARNING: Not including the private key allows to check the wallet balance, transaction history, and create spend proposals from the export. However, does not allow to approve (sign) proposals, so funds will not be accessible from the export. + + +
+ + + + +
+

Export options

+ + +
+
+ +
+
+

Wallet Export

+
+ +
+
+ + Copy this text as it is to a safe place (notepad or email) +
+
+
+
diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html new file mode 100644 index 000000000..a16fcd428 --- /dev/null +++ b/public/views/tab-export-qrCode.html @@ -0,0 +1,23 @@ + + Export Wallet + + + + + + + +
+
+ +
+
From the destination device, go to Add wallet > Import wallet and scan this QR code
+
+ +
+
Exporting via QR not supported for this wallet
+
+ +
diff --git a/public/views/tab-import-file.html b/public/views/tab-import-file.html new file mode 100644 index 000000000..437251135 --- /dev/null +++ b/public/views/tab-import-file.html @@ -0,0 +1,65 @@ + + + + + Import wallet + + + + +
+ {{error|translate}} +
+ +
+ +
+ + + + + + + + + Show advanced options + Hide advanced options + + +
+ + + +
+
+ + +
+ +
diff --git a/public/views/tab-import-hardware.html b/public/views/tab-import-hardware.html new file mode 100644 index 000000000..9a85f29f7 --- /dev/null +++ b/public/views/tab-import-hardware.html @@ -0,0 +1,71 @@ + + + + + Import wallet + + + + +
+ {{error|translate}} +
+ +
+ +
+
+ No hardware wallets supported on this device +
+
+ +
+
+ + + + + + + Shared Wallet + + + + Show advanced options + Hide advanced options + + +
+ + + +
+
+ + +
+ +
+ +
diff --git a/public/views/tab-import-phrase.html b/public/views/tab-import-phrase.html new file mode 100644 index 000000000..c0255a2c7 --- /dev/null +++ b/public/views/tab-import-phrase.html @@ -0,0 +1,88 @@ + + + + + Import wallet + + + + +
+
+
Could not access the wallet at the server. Please check:
+
    +
  • The password of the recovery phrase (if set)
  • +
  • The derivation path
  • +
  • The wallet service URL
  • +
+
+ NOTE: To import a wallet from a 3rd party software, please go to Add Wallet > Create Wallet, and specify the Recovery Phrase there. +
+
+ +
+ {{error|translate}} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + Show advanced options + Hide advanced options + + +
+ + + + + + + + + Testnet + +
+
+ + +
+
diff --git a/src/js/routes.js b/src/js/routes.js index c5439bbf2..86342e4e7 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -199,6 +199,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('wallet.export', { + abstract: true, url: '/export', views: { 'wallet': { @@ -206,6 +207,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) + .state('wallet.export.file', { + url: '/tab-export-file', + needProfile: true, + views: { + 'tab-export-file': { + templateUrl: 'views/tab-export-file.html', + }, + } + }) + .state('wallet.export.qrCode', { + url: '/tab-export-qrCode', + needProfile: true, + views: { + 'tab-export-qrCode': { + templateUrl: 'views/tab-export-qrCode.html', + }, + } + }) .state('wallet.preferencesBwsUrl', { url: '/preferencesBwsUrl', views: { @@ -371,21 +390,63 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }) .state('add.import', { url: '/import', + abstract: true, views: { 'add': { templateUrl: 'views/import.html' }, } }) + .state('add.import.phrase', { + url: '/tab-import-phrase', + views: { + 'tab-import-phrase': { + templateUrl: 'views/tab-import-phrase.html', + }, + } + }) + .state('add.import.file', { + url: '/tab-import-file', + views: { + 'tab-import-file': { + templateUrl: 'views/tab-import-file.html', + }, + } + }) + .state('add.import.hardware', { + url: '/tab-import-hardware', + views: { + 'tab-import-hardware': { + templateUrl: 'views/tab-import-hardware.html', + }, + } + }) .state('add.create', { url: '/create', + abstract: true, + templateUrl: 'views/create.html', views: { 'add': { templateUrl: 'views/create.html' }, } }) - + .state('add.create.personal', { + url: '/tab-create-personal', + views: { + 'tab-create-personal': { + templateUrl: 'views/tab-create-personal.html', + }, + } + }) + .state('add.create.shared', { + url: '/tab-create-shared', + views: { + 'tab-create-shared': { + templateUrl: 'views/tab-create-shared.html', + }, + } + }) /* * diff --git a/src/sass/main.scss b/src/sass/main.scss index 76150a1e0..b18dc6db2 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -1027,6 +1027,10 @@ input[type="number"] { } } +.tab-item { + max-width: 100%; +} + @media all and (max-height: 480px) { .calculator .button-calc .columns { padding: 10px; } .calculator .header-calc { top: 11%; } @@ -1041,4 +1045,3 @@ input[type="number"] { .calculator .button-calc .columns { padding: 20px; } .calculator .header-calc { top: 18%; } } -