[CP staging] Revert "Expense-Scan and Manual Options Partially Hidden at Maximum Font Size"

src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx

@@ -5,7 +5,6 @@ import type {TNode} from 'react-native-render-html';
 import useThemeStyles from '@hooks/useThemeStyles';
 import convertToLTR from '@libs/convertToLTR';
 import FontUtils from '@styles/utils/FontUtils';
-import variables from '@styles/variables';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import {computeEmbeddedMaxWidth, isChildOfTaskTitle} from './htmlEngineUtils';
 import htmlRenderers from './HTMLRenderers';
@@ -152,7 +151,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
             'account-manager-link': HTMLElementModel.fromCustomModel({tagName: 'account-manager-link', contentModel: HTMLContentModel.textual}),
             'next-step': HTMLElementModel.fromCustomModel({
                 tagName: 'next-step',
-                mixedUAStyles: {...styles.textLabelSupporting, paddingVertical: variables.labelPaddingVertical},
+                mixedUAStyles: {...styles.textLabelSupporting, ...styles.lh16},
                 contentModel: HTMLContentModel.textual,
             }),
             'next-step-email': HTMLElementModel.fromCustomModel({tagName: 'next-step-email', contentModel: HTMLContentModel.textual}),
@@ -195,7 +194,6 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
             styles.taskTitleMenuItemItalic,
             styles.em,
             styles.h1,
-            styles.lh16,
             styles.blockquote,
             styles.onlyEmojisTextLineHeight,
             styles.subTextFileUpload,

src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx

@@ -715,7 +715,7 @@ function MoneyRequestReportPreviewContent({
                                                                     <Text style={[styles.reportStatusText, {color: reportStatusColorStyle?.textColor}]}>{reportStatus}</Text>
                                                                 </View>
                                                             )}
-                                                            {!shouldShowAccessPlaceHolder && <Text style={[styles.textLabelSupporting]}>{expenseCount}</Text>}
+                                                            {!shouldShowAccessPlaceHolder && <Text style={[styles.textLabelSupporting, styles.lh16]}>{expenseCount}</Text>}
                                                         </View>
                                                     )
                                                 )}

src/components/ReportActionItem/TransactionPreview/TransactionPreviewContent.tsx

@@ -378,15 +378,7 @@ function TransactionPreviewContent({
                                         />
                                         <Text
                                             numberOfLines={1}
-                                            style={[
-                                                isDeleted && styles.lineThrough,
-                                                styles.textMicroSupporting,
-                                                styles.lhUndefined,
-                                                styles.textMicroSupportingPadding,
-                                                styles.pre,
-                                                styles.flexShrink1,
-                                                styles.textDanger,
-                                            ]}
+                                            style={[isDeleted && styles.lineThrough, styles.textMicroSupporting, styles.pre, styles.flexShrink1, {color: theme.danger}]}
                                         >
                                             {RBRMessage}
                                         </Text>

src/styles/index.ts

@@ -359,7 +359,7 @@ const staticStyles = (theme: ThemeColors) =>
             alignItems: 'center',
             justifyContent: 'center',
             borderRadius: variables.componentBorderRadiusSmall,
-            minHeight: 16,
+            height: 16,
         },
 
         reportStatusText: {
@@ -1469,10 +1469,6 @@ const staticStyles = (theme: ThemeColors) =>
             color: theme.textSupporting,
         },
 
-        lhUndefined: {
-            lineHeight: undefined,
-        },
-
         lh14: {
             lineHeight: variables.lineHeightSmall,
         },
@@ -4136,12 +4132,8 @@ const staticStyles = (theme: ThemeColors) =>
             height: 450,
         },
 
-        textMicroSupportingPadding: {
-            padding: variables.paddingSmall,
-        },
-
         tabSelectorButton: {
-            minHeight: variables.tabSelectorButtonHeight,
+            height: variables.tabSelectorButtonHeight,
             padding: variables.tabSelectorButtonPadding,
             flexDirection: 'row',
             alignItems: 'center',

src/styles/variables.ts

@@ -52,7 +52,6 @@ export default {
     defaultAvatarPreviewSize: 360,
     fabBottom: 25,
     breadcrumbsFontSize: getValueUsingPixelRatio(19, 32),
-    labelPaddingVertical: Math.abs((getValueUsingPixelRatio(13, 19) - 16) / 2),
     fontSizeXXSmall: 7,
     fontSizeSmall: getValueUsingPixelRatio(11, 17),
     fontSizeExtraSmall: 9,
@@ -134,7 +133,6 @@ export default {
     inputHeightSmall: 28,
     inputIconMarginTopSmall: getValueUsingPixelRatio(8, 11),
     inputIconMarginTopLarge: getValueUsingPixelRatio(16, 21),
-    paddingSmall: getValueUsingPixelRatio(7, 8),
     formErrorLineHeight: getValueUsingPixelRatio(18, 23),
     communicationsLinkHeight: getValueUsingPixelRatio(20, 30),
     alternateTextHeight: getValueUsingPixelRatio(20, 24),