Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-09 07:02:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

get trade account payloads over grpc, support crypto account forms

Browse source
This commit is contained in:
woodser 2022-11-21 08:40:58 -05:00
parent 1f61e82946
commit 0d981a2df6
32 changed files with 292 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

4
desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java
View file

@ -31,7 +31,7 @@ import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AssetAccount;
import bisq.core.payment.InstantCryptoCurrencyAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AssetsAccountPayload;
import bisq.core.payment.payload.AssetAccountPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.validation.AltCoinAddressValidator;
import bisq.core.util.coin.CoinFormatter;
@ -71,7 +71,7 @@ public class AssetsForm extends PaymentMethodForm {
PaymentAccountPayload paymentAccountPayload,
String labelTitle) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, labelTitle,
((AssetsAccountPayload) paymentAccountPayload).getAddress());
((AssetAccountPayload) paymentAccountPayload).getAddress());
return gridRow;
}

6
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file

@ -87,7 +87,7 @@ import bisq.core.network.MessageState;
import bisq.core.offer.Offer;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountUtil;
import bisq.core.payment.payload.AssetsAccountPayload;
import bisq.core.payment.payload.AssetAccountPayload;
import bisq.core.payment.payload.CashByMailAccountPayload;
import bisq.core.payment.payload.CashDepositAccountPayload;
import bisq.core.payment.payload.F2FAccountPayload;
@ -548,7 +548,7 @@ public class BuyerStep2View extends TradeStepView {
} else {
showConfirmPaymentStartedPopup();
}
} else if (sellersPaymentAccountPayload instanceof AssetsAccountPayload && isXmrTrade()) {
} else if (sellersPaymentAccountPayload instanceof AssetAccountPayload && isXmrTrade()) {
SetXmrTxKeyWindow setXmrTxKeyWindow = new SetXmrTxKeyWindow();
setXmrTxKeyWindow
.actionButtonText(Res.get("portfolio.pending.step2_buyer.confirmStart.headline"))
@ -623,7 +623,7 @@ public class BuyerStep2View extends TradeStepView {
String fees = Res.get("portfolio.pending.step2_buyer.fees");
String id = trade.getShortId();
String amount = VolumeUtil.formatVolumeWithCode(trade.getVolume());
if (paymentAccountPayload instanceof AssetsAccountPayload) {
if (paymentAccountPayload instanceof AssetAccountPayload) {
message += Res.get("portfolio.pending.step2_buyer.altcoin",
getCurrencyName(trade),
amount);

15
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -24,7 +24,6 @@ import bisq.desktop.components.indicator.TxConfidenceIndicator;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.portfolio.pendingtrades.PendingTradesViewModel;
import bisq.desktop.main.portfolio.pendingtrades.steps.TradeStepView;
import bisq.desktop.util.DisplayUtils;
import bisq.desktop.util.GUIUtil;
import bisq.desktop.util.Layout;
@ -32,7 +31,7 @@ import bisq.core.locale.Res;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountUtil;
import bisq.core.payment.payload.AmazonGiftCardAccountPayload;
import bisq.core.payment.payload.AssetsAccountPayload;
import bisq.core.payment.payload.AssetAccountPayload;
import bisq.core.payment.payload.BankAccountPayload;
import bisq.core.payment.payload.CashByMailAccountPayload;
import bisq.core.payment.payload.CashDepositAccountPayload;
@ -226,13 +225,13 @@ public class SellerStep3View extends TradeStepView {
.map(PaymentAccount::getAccountName)
.orElse("");
if (myPaymentAccountPayload instanceof AssetsAccountPayload) {
if (myPaymentAccountPayload instanceof AssetAccountPayload) {
if (myPaymentDetails.isEmpty()) {
// Not expected
myPaymentDetails = ((AssetsAccountPayload) myPaymentAccountPayload).getAddress();
myPaymentDetails = ((AssetAccountPayload) myPaymentAccountPayload).getAddress();
}
peersPaymentDetails = peersPaymentAccountPayload != null ?
((AssetsAccountPayload) peersPaymentAccountPayload).getAddress() : "NA";
((AssetAccountPayload) peersPaymentAccountPayload).getAddress() : "NA";
myTitle = Res.get("portfolio.pending.step3_seller.yourAddress", currencyName);
peersTitle = Res.get("portfolio.pending.step3_seller.buyersAddress", currencyName);
} else {
@ -374,7 +373,7 @@ public class SellerStep3View extends TradeStepView {
if (!DevEnv.isDevMode() && DontShowAgainLookup.showAgain(key)) {
PaymentAccountPayload paymentAccountPayload = model.dataModel.getSellersPaymentAccountPayload();
String message = Res.get("portfolio.pending.step3_seller.onPaymentReceived.part1", getCurrencyName(trade));
if (!(paymentAccountPayload instanceof AssetsAccountPayload)) {
if (!(paymentAccountPayload instanceof AssetAccountPayload)) {
Optional<String> optionalHolderName = getOptionalHolderName();
if (optionalHolderName.isPresent()) {
message += Res.get("portfolio.pending.step3_seller.onPaymentReceived.name", optionalHolderName.get());
@ -406,8 +405,8 @@ public class SellerStep3View extends TradeStepView {
String tradeVolumeWithCode = VolumeUtil.formatVolumeWithCode(trade.getVolume());
String currencyName = getCurrencyName(trade);
String part1 = Res.get("portfolio.pending.step3_seller.part", currencyName);
if (paymentAccountPayload instanceof AssetsAccountPayload) {
String address = ((AssetsAccountPayload) paymentAccountPayload).getAddress();
if (paymentAccountPayload instanceof AssetAccountPayload) {
String address = ((AssetAccountPayload) paymentAccountPayload).getAddress();
String explorerOrWalletString = isXmrTrade() ?
Res.get("portfolio.pending.step3_seller.altcoin.wallet", currencyName) :
Res.get("portfolio.pending.step3_seller.altcoin.explorer", currencyName);