From c89be1ff92db6955f52644f4671129830f27911d Mon Sep 17 00:00:00 2001
From: Hirad <hirad@re-work.dev>
Date: Wed, 14 Dec 2022 13:41:02 +0330
Subject: [PATCH] fix: enhanced same citizenship modal

---
 .../AccountSignupModal/account-signup-modal.jsx        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
index a5b0531acad7..3c52f2d0bcd9 100644
--- a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
+++ b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
@@ -79,6 +79,8 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
         }
     };
 
+    const same_citizenship_condition = !is_pasword_modal && !is_citizenship_modal;
+
     return (
         <div className='account-signup'>
             {is_loading ? (
@@ -103,7 +105,11 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
                         <Form>
                             {!selected_residence || !is_same_citizenship_modal ? (
                                 <ResidenceForm
-                                    header_text={localize('Thanks for verifying your email')}
+                                    header_text={
+                                        same_citizenship_condition
+                                            ? localize('Citizenship')
+                                            : localize('Thanks for verifying your email')
+                                    }
                                     class_prefix='account-signup'
                                     errors={errors}
                                     touched={touched}
@@ -130,7 +136,7 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
                                 </ResidenceForm>
                             ) : (
                                 <>
-                                    {!is_pasword_modal && !is_citizenship_modal ? (
+                                    {same_citizenship_condition ? (
                                         <SameCitizenshipModal
                                             onCitizenshipSelection={onCitizenshipSelection}
                                             residence={values.residence}