Skip to content

Show View button instead of status badge in Action column for Paid/Done reports #84626

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
carlosmiceli merged 6 commits into from
Mar 17, 2026
Merged

Show View button instead of status badge in Action column for Paid/Done reports #84626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3923237
Show View button instead of status badge in Action column for Paid/Do…
MelvinBot Mar 9, 2026
6f73abe
Fix: Run Prettier on ActionCell to fix formatting
MelvinBot Mar 9, 2026
0a31bff
Fix: Prettier formatting in ActionCell
MelvinBot Mar 9, 2026
8afac87
Merge remote-tracking branch 'origin/claude-removeDuplicateStatusBadg…
MelvinBot Mar 9, 2026
b71b810
Remove unused BadgeActionCell component
MelvinBot Mar 10, 2026
551ce46
Remove unused isLargeScreenWidth prop from ActionCell
MelvinBot Mar 10, 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
50 changes: 0 additions & 50 deletions src/components/SelectionListWithSections/Search/ActionCell/BadgeActionCell.tsx
View file
Open in desktop

This file was deleted.

26 changes: 5 additions & 21 deletions src/components/SelectionListWithSections/Search/ActionCell/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
import actionTranslationsMap from './actionTranslationsMap';
import BadgeActionCell from './BadgeActionCell';
import PayActionCell from './PayActionCell';

type ActionCellProps = {
action?: SearchTransactionAction;
isLargeScreenWidth?: boolean;
isSelected?: boolean;
goToItem: () => void;
isChildListItem?: boolean;
parentAction?: string;
isLoading?: boolean;
policyID?: string;
reportID?: string;
Expand All @@ -27,11 +24,9 @@ type ActionCellProps = {

function ActionCell({
action = CONST.SEARCH.ACTION_TYPES.VIEW,
isLargeScreenWidth = true,
isSelected = false,
goToItem,
isChildListItem = false,
parentAction = '',
isLoading = false,
policyID = '',
reportID = '',
Expand All @@ -44,24 +39,13 @@ function ActionCell({
const styles = useThemeStyles();
const {isOffline} = useNetwork();

const shouldUseViewAction = action === CONST.SEARCH.ACTION_TYPES.VIEW || (parentAction === CONST.SEARCH.ACTION_TYPES.PAID && action === CONST.SEARCH.ACTION_TYPES.PAID);
const isBadgeAction = !isChildListItem && ((parentAction !== CONST.SEARCH.ACTION_TYPES.PAID && action === CONST.SEARCH.ACTION_TYPES.PAID) || action === CONST.SEARCH.ACTION_TYPES.DONE);
const shouldUseViewAction = action === CONST.SEARCH.ACTION_TYPES.VIEW || action === CONST.SEARCH.ACTION_TYPES.PAID || action === CONST.SEARCH.ACTION_TYPES.DONE;

if (isBadgeAction) {
return (
<BadgeActionCell
action={action}
isLargeScreenWidth={isLargeScreenWidth}
shouldDisablePointerEvents={shouldDisablePointerEvents}
/>
);
}

if (action === CONST.SEARCH.ACTION_TYPES.VIEW || shouldUseViewAction || isChildListItem) {
const text = isChildListItem ? translate(actionTranslationsMap[CONST.SEARCH.ACTION_TYPES.VIEW]) : translate(actionTranslationsMap[action]);
if (shouldUseViewAction || isChildListItem) {
const text = translate(actionTranslationsMap[CONST.SEARCH.ACTION_TYPES.VIEW]);
const buttonInnerStyles = isSelected ? styles.buttonDefaultSelected : {};

return isLargeScreenWidth ? (
return (
<Button
testID="ActionCell"
text={text}
Expand All @@ -77,7 +61,7 @@ function ActionCell({
isNested
sentryLabel={CONST.SENTRY_LABEL.SEARCH.ACTION_CELL_VIEW}
/>
) : null;
);
}

if (action === CONST.SEARCH.ACTION_TYPES.PAY) {
Expand Down
1 change: 0 additions & 1 deletion src/components/TransactionItemRow/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ function TransactionItemRow({
action={transactionItem.action}
isSelected={isSelected}
isChildListItem={isReportItemChild}
parentAction={transactionItem.parentTransactionID}
goToItem={onButtonPress}
isLoading={isActionLoading}
reportID={transactionItem.reportID}
Expand Down
Loading