Merge branch 'main' into ts-migration/workspacereimburse-page

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001045500
-        versionName "1.4.55-0"
+        versionCode 1001045503
+        versionName "1.4.55-3"
     }
 
     flavorDimensions "default"

docs/articles/expensify-classic/expenses/Export-expenses.md

@@ -0,0 +1,13 @@
+---
+title: Export expenses
+description: Export expenses to a CSV
+---
+<div id="expensify-classic" markdown="1">
+
+1. Click the **Expenses** tab. 
+2. Select the expenses you want to export by checking the box to the left of each expense or selecting them all. 
+3. Click **Export To** in the right corner and select either:
+   - **Default CSV**: Use Expensify’s default template
+   - **Create new CSV export layout**: Create your own custom CSV template
+
+</div>

docs/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account.md

@@ -0,0 +1,30 @@
+---
+title: Assign billing owner and payment account
+description: Determine who will cover the cost of the workspace and link a payment method
+---
+<div id="expensify-classic" markdown="1">
+
+The person who creates a workspace will automatically be responsible for the billing for that workspace. However, the existing billing owner can transfer the workspace’s billing ownership to any Admin on the workspace. 
+
+{% include info.html %}
+There can only be one billing owner at a time. Assigning a new billing owner will automatically un-assign the existing billing owner. However, billing owners are also workspace admins by default, and the previous billing owner will remain a workspace admin unless manually updated.
+{% include end-info.html %}
+
+# Assign a new billing owner
+
+To assign a new billing owner, **the person who will take over responsibility for the workspace billing must complete the following process**:
+
+1. Hover over Settings, then click **Workspaces**. 
+2. Click the desired workspace name. 
+3. Under Workspace Overview, click **Take Over Billing**. 
+
+# Add or update payment account
+
+Once you take over billing for a workspace, you must add a payment method to your account. 
+
+1. Hover over Settings, then click **Account**. 
+2. Click the **Payments** tab. 
+3. Scroll down to the Payment Details sections and click **Add Payment Card**. 
+4. Enter your credit or debit card information and click **Accept terms, add payment card, and pay $0.00** (the box will only show a balance if one is due).
+
+</div>

docs/articles/expensify-classic/workspaces/Create-a-group-workspace.md

@@ -0,0 +1,24 @@
+---
+title: Create a group workspace
+description: Create a workspace for your team's expense reports
+---
+<div id="expensify-classic" markdown="1">
+
+A workspace is the set of rules, settings, and spending limits for expense reports in your organization. This includes the unique expense categories and tags, budgets, currency and tax settings, etc. that all workspace members will use. A workspace also defines the approval workflow for your employees, as well as the accounting connection if using an accounting software integration.
+
+Here are a couple examples of when you’d want to create different workspaces: 
+
+- You have employees with expense reports in different currencies. For example, you may have a workspace for employees who live in the US and submit their reports in USD and a workspace for employees who live in Canada and submit in CAD.
+- You want to limit specific groups of people to their own set of expense coding options (categories/tags) then they can separate their employees by Sales, Marketing, Support, etc. 
+
+To create a group workspace, 
+
+1. Hover over Settings, then click **Workspaces**. 
+2. Click the **Group** tab on the left. 
+3. Click **New Workspace**. 
+4. Enter the workspace name and select a workspace type. 
+   - **Collect**: Ideal for small groups who only need basic features like expense approvals, reimbursement, corporate card management, and integration options.
+   - **Control**: For groups that need a deeper level of control and configurations, like multi-stage approval workflows, corporate card management, integrations, and more. This is the most popular option. 
+5. Set up your workspace details including the workspace name, expense rules, categories, and more.
+
+</div>

docs/articles/expensify-classic/workspaces/Set-up-your-individual-workspace.md

@@ -0,0 +1,20 @@
+---
+title: Set up your individual workspace
+description: Capture your personal expenses
+---
+<div id="expensify-classic" markdown="1">
+
+All Expensify accounts come with an individual workspace where you can track your personal expenses. If you want to connect your personal expenses to an accounting or travel integration, you can create a group workspace—even if you will be the only person in the group. 
+
+To set up your individual workspace, 
+
+1. Hover over Settings, then click **Workspaces**. 
+2. Click the **Individual** tab on the left. 
+3. Select the policy type that best fits your needs. 
+4. Set up your workspace details including the workspace name, expense rules, categories, and more. 
+
+{% include info.html %}
+You can create multiple group workspaces, but you can only create one individual workspace.
+{% include end-info.html %}
+
+</div>

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.55.0</string>
+	<string>1.4.55.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.55.0</string>
+	<string>1.4.55.3</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.55</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.55.0</string>
+	<string>1.4.55.3</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

@@ -39,7 +39,7 @@ PODS:
     - React-Core
   - Expo (50.0.4):
     - ExpoModulesCore
-  - ExpoImage (1.10.1):
+  - ExpoImage (1.11.0):
     - ExpoModulesCore
     - SDWebImage (~> 5.17.0)
     - SDWebImageAVIFCoder (~> 0.10.1)
@@ -1790,7 +1790,7 @@ SPEC CHECKSUMS:
   EXAV: 09a4d87fa6b113fbb0ada3aade6799f78271cb44
   EXImageLoader: 55080616b2fe9da19ef8c7f706afd9814e279b6b
   Expo: 1e3bcf9dd99de57a636127057f6b488f0609681a
-  ExpoImage: 1cdaa65a6a70bb01067e21ad1347ff2d973885f5
+  ExpoImage: 390c524542b258f8173f475c1cc71f016444a7be
   ExpoImageManipulator: c1d7cb865eacd620a35659f3da34c70531f10b59
   ExpoModulesCore: 96d1751929ad10622773bb729ab28a8423f0dd0c
   FBLazyVector: fbc4957d9aa695250b55d879c1d86f79d7e69ab4
@@ -1921,7 +1921,7 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
   VisionCamera: 0a6794d1974aed5d653d0d0cb900493e2583e35a
-  Yoga: 13c8ef87792450193e117976337b8527b49e8c03
+  Yoga: e64aa65de36c0832d04e8c7bd614396c77a80047
 
 PODFILE CHECKSUM: a431c146e1501391834a2f299a74093bac53b530
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.55-0",
+  "version": "1.4.55-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.",
@@ -102,10 +102,10 @@
     "date-fns-tz": "^2.0.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#615f4a8662cd1abea9fdeee4d04847197c5e36ae",
+    "expensify-common": "git+ssh://[email protected]/Expensify/expensify-common.git#4e020cfa13ffabde14313c92b341285aeb919f29",
     "expo": "^50.0.3",
     "expo-av": "~13.10.4",
-    "expo-image": "1.10.1",
+    "expo-image": "1.11.0",
     "expo-image-manipulator": "11.8.0",
     "htmlparser2": "^7.2.0",
     "idb-keyval": "^6.2.1",
@@ -121,7 +121,7 @@
     "react": "18.2.0",
     "react-beautiful-dnd": "^13.1.1",
     "react-collapse": "^5.1.0",
-    "react-content-loader": "^6.1.0",
+    "react-content-loader": "^7.0.0",
     "react-dom": "18.1.0",
     "react-error-boundary": "^4.0.11",
     "react-map-gl": "^7.1.3",