diff --git a/public/views/add.html b/public/views/add.html index 1b8413172..55c1f2d7e 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -10,17 +10,17 @@ - +

Create new wallet

- +

Join shared wallet

- +

Import wallet

diff --git a/public/views/create.html b/public/views/create.html index 9a8c54957..c379f7d72 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -1,11 +1,11 @@ - + - + diff --git a/public/views/export.html b/public/views/export.html index fcb9e75f7..563513f03 100644 --- a/public/views/export.html +++ b/public/views/export.html @@ -1,11 +1,11 @@ - + - + diff --git a/public/views/import.html b/public/views/import.html index e539912ee..79d347ebd 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -1,15 +1,15 @@ - + - + - + diff --git a/public/views/join.html b/public/views/join.html index 97b18ae75..54f6805c8 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,7 +1,7 @@ - @@ -133,4 +133,3 @@
- diff --git a/public/views/preferences.html b/public/views/preferences.html index f1fc1d0a3..dfecc04c7 100644 --- a/public/views/preferences.html +++ b/public/views/preferences.html @@ -9,7 +9,7 @@
Preferences
-
+
Wallet Name {{alias||wallet.walletName}} @@ -28,7 +28,7 @@ {{wallet.externalSource}}
-
+
Wallet Color @@ -36,7 +36,7 @@
-
+
Email Notifications Disabled @@ -47,7 +47,7 @@
Security
-
+
Backup
@@ -61,14 +61,14 @@ Request Fingerprint
-
+
Delete recovery phrase
Advanced
-
+
Advanced
diff --git a/public/views/preferencesAbout.html b/public/views/preferencesAbout.html index 611538017..7c5943167 100644 --- a/public/views/preferencesAbout.html +++ b/public/views/preferencesAbout.html @@ -26,15 +26,15 @@
-
+
Terms of Use
-
+
Translators
-
+
Session log
diff --git a/public/views/preferencesAdvanced.html b/public/views/preferencesAdvanced.html index 406ab13a1..5d0b8aaaa 100644 --- a/public/views/preferencesAdvanced.html +++ b/public/views/preferencesAdvanced.html @@ -9,27 +9,27 @@
-
+
Wallet Information
-
+
Sweep paper wallet
-
+
Export Wallet
-
+
Wallet Service URL
-
+
Transaction History
-
+
Delete Wallet
diff --git a/public/views/tab-create-personal.html b/public/views/tab-create-personal.html index 8114e1739..d8b80f6ca 100644 --- a/public/views/tab-create-personal.html +++ b/public/views/tab-create-personal.html @@ -1,7 +1,7 @@ - diff --git a/public/views/tab-create-shared.html b/public/views/tab-create-shared.html index 758d8ef3f..c3b31f141 100644 --- a/public/views/tab-create-shared.html +++ b/public/views/tab-create-shared.html @@ -1,6 +1,6 @@ - diff --git a/public/views/tab-export-file.html b/public/views/tab-export-file.html index 9a2e8a450..db4e14aff 100644 --- a/public/views/tab-export-file.html +++ b/public/views/tab-export-file.html @@ -1,7 +1,7 @@ Export Wallet - diff --git a/public/views/tab-export-qrCode.html b/public/views/tab-export-qrCode.html index a16fcd428..f524273d0 100644 --- a/public/views/tab-export-qrCode.html +++ b/public/views/tab-export-qrCode.html @@ -1,7 +1,7 @@ Export Wallet - diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 0c258b9e6..c008e21df 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -29,11 +29,11 @@
Wallets - +
+ ui-sref="tabs.details({'walletId': wallet.id})"> diff --git a/public/views/tab-settings.html b/public/views/tab-settings.html index dd7a257c5..eec3eab45 100644 --- a/public/views/tab-settings.html +++ b/public/views/tab-settings.html @@ -14,7 +14,7 @@
Preferences
-
+
Language @@ -22,7 +22,7 @@
-
+
Unit @@ -30,7 +30,7 @@
-
+
Alternative Currency @@ -38,7 +38,7 @@
-
+
Bitcoin Network Fee Policy @@ -77,9 +77,26 @@ Use Unconfirmed Funds -
+
+
Wallets Settings
+
+
+ + {{item.name || item.id}} + + {{item.m}}-of-{{item.n}} + + + Incomplete + +
+
+
+ +
+
- About Copay + About Bitpay Wallet
diff --git a/public/views/walletDetails.html b/public/views/walletDetails.html index 498be236f..63e9ca4ff 100644 --- a/public/views/walletDetails.html +++ b/public/views/walletDetails.html @@ -3,14 +3,9 @@ {{wallet.name}} - - - - - - + + {{'Back' | translate}} + diff --git a/src/js/controllers/backController.js b/src/js/controllers/backController.js index 285f8f630..f1fa38b68 100644 --- a/src/js/controllers/backController.js +++ b/src/js/controllers/backController.js @@ -8,7 +8,7 @@ angular.module('copayApp.controllers').controller('backController', function($sc $scope.importGoBack = function() { if ($stateParams.fromOnboarding) $state.go('onboarding.welcome'); - else $state.go('add.main'); + else $state.go('tabs.add'); }; $scope.onboardingMailSkip = function() { diff --git a/src/js/controllers/onboarding/welcomeController.js b/src/js/controllers/onboarding/welcomeController.js index b6e529a11..84c628724 100644 --- a/src/js/controllers/onboarding/welcomeController.js +++ b/src/js/controllers/onboarding/welcomeController.js @@ -3,7 +3,7 @@ angular.module('copayApp.controllers').controller('welcomeController', function($scope, $state, $timeout, $log, $ionicPopup, profileService) { $scope.goImport = function() { - $state.go('add.import.phrase', { + $state.go('tabs.import.phrase', { fromOnboarding: true }); }; diff --git a/src/js/controllers/tab-settings.js b/src/js/controllers/tab-settings.js index a0b312a2b..e4edb47d4 100644 --- a/src/js/controllers/tab-settings.js +++ b/src/js/controllers/tab-settings.js @@ -36,6 +36,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct $scope.otherWallets = lodash.filter(profileService.getWallets(self.network), function(w) { return w.id != self.walletId; }); + $scope.wallets = profileService.getWallets(); }; $scope.openAddressbookModal = function() { diff --git a/src/js/routes.js b/src/js/routes.js index c12c61be6..511b9e5bf 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -155,156 +155,18 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('wallet', { - url: '/wallet/{walletId}/{fromOnboarding}', - abstract: true, - template: '' - }) - .state('wallet.details', { - url: '/details', - views: { - 'wallet': { - templateUrl: 'views/walletDetails.html' - } - }, - params: { - txid: null, - txpId: null, - }, - }) - .state('wallet.preferences', { - url: '/preferences', - views: { - 'wallet': { - templateUrl: 'views/preferences.html' - } + .state('tabs.details', { + url: '/details/{walletId}/{fromOnboarding}', + views: { + 'tab-home': { + templateUrl: 'views/walletDetails.html' } - }) - .state('wallet.preferencesAlias', { - url: '/preferencesAlias', - views: { - 'wallet': { - templateUrl: 'views/preferencesAlias.html' - } - } - }) - .state('wallet.preferencesColor', { - url: '/preferencesColor', - views: { - 'wallet': { - templateUrl: 'views/preferencesColor.html' - } - } - }) - .state('wallet.preferencesEmail', { - url: '/preferencesEmail', - views: { - 'wallet': { - templateUrl: 'views/preferencesEmail.html' - } - } - }) - .state('wallet.backup', { - url: '/backup', - views: { - 'wallet': { - templateUrl: 'views/backup.html' - } - } - }) - .state('wallet.preferencesAdvanced', { - url: '/preferencesAdvanced', - views: { - 'wallet': { - templateUrl: 'views/preferencesAdvanced.html' - } - } - }) - .state('wallet.information', { - url: '/information', - views: { - 'wallet': { - templateUrl: 'views/preferencesInformation.html' - } - } - }) - .state('wallet.export', { - abstract: true, - url: '/export', - views: { - 'wallet': { - templateUrl: 'views/export.html' - } - } - }) - .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: { - 'wallet': { - templateUrl: 'views/preferencesBwsUrl.html' - } - } - }) - .state('wallet.preferencesHistory', { - url: '/preferencesHistory', - views: { - 'wallet': { - templateUrl: 'views/preferencesHistory.html' - } - } - }) - .state('wallet.deleteWords', { - url: '/deleteWords', - views: { - 'wallet': { - templateUrl: 'views/preferencesDeleteWords.html' - } - } - }) - .state('wallet.delete', { - url: '/delete', - views: { - 'wallet': { - templateUrl: 'views/preferencesDeleteWallet.html' - } - } - }) - .state('wallet.copayers', { - url: '/copayers', - views: { - 'wallet': { - templateUrl: 'views/copayers.html' - } - } - }) - .state('wallet.paperWallet', { - url: '/paperWallet', - views: { - 'wallet': { - templateUrl: 'views/paperWallet.html' - } - } - }) - - + }, + params: { + txid: null, + txpId: null, + }, + }) /* * @@ -385,15 +247,10 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('add', { + .state('tabs.add', { url: '/add', - abstract: true, - template: '' - }) - .state('add.main', { - url: '/main', views: { - 'add': { + 'tab-home': { templateUrl: 'views/add.html', controller: function(platformInfo) { if (platformInfo.isCordova && StatusBar.isVisible) { @@ -403,24 +260,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - .state('add.join', { + .state('tabs.join', { url: '/join/:url', views: { - 'add': { + 'tab-home': { templateUrl: 'views/join.html' }, } }) - .state('add.import', { + .state('tabs.import', { url: '/import/:fromOnboarding', abstract: true, views: { - 'add': { + 'tab-home': { templateUrl: 'views/import.html' }, } }) - .state('add.import.phrase', { + .state('tabs.import.phrase', { url: '/tab-import-phrase', views: { 'tab-import-phrase': { @@ -428,7 +285,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, } }) - .state('add.import.file', { + .state('tabs.import.file', { url: '/tab-import-file', views: { 'tab-import-file': { @@ -436,7 +293,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, } }) - .state('add.import.hardware', { + .state('tabs.import.hardware', { url: '/tab-import-hardware', views: { 'tab-import-hardware': { @@ -444,17 +301,17 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, } }) - .state('add.create', { + .state('tabs.create', { url: '/create', abstract: true, templateUrl: 'views/create.html', views: { - 'add': { + 'tab-home': { templateUrl: 'views/create.html' }, } }) - .state('add.create.personal', { + .state('tabs.create.personal', { url: '/tab-create-personal', views: { 'tab-create-personal': { @@ -462,7 +319,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr }, } }) - .state('add.create.shared', { + .state('tabs.create.shared', { url: '/tab-create-shared', views: { 'tab-create-shared': { @@ -477,76 +334,225 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('settings', { - url: '/settings', - abstract: true, - template: '' - }) - .state('settings.language', { + .state('tabs.language', { url: '/language', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/preferencesLanguage.html' } } }) - .state('settings.unit', { + .state('tabs.unit', { url: '/unit', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/preferencesUnit.html' } } }) - .state('settings.fee', { + .state('tabs.fee', { url: '/fee', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/preferencesFee.html' } } }) - .state('settings.altCurrency', { + .state('tabs.altCurrency', { url: '/altCurrency', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/preferencesAltCurrency.html' } } }) - .state('settings.about', { + .state('tabs.about', { url: '/about', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/preferencesAbout.html' } } }) - .state('settings.logs', { + .state('tabs.logs', { url: '/logs', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/preferencesLogs.html' } } }) - .state('settings.termsOfUse', { + .state('tabs.termsOfUse', { url: '/termsOfUse', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/termsOfUse.html', } } }) - .state('settings.translators', { + .state('tabs.translators', { url: '/translators', views: { - 'settings': { + 'tab-settings': { templateUrl: 'views/translators.html' } } }) + /* + * + * Wallet preferences + * + */ + + .state('tabs.preferences', { + url: '/preferences/:walletId', + abstract: true, + views: { + 'tab-settings': { + template: '' + }, + } + }) + .state('tabs.preferences.main', { + url: '/main', + views: { + 'preferences': { + templateUrl: 'views/preferences.html' + } + } + }) + .state('tabs.preferences.preferencesAlias', { + url: '/preferencesAlias', + views: { + 'preferences': { + templateUrl: 'views/preferencesAlias.html' + } + } + }) + .state('tabs.preferences.preferencesColor', { + url: '/preferencesColor', + views: { + 'preferences': { + templateUrl: 'views/preferencesColor.html' + } + } + }) + .state('tabs.preferences.preferencesEmail', { + url: '/preferencesEmail', + views: { + 'preferences': { + templateUrl: 'views/preferencesEmail.html' + } + } + }) + .state('tabs.preferences.backup', { + url: '/backup', + views: { + 'preferences': { + templateUrl: 'views/backup.html' + } + } + }) + .state('tabs.preferences.preferencesAdvanced', { + url: '/preferencesAdvanced', + views: { + 'preferences': { + templateUrl: 'views/preferencesAdvanced.html' + } + } + }) + .state('tabs.preferences.information', { + url: '/information', + views: { + 'preferences': { + templateUrl: 'views/preferencesInformation.html' + } + } + }) + .state('tabs.preferences.export', { + abstract: true, + url: '/export', + views: { + 'preferences': { + templateUrl: 'views/export.html' + } + } + }) + .state('tabs.preferences.export.file', { + url: '/tab-export-file', + needProfile: true, + views: { + 'tab-export-file': { + templateUrl: 'views/tab-export-file.html', + }, + } + }) + .state('tabs.preferences.export.qrCode', { + url: '/tab-export-qrCode', + needProfile: true, + views: { + 'tab-export-qrCode': { + templateUrl: 'views/tab-export-qrCode.html', + }, + } + }) + .state('tabs.preferences.preferencesBwsUrl', { + url: '/preferencesBwsUrl', + views: { + 'preferences': { + templateUrl: 'views/preferencesBwsUrl.html' + } + } + }) + .state('tabs.preferences.preferencesHistory', { + url: '/preferencesHistory', + views: { + 'preferences': { + templateUrl: 'views/preferencesHistory.html' + } + } + }) + .state('tabs.preferences.deleteWords', { + url: '/deleteWords', + views: { + 'preferences': { + templateUrl: 'views/preferencesDeleteWords.html' + } + } + }) + .state('tabs.preferences.delete', { + url: '/delete', + views: { + 'preferences': { + templateUrl: 'views/preferencesDeleteWallet.html' + } + } + }) + .state('tabs.preferences.paperWallet', { + url: '/paperWallet', + views: { + 'preferences': { + templateUrl: 'views/paperWallet.html' + } + } + }) + + /* + * + *TO DO + * + */ + + .state('tabs.copayers', { + url: '/copayers', + views: { + 'wallet': { + templateUrl: 'views/copayers.html' + } + } + }) + /* * * Onboarding