Merge pull request #1400 from HenrikJannsen/update_wiki_links

Update wiki links
bisq-network · Nov 24, 2023 · 961a90e · 961a90e
2 parents d972b77 + b39cae7
commit 961a90e
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 28 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/components/overlay/Overlay.java b/desktop/src/main/java/bisq/desktop/components/overlay/Overlay.java
@@ -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();
     }
 

diff --git a/...sq/desktop/main/content/bisq_easy/trade_guide/process/BisqEasyGuideProcessController.java b/...sq/desktop/main/content/bisq_easy/trade_guide/process/BisqEasyGuideProcessController.java
@@ -52,6 +52,6 @@ void onNext() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/bisqeasy");
+        Browser.open("https://bisq.wiki/Bisq_Easy");
     }
 }
diff --git a/...a/bisq/desktop/main/content/bisq_easy/trade_guide/rules/BisqEasyGuideRulesController.java b/...a/bisq/desktop/main/content/bisq_easy/trade_guide/rules/BisqEasyGuideRulesController.java
@@ -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) {

diff --git a/.../desktop/main/content/bisq_easy/trade_guide/security/BisqEasyGuideSecurityController.java b/.../desktop/main/content/bisq_easy/trade_guide/security/BisqEasyGuideSecurityController.java
@@ -44,7 +44,7 @@ public void onDeactivate() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/bisqeasy");
+        Browser.open("https://bisq.wiki/Bisq_Easy");
     }
 
     void onBack() {

diff --git a/desktop/src/main/java/bisq/desktop/main/content/trade_apps/TradeAppsController.java b/desktop/src/main/java/bisq/desktop/main/content/trade_apps/TradeAppsController.java
@@ -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());

diff --git a/desktop/src/main/java/bisq/desktop/main/content/trade_apps/more/MoreProtocolsController.java b/desktop/src/main/java/bisq/desktop/main/content/trade_apps/more/MoreProtocolsController.java
@@ -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,
@@ -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();

diff --git a/...p/main/content/user/bonded_roles/tabs/registration/BondedRolesRegistrationController.java b/...p/main/content/user/bonded_roles/tabs/registration/BondedRolesRegistrationController.java
@@ -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() {

diff --git a/desktop/src/main/java/bisq/desktop/main/content/user/reputation/ReputationController.java b/desktop/src/main/java/bisq/desktop/main/content/user/reputation/ReputationController.java
@@ -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) {

diff --git a/...a/bisq/desktop/main/content/user/reputation/accountAge/tab1/AccountAgeTab1Controller.java b/...a/bisq/desktop/main/content/user/reputation/accountAge/tab1/AccountAgeTab1Controller.java
@@ -44,7 +44,7 @@ public void onDeactivate() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/accountAge");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 
     void onNext() {

diff --git a/...a/bisq/desktop/main/content/user/reputation/accountAge/tab2/AccountAgeTab2Controller.java b/...a/bisq/desktop/main/content/user/reputation/accountAge/tab2/AccountAgeTab2Controller.java
@@ -53,6 +53,6 @@ void onNext() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/accountAge");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 }
diff --git a/...a/bisq/desktop/main/content/user/reputation/accountAge/tab3/AccountAgeTab3Controller.java b/...a/bisq/desktop/main/content/user/reputation/accountAge/tab3/AccountAgeTab3Controller.java
@@ -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) {

diff --git a/...a/bisq/desktop/main/content/user/reputation/bond/tab1/BondedReputationTab1Controller.java b/...a/bisq/desktop/main/content/user/reputation/bond/tab1/BondedReputationTab1Controller.java
@@ -44,7 +44,7 @@ public void onDeactivate() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/bondedBsq");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 
     void onNext() {

diff --git a/...a/bisq/desktop/main/content/user/reputation/bond/tab2/BondedReputationTab2Controller.java b/...a/bisq/desktop/main/content/user/reputation/bond/tab2/BondedReputationTab2Controller.java
@@ -53,6 +53,6 @@ void onNext() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/bondedBsq");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 }
diff --git a/...a/bisq/desktop/main/content/user/reputation/bond/tab3/BondedReputationTab3Controller.java b/...a/bisq/desktop/main/content/user/reputation/bond/tab3/BondedReputationTab3Controller.java
@@ -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) {

diff --git a/.../main/java/bisq/desktop/main/content/user/reputation/burn/tab1/BurnBsqTab1Controller.java b/.../main/java/bisq/desktop/main/content/user/reputation/burn/tab1/BurnBsqTab1Controller.java
@@ -44,7 +44,7 @@ public void onDeactivate() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/burnBsq");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 
     void onNext() {

diff --git a/.../main/java/bisq/desktop/main/content/user/reputation/burn/tab2/BurnBsqTab2Controller.java b/.../main/java/bisq/desktop/main/content/user/reputation/burn/tab2/BurnBsqTab2Controller.java
@@ -53,6 +53,6 @@ void onNext() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/burnBsq");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 }
diff --git a/.../main/java/bisq/desktop/main/content/user/reputation/burn/tab3/BurnBsqTab3Controller.java b/.../main/java/bisq/desktop/main/content/user/reputation/burn/tab3/BurnBsqTab3Controller.java
@@ -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) {

diff --git a/.../desktop/main/content/user/reputation/signedAccount/tab1/SignedWitnessTab1Controller.java b/.../desktop/main/content/user/reputation/signedAccount/tab1/SignedWitnessTab1Controller.java
@@ -44,7 +44,7 @@ public void onDeactivate() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/signedAccount");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 
     void onNext() {

diff --git a/.../desktop/main/content/user/reputation/signedAccount/tab2/SignedWitnessTab2Controller.java b/.../desktop/main/content/user/reputation/signedAccount/tab2/SignedWitnessTab2Controller.java
@@ -67,6 +67,6 @@ void onNext() {
     }
 
     void onLearnMore() {
-        Browser.open("https://bisq.wiki/reputation/signedAccount");
+        Browser.open("https://bisq.wiki/Reputation");
     }
 }
diff --git a/.../desktop/main/content/user/reputation/signedAccount/tab3/SignedWitnessTab3Controller.java b/.../desktop/main/content/user/reputation/signedAccount/tab3/SignedWitnessTab3Controller.java
@@ -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) {

diff --git a/desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileController.java b/desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileController.java
@@ -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;
@@ -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

diff --git a/desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileView.java b/desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileView.java
@@ -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;
@@ -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) {
@@ -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<>() {
@@ -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"));
@@ -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());
@@ -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);
 

diff --git a/i18n/src/main/resources/user.properties b/i18n/src/main/resources/user.properties
@@ -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