Merge remote-tracking branch 'upstream/main' into 68373-improve-prompting

Author: huult

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009020002
-        versionName "9.2.0-2"
+        versionCode 1009020100
+        versionName "9.2.1-0"
         // 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

@@ -336,10 +336,29 @@ Once potential performance bottlenecks are identified, the next step is to optim
 *   Components performing heavy calculations or processing large datasets.
 *   Components subscribing directly to frequently changing data instead of receiving it as props from a parent.
 *   Incorrect or inefficient use of memoization techniques (`React.memo`, `useMemo`, `useCallback`).
-*   Rendering of unnecessary or duplicated child components.
+*   [Rendering of unnecessary or duplicated child components](#rendering-of-unnecessary-or-duplicated-child-components).
 
 After implementing optimizations, it's crucial to validate the changes. Manual comparison of performance metrics can be tedious and prone to bias. It's highly recommended to use tools that allow for objective comparison of traces or metrics before and after changes. This helps in confirming actual performance gains and avoiding regressions in other areas.
 
 The optimization process is often iterative. Small, incremental improvements can accumulate to significant overall gains. When proposing changes, aim for self-contained and predictable modifications to facilitate review and discussion.
 
 Finally, before concluding an investigation, always validate improvements against real-world scenarios. This includes testing on different platforms and with various build configurations (e.g., production builds) to ensure the optimizations hold up in diverse environments. Remember that performance maintenance is a continuous effort, encompassing not just profiling but also adherence to code conventions and real user monitoring.
+
+## Common performance bottlenecks
+### Rendering of unnecessary or duplicated child components
+Since our codebase is very complex, it results in a large DOM tree rendered for the user. This may become a potential performance issue if not handled carefully.
+
+One of the most common issues is related to modals, popovers, and tooltips — elements that may appear on the screen. The problem is that they are usually present in the DOM tree even when initially invisible. Because of this, the initial render time of a screen may increase, ultimately slowing down the app.
+
+The solution is better control of invisible elements, making sure they are not included in the first render. This can be done, e.g., by a simple `return null`, smart usage of `lazy loading`, the `useTransition` hook, or the `<Deferred />` component.
+
+Another issue worth mentioning is unnecessary code execution, especially for elements that are never shown on a specific platform. In theory, we separate the logic between platforms by using index.tsx/index.native.tsx files, but sometimes platform-specific logic may slip in, causing unnecessary execution. For example, this may happen when logic specific to a wide layout (applicable only for desktop/web) is included.
+
+The last common issue is related to the use of `return null`. Sometimes we already know in the parent component that a specific child should not be rendered. In such cases, we unnecessarily execute the child's internal logic (calling hooks, sending requests) only to find out that the whole process was redundant.
+
+Examples:
+- [Add shouldRender check in EducationalTooltip to avoid unnecessary calls](https://github.com/Expensify/App/pull/66052) - avoids rendering invisible components
+- [Remove shouldAdjustScrollView to avoid heavy rerender](https://github.com/Expensify/App/pull/66849) - removes hooks that were called only for Safari logic slowing down the `ReportScreen.tsx`
+- [PopoverWithMeasuredContent optimization for mobile](https://github.com/Expensify/App/pull/68223) - returns early to avoid unnecessary calculations
+- [Reduce confirm modal initial render count](https://github.com/Expensify/App/pull/67518) - returns early to reduce first load cost
+- [Do not render PopoverMenu until it gets opened](https://github.com/Expensify/App/pull/67877) - adds a wrapper to control if `PopoverMenu` should be rendered

contributingGuides/PERFORMANCE.md

@@ -6,7 +6,7 @@
   "dependencies": {
     "electron-context-menu": "^4.1.0",
     "electron-log": "^4.4.8",
-    "electron-updater": "^6.6.6",
+    "electron-updater": "^6.6.7",
     "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },

desktop/package-lock.json

@@ -819,6 +819,7 @@ button {
 
 .article-card {
     @extend .card;
+    align-items: center;
 
     .right-icon {
         display: flex;

desktop/package.json

@@ -0,0 +1,71 @@
+---
+title: How to Get Expensify Travel Support from an Agent
+description: Learn how to contact travel agent support via chat, phone, or email — and how assisted trip fees work.
+keywords: travel agent support, Expensify Travel, assisted booking, trip fees, travel help, Book travel button
+---
+
+Need help booking or changing travel plans? You can contact travel agent support via chat, phone, or email. It’s free to ask questions; fees only apply if a travel agent books or modifies travel on your behalf.
+
+---
+
+# Who can contact travel agent support?
+
+Anyone with access to Expensify Travel can contact travel agent support.
+
+- **Chat:** Click the green chat bubble in the bottom-right corner of your travel page.
+- **Phone:** Call +1-828-731-2962.
+- **Email:** Send a message to **expensifysupport@solutionstravel.com**.
+
+**Note:** Concierge support cannot book or modify trips on your behalf.
+
+---
+
+## How to access the travel tool
+
+- **In New Expensify:** Click the green **+** button in the bottom-left corner of your screen, then select **Book travel**.
+- **In Expensify Classic:** Click **Travel** in the left-hand menu, then select **Book or manage travel**.
+
+**Need to enable travel still?** Reach out to your Account Manager or Concierge to schedule a travel demo and get it enabled for your account.
+
+---
+
+## How assisted trip fees work
+
+You can always ask questions for free. You’ll only be charged a fee if a travel agent books or changes a trip for you.
+
+Here’s a breakdown of the fees:
+
+- **Self-serve trip** (booked or changed on your own): $15  
+- **Assisted trip** (booked or changed by a travel agent): $25  
+- **Already paid $15 but need agent help?** You’ll only be charged the additional $10 difference.
+
+Once you’ve paid the $25 assisted trip fee, you can continue to get help with that trip as often as needed — no extra charges.
+
+**Note:** The assisted trip fee only applies once per trip, no matter how many changes are made by the agent.
+
+---
+
+# FAQ
+
+## Will I be charged for asking questions?
+
+No. You can contact travel agent support anytime to ask about pricing, availability, your itinerary, or general travel questions — it’s completely free unless a travel agent books or changes your trip.
+
+---
+
+## What if I already paid $15 and then need help?
+
+If you start with a self-serve trip ($15) and later ask travel agent support to modify it, you’ll only be charged the $10 difference — for a total of $25.
+
+---
+
+## Can I keep asking for help after I pay the $25 fee?
+
+Yes. Once a trip becomes an assisted trip, you can contact travel agent support as many times as needed for that trip with no additional fees.
+
+---
+
+## What’s the difference between the $15 and $25 trip fees?
+
+- **$15:** If you book or change travel yourself  .
+- **$25:** If you ask a travel agent to do it for you, this includes unlimited support for that trip, including changes.

docs/_sass/_main.scss

@@ -624,6 +624,9 @@
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxMobileEvents/MapboxMobileEvents.framework/MapboxMobileEvents",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Onfido/Onfido.framework/Onfido",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Plaid/LinkKit.framework/LinkKit",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/group-ib-fp/GIBMobileSdk.framework/GIBMobileSdk",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/group-ib-fp/FPAppsCapability.framework/FPAppsCapability",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/group-ib-fp/FPCallCapability.framework/FPCallCapability",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
@@ -636,6 +639,9 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Onfido.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LinkKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GIBMobileSdk.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FPAppsCapability.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FPCallCapability.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;

docs/articles/travel/getting-started/How-to-Get-Expensify-Travel-Support-from-an-Agent.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.0</string>
+	<string>9.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.0.2</string>
+	<string>9.2.1.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify.xcodeproj/project.pbxproj

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.0</string>
+	<string>9.2.1</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.0.2</string>
+	<string>9.2.1.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>