Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

do not sync trade wallet on deletion if deposit not requested #796

Merged
merged 2 commits into from
Feb 26, 2024
Merged

do not sync trade wallet on deletion if deposit not requested #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa699c9
do not sync trade wallet on deletion if deposit not requested
woodser Feb 25, 2024
6ec59b5
remove trade after cleared and shut down
woodser Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/haveno/core/trade/Trade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ public void deleteWallet() {
}

// wallet must be synced
if (!isSyncedWithinTolerance()) {
if (isDepositRequested() && !isSyncedWithinTolerance()) {
log.warn("Wallet is not synced for {} {}, syncing", getClass().getSimpleName(), getId());
syncWallet(true);
}
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/haveno/core/trade/TradeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,13 +1311,13 @@ private void removeTradeOnError(Trade trade) {
if (trade instanceof MakerTrade && openOffer.isPresent()) {
openOfferManager.unreserveOpenOffer(openOffer.get());
}

// remove trade from list
removeTrade(trade);
}

// clear and shut down trade
trade.clearAndShutDown();

// remove trade from list
removeTrade(trade);
}

private void listenForCleanup(Trade trade) {
Expand Down
Loading