From 67d140e981abdc471823a8c8bb71e4a9ed96163a Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 24 Apr 2015 02:42:10 -0300 Subject: [PATCH] fix changing wallet / form reset --- public/views/walletHome.html | 44 ++++++++---------- src/css/main.css | 1 + src/js/controllers/index.js | 7 +-- src/js/controllers/walletHome.js | 76 +++++++++++++++----------------- src/js/directives/directives.js | 3 +- src/js/services/go.js | 7 --- 6 files changed, 62 insertions(+), 76 deletions(-) diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 7b20a418f..e6cb5122d 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -15,7 +15,7 @@
- Reconnecting to Wallet Server... + Reconnecting to Wallet Service...
@@ -35,6 +35,17 @@ index.onGoingProcessName == 'openingWallet' Recreating Wallet...
+
+ + {{home.onGoingProcess|translate}}... +
+
@@ -198,7 +209,7 @@ index.onGoingProcessName == 'openingWallet'
@@ -233,12 +244,7 @@ index.onGoingProcessName == 'openingWallet'
-
- - Fetching Payment Information... - -
-
+
{{home.error|translate}} @@ -330,12 +336,6 @@ index.onGoingProcessName == 'openingWallet'
-
- {{home.onGoingProcess|translate}}... -
- - -
Cancel @@ -360,11 +360,9 @@ history -->
-
+
- Getting transactions... - Could not fetch transaction history
Tap to retry @@ -410,18 +408,14 @@ history
-
+
diff --git a/src/css/main.css b/src/css/main.css index c02510e19..75c1608f2 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1190,3 +1190,4 @@ input.ng-invalid-match, input.ng-invalid-match:focus { -webkit-transform: scaleY(1.0); } } + diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js index 5fbce2b62..273e2d2a1 100644 --- a/src/js/controllers/index.js +++ b/src/js/controllers/index.js @@ -217,10 +217,11 @@ angular.module('copayApp.controllers').controller('indexController', function($r self.txHistory = []; } self.skipHistory = skip || 0; + $log.debug('Updating Transaction History'); + self.txHistoryError = false; + self.updatingTxHistory = true; $timeout(function() { - $log.debug('Updating Transaction History'); - self.txHistoryError = false; - self.updatingTxHistory = true; + $rootScope.$apply(); fc.getTxHistory({ skip: self.skipHistory, limit: self.limitHistory + 1 diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 7c554574d..81b209fb0 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -40,9 +40,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.getAddress(); }); + var disableFocusListener = $rootScope.$on('Local/NewFocusedWallet', function() { + self.resetForm(); + }); - var disableTabListener = $rootScope.$on('Local/TabChanged', function(e,tab){ - switch(tab) { + var disableTabListener = $rootScope.$on('Local/TabChanged', function(e, tab) { + switch (tab) { case 'send': self.resetError(); self.setInputs(); @@ -57,6 +60,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi disableScannerListener(); disablePaymentUriListener(); disableTabListener(); + disableFocusListener(); $rootScope.hideMenuBar = false; }); @@ -279,14 +283,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.newAddress = function() { var fc = profileService.focusedClient; - self.generatingAddress = true; - self.error = null; + self.setOngoingProcess('Generating Address'); fc.createAddress(function(err, addr) { - self.generatingAddress = false; + self.setOngoingProcess(); if (err) { $log.debug('Creating address ERROR:', err); $scope.$emit('Local/ClientError', err); - self.error = 'Could not generate address'; } else { self.addr = addr.address; storageService.storeLastAddress(fc.credentials.walletId, addr.address, function() {}); @@ -434,16 +436,27 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.setOngoingProcess = function(name) { var self = this; - $timeout(function() { - self.onGoingProcess = name; - $rootScope.$apply(); - }) + self.blockUx = !!name; + + if (isCordova) { + if (name) { + window.plugins.spinnerDialog.show(null, name + '...', true); + } else { + window.plugins.spinnerDialog.hide(); + } + } else { + $timeout(function() { + self.onGoingProcess = name; + $rootScope.$apply(); + }) + } }; - this.submitForm = function(form) { + this.submitForm = function() { var fc = profileService.focusedClient; var unitToSat = this.unitToSatoshi; + var form = $scope.sendForm; if (form.$invalid) { this.error = 'Unable to send transaction proposal'; return; @@ -452,18 +465,12 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (fc.isPrivKeyEncrypted()) { profileService.unlockFC(function(err) { if (err) return self.setError(err); - return self.submitForm(form); + return self.submitForm(); }); return; }; - self.blockUx = true; - self.setOngoingProcess('Sending'); - - if (isCordova) { - window.plugins.spinnerDialog.show(null, 'Creating transaction...', true); - } - + self.setOngoingProcess('Sending transaction'); $timeout(function() { var comment = form.comment.$modelValue; var paypro = self._paypro; @@ -481,24 +488,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi self.setOngoingProcess(); if (err) { profileService.lockFC(); - if (isCordova) { - window.plugins.spinnerDialog.hide(); - } - self.blockUx = false; return self.setError(err); } self.signAndBroadcast(txp, function(err) { self.setOngoingProcess(); - if (isCordova) { - window.plugins.spinnerDialog.hide(); - } - self.blockUx = false; + profileService.lockFC(); if (err) { - profileService.lockFC(); return self.setError(err); } - self.resetForm(form); + self.resetForm(); }); }); }, 100); @@ -507,7 +506,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.signAndBroadcast = function(txp, cb) { var fc = profileService.focusedClient; - self.setOngoingProcess('Signing'); + self.setOngoingProcess('Signing transaction'); fc.signTxProposal(txp, function(err, signedTx) { profileService.lockFC(); self.setOngoingProcess(); @@ -515,7 +514,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi if (err) return cb(err); if (signedTx.status == 'accepted') { - self.setOngoingProcess('Broadcasting'); + self.setOngoingProcess('Broadcasting transaction'); fc.broadcastTxProposal(signedTx, function(err, btx) { self.setOngoingProcess(); if (err) { @@ -570,9 +569,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi - this.resetForm = function(form) { + this.resetForm = function() { this.resetError(); - this.fetchingURL = null; this._paypro = null; this.lockAddress = false; @@ -580,6 +578,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this._amount = this._address = null; + var form = $scope.sendForm; if (form && form.amount) { form.amount.$pristine = true; form.amount.$setViewValue(''); @@ -623,7 +622,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); }; - this.setFromPayPro = function(uri, form) { + this.setFromPayPro = function(uri) { var fc = profileService.focusedClient; if (isChromeApp) { this.error = 'Payment Protocol not supported on Chrome App'; @@ -631,22 +630,19 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi } var satToUnit = 1 / this.unitToSatoshi; - this.fetchingURL = uri; - this.blockUx = true; var self = this; + self.setOngoingProcess('Fetching Payment Informantion'); $log.debug('Fetch PayPro Request...', uri); $timeout(function() { fc.fetchPayPro({ payProUrl: uri, }, function(err, paypro) { - $log.debug(paypro); - self.blockUx = false; - self.fetchingURL = null; + self.setOngoingProcess(); if (err) { $log.warn(err); - self.resetForm(form); + self.resetForm(); var msg = err.toString(); if (msg.match('HTTP')) { msg = 'Could not fetch payment information'; diff --git a/src/js/directives/directives.js b/src/js/directives/directives.js index c5c3a9162..93dc7f87e 100644 --- a/src/js/directives/directives.js +++ b/src/js/directives/directives.js @@ -24,10 +24,10 @@ angular.module('copayApp.directives') return { require: 'ngModel', link: function(scope, elem, attrs, ctrl) { - var networkName = profileService.focusedClient.credentials.network; var URI = bitcore.URI; var Address = bitcore.Address var validator = function(value) { + var networkName = profileService.focusedClient.credentials.network; // Regular url if (/^https?:\/\//.test(value)) { ctrl.$setValidity('validAddress', true); @@ -51,6 +51,7 @@ angular.module('copayApp.directives') return; } +console.log('[directives.js.53]', value, networkName); //TODO // Regular Address ctrl.$setValidity('validAddress', Address.isValid(value, networkName)); return value; diff --git a/src/js/services/go.js b/src/js/services/go.js index 71482e8c9..d7139b00e 100644 --- a/src/js/services/go.js +++ b/src/js/services/go.js @@ -67,13 +67,6 @@ angular.module('copayApp.services').factory('go', function($window, $rootScope, }); }; - root.home = function() { - if ($rootScope.iden) - root.walletHome(); - else - root.path('signin'); - }; - root.addWallet = function() { $state.go('add'); };