resolve conflicts

Author: luacmartins

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009016400
-        versionName "9.1.64-0"
+        versionCode 1009016403
+        versionName "9.1.64-3"
         // 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

@@ -99,9 +99,9 @@ Admins manage workspace settings, reports, and approvals. The table below shows
 ## Steps to Assign Admins:
 
 <ol type="a">
-   <li>Click <b>Members</b>b> in the left menu.</li>
+   <li>Click <b>Members</b> in the left menu.</li>
    <li>Select a member’s name.</li>
-   <li>Click <b>Role</b>b> and set them as <b>Admin</b>b>.</li>
+   <li>Click <b>Role</b> and set them as <b>Admin</b>.</li>
 </ol>
 
 # 6. Set Up Approval Workflows

docs/articles/new-expensify/getting-started/Create-a-company-workspace.md

@@ -1,19 +1,19 @@
 ---
 title: Distance Expenses
-description: Learn how to create a distance expense in Expensify and expense mileage reimbursement.
-keywords: [New Expensify, distance expense, mileage reimbursement, create expense, map route, add stops, calculate distance, workspace submission, expense money]
+description: Learn how to create a distance expense and how the reimbursement rate is determined in New Expensify.
+keywords: [New Expensify, distance expense, mileage reimbursement, create expense, distance rate, workspace policy, personal policy, map route, reimbursement rate]
 ---
 <div id="new-expensify" markdown="1">
 
-Expensify makes it easy to expense mileage using a built-in map. You can create and send a distance expense directly from the web, desktop, or mobile app.
+Expensify makes it easy to submit mileage expenses using a built-in map, whether you're on the web, desktop, or mobile app. This guide explains how to create a distance expense and how the reimbursement rate is determined.
 
 ---
 
 # Create and Send a Distance Expense
 
 To submit a mileage-based expense:
 
-1. **From the left-hand menu**, click the green **+** button and select **Create expense**.
+1. From the left-hand menu, click the green **+** button and select **Create expense**.
 2. Select **Distance** from the top row.
 3. Enter your **Start** and **Finish** locations.
    - To include additional stops, click **Add stop**.
@@ -30,14 +30,41 @@ A Workspace Admin will be notified of the expense and, depending on your workspa
 
 ---
 
+# How Reimbursement Rates Are Determined
+
+## Submitting to a workspace
+
+If you're submitting the expense to a workspace:
+
+- You'll choose from the distance rates that are enabled on that workspace.
+- The **Workspace Admin** manages available rates.
+- The **unit** (miles or kilometers) depends on the workspace’s distance unit setting.
+
+[Learn how to manage distance rates as a Workspace Admin](https://help.expensify.com/articles/new-expensify/reports-and-expenses/Managing-Distance-Rates)
+
+## Not submitting to a workspace
+
+If you're not submitting to a workspace (e.g., personal tracking):
+
+- Expensify will apply a **default rate** based on your **reporting currency**.
+   - Example: For USD, the rate is based on the current IRS reimbursement rate and uses **miles**.
+   - Other currencies use sensible defaults determined by Expensify’s internal research.
+- You can’t customize this rate unless you upgrade to a workspace.
+- Default distance rates are updated annually.
+
+---
+
 # FAQ
 
 ## Is there an easy way to reuse recent locations?
+
 Yes! When selecting the **Start** and **Finish** addresses, recently used locations will appear for quick selection.
 
 ## How do I create a round-trip expense?
-To create a round-trip distance expense, enter the same location for both the starting point and destination, and add one or more waypoints in between. 
 
-For example, if you're starting and ending in San Francisco but making a stop in Los Angeles, you’d enter: **San Francisco → Los Angeles → San Francisco**.
+To create a round-trip distance expense, enter the same location for both the starting point and destination, and add one or more waypoints in between.
+
+For example, if you're starting and ending in San Francisco but making a stop in Los Angeles, enter:  
+**San Francisco → Los Angeles → San Francisco**
 
 </div>

docs/articles/new-expensify/reports-and-expenses/Distance-Expenses.md

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

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.64.0</string>
+	<string>9.1.64.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.64.0</string>
+	<string>9.1.64.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

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

@@ -440,14 +440,15 @@ const ROUTES = {
         getRoute: (
             reportID: string | undefined,
             attachmentID: string | undefined,
-            type: ValueOf<typeof CONST.ATTACHMENT_TYPE>,
+            type: ValueOf<typeof CONST.ATTACHMENT_TYPE> | undefined,
             url: string,
             accountID?: number,
             isAuthTokenRequired?: boolean,
             fileName?: string,
             attachmentLink?: string,
             hashKey?: number,
         ) => {
+            const typeParam = type ? `&type=${type}` : '';
             const reportParam = reportID ? `&reportID=${reportID}` : '';
             const accountParam = accountID ? `&accountID=${accountID}` : '';
             const authTokenParam = isAuthTokenRequired ? '&isAuthTokenRequired=true' : '';
@@ -456,9 +457,7 @@ const ROUTES = {
             const attachmentIDParam = attachmentID ? `&attachmentID=${attachmentID}` : '';
             const hashKeyParam = hashKey ? `&hashKey=${hashKey}` : '';
 
-            return `attachment?source=${encodeURIComponent(url)}&type=${
-                type as string
-            }${reportParam}${attachmentIDParam}${accountParam}${authTokenParam}${fileNameParam}${attachmentLinkParam}${hashKeyParam}` as const;
+            return `attachment?source=${encodeURIComponent(url)}${typeParam}${reportParam}${attachmentIDParam}${accountParam}${authTokenParam}${fileNameParam}${attachmentLinkParam}${hashKeyParam}` as const;
         },
     },
     REPORT_PARTICIPANTS: {