diff --git a/.travis.yml b/.travis.yml index 1c83f08631f..ed2abf26c06 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,5 @@ language: java jdk: oraclejdk8 -before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ -cache: - directories: - - $HOME/.gradle/caches/ - - $HOME/.gradle/wrapper/ notifications: slack: on_success: change diff --git a/src/main/java/bisq/desktop/main/dao/proposal/dashboard/ProposalDashboardView.java b/src/main/java/bisq/desktop/main/dao/proposal/dashboard/ProposalDashboardView.java index 197be5c2535..2bc5eb0e01a 100644 --- a/src/main/java/bisq/desktop/main/dao/proposal/dashboard/ProposalDashboardView.java +++ b/src/main/java/bisq/desktop/main/dao/proposal/dashboard/ProposalDashboardView.java @@ -141,12 +141,13 @@ protected void deactivate() { private void onChainHeightChanged(int height) { phaseBarsItems.forEach(item -> { - int startBlock = periodService.getAbsoluteStartBlockOfPhase(height, item.getPhase()); - int endBlock = periodService.getAbsoluteEndBlockOfPhase(height, item.getPhase()); + int startBlock = periodService.getFirstBlockOfPhase(periodService.getCycle(height), item.getPhase()); + int endBlock = periodService.getLastBlockOfPhase(periodService.getCycle(height), item.getPhase()); item.setStartAndEnd(startBlock, endBlock); double progress = 0; if (height >= startBlock && height <= endBlock) { - progress = (double) (height - startBlock + 1) / (double) item.getPhase().getDurationInBlocks(); + progress = (double) (height - startBlock + 1) / + (double) periodService.getCycle(height).getPhaseDuration(item.getPhase()); } else if (height < startBlock) { progress = 0; } else if (height > endBlock) {