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

Unconfirmed accounts

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2015-09-08 12:04:27 -03:00
commit 07bf7b8f97
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
6 changed files with 54 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/buyGlidera.js
View file

@ -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;

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

@ -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,
});

9
src/js/controllers/index.js
View file

@ -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...');