From fd9452b557f890118806c1da01cc54c993cb549e Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Mon, 30 Sep 2024 22:08:39 +0700 Subject: [PATCH 1/2] Increase column width --- .../main/content/reputation/ranking/ReputationRankingView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/ranking/ReputationRankingView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/ranking/ReputationRankingView.java index d0d1d273b2..eb2f030e39 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/ranking/ReputationRankingView.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/ranking/ReputationRankingView.java @@ -201,6 +201,7 @@ private void configTableView() { richTableView.getColumns().add(scoreColumn); valueColumn = new BisqTableColumn.Builder() + .minWidth(150) .titleProperty(model.getFilteredValueTitle()) .comparator(Comparator.comparing(ListItem::getValue)) .valuePropertySupplier(ListItem::getValueAsStringProperty) From 87e4a0ae7e18b2ff5e33ffad1f0ba49cce63ae47 Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Mon, 30 Sep 2024 22:30:20 +0700 Subject: [PATCH 2/2] Improve build reputation screen --- .../build_reputation/BuildReputationView.java | 15 +++++++++------ .../src/main/resources/css/application.css | 14 +++++++++----- i18n/src/main/resources/reputation.properties | 18 ++++++++++-------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/build_reputation/BuildReputationView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/build_reputation/BuildReputationView.java index df19c6b40f..5ca0d4f949 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/build_reputation/BuildReputationView.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/reputation/build_reputation/BuildReputationView.java @@ -31,7 +31,7 @@ @Slf4j public class BuildReputationView extends View { private final Button burnBsqButton, bsqBondButton, accountAgeButton, signedAccountButton; - private final BisqMenuItem learnMore; + private final BisqMenuItem learnMoreLink; public BuildReputationView(BuildReputationModel model, BuildReputationController controller) { super(new VBox(), model, controller); @@ -82,12 +82,15 @@ public BuildReputationView(BuildReputationModel model, BuildReputationController HBox signedAccountAndAgeBox = new HBox(20, signedAccountBox, accountAgeBox); - learnMore = new BisqMenuItem(Res.get("reputation.buildReputation.readMore")); - learnMore.getStyleClass().add("reputation-learn-more"); + Label learnMoreLabel = new Label(Res.get("reputation.buildReputation.learnMore")); + learnMoreLink = new BisqMenuItem(Res.get("reputation.buildReputation.learnMore.link")); + learnMoreLabel.getStyleClass().addAll("reputation-learn-more"); + learnMoreLink.getStyleClass().addAll("reputation-learn-more-link"); + HBox learnMoreHBox = new HBox(4, learnMoreLabel, learnMoreLink); VBox contentBox = new VBox(20); contentBox.getChildren().addAll(headlineLabel, introLabelPart1, introLabelPart2, title, burnAndBondBox, - signedAccountAndAgeBox, learnMore); + signedAccountAndAgeBox, learnMoreHBox); contentBox.getStyleClass().add("bisq-common-bg"); root.getChildren().addAll(contentBox); root.setPadding(new Insets(0, 40, 20, 40)); @@ -100,7 +103,7 @@ protected void onViewAttached() { bsqBondButton.setOnAction(e -> controller.onBsqBond()); signedAccountButton.setOnAction(e -> controller.onSignedAccount()); accountAgeButton.setOnAction(e -> controller.onAccountAge()); - learnMore.setOnAction(e -> controller.onLearnMore()); + learnMoreLink.setOnAction(e -> controller.onLearnMore()); } @Override @@ -109,7 +112,7 @@ protected void onViewDetached() { bsqBondButton.setOnAction(null); signedAccountButton.setOnAction(null); accountAgeButton.setOnAction(null); - learnMore.setOnAction(null); + learnMoreLink.setOnAction(null); } private VBox createAndGetBuildReputationMethodBox(String title, String description, Button button) { diff --git a/apps/desktop/desktop/src/main/resources/css/application.css b/apps/desktop/desktop/src/main/resources/css/application.css index c31a8d35ea..3b8be096ce 100644 --- a/apps/desktop/desktop/src/main/resources/css/application.css +++ b/apps/desktop/desktop/src/main/resources/css/application.css @@ -390,20 +390,24 @@ -fx-font-size: 1.9em !important; } -.reputation .label, .reputation .reputation-learn-more { + -fx-fill: -fx-light-text-color !important; + -fx-text-fill: -fx-light-text-color !important; -fx-font-size: 1.15em; -fx-font-family: "IBM Plex Sans Light"; } -.reputation .reputation-learn-more { +.reputation .reputation-learn-more-link { -fx-fill: -fx-light-text-color !important; -fx-text-fill: -fx-light-text-color !important; -} - -.reputation .reputation-learn-more:hover { + -fx-font-size: 1.15em; + -fx-font-family: "IBM Plex Sans Light"; -fx-underline: true; } +.reputation .reputation-learn-more-link:hover { + -fx-fill: -bisq2-green !important; + -fx-text-fill: -bisq2-green !important; +} .popup-bg .bisq-common-bg { -fx-padding: 10 30 30 30 !important; diff --git a/i18n/src/main/resources/reputation.properties b/i18n/src/main/resources/reputation.properties index 6ffb8e1f8d..6d7def50ab 100644 --- a/i18n/src/main/resources/reputation.properties +++ b/i18n/src/main/resources/reputation.properties @@ -8,10 +8,11 @@ reputation.reputationScore=Reputation score reputation.buildReputation.headline=Build reputation reputation.buildReputation.intro.part1=Bisq Easy's security model relies on the seller's reputation.\n\ - This is because during a trade the buyer sends the fiat amount first, therefore the seller needs to have put a stake upfront.\n\ - This stake is what effectively translates into the seller's reputation. -reputation.buildReputation.intro.part2=The underlying heuristic is the following: the higher the reputation of a seller, the higher the amount that can be traded.\n\ - If the seller's reputation does not meet the guidelines established at Bisq, buyers will receive a message that taking such offer warrants caution. + This is because during a trade the buyer sends the fiat amount first, therefore the seller needs to provide reputation to establish some level of security. +reputation.buildReputation.intro.part2=A seller can take offers up to the amount derived from their reputation score. \ + It is calculated as follows:\n\ + 'Reputation score / 200 = max. trade amount in USD' (converted to the currency used).\n\ + If a seller posts an offer with an amount not covered by their reputation score, the buyer will see a warning about the potential risks when taking that offer. reputation.buildReputation.title=How can sellers build up their reputation? reputation.buildReputation.burnBsq.title=Burning BSQ reputation.buildReputation.burnBsq.description=This is the strongest form of reputation.\n\ @@ -27,7 +28,8 @@ reputation.buildReputation.signedAccount.button=Learn how to import signed accou reputation.buildReputation.accountAge.title=Account age reputation.buildReputation.accountAge.description=Users of Bisq 1 can gain reputation by importing their account age from Bisq 1 into Bisq 2. reputation.buildReputation.accountAge.button=Learn how to import account age -reputation.buildReputation.readMore=Click here to read more about the Bisq reputation system. +reputation.buildReputation.learnMore=Learn more about the Bisq reputation system at the +reputation.buildReputation.learnMore.link=Bisq Wiki. # suppress inspection "UnusedProperty" reputation.source.BURNED_BSQ=Burned BSQ @@ -218,16 +220,16 @@ reputation.reputationScore.sellerReputation=The reputation of a seller is the be reputation.reputationScore.explanation.intro=Reputation at Bisq2 is captured in three elements: reputation.reputationScore.explanation.score.title=Score reputation.reputationScore.explanation.score.description=This is the total score a seller has built up so far.\n\ - The score can be increased in several ways. The best way to do so is by burning or bonding BSQ.\ + The score can be increased in several ways. The best way to do so is by burning or bonding BSQ. \ This means the seller has put a stake upfront and, as a result, can be regarded as trustworthy.\n\ Further reading on how to increase the score can be found in 'Build reputation' section.\n\ - At Bisq, we recommend trading with sellers who have the highest score. + It is recommended to trade with sellers who have the highest score. reputation.reputationScore.explanation.ranking.title=Ranking reputation.reputationScore.explanation.ranking.description=Ranks users from highest to lowest score.\n\ As a rule of thumb when trading: the higher the rank, the better likelihood of a successful trade. reputation.reputationScore.explanation.stars.title=Stars reputation.reputationScore.explanation.stars.description=This is a graphical representation of the score. See the conversion table below for how stars are calculated.\n\ - At Bisq, we recommend trading with sellers who have the highest number of stars. + It is recommended to trade with sellers who have the highest number of stars. reputation.reputationScore.closing=For more details on how a seller has built their reputation, see 'Ranking' section and click 'Show details' in the user.