From b370e610128a3d3c88df5beb1c19527b2b0450d9 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 23 Sep 2016 17:10:34 -0300 Subject: [PATCH] Bug fixes. Split contacts and wallets from send --- public/views/amount.html | 3 ++- public/views/confirm.html | 3 ++- public/views/tab-send.html | 22 ++++++++++++++++++---- src/js/controllers/addressbookAdd.js | 2 +- src/js/controllers/amount.js | 12 ++++++------ src/js/controllers/confirm.js | 1 + src/js/controllers/tab-send.js | 3 +++ src/js/routes.js | 6 +++--- 8 files changed, 36 insertions(+), 16 deletions(-) diff --git a/public/views/amount.html b/public/views/amount.html index 10ee69f7e..207ca5c11 100644 --- a/public/views/amount.html +++ b/public/views/amount.html @@ -13,7 +13,8 @@
Recipient
- + + {{toName || toAddress}}
diff --git a/public/views/confirm.html b/public/views/confirm.html index 8be1797eb..721ef18c8 100644 --- a/public/views/confirm.html +++ b/public/views/confirm.html @@ -25,7 +25,8 @@
- + + To: {{toAddress}}

{{toName}}

diff --git a/public/views/tab-send.html b/public/views/tab-send.html index 861fa5892..e3fac9dcb 100644 --- a/public/views/tab-send.html +++ b/public/views/tab-send.html @@ -16,12 +16,26 @@
-
+
- Contacts & Wallets + Contacts
-
No Wallet - Contact
- + + + Add a Contact + + + + {{item.name}} + +
+ +
+
+ Transfer to Wallet +
+
No Wallet
+ {{item.name}} diff --git a/src/js/controllers/addressbookAdd.js b/src/js/controllers/addressbookAdd.js index 12d0305af..a33050197 100644 --- a/src/js/controllers/addressbookAdd.js +++ b/src/js/controllers/addressbookAdd.js @@ -31,7 +31,7 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu return; } if ($scope.fromSendTab) $scope.goHome(); - else $state.go('tabs.addressbook'); + else $ionicHistory.goBack(); }); }, 100); }; diff --git a/src/js/controllers/amount.js b/src/js/controllers/amount.js index 19a0c2b26..590fa55d4 100644 --- a/src/js/controllers/amount.js +++ b/src/js/controllers/amount.js @@ -10,10 +10,15 @@ angular.module('copayApp.controllers').controller('amountController', function($ var SMALL_FONT_SIZE_LIMIT = 13; var LENGTH_EXPRESSION_LIMIT = 19; + $scope.isWallet = $stateParams.isWallet; $scope.toAddress = $stateParams.toAddress; $scope.toName = $stateParams.toName; $scope.toEmail = $stateParams.toEmail; + $scope.$on('$ionicView.beforeLeave', function() { + angular.element($window).off('keydown'); + }); + $scope.$on("$ionicView.beforeEnter", function(event, data) { if (!$stateParams.toAddress) { @@ -24,7 +29,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ var reNr = /^[1234567890\.]$/; var reOp = /^[\*\+\-\/]$/; - var disableKeys = angular.element($window).on('keydown', function(e) { if (e.which === 8) { // you can add others here inside brackets. e.preventDefault(); @@ -46,10 +50,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ }); - $scope.$on('$destroy', function() { - angular.element($window).off('keydown'); - }); - var config = configService.getSync().wallet.settings; $scope.unitName = config.unitName; $scope.alternativeIsoCode = config.alternativeIsoCode; @@ -65,7 +65,6 @@ angular.module('copayApp.controllers').controller('amountController', function($ $scope.amount = (($stateParams.toAmount) * satToUnit).toFixed(unitDecimals); } - processAmount($scope.amount); $timeout(function() { @@ -187,6 +186,7 @@ angular.module('copayApp.controllers').controller('amountController', function($ var amount = $scope.showAlternativeAmount ? fromFiat(_amount).toFixed(unitDecimals) : _amount.toFixed(unitDecimals); $state.transitionTo('tabs.send.confirm', { + isWallet: $scope.isWallet, toAmount: amount * unitToSatoshi, toAddress: $scope.toAddress, toName: $scope.toName, diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index ea91048d1..6665f0a49 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('confirmController', function( var cachedTxp = {}; var isChromeApp = platformInfo.isChromeApp; + $scope.isWallet = $stateParams.isWallet; $scope.toAddress = $stateParams.toAddress; $scope.toName = $stateParams.toName; $scope.toEmail = $stateParams.toEmail; diff --git a/src/js/controllers/tab-send.js b/src/js/controllers/tab-send.js index 58aaf6aef..f839c1a78 100644 --- a/src/js/controllers/tab-send.js +++ b/src/js/controllers/tab-send.js @@ -10,6 +10,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( var wallets = profileService.getWallets({ onlyComplete: true }); + $scope.hasWallets = lodash.isEmpty(wallets) ? false : true; lodash.each(wallets, function(v) { originalList.push({ @@ -25,6 +26,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( addressbookService.list(function(err, ab) { if (err) $log.error(err); + $scope.hasContacts = lodash.isEmpty(ab) ? false : true; var contacts = []; lodash.each(ab, function(v, k) { contacts.push({ @@ -76,6 +78,7 @@ angular.module('copayApp.controllers').controller('tabSendController', function( } $log.debug('Got toAddress:' + addr + ' | ' + item.name); return $state.transitionTo('tabs.send.amount', { + isWallet: item.isWallet, toAddress: addr, toName: item.name, toEmail: item.email diff --git a/src/js/routes.js b/src/js/routes.js index 3c4708d08..022007af4 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -236,8 +236,8 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr * */ - .state('tabs.send.amount', { - url: '/amount/:toAddress/:toName/:toEmail', + .state('tabs.send.amount', { + url: '/amount/:isWallet/:toAddress/:toName/:toEmail', views: { 'tab-send@tabs': { controller: 'amountController', @@ -246,7 +246,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.send.confirm', { - url: '/confirm/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro', + url: '/confirm/:isWallet/:toAddress/:toName/:toAmount/:toEmail/:description/:paypro', views: { 'tab-send@tabs': { controller: 'confirmController',