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

Merge pull request #1334 from ripcurlx/change-goto-screen-after-trade

Browse source 
Change path after completed trade
This commit is contained in:
Manfred Karrer 2018-02-13 12:38:45 -05:00 • committed by GitHub
commit e5e7ded68f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1518,6 +1518,7 @@ navigation.arbitratorSelection=\"Arbitrator selection\"
navigation.funds.availableForWithdrawal=\"Fund/Send funds\" navigation.funds.availableForWithdrawal=\"Fund/Send funds\"
navigation.portfolio.myOpenOffers=\"Portfolio/My open offers\" navigation.portfolio.myOpenOffers=\"Portfolio/My open offers\"
navigation.portfolio.pending=\"Portfolio/Open trades\" navigation.portfolio.pending=\"Portfolio/Open trades\"
navigation.portfolio.closedTrades=\"Portfolio/History\"
navigation.funds.depositFunds=\"Funds/Receive funds\" navigation.funds.depositFunds=\"Funds/Receive funds\"
navigation.settings.preferences=\"Settings/Preferences\" navigation.settings.preferences=\"Settings/Preferences\"
navigation.funds.transactions=\"Funds/Transactions\" navigation.funds.transactions=\"Funds/Transactions\"

1
common/src/main/resources/i18n/displayStrings_de.properties
View file

@ -1281,6 +1281,7 @@ navigation.arbitratorSelection=\"Vermittlerauswahl\"
navigation.funds.availableForWithdrawal=\"Gelder/Gelder senden\" navigation.funds.availableForWithdrawal=\"Gelder/Gelder senden\"
navigation.portfolio.myOpenOffers=\"Portfolio/Meine offenen Angebote\" navigation.portfolio.myOpenOffers=\"Portfolio/Meine offenen Angebote\"
navigation.portfolio.pending=\"Portfolio/Offene Händel\" navigation.portfolio.pending=\"Portfolio/Offene Händel\"
navigation.portfolio.closedTrades=\"Portfolio/Verlauf\"
navigation.funds.depositFunds=\"Gelder/Gelder erhalten\" navigation.funds.depositFunds=\"Gelder/Gelder erhalten\"
navigation.settings.preferences=\"Einstellungen/Voreinstellungen\" navigation.settings.preferences=\"Einstellungen/Voreinstellungen\"
navigation.funds.transactions=\"Gelder/Transaktionen\" navigation.funds.transactions=\"Gelder/Transaktionen\"

8
gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java
View file

@ -36,10 +36,10 @@ import io.bisq.gui.components.AutoTooltipLabel;
import io.bisq.gui.components.InputTextField; import io.bisq.gui.components.InputTextField;
import io.bisq.gui.components.TitledGroupBg; import io.bisq.gui.components.TitledGroupBg;
import io.bisq.gui.main.MainView; import io.bisq.gui.main.MainView;
import io.bisq.gui.main.funds.FundsView;
import io.bisq.gui.main.funds.transactions.TransactionsView;
import io.bisq.gui.main.overlays.notifications.Notification; import io.bisq.gui.main.overlays.notifications.Notification;
import io.bisq.gui.main.overlays.popups.Popup; import io.bisq.gui.main.overlays.popups.Popup;
import io.bisq.gui.main.portfolio.PortfolioView;
import io.bisq.gui.main.portfolio.closedtrades.ClosedTradesView;
import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel; import io.bisq.gui.main.portfolio.pendingtrades.PendingTradesViewModel;
import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView; import io.bisq.gui.main.portfolio.pendingtrades.steps.TradeStepView;
import io.bisq.gui.util.BSFormatter; import io.bisq.gui.util.BSFormatter;
@ -286,8 +286,8 @@ public class BuyerStep4View extends TradeStepView {
//noinspection unchecked //noinspection unchecked
new Popup<>().headLine(Res.get("portfolio.pending.step5_buyer.withdrawalCompleted.headline")) new Popup<>().headLine(Res.get("portfolio.pending.step5_buyer.withdrawalCompleted.headline"))
.feedback(Res.get("portfolio.pending.step5_buyer.withdrawalCompleted.msg")) .feedback(Res.get("portfolio.pending.step5_buyer.withdrawalCompleted.msg"))
.actionButtonTextWithGoTo("navigation.funds.transactions") .actionButtonTextWithGoTo("navigation.portfolio.closedTrades")
.onAction(() -> model.dataModel.navigation.navigateTo(MainView.class, FundsView.class, TransactionsView.class)) .onAction(() -> model.dataModel.navigation.navigateTo(MainView.class, PortfolioView.class, ClosedTradesView.class))
.dontShowAgainId(key) .dontShowAgainId(key)
.show(); .show();
} }