From 8f3028e2a8ecaf4d055c47100a3e01e48144061c Mon Sep 17 00:00:00 2001
From: Sid Ferreira <143615+sidferreira@users.noreply.github.com>
Date: Fri, 12 Nov 2021 15:25:13 -0800
Subject: [PATCH 1/5] Fix 6096 - Name and message aligned in iOS + Focus Mode

---
 src/styles/optionAlternateTextCompact/index.ios.js | 10 ++++++++++
 src/styles/optionAlternateTextCompact/index.js     |  7 +++++++
 src/styles/styles.js                               |  7 ++-----
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 src/styles/optionAlternateTextCompact/index.ios.js
 create mode 100644 src/styles/optionAlternateTextCompact/index.js

diff --git a/src/styles/optionAlternateTextCompact/index.ios.js b/src/styles/optionAlternateTextCompact/index.ios.js
new file mode 100644
index 0000000000000..235d458f06785
--- /dev/null
+++ b/src/styles/optionAlternateTextCompact/index.ios.js
@@ -0,0 +1,10 @@
+import base from './index';
+
+const optionAlternateTextCompact = {
+    ...base,
+    height: 20,
+    lineHeight: 20,
+};
+
+
+export default optionAlternateTextCompact;
diff --git a/src/styles/optionAlternateTextCompact/index.js b/src/styles/optionAlternateTextCompact/index.js
new file mode 100644
index 0000000000000..55b6e33affb18
--- /dev/null
+++ b/src/styles/optionAlternateTextCompact/index.js
@@ -0,0 +1,7 @@
+const optionAlternateTextCompact = {
+    flexShrink: 1,
+    flexGrow: 1,
+    flexBasis: 'auto',
+};
+
+export default optionAlternateTextCompact;
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 4bdc26019b56d..c625a4de1cac7 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -17,6 +17,7 @@ import CONST from '../CONST';
 import positioning from './utilities/positioning';
 import codeStyles from './codeStyles';
 import visibility from './utilities/visibility';
+import optionAlternateTextCompact from './optionAlternateTextCompact';
 
 const expensiPicker = {
     backgroundColor: 'transparent',
@@ -954,11 +955,7 @@ const styles = {
         lineHeight: 16,
     },
 
-    optionAlternateTextCompact: {
-        flexShrink: 1,
-        flexGrow: 1,
-        flexBasis: 'auto',
-    },
+    optionAlternateTextCompact,
 
     // App Content Wrapper styles
     appContentWrapper: {

From 269d19d9739c9f7ea7cab88f199e118519477375 Mon Sep 17 00:00:00 2001
From: Sid Ferreira <143615+sidferreira@users.noreply.github.com>
Date: Thu, 18 Nov 2021 14:53:46 -0800
Subject: [PATCH 2/5] Name + Focus Alignment: fine tune

---
 src/styles/optionAlternateTextCompact/index.ios.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/optionAlternateTextCompact/index.ios.js b/src/styles/optionAlternateTextCompact/index.ios.js
index 235d458f06785..c6b79855d5034 100644
--- a/src/styles/optionAlternateTextCompact/index.ios.js
+++ b/src/styles/optionAlternateTextCompact/index.ios.js
@@ -4,7 +4,7 @@ const optionAlternateTextCompact = {
     ...base,
     height: 20,
     lineHeight: 20,
+    paddingTop: 1,
 };
 
-
 export default optionAlternateTextCompact;

From 40cef2ff0c1c1c7d6484f51d082a3977502e01c5 Mon Sep 17 00:00:00 2001
From: Sid Ferreira <143615+sidferreira@users.noreply.github.com>
Date: Thu, 18 Nov 2021 15:05:10 -0800
Subject: [PATCH 3/5] Name + Focus Alignment

---
 src/styles/optionAlternateTextCompact/base.js      | 7 +++++++
 src/styles/optionAlternateTextCompact/index.ios.js | 2 +-
 src/styles/optionAlternateTextCompact/index.js     | 8 +-------
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 src/styles/optionAlternateTextCompact/base.js

diff --git a/src/styles/optionAlternateTextCompact/base.js b/src/styles/optionAlternateTextCompact/base.js
new file mode 100644
index 0000000000000..55b6e33affb18
--- /dev/null
+++ b/src/styles/optionAlternateTextCompact/base.js
@@ -0,0 +1,7 @@
+const optionAlternateTextCompact = {
+    flexShrink: 1,
+    flexGrow: 1,
+    flexBasis: 'auto',
+};
+
+export default optionAlternateTextCompact;
diff --git a/src/styles/optionAlternateTextCompact/index.ios.js b/src/styles/optionAlternateTextCompact/index.ios.js
index c6b79855d5034..1e0eadb0cc4ea 100644
--- a/src/styles/optionAlternateTextCompact/index.ios.js
+++ b/src/styles/optionAlternateTextCompact/index.ios.js
@@ -1,4 +1,4 @@
-import base from './index';
+import base from './base';
 
 const optionAlternateTextCompact = {
     ...base,
diff --git a/src/styles/optionAlternateTextCompact/index.js b/src/styles/optionAlternateTextCompact/index.js
index 55b6e33affb18..82375768b2e8f 100644
--- a/src/styles/optionAlternateTextCompact/index.js
+++ b/src/styles/optionAlternateTextCompact/index.js
@@ -1,7 +1 @@
-const optionAlternateTextCompact = {
-    flexShrink: 1,
-    flexGrow: 1,
-    flexBasis: 'auto',
-};
-
-export default optionAlternateTextCompact;
+export {default} from './base';

From 447e0eb49710d1aa4ce87935d20ac0f9c83f189e Mon Sep 17 00:00:00 2001
From: Sid Ferreira <143615+sidferreira@users.noreply.github.com>
Date: Tue, 30 Nov 2021 09:27:56 -0800
Subject: [PATCH 4/5] Inline Icons - review 6

---
 src/styles/optionAlternateTextCompact/base.js          |  7 -------
 src/styles/optionAlternateTextCompact/index.ios.js     | 10 ----------
 src/styles/optionAlternateTextCompact/index.js         |  1 -
 .../optionAlternateTextPlatformStyles/index.ios.js     |  5 +++++
 src/styles/optionAlternateTextPlatformStyles/index.js  |  2 ++
 src/styles/styles.js                                   |  9 +++++++--
 6 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 src/styles/optionAlternateTextCompact/base.js
 delete mode 100644 src/styles/optionAlternateTextCompact/index.ios.js
 delete mode 100644 src/styles/optionAlternateTextCompact/index.js
 create mode 100644 src/styles/optionAlternateTextPlatformStyles/index.ios.js
 create mode 100644 src/styles/optionAlternateTextPlatformStyles/index.js

diff --git a/src/styles/optionAlternateTextCompact/base.js b/src/styles/optionAlternateTextCompact/base.js
deleted file mode 100644
index 55b6e33affb18..0000000000000
--- a/src/styles/optionAlternateTextCompact/base.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const optionAlternateTextCompact = {
-    flexShrink: 1,
-    flexGrow: 1,
-    flexBasis: 'auto',
-};
-
-export default optionAlternateTextCompact;
diff --git a/src/styles/optionAlternateTextCompact/index.ios.js b/src/styles/optionAlternateTextCompact/index.ios.js
deleted file mode 100644
index 1e0eadb0cc4ea..0000000000000
--- a/src/styles/optionAlternateTextCompact/index.ios.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import base from './base';
-
-const optionAlternateTextCompact = {
-    ...base,
-    height: 20,
-    lineHeight: 20,
-    paddingTop: 1,
-};
-
-export default optionAlternateTextCompact;
diff --git a/src/styles/optionAlternateTextCompact/index.js b/src/styles/optionAlternateTextCompact/index.js
deleted file mode 100644
index 82375768b2e8f..0000000000000
--- a/src/styles/optionAlternateTextCompact/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export {default} from './base';
diff --git a/src/styles/optionAlternateTextPlatformStyles/index.ios.js b/src/styles/optionAlternateTextPlatformStyles/index.ios.js
new file mode 100644
index 0000000000000..ec43230189770
--- /dev/null
+++ b/src/styles/optionAlternateTextPlatformStyles/index.ios.js
@@ -0,0 +1,5 @@
+export default {
+    height: 20,
+    lineHeight: 20,
+    paddingTop: 1,
+};
diff --git a/src/styles/optionAlternateTextPlatformStyles/index.js b/src/styles/optionAlternateTextPlatformStyles/index.js
new file mode 100644
index 0000000000000..02a61bed5e1ed
--- /dev/null
+++ b/src/styles/optionAlternateTextPlatformStyles/index.js
@@ -0,0 +1,2 @@
+export default {
+};
diff --git a/src/styles/styles.js b/src/styles/styles.js
index c625a4de1cac7..8ebb84378fd67 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -17,7 +17,7 @@ import CONST from '../CONST';
 import positioning from './utilities/positioning';
 import codeStyles from './codeStyles';
 import visibility from './utilities/visibility';
-import optionAlternateTextCompact from './optionAlternateTextCompact';
+import optionAlternateTextPlatformStyles from './optionAlternateTextPlatformStyles';
 
 const expensiPicker = {
     backgroundColor: 'transparent',
@@ -955,7 +955,12 @@ const styles = {
         lineHeight: 16,
     },
 
-    optionAlternateTextCompact,
+    optionAlternateTextCompact: {
+        flexShrink: 1,
+        flexGrow: 1,
+        flexBasis: 'auto',
+        ...optionAlternateTextPlatformStyles,
+    },
 
     // App Content Wrapper styles
     appContentWrapper: {

From ee21d13088e7182bb260944f334b656cf2ddb39f Mon Sep 17 00:00:00 2001
From: Sid Ferreira <143615+sidferreira@users.noreply.github.com>
Date: Tue, 30 Nov 2021 11:19:42 -0800
Subject: [PATCH 5/5] Update
 src/styles/optionAlternateTextPlatformStyles/index.js

Co-authored-by: Rajat Parashar <parasharrajat@users.noreply.github.com>
---
 src/styles/optionAlternateTextPlatformStyles/index.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/styles/optionAlternateTextPlatformStyles/index.js b/src/styles/optionAlternateTextPlatformStyles/index.js
index 02a61bed5e1ed..ff8b4c56321a3 100644
--- a/src/styles/optionAlternateTextPlatformStyles/index.js
+++ b/src/styles/optionAlternateTextPlatformStyles/index.js
@@ -1,2 +1 @@
-export default {
-};
+export default {};