From 7509a80895ed04ebccd5b3b3cf58f40134aec393 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sun, 4 Feb 2024 13:30:49 -0500
Subject: [PATCH] persist payment account on creation to fix null accountName

---
 .../account/content/cryptoaccounts/CryptoAccountsDataModel.java  | 1 +
 .../traditionalaccounts/TraditionalAccountsDataModel.java        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/desktop/src/main/java/haveno/desktop/main/account/content/cryptoaccounts/CryptoAccountsDataModel.java b/desktop/src/main/java/haveno/desktop/main/account/content/cryptoaccounts/CryptoAccountsDataModel.java
index 7fc3089a..0784d7b6 100644
--- a/desktop/src/main/java/haveno/desktop/main/account/content/cryptoaccounts/CryptoAccountsDataModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/account/content/cryptoaccounts/CryptoAccountsDataModel.java
@@ -121,6 +121,7 @@ class CryptoAccountsDataModel extends ActivatableDataModel {
 
         if (paymentAccount.getAccountName() == null) throw new IllegalStateException("Account name cannot be null");
         user.addPaymentAccount(paymentAccount);
+        paymentAccount.onPersistChanges();
 
         if (!(paymentAccount instanceof AssetAccount))
             accountAgeWitnessService.publishMyAccountAgeWitness(paymentAccount.getPaymentAccountPayload());
diff --git a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsDataModel.java b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsDataModel.java
index 7010cb17..9cf407a6 100644
--- a/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsDataModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/account/content/traditionalaccounts/TraditionalAccountsDataModel.java
@@ -127,6 +127,7 @@ class TraditionalAccountsDataModel extends ActivatableDataModel {
         }
 
         user.addPaymentAccount(paymentAccount);
+        paymentAccount.onPersistChanges();
 
         accountAgeWitnessService.publishMyAccountAgeWitness(paymentAccount.getPaymentAccountPayload());
         accountAgeWitnessService.signAndPublishSameNameAccounts();