anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5476 from cmgustavo/ref/coinbase-02

Browse source 
Fix first link to your account. Removes unused variables. Fix spinner
This commit is contained in:
Matias Alejo Garcia 2017-01-18 14:27:39 -03:00 • committed by GitHub
commit 23b1d77ec1
5 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/js/controllers/coinbase.js
View file

@ -16,7 +16,9 @@ angular.module('copayApp.controllers').controller('coinbaseController', function
$scope.loading = false;
if (err || lodash.isEmpty(data)) {
if (err) {
popupService.showAlert('Error', err);
$log.error(err);
err = err.errors ? err.errors[0].message : err;
popupService.showAlert('Error connecting to Coinbase', err);
}
return;
}
@ -79,18 +81,15 @@ angular.module('copayApp.controllers').controller('coinbaseController', function
this.submitOauthCode = function(code) {
var self = this;
ongoingProcess.set('connectingCoinbase', true);
$scope.error = null;
$timeout(function() {
coinbaseService.getToken(code, function(err, accessToken) {
ongoingProcess.set('connectingCoinbase', false);
if (err) {
popupService.showAlert('Error', err);
return;
}
$scope.accessToken = accessToken;
init();
});
}, 100);
coinbaseService.getToken(code, function(err, accessToken) {
ongoingProcess.set('connectingCoinbase', false);
if (err) {
popupService.showAlert('Error connecting to Coinbase', err);
return;
}
$scope.accessToken = accessToken;
init();
});
};
this.openTxModal = function(tx) {
@ -109,7 +108,9 @@ angular.module('copayApp.controllers').controller('coinbaseController', function
$scope.$on("$ionicView.beforeEnter", function(event, data) {
coinbaseService.setCredentials();
if (data.stateParams && data.stateParams.code) {
self.submitOauthCode(data.stateParams.code);
coinbaseService.getStoredToken(function(at) {
if (!at) self.submitOauthCode(data.stateParams.code);
});
} else {
init();
}