Skip to content

Make WorkspaceSettlementFrequencyPage use new SelectionList #72298

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
grgia merged 4 commits into from
Oct 23, 2025
Merged

Make WorkspaceSettlementFrequencyPage use new SelectionList #72298

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
715cadf
Make WorkspaceSettlementRequencyPage use new SelectionList
zfurtak Oct 10, 2025
0837977
Fix lint
zfurtak Oct 10, 2025
b391498
Fix focusing
zfurtak Oct 10, 2025
71c992d
Merge branch 'main' into @zfurtak/migrate-WorkspaceSettlementFrequenc…
zfurtak Oct 17, 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/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import React, {useMemo} from 'react';
import type {ValueOf} from 'type-fest';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import SelectionList from '@components/SelectionListWithSections';
import RadioListItem from '@components/SelectionListWithSections/RadioListItem';
import SelectionList from '@components/SelectionList';
import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
import Text from '@components/Text';
import useDefaultFundID from '@hooks/useDefaultFundID';
import useLocalize from '@hooks/useLocalize';
Expand All @@ -27,7 +27,7 @@ function WorkspaceSettlementFrequencyPage({route}: WorkspaceSettlementFrequencyP
const policyID = route.params?.policyID;
const defaultFundID = useDefaultFundID(policyID);

const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`);
const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${defaultFundID}`, {canBeMissing: true});

const shouldShowMonthlyOption = cardSettings?.isMonthlySettlementAllowed ?? false;
const selectedFrequency = cardSettings?.monthlySettlementDate ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY;
Expand Down Expand Up @@ -77,11 +77,12 @@ function WorkspaceSettlementFrequencyPage({route}: WorkspaceSettlementFrequencyP
/>
<Text style={[styles.mh5, styles.mv4]}>{translate('workspace.expensifyCard.settlementFrequencyDescription')}</Text>
<SelectionList
sections={[{data}]}
data={data}
ListItem={RadioListItem}
onSelectRow={({value}) => updateSettlementFrequency(value)}
initiallyFocusedItemKey={selectedFrequency}
shouldUpdateFocusedIndex
shouldSingleExecuteRowSelect
initiallyFocusedOptionKey={selectedFrequency}
addBottomSafeAreaPadding
/>
</ScreenWrapper>
Expand Down
Loading