mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 06:55:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add info for wallet restore

Browse source
This commit is contained in:
Manfred Karrer 2017-07-16 02:35:03 +02:00
parent 50d9c453ba
commit 25f9368990
4 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/src/main/resources/i18n/displayStrings.properties
View file

@ -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

1
core/src/main/java/io/bisq/core/trade/protocol/tasks/seller_as_taker/SellerAsTakerSignAndPublishDepositTx.java
View file

@ -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();

8
gui/src/main/java/io/bisq/gui/main/account/content/seedwords/SeedWordsView.java
View file

@ -143,7 +143,13 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
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");

1
gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferDataModel.java
View file

@ -256,7 +256,6 @@ class TakeOfferDataModel extends ActivatableDataModel {
}
public void onClose() {
log.error("onClose");
btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
}