Skip to content

Extra space between menu items on the Rules page #69526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amyevans merged 6 commits into from
Sep 4, 2025
Merged

Extra space between menu items on the Rules page #69526

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cc15cf6
Extra space between menu items on the Rules page
dukenv0307 Aug 29, 2025
c85e31e
Merge branch 'main' into fix/69154
dukenv0307 Sep 1, 2025
609c9e5
Merge branch 'main' into fix/69154
dukenv0307 Sep 3, 2025
1c73356
update style
dukenv0307 Sep 3, 2025
6aa57f6
Merge branch 'main' into fix/69154
dukenv0307 Sep 4, 2025
b9f0f91
update minHeight
dukenv0307 Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/pages/workspace/rules/IndividualExpenseRulesSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {getCashExpenseReimbursableMode, setPolicyAttendeeTrackingEnabled, setWor
import {convertToDisplayString} from '@libs/CurrencyUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {ThemeStyles} from '@styles/index';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import type {TranslationPaths} from '@src/languages/types';
import ROUTES from '@src/ROUTES';
Expand Down Expand Up @@ -195,7 +196,7 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection
)}
titleStyles={styles.accountSettingsSectionTitle}
>
<View style={[styles.mt3, styles.gap3]}>
<View style={[styles.mt3]}>
{individualExpenseRulesItems.map((item) => (
<OfflineWithFeedback
pendingAction={item.pendingAction}
Expand All @@ -214,7 +215,7 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection

<View style={[styles.mt3]}>
<OfflineWithFeedback pendingAction={policy?.pendingFields?.eReceipts}>
<View style={[styles.flexRow, styles.mb1, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, {minHeight: variables.h40}]}>
<Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.rules.individualExpenseRules.eReceipts')}</Text>
<Switch
isOn={areEReceiptsEnabled}
Expand All @@ -224,7 +225,7 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection
/>
</View>
</OfflineWithFeedback>
<Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100]}>
<Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.pt1]}>
<Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.eReceiptsHint')}</Text>{' '}
<TextLink
style={[styles.textLabel, styles.link]}
Expand All @@ -237,7 +238,7 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection
</View>
<View style={[styles.mt3]}>
<OfflineWithFeedback pendingAction={policy?.pendingFields?.isAttendeeTrackingEnabled}>
<View style={[styles.flexRow, styles.mb1, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
<View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, {minHeight: variables.h40}]}>
<Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.rules.individualExpenseRules.attendeeTracking')}</Text>
<Switch
isOn={isAttendeeTrackingEnabled}
Expand All @@ -246,7 +247,7 @@ function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSection
/>
</View>
</OfflineWithFeedback>
<Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100]}>
<Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.pt1]}>
<Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.attendeeTrackingHint')}</Text>
</Text>
</View>
Expand Down
Loading