Skip to content
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

Jump to bottom

[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

Merged
merged 4 commits into from
Jul 4, 2024
Merged

[CP Staging] fix: Categories - The subtitle under 'Members must categorize all expenses' contains 'undefined'. #44866

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e5aa05
fix: Categories - The subtitle under 'Members must categorize all exp…
Krishna2323 Jul 4, 2024
ecd93c0
Merge branch 'Expensify:main' into krishna2323/issue/44826
Krishna2323 Jul 4, 2024
72a1986
minor updates.
Krishna2323 Jul 4, 2024
5158ef1
merge main.
Krishna2323 Jul 4, 2024
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
2 changes: 1 addition & 1 deletion src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
<View style={styles.flexGrow1}>
<ToggleSettingOptionRow
title={translate('workspace.categories.requiresCategory')}
subtitle={toggleSubtitle}
subtitle={isConnectedToAccounting ? toggleSubtitle : undefined}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would make more sense to make toggleSubtitle undefined than doing it here, can you update accordingly please

Copy link
Contributor Author

@Krishna2323 Krishna2323 Jul 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@allgandalf, can you pls check now. Sorry haven't pulled main branch yet, just a min.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

haha

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@allgandalf, pls check now.

switchAccessibilityLabel={toggleSubtitle}
isActive={policy?.requiresCategory ?? false}
onToggle={updateWorkspaceRequiresCategory}
Expand Down
Loading