Merge main and resolve conflicts

Author: OlGierd03

Mobile-Expensify

@@ -0,0 +1,13 @@
+const useCameraDevice = jest.fn(() => null);
+const useCameraFormat = jest.fn(() => null);
+const useCameraPermission = jest.fn(() => ({hasPermission: false, requestPermission: jest.fn(() => Promise.resolve(false))}));
+
+const Camera = Object.assign(
+    jest.fn(() => null),
+    {
+        getCameraPermissionStatus: jest.fn(() => 'not-determined'),
+        requestCameraPermission: jest.fn(() => Promise.resolve('granted')),
+    },
+);
+
+export {Camera, useCameraDevice, useCameraFormat, useCameraPermission};

__mocks__/react-native-vision-camera.ts

@@ -111,8 +111,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009036801
-        versionName "9.3.68-1"
+        versionCode 1009036803
+        versionName "9.3.68-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

@@ -9,7 +9,9 @@ You can create as many accounts as needed in order to test your changes directly
 
 **Notes**: 
 
-1. When creating test accounts, include a `+` (plus sign) in the email address (e.g., matt+1@gmail.com). This marks the account and their associated workspaces as test accounts in Expensify, ensuring Expensify Guides are not assigned to help with account setup.
+1. When creating test accounts:
+  - Include a `+` (plus sign) in the email address (e.g., matt+1@gmail.com). This marks the account and their associated workspaces as test accounts in Expensify, ensuring Expensify Guides are not assigned to help with account setup.
+  - When testing on live servers with a private domain, stick to a single, consistent test domain. Please avoid generating random or "fake" domains (e.g., asdfkef23@asfdasfwaf.com).
 2. When testing chat functionality in the app please do this between accounts you or your fellow contributors own - **do not test chatting with Concierge**, as this diverts to our customer support team. Thank you.
 3. A member of our customer onboarding team gets auto-assigned to every new policy created by a non-paying account to help them set up. Please **do not interact with these teams, ask for calls, or support on your issues.** If you do need to test functionality inside the defaultRooms (#admins & #announce) for any issues you’re working on, please let them know that you are a contributor and don’t need assistance. They will proceed to ignore the chat.
 4. Please **do not post in any Expensify owned public room for testing** (e.g #exfy-roadmap, #new-expensify-feedback). These rooms include real customers and investors. You can create your own public rooms, or [use this test public room](https://staging.new.expensify.com/r/2091104345528462) on either staging or production. Thanks!

assets/images/camera-flip.svg

@@ -34,8 +34,9 @@ Workspace Admins with an email on a private domain can share a company card feed
 1. Click the navigation tabs (on the left on web, on the bottom on mobile) and select **Workspaces > [Workspace Name]**
 2. Choose **Company cards** to view your company’s card setup page.
  - If you don't see **Company cards**, enable the feature under **More features > Company cards**
-3. Select your existing card connection.
-4. In **From other workspaces**, choose a company card feed to add to the Workspace.
+3. Click **Add cards**.
+4. Select your existing card connection.
+5. In **From other workspaces**, choose a company card feed to add to the Workspace.
 
 ---
 

config/eslint/eslint.seatbelt.tsv

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

contributingGuides/CONTRIBUTING.md

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.68</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.68.1</string>
+	<string>9.3.68.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

docs/articles/new-expensify/connect-credit-cards/Share-a-Company-Card-Connection-Across-Workspaces.md

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.3.68</string>
 	<key>CFBundleVersion</key>
-	<string>9.3.68.1</string>
+	<string>9.3.68.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>