Merge branch 'master' of github.com:bitpay/copay into feature/better-buy-and-sell

This commit is contained in:
Jason Dreyzehner 2017-02-01 17:38:57 -05:00
commit aaf9008394
41 changed files with 931 additions and 1016 deletions

View file

@ -137,7 +137,6 @@ angular.module('copayApp.controllers').controller('coinbaseController', function
var self = this;
$scope.$on("$ionicView.beforeEnter", function(event, data) {
$scope.showOauthForm = false;
coinbaseService.setCredentials();
if (data.stateParams && data.stateParams.code) {
coinbaseService.getStoredToken(function(at) {
if (!at) self.submitOauthCode(data.stateParams.code);