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

Jump to bottom

Update wiki links #1400

Merged
merged 2 commits into from
Nov 24, 2023
Merged

Update wiki links #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
196ea55
Add learn more link to user profile screen
HenrikJannsen Nov 22, 2023
b39cae7
Update wiki links
HenrikJannsen Nov 22, 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
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/components/overlay/Overlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ public T closeButtonText(String closeButtonText) {

public T useReportBugButton() {
this.closeButtonText = Res.get("popup.reportBug");
this.closeHandlerOptional = Optional.of(() -> Browser.open("https://bisq.network/source/bisq/issues"));
this.closeHandlerOptional = Optional.of(() -> Browser.open("https://bisq.network/source/bisq2/issues"));
return cast();
}

Expand Down
2 changes: 1 addition & 1 deletion ...sq/desktop/main/content/bisq_easy/trade_guide/process/BisqEasyGuideProcessController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,6 @@ void onNext() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/bisqeasy");
Browser.open("https://bisq.wiki/Bisq_Easy");
}
}
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/bisq_easy/trade_guide/rules/BisqEasyGuideRulesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void onBack() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/bisqeasy");
Browser.open("https://bisq.wiki/Bisq_Easy");
}

void onConfirm(boolean selected) {
Expand Down
2 changes: 1 addition & 1 deletion .../desktop/main/content/bisq_easy/trade_guide/security/BisqEasyGuideSecurityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void onDeactivate() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/bisqeasy");
Browser.open("https://bisq.wiki/Bisq_Easy");
}

void onBack() {
Expand Down
8 changes: 4 additions & 4 deletions desktop/src/main/java/bisq/desktop/main/content/trade_apps/TradeAppsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,22 @@ protected Optional<? extends Controller> createController(NavigationTarget navig
case BISQ_EASY_INFO: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.BISQ_EASY,
"protocol-multisig",
"https://bisq.network/"));
"https://bisq.wiki/Trade_Protocols#Bisq_Easy"));
}
case MULTISIG: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.MULTISIG,
"protocol-multisig",
"https://bisq.network/"));
"https://bisq.wiki/Trade_Protocols#Bisq_Multisig"));
}
case SUBMARINE: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.SUBMARINE,
"protocol-submarine",
"https://docs.lightning.engineering/the-lightning-network/multihop-payments/understanding-submarine-swaps"));
"https://bisq.wiki/Trade_Protocols#Submarine_Swaps"));
}
case BISQ_LIGHTNING: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.BISQ_LIGHTNING,
"protocol-bisq-lightning",
"https://bisq.wiki/ln-liquid"));
"https://bisq.wiki/Trade_Protocols#Bisq_Lightning"));
}
case MORE_TRADE_PROTOCOLS: {
return Optional.of(new MoreProtocolsController());
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/content/trade_apps/more/MoreProtocolsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ public Optional<ProtocolRoadmapController> getProtocolRoadmapController(TradePro
case LIQUID_MULTISIG: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.LIQUID_MULTISIG,
"protocol-liquid-multisig",
"https://bisq.wiki/liquid-multisig"));
"https://bisq.wiki/Trade_Protocols#Liquid_Multisig"));
}

case LIQUID_SWAP: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.LIQUID_SWAP,
"protocol-liquid-multisig",
"https://www.blockstream.com/liquid/"));
"https://bisq.wiki/Trade_Protocols#Liquid_Swaps"));
}
case BSQ_SWAP: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.BSQ_SWAP,
Expand All @@ -77,7 +77,7 @@ public Optional<ProtocolRoadmapController> getProtocolRoadmapController(TradePro
case MONERO_SWAP: {
return Optional.of(new ProtocolRoadmapController(TradeProtocolType.MONERO_SWAP,
"protocol-monero-swap",
"https://www.monerooutreach.org/stories/monero-atomic-swaps.html"));
"https://bisq.wiki/Trade_Protocols#Monero_Swaps"));
}
default: {
return Optional.empty();
Expand Down
2 changes: 1 addition & 1 deletion ...p/main/content/user/bonded_roles/tabs/registration/BondedRolesRegistrationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void onRequestCancellation() {
}

public void onLearnMore() {
Browser.open("https://bisq.wiki/bisq2/roles/" + model.getBondedRoleType().name().toLowerCase());
Browser.open("https://bisq.wiki/Bisq_2_Roles");
}

public void onCopyToClipboard() {
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/content/user/reputation/ReputationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void onSignedAccount() {
}

public void onLearnMore() {
Browser.open("https://bisq.wiki/reputation");
Browser.open("https://bisq.wiki/Reputation");
}

public void onShowDetails(ReputationView.ListItem item) {
Expand Down
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/user/reputation/accountAge/tab1/AccountAgeTab1Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void onDeactivate() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/accountAge");
Browser.open("https://bisq.wiki/Reputation");
}

void onNext() {
Expand Down
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/user/reputation/accountAge/tab2/AccountAgeTab2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ void onNext() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/accountAge");
Browser.open("https://bisq.wiki/Reputation");
}
}
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/user/reputation/accountAge/tab3/AccountAgeTab3Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void onBack() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/accountAge");
Browser.open("https://bisq.wiki/Reputation");
}

void onCopyToClipboard(String pubKeyHash) {
Expand Down
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/user/reputation/bond/tab1/BondedReputationTab1Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void onDeactivate() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/bondedBsq");
Browser.open("https://bisq.wiki/Reputation");
}

void onNext() {
Expand Down
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/user/reputation/bond/tab2/BondedReputationTab2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ void onNext() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/bondedBsq");
Browser.open("https://bisq.wiki/Reputation");
}
}
2 changes: 1 addition & 1 deletion ...a/bisq/desktop/main/content/user/reputation/bond/tab3/BondedReputationTab3Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void onBack() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/bondedBsq");
Browser.open("https://bisq.wiki/Reputation");
}

void onCopyToClipboard(String pubKeyHash) {
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/bisq/desktop/main/content/user/reputation/burn/tab1/BurnBsqTab1Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void onDeactivate() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/burnBsq");
Browser.open("https://bisq.wiki/Reputation");
}

void onNext() {
Expand Down
2 changes: 1 addition & 1 deletion .../main/java/bisq/desktop/main/content/user/reputation/burn/tab2/BurnBsqTab2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ void onNext() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/burnBsq");
Browser.open("https://bisq.wiki/Reputation");
}
}
2 changes: 1 addition & 1 deletion .../main/java/bisq/desktop/main/content/user/reputation/burn/tab3/BurnBsqTab3Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void onBack() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/burnBsq");
Browser.open("https://bisq.wiki/Reputation");
}

void onCopyToClipboard(String pubKeyHash) {
Expand Down
2 changes: 1 addition & 1 deletion .../desktop/main/content/user/reputation/signedAccount/tab1/SignedWitnessTab1Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void onDeactivate() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/signedAccount");
Browser.open("https://bisq.wiki/Reputation");
}

void onNext() {
Expand Down
2 changes: 1 addition & 1 deletion .../desktop/main/content/user/reputation/signedAccount/tab2/SignedWitnessTab2Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,6 @@ void onNext() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/signedAccount");
Browser.open("https://bisq.wiki/Reputation");
}
}
2 changes: 1 addition & 1 deletion .../desktop/main/content/user/reputation/signedAccount/tab3/SignedWitnessTab3Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ void onBack() {
}

void onLearnMore() {
Browser.open("https://bisq.wiki/reputation/signedAccount");
Browser.open("https://bisq.wiki/Reputation");
}

void onCopyToClipboard(String pubKeyHash) {
Expand Down
9 changes: 7 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import bisq.bisq_easy.BisqEasyService;
import bisq.common.observable.Pin;
import bisq.desktop.ServiceProvider;
import bisq.desktop.common.Browser;
import bisq.desktop.common.observable.FxBindings;
import bisq.desktop.common.threading.UIThread;
import bisq.desktop.common.view.Controller;
Expand Down Expand Up @@ -122,11 +123,15 @@ public void resetSelection() {
model.getReputationScoreValue().set(null);
}

public void onAddNewChatUser() {
void onAddNewChatUser() {
Navigation.navigateTo(CREATE_PROFILE_STEP1);
}

public void onSave() {
void onLearnMore() {
Browser.open("https://bisq.wiki/Identity");
}

void onSave() {
var userIdentity = userIdentityService.getSelectedUserIdentity();
if (userIdentity == null) {
// This should never happen as the combobox selection is validated before getting here
Expand Down
12 changes: 11 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Hyperlink;
import javafx.scene.control.SplitPane;
import javafx.scene.image.ImageView;
import javafx.scene.layout.HBox;
Expand Down Expand Up @@ -69,6 +70,7 @@ public class UserProfileView extends View<HBox, UserProfileModel, UserProfileCon
private final VBox formVBox;
private final AutoCompleteComboBox<UserIdentity> comboBox;
private final BisqTooltip deleteTooltip;
private final Hyperlink learnMore;
private Subscription reputationScorePin, useDeleteTooltipPin, selectedChatUserIdentityPin, isValidSelectionPin;

public UserProfileView(UserProfileModel model, UserProfileController controller) {
Expand All @@ -89,6 +91,12 @@ public UserProfileView(UserProfileModel model, UserProfileController controller)
createNewProfileButton = new Button(Res.get("user.userProfile.createNewProfile"));
createNewProfileButton.getStyleClass().addAll("outlined-button");

learnMore = new Hyperlink(Res.get("user.userProfile.learnMore"));

VBox.setMargin(learnMore, new Insets(0, -4, 0, 0));
VBox buttons = new VBox(5, createNewProfileButton, learnMore);
buttons.setAlignment(Pos.TOP_RIGHT);

comboBox = new AutoCompleteComboBox<>(model.getUserIdentities(), Res.get("user.bondedRoles.userProfile.select"));
comboBox.setPrefWidth(300);
comboBox.setConverter(new StringConverter<>() {
Expand All @@ -103,7 +111,7 @@ public UserIdentity fromString(String string) {
}
});

HBox selectionButtonHBox = new HBox(20, comboBox, Spacer.fillHBox(), createNewProfileButton);
HBox selectionButtonHBox = new HBox(20, comboBox, Spacer.fillHBox(), buttons);
formVBox.getChildren().add(selectionButtonHBox);

nymId = addField(Res.get("user.userProfile.nymId"));
Expand Down Expand Up @@ -162,6 +170,7 @@ protected void onViewAttached() {
deleteButton.setOnAction(e -> onDeleteButtonPressed());
saveButton.setOnAction(e -> onSaveButtonPressed());
createNewProfileButton.setOnAction(e -> controller.onAddNewChatUser());
learnMore.setOnAction(e -> controller.onLearnMore());
comboBox.setOnChangeConfirmed(e -> {
if (comboBox.getSelectionModel().getSelectedItem() == null) {
comboBox.getSelectionModel().select(model.getSelectedUserIdentity().get());
Expand Down Expand Up @@ -244,6 +253,7 @@ protected void onViewDetached() {
deleteButton.setOnAction(null);
saveButton.setOnAction(null);
createNewProfileButton.setOnAction(null);
learnMore.setOnAction(null);
comboBox.setOnChangeConfirmed(null);
comboBox.getIsValidSelection().set(true);

Expand Down
1 change: 1 addition & 0 deletions i18n/src/main/resources/user.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ user.userProfile.terms.prompt=Enter optional trade terms
user.userProfile.terms.tooLong=Trade terms must not be longer than {0} characters

user.userProfile.createNewProfile=Create new profile
user.userProfile.learnMore=Why create a new profile?
user.userProfile.deleteProfile=Delete profile
user.userProfile.deleteProfile.popup.warning=Do you really want to delete {0}? You cannot un-do this operation.
user.userProfile.deleteProfile.popup.warning.yes=Yes, delete profile
Expand Down