Merge branch 'main' into ts-migration/iou

# Conflicts: # src/libs/ReceiptUtils.ts # src/libs/ReportUtils.ts
Expensify · Feb 2, 2024 · 54d0edf · 54d0edf
2 parents a9a4018 + 3a610af
commit 54d0edf
Show file tree

Hide file tree

Showing 37 changed files with 451 additions and 231 deletions.
diff --git a/src/components/OptionRow.tsx b/src/components/OptionRow.tsx
@@ -209,14 +209,14 @@ function OptionRow({
                                         <SubscriptAvatar
                                             mainAvatar={option.icons[0]}
                                             secondaryAvatar={option.icons[1]}
-                                            backgroundColor={hovered ? hoveredBackgroundColor : subscriptColor}
+                                            backgroundColor={hovered && !optionIsFocused ? hoveredBackgroundColor : subscriptColor}
                                             size={CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
                                         <MultipleAvatars
                                             icons={option.icons}
                                             size={CONST.AVATAR_SIZE.DEFAULT}
-                                            secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(hovered ? hoveredBackgroundColor : subscriptColor)]}
+                                            secondAvatarStyle={[StyleUtils.getBackgroundAndBorderStyle(hovered && !optionIsFocused ? hoveredBackgroundColor : subscriptColor)]}
                                             shouldShowTooltip={showTitleTooltip && OptionsListUtils.shouldOptionShowTooltip(option)}
                                         />
                                     ))}

diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -41,6 +41,9 @@ const propTypes = {
     /** Whether referral CTA should be displayed */
     shouldShowReferralCTA: PropTypes.bool,
 
+    /** A method triggered when the user closes the call to action banner */
+    onCallToActionClosed: PropTypes.func,
+
     /** Referral content type */
     referralContentType: PropTypes.string,
 
@@ -53,6 +56,7 @@ const propTypes = {
 const defaultProps = {
     shouldDelayFocus: false,
     shouldShowReferralCTA: false,
+    onCallToActionClosed: () => {},
     referralContentType: CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND,
     safeAreaPaddingBottomStyle: {},
     contentContainerStyles: [],
@@ -68,7 +72,7 @@ class BaseOptionsSelector extends Component {
         this.updateFocusedIndex = this.updateFocusedIndex.bind(this);
         this.scrollToIndex = this.scrollToIndex.bind(this);
         this.selectRow = this.selectRow.bind(this);
-        this.handleReferralModal = this.handleReferralModal.bind(this);
+        this.closeReferralModal = this.closeReferralModal.bind(this);
         this.selectFocusedOption = this.selectFocusedOption.bind(this);
         this.addToSelection = this.addToSelection.bind(this);
         this.updateSearchValue = this.updateSearchValue.bind(this);
@@ -262,8 +266,9 @@ class BaseOptionsSelector extends Component {
         this.props.onChangeText(value);
     }
 
-    handleReferralModal() {
+    closeReferralModal() {
         this.setState((prevState) => ({shouldShowReferralModal: !prevState.shouldShowReferralModal}));
+        this.props.onCallToActionClosed(this.props.referralContentType);
     }
 
     handleFocusIn() {
@@ -652,7 +657,7 @@ class BaseOptionsSelector extends Component {
                     <View style={[this.props.themeStyles.ph5, this.props.themeStyles.pb5, this.props.themeStyles.flexShrink0]}>
                         <ReferralProgramCTA
                             referralContentType={this.props.referralContentType}
-                            onCloseButtonPress={this.handleReferralModal}
+                            onCloseButtonPress={this.closeReferralModal}
                         />
                     </View>
                 )}

diff --git a/src/components/ReferralProgramCTA.tsx b/src/components/ReferralProgramCTA.tsx
@@ -9,6 +9,7 @@ import Icon from './Icon';
 import {Close} from './Icon/Expensicons';
 import {PressableWithoutFeedback} from './Pressable';
 import Text from './Text';
+import Tooltip from './Tooltip';
 
 type ReferralProgramCTAProps = {
     referralContentType:
@@ -44,22 +45,24 @@ function ReferralProgramCTA({referralContentType, onCloseButtonPress = () => {}}
                     {translate(`referralProgram.${referralContentType}.buttonText2`)}
                 </Text>
             </Text>
-            <PressableWithoutFeedback
-                onPress={onCloseButtonPress}
-                onMouseDown={(e) => {
-                    e.preventDefault();
-                }}
-                style={[styles.touchableButtonImage]}
-                role={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                accessibilityLabel={translate('common.close')}
-            >
-                <Icon
-                    src={Close}
-                    height={20}
-                    width={20}
-                    fill={theme.icon}
-                />
-            </PressableWithoutFeedback>
+            <Tooltip text={translate('common.close')}>
+                <PressableWithoutFeedback
+                    onPress={onCloseButtonPress}
+                    onMouseDown={(e) => {
+                        e.preventDefault();
+                    }}
+                    style={[styles.touchableButtonImage]}
+                    role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                    accessibilityLabel={translate('common.close')}
+                >
+                    <Icon
+                        src={Close}
+                        height={20}
+                        width={20}
+                        fill={theme.icon}
+                    />
+                </PressableWithoutFeedback>
+            </Tooltip>
         </PressableWithoutFeedback>
     );
 }

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
@@ -247,6 +247,7 @@ function MoneyRequestView({report, parentReport, parentReportActions, policyCate
                                 thumbnail={receiptURIs.thumbnail}
                                 image={receiptURIs.image}
                                 isLocalFile={receiptURIs.isLocalFile}
+                                filename={receiptURIs.filename}
                                 transaction={transaction}
                                 enablePreviewModal
                                 canEditReceipt={canEditReceipt}

diff --git a/src/components/ReportActionItem/ReportActionItemImage.tsx b/src/components/ReportActionItem/ReportActionItemImage.tsx
@@ -34,6 +34,9 @@ type ReportActionItemImageProps = {
 
     /** whether the receipt can be replaced */
     canEditReceipt?: boolean;
+
+    /** Filename of attachment */
+    filename?: string;
 };
 
 /**
@@ -42,7 +45,7 @@ type ReportActionItemImageProps = {
  * and optional preview modal as well.
  */
 
-function ReportActionItemImage({thumbnail, image, enablePreviewModal = false, transaction, canEditReceipt = false, isLocalFile = false}: ReportActionItemImageProps) {
+function ReportActionItemImage({thumbnail, image, enablePreviewModal = false, transaction, canEditReceipt = false, isLocalFile = false, filename}: ReportActionItemImageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const imageSource = tryResolveUrlFromApiRoot(image ?? '');
@@ -86,7 +89,7 @@ function ReportActionItemImage({thumbnail, image, enablePreviewModal = false, tr
                         isReceiptAttachment
                         canEditReceipt={canEditReceipt}
                         allowDownload
-                        originalFileName={transaction?.filename}
+                        originalFileName={filename}
                     >
                         {({show}) => (
                             <PressableWithoutFocus

diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
@@ -28,22 +28,14 @@ import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, Report, ReportAction} from '@src/types/onyx';
+import type {Report, ReportAction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type PolicyRole = {
-    /** The role of current user */
-    role: Task.PolicyValue | undefined;
-};
-
 type TaskPreviewOnyxProps = {
     /* Onyx Props */
 
     /* current report of TaskPreview */
     taskReport: OnyxEntry<Report>;
-
-    /** The policy of root parent report */
-    rootParentReportpolicy: OnyxEntry<PolicyRole>;
 };
 
 type TaskPreviewProps = WithCurrentUserPersonalDetailsProps &
@@ -70,17 +62,7 @@ type TaskPreviewProps = WithCurrentUserPersonalDetailsProps &
         checkIfContextMenuActive: () => void;
     };
 
-function TaskPreview({
-    taskReport,
-    taskReportID,
-    action,
-    contextMenuAnchor,
-    chatReportID,
-    checkIfContextMenuActive,
-    currentUserPersonalDetails,
-    rootParentReportpolicy,
-    isHovered = false,
-}: TaskPreviewProps) {
+function TaskPreview({taskReport, taskReportID, action, contextMenuAnchor, chatReportID, checkIfContextMenuActive, currentUserPersonalDetails, isHovered = false}: TaskPreviewProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
@@ -123,7 +105,7 @@ function TaskPreview({
                         style={[styles.mr2]}
                         containerStyle={[styles.taskCheckbox]}
                         isChecked={isTaskCompleted}
-                        disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID, rootParentReportpolicy?.role)}
+                        disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID)}
                         onPress={Session.checkIfActionIsAllowed(() => {
                             if (isTaskCompleted) {
                                 Task.reopenTask(taskReport);
@@ -151,9 +133,5 @@ export default withCurrentUserPersonalDetails(
         taskReport: {
             key: ({taskReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`,
         },
-        rootParentReportpolicy: {
-            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID ?? '0'}`,
-            selector: (policy: Policy | null) => ({role: policy?.role}),
-        },
     })(TaskPreview),
 );
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
@@ -28,14 +28,11 @@ import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Policy, Report} from '@src/types/onyx';
+import type {PersonalDetailsList, Report} from '@src/types/onyx';
 
 type TaskViewOnyxProps = {
     /** All of the personal details for everyone */
     personalDetails: OnyxEntry<PersonalDetailsList>;
-
-    /** The policy for the current route */
-    policy: Pick<Policy, 'role'> | null;
 };
 
 type TaskViewProps = TaskViewOnyxProps &
@@ -47,7 +44,7 @@ type TaskViewProps = TaskViewOnyxProps &
         shouldShowHorizontalRule: boolean;
     };
 
-function TaskView({report, policy, shouldShowHorizontalRule, ...props}: TaskViewProps) {
+function TaskView({report, shouldShowHorizontalRule, ...props}: TaskViewProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     useEffect(() => {
@@ -61,7 +58,7 @@ function TaskView({report, policy, shouldShowHorizontalRule, ...props}: TaskView
     );
     const isCompleted = ReportUtils.isCompletedTaskReport(report);
     const isOpen = ReportUtils.isOpenTaskReport(report);
-    const canModifyTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID, policy?.role);
+    const canModifyTask = Task.canModifyTask(report, props.currentUserPersonalDetails.accountID);
     const disableState = !canModifyTask;
     const isDisableInteractive = !canModifyTask || !isOpen;
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
@@ -199,13 +196,6 @@ const TaskViewWithOnyx = withOnyx<TaskViewProps, TaskViewOnyxProps>({
     personalDetails: {
         key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     },
-    policy: {
-        key: ({report}) => {
-            const rootParentReport = ReportUtils.getRootParentReport(report);
-            return `${ONYXKEYS.COLLECTION.POLICY}${rootParentReport ? rootParentReport.policyID : '0'}`;
-        },
-        selector: (policy: OnyxEntry<Policy>) => (policy ? {role: policy.role} : null),
-    },
 })(TaskView);
 
 export default withCurrentUserPersonalDetails(TaskViewWithOnyx);
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
@@ -14,25 +14,22 @@ import Button from './Button';
 type TaskHeaderActionButtonOnyxProps = {
     /** Current user session */
     session: OnyxEntry<OnyxTypes.Session>;
-
-    /** The policy of root parent report */
-    policy: OnyxEntry<OnyxTypes.Policy>;
 };
 
 type TaskHeaderActionButtonProps = TaskHeaderActionButtonOnyxProps & {
     /** The report currently being looked at */
     report: OnyxTypes.Report;
 };
 
-function TaskHeaderActionButton({report, session, policy}: TaskHeaderActionButtonProps) {
+function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? 0, policy?.role)}
+                isDisabled={!Task.canModifyTask(report, session?.accountID ?? 0)}
                 medium
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
                 onPress={Session.checkIfActionIsAllowed(() => (ReportUtils.isCompletedTaskReport(report) ? Task.reopenTask(report) : Task.completeTask(report)))}
@@ -48,10 +45,4 @@ export default withOnyx<TaskHeaderActionButtonProps, TaskHeaderActionButtonOnyxP
     session: {
         key: ONYXKEYS.SESSION,
     },
-    policy: {
-        key: ({report}) => {
-            const rootParentReport = ReportUtils.getRootParentReport(report);
-            return `${ONYXKEYS.COLLECTION.POLICY}${rootParentReport ? rootParentReport.policyID : '0'}`;
-        },
-    },
 })(TaskHeaderActionButton);
diff --git a/src/libs/API/parameters/DismissReferralBannerParams.ts b/src/libs/API/parameters/DismissReferralBannerParams.ts
@@ -0,0 +1,10 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type ContentTypes = ValueOf<typeof CONST.REFERRAL_PROGRAM.CONTENT_TYPES>;
+
+type DismissReferralBannerParams = {
+    type: ContentTypes;
+};
+
+export default DismissReferralBannerParams;
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
@@ -14,6 +14,7 @@ export type {default as ConnectBankAccountWithPlaidParams} from './ConnectBankAc
 export type {default as DeleteContactMethodParams} from './DeleteContactMethodParams';
 export type {default as DeletePaymentBankAccountParams} from './DeletePaymentBankAccountParams';
 export type {default as DeletePaymentCardParams} from './DeletePaymentCardParams';
+export type {default as DismissReferralBannerParams} from './DismissReferralBannerParams';
 export type {default as ExpandURLPreviewParams} from './ExpandURLPreviewParams';
 export type {default as GetMissingOnyxMessagesParams} from './GetMissingOnyxMessagesParams';
 export type {default as GetNewerActionsParams} from './GetNewerActionsParams';

diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
@@ -8,6 +8,7 @@ import type UpdateBeneficialOwnersForBankAccountParams from './parameters/Update
 type ApiRequest = ValueOf<typeof CONST.API_REQUEST_TYPE>;
 
 const WRITE_COMMANDS = {
+    DISMISS_REFERRAL_BANNER: 'DismissReferralBanner',
     UPDATE_PREFERRED_LOCALE: 'UpdatePreferredLocale',
     RECONNECT_APP: 'ReconnectApp',
     OPEN_PROFILE: 'OpenProfile',
@@ -145,6 +146,7 @@ const WRITE_COMMANDS = {
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
 
 type WriteCommandParameters = {
+    [WRITE_COMMANDS.DISMISS_REFERRAL_BANNER]: Parameters.DismissReferralBannerParams;
     [WRITE_COMMANDS.UPDATE_PREFERRED_LOCALE]: Parameters.UpdatePreferredLocaleParams;
     [WRITE_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
     [WRITE_COMMANDS.OPEN_PROFILE]: Parameters.OpenProfileParams;

diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
@@ -550,6 +550,8 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
         lastMessageTextFromReport = ReportUtils.getReimbursementDeQueuedActionMessage(report);
     } else if (ReportActionUtils.isDeletedParentAction(lastReportAction) && ReportUtils.isChatReport(report)) {
         lastMessageTextFromReport = ReportUtils.getDeletedParentActionMessageForChatReport(lastReportAction);
+    } else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? '')) {
+        lastMessageTextFromReport = Localize.translateLocal('parentReportAction.hiddenMessage');
     } else if (ReportUtils.isReportMessageAttachment({text: report?.lastMessageText ?? '', html: report?.lastMessageHtml, translationKey: report?.lastMessageTranslationKey, type: ''})) {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         lastMessageTextFromReport = `[${Localize.translateLocal((report?.lastMessageTranslationKey || 'common.attachment') as TranslationPaths)}]`;

diff --git a/src/libs/ReceiptUtils.ts b/src/libs/ReceiptUtils.ts
@@ -16,6 +16,7 @@ type ThumbnailAndImageURI = {
     thumbnail: ImageSourcePropType | string | null;
     transaction?: Transaction;
     isLocalFile?: boolean;
+    filename?: string;
 };
 
 type FileNameAndExtension = {
@@ -45,16 +46,16 @@ function getThumbnailAndImageURIs(transaction: Transaction, receiptPath: string
     const hasEReceipt = transaction?.hasEReceipt;
 
     if (hasEReceipt) {
-        return {thumbnail: null, image: ROUTES.ERECEIPT.getRoute(transaction.transactionID), transaction};
+        return {thumbnail: null, image: ROUTES.ERECEIPT.getRoute(transaction.transactionID), transaction, filename};
     }
 
     // For local files, we won't have a thumbnail yet
     if (isReceiptImage && typeof path === 'string' && (path.startsWith('blob:') || path.startsWith('file:'))) {
-        return {thumbnail: null, image: path, isLocalFile: true};
+        return {thumbnail: null, image: path, isLocalFile: true, filename};
     }
 
     if (isReceiptImage) {
-        return {thumbnail: `${path}.1024.jpg`, image: path};
+        return {thumbnail: `${path}.1024.jpg`, image: path, filename};
     }
 
     const {fileExtension} = FileUtils.splitExtensionFromFileName(filename) as FileNameAndExtension;
@@ -72,7 +73,7 @@ function getThumbnailAndImageURIs(transaction: Transaction, receiptPath: string
     }
 
     const isLocalFile = typeof path === 'number' || path.startsWith('blob:') || path.startsWith('file:') || path.startsWith('/');
-    return {thumbnail: image, image: path, isLocalFile};
+    return {thumbnail: image, image: path, isLocalFile, filename};
 }
 
 // eslint-disable-next-line import/prefer-default-export