Merge branch 'main' into VickyStash/refactor/58828-remove-toggle

Author: VickyStash

.github/workflows/reassurePerformanceTests.yml

@@ -50,20 +50,17 @@ jobs:
           set -e
           BASELINE_BRANCH=${BASELINE_BRANCH:="main"}
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
-          git switch "$BASELINE_BRANCH"
-          cd Mobile-Expensify
-          git checkout "$(git rev-parse HEAD)"
-          cd ..
-          git add Mobile-Expensify
-          npm install --force || (rm -rf node_modules && npm install --force) 
+          
+          git checkout --force --detach "origin/$BASELINE_BRANCH" --no-recurse-submodules
+          npm install --force || (rm -rf node_modules && npm install --force)
           NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
-          git switch --force --detach "${PR_SHA:-${GITHUB_SHA}}"
-          cd Mobile-Expensify
-          git checkout "$(git rev-parse HEAD)"
-          cd ..
-          git add Mobile-Expensify
-          git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
-          git checkout --ours .
+          
+          git checkout --force --detach "${PR_SHA:-${GITHUB_SHA}}" --no-recurse-submodules
+          
+          if ! git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours; then
+            git checkout --ours .
+          fi
+          
           npm install --force || (rm -rf node_modules && npm install --force)
           NODE_OPTIONS=--experimental-vm-modules npx reassure --branch
 

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009023300
-        versionName "9.2.33-0"
+        versionCode 1009023304
+        versionName "9.2.33-4"
         // 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,76 @@
+# Red Brick Road and Green Brick Road Philosophy
+The Red Brick Road (RBR) and Green Brick Road (GBR) are each a method to direct a user down a clear path of actions to take or errors to fix. It is intended to help the user have a clearly defined set of steps to follow in order to resolve something. It can lead you to take an action anywhere in the Inbox, Reports, Workspaces, or Account.
+
+## Terminology
+- **Brick Road**: The Brick Road is named after the Yellow Brick Road from the popular movie The Wizard of Oz. In the Wizard of Oz, Dorothy must follow the Yellow Brick Road in order to reach the Emerald City, similar to how the Brick Roads in Expensify lead the user down a certain path to reach the final destination of a resolution.
+- **Red Brick Road**: The Red Brick Road (RBR) is the red dot that shows up under certain conditions that will lead the user down a path of errors or violations to fix.
+    - **The UI Pattern**:
+        - The Red Brick Road will show up in the UI as a red dot next to an inbox item, expense, report or other specific menu item.
+        - The goal is to bring the user to some kind of action.
+        - With the RBR, it usually ends at some kind of error with instructions on how to fix it.
+        - The dots (or indicators) should be present on the navigation items (eg. links, buttons) that the user needs to click on to take them to where the action item will be.
+The dots (or indicators) should be present on the navigation items (eg. links, buttons) that the user needs to click on to take them to where the action item will be
+- **Green Brick Road**: The Green Brick Road (GBR) is the red dot that shows up under certain conditions that will lead the user down a path of errors or violations to fix.
+    - **The UI Pattern**:
+        - The Green Brick Road will show up in the UI as a green dot next to an inbox item, expense, report, or other specific menu item.
+        - The goal is to bring the user to some kind of action.
+        - With GBR, it's usually a big green button to signal they made it to the end of the road.
+        - The dots (or indicators) should be present on the navigation items (eg. links, buttons) that the user needs to click on to take them to where the action item will be.
+- **Both Brick Roads**
+    - **The UI Pattern**:
+        - For both Brick Roads, it MUST take the user to something that is actionable. If there is nothing the user can do to resolve the brick road, then the brick road should not exist.- 
+
+## Green Brick Road (GBR)
+This section is broken down into the rules and examples for each section where the Green Brick Road will appear.
+
+### Rules
+The GBR MUST show up when there is a pending action to take or item to review. 
+
+### Inbox
+Any chats in the left hand navigation (LHN) that require attention will in most cases show up in the highest context chat.
+Examples:
+- There is a report pending approval by an admin
+- There is a report pending submission by an employee
+- There is a report waiting to be paid by the admin
+- There is a report queued for reimbursement but the employee needs to add a deposit bank account
+- An Expensify Card has been issued to an employee but the employee needs to add their shipping details
+- A user is mentioned in a report comment
+
+### Workspaces
+Examples:
+- If the billing owner had to retry billing and the retry was successful
+
+### Account
+Examples:
+- A user has an unvalidated contact method
+
+
+## Red Brick Road (RBR)
+This section is broken down into rules and examples for each section where the Red Brick Road will appear.
+
+### Rules
+The RBR MUST show up when there is an error or violation that needs fixing.
+
+### Inbox
+Any chats in the left hand navigation (LHN) that require attention will in most cases show up in the highest context chat.
+Examples:
+- There are violations on a report that the employee needs to fix
+- There is a task that you assigned to an employee waiting to be completed
+- There is an expense that the admin put on hold
+
+### Workspaces
+Examples:
+- The Workspace Admin's accounting integration connection is broken
+- The QuickBooks Online export is broken and needs to be re-authenticated
+- Your direct connection to your bank or Plaid is broken and needs to be reconnected
+- There is an error with your billing subscription
+- The Workspace Admin adds a new workspace member but gets an error message
+
+### Account
+Examples:
+- A third party card assigned to a user has a broken connection
+
+### Other
+Examples:
+- There is an error that occurred from an action the user took while they were offline
+

contributingGuides/philosophies/RED_BRICK_ROAD_AND_GREEN_BRICK_ROAD.md

@@ -1,7 +1,7 @@
 ---
 title: Request the Expensify Card
 description: Learn how to request, activate, and manage the Expensify Card, including virtual card setup, replacement procedures, and eligibility requirements.
-keywords: [Expensify Classic, Expensify Card, request a card, new card]
+keywords: [Expensify Classic, Expensify Card, request a card, new card, activate, virtual card, replace card, lost card, update address]
 ---
 
 This guide provides details on how you and your employees can request and use the Expensify Card.

contributingGuides/philosophies/Red_Brick_Road_and_Green_Brick_Road.md

@@ -10,7 +10,7 @@ Once you receive your Expensify Visa® Commercial Card, you can activate it and
 
 # Activate your Expensify Card
 
-1. In the navigation tabs (on the left on web, and at the bottom on mobile), select **Reports > Tasks**.
+1. In the navigation tabs (on the left on web, and at the bottom on mobile), select **Account > Wallet > Expensify Card**.
 2. Complete the task labeled **Activate your Expensify Card**.
 3. Enter the last 4 digits of your physical card to activate it.
 

docs/articles/expensify-classic/expensify-card/Request-the-Expensify-Card.md

@@ -1,7 +1,7 @@
 ---
 title: Workspace Workflows
 description: Configure your workspace approval and submission workflows to match your team's needs.
-keywords: [New Expensify, workflows, approval workflows, delay submission, add approver, connect bank, workspace settings]
+keywords: [New Expensify, workflows, approval workflows, delay submission, add approver, connect bank, workspace settings, submission frequency]
 ---
 
 Workflows help you automate how expenses are submitted, approved, and reimbursed in your workspace. Whether you're tracking personal expenses or managing a team, you can adjust workflows to match your use case.
@@ -40,10 +40,11 @@ Once enabled, go to the **Workflows** tab in the left menu to customize your sub
 - You can assign an approver per workspace member.
 - The default approver is the **Workspace Owner**, but any **Workspace Admin** can be selected.
 
-## Delay Submissions
+## Submission Frequency
 
 - Controls when expenses are automatically submitted.
 - Choose how frequently expenses are submitted:
+   - Instantly - Expenses are submitted upon creation.
    - Daily – Reports are submitted every evening. Violations are submitted once corrected.
    - Weekly – Reports are submitted weekly. Violations are submitted on Sunday after correction.
    - Twice a month – Reports are submitted on the 15th and the last day of the month. Violations are submitted at the next applicable date.
@@ -67,10 +68,19 @@ To reimburse employees or pay invoices directly from Expensify, connect your bus
 
 # FAQ
 
-## If I Have Both Delay Submission and an Approver Enabled, What Happens?
+## What happens if I don’t choose a submission frequency?
 
-When both **Add Approvals** and **Delay Submission** are enabled, expense reports follow this flow: **Open** → **Processing** → **Approved**
+Expenses will remain in the **Unreported** state until the submitter adds the expense to a report, and reports will need to be submitted manually.
 
-If **Delay Submission** is turned off:
-- Reports are submitted immediately and follow this flow: **Processing** → **Approved**
+## Why are reports still being submitted without an automatic submission frequency set?
+
+This happens if the submitter has set a submission frequency on their Individual workspace in Expensify Classic. In that case, expenses and reports will follow the cadence set in the Individual workspace.
+
+## What time of day are reports submitted when an automated submission frequency is set?
+
+All automatic report submissions occur in the evening Pacific Time (PT).
+
+## Can I automatically create separate reports for each of my credit cards?
+
+Not at this time. All expenses are collected into a single report and submitted based on the selected frequency.
 

docs/articles/new-expensify/expensify-card/Cardholder-Settings-and-Features.md

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

docs/articles/new-expensify/workspaces/Workspace-Workflows.md

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.2.33</string>
 	<key>CFBundleVersion</key>
-	<string>9.2.33.0</string>
+	<string>9.2.33.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>