Merge branch 'main' into ts-migration/TextLink

Expensify · Dec 7, 2023 · 83504ed · 83504ed
2 parents ddf0d4e + b0268fa
commit 83504ed
Show file tree

Hide file tree

Showing 38 changed files with 380 additions and 366 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001040801
-        versionName "1.4.8-1"
+        versionCode 1001040902
+        versionName "1.4.9-2"
     }
 
     flavorDimensions "default"

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.8</string>
+	<string>1.4.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.8.1</string>
+	<string>1.4.9.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.8</string>
+	<string>1.4.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.8.1</string>
+	<string>1.4.9.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.8-1",
+  "version": "1.4.9-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

diff --git a/src/CONST.ts b/src/CONST.ts
@@ -2807,7 +2807,7 @@ const CONST = {
     HORIZONTAL_SPACER: {
         DEFAULT_BORDER_BOTTOM_WIDTH: 1,
         DEFAULT_MARGIN_VERTICAL: 8,
-        HIDDEN_MARGIN_VERTICAL: 0,
+        HIDDEN_MARGIN_VERTICAL: 4,
         HIDDEN_BORDER_BOTTOM_WIDTH: 0,
     },
 

diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
@@ -62,7 +62,7 @@ function AnchorRenderer(props) {
             key={props.key}
             displayName={displayName}
             // Only pass the press handler for internal links. For public links or whitelisted internal links fallback to default link handling
-            onPress={internalNewExpensifyPath || internalExpensifyPath ? Link.openLink : undefined}
+            onPress={internalNewExpensifyPath || internalExpensifyPath ? () => Link.openLink(attrHref, environmentURL, isAttachment) : undefined}
         >
             <TNodeChildrenRenderer tnode={props.tnode} />
         </AnchorForCommentsOnly>

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
@@ -699,7 +699,13 @@ function MoneyRequestConfirmationList(props) {
                             title={props.iouCategory}
                             description={translate('common.category')}
                             numberOfLinesTitle={2}
-                            onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_CATEGORY.getRoute(props.iouType, props.reportID))}
+                            onPress={() => {
+                                if (props.isEditingSplitBill) {
+                                    Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(props.reportID, props.reportActionID, CONST.EDIT_REQUEST_FIELD.CATEGORY));
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.MONEY_REQUEST_CATEGORY.getRoute(props.iouType, props.reportID));
+                            }}
                             style={[styles.moneyRequestMenuItem]}
                             titleStyle={styles.flex1}
                             disabled={didConfirm}
@@ -713,7 +719,13 @@ function MoneyRequestConfirmationList(props) {
                             title={props.iouTag}
                             description={policyTagListName}
                             numberOfLinesTitle={2}
-                            onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_TAG.getRoute(props.iouType, props.reportID))}
+                            onPress={() => {
+                                if (props.isEditingSplitBill) {
+                                    Navigation.navigate(ROUTES.EDIT_SPLIT_BILL.getRoute(props.reportID, props.reportActionID, CONST.EDIT_REQUEST_FIELD.TAG));
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.MONEY_REQUEST_TAG.getRoute(props.iouType, props.reportID));
+                            }}
                             style={[styles.moneyRequestMenuItem]}
                             disabled={didConfirm}
                             interactive={!props.isReadOnly}

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
@@ -29,6 +29,7 @@ import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import AnimatedEmptyStateBackground from '@pages/home/report/AnimatedEmptyStateBackground';
+import reportActionPropTypes from '@pages/home/report/reportActionPropTypes';
 import iouReportPropTypes from '@pages/iouReportPropTypes';
 import reportPropTypes from '@pages/reportPropTypes';
 import * as StyleUtils from '@styles/StyleUtils';
@@ -51,6 +52,9 @@ const propTypes = {
     /** The expense report or iou report (only will have a value if this is a transaction thread) */
     parentReport: iouReportPropTypes,
 
+    /** The actions from the parent report */
+    parentReportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)),
+
     /** Collection of categories attached to a policy */
     policyCategories: PropTypes.objectOf(categoryPropTypes),
 
@@ -65,6 +69,7 @@ const propTypes = {
 
 const defaultProps = {
     parentReport: {},
+    parentReportActions: {},
     policyCategories: {},
     transaction: {
         amount: 0,
@@ -74,13 +79,13 @@ const defaultProps = {
     policyTags: {},
 };
 
-function MoneyRequestView({report, parentReport, policyCategories, shouldShowHorizontalRule, transaction, policyTags, policy}) {
+function MoneyRequestView({report, parentReport, parentReportActions, policyCategories, shouldShowHorizontalRule, transaction, policyTags, policy}) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {isSmallScreenWidth} = useWindowDimensions();
     const {translate} = useLocalize();
     const {canUseViolations} = usePermissions();
-    const parentReportAction = ReportActionsUtils.getParentReportAction(report);
+    const parentReportAction = parentReportActions[report.parentReportActionID] || {};
     const moneyRequestReport = parentReport;
     const {
         created: transactionDate,
@@ -313,27 +318,33 @@ MoneyRequestView.displayName = 'MoneyRequestView';
 export default compose(
     withCurrentUserPersonalDetails,
     withOnyx({
-        parentReport: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
+        session: {
+            key: ONYXKEYS.SESSION,
         },
         policy: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`,
         },
         policyCategories: {
             key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report.policyID}`,
         },
-        session: {
-            key: ONYXKEYS.SESSION,
+        policyTags: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report.policyID}`,
         },
+        parentReport: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
+        },
+        parentReportActions: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : '0'}`,
+            canEvict: false,
+        },
+    }),
+    withOnyx({
         transaction: {
-            key: ({report}) => {
-                const parentReportAction = ReportActionsUtils.getParentReportAction(report);
+            key: ({report, parentReportActions}) => {
+                const parentReportAction = parentReportActions[report.parentReportActionID];
                 const transactionID = lodashGet(parentReportAction, ['originalMessage', 'IOUTransactionID'], 0);
                 return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
             },
         },
-        policyTags: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report.policyID}`,
-        },
     }),
 )(MoneyRequestView);
diff --git a/src/components/SpacerView.js b/src/components/SpacerView.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
+import usePrevious from '@hooks/usePrevious';
 import stylePropTypes from '@styles/stylePropTypes';
 import * as StyleUtils from '@styles/StyleUtils';
 import CONST from '@src/CONST';
@@ -23,22 +24,30 @@ const defaultProps = {
 };
 
 function SpacerView({shouldShow = true, style = []}) {
-    const marginVertical = useSharedValue(CONST.HORIZONTAL_SPACER.DEFAULT_MARGIN_VERTICAL);
-    const borderBottomWidth = useSharedValue(CONST.HORIZONTAL_SPACER.DEFAULT_BORDER_BOTTOM_WIDTH);
+    const marginVertical = useSharedValue(shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_MARGIN_VERTICAL : CONST.HORIZONTAL_SPACER.HIDDEN_MARGIN_VERTICAL);
+    const borderBottomWidth = useSharedValue(shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_BORDER_BOTTOM_WIDTH : CONST.HORIZONTAL_SPACER.HIDDEN_BORDER_BOTTOM_WIDTH);
+    const prevShouldShow = usePrevious(shouldShow);
+
+    const duration = CONST.ANIMATED_TRANSITION;
     const animatedStyles = useAnimatedStyle(() => ({
-        marginVertical: marginVertical.value,
-        borderBottomWidth: borderBottomWidth.value,
+        borderBottomWidth: withTiming(borderBottomWidth.value, {duration}),
+        marginTop: withTiming(marginVertical.value, {duration}),
+        marginBottom: withTiming(marginVertical.value, {duration}),
     }));
 
     React.useEffect(() => {
-        const duration = CONST.ANIMATED_TRANSITION;
+        if (shouldShow === prevShouldShow) {
+            return;
+        }
         const values = {
             marginVertical: shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_MARGIN_VERTICAL : CONST.HORIZONTAL_SPACER.HIDDEN_MARGIN_VERTICAL,
             borderBottomWidth: shouldShow ? CONST.HORIZONTAL_SPACER.DEFAULT_BORDER_BOTTOM_WIDTH : CONST.HORIZONTAL_SPACER.HIDDEN_BORDER_BOTTOM_WIDTH,
         };
-        marginVertical.value = withTiming(values.marginVertical, {duration});
-        borderBottomWidth.value = withTiming(values.borderBottomWidth, {duration});
-    }, [shouldShow, borderBottomWidth, marginVertical]);
+        marginVertical.value = values.marginVertical;
+        borderBottomWidth.value = values.borderBottomWidth;
+
+        // eslint-disable-next-line react-hooks/exhaustive-deps -- we only need to trigger when shouldShow prop is changed
+    }, [shouldShow, prevShouldShow]);
 
     return <Animated.View style={[animatedStyles, ...StyleUtils.parseStyleAsArray(style)]} />;
 }

diff --git a/src/languages/en.ts b/src/languages/en.ts
@@ -1547,12 +1547,6 @@ export default {
             invitePeople: 'Invite new members',
             genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.',
             pleaseEnterValidLogin: `Please ensure the email or phone number is valid (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
-            user: 'user',
-            users: 'users',
-            invited: 'invited',
-            removed: 'removed',
-            to: 'to',
-            from: 'from',
         },
         inviteMessage: {
             inviteMessageTitle: 'Add message',

diff --git a/src/languages/es.ts b/src/languages/es.ts
@@ -1569,12 +1569,6 @@ export default {
             invitePeople: 'Invitar nuevos miembros',
             genericFailureMessage: 'Se produjo un error al invitar al usuario al espacio de trabajo. Vuelva a intentarlo..',
             pleaseEnterValidLogin: `Asegúrese de que el correo electrónico o el número de teléfono sean válidos (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
-            user: 'usuario',
-            users: 'usuarios',
-            invited: 'invitó',
-            removed: 'eliminó',
-            to: 'a',
-            from: 'de',
         },
         inviteMessage: {
             inviteMessageTitle: 'Añadir un mensaje',

diff --git a/src/libs/Localize/index.ts b/src/libs/Localize/index.ts
@@ -1,7 +1,6 @@
 import * as RNLocalize from 'react-native-localize';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
-import {MessageElementBase, MessageTextElement} from '@libs/MessageElement';
 import Config from '@src/CONFIG';
 import CONST from '@src/CONST';
 import translations from '@src/languages/translations';
@@ -122,48 +121,15 @@ function translateIfPhraseKey(message: MaybePhraseKey): string {
     }
 }
 
-function getPreferredListFormat(): Intl.ListFormat {
-    if (!CONJUNCTION_LIST_FORMATS_FOR_LOCALES) {
-        init();
-    }
-
-    return CONJUNCTION_LIST_FORMATS_FOR_LOCALES[BaseLocaleListener.getPreferredLocale()];
-}
-
 /**
  * Format an array into a string with comma and "and" ("a dog, a cat and a chicken")
  */
-function formatList(components: string[]) {
-    const listFormat = getPreferredListFormat();
-    return listFormat.format(components);
-}
-
-function formatMessageElementList<E extends MessageElementBase>(elements: readonly E[]): ReadonlyArray<E | MessageTextElement> {
-    const listFormat = getPreferredListFormat();
-    const parts = listFormat.formatToParts(elements.map((e) => e.content));
-    const resultElements: Array<E | MessageTextElement> = [];
-
-    let nextElementIndex = 0;
-    for (const part of parts) {
-        if (part.type === 'element') {
-            /**
-             * The standard guarantees that all input elements will be present in the constructed parts, each exactly
-             * once, and without any modifications: https://tc39.es/ecma402/#sec-createpartsfromlist
-             */
-            const element = elements[nextElementIndex++];
-
-            resultElements.push(element);
-        } else {
-            const literalElement: MessageTextElement = {
-                kind: 'text',
-                content: part.value,
-            };
-
-            resultElements.push(literalElement);
-        }
+function arrayToString(anArray: string[]) {
+    if (!CONJUNCTION_LIST_FORMATS_FOR_LOCALES) {
+        init();
     }
-
-    return resultElements;
+    const listFormat = CONJUNCTION_LIST_FORMATS_FOR_LOCALES[BaseLocaleListener.getPreferredLocale()];
+    return listFormat.format(anArray);
 }
 
 /**
@@ -173,5 +139,5 @@ function getDevicePreferredLocale(): string {
     return RNLocalize.findBestAvailableLanguage([CONST.LOCALES.EN, CONST.LOCALES.ES])?.languageTag ?? CONST.LOCALES.DEFAULT;
 }
 
-export {translate, translateLocal, translateIfPhraseKey, formatList, formatMessageElementList, getDevicePreferredLocale};
+export {translate, translateLocal, translateIfPhraseKey, arrayToString, getDevicePreferredLocale};
 export type {PhraseParameters, Phrase, MaybePhraseKey};
diff --git a/src/libs/MessageElement.ts b/src/libs/MessageElement.ts
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -13,6 +13,7 @@ import type {AuthScreensParamList} from '@navigation/types';
 import DemoSetupPage from '@pages/DemoSetupPage';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import DesktopSignInRedirectPage from '@pages/signin/DesktopSignInRedirectPage';
+import SearchInputManager from '@pages/workspace/SearchInputManager';
 import useThemeStyles from '@styles/useThemeStyles';
 import * as App from '@userActions/App';
 import * as Download from '@userActions/Download';
@@ -123,6 +124,8 @@ const modalScreenListeners = {
         Modal.setModalVisibility(true);
     },
     beforeRemove: () => {
+        // Clear search input (WorkspaceInvitePage) when modal is closed
+        SearchInputManager.searchInput = '';
         Modal.setModalVisibility(false);
     },
 };

diff --git a/src/libs/PersonalDetailsUtils.js b/src/libs/PersonalDetailsUtils.js
@@ -197,18 +197,6 @@ function getFormattedAddress(privatePersonalDetails) {
     return formattedAddress.trim().replace(/,$/, '');
 }
 
-/**
- * @param {Object} personalDetail - details object
- * @returns {String | undefined} - The effective display name
- */
-function getEffectiveDisplayName(personalDetail) {
-    if (personalDetail) {
-        return LocalePhoneNumber.formatPhoneNumber(personalDetail.login) || personalDetail.displayName;
-    }
-
-    return undefined;
-}
-
 export {
     getDisplayNameOrDefault,
     getPersonalDetailsByIDs,
@@ -218,5 +206,4 @@ export {
     getFormattedAddress,
     getFormattedStreet,
     getStreetLines,
-    getEffectiveDisplayName,
 };