Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-10 15:40:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

select online, registered, and least used arbitrator (#400)

Browse source 
support registering and unregistering arbitrators over grpc
maker always sends InitTradeRequest to arbitrator
share original contract for comparision
remove backup arbitator from model
cleanup trade states
This commit is contained in:
woodser 2022-08-13 09:47:33 -04:00 • committed by GitHub
parent 757c7cf19c
commit 3727d12ef6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 472 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

2
desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java
View file

@ -192,7 +192,7 @@ public class NotificationCenter {
message = Res.get("notification.trade.accepted", role);
}
if (trade instanceof BuyerTrade && phase.ordinal() == Trade.Phase.DEPOSIT_UNLOCKED.ordinal())
if (trade instanceof BuyerTrade && phase.ordinal() == Trade.Phase.DEPOSITS_UNLOCKED.ordinal())
message = Res.get("notification.trade.confirmed");
else if (trade instanceof SellerTrade && phase.ordinal() == Trade.Phase.PAYMENT_SENT.ordinal())
message = Res.get("notification.trade.paymentStarted");

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

@ -162,7 +162,7 @@ public class BuyerStep2View extends TradeStepView {
switch (state) {
case BUYER_CONFIRMED_IN_UI_PAYMENT_SENT:
busyAnimation.play();
statusLabel.setText("Confirming payment sent. This can take up to a few minutes depending on connection speed. Please wait...");
statusLabel.setText("Confirming payment sent. This can take up to a few minutes. Please wait...");
break;
case BUYER_SENT_PAYMENT_SENT_MSG:
busyAnimation.play();

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

@ -121,7 +121,7 @@ public class SellerStep3View extends TradeStepView {
switch (state) {
case SELLER_CONFIRMED_IN_UI_PAYMENT_RECEIPT:
busyAnimation.play();
statusLabel.setText(Res.get("Confirming payment received. This can take up to a few minutes depending on connection speed. Please wait..."));
statusLabel.setText(Res.get("Confirming payment received. This can take up to a few minutes. Please wait..."));
break;
case SELLER_PUBLISHED_PAYOUT_TX:
case SELLER_SENT_PAYOUT_TX_PUBLISHED_MSG: