payment account removal issue. Issue #3461

core/src/main/java/bisq/core/payment/PaymentAccount.java

@@ -43,15 +43,17 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-@EqualsAndHashCode
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @ToString
 @Getter
 @Slf4j
 public abstract class PaymentAccount implements PersistablePayload {
     protected final PaymentMethod paymentMethod;
     @Setter
+    @EqualsAndHashCode.Include
     protected String id;
     @Setter
+    @EqualsAndHashCode.Include
     protected long creationDate;
     @Setter
     public PaymentAccountPayload paymentAccountPayload;

core/src/test/java/bisq/core/payment/PaymentAccountsTest.java

@@ -21,12 +21,17 @@
 import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.offer.Offer;
 import bisq.core.payment.payload.PaymentAccountPayload;
+import bisq.core.user.UserPayload;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
 
 import java.util.Collections;
 
 import org.junit.Test;
 
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -71,4 +76,21 @@ private static PaymentAccount createAccountWithAge(AccountAgeWitnessService serv
 
         return account;
     }
+
+    @Test
+    public void testRemoveAccount() {
+        PaymentAccount account = new RevolutAccount();
+        account.setAccountName("account name");
+
+        ObservableSet<PaymentAccount> paymentAccountsAsObservable;
+        paymentAccountsAsObservable = FXCollections.observableSet(new UserPayload().getPaymentAccounts());
+
+        //add element
+        paymentAccountsAsObservable.add(account);
+
+        //remove element with some state change
+        account.setAccountName("new account name for new hash code");
+
+        assertTrue(paymentAccountsAsObservable.remove(account));
+    }
 }