From 10cc7fdf53671977d0d49743c77d1081219efe61 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 16 Sep 2016 21:01:19 -0300 Subject: [PATCH] Fix routes --- public/views/add.html | 16 +++++------ public/views/amount.html | 8 ++---- public/views/confirm.html | 23 ++++++++------- public/views/join.html | 8 ++---- public/views/modals/scanner.html | 2 +- public/views/tab-home.html | 12 ++++---- src/js/controllers/addressbookView.js | 6 ++-- src/js/controllers/amount.js | 3 +- src/js/controllers/confirm.js | 20 ++++--------- src/js/controllers/tab-send.js | 2 +- src/js/routes.js | 41 ++++++++++++--------------- src/js/services/incomingData.js | 18 ++++++------ src/js/services/popupService.js | 9 +++--- 13 files changed, 76 insertions(+), 92 deletions(-) diff --git a/public/views/add.html b/public/views/add.html index 28a01d1cb..95230a314 100644 --- a/public/views/add.html +++ b/public/views/add.html @@ -1,31 +1,29 @@ {{'Add wallet' | translate}} - - - + + + - +

New Personal Wallet

 - +

Create Shared Wallet

 - +

Join shared wallet

 - +

Import wallet

 diff --git a/public/views/amount.html b/public/views/amount.html index 4c996478c..7a1b1f613 100644 --- a/public/views/amount.html +++ b/public/views/amount.html @@ -1,10 +1,8 @@ - - - + + + diff --git a/public/views/confirm.html b/public/views/confirm.html index c763a8dfd..8cf5f6196 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -7,7 +7,7 @@ -
+
Sending
{{amountStr}}
@@ -24,7 +24,7 @@
- {{toAddress}} + To: {{toAddress}}

{{toName}}

@@ -33,23 +33,24 @@ {{_paypro.domain}}
+
-
- - No wallet with enough funds -
+
+ No wallet with enough funds +
- + +
- Add Description - {{description}} - + Add description + {{description}} +
- diff --git a/public/views/join.html b/public/views/join.html index 483167d82..2f0a3f74c 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -1,10 +1,8 @@ - - - + + + {{'Join shared wallet' | translate}} diff --git a/public/views/modals/scanner.html b/public/views/modals/scanner.html index 30e197f49..1a92705c6 100644 --- a/public/views/modals/scanner.html +++ b/public/views/modals/scanner.html @@ -1,6 +1,6 @@ -

QR-Scanner

diff --git a/public/views/tab-home.html b/public/views/tab-home.html index 4e366ef67..0764f31de 100644 --- a/public/views/tab-home.html +++ b/public/views/tab-home.html @@ -51,14 +51,14 @@ - +

+ Incomplete -

- {{wallet.status.availableBalanceStr}} -

-

- [Balance Hidden] +

+ {{wallet.status.availableBalanceStr}} + [Balance Hidden] +

diff --git a/src/js/controllers/addressbookView.js b/src/js/controllers/addressbookView.js index a0064fad4..b62289039 100644 --- a/src/js/controllers/addressbookView.js +++ b/src/js/controllers/addressbookView.js @@ -26,10 +26,12 @@ angular.module('copayApp.controllers').controller('addressbookViewController', f }); $scope.sendTo = function() { + $state.go('^.^.send'); $timeout(function() { - $state.transitionTo('send.amount', { + $state.go('.amount', { toAddress: $scope.addressbookEntry.address, - toName: $scope.addressbookEntry.name + toName: $scope.addressbookEntry.name, + toEmail: $scope.addressbookEntry.email }); }, 100); }; diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index c68f6bfab..27f474544 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -2,6 +2,7 @@ angular.module('copayApp.controllers').controller('amountController', function($rootScope, $scope, $filter, $timeout, $ionicHistory, $ionicScrollDelegate, $ionicNavBarDelegate, gettextCatalog, platformInfo, lodash, configService, rateService, $stateParams, $window, $state, $log, txFormatService) { $ionicNavBarDelegate.title(gettextCatalog.getString('Enter Amount')); + $ionicNavBarDelegate.showBackButton(true); var unitToSatoshi; var satToUnit; @@ -188,7 +189,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ var _amount = evaluate(format($scope.amount)); var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals); - $state.transitionTo('send.confirm', { + $state.transitionTo('tabs.send.confirm', { toAmount: amount * unitToSatoshi, toAddress: $scope.toAddress, toName: $scope.toName, diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index 486f35a79..2efc0b42b 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -17,24 +17,14 @@ angular.module('copayApp.controllers').controller('confirmController', function( $scope.showDescriptionPopup = function() { - - $scope.data = { - comment: null + var title = gettextCatalog.getString('Add description'); + var opts = { + defaultText: $scope.description }; - var commentPopup = $ionicPopup.show({ - templateUrl: "views/includes/note.html", - title: gettextCatalog.getString('Set description'), - scope: $scope, + popupService.showPrompt(title, null, opts, function(res) { + if (res) $scope.description = res; }); - $scope.commentPopupClose = function() { - commentPopup.close(); - }; - $scope.commentPopupSave = function() { - $log.debug('Saving description: ' + $scope.data.comment); - $scope.description = $scope.data.comment; - commentPopup.close(); - }; }; var setFromPayPro = function(uri, cb) { diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index d483f92c6..c0ca2b422 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -75,7 +75,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( return; } $log.debug('Got toAddress:' + addr + ' | ' + item.name); - return $state.transitionTo('send.amount', { + return $state.transitionTo('tabs.send.amount', { toAddress: addr, toName: item.name, toEmail: item.email diff --git a/src/js/routes.js b/src/js/routes.js index e25d9a224..3e64bf47b 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -218,29 +218,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) - /* - * - * Send - * - */ + /* + * + * Send + * + */ - .state('send', { - url: '/send', - abstract: true, - template: '' - }) - .state('send.amount', { + .state('tabs.send.amount', { url: '/amount/:toAddress/:toName/:toEmail', views: { - 'send': { + 'tab-send@tabs': { templateUrl: 'views/amount.html' } } }) - .state('send.confirm', { + .state('tabs.send.confirm', { url: '/confirm/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro', views: { - 'send': { + 'tab-send@tabs': { templateUrl: 'views/confirm.html' } } @@ -256,39 +251,39 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr .state('tabs.add', { url: '/add', views: { - 'tab-home': { + 'tab-home@tabs': { templateUrl: 'views/add.html' } } }) - .state('tabs.join', { + .state('tabs.add.join', { url: '/join/:url', views: { - 'tab-home': { + 'tab-home@tabs': { templateUrl: 'views/join.html' }, } }) - .state('tabs.import', { + .state('tabs.add.import', { url: '/import', views: { - 'tab-home': { + 'tab-home@tabs': { templateUrl: 'views/import.html' }, }, }) - .state('tabs.create-personal', { + .state('tabs.add.create-personal', { url: '/create-personal', views: { - 'tab-home': { + 'tab-home@tabs': { templateUrl: 'views/tab-create-personal.html' }, } }) - .state('tabs.create-shared', { + .state('tabs.add.create-shared', { url: '/create-shared', views: { - 'tab-home': { + 'tab-home@tabs': { templateUrl: 'views/tab-create-shared.html' }, } diff --git a/src/js/services/incomingData.js b/src/js/services/incomingData.js index 73e093336..0fa615321 100644 --- a/src/js/services/incomingData.js +++ b/src/js/services/incomingData.js @@ -26,7 +26,7 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni // data extensions for Payment Protocol with non-backwards-compatible request if ((/^bitcoin:\?r=[\w+]/).exec(data)) { data = decodeURIComponent(data.replace('bitcoin:?r=', '')); - $state.go('send.confirm', {paypro: data}) + $state.go('tabs.send.confirm', {paypro: data}) } @@ -42,25 +42,25 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni var amount = parsed.amount ? parsed.amount : ''; if (parsed.r) { - $state.go('send.confirm', {paypro: parsed.r}); + $state.go('tabs.send.confirm', {paypro: parsed.r}); } else { if (amount) { - $state.go('send.confirm', {toAmount: amount, toAddress: addr, description:message}) + $state.go('tabs.send.confirm', {toAmount: amount, toAddress: addr, description:message}) } else { - $state.go('send.amount', {toAddress: addr}) + $state.go('tabs.send.amount', {toAddress: addr}) } } return true; // Plain URL } else if (/^https?:\/\//.test(data)) { - return $state.go('send.confirm', {paypro: data}) + return $state.go('tabs.send.confirm', {paypro: data}) // Plain Address } else if (bitcore.Address.isValid(data, 'livenet')) { - return $state.go('send.amount', {toAddress: data}) + return $state.go('tabs.send.amount', {toAddress: data}) } else if (bitcore.Address.isValid(data, 'testnet')) { - return $state.go('send.amount', {toAddress: data}) + return $state.go('tabs.send.amount', {toAddress: data}) // Protocol @@ -71,11 +71,11 @@ angular.module('copayApp.services').factory('incomingData', function($log, $ioni // Join } else if (data.match(/^copay:[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { - return $state.go('add.join', {url: data}) + return $state.go('tabs.add.join', {url: data}) // Old join } else if (data.match(/^[0-9A-HJ-NP-Za-km-z]{70,80}$/)) { - return $state.go('add.join', {url: data}) + return $state.go('tabs.add.join', {url: data}) } diff --git a/src/js/services/popupService.js b/src/js/services/popupService.js index a510ca153..c8979ca1c 100644 --- a/src/js/services/popupService.js +++ b/src/js/services/popupService.js @@ -32,9 +32,10 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni opts = opts || {}; $ionicPopup.prompt({ title: title, - template: message, - inputType: opts.inputType || 'password', - inputPlaceholder: opts.inputPlaceholder || 'Your password' + subTitle: message, + inputType: opts.inputType, + inputPlaceholder: opts.inputPlaceholder, + defaultText: opts.defaultText }).then(function(res) { return cb(res) }); @@ -106,7 +107,7 @@ angular.module('copayApp.services').service('popupService', function($log, $ioni * * @param {String} Title * @param {String} Message - * @param {Object} Object{ inputType, inputPlaceholder } (optional) + * @param {Object} Object{ inputType, inputPlaceholder, defaultText } (optional) * @param {Callback} Function * @returns {Callback} Return the value of the input if user presses OK */