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
bower.json
View file

@ -17,7 +17,7 @@
"ng-lodash": "~0.2.0",
"angular-moment": "0.10.1",
"moment": "2.10.3",
"angular-bitcore-wallet-client": "0.1.4",
"angular-bitcore-wallet-client": "0.1.2",
"angular-ui-router": "~0.2.13",
"qrcode-decoder-js": "*",
"fastclick": "*",

50
public/views/glidera.html
View file

@ -25,7 +25,7 @@
<div class="row">
<div class="columns">
<div class="text-center m20b">
<img src="img/glidera-logo.png">
<img src="img/glidera-logo.png" ng-click="index.updateGlidera(index.glideraToken, index.glideraPermissions)">
</div>
<div class="m20b box-notification" ng-if="index.glideraError || glidera.error">
@ -43,7 +43,7 @@
</div>
</div>
<div ng-if="index.glideraCredentials && !index.glideraToken && !index.glideraLoading && !index.glideraError"
<div ng-if="!index.glideraToken && !index.glideraLoading && !index.glideraError"
class="row">
<div class="columns" ng-init="showOauthForm = false">
<div class="text-center" ng-show="!showOauthForm">
@ -78,41 +78,61 @@
</div>
</div>
<div ng-if="index.glideraToken && index.glideraPermissions"
ng-init="glidera.update(index.glideraToken, index.glideraPermissions)">
<div ng-if="index.glideraStatusLoaded && index.glideraToken && index.glideraPermissions">
<div class="text-center m10b">
<div class="size-12" ng-show="index.glideraEmail">{{index.glideraEmail}}</div>
<div class="size-12" ng-show="index.glideraEmail">
{{index.glideraEmail}}
<span ng-show="!index.glideraStatus.userEmailIsSetup">(<span translate>Unconfirmed</span>)</span>
</div>
<div ng-show="index.glideraPersonalInfo" class="size-12">
{{index.glideraPersonalInfo.firstName}} {{index.glideraPersonalInfo.lastName}}
<span ng-show="index.glideraStatus.personalInfoState != 'VERIFIED'">({{index.glideraStatus.personalInfoState}})</span>
</div>
<div class="text-warning size-12" ng-show="!index.glideraStatus.userPhoneIsSetup" translate>
You need to setup a phone number
</div>
<div class="text-warning size-12" ng-show="!index.glideraStatus.userBankAccountIsSetup" translate>
You need to setup a bank account
</div>
<div class="text-gray size-12"
ng-show="index.glideraStatus.userBankAccountIsSetup && index.glideraStatus.bankAccountState != 'VERIFIED'" translate>
Bank account state: {{index.glideraStatus.bankAccountState}}
</div>
</div>
<div class="text-center m20b">
<a href class="text-gray" ng-click="$root.go('preferencesGlidera')">
Preferences
</a>
</div>
<ul class="no-bullet m0 size-14" ng-show="index.glideraPermissions.transact">
<li class="line-b line-t p20 pointer" ng-click="$root.go('buyGlidera')">
<ul class="no-bullet m0 size-14">
<li class="line-b line-t p20 pointer"
ng-show="index.glideraPermissions.transact &&
(index.glideraStatus.userCanBuy || index.glideraStatus.userCanTransact)"
ng-click="$root.go('buyGlidera')">
<span translate>Buy</span>
<span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i>
</span>
</li>
<li class="line-b p20 pointer" ng-click="$root.go('sellGlidera')">
<li class="line-b p20 pointer"
ng-show="index.glideraPermissions.transact &&
(index.glideraStatus.userCanSell || index.glideraStatus.userCanTransact)"
ng-click="$root.go('sellGlidera')">
<span translate>Sell</span>
<span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i>
</span>
</li>
<li class="line-b p20 pointer" ng-click="$root.go('preferencesGlidera')">
<span translate>Preferences</span>
<span class="right text-gray">
<i class="icon-arrow-right3 size-24 right"></i>
</span>
</li>
</ul>
<div ng-show="index.glideraPermissions.transaction_history">
<h4 class="title m0" translate>Activity</h4>
<div ng-show="!index.glideraTxs"
<div ng-show="index.glideraTxs.length == 0 && !index.glideraLoadingHistory"
class="size-12 p10 text-center text-gray" translate>
No activity in your account
</div>

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

3
src/js/services/glideraService.js
View file

@ -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() {