fix: resolve conflicts

Author: koko57

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016004
-        versionName "9.1.60-4"
+        versionCode 1009016200
+        versionName "9.1.62-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

@@ -1,11 +1,13 @@
 ---
-title: Suggested Search
-description: Learn how Suggested Search simplifies submitting, approving, paying, and exporting expense reports in New Expensify.
-keywords: [Suggested Search, Submit, Approve, Pay, Export, New Expensify, To-do, LHN, batch processing, filters, expense report actions]
+
+title: Suggested-Search.md
+description: Learn how Suggested Search simplifies submitting, approving, or paying expense reports in New Expensify.
+keywords: [Suggested Search, Submit, Approve, Pay, New Expensify, To-do, LHN, batch processing, filters, expense report actions]
+
 ---
 <div id="new-expensify" markdown="1">
 
-Suggested Search helps you quickly take action on expense reports you need to submit, approve, pay, or export, all tailored to your role in a workspace.
+Suggested Search helps you quickly take action on expense reports you need to submit, approve, or pay, all tailored to your role in a workspace.
 
 ---
 
@@ -14,10 +16,10 @@ Suggested Search helps you quickly take action on expense reports you need to su
 **Navigation: Left-hand Menu > Reports > Expense Reports > Suggested Search**.
 
 Suggested Search surfaces key report actions in your **Reports** page so you can:
-- Submit any expenses that are waiting for you to action them.
-- Approve reports that need your review.
-- Pay approved reports ready for reimbursement.
-- Export finalized reports to accounting platforms.
+- Submit expenses waiting on you
+- Approve reports that need your review
+- Pay approved reports ready for reimbursement
+
 
 These shortcuts are personalized based on your role and workspace configuration, helping you process reports in batches without an advanced search.
 
@@ -31,40 +33,6 @@ Depending on your role, you’ll see shortcuts like:
 - **Submit** – Reports you’ve drafted and need to submit.
 - **Approve** – Reports awaiting your review.
 - **Pay** – Reports ready for reimbursement.
-- **Export** – Reports ready for accounting export (e.g., to QuickBooks).
-
----
-
-# Workflow Breakdown
-
-Here’s how these actions are usually completed manually and how Suggested Search streamlines them for you.
-
-## Submit
-
-1. Go to **Reports > Expense Reports**.
-2. Click the **Drafts** tab.
-3. Use the **Filter** to select `From: yourself`.
-4. View and submit your draft reports.
-
-## Approve
-
-1. Go to **Reports > Expense Reports**.
-2. Click the **Outstanding** tab.
-3. Use the **Filter** to select `To: yourself`.
-4. View reports that need your approval.
-
-## Pay
-
-1. Go to **Reports > Expense Reports**.
-2. Click the **Approved** tab.
-3. Use the **Filter** to select `To: yourself`.
-4. View approved reports ready for payment.
-
-## Export
-
-1. Go to **Reports > Expense Reports**.
-2. In the search bar, enter: `status:approved,paid,done`.
-3. View finalized reports eligible for export.
 
 ---
 
@@ -86,10 +54,6 @@ Here’s how these actions are usually completed manually and how Suggested Sear
 - See **Pay** for reports ready to reimburse.
 - See a celebratory message (e.g., “All reports paid!”) when cleared.
 
-## Admins (Exports)
-- See **Export** for reports eligible for accounting export (e.g., to QuickBooks Online).
-- Filter uses `exported:never` to show only unexported reports.
-
 ---
 
 # Best Practices
@@ -102,7 +66,7 @@ Here’s how these actions are usually completed manually and how Suggested Sear
 
 # FAQ
 
-## What if I don't see the Submit, Approve, Pay, or Export options?
+## What if I don't see the Submit, Approve, or Pay options?
 
 Suggested searches only appear when:
 - You have reports that require those actions.
@@ -115,6 +79,6 @@ Not yet. The **Workspace filter** is currently single-select. Multi-workspace su
 ## What is the difference between Explore and To-do?
 
 - **Explore** = General browsing (e.g., Expenses, Chats)
-- **To-do** = Personalized actions based on your role (e.g., Submit, Approve, Pay, Export)
+- **To-do** = Personalized actions based on your role (e.g., Submit, Approve, Pay)
 
 </div>

docs/articles/new-expensify/reports-and-expenses/Suggested-Search.md

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.60</string>
+	<string>9.1.62</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.60.4</string>
+	<string>9.1.62.0</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.60</string>
+	<string>9.1.62</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.60.4</string>
+	<string>9.1.62.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -2522,7 +2522,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.287):
+  - RNLiveMarkdown (0.1.288):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -3487,7 +3487,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 66e593addd8952725107cfaa4f5e3378e946b541
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: dd1f4716a874608a541942fb25d2b9973592bf19
+  RNLiveMarkdown: c5eb96d42d1f695dc6da2d2d38064259bc6abe22
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: 1d313fe5d7d18845b3015ffd6994e0c81afbffcd
   RNNitroSQLite: 0243d91c6662d8a334fb4953c969b82884ac6c68

ios/Podfile.lock

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.1.60</string>
+	<string>9.1.62</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.60.4</string>
+	<string>9.1.62.0</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.60-4",
+  "version": "9.1.62-0",
   "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.",
@@ -84,7 +84,7 @@
     "@dotlottie/react-player": "^1.6.3",
     "@expensify/react-native-background-task": "file:./modules/background-task",
     "@expensify/react-native-hybrid-app": "file:./modules/hybrid-app",
-    "@expensify/react-native-live-markdown": "0.1.287",
+    "@expensify/react-native-live-markdown": "0.1.288",
     "@expensify/react-native-wallet": "file:modules/expensify-react-native-wallet.tgz",
     "@expo/metro-runtime": "^4.0.1",
     "@firebase/app": "^0.10.10",

package-lock.json

@@ -12,6 +12,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate';
 import {close} from '@libs/actions/Modal';
 import {getLatestError} from '@libs/ErrorUtils';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils';
 import TextWithEmojiFragment from '@pages/home/report/comment/TextWithEmojiFragment';
 import variables from '@styles/variables';
@@ -204,7 +205,7 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
                                         numberOfLines={1}
                                         style={[styles.textBold, styles.textLarge, styles.flexShrink1, styles.lineHeightXLarge]}
                                     >
-                                        {displayName}
+                                        {formatPhoneNumber(displayName)}
                                     </Text>
                                 )}
                                 {!!canSwitchAccounts && (