Fix tab-receibe view. Fix wallet-details
This commit is contained in:
parent
96dbd563d3
commit
18c0d829c7
6 changed files with 37 additions and 19 deletions
|
|
@ -4,6 +4,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
|||
function($rootScope, $timeout, $scope, $state, $stateParams, $ionicModal, $ionicScrollDelegate, gettextCatalog, lodash, popupService, ongoingProcess, profileService, walletService, configService, $log, platformInfo, storageService, txpModalService, $window, bitpayCardService) {
|
||||
var wallet;
|
||||
var listeners = [];
|
||||
var notifications = [];
|
||||
$scope.externalServices = {};
|
||||
$scope.bitpayCardEnabled = true; // TODO
|
||||
$scope.openTxpModal = txpModalService.open;
|
||||
|
|
@ -102,7 +103,6 @@ angular.module('copayApp.controllers').controller('tabHomeController',
|
|||
var i = $scope.wallets.length;
|
||||
var j = 0;
|
||||
var timeSpan = 60 * 60 * 24 * 7;
|
||||
var notifications = [];
|
||||
|
||||
lodash.each($scope.wallets, function(wallet) {
|
||||
walletService.getStatus(wallet, {}, function(err, status) {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@ angular.module('copayApp.controllers').controller('tabReceiveController', functi
|
|||
if (err) popupService.showAlert(gettextCatalog.getString('Error'), err);
|
||||
$scope.addr = addr;
|
||||
if ($scope.wallet.showBackupNeededModal) $scope.openBackupNeededModal();
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
}, 100);
|
||||
});
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -122,9 +122,6 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
|||
$scope.updatingTxHistoryProgress = txs ? txs.length : 0;
|
||||
$scope.completeTxHistory = txs;
|
||||
$scope.showHistory();
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
});
|
||||
};
|
||||
|
||||
$timeout(function() {
|
||||
|
|
@ -139,9 +136,7 @@ angular.module('copayApp.controllers').controller('walletDetailsController', fun
|
|||
}
|
||||
$scope.completeTxHistory = txHistory;
|
||||
$scope.showHistory();
|
||||
$timeout(function() {
|
||||
$scope.$apply();
|
||||
});
|
||||
$scope.$apply();
|
||||
return cb();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
background: #fff;
|
||||
.incomplete {
|
||||
padding: 50px;
|
||||
height: 350px;
|
||||
.title {
|
||||
padding: 20px;
|
||||
font-size: 25px;
|
||||
|
|
@ -44,11 +45,13 @@
|
|||
&-gen-address {}
|
||||
}
|
||||
.qr {
|
||||
padding: 30px;
|
||||
padding: 50px 0 20px 0;
|
||||
}
|
||||
.backup {
|
||||
background-color: orange;
|
||||
color: #fff;
|
||||
position: absolute;
|
||||
top: 5px;
|
||||
i {
|
||||
padding: 10px;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue