🍒 Cherry pick PR #79162 to staging 🍒

android/app/build.gradle

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009029603
-        versionName "9.2.96-3"
+        versionCode 1009029604
+        versionName "9.2.96-4"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

ios/NewExpensify/Info.plist

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.96.3</string>
+	<string>9.2.96.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.96</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.96.3</string>
+	<string>9.2.96.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/ShareViewController/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.96</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.96.3</string>
+	<string>9.2.96.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.2.96-3",
+  "version": "9.2.96-4",
   "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.",

src/components/AddressForm.tsx

@@ -134,7 +134,7 @@ function AddressForm({
             if (countrySpecificZipRegex) {
                 if (!countrySpecificZipRegex.test(values.zipPostCode?.trim().toUpperCase())) {
                     if (isRequiredFulfilled(values.zipPostCode?.trim())) {
-                        errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat', countryZipFormat);
+                        errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat', {zipFormat: countryZipFormat});
                     } else {
                         errors.zipPostCode = translate('common.error.fieldRequired');
                     }

src/components/ExceededCommentLength.tsx

@@ -20,7 +20,7 @@ function ExceededCommentLength({maxCommentLength = CONST.MAX_COMMENT_LENGTH, isT
             style={[styles.textMicro, styles.textDanger, styles.chatItemComposeSecondaryRow, styles.mlAuto, styles.pl2]}
             numberOfLines={1}
         >
-            {translate(translationKey, numberFormat(maxCommentLength))}
+            {translate(translationKey, {formattedMaxLength: numberFormat(maxCommentLength)})}
         </Text>
     );
 }

src/components/FocusModeNotification.tsx

@@ -31,7 +31,7 @@ function FocusModeNotification({onClose}: FocusModeNotificationProps) {
             onCancel={onClose}
             prompt={
                 <View style={[styles.renderHTML, styles.flexRow]}>
-                    <RenderHTML html={translate('focusModeUpdateModal.prompt', priorityModePageUrl)} />
+                    <RenderHTML html={translate('focusModeUpdateModal.prompt', {priorityModePageUrl})} />
                 </View>
             }
             isVisible

src/components/ImportColumn.tsx

@@ -178,7 +178,7 @@ function ImportColumn({column, columnName, columnRoles, columnIndex, shouldShowD
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want this effect to run again
     }, []);
 
-    const columnHeader = containsHeader ? column.at(0) : translate('spreadsheet.column', columnName);
+    const columnHeader = containsHeader ? column.at(0) : translate('spreadsheet.column', {name: columnName});
 
     return (
         <View style={[styles.importColumnCard, styles.mt4]}>

src/components/ImportSpreadsheetConfirmModal.tsx

@@ -32,7 +32,7 @@ function ImportSpreadsheetConfirmModal({isVisible, closeImportPageAndModal, onMo
         }
         const title = spreadsheet.importFinalModal.titleKey ? translate(spreadsheet.importFinalModal.titleKey) : '';
         const prompt = spreadsheet.importFinalModal.promptKey
-            ? translate(spreadsheet.importFinalModal.promptKey, ...(spreadsheet.importFinalModal.promptKeyParams as TranslationParameters<typeof spreadsheet.importFinalModal.promptKey>))
+            ? translate(spreadsheet.importFinalModal.promptKey, spreadsheet.importFinalModal.promptKeyParams as TranslationParameters<typeof spreadsheet.importFinalModal.promptKey>[0])
             : '';
         setTitleText(title);
         setPromptText(prompt);

src/components/UploadFile.tsx

@@ -83,7 +83,7 @@ function UploadFile({
         }
 
         if (fileLimit && resultedFiles.length > 0 && resultedFiles.length > fileLimit) {
-            setError(translate('attachmentPicker.tooManyFiles', fileLimit));
+            setError(translate('attachmentPicker.tooManyFiles', {fileLimit}));
             return;
         }