Merge branch 'main' of https://github.com/Expensify/App into feat/#Ex…

…pensify#23138-clear-after-status

.github/PULL_REQUEST_TEMPLATE.md

@@ -98,7 +98,7 @@ This is a checklist for PR authors. Please make sure to complete all tasks and c
     - [ ] The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
 - [ ] If a new CSS style is added I verified that:
     - [ ] A similar style doesn't already exist
-    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)`)
+    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)`)
 - [ ] If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
 - [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.

__mocks__/@ua/react-native-airship.js

@@ -31,7 +31,7 @@ const Airship = {
     },
     contact: {
         identify: jest.fn(),
-        getNamedUserId: jest.fn(),
+        getNamedUserId: () => Promise.resolve(undefined),
         reset: jest.fn(),
     },
 };

android/app/build.gradle

@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001040800
-        versionName "1.4.8-0"
+        versionCode 1001040801
+        versionName "1.4.8-1"
     }
 
     flavorDimensions "default"

contributingGuides/NAVIGATION.md

@@ -1,6 +1,6 @@
 # Overview
 
-The navigation in the App consists of a top-level Stack Navigator (called `RootStack`) with each of its `Screen` components handling different high-level flow. All those flows can be seen in `AuthScreens.js` file.
+The navigation in the App consists of a top-level Stack Navigator (called `RootStack`) with each of its `Screen` components handling different high-level flow. All those flows can be seen in `AuthScreens.tsx` file.
 
 ## Terminology
 
@@ -20,11 +20,11 @@ Navigation Actions - User actions correspond to resulting navigation actions tha
 
 ## Adding RHP flows
 
-Most of the time, if you want to add some of the flows concerning one of your reports, e.g. `Money Request` from a user, you will most probably use `RightModalNavigator.js` and `ModalStackNavigators.js` file:
+Most of the time, if you want to add some of the flows concerning one of your reports, e.g. `Money Request` from a user, you will most probably use `RightModalNavigator.tsx` and `ModalStackNavigators.tsx` file:
 
-- Since each of those flows is kind of a modal stack, if you want to add a page to the existing flow, you should just add a page to the correct stack in `ModalStackNavigators.js`.
+- Since each of those flows is kind of a modal stack, if you want to add a page to the existing flow, you should just add a page to the correct stack in `ModalStackNavigators.tsx`.
 
-- If you want to create new flow, add a `Screen` in `RightModalNavigator.js` and make new modal in `ModalStackNavigators.js` with chosen pages.
+- If you want to create new flow, add a `Screen` in `RightModalNavigator.tsx` and make new modal in `ModalStackNavigators.tsx` with chosen pages.
 
 When creating RHP flows, you have to remember a couple things:
 
@@ -196,4 +196,4 @@ The action for the first step created with  `getMinimalAction` looks like this:
 ```
 
 ### Deeplinking 
-There is no minimal action for deeplinking directly to the `Profile` screen. But because the `Settings_root` is not on the stack, pressing UP will reset the params for navigators to the correct ones.
+There is no minimal action for deeplinking directly to the `Profile` screen. But because the `Settings_root` is not on the stack, pressing UP will reset the params for navigators to the correct ones.

contributingGuides/REVIEWER_CHECKLIST.md

@@ -46,7 +46,7 @@
     - [ ] The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
 - [ ] If a new CSS style is added I verified that:
     - [ ] A similar style doesn't already exist
-    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG`)
+    - [ ] The style can't be created with an existing [StyleUtils](https://github.com/Expensify/App/blob/main/src/styles/StyleUtils.js) function (i.e. `StyleUtils.getBackgroundAndBorderStyle(theme.componentBG`)
 - [ ] If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
 - [ ] If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like `Avatar` is modified, I verified that `Avatar` is working as expected in all cases)
 - [ ] If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.

docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-Company-Cards.md → docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Company-Card-Settings.md

@@ -1,6 +1,6 @@
 ---
 title: Company-Card-Settings.md
-description: Company card settings 
+description: Once you connect your cards, customize the configuration using company card settings.
 ---
 # Overview
 Once you’ve imported your company cards via commercial card feed, direct bank feed, or CSV import, the next step is to configure the cards’ settings. 

docs/articles/expensify-classic/expensify-partner-program/Your-Expensify-Partner-Manager.md

@@ -1,5 +1,5 @@
 ---
-title: Your Expensify Partner Manager
+title: Expensify Partner Support
 description: Understanding support for our partners
 ---
 
@@ -10,23 +10,47 @@ Our well-rounded support methodology is designed to provide comprehensive assist
 
 ## 1. ExpensifyApproved! University
 **Purpose:** Equip your team with a comprehensive understanding of Expensify.
+
 **Benefits:**
 - Foundation-level knowledge about the platform.
 - 3 CPE credits upon successful completion (US-only).
 - Unlock exclusive partner perks, including tickets to ExpensiCon!
 - Visit university.Expensify.com to access our comprehensive training program.
 
 ## 2. Partner Manager
-**Role:** A designated liaison for your firm.
+**Role:** 
+A Partner Manager is a dedicated point of contact for your firm Partner Managers support our accounting partners by providing recommendations for client’s accounts, assisting with firm-wide training, and ensuring partners receive the full benefits of our partnership program. They will actively monitor open technical issues and be proactive with recommendations to increase efficiency.
+
+
 **Key Responsibilities:**
 - Handle any escalations promptly.
 - Organize firm-wide training sessions.
 - Assist with strategic planning and the introduction of new features.
 - Once you've completed the ExpensifyApproved! University, log in to your Expensify account. Click on the "Support" option to connect with your dedicated Partner Manager.
 
+**How do I know if I have a Partner Manager?**
+
+For your firm to be assigned a Partner Manager, you must complete the ExpensifyApproved! University training course. Every external accountant or bookkeeper who completes the training is automatically enrolled in our program and receives all the benefits, including access to the Partner Manager. So everyone at your firm must complete the training to receive the maximum benefit.
+
+You can check to see if you’ve completed the course and enrolled in the ExpensifyApproved! Accountants program simply by logging into your Expensify account. In the bottom left-hand corner of the website, you will see the ExpensifyApproved! logo.
+
+**How do I contact my Partner Manager?**
+1. Signing in to new.expensify.com and searching for your Partner Manager
+2. Replying to or clicking the chat link on any email you get from your Partner Manager
+
+**How do I know if my Partner Manager is online?**
+
+You will be able to see if they are online via their status in new.expensify.com, which will either say “online” or have their working hours.
+
+**Can I get on a call with my Partner Manager?**
+
+Of course! You can ask your Partner Manager to schedule a call whenever you think one might be helpful. Partner Managers can discuss client onboarding strategies, firm-wide training, and client setups.
+
+We recommend continuing to work with Concierge for general support questions, as this team is always online and available to help immediately.
 
 ## 3. Client Setup Specialist
 **Purpose:** Ensure smooth onboarding for every client you refer.
+
 **Duties:**
 - Comprehensive assistance with setting up Expensify.
 - Help with configuring accounting integrations.
@@ -35,13 +59,15 @@ Our well-rounded support methodology is designed to provide comprehensive assist
 
 ## 4. Client Account Manager
 **Role:** Dedicated support for ongoing client needs.
+
 **Responsibilities:**
 - Address day-to-day product inquiries.
 - Assist clients in navigating and optimizing their use of Expensify.
 - After logging into Expensify, click on the "Support" option in the left-hand navigation pane. This will connect you directly to your assigned Account Manager.
 
 ## 5. Concierge chat support
 **Availability:** Real-time support for any urgent inquiries.
+
 **Features:**
 - Immediate assistance with an average response time of under two minutes.
 - Available to both accountants and clients for all product-related questions.

docs/articles/expensify-classic/workspace-and-domain-settings/Creating-Per-Diem-Expenses.md → docs/articles/expensify-classic/get-paid-back/Per-Diem-Expenses.md

@@ -1,17 +1,17 @@
 ---
-title: Creating Per Diem Expenses
+title: Per-Diem-Expenses
 description: How to create Per Diem expenses on mobile and web.
 ---
 # Overview
 
 What are Per Diems? Per diems, short for "per diem allowance" or "daily allowance," are fixed daily payments provided by your employer to cover expenses incurred during business or work-related travel. These allowances simplify expense tracking and reimbursement for meals, lodging, and incidental expenses during a trip. Per Diems can be masterfully tracked in Expensify! 
 
-## How To create per diem expenses 
+## How to create per diem expenses 
 
 To add per diem expenses, you need three pieces of information:
 1. Where did you go? - Specify your travel destination.
 2. How long were you away? - Define the period you're claiming for.
-3. Which rate did you use? - Select the appropriate per diem rate.
+3. Which rate did you use? - Select the appropriate per diem rate (this is set by your employer).
 
 ### Step 1: On either the web or mobile app, click New Expense and choose Per Diem
 
@@ -31,15 +31,15 @@ Finally, submit your Per Diem expense for approval, and you'll be on your way to
 
 # FAQ 
 
-## Can I Edit My Per Diems?
+## Can I edit my per diem expenses?
 Per Diems cannot be amended. To make changes, delete the expense and recreate it as needed.
 
-## What If My Admin Requires Daily Per Diems?
+## What if my admin requires daily per diems? 
 No problem! Create a separate Per Diem expense for each day of your trip.
 
-## I Have Questions About the Amount I'm Due
+## I have questions about the amount I'm due 
 Reach out to your internal Admin team, as they've configured the rates in your policy to meet specific requirements. 
 
-## Can I Add Start and End Times to a Per Diem?
+## Can I add start and end times to per diems? 
 Unfortunately, you cannot add start and end times to Per Diems in Expensify.
 By following these steps, you can efficiently create and manage your Per Diem expenses in Expensify, making the process of tracking and getting reimbursed hassle-free. 

docs/articles/expensify-classic/integrations/travel-integrations/Uber.md

@@ -1,5 +1,24 @@
 ---
-title: Coming Soon
-description: Coming Soon
+title: Uber integration
+description: Connecting your Uber account to Expensify
 ---
-## Resource Coming Soon!
+## Overview
+
+Link Expensify directly to your Uber account so your Uber for Business receipts populate automatically in Expensify. 
+
+# How to connect Uber to Expensify
+
+You can do this right in the Uber app:
+
+1. Head to Account > Business hub > Get started 
+2. Tap Create an individual account > Get started
+3. Enter your business email and tap Next
+4. Select the payment card you'd like to use for your business profile
+5. Choose how frequently you’d like to receive travel summaries 
+6. Select Expensify as your expense provider
+Expensify and Uber are now connected! 
+
+Now, every time you use Uber for Business – be it for rides or meals – the receipt will be imported and scanned into Expensify automatically. 
+
+![Uber integration set up steps: Connecting your account](https://help.expensify.com/assets/images/Uber1.png){:width="100%"}
+![Uber integration set up steps: Selecting Expensify](https://help.expensify.com/assets/images/Uber2.png){:width="100%"}

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.8.0</string>
+	<string>1.4.8.1</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.8.0</string>
+	<string>1.4.8.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.8-0",
+  "version": "1.4.8-1",
   "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.",
@@ -143,7 +143,7 @@
     "react-native-pdf": "^6.7.3",
     "react-native-performance": "^5.1.0",
     "react-native-permissions": "^3.9.3",
-    "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
+    "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#0d15d4618f58e99c1261921111e68ee85bb3c2a8",
     "react-native-plaid-link-sdk": "10.8.0",
     "react-native-qrcode-svg": "^6.2.0",
     "react-native-quick-sqlite": "^8.0.0-beta.2",