diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index 14163368cb65..2b0ff847c028 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -22,6 +22,7 @@ import useParentReportAction from '@hooks/useParentReportAction';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useStyleUtils from '@hooks/useStyleUtils';
import useTaskCheckboxAccessibility from '@hooks/useTaskCheckboxAccessibility';
+import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import getButtonState from '@libs/getButtonState';
@@ -57,6 +58,7 @@ function TaskView({report, parentReport, action}: TaskViewProps) {
const icons = useMemoizedLazyExpensifyIcons(['ArrowRight']);
const {translate, formatPhoneNumber} = useLocalize();
const styles = useThemeStyles();
+ const theme = useTheme();
const StyleUtils = useStyleUtils();
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const personalDetails = usePersonalDetails();
@@ -170,76 +172,75 @@ function TaskView({report, parentReport, action}: TaskViewProps) {
disabled={isDisableInteractive}
sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_TITLE}
>
- {({pressed}) => {
+ {() => {
const titleContent = (
- <>
-
-
-
- {!isDisableInteractive && (
-
-
-
- )}
- >
+
+
+
);
return (
- {translate('task.title')}
-
- {
- // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
- if (isActiveTaskEditRoute(report?.reportID)) {
- return;
- }
- updateTaskCheckboxStateForAccessibility(isCompleted);
- if (isCompleted) {
- reopenTask(report, parentReport, currentUserPersonalDetails.accountID, delegateEmail);
- } else {
- completeTask(
- report,
- parentReport?.hasOutstandingChildTask ?? false,
- hasOutstandingChildTask,
- parentReportAction,
- delegateEmail,
- );
- }
- })}
- isChecked={isCompleted}
- style={styles.taskMenuItemCheckbox}
- containerSize={24}
- containerBorderRadius={8}
- caretSize={16}
- accessibilityLabel={taskCheckboxAccessibilityLabel}
- accessibilityHint={taskCheckboxAccessibilityHint}
- disabled={!isTaskActionable}
- sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_CHECKBOX}
- />
- {shouldSplitTaskAccessibilityTargets ? (
- Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.TASK_TITLE.path)))}
- style={[styles.flexRow, styles.flex1]}
- sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_TITLE}
- >
- {titleContent}
-
- ) : (
- titleContent
+
+
+ {translate('task.title')}
+
+ {
+ // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
+ if (isActiveTaskEditRoute(report?.reportID)) {
+ return;
+ }
+ updateTaskCheckboxStateForAccessibility(isCompleted);
+ if (isCompleted) {
+ reopenTask(report, parentReport, currentUserPersonalDetails.accountID, delegateEmail);
+ } else {
+ completeTask(
+ report,
+ parentReport?.hasOutstandingChildTask ?? false,
+ hasOutstandingChildTask,
+ parentReportAction,
+ delegateEmail,
+ );
+ }
+ })}
+ isChecked={isCompleted}
+ style={styles.taskMenuItemCheckbox}
+ containerSize={24}
+ containerBorderRadius={8}
+ caretSize={16}
+ accessibilityLabel={taskCheckboxAccessibilityLabel}
+ accessibilityHint={taskCheckboxAccessibilityHint}
+ disabled={!isTaskActionable}
+ sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_CHECKBOX}
+ />
+ {shouldSplitTaskAccessibilityTargets ? (
+ Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.TASK_TITLE.path)))}
+ style={[styles.flexRow, styles.flex1]}
+ sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_TITLE}
+ >
+ {titleContent}
+
+ ) : (
+ titleContent
+ )}
+
+
+ {!isDisableInteractive && (
+
+
+
)}
diff --git a/src/styles/index.ts b/src/styles/index.ts
index d39ced8344e7..2152204a34c2 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -4758,12 +4758,12 @@ const staticStyles = (theme: ThemeColors) =>
},
taskRightIconContainer: {
- width: variables.componentSizeNormal,
+ width: variables.iconSizeNormal,
marginLeft: 'auto',
- ...spacing.mt1,
...pointerEventsAuto,
...display.dFlex,
- ...flex.alignItemsCenter,
+ ...flex.justifyContentCenter,
+ ...flex.alignItemsEnd,
},
shareCodeContainer: {