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 1009026305
-        versionName "9.2.63-5"
+        versionCode 1009026401
+        versionName "9.2.64-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

@@ -0,0 +1,77 @@
+---
+title: Your Collect Workspace Has Been Upgraded to Control
+description: Your Collect workspaces have been upgraded to Control at no extra cost—learn what changed and what to expect next.
+keywords: [New Expensify, workspace upgrade, Collect to Control, customer appreciation discount, downgrade workspace, billing]
+---
+
+# Your Collect workspaces have been upgraded!
+
+Great news! Your Collect workspaces have been upgraded to Control at no extra cost. 
+
+## Why this change?
+
+We’ve simplified our Collect plan to make it an even better fit for more customers. As a result, some of the features you currently use have moved to the Control plan. To make sure your workflow isn’t disrupted, we’ve proactively upgraded you at no additional cost.
+
+## What this means for you
+
+- **No price increase**: Your upgraded workspaces will stay the same price.  
+- **More functionality**: You’ll enjoy the added features of Control.  
+- **Future workspaces**: Any new workspaces you create will be billed under standard pricing.  
+- **Flexibility**: You can downgrade at any time.  
+
+# FAQ
+
+## Why did my Collect workspace get upgraded to Control?
+
+We upgraded your Collect workspace(s) to Control at no extra cost to you to ensure that you retain access to the features you use when we updated our Collect plan.
+
+## My workspace now shows Control, but my Expensify receipt says Collect. Why?
+
+We upgraded your Collect workspace(s) to Control at no extra cost to you to ensure that you retain access to the features you use when we updated our Collect plan. In Expensify, you will see your workspace(s) as Control workspaces, but in your Expensify receipt, you will see any members as Collect workspace members with a customer appreciation discount. This ensures billing remains the same while providing Control features.
+
+## What is the customer appreciation discount on my Expensify receipt?
+
+This indicates that the users being billed for are members of a workspace that was upgraded from Collect to Control at no additional cost.
+
+## I want to switch back to Collect. How do I downgrade?
+
+No problem! You can downgrade your workspace at any time. Just note that downgrading will remove access to any Control-specific features.
+
+**How to downgrade your Control workspace to Collect**
+
+1. In the navigation menu, select **Workspaces > [Workspace Name] > Overview**.  
+2. Click **Plan type**.  
+3. Select **Collect**, then click **Save**.  
+4. Confirm by clicking **Downgrade workspace**.  
+
+**Note:** Downgrading will remove access to any Control-specific features.
+
+## Will my Collect workspace be upgraded automatically?
+
+Yes, if you are using any of the following advanced features on your Collect workspace:
+
+- You have enabled **Billable expenses**  
+- You have disabled **eReceipts** for your USD company card feed  
+- You have enabled **Public receipt visibility**  
+- You have enabled **Per diem**  
+- You enforce the **Report title formula**  
+- You have enabled **Report fields**  
+- You have connected software other than **QuickBooks Online** and **Xero**  
+- You have enabled **Multi-level tags** not imported from your connected software  
+- You have users with the **Auditor** role  
+- You have enabled **Auto approval**  
+- You have enabled **Prevent self-approval**  
+- You have enabled **Auto reimbursement**  
+- Your employees use **Attendee tracking**  
+- You have more than one **Company card feed**
+- You have set **Cash expenses** to be
+  - Always reimbursable/non-reimbursable
+  - Defaulted to non-reimbursable   
+
+## Will my workspace stay on Collect?
+
+Yes, provided:
+
+- You have neither a Collect nor Control workspace  
+- You have only Control workspace(s)  
+- You have only Collect workspace(s) with none of the above advanced feature(s) enabled  

docs/Hidden/collect-upgrade.md

@@ -83,6 +83,7 @@
 
 /* This input is in #___gcse_0 search bar */
 input#gsc-i-id1.gsc-input {
+    background-image: none !important;
     background-color: var(--color-appBG) !important;
     padding: 15px 0px 0px !important;
     pointer-events: auto;

docs/_sass/_search-bar.scss

@@ -121,7 +121,7 @@ function openSidebar() {
 // Function to adapt & fix cropped SVG viewBox from Google based on viewport (Mobile or Tablet-Desktop)
 function changeSVGViewBoxGoogle() {
     // Get all inline Google SVG elements on the page
-    const svgsGoogle = document.querySelectorAll('svg[data-source]:not(.logo)');
+    const svgsGoogle = document.querySelectorAll('svg[data-source]:not(.logo), .gsc-search-button.gsc-search-button-v2 svg');
 
     Array.from(svgsGoogle).forEach((svg) => {
         // Set the viewBox attribute to '0 0 13 13' to make the svg fit in the mobile view

docs/assets/js/main.js

@@ -23,7 +23,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.63</string>
+	<string>9.2.64</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.2.63.5</string>
+	<string>9.2.64.1</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.2.63</string>
+	<string>9.2.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.63.5</string>
+	<string>9.2.64.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.2.63</string>
+	<string>9.2.64</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.63.5</string>
+	<string>9.2.64.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -2,6 +2,7 @@
 import * as core from '@actions/core';
 import '@shopify/flash-list/jestSetup';
 import type * as RNAppLogs from 'react-native-app-logs';
+import type {ReadDirItem} from 'react-native-fs';
 import 'react-native-gesture-handler/jestSetup';
 import type * as RNKeyboardController from 'react-native-keyboard-controller';
 import mockStorage from 'react-native-onyx/dist/storage/__mocks__';
@@ -69,6 +70,12 @@ jest.mock('react-native-fs', () => ({
                 res();
             }),
     ),
+    readDir: jest.fn(
+        () =>
+            new Promise<ReadDirItem[]>((res) => {
+                res([]);
+            }),
+    ),
     CachesDirectoryPath: jest.fn(),
 }));