Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-17 05:52:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

UI cleanup, can confirm payment sent and received after dispute opened

Browse source 
show buyer and seller trade fee in dispute summary window
remove "Error polling trade wallet warning" if disconnected
show notification when dispute opened or closed in legacy app
resolve disputes under Support > Arbitration, hide other views
show "support ticket opened" when dispute request is acked
rename all variations of TradingPeer to TradePeer
rename "payment started" to "payment sent" for consistency
This commit is contained in:
woodser 2023-02-05 18:56:13 -05:00
parent a50e151c98
commit aafb47e2ce
112 changed files with 527 additions and 567 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cli/src/main/java/bisq/cli/CliMain.java
View file

@ -374,14 +374,14 @@ public class CliMain {
}
return;
}
case confirmpaymentstarted: {
case confirmpaymentsent: {
var opts = new GetTradeOptionParser(args).parse();
if (opts.isForHelp()) {
out.println(client.getMethodHelp(method));
return;
}
var tradeId = opts.getTradeId();
client.confirmPaymentStarted(tradeId);
client.confirmPaymentSent(tradeId);
out.printf("trade %s payment started message sent%n", tradeId);
return;
}
@ -700,7 +700,7 @@ public class CliMain {
stream.println();
stream.format(rowFormat, gettrades.name(), "[--category=<open|closed|failed>]", "Get open (default), closed, or failed trades");
stream.println();
stream.format(rowFormat, confirmpaymentstarted.name(), "--trade-id=<trade-id>", "Confirm payment started");
stream.format(rowFormat, confirmpaymentsent.name(), "--trade-id=<trade-id>", "Confirm payment started");
stream.println();
stream.format(rowFormat, confirmpaymentreceived.name(), "--trade-id=<trade-id>", "Confirm payment received");
stream.println();

4
cli/src/main/java/bisq/cli/GrpcClient.java
View file

@ -211,8 +211,8 @@ public final class GrpcClient {
return tradesServiceRequest.getTradeHistory(category);
}
public void confirmPaymentStarted(String tradeId) {
tradesServiceRequest.confirmPaymentStarted(tradeId);
public void confirmPaymentSent(String tradeId) {
tradesServiceRequest.confirmPaymentSent(tradeId);
}
public void confirmPaymentReceived(String tradeId) {

2
cli/src/main/java/bisq/cli/Method.java
View file

@ -24,7 +24,7 @@ public enum Method {
canceloffer,
closetrade,
confirmpaymentreceived,
confirmpaymentstarted,
confirmpaymentsent,
createoffer,
editoffer,
createpaymentacct,

8
cli/src/main/java/bisq/cli/request/TradesServiceRequest.java
View file

@ -18,7 +18,7 @@
package bisq.cli.request;
import bisq.proto.grpc.ConfirmPaymentReceivedRequest;
import bisq.proto.grpc.ConfirmPaymentStartedRequest;
import bisq.proto.grpc.ConfirmPaymentSentRequest;
import bisq.proto.grpc.GetTradeRequest;
import bisq.proto.grpc.GetTradesRequest;
import bisq.proto.grpc.TakeOfferReply;
@ -82,12 +82,12 @@ public class TradesServiceRequest {
return grpcStubs.tradesService.getTrades(request).getTradesList();
}
public void confirmPaymentStarted(String tradeId) {
var request = ConfirmPaymentStartedRequest.newBuilder()
public void confirmPaymentSent(String tradeId) {
var request = ConfirmPaymentSentRequest.newBuilder()
.setTradeId(tradeId)
.build();
//noinspection ResultOfMethodCallIgnored
grpcStubs.tradesService.confirmPaymentStarted(request);
grpcStubs.tradesService.confirmPaymentSent(request);
}
public void confirmPaymentReceived(String tradeId) {

4
cli/src/main/java/bisq/cli/table/builder/AbstractTradeListBuilder.java
View file

@ -94,7 +94,7 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
@Nullable
protected final Column<String> colTradeCost;
@Nullable
protected final Column<Boolean> colIsPaymentStartedMessageSent;
protected final Column<Boolean> colIsPaymentSentMessageSent;
@Nullable
protected final Column<Boolean> colIsPaymentReceivedMessageSent;
@Nullable
@ -132,7 +132,7 @@ abstract class AbstractTradeListBuilder extends AbstractTableBuilder {
this.colIsCompleted = colSupplier.fundsWithdrawnColumn.get();
this.colBisqTradeFee = colSupplier.bisqTradeDetailFeeColumn.get();
this.colTradeCost = colSupplier.tradeCostColumn.get();
this.colIsPaymentStartedMessageSent = colSupplier.paymentStartedMessageSentColumn.get();
this.colIsPaymentSentMessageSent = colSupplier.paymentSentMessageSentColumn.get();
this.colIsPaymentReceivedMessageSent = colSupplier.paymentReceivedMessageSentColumn.get();
//noinspection ConstantConditions
this.colAltcoinReceiveAddressColumn = colSupplier.altcoinReceiveAddressColumn.get();

4
cli/src/main/java/bisq/cli/table/builder/TradeDetailTableBuilder.java
View file

@ -68,7 +68,7 @@ class TradeDetailTableBuilder extends AbstractTradeListBuilder {
colIsDepositPublished.addRow(trade.getIsDepositsPublished());
colIsDepositConfirmed.addRow(trade.getIsDepositsUnlocked());
colTradeCost.addRow(toTradeVolumeAsString.apply(trade));
colIsPaymentStartedMessageSent.addRow(trade.getIsPaymentSent());
colIsPaymentSentMessageSent.addRow(trade.getIsPaymentSent());
colIsPaymentReceivedMessageSent.addRow(trade.getIsPaymentReceived());
colIsPayoutPublished.addRow(trade.getIsPayoutPublished());
colIsCompleted.addRow(trade.getIsCompleted());
@ -91,7 +91,7 @@ class TradeDetailTableBuilder extends AbstractTradeListBuilder {
add(colIsDepositPublished.asStringColumn());
add(colIsDepositConfirmed.asStringColumn());
add(colTradeCost.justify());
add(colIsPaymentStartedMessageSent.asStringColumn());
add(colIsPaymentSentMessageSent.asStringColumn());
add(colIsPaymentReceivedMessageSent.asStringColumn());
add(colIsPayoutPublished.asStringColumn());
add(colIsCompleted.asStringColumn());

2
cli/src/main/java/bisq/cli/table/builder/TradeTableColumnSupplier.java
View file

@ -204,7 +204,7 @@ class TradeTableColumnSupplier {
? t.getOffer().getCounterCurrencyCode()
: t.getOffer().getBaseCurrencyCode();
final Supplier<Column<Boolean>> paymentStartedMessageSentColumn = () -> {
final Supplier<Column<Boolean>> paymentSentMessageSentColumn = () -> {
if (isTradeDetailTblBuilder.get()) {
String headerCurrencyCode = toPaymentCurrencyCode.apply(firstRow.get());
String colHeader = format(COL_HEADER_TRADE_PAYMENT_SENT, headerCurrencyCode);