From 3a6cf15daca347c491ab79c677b2ad38df79913d Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 16 Sep 2024 15:07:48 +0530
Subject: [PATCH 1/5] fix

---
 .../modules/core/src/pages/citizen/Home/UserProfile.js   | 6 +++---
 .../packages/react-components/src/atoms/OTPInput.js      | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
index e6d16e9645..078869f0e1 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
@@ -724,7 +724,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
                     name="mobileNumber"
                     placeholder="Enter a valid Mobile No."
                     onChange={(value) => setUserMobileNumber(value)}
-                    disable={true}
+                    disable={Digit.Utils.getMultiRootTenant()?false : true}
                     {...{
                       required: true,
                       pattern: "[6-9]{1}[0-9]{9}",
@@ -759,7 +759,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
                     name="email"
                     value={email}
                     onChange={(e) => setUserEmailAddress(e.target.value)}
-                    disabled={editScreen}
+                    disabled={Digit.Utils.getMultiRootTenant()?true : editScreen}
                   />
                   {errors?.emailAddress && (
                     <ErrorMessage
@@ -776,7 +776,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
 
               <LabelFieldPair>
                 <div style={{ width: "100%" }}>
-                  {changepassword == false ? (
+                  {changepassword == false && !Digit.Utils.getMultiRootTenant()? (
                     <Button
                       label={t("CORE_COMMON_CHANGE_PASSWORD")}
                       variation={"teritiary"}
diff --git a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/OTPInput.js b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/OTPInput.js
index ee44448cd9..19a8da7c6e 100644
--- a/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/OTPInput.js
+++ b/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/OTPInput.js
@@ -18,7 +18,7 @@ const SingleInput = ({ isFocus, onChange, onFocus, value, ...rest }) => {
       onChange={onChange}
       onFocus={onFocus}
       ref={inputRef}
-      type="number"
+      type="text"  
       value={value ? value : ""}
       {...rest}
     />
@@ -29,7 +29,7 @@ const OTPInput = (props) => {
   const [activeInput, setActiveInput] = useState(0);
 
   const isInputValueValid = (value) => {
-    return typeof value === "string" && value.trim().length === 1;
+    return /^[0-9]$/.test(value); 
   };
 
   const changeCodeAtFocus = (value) => {
@@ -60,9 +60,12 @@ const OTPInput = (props) => {
 
   function inputChange(event) {
     const { value } = event.target;
-    changeCodeAtFocus(value);
+
     if (isInputValueValid(value)) {
+      changeCodeAtFocus(value);
       focusNextInput();
+    } else if (value === "") {
+      changeCodeAtFocus(""); // Handle clearing the input
     }
   }
 

From f7a57fc63b416d6ab2caa2e4aef51b6e17f4ace2 Mon Sep 17 00:00:00 2001
From: aaradhya-egov <aaradhya.sahu@egovernments.org>
Date: Mon, 16 Sep 2024 17:14:59 +0530
Subject: [PATCH 2/5] fix

---
 .../packages/libraries/src/services/elements/Localities.js    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Localities.js b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Localities.js
index 0ef16e7aca..8b66693de0 100644
--- a/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Localities.js
+++ b/micro-ui/web/micro-ui-internals/packages/libraries/src/services/elements/Localities.js
@@ -1,7 +1,11 @@
 import { LocalizationService } from "./Localization/service";
 
 const ADMIN_CODE = ({ tenantId, hierarchyType }) => {
+  if(Digit.Utils.getMultiRootTenant()){
+    return hierarchyType.code;
+  }else{
   return tenantId.replace(".", "_").toUpperCase() + "_" + hierarchyType.code;
+  }
 };
 
 const getI18nKeys = (localitiesWithLocalizationKeys) => {

From 92b0f4a1a0df7811803ef9f2eb611807ebce096c Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <nabeel.md@egovernments.org>
Date: Mon, 16 Sep 2024 17:27:43 +0530
Subject: [PATCH 3/5] Update
 micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js

---
 .../packages/modules/core/src/pages/citizen/Home/UserProfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
index 078869f0e1..2667292b5c 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
@@ -776,7 +776,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
 
               <LabelFieldPair>
                 <div style={{ width: "100%" }}>
-                  {changepassword == false && !Digit.Utils.getMultiRootTenant()? (
+                  {changepassword == false && !Digit.Utils.getOTPBasedLogin()? (
                     <Button
                       label={t("CORE_COMMON_CHANGE_PASSWORD")}
                       variation={"teritiary"}

From 7385be3e32aa3881393b37ee55eeab40dc21a79d Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <nabeel.md@egovernments.org>
Date: Mon, 16 Sep 2024 17:27:49 +0530
Subject: [PATCH 4/5] Update
 micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js

---
 .../packages/modules/core/src/pages/citizen/Home/UserProfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
index 2667292b5c..ef117082fc 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
@@ -724,7 +724,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
                     name="mobileNumber"
                     placeholder="Enter a valid Mobile No."
                     onChange={(value) => setUserMobileNumber(value)}
-                    disable={Digit.Utils.getMultiRootTenant()?false : true}
+                    disable={Digit.Utils.getMultiRootTenant()? false : true}
                     {...{
                       required: true,
                       pattern: "[6-9]{1}[0-9]{9}",

From 10e16da612c1295f9a91dc5ed683743d056487ee Mon Sep 17 00:00:00 2001
From: nabeelmd-eGov <nabeel.md@egovernments.org>
Date: Mon, 16 Sep 2024 17:28:25 +0530
Subject: [PATCH 5/5] Update UserProfile.js

---
 .../packages/modules/core/src/pages/citizen/Home/UserProfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
index ef117082fc..ec558e29b3 100644
--- a/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
+++ b/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/UserProfile.js
@@ -759,7 +759,7 @@ const UserProfile = ({ stateCode, userType, cityDetails }) => {
                     name="email"
                     value={email}
                     onChange={(e) => setUserEmailAddress(e.target.value)}
-                    disabled={Digit.Utils.getMultiRootTenant()?true : editScreen}
+                    disabled={Digit.Utils.getMultiRootTenant()? true : editScreen}
                   />
                   {errors?.emailAddress && (
                     <ErrorMessage