Fix glidera issues (tx proposals and ui)

This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-06 11:59:05 -03:00
commit 241213ca4f
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
11 changed files with 42 additions and 47 deletions

View file

@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('txpDetailsController', functi
var tx = $scope.tx;
var copayers = $scope.copayers;
var isGlidera = $scope.isGlidera;
var GLIDERA_LOCK_TIME = 6 * 60 * 60;
var now = Math.floor(Date.now() / 1000);
$scope.loading = null;

View file

@ -51,7 +51,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
if (permissions.view_email_address && opts.fullUpdate) {
glideraService.getEmail(accessToken, function(err, data) {
$scope.email = data.email;
$scope.email = data;
});
}
if (permissions.personal_info && opts.fullUpdate) {

View file

@ -86,7 +86,7 @@ h3.title {
.box-notification {
padding: 0.5rem;
border: 1px solid;
margin-bottom: 20px;
margin: 10px;
a {
color: #fff;
}

View file

@ -1,7 +1,8 @@
.wallet-activity {
&-not-pending {
background-color:#eee;
opacity: 0.6;
filter: alpha(opacity=60); /* For IE8 and earlier */
}
&-amount {