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

4
src/js/services/coinbaseService.js
View file

@ -700,7 +700,9 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $
root.logout = function(cb) {
storageService.removeCoinbaseToken(credentials.NETWORK, function() {
storageService.removeCoinbaseRefreshToken(credentials.NETWORK, function() {
return cb();
storageService.removeCoinbaseTxs(credentials.NETWORK, function() {
return cb();
});
});
});
};

8
src/js/services/incomingData.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.services').factory('incomingData', function($log, $state, $timeout, bitcore, $rootScope, payproService, scannerService, appConfigService) {
angular.module('copayApp.services').factory('incomingData', function($log, $state, $timeout, $ionicHistory, bitcore, $rootScope, payproService, scannerService, appConfigService) {
var root = {};
@ -127,10 +127,16 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
});
} else if (data && data.indexOf(appConfigService.name + '://coinbase') === 0) {
var code = getParameterByName('code', data);
$ionicHistory.nextViewOptions({
disableAnimate: true
});
$state.go('tabs.home', {}, {
'reload': true,
'notify': $state.current.name == 'tabs.home' ? false : true
}).then(function() {
$ionicHistory.nextViewOptions({
disableAnimate: true
});
$state.transitionTo('tabs.buyandsell.coinbase', {
code: code
});