Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0

This commit is contained in:
Manfred Karrer 2018-11-26 20:03:14 +01:00
commit 7feabf5dbd
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
4 changed files with 5 additions and 8 deletions

View File

@ -404,13 +404,11 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel> extends
tradeFeeInBtcToggle.setMouseTransparent(true);
tradeFeeInBsqToggle.setMouseTransparent(true);
int delay = 500;
int diff = 100;
setDepositTitledGroupBg.setVisible(false);
setDepositTitledGroupBg.setManaged(false);
transitions.fadeOutAndRemove(setDepositTitledGroupBg, delay, (event) -> {
});
delay -= diff;
transitions.fadeOutAndRemove(advancedOptionsBox, delay);
advancedOptionsBox.setVisible(false);
advancedOptionsBox.setManaged(false);
model.onShowPayFundsScreen();

View File

@ -305,8 +305,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
volumeColumn.setTitleWithHelpText(Res.get("offerbook.volume", code), Res.get("shared.amountHelp"));
priceColumn.setTitle(formatter.getPriceWithCurrencyCode(code));
if (tableView.getColumns().contains(marketColumn))
tableView.getColumns().remove(marketColumn);
tableView.getColumns().remove(marketColumn);
}
return null;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 730 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB