Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign Bisq Easy Protocol #1566

Merged
merged 8 commits into from
Jan 8, 2024
Merged

Redesign Bisq Easy Protocol #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c77a969
Update BisqEasy state transitions according to revised protocol
axpoems Dec 29, 2023
a5f8d42
Change number of steps to 4 and update BuyerState1 with its correspon…
axpoems Dec 29, 2023
41eb060
Update the rest of the trade states
axpoems Dec 30, 2023
2d66d85
Move state of buyer's waiting for seller's account data to Phase 1
axpoems Dec 31, 2023
60cda42
Improve SELLER_RECEIVED_BTC_ADDRESS state management and re-enable sy…
axpoems Dec 31, 2023
ee765de
Set check icon in final phase Trade completed
axpoems Dec 31, 2023
ed40dcf
Add missing state in CloseTradeReason
axpoems Dec 31, 2023
d41a790
Remove temporary comments
axpoems Dec 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 32 additions & 50 deletions .../main/java/bisq/desktop/main/content/bisq_easy/open_trades/trade_state/TradePhaseBox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import bisq.i18n.Res;
import bisq.support.mediation.MediationRequestService;
import bisq.trade.bisq_easy.BisqEasyTrade;
import bisq.trade.bisq_easy.protocol.BisqEasyTradeState;
import javafx.beans.property.*;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
Expand Down Expand Up @@ -109,61 +108,53 @@ private void setBisqEasyTrade(BisqEasyTrade bisqEasyTrade) {
return;
}

boolean isBuyer = bisqEasyTrade.isBuyer();

model.getPhase1Info().set(isBuyer ?
Res.get("bisqEasy.tradeState.phase.buyer.phase1").toUpperCase() :
Res.get("bisqEasy.tradeState.phase.seller.phase1").toUpperCase());
model.getPhase2Info().set(isBuyer ?
Res.get("bisqEasy.tradeState.phase.buyer.phase2a").toUpperCase() :
Res.get("bisqEasy.tradeState.phase.seller.phase2a").toUpperCase());
model.getPhase3Info().set(isBuyer ?
Res.get("bisqEasy.tradeState.phase.buyer.phase3a").toUpperCase() :
Res.get("bisqEasy.tradeState.phase.seller.phase3a").toUpperCase());
model.getPhase4Info().set(isBuyer ?
Res.get("bisqEasy.tradeState.phase.buyer.phase4").toUpperCase() :
Res.get("bisqEasy.tradeState.phase.seller.phase4").toUpperCase());
model.getPhase5Info().set(Res.get("bisqEasy.tradeState.phase.phase5").toUpperCase());
model.getPhase1Info().set(Res.get("bisqEasy.tradeState.phase1").toUpperCase());
model.getPhase2Info().set(Res.get("bisqEasy.tradeState.phase2").toUpperCase());
model.getPhase3Info().set(Res.get("bisqEasy.tradeState.phase3").toUpperCase());
model.getPhase4Info().set(Res.get("bisqEasy.tradeState.phase4").toUpperCase());

bisqEasyTradeStatePin = bisqEasyTrade.tradeStateObservable().addObserver(state -> {
UIThread.run(() -> {
switch (state) {
case INIT:
break;

case TAKER_SENT_TAKE_OFFER_REQUEST:
case MAKER_SENT_TAKE_OFFER_RESPONSE:
case TAKER_RECEIVED_TAKE_OFFER_RESPONSE:
case BUYER_SENT_BTC_ADDRESS:
model.getPhaseIndex().set(0);
model.getRequestMediationButtonVisible().set(false);
model.getReportToMediatorButtonVisible().set(true);
break;

case SELLER_RECEIVED_BTC_ADDRESS:
boolean hasSentAccountData = model.getBisqEasyTrade().getPaymentAccountData().get() != null;
model.getPhaseIndex().set(hasSentAccountData ? 1 : 0);
model.getRequestMediationButtonVisible().set(false);
model.getReportToMediatorButtonVisible().set(true);
break;

case SELLER_SENT_ACCOUNT_DATA:
case SELLER_RECEIVED_FIAT_SENT_CONFIRMATION:
case BUYER_RECEIVED_ACCOUNT_DATA:
case BUYER_SENT_FIAT_SENT_CONFIRMATION:
case SELLER_RECEIVED_FIAT_SENT_CONFIRMATION:
model.getPhaseIndex().set(1);
model.getRequestMediationButtonVisible().set(false);
model.getReportToMediatorButtonVisible().set(true);
break;
case BUYER_SENT_BTC_ADDRESS:
case SELLER_RECEIVED_BTC_ADDRESS:

case SELLER_CONFIRMED_FIAT_RECEIPT:
case BUYER_RECEIVED_SELLERS_FIAT_RECEIPT_CONFIRMATION:
model.getPhaseIndex().set(2);
model.getRequestMediationButtonVisible().set(true);
model.getReportToMediatorButtonVisible().set(false);
break;

case SELLER_SENT_BTC_SENT_CONFIRMATION:
case BUYER_RECEIVED_BTC_SENT_CONFIRMATION:
model.getPhaseIndex().set(3);
model.getPhaseIndex().set(2);
model.getRequestMediationButtonVisible().set(true);
model.getReportToMediatorButtonVisible().set(false);
break;

case BTC_CONFIRMED:
model.getPhaseIndex().set(4);
model.getPhaseIndex().set(3);
model.getRequestMediationButtonVisible().set(false);
model.getReportToMediatorButtonVisible().set(true);
break;
Expand All @@ -174,17 +165,6 @@ private void setBisqEasyTrade(BisqEasyTrade bisqEasyTrade) {
model.getReportToMediatorButtonVisible().set(true);
break;
}

if (state.ordinal() >= BisqEasyTradeState.BUYER_SENT_FIAT_SENT_CONFIRMATION.ordinal()) {
model.getPhase2Info().set(isBuyer ?
Res.get("bisqEasy.tradeState.phase.buyer.phase2b").toUpperCase() :
Res.get("bisqEasy.tradeState.phase.seller.phase2b").toUpperCase());
}
if (state.ordinal() >= BisqEasyTradeState.SELLER_CONFIRMED_FIAT_RECEIPT.ordinal()) {
model.getPhase3Info().set(isBuyer ?
Res.get("bisqEasy.tradeState.phase.buyer.phase3b").toUpperCase() :
Res.get("bisqEasy.tradeState.phase.seller.phase3b").toUpperCase());
}
});
});
}
Expand Down Expand Up @@ -236,7 +216,6 @@ private static class Model implements bisq.desktop.common.view.Model {
private final StringProperty phase2Info = new SimpleStringProperty();
private final StringProperty phase3Info = new SimpleStringProperty();
private final StringProperty phase4Info = new SimpleStringProperty();
private final StringProperty phase5Info = new SimpleStringProperty();

void reset() {
selectedChannel = null;
Expand All @@ -248,12 +227,11 @@ void reset() {
phase2Info.set(null);
phase3Info.set(null);
phase4Info.set(null);
phase5Info.set(null);
}
}

public static class View extends bisq.desktop.common.view.View<VBox, Model, Controller> {
private final Label phase1Label, phase2Label, phase3Label, phase4Label, phase5Label;
private final Label phase1Label, phase2Label, phase3Label, phase4Label;
private final Button requestMediationButton;
private final Hyperlink openTradeGuide, walletHelp, reportToMediator;
private final List<Triple<HBox, Label, Badge>> phaseItems;
Expand All @@ -268,22 +246,19 @@ public View(Model model, Controller controller) {
Triple<HBox, Label, Badge> phaseItem1 = getPhaseItem(1);
Triple<HBox, Label, Badge> phaseItem2 = getPhaseItem(2);
Triple<HBox, Label, Badge> phaseItem3 = getPhaseItem(3);
Triple<HBox, Label, Badge> phaseItem4 = getPhaseItem(4);
Triple<HBox, Label, Badge> phaseItem5 = getPhaseItem(5);
Triple<HBox, Label, Badge> phaseItem4 = getPhaseItem(4, true);

HBox phase1HBox = phaseItem1.getFirst();
HBox phase2HBox = phaseItem2.getFirst();
HBox phase3HBox = phaseItem3.getFirst();
HBox phase4HBox = phaseItem4.getFirst();
HBox phase5HBox = phaseItem5.getFirst();

phase1Label = phaseItem1.getSecond();
phase2Label = phaseItem2.getSecond();
phase3Label = phaseItem3.getSecond();
phase4Label = phaseItem4.getSecond();
phase5Label = phaseItem5.getSecond();

phaseItems = List.of(phaseItem1, phaseItem2, phaseItem3, phaseItem4, phaseItem5);
phaseItems = List.of(phaseItem1, phaseItem2, phaseItem3, phaseItem4);

walletHelp = new Hyperlink(Res.get("bisqEasy.walletGuide.open"), ImageUtil.getImageViewById("icon-wallet"));
walletHelp.setGraphicTextGap(5);
Expand Down Expand Up @@ -311,8 +286,6 @@ public View(Model model, Controller controller) {
phase3HBox,
getVLine(),
phase4HBox,
getVLine(),
phase5HBox,
Spacer.fillVBox(),
walletHelp,
openTradeGuide,
Expand All @@ -326,7 +299,6 @@ protected void onViewAttached() {
phase2Label.textProperty().bind(model.getPhase2Info());
phase3Label.textProperty().bind(model.getPhase3Info());
phase4Label.textProperty().bind(model.getPhase4Info());
phase5Label.textProperty().bind(model.getPhase5Info());
reportToMediator.visibleProperty().bind(model.getReportToMediatorButtonVisible().and(model.getIsInMediation().not()));
reportToMediator.managedProperty().bind(reportToMediator.visibleProperty());
requestMediationButton.visibleProperty().bind(model.getRequestMediationButtonVisible());
Expand All @@ -346,7 +318,6 @@ protected void onViewDetached() {
phase2Label.textProperty().unbind();
phase3Label.textProperty().unbind();
phase4Label.textProperty().unbind();
phase5Label.textProperty().unbind();
reportToMediator.visibleProperty().unbind();
reportToMediator.managedProperty().unbind();
requestMediationButton.visibleProperty().unbind();
Expand Down Expand Up @@ -396,5 +367,16 @@ private static Triple<HBox, Label, Badge> getPhaseItem(int index) {
hBox.setAlignment(Pos.CENTER_LEFT);
return new Triple<>(hBox, label, badge);
}

private static Triple<HBox, Label, Badge> getPhaseItem(int index, boolean isFinalStep) {
Label label = new Label();
label.getStyleClass().add("bisq-easy-trade-state-phase");
Badge badge = new Badge();
badge.setText(isFinalStep ? "\u2713" : String.valueOf(index));
badge.setPrefSize(20, 20);
HBox hBox = new HBox(7.5, badge, label);
hBox.setAlignment(Pos.CENTER_LEFT);
return new Triple<>(hBox, label, badge);
}
}
}
}
50 changes: 32 additions & 18 deletions ...ava/bisq/desktop/main/content/bisq_easy/open_trades/trade_state/TradeStateController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,39 +235,54 @@ private void applyStateInfoVBox(@Nullable BisqEasyTradeState state) {
if (isSeller) {
model.getStateInfoVBox().set(new SellerState1(serviceProvider, trade, channel).getView().getRoot());
} else {
model.getStateInfoVBox().set(new BuyerState1(serviceProvider, trade, channel).getView().getRoot());
model.getStateInfoVBox().set(new BuyerState1a(serviceProvider, trade, channel).getView().getRoot());
}
break;

// Seller
case SELLER_RECEIVED_BTC_ADDRESS:
boolean hasSentAccountData = trade.getPaymentAccountData().get() != null;
if (!hasSentAccountData) {
model.getStateInfoVBox().set(new SellerState1(serviceProvider, trade, channel).getView().getRoot());
} else {
model.getStateInfoVBox().set(new SellerState2a(serviceProvider, trade, channel).getView().getRoot());
}
break;
case SELLER_SENT_ACCOUNT_DATA:
model.getStateInfoVBox().set(new SellerState2a(serviceProvider, trade, channel).getView().getRoot());
break;
case SELLER_RECEIVED_FIAT_SENT_CONFIRMATION:
model.getStateInfoVBox().set(new SellerState2(serviceProvider, trade, channel).getView().getRoot());
model.getStateInfoVBox().set(new SellerState2b(serviceProvider, trade, channel).getView().getRoot());
break;

case BUYER_RECEIVED_ACCOUNT_DATA:
case BUYER_SENT_FIAT_SENT_CONFIRMATION:
model.getStateInfoVBox().set(new BuyerState2(serviceProvider, trade, channel).getView().getRoot());
case SELLER_CONFIRMED_FIAT_RECEIPT:
model.getStateInfoVBox().set(new SellerState3a(serviceProvider, trade, channel).getView().getRoot());
break;
case SELLER_SENT_BTC_SENT_CONFIRMATION:
model.getStateInfoVBox().set(new SellerState3b(serviceProvider, trade, channel).getView().getRoot());
break;

// Buyer
case BUYER_SENT_BTC_ADDRESS:
case BUYER_RECEIVED_SELLERS_FIAT_RECEIPT_CONFIRMATION:
model.getStateInfoVBox().set(new BuyerState3(serviceProvider, trade, channel).getView().getRoot());
model.getStateInfoVBox().set(new BuyerState1b(serviceProvider, trade, channel).getView().getRoot());
break;

case SELLER_RECEIVED_BTC_ADDRESS:
case SELLER_CONFIRMED_FIAT_RECEIPT:
model.getStateInfoVBox().set(new SellerState3(serviceProvider, trade, channel).getView().getRoot());
case BUYER_RECEIVED_ACCOUNT_DATA:
model.getStateInfoVBox().set(new BuyerState2a(serviceProvider, trade, channel).getView().getRoot());
break;
case SELLER_SENT_BTC_SENT_CONFIRMATION:
model.getStateInfoVBox().set(new SellerState4(serviceProvider, trade, channel).getView().getRoot());
case BUYER_SENT_FIAT_SENT_CONFIRMATION:
model.getStateInfoVBox().set(new BuyerState2b(serviceProvider, trade, channel).getView().getRoot());
break;
case BUYER_RECEIVED_SELLERS_FIAT_RECEIPT_CONFIRMATION:
model.getStateInfoVBox().set(new BuyerState3a(serviceProvider, trade, channel).getView().getRoot());
break;
case BUYER_RECEIVED_BTC_SENT_CONFIRMATION:
model.getStateInfoVBox().set(new BuyerState4(serviceProvider, trade, channel).getView().getRoot());
model.getStateInfoVBox().set(new BuyerState3b(serviceProvider, trade, channel).getView().getRoot());
break;

case BTC_CONFIRMED:
if (isSeller) {
model.getStateInfoVBox().set(new SellerState5(serviceProvider, trade, channel).getView().getRoot());
model.getStateInfoVBox().set(new SellerState4(serviceProvider, trade, channel).getView().getRoot());
} else {
model.getStateInfoVBox().set(new BuyerState5(serviceProvider, trade, channel).getView().getRoot());
model.getStateInfoVBox().set(new BuyerState4(serviceProvider, trade, channel).getView().getRoot());
}
break;

Expand Down Expand Up @@ -337,7 +352,6 @@ private void applyCloseTradeReason(@Nullable BisqEasyTradeState state) {
model.setTradeCloseType(TradeStateModel.TradeCloseType.COMPLETED);
model.getInterruptTradeButtonVisible().set(false);
break;

case REJECTED:
case CANCELLED:
model.getInterruptTradeButtonVisible().set(false);
Expand Down
Loading