Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-22 13:39:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix trade state update bug

Browse source
This commit is contained in:
Manfred Karrer 2014-11-18 19:52:46 +01:00
parent b87a27922a
commit f9859b3a13
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java
View file

@ -163,9 +163,6 @@ class PendingTradesModel extends UIModel {
if (selectedItem != null) { if (selectedItem != null) {
isOfferer = getTrade().getOffer().getMessagePublicKey().equals(user.getMessagePublicKey()); isOfferer = getTrade().getOffer().getMessagePublicKey().equals(user.getMessagePublicKey());
// we want to re-trigger a change if the state is the same but different trades
tradeState.set(null);
Trade trade = getTrade(); Trade trade = getTrade();
if (trade.getDepositTx() != null) if (trade.getDepositTx() != null)
txId.set(trade.getDepositTx().getHashAsString()); txId.set(trade.getDepositTx().getHashAsString());

2
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
View file

@ -122,6 +122,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
void selectTrade(PendingTradesListItem item) { void selectTrade(PendingTradesListItem item) {
model.selectTrade(item); model.selectTrade(item);
updateState();
} }
void fiatPaymentStarted() { void fiatPaymentStarted() {
@ -250,6 +251,7 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
private void updateState() { private void updateState() {
if (model.tradeState.get() != null) { if (model.tradeState.get() != null) {
log.debug("tradeState " + model.tradeState.get());
switch (model.tradeState.get()) { switch (model.tradeState.get()) {
case DEPOSIT_PUBLISHED: case DEPOSIT_PUBLISHED:
state.set(model.isOfferer() ? State.OFFERER_BUYER_WAIT_TX_CONF : State.TAKER_SELLER_WAIT_TX_CONF); state.set(model.isOfferer() ? State.OFFERER_BUYER_WAIT_TX_CONF : State.TAKER_SELLER_WAIT_TX_CONF);

7
src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java
View file

@ -133,11 +133,10 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
txIdTextField.setup(presentationModel.getWalletService(), newValue); txIdTextField.setup(presentationModel.getWalletService(), newValue);
selectedItemChangeListener = (obsValue, oldValue, newValue) -> { selectedItemChangeListener = (obsValue, oldValue, newValue) -> {
if (oldValue != null && newValue != null) if (oldValue != null && newValue != null) {
presentationModel.selectTrade(newValue); presentationModel.selectTrade(newValue);
// TODO only clearSelection when there are more at least one remaining trades updateScreen();
/* else if (newValue == null) }
table.getSelectionModel().clearSelection();*/
}; };
listChangeListener = change -> { listChangeListener = change -> {