Merge remote-tracking branch 'upstream/main' into 83834-migrate-workspace-tags-settings-per-diem

Author: huult

Mobile-Expensify

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036000
-        versionName "9.3.60-0"
+        versionCode 1009036001
+        versionName "9.3.60-1"
         // 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"

android/app/build.gradle

@@ -61,9 +61,9 @@ Your file must include at least the following columns:
 
 You’ll see an error message and won’t be able to proceed until the issue is resolved.
 
-## Can I import additional spreadsheet later on the same card entry? 
+## Can I import additional transactions to the same card?
 
-No. To import additional transactions, you must repeat the import process.
+Yes. You can simply repeat the import process.
 
 ## Can I delete personal card spreadsheet imports? 
 

docs/articles/new-expensify/connect-credit-cards/Import-Personal-Card-Transactions-From-a-Spreadsheet.md

@@ -33,7 +33,7 @@ Home includes:
 - **Time-sensitive alerts** (when applicable)
 - **For you**
 - **Spend over time** (when applicable)
-- **Discover**
+- **Discover** (when applicable)
 - **Announcements**
 - **Assigned cards** (when applicable)
 
@@ -85,6 +85,8 @@ The **Discover** section helps you get familiar with things you can do in Expens
 
 This section includes a short demo that introduces key areas of the app and shows how different parts fit together. This can be helpful when you’re getting started or returning after some time away.
 
+Once you’ve watched the demo, the **Discover** section is automatically hidden from Home.
+
 ---
 
 ## How the Announcements section works on Home
@@ -129,6 +131,10 @@ The **Time-sensitive** section only appears when there is an urgent issue or lim
 
 The **Spend over time** section only appears if you are a Workspace Admin, Auditor, or approver on a paid workspace that has existing transactions. If you don't hold one of these roles, or your workspace has no transactions yet, this section won't be visible.
 
+## Why don’t I see the Discover section?
+
+The **Discover** section only appears until you’ve watched the demo. Once you’ve completed it, the section is automatically hidden from Home.
+
 ## Why don’t I see the Assigned cards section?
 
 The **Assigned cards** section only appears if you have an active **Expensify Card** assigned to you.

docs/articles/new-expensify/getting-started/Expensify-Home-Overview.md

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

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.60</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.60.0</string>
+	<string>9.3.60.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.60</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.60.0</string>
+	<string>9.3.60.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

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

package-lock.json

@@ -72,6 +72,7 @@ import {
     getRenamedAction,
     getRenamedCardFeedMessage,
     getReportActionMessage as getReportActionMessageFromActionsUtils,
+    getReportActionMessageText,
     getReportActionText,
     getSettlementAccountLockedMessage,
     getSubmitsToUpdateMessage,
@@ -472,7 +473,7 @@ function computeReportNameBasedOnReportAction(
         });
     }
     if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.RECEIPT_SCAN_FAILED) {
-        return translate('iou.receiptScanningFailed');
+        return getReportActionMessageText(parentReportAction) || translate('iou.receiptScanningFailed');
     }
 
     if (isReimbursementDeQueuedOrCanceledAction(parentReportAction)) {