From 6365db18e2bb2a814d65020075ca7eb9c34deedb Mon Sep 17 00:00:00 2001
From: amina-deriv <amina@regentmarkets.com>
Date: Fri, 31 Mar 2023 16:15:24 +0400
Subject: [PATCH] fix: set citizen on account

---
 packages/core/src/Stores/client-store.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
index 53af75b39fdc..e2060b823e7b 100644
--- a/packages/core/src/Stores/client-store.js
+++ b/packages/core/src/Stores/client-store.js
@@ -1306,7 +1306,7 @@ export default class ClientStore extends BaseStore {
             currency = form_values.currency;
         }
         const { document_number, document_type, document_additional, ...required_form_values } = form_values;
-        required_form_values.citizen = this.account_settings.citizen || this.residence;
+        required_form_values.citizen = form_values.citizen || this.account_settings.citizen || this.residence;
 
         const response = is_maltainvest_account
             ? await WS.newAccountRealMaltaInvest(required_form_values)
@@ -1591,7 +1591,9 @@ export default class ClientStore extends BaseStore {
             if (language !== 'EN' && language !== LocalStore.get(LANGUAGE_KEY)) {
                 window.history.replaceState({}, document.title, urlForLanguage(language));
             }
-            if (this.citizen) this.onSetCitizen(this.citizen);
+            if (this.citizen) {
+                await this.onSetCitizen(this.citizen);
+            }
             if (!this.is_virtual) {
                 this.setPrevRealAccountLoginid(this.loginid);
             }
@@ -2248,7 +2250,7 @@ export default class ClientStore extends BaseStore {
         });
     }
 
-    onSetCitizen(citizen) {
+    async onSetCitizen(citizen) {
         if (!citizen) return;
         WS.setSettings({
             set_settings: 1,