nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix blank page when redirected to national currencies tab

Browse Source
This commit is contained in:
woodser 2022-07-14 10:54:07 -04:00
parent 003fac3da4
commit 83c5d505c3
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
desktop/src/main/java/bisq/desktop/main/MainView.java
View File

@ -357,25 +357,23 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
settingsButtonWithBadge.getStyleClass().add("new"); settingsButtonWithBadge.getStyleClass().add("new");
navigation.addListener((viewPath, data) -> { navigation.addListener((viewPath, data) -> {
UserThread.execute(() -> { if (viewPath.size() != 2 || viewPath.indexOf(MainView.class) != 0)
if (viewPath.size() != 2 || viewPath.indexOf(MainView.class) != 0) return;
return;
Class<? extends View> viewClass = viewPath.tip(); Class<? extends View> viewClass = viewPath.tip();
View view = viewLoader.load(viewClass); View view = viewLoader.load(viewClass);
contentContainer.getChildren().setAll(view.getRoot()); contentContainer.getChildren().setAll(view.getRoot());
try { try {
navButtons.getToggles().stream() navButtons.getToggles().stream()
.filter(toggle -> toggle instanceof NavButton) .filter(toggle -> toggle instanceof NavButton)
.filter(button -> viewClass == ((NavButton) button).viewClass) .filter(button -> viewClass == ((NavButton) button).viewClass)
.findFirst() .findFirst()
.orElseThrow(() -> new HavenoException("No button matching %s found", viewClass)) .orElseThrow(() -> new HavenoException("No button matching %s found", viewClass))
.setSelected(true); .setSelected(true);
} catch (HavenoException e) { } catch (HavenoException e) {
navigation.navigateTo(MainView.class, MarketView.class, OfferBookChartView.class); navigation.navigateTo(MainView.class, MarketView.class, OfferBookChartView.class);
} }
});
}); });
VBox splashScreen = createSplashScreen(); VBox splashScreen = createSplashScreen();

2
desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View File

@ -268,7 +268,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
setupDevDummyPaymentAccounts(); setupDevDummyPaymentAccounts();
} }
getShowAppScreen().set(true); UserThread.execute(() -> getShowAppScreen().set(true));
// We only show the popup if the user has already set up any fiat account. For new users it is not a rule // We only show the popup if the user has already set up any fiat account. For new users it is not a rule
// change and for altcoins its not relevant. // change and for altcoins its not relevant.