From 13165f25f262bfc54eaac6872ce8ed77c0aff684 Mon Sep 17 00:00:00 2001
From: meetdhanani17 <124246235+meetdhanani17@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:50:24 +0530
Subject: [PATCH 1/4] fix fontweight issue of double in android

---
 packages/react-native/Libraries/Text/Text.js | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/react-native/Libraries/Text/Text.js b/packages/react-native/Libraries/Text/Text.js
index 807b1c73d165e7..4a8bb21fe13e59 100644
--- a/packages/react-native/Libraries/Text/Text.js
+++ b/packages/react-native/Libraries/Text/Text.js
@@ -223,25 +223,29 @@ const TextLegacy: React.AbstractComponent<
   }
 
   let _selectable = selectable;
-  const processedStyle = flattenStyle(_style);
+  let processedStyle = flattenStyle(_style);
   if (processedStyle != null) {
+    const overrideStyle = null;
     if (typeof processedStyle.fontWeight === 'number') {
-      // $FlowFixMe[cannot-write]
+      overrideStyle = overrideStyle || {};
       processedStyle.fontWeight = processedStyle.fontWeight.toString();
     }
 
     if (processedStyle.userSelect != null) {
       _selectable = userSelectToSelectableMap[processedStyle.userSelect];
-      // $FlowFixMe[cannot-write]
-      delete processedStyle.userSelect;
+      overrideStyle = overrideStyle || {};
+      overrideStyle.userSelect = undefined;
     }
 
     if (processedStyle.verticalAlign != null) {
       // $FlowFixMe[cannot-write]
-      processedStyle.textAlignVertical =
+      overrideStyle.textAlignVertical =
         verticalAlignToTextAlignVerticalMap[processedStyle.verticalAlign];
-      // $FlowFixMe[cannot-write]
-      delete processedStyle.verticalAlign;
+      overrideStyle.verticalAlign = undefined;
+    }
+    
+    if (overriteStyle != null) {
+      processedStyle = {...processedStyle, ...overriteStyle};
     }
   }
 

From 2c7d78f84d86bc0006848c78e08b23e0569ec6e3 Mon Sep 17 00:00:00 2001
From: meetdhanani17 <124246235+meetdhanani17@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:54:32 +0530
Subject: [PATCH 2/4] fix typo for overrideStyle

---
 packages/react-native/Libraries/Text/Text.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-native/Libraries/Text/Text.js b/packages/react-native/Libraries/Text/Text.js
index 4a8bb21fe13e59..e7eebc3271ba0d 100644
--- a/packages/react-native/Libraries/Text/Text.js
+++ b/packages/react-native/Libraries/Text/Text.js
@@ -245,7 +245,7 @@ const TextLegacy: React.AbstractComponent<
     }
     
     if (overriteStyle != null) {
-      processedStyle = {...processedStyle, ...overriteStyle};
+      processedStyle = {...processedStyle, ...overrideStyle};
     }
   }
 

From 72b0b833aefa0c1afbeea51bd7ebca8b5002bd2e Mon Sep 17 00:00:00 2001
From: meetdhanani17 <124246235+meetdhanani17@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:58:04 +0530
Subject: [PATCH 3/4] fix typo for overrideStyle

---
 packages/react-native/Libraries/Text/Text.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-native/Libraries/Text/Text.js b/packages/react-native/Libraries/Text/Text.js
index e7eebc3271ba0d..927d0a7f915b16 100644
--- a/packages/react-native/Libraries/Text/Text.js
+++ b/packages/react-native/Libraries/Text/Text.js
@@ -228,7 +228,7 @@ const TextLegacy: React.AbstractComponent<
     const overrideStyle = null;
     if (typeof processedStyle.fontWeight === 'number') {
       overrideStyle = overrideStyle || {};
-      processedStyle.fontWeight = processedStyle.fontWeight.toString();
+      overrideStyle.fontWeight = processedStyle.fontWeight.toString();
     }
 
     if (processedStyle.userSelect != null) {
@@ -244,7 +244,7 @@ const TextLegacy: React.AbstractComponent<
       overrideStyle.verticalAlign = undefined;
     }
     
-    if (overriteStyle != null) {
+    if (overrideStyle != null) {
       processedStyle = {...processedStyle, ...overrideStyle};
     }
   }

From f277fcb4090704dbc3d808a7e6c885707a141bdf Mon Sep 17 00:00:00 2001
From: meetdhanani17 <124246235+meetdhanani17@users.noreply.github.com>
Date: Tue, 9 Jul 2024 15:59:33 +0530
Subject: [PATCH 4/4] Update Text.js

---
 packages/react-native/Libraries/Text/Text.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-native/Libraries/Text/Text.js b/packages/react-native/Libraries/Text/Text.js
index 927d0a7f915b16..269e5b125a1a2c 100644
--- a/packages/react-native/Libraries/Text/Text.js
+++ b/packages/react-native/Libraries/Text/Text.js
@@ -227,13 +227,13 @@ const TextLegacy: React.AbstractComponent<
   if (processedStyle != null) {
     const overrideStyle = null;
     if (typeof processedStyle.fontWeight === 'number') {
-      overrideStyle = overrideStyle || {};
+      overrideStyle = overrideStyle ?? {};
       overrideStyle.fontWeight = processedStyle.fontWeight.toString();
     }
 
     if (processedStyle.userSelect != null) {
       _selectable = userSelectToSelectableMap[processedStyle.userSelect];
-      overrideStyle = overrideStyle || {};
+      overrideStyle = overrideStyle ?? {};
       overrideStyle.userSelect = undefined;
     }