From ef90113dd8775d740fc96ee4b11a73dd73ff3848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 21 Sep 2016 15:13:22 -0300 Subject: [PATCH 1/2] add addressbook entry when send success --- public/views/addressbook.add.html | 12 ++++-- public/views/modals/tx-status.html | 29 +++++++++++++- src/js/controllers/addressbookAdd.js | 14 +++++-- src/js/controllers/confirm.js | 4 -- src/js/controllers/modals/txDetails.js | 3 +- src/js/controllers/modals/txStatus.js | 19 ++++++++- src/js/routes.js | 54 +++++++++++++++----------- src/sass/main.scss | 1 + src/sass/views/includes/tx-status.scss | 27 +++++++++++++ 9 files changed, 126 insertions(+), 37 deletions(-) create mode 100644 src/sass/views/includes/tx-status.scss diff --git a/public/views/addressbook.add.html b/public/views/addressbook.add.html index 453cb9a29..698594ad9 100644 --- a/public/views/addressbook.add.html +++ b/public/views/addressbook.add.html @@ -1,10 +1,16 @@ - - - Add entry + Add Contact + + + + + + diff --git a/public/views/modals/tx-status.html b/public/views/modals/tx-status.html index 50f0f30a2..53fbd1e46 100644 --- a/public/views/modals/tx-status.html +++ b/public/views/modals/tx-status.html @@ -1,4 +1,4 @@ - +
@@ -7,9 +7,34 @@
Sent
-
+
OKAY
+
+
+

Would you like to add this address to your address book?

+
+
+
+ + + + +
+
+
+
+ +
+
+ +
+
+
diff --git a/src/js/controllers/addressbookAdd.js b/src/js/controllers/addressbookAdd.js index 8d6831076..4b22e12ca 100644 --- a/src/js/controllers/addressbookAdd.js +++ b/src/js/controllers/addressbookAdd.js @@ -1,9 +1,11 @@ 'use strict'; -angular.module('copayApp.controllers').controller('addressbookAddController', function($scope, $state, $timeout, addressbookService, popupService) { +angular.module('copayApp.controllers').controller('addressbookAddController', function($scope, $state, $stateParams, $timeout, $ionicHistory, addressbookService, popupService) { + + $scope.fromSendTab = $stateParams.fromSendTab; $scope.addressbookEntry = { - 'address': '', + 'address': $stateParams.addressbookEntry || '', 'name': '', 'email': '' }; @@ -28,9 +30,15 @@ angular.module('copayApp.controllers').controller('addressbookAddController', fu popupService.showAlert(err); return; } - $state.go('tabs.addressbook'); + if ($scope.fromSendTab) $scope.goHome(); + else $state.go('tabs.addressbook'); }); }, 100); }; + $scope.goHome = function() { + $ionicHistory.clearHistory(); + $state.go('tabs.home'); + }; + }); diff --git a/src/js/controllers/confirm.js b/src/js/controllers/confirm.js index c3eeeed2e..091354114 100644 --- a/src/js/controllers/confirm.js +++ b/src/js/controllers/confirm.js @@ -262,8 +262,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( return walletService.onlyPublish(wallet, txp, function(err, txp) { if (err) return setSendError(err); - $ionicHistory.clearHistory(); - $state.go('tabs.home'); }); } ongoingProcess.set('creatingTx', true); @@ -304,8 +302,6 @@ angular.module('copayApp.controllers').controller('confirmController', function( function publishAndSign(wallet, txp) { walletService.publishAndSign(wallet, txp, function(err, txp) { if (err) return setSendError(err); - $ionicHistory.clearHistory(); - $state.go('tabs.home'); }); }; diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index dd2ed813c..98a6f183c 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -83,7 +83,8 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.showCommentPopup = function() { popupService.showPrompt(gettextCatalog.getString('Memo'), ' ', {}, function(text) { $log.debug('Saving memo'); - + console.log("#######################"); + console.log(text); var args = { txid: $scope.btx.txid, body: text diff --git a/src/js/controllers/modals/txStatus.js b/src/js/controllers/modals/txStatus.js index 05037eedd..8d596ee6f 100644 --- a/src/js/controllers/modals/txStatus.js +++ b/src/js/controllers/modals/txStatus.js @@ -1,10 +1,27 @@ 'use strict'; -angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout) { +angular.module('copayApp.controllers').controller('txStatusController', function($scope, $timeout, $state, $log, addressbookService) { if ($scope.cb) $timeout($scope.cb, 100); $scope.cancel = function() { $scope.txStatusModal.hide(); }; + + $scope.save = function(addressbookEntry) { + $scope.txStatusModal.hide(); + $state.go('tabs.send.addressbook', { + fromSendTab: true, + addressbookEntry: addressbookEntry + }) + } + + addressbookService.list(function(err, ab) { + if (err) $log.error(err); + if (ab[$scope.tx.toAddress]) { + $scope.entryExist = true; + $log.debug('Entry already exist'); + } + }) + }); diff --git a/src/js/routes.js b/src/js/routes.js index 664617526..876bcdae7 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -222,13 +222,13 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) - /* - * - * Send - * - */ + /* + * + * Send + * + */ - .state('tabs.send.amount', { + .state('tabs.send.amount', { url: '/amount/:toAddress/:toName/:toEmail', views: { 'tab-send@tabs': { @@ -244,7 +244,15 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } } }) - + .state('tabs.send.addressbook', { + url: '/addressbook/add/:fromSendTab/:addressbookEntry', + views: { + 'tab-send@tabs': { + templateUrl: 'views/addressbook.add.html', + controller: 'addressbookAddController' + } + } + }) /* * @@ -501,7 +509,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.addressbook.add', { - url: '/add', + url: '/add/:addressbookEntry', views: { 'tab-settings@tabs': { templateUrl: 'views/addressbook.add.html', @@ -709,24 +717,24 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr templateUrl: 'views/sellCoinbase.html' }) - /* - * - * Gift Cards - * - */ + /* + * + * Gift Cards + * + */ - .state('tabs.giftcards', { - url: '/giftcards', - abstract: true - }) + .state('tabs.giftcards', { + url: '/giftcards', + abstract: true + }) - /* - * - * Amazon.com Gift Card - * - */ + /* + * + * Amazon.com Gift Card + * + */ - .state('tabs.giftcards.amazon', { + .state('tabs.giftcards.amazon', { url: '/amazon', views: { 'tab-home@tabs': { diff --git a/src/sass/main.scss b/src/sass/main.scss index 3dff22f78..417b1ebf5 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -999,3 +999,4 @@ input[type=number] { @import "views/includes/modals/modals"; @import "views/includes/tx-details"; @import "views/includes/txp-details"; +@import "views/includes/tx-status"; diff --git a/src/sass/views/includes/tx-status.scss b/src/sass/views/includes/tx-status.scss new file mode 100644 index 000000000..ad1eb66d0 --- /dev/null +++ b/src/sass/views/includes/tx-status.scss @@ -0,0 +1,27 @@ +#tx-status { + .address { + display: flex; + padding: 5px 15px; + background-color: #f5f5f5; + margin-top: 10px; + i { + color: grey; + padding-right: 10px; + border-right: 1px solid; + border-color: grey; + font-size: 20px; + } + contact { + margin-left: 15px; + margin-bottom: 3px; + margin-top: 5px; + } + } + .collect-address{ + bottom: 0; + background: #fff; + color: #6c6c6c; + position: absolute; + width: 100%; + } +} From 1013eb0f40c391908c6bfa9c3554bee6840dc76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Baz=C3=A1n?= Date: Wed, 21 Sep 2016 16:39:40 -0300 Subject: [PATCH 2/2] fixes --- public/views/addressbook.add.html | 4 ++-- src/js/controllers/modals/txDetails.js | 3 +-- src/js/routes.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/public/views/addressbook.add.html b/public/views/addressbook.add.html index 698594ad9..dec411653 100644 --- a/public/views/addressbook.add.html +++ b/public/views/addressbook.add.html @@ -3,11 +3,11 @@ Add Contact - + diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index 98a6f183c..dd2ed813c 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -83,8 +83,7 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.showCommentPopup = function() { popupService.showPrompt(gettextCatalog.getString('Memo'), ' ', {}, function(text) { $log.debug('Saving memo'); - console.log("#######################"); - console.log(text); + var args = { txid: $scope.btx.txid, body: text diff --git a/src/js/routes.js b/src/js/routes.js index 876bcdae7..eb2cfa485 100644 --- a/src/js/routes.js +++ b/src/js/routes.js @@ -509,7 +509,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr } }) .state('tabs.addressbook.add', { - url: '/add/:addressbookEntry', + url: '/add', views: { 'tab-settings@tabs': { templateUrl: 'views/addressbook.add.html',