diff --git a/common/src/main/resources/i18n/displayStrings.properties b/common/src/main/resources/i18n/displayStrings.properties index 3c087027f6..ae4ebc6002 100644 --- a/common/src/main/resources/i18n/displayStrings.properties +++ b/common/src/main/resources/i18n/displayStrings.properties @@ -894,7 +894,11 @@ account.seed.warn.noPw.msg=You have not setup a wallet password which would prot Do you want to display the seed words? account.seed.warn.noPw.yes=Yes, and don't ask me again account.seed.enterPw=Enter password to view seed words - +account.seed.restore.info=Please note that you cannot import a wallet from an old Bitsquare version (any version before 0.5.0), \ + because the wallet format has changed!\n\n\ + If you want to move the funds from the old version to the new Bisq application send it with a Bitcoin transaction.\n\n\ + Also be aware that wallet restore is only for emergency cases and might cause problems with the internal wallet database. +account.seed.restore.ok=Ok, I understand and want to restore #################################################################### # DAO diff --git a/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java b/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java index 6c88ec175a..6374d5ba62 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java @@ -104,7 +104,6 @@ public class SellerAsTakerSignAndPublishDepositTx extends TradeTask { log.trace("takerSignAndPublishTx succeeded " + transaction); trade.setDepositTx(transaction); trade.setState(Trade.State.TAKER_PUBLISHED_DEPOSIT_TX); - log.error("onSuccess, offerid={}, RESERVED_FOR_TRADE", trade.getId()); walletService.swapTradeEntryToAvailableEntry(id, AddressEntry.Context.RESERVED_FOR_TRADE); complete(); diff --git a/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java b/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java index 22b349f520..c0ae6cc73a 100644 --- a/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java +++ b/gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java @@ -143,7 +143,13 @@ public class SeedWordsView extends ActivatableView { restoreButton.disableProperty().bind(createBooleanBinding(() -> !seedWordsValid.get() || !dateValid.get() || !seedWordsEdited.get(), seedWordsValid, dateValid, seedWordsEdited)); - restoreButton.setOnAction(e -> onRestore()); + restoreButton.setOnAction(e -> { + new Popup<>().information(Res.get("account.seed.restore.info")) + .closeButtonText(Res.get("shared.cancel")) + .actionButtonText(Res.get("account.seed.restore.ok")) + .onAction(this::onRestore) + .show(); + }); seedWordsTextArea.getStyleClass().remove("validation_error"); restoreDatePicker.getStyleClass().remove("validation_error"); diff --git a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java index 779ac6b3b1..3477c3f230 100644 --- a/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java +++ b/gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java @@ -256,7 +256,6 @@ class TakeOfferDataModel extends ActivatableDataModel { } public void onClose() { - log.error("onClose"); btcWalletService.resetAddressEntriesForOpenOffer(offer.getId()); }