Fix glidera issues (tx proposals and ui)
This commit is contained in:
parent
2354a46bed
commit
241213ca4f
11 changed files with 42 additions and 47 deletions
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ h3.title {
|
|||
.box-notification {
|
||||
padding: 0.5rem;
|
||||
border: 1px solid;
|
||||
margin-bottom: 20px;
|
||||
margin: 10px;
|
||||
a {
|
||||
color: #fff;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
.wallet-activity {
|
||||
|
||||
&-not-pending {
|
||||
background-color:#eee;
|
||||
opacity: 0.6;
|
||||
filter: alpha(opacity=60); /* For IE8 and earlier */
|
||||
}
|
||||
|
||||
&-amount {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue