anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Fix tab-receibe view. Fix wallet-details

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-30 12:27:31 -03:00
commit 18c0d829c7
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
6 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/js/controllers/tab-home.js
View file

@ -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) {

3
src/js/controllers/tab-receive.js
View file

@ -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);
});
};

7
src/js/controllers/walletDetails.js
View file

@ -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();
});
});