Skip to content

Commit

Permalink
Merge pull request #6848 from jmacxx/streamline_create_take_offer_flow
Browse files Browse the repository at this point in the history 
Improve flow in create/take offer process.
  • Loading branch information
@alejandrogarcia83
alejandrogarcia83 authored Sep 6, 2023
2 parents e915ef2 + e9ec3d7 commit d3f60c4
Show file tree
Hide file tree
Showing 9 changed files with 91 additions and 18 deletions.
7 changes: 5 additions & 2 deletions core/src/main/java/bisq/core/user/PreferencesPayload.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ public final class PreferencesPayload implements PersistableEnvelope {
// Added at 1.9.11
private boolean isFullBMAccountingNode = false;

private boolean useBisqWalletFunding = false;

///////////////////////////////////////////////////////////////////////////////////////////
// Constructor
Expand Down Expand Up @@ -225,7 +226,8 @@ public Message toProtoMessage() {
.setUserDefinedTradeLimit(userDefinedTradeLimit)
.setUserHasRaisedTradeLimit(userHasRaisedTradeLimit)
.setProcessBurningManAccountingData(processBurningManAccountingData)
.setIsFullBMAccountingNode(isFullBMAccountingNode);
.setIsFullBMAccountingNode(isFullBMAccountingNode)
.setUseBisqWalletFunding(useBisqWalletFunding);

Optional.ofNullable(backupDirectory).ifPresent(builder::setBackupDirectory);
Optional.ofNullable(preferredTradeCurrency).ifPresent(e -> builder.setPreferredTradeCurrency((protobuf.TradeCurrency) e.toProtoMessage()));
Expand Down Expand Up @@ -334,7 +336,8 @@ public static PreferencesPayload fromProto(protobuf.PreferencesPayload proto, Co
proto.getUserHasRaisedTradeLimit() ? proto.getUserDefinedTradeLimit() : Preferences.INITIAL_TRADE_LIMIT,
proto.getUserHasRaisedTradeLimit(),
proto.getProcessBurningManAccountingData(),
proto.getIsFullBMAccountingNode()
proto.getIsFullBMAccountingNode(),
proto.getUseBisqWalletFunding()
);
}
}
6 changes: 6 additions & 0 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ shared.nextStep=Next step
shared.fundFromSavingsWalletButton=Transfer funds from Bisq wallet
shared.fundFromExternalWalletButton=Open your external wallet for funding
shared.openDefaultWalletFailed=Failed to open a Bitcoin wallet application. Are you sure you have one installed?
shared.question.useBisqWalletForFunding=Would you like to always use your Bisq wallet for funding?\n\n\
The make/take offer process will take less steps by choosing this. \
However, funding from an external wallet could potentially be better for privacy.\n\n\
(This can be also be controlled in Settings: "Fund offer/trades from Bisq wallet").
shared.belowInPercent=Below % from market price
shared.aboveInPercent=Above % from market price
shared.enterPercentageValue=Enter % value
Expand Down Expand Up @@ -1405,6 +1409,8 @@ setting.preferences.useBitcoinUris.tooltip=Bisq's QR codes can either store bitc
with some extra parameters (amount & label) or plain bitcoin addresses\n\
with no additional data. Disable this option if your external wallet's\n\
scanner cannot handle the bitcoin URI scheme format.
setting.preferences.useBisqWalletForFunding=Fund offer/trades from Bisq wallet
setting.preferences.useBisqWalletForFunding.tooltip=The make/take offer process will be streamlined to take fewer steps if this option is enabled.
setting.preferences.currenciesInList=Currencies in market price feed list
setting.preferences.prefCurrency=Preferred currency
setting.preferences.displayFiat=Display national currencies
Expand Down
18 changes: 12 additions & 6 deletions desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,12 @@ private void onShowPayFundsScreen() {
advancedOptionsBox.setManaged(false);

model.onShowPayFundsScreen(() -> {
if (!DevEnv.isDevMode()) {
totalToPayTextField.setFundsStructure(model.getFundsStructure());
totalToPayTextField.setContentForInfoPopOver(createInfoPopover());

if (preferences.isUseBisqWalletFunding()) {
model.fundFromSavingsWallet();
} else {
String key = "createOfferFundWalletInfo";
String tradeAmountText = model.isSellOffer() ?
Res.get("createOffer.createOfferFundWalletInfo.tradeAmount", model.getTradeAmount()) : "";
Expand All @@ -447,9 +452,6 @@ private void onShowPayFundsScreen() {
.dontShowAgainId(key)
.show();
}

totalToPayTextField.setFundsStructure(model.getFundsStructure());
totalToPayTextField.setContentForInfoPopOver(createInfoPopover());
});

paymentAccountsComboBox.setDisable(true);
Expand All @@ -467,7 +469,7 @@ private void onShowPayFundsScreen() {

balanceTextField.setTargetAmount(model.getDataModel().totalToPayAsCoinProperty().get());

if (!DevEnv.isDevMode()) {
if (!preferences.isUseBisqWalletFunding()) {
String key = "securityDepositInfo";
new Popup().backgroundInfo(Res.get("popup.info.securityDepositInfo"))
.actionButtonText(Res.get("shared.faq"))
Expand Down Expand Up @@ -822,6 +824,9 @@ private void createListeners() {
.autoClose();

walletFundedNotification.show();
if (preferences.isUseBisqWalletFunding()) { // potentially bypass review step to the confirmation popup
UserThread.execute(this::onPlaceOffer);
}
}
};

Expand Down Expand Up @@ -1254,7 +1259,8 @@ private void addFundingGroup() {
fundFromSavingsWalletButton = new AutoTooltipButton(Res.get("shared.fundFromSavingsWalletButton"));
fundFromSavingsWalletButton.setDefaultButton(true);
fundFromSavingsWalletButton.getStyleClass().add("action-button");
fundFromSavingsWalletButton.setOnAction(e -> model.fundFromSavingsWallet());
fundFromSavingsWalletButton.setOnAction(e -> GUIUtil.maybeAskAboutStreamliningOrderFunding(
model::savePreferenceAndFundFromSavingsWallet, model::fundFromSavingsWallet));
Label label = new AutoTooltipLabel(Res.get("shared.OR"));
label.setPadding(new Insets(5, 0, 0, 0));
Button fundFromExternalWalletButton = new AutoTooltipButton(Res.get("shared.fundFromExternalWalletButton"));
Expand Down
5 changes: 5 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,11 @@ void onShowPayFundsScreen(Runnable actionHandler) {
updateSpinnerInfo();
}

void savePreferenceAndFundFromSavingsWallet() {
preferences.setUseBisqWalletFunding(true);
fundFromSavingsWallet();
}

void fundFromSavingsWallet() {
dataModel.fundFromSavingsWallet();
if (dataModel.getIsBtcWalletFunded().get()) {
Expand Down
14 changes: 12 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.coin.BsqFormatter;
import bisq.core.util.coin.CoinFormatter;
Expand Down Expand Up @@ -126,6 +127,7 @@
@FxmlView
public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOfferViewModel> implements ClosableView, InitializableViewWithTakeOfferData, SelectableView {
private final Navigation navigation;
private final Preferences preferences;
private final CoinFormatter formatter;
private final BsqFormatter bsqFormatter;
private final OfferDetailsWindow offerDetailsWindow;
Expand Down Expand Up @@ -184,13 +186,15 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
@Inject
private TakeOfferView(TakeOfferViewModel model,
Navigation navigation,
Preferences preferences,
@Named(FormattingUtils.BTC_FORMATTER_KEY) CoinFormatter formatter,
BsqFormatter bsqFormatter,
OfferDetailsWindow offerDetailsWindow,
Transitions transitions) {
super(model);

this.navigation = navigation;
this.preferences = preferences;
this.formatter = formatter;
this.bsqFormatter = bsqFormatter;
this.offerDetailsWindow = offerDetailsWindow;
Expand Down Expand Up @@ -224,6 +228,9 @@ protected void initialize() {
.autoClose();

walletFundedNotification.show();
if (preferences.isUseBisqWalletFunding()) { // potentially bypass review step to the confirmation popup
UserThread.execute(this::onTakeOffer);
}
}
};

Expand Down Expand Up @@ -504,7 +511,9 @@ private void onShowPayFundsScreen() {

balanceTextField.setTargetAmount(model.dataModel.getTotalToPayAsCoin().get());

if (!DevEnv.isDevMode()) {
if (preferences.isUseBisqWalletFunding()) {
model.fundFromSavingsWallet();
} else {
String key = "securityDepositInfo";
new Popup().backgroundInfo(Res.get("popup.info.securityDepositInfo"))
.actionButtonText(Res.get("shared.faq"))
Expand Down Expand Up @@ -995,7 +1004,8 @@ private void addFundingGroup() {
fundFromSavingsWalletButton = new AutoTooltipButton(Res.get("shared.fundFromSavingsWalletButton"));
fundFromSavingsWalletButton.setDefaultButton(true);
fundFromSavingsWalletButton.getStyleClass().add("action-button");
fundFromSavingsWalletButton.setOnAction(e -> model.fundFromSavingsWallet());
fundFromSavingsWalletButton.setOnAction(e -> GUIUtil.maybeAskAboutStreamliningOrderFunding(
model::savePreferenceAndFundFromSavingsWallet, model::fundFromSavingsWallet));
Label label = new AutoTooltipLabel(Res.get("shared.OR"));
label.setPadding(new Insets(5, 0, 0, 0));
Button fundFromExternalWalletButton = new AutoTooltipButton(Res.get("shared.fundFromExternalWalletButton"));
Expand Down
9 changes: 9 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.provider.fee.FeeService;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.user.Preferences;
import bisq.core.util.FormattingUtils;
import bisq.core.util.VolumeUtil;
import bisq.core.util.coin.BsqFormatter;
Expand Down Expand Up @@ -86,6 +87,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
private final P2PService p2PService;
private final AccountAgeWitnessService accountAgeWitnessService;
private final Navigation navigation;
private final Preferences preferences;
private final CoinFormatter btcFormatter;
private final BsqFormatter bsqFormatter;

Expand Down Expand Up @@ -145,6 +147,7 @@ public TakeOfferViewModel(TakeOfferDataModel dataModel,
P2PService p2PService,
AccountAgeWitnessService accountAgeWitnessService,
Navigation navigation,
Preferences preferences,
@Named(FormattingUtils.BTC_FORMATTER_KEY) CoinFormatter btcFormatter,
BsqFormatter bsqFormatter) {
super(dataModel);
Expand All @@ -154,6 +157,7 @@ public TakeOfferViewModel(TakeOfferDataModel dataModel,
this.p2PService = p2PService;
this.accountAgeWitnessService = accountAgeWitnessService;
this.navigation = navigation;
this.preferences = preferences;
this.btcFormatter = btcFormatter;
this.bsqFormatter = bsqFormatter;
createListeners();
Expand Down Expand Up @@ -266,6 +270,11 @@ public void onShowPayFundsScreen() {
updateSpinnerInfo();
}

void savePreferenceAndFundFromSavingsWallet() {
preferences.setUseBisqWalletFunding(true);
fundFromSavingsWallet();
}

boolean fundFromSavingsWallet() {
dataModel.fundFromSavingsWallet();
if (dataModel.getIsBtcWalletFunded().get()) {
Expand Down
32 changes: 24 additions & 8 deletions desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
avoidStandbyMode, useCustomFee, autoConfirmXmrToggle, hideNonAccountPaymentMethodsToggle, denyApiTakerToggle,
notifyOnPreReleaseToggle, isDaoFullNodeToggleButton,
fullModeDaoMonitorToggleButton, useBitcoinUrisToggle, tradeLimitToggle, processBurningManAccountingDataToggleButton,
isFullBMAccountingDataNodeToggleButton;
isFullBMAccountingDataNodeToggleButton, useBisqWalletForFundingToggle;
private int gridRow = 0;
private int displayCurrenciesGridRowIndex = 0;
private InputTextField transactionFeeInputTextField, ignoreTradersListInputTextField, ignoreDustThresholdInputTextField,
Expand Down Expand Up @@ -286,7 +286,7 @@ protected void deactivate() {
///////////////////////////////////////////////////////////////////////////////////////////

private void initializeGeneralOptions() {
int titledGroupBgRowSpan = displayStandbyModeFeature ? 11 : 10;
int titledGroupBgRowSpan = displayStandbyModeFeature ? 12 : 11;
TitledGroupBg titledGroupBg = addTitledGroupBg(root, gridRow, titledGroupBgRowSpan, Res.get("setting.preferences.general"));
GridPane.setColumnSpan(titledGroupBg, 1);

Expand Down Expand Up @@ -440,12 +440,23 @@ private void initializeGeneralOptions() {
Res.get("setting.preferences.avoidStandbyMode"));
}

useBitcoinUrisToggle = addSlideToggleButton(root, ++gridRow, Res.get("setting.preferences.useBitcoinUris"));
Tooltip tooltip = new Tooltip(Res.get("setting.preferences.useBitcoinUris.tooltip"));
tooltip.setShowDuration(Duration.millis(8000));
tooltip.setShowDelay(Duration.millis(300));
tooltip.setHideDelay(Duration.millis(0));
Tooltip.install(useBitcoinUrisToggle, tooltip);
{
useBitcoinUrisToggle = addSlideToggleButton(root, ++gridRow, Res.get("setting.preferences.useBitcoinUris"));
Tooltip tooltip = new Tooltip(Res.get("setting.preferences.useBitcoinUris.tooltip"));
tooltip.setShowDuration(Duration.millis(8000));
tooltip.setShowDelay(Duration.millis(300));
tooltip.setHideDelay(Duration.millis(0));
Tooltip.install(useBitcoinUrisToggle, tooltip);
}

{
useBisqWalletForFundingToggle = addSlideToggleButton(root, ++gridRow, Res.get("setting.preferences.useBisqWalletForFunding"));
Tooltip tooltip = new Tooltip(Res.get("setting.preferences.useBisqWalletForFunding.tooltip"));
tooltip.setShowDuration(Duration.millis(8000));
tooltip.setShowDelay(Duration.millis(300));
tooltip.setHideDelay(Duration.millis(0));
Tooltip.install(useBisqWalletForFundingToggle, tooltip);
}
}

private void initializeSeparator() {
Expand Down Expand Up @@ -990,6 +1001,10 @@ public Country fromString(String string) {
useBitcoinUrisToggle.setOnAction(e ->
preferences.setUseBitcoinUrisInQrCodes(useBitcoinUrisToggle.isSelected()));

useBisqWalletForFundingToggle.setSelected(preferences.isUseBisqWalletFunding());
useBisqWalletForFundingToggle.setOnAction(e ->
preferences.setUseBisqWalletFunding(useBisqWalletForFundingToggle.isSelected()));

btcExplorerTextField.setText(preferences.getBlockChainExplorer().name);
bsqExplorerTextField.setText(preferences.getBsqBlockChainExplorer().name);

Expand Down Expand Up @@ -1362,6 +1377,7 @@ private void deactivateGeneralOptions() {
editCustomBtcExplorer.setOnAction(null);
editCustomBsqExplorer.setOnAction(null);
useBitcoinUrisToggle.setOnAction(null);
useBisqWalletForFundingToggle.setOnAction(null);
deviationInputTextField.textProperty().removeListener(deviationListener);
deviationInputTextField.focusedProperty().removeListener(deviationFocusedListener);
transactionFeeInputTextField.focusedProperty().removeListener(transactionFeeFocusedListener);
Expand Down
17 changes: 17 additions & 0 deletions desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,23 @@ public static boolean isBootstrappedOrShowPopup(P2PService p2PService) {
return false;
}

public static void maybeAskAboutStreamliningOrderFunding(Runnable actionHandlerYes, Runnable actionHandlerNo) {
String key = "ask_always_use_bisq_wallet";
if (!preferences.isUseBisqWalletFunding() && DontShowAgainLookup.showAgain(key)) {
// user clicks on "Fund from Bisq wallet",
// ask user if they want to in the future always fund from Bisq wallet
new Popup().instruction(Res.get("shared.question.useBisqWalletForFunding"))
.actionButtonText(Res.get("shared.yes"))
.onAction(actionHandlerYes)
.closeButtonText(Res.get("shared.no"))
.onClose(actionHandlerNo)
.dontShowAgainId(key)
.show();
} else {
actionHandlerNo.run();
}
}

public static boolean isReadyForTxBroadcastOrShowPopup(P2PService p2PService, WalletsSetup walletsSetup) {
if (!GUIUtil.isBootstrappedOrShowPopup(p2PService)) {
return false;
Expand Down
1 change: 1 addition & 0 deletions proto/src/main/proto/pb.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1973,6 +1973,7 @@ message PreferencesPayload {
bool user_has_raised_trade_limit = 68;
bool process_burning_man_accounting_data = 69;
bool is_full_b_m_accounting_node = 70;
bool use_bisq_wallet_funding = 71;
}

message AutoConfirmSettings {
Expand Down

0 comments on commit d3f60c4

Please sign in to comment.