Bsq swap: Implementation [3]

core/src/main/java/bisq/core/btc/wallet/WalletService.java

@@ -871,7 +871,10 @@ public static Transaction maybeAddTxToWallet(Transaction transaction,
     // bisqWalletEventListener
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public class BisqWalletListener implements WalletCoinsReceivedEventListener, WalletCoinsSentEventListener, WalletReorganizeEventListener, TransactionConfidenceEventListener {
+    public class BisqWalletListener implements WalletCoinsReceivedEventListener,
+            WalletCoinsSentEventListener,
+            WalletReorganizeEventListener,
+            TransactionConfidenceEventListener {
         @Override
         public void onCoinsReceived(Wallet wallet, Transaction tx, Coin prevBalance, Coin newBalance) {
             notifyBalanceListeners(tx);

core/src/main/resources/i18n/displayStrings.properties

@@ -3105,8 +3105,9 @@ notification.takeOffer.walletUpdate.msg=Your trading wallet was already sufficie
 notification.tradeCompleted.headline=Trade completed
 notification.tradeCompleted.msg=You can withdraw your funds now to your external Bitcoin wallet or transfer it to the Bisq wallet.
 notification.bsqSwap.maker.headline=BSQ swap completed
-notification.bsqSwap.maker.tradeCompleted=Your offer with ID  ''{0}'' has been taken.
-
+notification.bsqSwap.maker.tradeCompleted=Your offer with ID ''{0}'' has been taken.
+notification.bsqSwap.confirmed.headline=BSQ swap transaction confirmed
+notification.bsqSwap.confirmed.text=The BSQ swap transaction for trade with ID ''{0}'' is confirmed.
 
 ####################################################################
 # System Tray

desktop/src/main/java/bisq/desktop/main/MainViewModel.java

@@ -37,6 +37,7 @@
 import bisq.desktop.main.overlays.windows.downloadupdate.DisplayUpdateDownloadWindow;
 import bisq.desktop.main.portfolio.PortfolioView;
 import bisq.desktop.main.portfolio.bsqswaps.UnconfirmedBsqSwapsView;
+import bisq.desktop.main.portfolio.closedtrades.ClosedTradesView;
 import bisq.desktop.main.presentation.AccountPresentation;
 import bisq.desktop.main.presentation.DaoPresentation;
 import bisq.desktop.main.presentation.MarketPricePresentation;
@@ -51,6 +52,7 @@
 import bisq.core.app.BisqSetup;
 import bisq.core.btc.nodes.LocalBitcoinNode;
 import bisq.core.btc.setup.WalletsSetup;
+import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
 import bisq.core.locale.CryptoCurrency;
 import bisq.core.locale.CurrencyUtil;
@@ -86,6 +88,8 @@
 import bisq.common.util.Hex;
 import bisq.common.util.Tuple2;
 
+import org.bitcoinj.core.TransactionConfidence;
+
 import com.google.inject.Inject;
 
 import com.google.common.base.Charsets;
@@ -123,6 +127,7 @@
 public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener {
     private final BisqSetup bisqSetup;
     private final WalletsSetup walletsSetup;
+    private final BsqWalletService bsqWalletService;
     private final User user;
     private final BalancePresentation balancePresentation;
     private final TradePresentation tradePresentation;
@@ -172,6 +177,7 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener {
     public MainViewModel(BisqSetup bisqSetup,
                          WalletsSetup walletsSetup,
                          BtcWalletService btcWalletService,
+                         BsqWalletService bsqWalletService,
                          User user,
                          BalancePresentation balancePresentation,
                          TradePresentation tradePresentation,
@@ -200,6 +206,7 @@ public MainViewModel(BisqSetup bisqSetup,
                          Navigation navigation) {
         this.bisqSetup = bisqSetup;
         this.walletsSetup = walletsSetup;
+        this.bsqWalletService = bsqWalletService;
         this.user = user;
         this.balancePresentation = balancePresentation;
         this.tradePresentation = tradePresentation;
@@ -264,8 +271,8 @@ public void onSetupComplete() {
                                     if (DontShowAgainLookup.showAgain(key)) {
                                         DontShowAgainLookup.dontShowAgain(key, true);
                                         new Popup().warning(Res.get("popup.warning.tradePeriod.halfReached",
-                                                trade.getShortId(),
-                                                DisplayUtils.formatDateTime(maxTradePeriodDate)))
+                                                        trade.getShortId(),
+                                                        DisplayUtils.formatDateTime(maxTradePeriodDate)))
                                                 .show();
                                     }
                                     break;
@@ -274,8 +281,8 @@ public void onSetupComplete() {
                                     if (DontShowAgainLookup.showAgain(key)) {
                                         DontShowAgainLookup.dontShowAgain(key, true);
                                         new Popup().warning(Res.get("popup.warning.tradePeriod.ended",
-                                                trade.getShortId(),
-                                                DisplayUtils.formatDateTime(maxTradePeriodDate)))
+                                                        trade.getShortId(),
+                                                        DisplayUtils.formatDateTime(maxTradePeriodDate)))
                                                 .show();
                                     }
                                     break;
@@ -296,6 +303,9 @@ public void onSetupComplete() {
                         bsqSwapTradeManager.resetCompletedBsqSwapTrade();
                     }
                 });
+
+                maybeNotifyBsqSwapTxConfirmed();
+                bsqWalletService.getWallet().addTransactionConfidenceEventListener((wallet, tx) -> maybeNotifyBsqSwapTxConfirmed());
             }
         });
 
@@ -316,6 +326,25 @@ public void onSetupComplete() {
         getShowAppScreen().set(true);
     }
 
+    private void maybeNotifyBsqSwapTxConfirmed() {
+        bsqSwapTradeManager.getObservableList().stream()
+                .filter(bsqSwapTrade -> bsqSwapTrade.getTxId() != null)
+                .filter(bsqSwapTrade -> DontShowAgainLookup.showAgain(bsqSwapTrade.getTxId()))
+                .filter(bsqSwapTrade -> {
+                    TransactionConfidence confidenceForTxId = bsqWalletService.getConfidenceForTxId(bsqSwapTrade.getTxId());
+                    return confidenceForTxId != null && confidenceForTxId.getDepthInBlocks() > 0;
+                })
+                .forEach(bsqSwapTrade -> {
+                    DontShowAgainLookup.dontShowAgain(bsqSwapTrade.getTxId(), true);
+                    new Notification()
+                            .headLine(Res.get("notification.bsqSwap.confirmed.headline"))
+                            .notification(Res.get("notification.bsqSwap.confirmed.text", bsqSwapTrade.getShortId()))
+                            .actionButtonTextWithGoTo("navigation.portfolio.closedTrades")
+                            .onAction(() -> navigation.navigateTo(MainView.class, PortfolioView.class, ClosedTradesView.class))
+                            .show();
+                });
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // UI handlers