-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3276 from HenrikJannsen/add-mediation-case-detail…
…s-popup Add mediation case details popup
- Loading branch information
Showing
13 changed files
with
505 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
128 changes: 128 additions & 0 deletions
128
...desktop/main/content/authorized_role/mediator/details/MediationCaseDetailsController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.content.authorized_role.mediator.details; | ||
|
|
||
| import bisq.bisq_easy.NavigationTarget; | ||
| import bisq.chat.bisq_easy.open_trades.BisqEasyOpenTradeChannel; | ||
| import bisq.contract.bisq_easy.BisqEasyContract; | ||
| import bisq.desktop.ServiceProvider; | ||
| import bisq.desktop.common.view.Controller; | ||
| import bisq.desktop.common.view.InitWithDataController; | ||
| import bisq.desktop.common.view.NavigationController; | ||
| import bisq.desktop.main.content.authorized_role.mediator.MediationCaseListItem; | ||
| import bisq.desktop.overlay.OverlayController; | ||
| import bisq.i18n.Res; | ||
| import bisq.offer.bisq_easy.BisqEasyOffer; | ||
| import bisq.offer.price.spec.FixPriceSpec; | ||
| import bisq.offer.price.spec.PriceSpecFormatter; | ||
| import bisq.presentation.formatters.DateFormatter; | ||
| import bisq.presentation.formatters.PriceFormatter; | ||
| import bisq.support.mediation.MediationCase; | ||
| import bisq.support.mediation.MediationRequest; | ||
| import bisq.trade.bisq_easy.BisqEasyTradeFormatter; | ||
| import bisq.trade.bisq_easy.BisqEasyTradeUtils; | ||
| import lombok.EqualsAndHashCode; | ||
| import lombok.Getter; | ||
| import lombok.ToString; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| import java.util.Optional; | ||
|
|
||
| @Slf4j | ||
| public class MediationCaseDetailsController extends NavigationController implements InitWithDataController<MediationCaseDetailsController.InitData> { | ||
| @Getter | ||
| @EqualsAndHashCode | ||
| @ToString | ||
| public static class InitData { | ||
| private final MediationCaseListItem mediationCaseListItem; | ||
|
|
||
| public InitData(MediationCaseListItem mediationCaseListItem) { | ||
| this.mediationCaseListItem = mediationCaseListItem; | ||
| } | ||
| } | ||
|
|
||
| @Getter | ||
| private final MediationCaseDetailsModel model; | ||
| @Getter | ||
| private final MediationCaseDetailsView view; | ||
|
|
||
|
|
||
| public MediationCaseDetailsController(ServiceProvider serviceProvider) { | ||
| super(NavigationTarget.MEDIATION_CASE_DETAILS); | ||
|
|
||
| model = new MediationCaseDetailsModel(); | ||
| view = new MediationCaseDetailsView(model, this); | ||
| } | ||
|
|
||
| @Override | ||
| public void initWithData(InitData initData) { | ||
| model.setMediationCaseListItem(initData.mediationCaseListItem); | ||
| } | ||
|
|
||
| @Override | ||
| public void onActivate() { | ||
| MediationCaseListItem mediationCaseListItem = model.getMediationCaseListItem(); | ||
| BisqEasyOpenTradeChannel channel = mediationCaseListItem.getChannel(); | ||
| MediationCase mediationCase = mediationCaseListItem.getMediationCase(); | ||
| MediationRequest mediationRequest = mediationCase.getMediationRequest(); | ||
| BisqEasyContract contract = mediationRequest.getContract(); | ||
| BisqEasyOffer offer = contract.getOffer(); | ||
| String tradeId = mediationRequest.getTradeId(); | ||
|
|
||
| model.setTradeDate(DateFormatter.formatDateTime(contract.getTakeOfferDate())); | ||
|
|
||
| model.setOfferType(offer.getDirection().isBuy() | ||
| ? Res.get("bisqEasy.openTrades.tradeDetails.offerTypeAndMarket.buyOffer") | ||
| : Res.get("bisqEasy.openTrades.tradeDetails.offerTypeAndMarket.sellOffer")); | ||
| model.setMarket(Res.get("bisqEasy.openTrades.tradeDetails.offerTypeAndMarket.fiatMarket", | ||
| offer.getMarket().getQuoteCurrencyCode())); | ||
| model.setFiatAmount(BisqEasyTradeFormatter.formatQuoteSideAmount(contract)); | ||
| model.setFiatCurrency(offer.getMarket().getQuoteCurrencyCode()); | ||
| model.setBtcAmount(BisqEasyTradeFormatter.formatBaseSideAmount(contract)); | ||
| model.setPrice(PriceFormatter.format(BisqEasyTradeUtils.getPriceQuote(contract))); | ||
| model.setPriceCodes(offer.getMarket().getMarketCodes()); | ||
| model.setPriceSpec(offer.getPriceSpec() instanceof FixPriceSpec | ||
| ? "" | ||
| : String.format("(%s)", PriceSpecFormatter.getFormattedPriceSpec(offer.getPriceSpec(), true))); | ||
| model.setPaymentMethod(contract.getQuoteSidePaymentMethodSpec().getShortDisplayString()); | ||
| model.setSettlementMethod(contract.getBaseSidePaymentMethodSpec().getShortDisplayString()); | ||
| model.setTradeId(tradeId); | ||
|
|
||
| MediationCaseListItem.Trader maker = mediationCaseListItem.getMaker(); | ||
| MediationCaseListItem.Trader taker = mediationCaseListItem.getTaker(); | ||
| MediationCaseListItem.Trader buyer = offer.getDirection().isBuy() ? maker : taker; | ||
| MediationCaseListItem.Trader seller = offer.getDirection().isSell() ? maker : taker; | ||
| model.setBuyerUserName(buyer.getUserName()); | ||
| model.setSellerUserName(seller.getUserName()); | ||
| model.setBuyerNetworkAddress(buyer.getUserProfile().getAddressByTransportDisplayString(50)); | ||
| model.setSellerNetworkAddress(seller.getUserProfile().getAddressByTransportDisplayString(50)); | ||
| } | ||
|
|
||
| @Override | ||
| public void onDeactivate() { | ||
| } | ||
|
|
||
| @Override | ||
| protected Optional<? extends Controller> createController(NavigationTarget navigationTarget) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| void onClose() { | ||
| OverlayController.hide(); | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...bisq/desktop/main/content/authorized_role/mediator/details/MediationCaseDetailsModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.desktop.main.content.authorized_role.mediator.details; | ||
|
|
||
| import bisq.bisq_easy.NavigationTarget; | ||
| import bisq.desktop.common.view.NavigationModel; | ||
| import bisq.desktop.main.content.authorized_role.mediator.MediationCaseListItem; | ||
| import lombok.Getter; | ||
| import lombok.Setter; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| @Getter | ||
| @Setter | ||
| public class MediationCaseDetailsModel extends NavigationModel { | ||
| private MediationCaseListItem mediationCaseListItem; | ||
| private String tradeDate; | ||
| private String offerType; | ||
| private String market; | ||
| private String fiatAmount; | ||
| private String fiatCurrency; | ||
| private String btcAmount; | ||
| private String price; | ||
| private String priceCodes; | ||
| private String priceSpec; | ||
| private String paymentMethod; | ||
| private String settlementMethod; | ||
| private String tradeId; | ||
| private String buyerUserName; | ||
| private String sellerUserName; | ||
| private String buyerNetworkAddress; | ||
| private String sellerNetworkAddress; | ||
|
|
||
| @Override | ||
| public NavigationTarget getDefaultNavigationTarget() { | ||
| return NavigationTarget.MEDIATION_CASE_DETAILS; | ||
| } | ||
| } |
Oops, something went wrong.