Commit d6c1737d authored by Benoit Lavenier's avatar Benoit Lavenier

[fix] TX history: "show all" button not working - fix #727

parent fcbcec72
Subproject commit b828d3b53a649d2c64b935c75bdc782358d1c496
Subproject commit 3d8750ea54cf459784c1f3c425b2b44845688642
......@@ -694,8 +694,10 @@ function WalletTxController($scope, $ionicPopover, $state, $timeout, $location,
$scope.load = function() {
if (!wallet) return;
var hasMinData = wallet.isDataLoaded({minData: true});
var options = {
minData: !wallet.isDataLoaded({minData: true}),
requirements: !hasMinData, // load requirements (=minData) once
minData: !hasMinData,
sources: true,
tx: {
enable: true
......@@ -836,7 +838,7 @@ function WalletTxController($scope, $ionicPopover, $state, $timeout, $location,
(Math.trunc(new Date().getTime() / 1000) - 2 * csSettings.data.walletHistoryTimeSecond);
UIUtils.loading.show();
return csWallet.refreshData({tx: {enable: true,fromTime: fromTime}})
return wallet.refreshData({tx: {enable: true,fromTime: fromTime}})
.then(function() {
$scope.updateView();
UIUtils.loading.hide();
......
......@@ -914,6 +914,11 @@ angular.module('cesium.wallet.services', ['ngApi', 'ngFileSaver', 'cesium.bma.se
// Force some load (requirements) if not already loaded
options.requirements = angular.isDefined(options.requirements) ? options.requirements : angular.isDefined(data.requirements.needSelf);
// Force sources when TX enable
if (angular.isUndefined(options.sources) && options.tx && options.tx.enable) {
options.sources = true;
}
var jobs = [];
// Get requirements
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment