Cleanups

apitest/src/test/java/bisq/apitest/ApiTestCase.java

@@ -17,6 +17,8 @@
 
 package bisq.apitest;
 
+import java.time.Duration;
+
 import java.io.IOException;
 
 import java.util.concurrent.ExecutionException;
@@ -32,9 +34,9 @@ import static bisq.apitest.config.ApiTestRateMeterInterceptorConfig.getTestRateM
 import static bisq.apitest.config.BisqAppConfig.alicedaemon;
 import static bisq.apitest.config.BisqAppConfig.arbdaemon;
 import static bisq.apitest.config.BisqAppConfig.bobdaemon;
+import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
 import static java.net.InetAddress.getLoopbackAddress;
 import static java.util.Arrays.stream;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 
 
@@ -131,11 +133,7 @@ public class ApiTestCase {
     }
 
     protected static void sleep(long ms) {
-        try {
-            MILLISECONDS.sleep(ms);
-        } catch (InterruptedException ignored) {
-            // empty
-        }
+        sleepUninterruptibly(Duration.ofMillis(ms));
     }
 
     protected final String testName(TestInfo testInfo) {

cli/src/main/java/bisq/cli/opts/AbstractMethodOptionParser.java

@@ -53,7 +53,6 @@ abstract class AbstractMethodOptionParser implements MethodOpts {
     public AbstractMethodOptionParser parse() {
         try {
             options = parser.parse(new ArgumentList(args).getMethodArguments());
-            //noinspection unchecked
             nonOptionArguments = (List<String>) options.nonOptionArguments();
             return this;
         } catch (OptionException ex) {

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

@@ -532,6 +532,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener
         return getPreparedSendTx(receiverAddress, receiverAmount, bsqCoinSelector);
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Send BTC (non-BSQ) with BTC fee (e.g. the issuance output from a  lost comp. request)
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -773,6 +774,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener
         return tx;
     }
 
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Unlock bond tx
     ///////////////////////////////////////////////////////////////////////////////////////////

core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java

@@ -46,7 +46,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 // OfferPayload has about 1.4 kb. We should look into options to make it smaller but will be hard to do it in a
 // backward compatible way. Maybe a candidate when segwit activation is done as hardfork?
 
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
 @Getter
 @Slf4j
 public final class OfferPayload extends OfferPayloadBase {

core/src/main/java/bisq/core/trade/protocol/bisq_v1/messages/InputsForDepositTxRequest.java

@@ -183,8 +183,7 @@ public final class InputsForDepositTxRequest extends TradeMessage implements Dir
                                                       CoreProtoResolver coreProtoResolver,
                                                       int messageVersion) {
         List<RawTransactionInput> rawTransactionInputs = proto.getRawTransactionInputsList().stream()
-                .map(rawTransactionInput -> new RawTransactionInput(rawTransactionInput.getIndex(),
-                        rawTransactionInput.getParentTransaction().toByteArray(), rawTransactionInput.getValue()))
+                .map(RawTransactionInput::fromProto)
                 .collect(Collectors.toList());
         List<NodeAddress> acceptedArbitratorNodeAddresses = proto.getAcceptedArbitratorNodeAddressesList().stream()
                 .map(NodeAddress::fromProto).collect(Collectors.toList());

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

@@ -2835,7 +2835,7 @@ popup.reportError={0}\n\nTo help us to improve the software please report this b
 The above error message will be copied to the clipboard when you click either of the buttons below.\n\
 It will make debugging easier if you include the bisq.log file by pressing "Open log file", saving a copy, and attaching it to your bug report.
 
-popup.error.tryRestart=Please try to restart your application and check your network connection to see if you can resolve the issue.
+popup.error.tryRestart=Please restart your application and check your network connection to see if you can resolve the issue.
 popup.error.takeOfferRequestFailed=An error occurred when someone tried to take one of your offers:\n{0}
 
 error.spvFileCorrupted=An error occurred when reading the SPV chain file.\nIt might be that the SPV chain file is corrupted.\n\nError message: {0}\n\nDo you want to delete it and start a resync?

desktop/src/main/java/bisq/desktop/main/offer/OfferView.java

@@ -254,15 +254,15 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
     }
 
     private void openTakeOffer(Offer offer) {
-        OfferView.this.takeOfferViewOpen = true;
-        OfferView.this.offer = offer;
-        OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(), TakeOfferView.class);
+        this.takeOfferViewOpen = true;
+        this.offer = offer;
+        this.navigation.navigateTo(MainView.class, this.getClass(), TakeOfferView.class);
     }
 
     private void openCreateOffer(TradeCurrency tradeCurrency, PaymentMethod paymentMethod) {
-        OfferView.this.createOfferViewOpen = true;
-        OfferView.this.tradeCurrency = tradeCurrency;
-        OfferView.this.navigation.navigateTo(MainView.class, OfferView.this.getClass(), CreateOfferView.class);
+        this.createOfferViewOpen = true;
+        this.tradeCurrency = tradeCurrency;
+        this.navigation.navigateTo(MainView.class, this.getClass(), CreateOfferView.class);
     }
 
     private void onCreateOfferViewRemoved() {