Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions src/components/ReportActionItem/ActionableItemButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ type ActionableItemButtonsProps = {
styles?: {
text?: StyleProp<TextStyle>;
button?: StyleProp<ViewStyle>;
container?: StyleProp<ViewStyle>;
};
};

Expand All @@ -31,7 +30,7 @@ function ActionableItemButtons(props: ActionableItemButtonsProps) {
const {translate} = useLocalize();

return (
<View style={[styles.gap2, styles.mt2, props.layout === 'horizontal' ? styles.flexRow : [styles.flexColumn, styles.alignItemsStart, props.styles?.container]]}>
<View style={[styles.gap2, styles.mt2, props.layout === 'horizontal' ? styles.flexRow : [styles.flexColumn, styles.alignItemsStart]]}>
{props.items?.map((item) => (
<Button
key={item.key}
Expand Down
30 changes: 7 additions & 23 deletions src/pages/inbox/report/PureReportActionItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1799,13 +1799,9 @@ function PureReportActionItem({

const isConciergeOptions = isConciergeCategoryOptions(action) || isConciergeDescriptionOptions(action);
const actionContainsFollowUps = containsActionableFollowUps(action);
let actionableButtonsNoLines = 1;
if (isConciergeOptions) {
actionableButtonsNoLines = 2;
}
if (actionContainsFollowUps) {
actionableButtonsNoLines = 0;
}
const isPhrasalConciergeOptions = isConciergeOptions || actionContainsFollowUps;
const actionableButtonsNoLines = isPhrasalConciergeOptions ? 3 : 1;

children = (
<MentionReportContext.Provider value={mentionReportContextValue}>
<ShowContextMenuContext.Provider value={contextValue}>
Expand Down Expand Up @@ -1841,24 +1837,12 @@ function PureReportActionItem({
{actionableItemButtons.length > 0 && (
<ActionableItemButtons
items={actionableItemButtons}
layout={
isActionableTrackExpense(action) ||
isConciergeCategoryOptions(action) ||
isConciergeDescriptionOptions(action) ||
isActionableMentionWhisper(action) ||
actionContainsFollowUps
? 'vertical'
: 'horizontal'
}
shouldUseLocalization={!isConciergeOptions && !actionContainsFollowUps}
layout={isActionableTrackExpense(action) || isActionableMentionWhisper(action) || isPhrasalConciergeOptions ? 'vertical' : 'horizontal'}
shouldUseLocalization={!isPhrasalConciergeOptions}
primaryTextNumberOfLines={actionableButtonsNoLines}
styles={{
text: [isConciergeOptions || actionContainsFollowUps ? styles.textAlignLeft : undefined],
button: actionContainsFollowUps ? [styles.actionableItemButton, hovered && styles.actionableItemButtonBackgroundHovered] : undefined,
container: [
actionContainsFollowUps && shouldUseNarrowLayout ? styles.alignItemsStretch : undefined,
actionContainsFollowUps ? styles.mt5 : undefined,
],
text: isPhrasalConciergeOptions ? styles.actionableItemButtonText : undefined,
button: isPhrasalConciergeOptions ? styles.actionableItemButton : undefined,
}}
/>
)}
Expand Down
7 changes: 4 additions & 3 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -936,11 +936,12 @@ const staticStyles = (theme: ThemeColors) =>
paddingTop: 8,
paddingBottom: 8,
alignItems: 'flex-start',
borderRadius: variables.componentBorderRadiusMedium,
borderRadius: 20,
},

actionableItemButtonBackgroundHovered: {
borderColor: theme.buttonPressedBG,
actionableItemButtonText: {
textAlign: 'left',
...wordBreak.breakWord,
},

hoveredComponentBG: {
Expand Down
Loading