Skip to content

Fix concierge categorize message styling #62085

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
marcochavezf merged 7 commits into from
May 20, 2025
Merged

Fix concierge categorize message styling #62085

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
36dc506
fix concierge categorize message styling
bernhardoj May 15, 2025
f9d51f9
Merge branch 'main' into fix/61384-concierge-categorize-message-styling
bernhardoj May 16, 2025
e431b43
set medium size as the default
bernhardoj May 16, 2025
2e1c85f
Merge branch 'main' into fix/61384-concierge-categorize-message-styling
bernhardoj May 19, 2025
ddded5f
update all actionable button to medium size
bernhardoj May 19, 2025
9fb4065
remove unused prop
bernhardoj May 19, 2025
bb5d23a
tidying up
bernhardoj May 20, 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
4 changes: 1 addition & 3 deletions src/components/ReportActionItem/ActionableItemButtons.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ type ActionableItem = {
key: string;
onPress: () => void;
text: string;
isMediumSized?: boolean;
shouldUseLocalization?: boolean;
};

Expand All @@ -31,8 +30,7 @@ function ActionableItemButtons(props: ActionableItemButtonsProps) {
key={item.key}
onPress={item.onPress}
text={props.shouldUseLocalization ? translate(item.text as TranslationPaths) : item.text}
small={!item.isMediumSized}
medium={item.isMediumSized}
medium
success={item.isPrimary}
/>
))}
Expand Down
5 changes: 5 additions & 0 deletions src/libs/ReportActionsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,11 @@ function getReportActionMessageFragments(action: ReportAction): Message[] {
return [{text: message, html: `<muted-text>${message}</muted-text>`, type: 'COMMENT'}];
}

if (isConciergeCategoryOptions(action)) {

@dominictb dominictb May 15, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@bernhardoj #61384 (comment)

Also FYI - there was a backend change last week that changed the type of message, and it should be COMMENT from now on

@bernhardoj bernhardoj May 16, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It doesn't affect anything here , right?

@dominictb dominictb May 16, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

But it's unnecessary

@bernhardoj bernhardoj May 16, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Oh, I got what you mean. If we don't add this, the text will be muted.

const message = getReportActionMessageText(action);
return [{text: message, html: message, type: 'COMMENT'}];
}

const actionMessage = action.previousMessage ?? action.message;
if (Array.isArray(actionMessage)) {
return actionMessage.filter((item): item is Message => !!item);
Expand Down
5 changes: 0 additions & 5 deletions src/pages/home/report/PureReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,6 @@ function PureReportActionItem({
onPress: () => {
Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
},
isMediumSized: true,
isPrimary: true,
},
];
Expand Down Expand Up @@ -687,31 +686,27 @@ function PureReportActionItem({
onPress: () => {
createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportID, CONST.IOU.ACTION.SUBMIT, action.reportActionID);
},
isMediumSized: true,
},
{
text: 'actionableMentionTrackExpense.categorize',
key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
onPress: () => {
createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID);
},
isMediumSized: true,
},
{
text: 'actionableMentionTrackExpense.share',
key: `${action.reportActionID}-actionableMentionTrackExpense-share`,
onPress: () => {
createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportID, CONST.IOU.ACTION.SHARE, action.reportActionID);
},
isMediumSized: true,
},
{
text: 'actionableMentionTrackExpense.nothing',
key: `${action.reportActionID}-actionableMentionTrackExpense-nothing`,
onPress: () => {
dismissTrackExpenseActionableWhisper(reportID, action);
},
isMediumSized: true,
},
];
}
Expand Down
Loading