Ecosystem/haveno
Ecosystem/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-09-29 03:51:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support wallet seed tab showing seed phrase

Browse source 
disable wallet info tab
This commit is contained in:
woodser 2022-07-13 08:58:41 -04:00
parent 83c5d505c3
commit c71c61d1bb
4 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop/src/main/java/bisq/desktop/main/MainView.java
View file

@ -28,6 +28,7 @@ import bisq.desktop.components.AutoTooltipLabel;
import bisq.desktop.components.AutoTooltipToggleButton;
import bisq.desktop.components.BusyAnimation;
import bisq.desktop.main.account.AccountView;
import bisq.desktop.main.funds.FundsView;
import bisq.desktop.main.market.MarketView;
import bisq.desktop.main.market.offerbook.OfferBookChartView;
import bisq.desktop.main.offer.BuyOfferView;
@ -173,7 +174,7 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
ToggleButton buyButton = new NavButton(BuyOfferView.class, Res.get("mainView.menu.buy").toUpperCase());
ToggleButton sellButton = new NavButton(SellOfferView.class, Res.get("mainView.menu.sell").toUpperCase());
ToggleButton portfolioButton = new NavButton(PortfolioView.class, Res.get("mainView.menu.portfolio").toUpperCase());
// ToggleButton fundsButton = new NavButton(FundsView.class, Res.get("mainView.menu.funds").toUpperCase());
ToggleButton fundsButton = new NavButton(FundsView.class, Res.get("mainView.menu.funds").toUpperCase());
ToggleButton supportButton = new NavButton(SupportView.class, Res.get("mainView.menu.support"));
ToggleButton settingsButton = new NavButton(SettingsView.class, Res.get("mainView.menu.settings"));

5
desktop/src/main/java/bisq/desktop/main/account/AccountView.fxml
View file

@ -49,11 +49,6 @@
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</Tab>
<Tab fx:id="walletInfoTab" closable="false">
<ScrollPane fitToWidth="true" hbarPolicy="NEVER"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"/>
</Tab>
<Tab fx:id="backupTab" closable="false"/>
</JFXTabPane>

2
desktop/src/main/java/bisq/desktop/main/account/AccountView.java
View file

@ -103,7 +103,7 @@ public class AccountView extends ActivatableView<TabPane, Void> {
notificationTab.setText(Res.get("account.menu.notifications").toUpperCase());
passwordTab.setText(Res.get("account.menu.password").toUpperCase());
seedWordsTab.setText(Res.get("account.menu.seedWords").toUpperCase());
walletInfoTab.setText(Res.get("account.menu.walletInfo").toUpperCase());
//walletInfoTab.setText(Res.get("account.menu.walletInfo").toUpperCase());
backupTab.setText(Res.get("account.menu.backup").toUpperCase());
navigationListener = (viewPath, data) -> {

33
desktop/src/main/java/bisq/desktop/main/account/content/seedwords/SeedWordsView.java
View file

@ -24,8 +24,8 @@ import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.overlays.windows.WalletPasswordWindow;
import bisq.desktop.util.Layout;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.WalletsManager;
import bisq.core.btc.wallet.XmrWalletService;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOfferManager;
import bisq.core.user.DontShowAgainLookup;
@ -39,7 +39,6 @@ import org.bitcoinj.wallet.DeterministicSeed;
import javax.inject.Inject;
import javax.inject.Named;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import javafx.scene.control.Button;
@ -54,13 +53,11 @@ import javafx.beans.value.ChangeListener;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.TimeZone;
import static bisq.desktop.util.FormBuilder.*;
@ -70,7 +67,7 @@ import static javafx.beans.binding.Bindings.createBooleanBinding;
public class SeedWordsView extends ActivatableView<GridPane, Void> {
private final WalletsManager walletsManager;
private final OpenOfferManager openOfferManager;
private final BtcWalletService btcWalletService;
private final XmrWalletService xmrWalletService;
private final WalletPasswordWindow walletPasswordWindow;
private final File storageDir;
@ -94,12 +91,12 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
@Inject
private SeedWordsView(WalletsManager walletsManager,
OpenOfferManager openOfferManager,
BtcWalletService btcWalletService,
XmrWalletService xmrWalletService,
WalletPasswordWindow walletPasswordWindow,
@Named(Config.STORAGE_DIR) File storageDir) {
this.walletsManager = walletsManager;
this.openOfferManager = openOfferManager;
this.btcWalletService = btcWalletService;
this.xmrWalletService = xmrWalletService;
this.walletPasswordWindow = walletPasswordWindow;
this.storageDir = storageDir;
}
@ -109,8 +106,8 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
addTitledGroupBg(root, gridRow, 2, Res.get("account.seed.backup.title"));
displaySeedWordsTextArea = addTopLabelTextArea(root, gridRow, Res.get("seed.seedWords"), "", Layout.FIRST_ROW_DISTANCE).second;
displaySeedWordsTextArea.getStyleClass().add("wallet-seed-words");
displaySeedWordsTextArea.setPrefHeight(40);
displaySeedWordsTextArea.setMaxHeight(40);
displaySeedWordsTextArea.setPrefHeight(70);
displaySeedWordsTextArea.setMaxHeight(70);
displaySeedWordsTextArea.setEditable(false);
datePicker = addTopLabelDatePicker(root, ++gridRow, Res.get("seed.date"), 10).second;
@ -182,10 +179,7 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
}
private void showSeedPhrase() {
DeterministicSeed keyChainSeed = btcWalletService.getKeyChainSeed();
// wallet creation date is not encrypted
walletCreationDate = Instant.ofEpochSecond(walletsManager.getChainSeedCreationTimeSeconds()).atZone(ZoneId.systemDefault()).toLocalDate();
if (keyChainSeed.isEncrypted()) {
if (xmrWalletService.isWalletEncrypted()) {
askForPassword();
} else {
String key = "showSeedWordsWarning";
@ -194,13 +188,13 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
.actionButtonText(Res.get("account.seed.warn.noPw.yes"))
.onAction(() -> {
DontShowAgainLookup.dontShowAgain(key, true);
initSeedWords(keyChainSeed);
initSeedWords(xmrWalletService.getWallet().getMnemonic());
showSeedScreen();
})
.closeButtonText(Res.get("shared.no"))
.show();
} else {
initSeedWords(keyChainSeed);
initSeedWords(xmrWalletService.getWallet().getMnemonic());
showSeedScreen();
}
}
@ -225,16 +219,13 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
private void askForPassword() {
walletPasswordWindow.headLine(Res.get("account.seed.enterPw")).onAesKey(aesKey -> {
initSeedWords(walletsManager.getDecryptedSeed(aesKey, btcWalletService.getKeyChainSeed(), btcWalletService.getKeyCrypter()));
initSeedWords(xmrWalletService.getWallet().getMnemonic());
showSeedScreen();
}).hideForgotPasswordButton().show();
}
private void initSeedWords(DeterministicSeed seed) {
List<String> mnemonicCode = seed.getMnemonicCode();
if (mnemonicCode != null) {
seedWordText = Joiner.on(" ").join(mnemonicCode);
}
private void initSeedWords(String seed) {
seedWordText = seed;
}
private void showSeedScreen() {