Merge branch 'main' into expo-image

src/CONST.ts

@@ -961,6 +961,7 @@ const CONST = {
     ATTACHMENT_SOURCE_ATTRIBUTE: 'data-expensify-source',
     ATTACHMENT_PREVIEW_ATTRIBUTE: 'src',
     ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE: 'data-name',
+    ATTACHMENT_LOCAL_URL_PREFIX: ['blob:', 'file:'],
 
     ATTACHMENT_PICKER_TYPE: {
         FILE: 'file',

src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js

@@ -56,6 +56,7 @@ function BaseAnchorForCommentsOnly({onPressIn, onPressOut, href = '', rel = '',
     return (
         <PressableWithSecondaryInteraction
             inline
+            suppressHighlighting
             style={[styles.cursorDefault, StyleUtils.getFontSizeStyle(style.fontSize)]}
             onSecondaryInteraction={(event) => {
                 ReportActionContextMenu.showContextMenu(

src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.js

@@ -54,7 +54,7 @@ function extractAttachmentsFromReport(parentReportAction, reportActions, transac
 
             if (TransactionUtils.hasReceipt(transaction)) {
                 const {image} = ReceiptUtils.getThumbnailAndImageURIs(transaction);
-                const isLocalFile = typeof image === 'string' && (image.startsWith('blob:') || image.startsWith('file:'));
+                const isLocalFile = typeof image === 'string' && _.some(CONST.ATTACHMENT_LOCAL_URL_PREFIX, (prefix) => image.startsWith(prefix));
                 attachments.unshift({
                     source: tryResolveUrlFromApiRoot(image),
                     isAuthTokenRequired: !isLocalFile,

src/components/PressableWithSecondaryInteraction/pressableWithSecondaryInteractionPropTypes.js

@@ -51,6 +51,9 @@ const propTypes = {
 
     /** Whether the view needs to be rendered offscreen (for Android only) */
     needsOffscreenAlphaCompositing: PropTypes.bool,
+
+    /** Whether the text has a gray highlights on press down (for IOS only) */
+    suppressHighlighting: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -63,6 +66,7 @@ const defaultProps = {
     activeOpacity: 1,
     enableLongPressWithHover: false,
     needsOffscreenAlphaCompositing: false,
+    suppressHighlighting: false,
 };
 
 export {propTypes, defaultProps};

src/libs/actions/IOU.js

@@ -2936,6 +2936,8 @@ function navigateToNextPage(iou, iouType, report, path = '') {
                       .map((accountID) => ({accountID, selected: true}))
                       .value();
             setMoneyRequestParticipants(participants);
+            resetMoneyRequestCategory();
+            resetMoneyRequestTag();
         }
         Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(iouType, report.reportID));
         return;

src/libs/fileDownload/index.js

@@ -1,6 +1,8 @@
+import _ from 'lodash';
 import * as ApiUtils from '@libs/ApiUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
 import * as FileUtils from './FileUtils';
 
 /**
@@ -11,7 +13,7 @@ import * as FileUtils from './FileUtils';
  */
 export default function fileDownload(url, fileName) {
     const resolvedUrl = tryResolveUrlFromApiRoot(url);
-    if (!resolvedUrl.startsWith(ApiUtils.getApiRoot())) {
+    if (!resolvedUrl.startsWith(ApiUtils.getApiRoot()) && !_.some(CONST.ATTACHMENT_LOCAL_URL_PREFIX, (prefix) => resolvedUrl.startsWith(prefix))) {
         // Different origin URLs might pose a CORS issue during direct downloads.
         // Opening in a new tab avoids this limitation, letting the browser handle the download.
         Link.openExternalLink(url);

src/pages/iou/steps/MoneyRequestConfirmPage.js

@@ -84,11 +84,6 @@ function MoneyRequestConfirmPage(props) {
     const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(props.report)), [props.report]);
     const isManualRequestDM = props.selectedTab === CONST.TAB.MANUAL && iouType === CONST.IOU.TYPE.REQUEST;
 
-    useEffect(() => {
-        IOU.resetMoneyRequestCategory();
-        IOU.resetMoneyRequestTag();
-    }, []);
-
     useEffect(() => {
         const policyExpenseChat = _.find(participants, (participant) => participant.isPolicyExpenseChat);
         if (policyExpenseChat) {

src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsPage.js

@@ -87,6 +87,8 @@ function MoneyRequestParticipantsPage({iou, selectedTab, route, transaction}) {
 
     const navigateToConfirmationStep = (moneyRequestType) => {
         IOU.setMoneyRequestId(moneyRequestType);
+        IOU.resetMoneyRequestCategory();
+        IOU.resetMoneyRequestTag();
         Navigation.navigate(ROUTES.MONEY_REQUEST_CONFIRMATION.getRoute(moneyRequestType, reportID));
     };
 

src/pages/settings/InitialSettingsPage.js

@@ -173,6 +173,7 @@ function InitialSettingsPage(props) {
             .filter((policy) => PolicyUtils.shouldShowPolicy(policy, props.network.isOffline))
             .sortBy((policy) => policy.name.toLowerCase())
             .map((policy) => ({
+                id: policy.id,
                 source: policy.avatar || ReportUtils.getDefaultWorkspaceAvatar(policy.name),
                 name: policy.name,
                 type: CONST.ICON_TYPE_WORKSPACE,
@@ -325,12 +326,6 @@ function InitialSettingsPage(props) {
         );
     }, [getDefaultMenuItems, props.betas, props.userWallet.currentBalance, translate, isExecuting, singleExecution]);
 
-    // On the very first sign in or after clearing storage these
-    // details will not be present on the first render so we'll just
-    // return nothing for now.
-    if (_.isEmpty(props.currentUserPersonalDetails)) {
-        return null;
-    }
     const headerContent = (
         <View style={[styles.avatarSectionWrapper, styles.justifyContentCenter]}>
             {_.isEmpty(props.currentUserPersonalDetails) || _.isUndefined(props.currentUserPersonalDetails.displayName) ? (