Activity
-
No activity in your account
diff --git a/src/js/controllers/buyGlidera.js b/src/js/controllers/buyGlidera.js
index 63ac06939..e8d2b88ea 100644
--- a/src/js/controllers/buyGlidera.js
+++ b/src/js/controllers/buyGlidera.js
@@ -7,7 +7,7 @@ angular.module('copayApp.controllers').controller('buyGlideraController',
this.show2faCodeInput = null;
this.error = null;
this.success = null;
- this.loading = null;
+ this.loading = null;
this.getBuyPrice = function(token, price) {
var self = this;
diff --git a/src/js/controllers/glidera.js b/src/js/controllers/glidera.js
index 0c63b6ef3..8d66d9583 100644
--- a/src/js/controllers/glidera.js
+++ b/src/js/controllers/glidera.js
@@ -1,7 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('glideraController',
- function($scope, $timeout, $modal, applicationService, profileService, configService, storageService, glideraService) {
+ function($scope, $timeout, $modal, applicationService, profileService, configService, storageService, glideraService, isChromeApp) {
var config = configService.getSync().wallet.settings;
@@ -34,6 +34,14 @@ angular.module('copayApp.controllers').controller('glideraController',
}, 100);
};
+ // DISABLE ANIMATION ON CHROMEAPP
+ if (isChromeApp) {
+ var animatedSlideRight = 'full';
+ }
+ else {
+ var animatedSlideRight = 'full animated slideInRight';
+ }
+
this.openTxModal = function(token, tx) {
var self = this;
var fc = profileService.focusedClient;
@@ -54,7 +62,7 @@ angular.module('copayApp.controllers').controller('glideraController',
var modalInstance = $modal.open({
templateUrl: 'views/modals/glidera-tx-details.html',
- windowClass: 'full animated slideInRight',
+ windowClass: animatedSlideRight,
controller: ModalInstanceCtrl,
});
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 8704c9456..8b4e6e29f 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -113,7 +113,6 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.pendingTxProposalsCountForUs = null;
self.setSpendUnconfirmed();
- self.glideraCredentials = null;
self.glideraToken = null;
self.glideraError = null;
self.glideraPermissions = null;
@@ -840,7 +839,7 @@ console.log('[index.js:395]',txps); //TODO
self.initGlidera = function(accessToken) {
if (self.isShared) return;
- self.glideraCredentials = glideraService.init(self.network);
+ glideraService.setCredentials(self.network);
var getToken = function(cb) {
if (accessToken) {
@@ -871,6 +870,12 @@ console.log('[index.js:395]',txps); //TODO
self.updateGlidera = function(accessToken, permissions) {
if (!accessToken || !permissions) return;
+
+ self.glideraStatusLoaded = false;
+ glideraService.getStatus(accessToken, function(err, data) {
+ self.glideraStatusLoaded = true;
+ self.glideraStatus = data;
+ });
if (permissions.view_email_address) {
self.glideraLoadingEmail = gettext('Getting Glidera Email...');
diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js
index 653c1291c..2fa48275a 100644
--- a/src/js/services/glideraService.js
+++ b/src/js/services/glideraService.js
@@ -4,7 +4,7 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
var root = {};
var credentials = {};
- root.init = function(network) {
+ root.setCredentials = function(network) {
if (network == 'testnet') {
credentials.HOST = 'https://sandbox.glidera.io';
credentials.REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob';
@@ -17,7 +17,6 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
credentials.CLIENT_ID = '';
credentials.CLIENT_SECRET = '';
};
- return credentials;
};
root.getOauthCodeUrl = function() {