Merge pull request #230 from JDonadio/ref/home-01
Fix activity spinner - UI
This commit is contained in:
commit
edcbec7d96
4 changed files with 62 additions and 61 deletions
|
|
@ -4,24 +4,21 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
|||
function($rootScope, $timeout, $scope, $state, lodash, profileService, walletService, configService, txFormatService, $ionicModal, $log, platformInfo) {
|
||||
|
||||
var setNotifications = function(notifications) {
|
||||
|
||||
var n = walletService.processNotifications(notifications, 5);
|
||||
|
||||
$scope.notifications = n;
|
||||
$scope.notificationsMore = notifications.length > 5 ? notifications.length - 5 : null;
|
||||
$scope.notificationsMore = notifications.length > 5 ? notifications.length - 5 : null;
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
}, 1);
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
$scope.updateAllWallets = function() {
|
||||
$timeout(function() {
|
||||
$scope.wallets = profileService.getWallets();
|
||||
$scope.wallets = profileService.getWallets();
|
||||
if (lodash.isEmpty($scope.wallets)) return;
|
||||
|
||||
var i = $scope.wallets.length, j =0;
|
||||
$timeout(function() {
|
||||
var i = $scope.wallets.length;
|
||||
var j = 0;
|
||||
var timeSpan = 60 * 60 * 24 * 7;
|
||||
var notifications = [];
|
||||
|
||||
|
|
@ -52,7 +49,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
|||
});
|
||||
|
||||
});
|
||||
$scope.$digest();
|
||||
$scope.$digest();
|
||||
}, 100);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
h3.title {
|
||||
margin-left: 10px !important;
|
||||
}
|
||||
|
||||
.walletHome h4.title {
|
||||
padding: 0px 0 10px 15px;
|
||||
margin: 5px 0 5px 0;
|
||||
|
|
@ -521,6 +525,10 @@ ul.wallet-selection.wallets {
|
|||
font-size: 28px;
|
||||
}
|
||||
|
||||
.size-32 {
|
||||
font-size: 32px;
|
||||
}
|
||||
|
||||
.size-36 {
|
||||
font-size: 36px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue