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

Merge pull request #5522 from cmgustavo/bug/coinbase-token-01

Browse source 
Bug/coinbase token 01
This commit is contained in:
Matias Alejo Garcia 2017-01-26 10:28:25 -03:00 • committed by GitHub
commit 57f1b10d10
4 changed files with 22 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('coinbaseController', function($scope, $timeout, $ionicModal, $log, coinbaseService, lodash, platformInfo, ongoingProcess, popupService, externalLinkService) {
angular.module('copayApp.controllers').controller('coinbaseController', function($scope, $timeout, $ionicModal, $ionicHistory, $log, coinbaseService, lodash, platformInfo, ongoingProcess, popupService, externalLinkService) {
var isNW = platformInfo.isNW;
var isCordova = platformInfo.isCordova;
@ -17,8 +17,14 @@ angular.module('copayApp.controllers').controller('coinbaseController', function
if (err || lodash.isEmpty(data)) {
if (err) {
$log.error(err);
var errorId = err.errors ? err.errors[0].id : null;
err = err.errors ? err.errors[0].message : err;
popupService.showAlert('Error connecting to Coinbase', err);
popupService.showAlert('Error connecting to Coinbase', err, function() {
if (errorId == 'revoked_token') {
coinbaseService.logout(function() {});
}
$ionicHistory.goBack();
});
}
return;
}

12
src/js/controllers/preferencesCoinbase.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesCoinbaseController', function($scope, $timeout, $state, $ionicHistory, lodash, ongoingProcess, popupService, coinbaseService) {
angular.module('copayApp.controllers').controller('preferencesCoinbaseController', function($scope, $timeout, $log, $state, $ionicHistory, lodash, ongoingProcess, popupService, coinbaseService) {
$scope.revokeToken = function() {
popupService.showConfirm('Coinbase', 'Are you sure you would like to log out of your Coinbase account?', null, null, function(res) {
@ -22,7 +22,15 @@ angular.module('copayApp.controllers').controller('preferencesCoinbaseController
if (err || lodash.isEmpty(data)) {
ongoingProcess.set('connectingCoinbase', false);
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err);
$log.error(err);
var errorId = err.errors ? err.errors[0].id : null;
err = err.errors ? err.errors[0].message : err;
popupService.showAlert('Error connecting to Coinbase', err, function() {
if (errorId == 'revoked_token') {
coinbaseService.logout(function() {});
$ionicHistory.goBack();
}
});
}
return;
}