Merge pull request #6666 from cmgustavo/ref/wallet-details-02

Bug fixes UI from walletDetails
This commit is contained in:
Javier Donadío 2017-08-31 11:39:15 -03:00 committed by GitHub
commit 60ae2d2117
4 changed files with 83 additions and 136 deletions

View file

@ -156,9 +156,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
var updateTxHistory = function(cb) {
if (!cb) cb = function() {};
if ($scope.updatingTxHistory) return;
$scope.updatingTxHistory = true;
$scope.updateTxHistoryError = false;
$scope.updatingTxHistoryProgress = 0;
@ -358,6 +356,8 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
if (!$scope.wallet) return;
$scope.requiresMultipleSignatures = $scope.wallet.credentials.m > 1;
$scope.updatingTxHistory = true;
addressbookService.list(function(err, ab) {
if (err) $log.error(err);
$scope.addressbook = ab || {};

View file

@ -88,6 +88,27 @@
padding: 1rem;
background: #f8f8f9;
}
&__no-transaction {
color: $v-mid-gray;
font-size: 12.5px;
text-align: center;
padding-top: 2rem;
}
&__no-update-history {
color: $v-error-color;
font-size: 12.5px;
text-align: center;
padding-top: 2rem;
}
&__updating-history {
color: $v-mid-gray;
font-size: 12.5px;
text-align: center;
padding-top: 1rem;
}
}
#walletDetails {
@ -177,10 +198,6 @@
align-items: center;
justify-content: center;
&.collapsible {
margin-bottom: 10px;
}
&__balance {
-webkit-transform: scale3d(1, 1, 1) translateY(45px);
transform: scale3d(1, 1, 1) translateY(45px);
@ -200,6 +217,15 @@
border: 1px solid rgba(255,255,255,0.25);
}
&__error {
cursor: pointer;
font-size: 14px;
padding: 35px 20px;
}
}
.no-alternative {
padding-top: 45px;
}
.item.item-footer {
font-weight: lighter;