diff --git a/platforms/desktop b/platforms/desktop index b828d3b53a649d2c64b935c75bdc782358d1c496..3d8750ea54cf459784c1f3c425b2b44845688642 160000 --- a/platforms/desktop +++ b/platforms/desktop @@ -1 +1 @@ -Subproject commit b828d3b53a649d2c64b935c75bdc782358d1c496 +Subproject commit 3d8750ea54cf459784c1f3c425b2b44845688642 diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js index c415480d5bc7b0a3313d3fad9dfb07b59ab5bdf9..0b844f132cd69ca61ed72e76f6fc4959f9e35916 100644 --- a/www/js/controllers/wallet-controllers.js +++ b/www/js/controllers/wallet-controllers.js @@ -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(); diff --git a/www/js/services/wallet-services.js b/www/js/services/wallet-services.js index 96eecea20852461fd2ef498f04dbd5e7fa0e2569..1d402fab1830aa07e4cddc79a86c4a7f0da814e4 100644 --- a/www/js/services/wallet-services.js +++ b/www/js/services/wallet-services.js @@ -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