Skip to content

Fix spend rule card page landscape overlap #87678

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
JS00001 merged 7 commits into from
Apr 15, 2026
+34 −23
Merged

Fix spend rule card page landscape overlap #87678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93122fb
Show headerMessage only when eligible cards exist on SpendRuleCardPage
MelvinBot Apr 10, 2026
b1b081c
hide search bar, change button text
luacmartins Apr 10, 2026
dd26b18
dry code
luacmartins Apr 10, 2026
bc1b5d8
Merge branch 'main' into claude-fixSpendRuleCardLandscapeOverlap
luacmartins Apr 14, 2026
fe44fcd
add scrollview
luacmartins Apr 14, 2026
8a830e0
Fix: Use @components/ScrollView instead of react-native ScrollView
MelvinBot Apr 14, 2026
e1ab0ea
fix category page
luacmartins Apr 14, 2026
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
42 changes: 25 additions & 17 deletions src/pages/workspace/rules/SpendRules/SpendRuleCardPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import SelectionList from '@components/SelectionList';
import CardListItem from '@components/SelectionList/ListItem/CardListItem';
import type {AdditionalCardProps} from '@components/SelectionList/ListItem/CardListItem';
Expand Down Expand Up @@ -184,7 +185,8 @@ function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
Navigation.goBack(parentRoute);
};

const headerMessage = getHeaderMessage(listData.length > 0, false, inputValue, countryCode, false);
const hasEligibleCards = eligibleCards.length > 0;
const headerMessage = hasEligibleCards ? getHeaderMessage(listData.length > 0, false, inputValue, countryCode, false) : '';

return (
<AccessOrNotFoundWrapper
Expand Down Expand Up @@ -214,12 +216,16 @@ function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
/>
<SelectionList
canSelectMultiple
textInputOptions={{
headerMessage,
value: inputValue,
label: translate('common.search'),
onChangeText: setInputValue,
}}
textInputOptions={
hasEligibleCards
? {
headerMessage,
value: inputValue,
label: translate('common.search'),
onChangeText: setInputValue,
}
: undefined
}
data={listData}
style={{
listHeaderWrapperStyle: [styles.pt5, styles.pb2],
Expand All @@ -234,19 +240,21 @@ function SpendRuleCardPage({route}: SpendRuleCardPageProps) {
shouldUpdateFocusedIndex
shouldPreventDefaultFocusOnSelectRow={!canUseTouchScreen()}
listEmptyContent={
<BlockingView
icon={illustrations.HandCard}
iconWidth={variables.iconSection}
iconHeight={variables.iconSection}
title={inputValue.trim() ? translate('common.noResultsFound') : translate('workspace.rules.spendRules.noAvailableCards')}
titleStyles={styles.mb2}
subtitle={translate('workspace.rules.spendRules.noAvailableCardsSubtitle')}
subtitleStyle={styles.textSupporting}
/>
<ScrollView contentContainerStyle={[styles.flexGrow1]}>
<BlockingView
icon={illustrations.HandCard}
iconWidth={variables.iconSection}
iconHeight={variables.iconSection}
title={inputValue.trim() ? translate('common.noResultsFound') : translate('workspace.rules.spendRules.noAvailableCards')}
titleStyles={styles.mb2}
subtitle={translate('workspace.rules.spendRules.noAvailableCardsSubtitle')}
subtitleStyle={styles.textSupporting}
/>
</ScrollView>
}
footerContent={
<FormAlertWithSubmitButton
buttonText={translate('common.save')}
buttonText={hasEligibleCards ? translate('common.save') : translate('common.buttonConfirm')}
isAlertVisible={false}
isDisabled={isCardSettingsLoading}
onSubmit={handleSave}
Expand Down
15 changes: 9 additions & 6 deletions src/pages/workspace/rules/SpendRules/SpendRuleCategoryPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import BlockingView from '@components/BlockingViews/BlockingView';
import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import ScreenWrapper from '@components/ScreenWrapper';
import ScrollView from '@components/ScrollView';
import SelectionList from '@components/SelectionList';
import MultiSelectListItem from '@components/SelectionList/ListItem/MultiSelectListItem';
import type {ListItem} from '@components/SelectionList/types';
Expand Down Expand Up @@ -125,12 +126,14 @@ function SpendRuleCategoryPage({route}: SpendRuleCategoryPageProps) {
shouldUpdateFocusedIndex
shouldPreventDefaultFocusOnSelectRow={!canUseTouchScreen()}
listEmptyContent={
<BlockingView
icon={illustrations.Telescope}
iconWidth={variables.emptyListIconWidth}
iconHeight={variables.emptyListIconHeight}
title={translate('common.noResultsFound')}
/>
<ScrollView contentContainerStyle={[styles.flexGrow1]}>
<BlockingView
icon={illustrations.Telescope}
iconWidth={variables.emptyListIconWidth}
iconHeight={variables.emptyListIconHeight}
title={translate('common.noResultsFound')}
/>
</ScrollView>
}
footerContent={
<FormAlertWithSubmitButton
Expand Down
Loading