From 42f5c057ecc954240a2ab96ad573e6de6f3091cc Mon Sep 17 00:00:00 2001 From: HenrikJannsen Date: Sun, 19 Jan 2025 14:55:28 +0700 Subject: [PATCH] Change index number at trade steps to start with 1 not with 0 --- .../bisq_easy/open_trades/trade_state/TradePhaseBox.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/open_trades/trade_state/TradePhaseBox.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/open_trades/trade_state/TradePhaseBox.java index 8d703b0928..18c22c1ab1 100644 --- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/open_trades/trade_state/TradePhaseBox.java +++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/open_trades/trade_state/TradePhaseBox.java @@ -128,14 +128,14 @@ private void setBisqEasyTrade(BisqEasyTrade bisqEasyTrade) { case TAKER_SENT_TAKE_OFFER_REQUEST: - // Seller + // Seller case TAKER_RECEIVED_TAKE_OFFER_RESPONSE__SELLER_DID_NOT_SENT_ACCOUNT_DATA__SELLER_DID_NOT_RECEIVED_BTC_ADDRESS: case TAKER_RECEIVED_TAKE_OFFER_RESPONSE__SELLER_DID_NOT_SENT_ACCOUNT_DATA__SELLER_RECEIVED_BTC_ADDRESS: case MAKER_SENT_TAKE_OFFER_RESPONSE__SELLER_DID_NOT_SENT_ACCOUNT_DATA__SELLER_DID_NOT_RECEIVED_BTC_ADDRESS: case MAKER_SENT_TAKE_OFFER_RESPONSE__SELLER_DID_NOT_SENT_ACCOUNT_DATA__SELLER_RECEIVED_BTC_ADDRESS: case MAKER_SENT_TAKE_OFFER_RESPONSE__SELLER_DID_NOT_SENT_ACCOUNT_DATA__SELLER_RECEIVED_BTC_ADDRESS_: case MAKER_DID_NOT_SENT_TAKE_OFFER_RESPONSE__SELLER_DID_NOT_SENT_ACCOUNT_DATA__SELLER_RECEIVED_BTC_ADDRESS: - // Buyer + // Buyer case TAKER_RECEIVED_TAKE_OFFER_RESPONSE__BUYER_DID_NOT_SENT_BTC_ADDRESS__BUYER_DID_NOT_RECEIVED_ACCOUNT_DATA: case TAKER_RECEIVED_TAKE_OFFER_RESPONSE__BUYER_SENT_BTC_ADDRESS__BUYER_DID_NOT_RECEIVED_ACCOUNT_DATA: case TAKER_RECEIVED_TAKE_OFFER_RESPONSE__BUYER_SENT_BTC_ADDRESS__BUYER_DID_NOT_RECEIVED_ACCOUNT_DATA_: @@ -159,7 +159,7 @@ private void setBisqEasyTrade(BisqEasyTrade bisqEasyTrade) { case MAKER_SENT_TAKE_OFFER_RESPONSE__SELLER_SENT_ACCOUNT_DATA__SELLER_DID_NOT_RECEIVED_BTC_ADDRESS: case MAKER_SENT_TAKE_OFFER_RESPONSE__SELLER_SENT_ACCOUNT_DATA__SELLER_RECEIVED_BTC_ADDRESS: case SELLER_RECEIVED_FIAT_SENT_CONFIRMATION: - // Buyer + // Buyer case TAKER_RECEIVED_TAKE_OFFER_RESPONSE__BUYER_SENT_BTC_ADDRESS__BUYER_RECEIVED_ACCOUNT_DATA: case MAKER_SENT_TAKE_OFFER_RESPONSE__BUYER_SENT_BTC_ADDRESS__BUYER_RECEIVED_ACCOUNT_DATA: case BUYER_SENT_FIAT_SENT_CONFIRMATION: @@ -384,7 +384,7 @@ private void phaseIndexChanged(Number phaseIndex) { badge.getStyleClass().add("bisq-easy-trade-state-phase-badge-completed"); label.getStyleClass().add("bisq-easy-trade-state-phase-completed"); } else { - badge.setText(String.valueOf(index)); + badge.setText(String.valueOf(index + 1)); badge.getLabel().setGraphic(null); if (index == phaseIndex.intValue()) { // current @@ -414,7 +414,6 @@ private static Triple getPhaseItem(int index) { label.getStyleClass().add("bisq-easy-trade-state-phase"); Badge badge = new Badge(); badge.setUseAnimation(false); - badge.setText(String.valueOf(index)); HBox hBox = new HBox(7.5, badge, label); hBox.setAlignment(Pos.CENTER_LEFT); return new Triple<>(hBox, label, badge);