Skip to content

Commit ed734b3

Browse files
HenrikJannsenHenrikJannsen
authored
Merge pull request #4349 from HenrikJannsen/Add-trade-guide-structure-for-Musig
Add MuSig trade guide
2 parents b3e03d3 + 7f245a9 commit ed734b3

92 files changed

Lines changed: 1168 additions & 174 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/main/java/bisq/api/dto/DtoMappings.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,8 @@ public static class SettingsMapping {
11181118

11191119
public static SettingsDto fromBisq2Model(SettingsService settingsService) {
11201120
return new SettingsDto(settingsService.getIsTacAccepted().get(),
1121-
settingsService.getTradeRulesConfirmed().get(),
1121+
settingsService.getBisqEasyTradeRulesConfirmed().get(),
1122+
settingsService.getMuSigTradeRulesConfirmed().get(),
11221123
settingsService.getCloseMyOfferWhenTaken().get(),
11231124
settingsService.getLanguageTag().get(),
11241125
settingsService.getSupportedLanguageTags(),

‎api/src/main/java/bisq/api/dto/settings/SettingsDto.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@
2222
import java.util.Set;
2323

2424
public record SettingsDto(boolean isTacAccepted,
25-
boolean tradeRulesConfirmed,
25+
boolean bisqEasyTradeRulesConfirmed,
26+
boolean muSigTradeRulesConfirmed,
2627
boolean closeMyOfferWhenTaken,
2728
String languageCode,
2829
Set<String> supportedLanguageCodes,
2930
double maxTradePriceDeviation,
3031
MarketDto selectedMuSigMarket,
3132
int numDaysAfterRedactingTradeData,
3233
boolean useAnimations) {
33-
}
34+
}

‎api/src/main/java/bisq/api/rest_api/endpoints/settings/SettingsChangeRequest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424

2525
public record SettingsChangeRequest(
2626
@Nullable Boolean isTacAccepted,
27-
@Nullable Boolean tradeRulesConfirmed,
27+
@Nullable Boolean bisqEasyTradeRulesConfirmed,
28+
@Nullable Boolean muSigTradeRulesConfirmed,
2829
@Nullable Boolean closeMyOfferWhenTaken,
2930
@Nullable String languageCode,
3031
@Nullable Set<String> supportedLanguageCodes,

‎api/src/main/java/bisq/api/rest_api/endpoints/settings/SettingsRestApi.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,10 @@ public Response updateSetting(@Valid SettingsChangeRequest request) {
100100
try {
101101
if (request.isTacAccepted() != null) {
102102
settingsService.setIsTacAccepted(request.isTacAccepted());
103-
} else if (request.tradeRulesConfirmed() != null) {
104-
settingsService.setTradeRulesConfirmed(request.tradeRulesConfirmed());
103+
} else if (request.bisqEasyTradeRulesConfirmed() != null) {
104+
settingsService.setBisqEasyTradeRulesConfirmed(request.bisqEasyTradeRulesConfirmed());
105+
} else if (request.muSigTradeRulesConfirmed() != null) {
106+
settingsService.setMuSigTradeRulesConfirmed(request.muSigTradeRulesConfirmed());
105107
} else if (request.closeMyOfferWhenTaken() != null) {
106108
settingsService.setCloseMyOfferWhenTaken(request.closeMyOfferWhenTaken());
107109
} else if (request.languageCode() != null) { // TODO rename VO for json and apply to mobile
@@ -129,4 +131,4 @@ public Response updateSetting(@Valid SettingsChangeRequest request) {
129131
return buildErrorResponse("An unexpected error occurred: " + e.getMessage());
130132
}
131133
}
132-
}
134+
}

‎apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/open_trades/BisqEasyOpenTradesController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public void onCleared() {
134134
}
135135
});
136136

137-
tradeRulesConfirmedPin = settingsService.getTradeRulesConfirmed().addObserver(isConfirmed ->
137+
tradeRulesConfirmedPin = settingsService.getBisqEasyTradeRulesConfirmed().addObserver(isConfirmed ->
138138
UIThread.run(() -> {
139139
if (isConfirmed) {
140140
model.getTradeRulesAccepted().set(true);
@@ -204,7 +204,7 @@ void onSelectItem(OpenTradeListItem item) {
204204
}
205205

206206
void onShowTradeRulesAcceptedWarning() {
207-
if (!model.getFilteredList().isEmpty() && !settingsService.getTradeRulesConfirmed().get()) {
207+
if (!model.getFilteredList().isEmpty() && !settingsService.getBisqEasyTradeRulesConfirmed().get()) {
208208
new Popup().information(Res.get("bisqEasy.tradeGuide.notConfirmed.warn"))
209209
.actionButtonText(Res.get("bisqEasy.tradeGuide.open"))
210210
.onAction(() -> Navigation.navigateTo(NavigationTarget.BISQ_EASY_GUIDE))
@@ -373,7 +373,7 @@ private void updateVisibility() {
373373
boolean openTradesAvailable = !model.getFilteredList().isEmpty();
374374
model.getNoOpenTrades().set(!openTradesAvailable);
375375

376-
boolean tradeRuleConfirmed = settingsService.getTradeRulesConfirmed().get();
376+
boolean tradeRuleConfirmed = settingsService.getBisqEasyTradeRulesConfirmed().get();
377377
model.getTradeWelcomeVisible().set(openTradesAvailable && !tradeRuleConfirmed);
378378
model.getTradeStateVisible().set(openTradesAvailable && tradeRuleConfirmed);
379379
model.getChatVisible().set(openTradesAvailable && tradeRuleConfirmed);

‎apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_guide/BisqEasyGuideController.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public BisqEasyGuideController(ServiceProvider serviceProvider) {
5050

5151
@Override
5252
public void onActivate() {
53-
model.setTradeRulesConfirmed(settingsService.getTradeRulesConfirmed().get());
53+
model.setTradeRulesConfirmed(settingsService.getBisqEasyTradeRulesConfirmed().get());
5454
}
5555

5656
@Override

‎apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_guide/rules/BisqEasyGuideRulesController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public BisqEasyGuideRulesController(ServiceProvider serviceProvider) {
4242

4343
@Override
4444
public void onActivate() {
45-
model.getTradeRulesConfirmed().set(settingsService.getTradeRulesConfirmed().get());
45+
model.getTradeRulesConfirmed().set(settingsService.getBisqEasyTradeRulesConfirmed().get());
4646
}
4747

4848
@Override
@@ -58,7 +58,7 @@ void onLearnMore() {
5858
}
5959

6060
void onConfirm(boolean selected) {
61-
settingsService.setTradeRulesConfirmed(selected);
61+
settingsService.setBisqEasyTradeRulesConfirmed(selected);
6262
model.getTradeRulesConfirmed().set(selected);
6363
}
6464

‎apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/ChatMessageContainerController.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private void doSendMessage(String text) {
298298
}
299299
chatService.getBisqEasyOfferbookChannelService().publishChatMessage(text, citation, (BisqEasyOfferbookChannel) chatChannel, userIdentity);
300300
} else if (chatChannel instanceof BisqEasyOpenTradeChannel) {
301-
if (settingsService.getTradeRulesConfirmed().get() || ((BisqEasyOpenTradeChannel) chatChannel).isMediator()) {
301+
if (settingsService.getBisqEasyTradeRulesConfirmed().get() || ((BisqEasyOpenTradeChannel) chatChannel).isMediator()) {
302302
chatService.getBisqEasyOpenTradeChannelService().sendTextMessage(text, citation, (BisqEasyOpenTradeChannel) chatChannel);
303303
} else {
304304
new Popup().information(Res.get("bisqEasy.tradeGuide.notConfirmed.warn"))
@@ -307,12 +307,12 @@ private void doSendMessage(String text) {
307307
.show();
308308
}
309309
} else if (chatChannel instanceof MuSigOpenTradeChannel) {
310-
if (settingsService.getTradeRulesConfirmed().get() || ((MuSigOpenTradeChannel) chatChannel).isMediator()) {
310+
if (settingsService.getMuSigTradeRulesConfirmed().get() || ((MuSigOpenTradeChannel) chatChannel).isMediator()) {
311311
chatService.getMuSigOpenTradeChannelService().sendTextMessage(text, citation, (MuSigOpenTradeChannel) chatChannel);
312312
} else {
313-
new Popup().information(Res.get("bisqEasy.tradeGuide.notConfirmed.warn"))
314-
.actionButtonText(Res.get("bisqEasy.tradeGuide.open"))
315-
.onAction(() -> Navigation.navigateTo(NavigationTarget.BISQ_EASY_GUIDE))
313+
new Popup().information(Res.get("muSig.tradeGuide.notConfirmed.warn"))
314+
.actionButtonText(Res.get("muSig.tradeGuide.open"))
315+
.onAction(() -> Navigation.navigateTo(NavigationTarget.MU_SIG_GUIDE))
316316
.show();
317317
}
318318
} else {

‎apps/desktop/desktop/src/main/java/bisq/desktop/main/content/mu_sig/open_trades/MuSigOpenTradesController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void onCleared() {
135135
}
136136
});
137137

138-
tradeRulesConfirmedPin = settingsService.getTradeRulesConfirmed().addObserver(isConfirmed ->
138+
tradeRulesConfirmedPin = settingsService.getMuSigTradeRulesConfirmed().addObserver(isConfirmed ->
139139
UIThread.run(() -> {
140140
if (isConfirmed) {
141141
model.getTradeRulesAccepted().set(true);
@@ -205,10 +205,10 @@ void onSelectItem(MuSigOpenTradeListItem item) {
205205
}
206206

207207
void onShowTradeRulesAcceptedWarning() {
208-
if (!model.getFilteredList().isEmpty() && !settingsService.getTradeRulesConfirmed().get()) {
209-
new Popup().information(Res.get("bisqEasy.tradeGuide.notConfirmed.warn"))
210-
.actionButtonText(Res.get("bisqEasy.tradeGuide.open"))
211-
.onAction(() -> Navigation.navigateTo(NavigationTarget.BISQ_EASY_GUIDE))
208+
if (!model.getFilteredList().isEmpty() && !settingsService.getMuSigTradeRulesConfirmed().get()) {
209+
new Popup().information(Res.get("muSig.tradeGuide.notConfirmed.warn"))
210+
.actionButtonText(Res.get("muSig.tradeGuide.open"))
211+
.onAction(() -> Navigation.navigateTo(NavigationTarget.MU_SIG_GUIDE))
212212
.show();
213213
}
214214
}
@@ -374,7 +374,7 @@ private void updateVisibility() {
374374
boolean openTradesAvailable = !model.getFilteredList().isEmpty();
375375
model.getNoOpenTrades().set(!openTradesAvailable);
376376

377-
boolean tradeRuleConfirmed = settingsService.getTradeRulesConfirmed().get();
377+
boolean tradeRuleConfirmed = settingsService.getMuSigTradeRulesConfirmed().get();
378378
model.getTradeWelcomeVisible().set(openTradesAvailable && !tradeRuleConfirmed);
379379
model.getTradeStateVisible().set(openTradesAvailable && tradeRuleConfirmed);
380380
model.getChatVisible().set(openTradesAvailable && tradeRuleConfirmed);

‎apps/desktop/desktop/src/main/java/bisq/desktop/main/content/mu_sig/open_trades/MuSigOpenTradesWelcome.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void onDeactivate() {
6262
}
6363

6464
void onOpenTradeGuide() {
65-
Navigation.navigateTo(NavigationTarget.BISQ_EASY_GUIDE);
65+
Navigation.navigateTo(NavigationTarget.MU_SIG_GUIDE);
6666
}
6767
}
6868

@@ -95,7 +95,7 @@ public View(Model model, Controller controller) {
9595
HBox line2 = getIconAndText(Res.get("bisqEasy.openTrades.welcome.line2"), "trading-in-circle-green");
9696
HBox line3 = getIconAndText(Res.get("bisqEasy.openTrades.welcome.line3"), "learn-in-circle-green");
9797

98-
button = new Button(Res.get("bisqEasy.tradeGuide.open"));
98+
button = new Button(Res.get("muSig.tradeGuide.open"));
9999
button.setDefaultButton(true);
100100
button.getStyleClass().add("medium-large-button");
101101
button.setMaxWidth(Double.MAX_VALUE);
@@ -127,4 +127,4 @@ private HBox getIconAndText(String text, String imageId) {
127127
return hBox;
128128
}
129129
}
130-
}
130+
}

0 commit comments

Comments
 (0)