fix merge main

.eslintrc.js

@@ -235,8 +235,21 @@ module.exports = {
         ],
     },
 
-    // Remove once no JS files are left
     overrides: [
+        // Enforces every Onyx type and its properties to have a comment explaining its purpose.
+        {
+            files: ['src/types/onyx/**/*.ts'],
+            rules: {
+                'jsdoc/require-jsdoc': [
+                    'error',
+                    {
+                        contexts: ['TSInterfaceDeclaration', 'TSTypeAliasDeclaration', 'TSPropertySignature'],
+                    },
+                ],
+            },
+        },
+
+        // Remove once no JS files are left
         {
             files: ['*.js', '*.jsx'],
             rules: {

.gitignore

@@ -37,6 +37,11 @@ local.properties
 android/app/src/main/java/com/expensify/chat/generated/
 .cxx/
 
+# VIM
+*.swp
+*.swo
+*~
+
 # Vscode
 .vscode
 

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048009
-        versionName "1.4.80-9"
+        versionCode 1001048108
+        versionName "1.4.81-8"
         // 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"

docs/README.md

@@ -186,9 +186,18 @@ Just update the content for each variable accordingly or remove it if the inform
 Assume that we want to rename the article `The Free Plan` to `Freemium Features` for the hub `billing and plan types` in New Expensify platform.
 1. Go to `docs/articles/new-expensify/billing-and-plan-types`
 2. Rename `The-Free-Plan.md` to `Freemium-Features.md`. Use dashes for spaces in the file name.
+3. Add an entry in redirects.csv for the old article pointing to the new article.
 
 Note: It is important that the file has `.md` extension.
 
+# How to hide an article temporarily
+Video demo available [here 🧵](https://expensify.slack.com/archives/C02NK2DQWUX/p1717772272605829?thread_ts=1717523271.137469&cid=C02NK2DQWUX).
+1. Open github's in built code editor by pressing `.` on your keyboard. ([instructions here](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor#opening-the-githubdev-editor))
+2. Go to the article that you want to hide `docs/articles/...`.
+3. Drag and drop the article inside the hidden folder `docs/Hidden/`.
+4. Add a redirect for it in `docs/redirects.csv` to ensure that we don't have broken links. You can choose to point it to the home page or the article's hub.
+5. Commit the changes and raise a PR.
+
 # How the site is deployed
 This site is hosted on Cloudflare pages. Whenever code is merged to main, the github action `deployExpensifyHelp` will run.
 

docs/_data/_routes.yml

@@ -71,7 +71,7 @@ platforms:
 
       - href: integrations
         title: Integrations
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Integrate with accounting or HR software to streamline expense approvals.
 
       - href: spending-insights
@@ -131,7 +131,7 @@ platforms:
 
       - href: connections
         title: Connections
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Connect to accounting software to streamline expense approvals.
 
       - href: settings

docs/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting.md

@@ -64,8 +64,9 @@ Make sure you're importing your card in the correct spot in Expensify and select
 Please note there are some things that cannot be bypassed within Expensify, including two-factor authentication being enabled within your bank account. This will prevent the connection from remaining stable and will need to be turned off on the bank side. 
 
 ## What are the most reliable bank connections in Expensify?*
-The most reliable corporate card to use with Expensify is the Expensify Visa® Commercial Card. We offer daily settlement, unapproved expense limits, and real-time compliance for secure and efficient spending, as well as 2% cash back (_Applies to USD purchases only._) Click here to learn more or apply.
-Additionally, we've teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts. Corporate cards from the following banks also offer the most dependable connections in Expensify:
+All bank connections listed below are extremely reliable, but we recommend transacting with the Expensify Visa® Commercial Card. It also offers daily and monthly settlement, unapproved expense limits, realtime compliance for secure and efficient spending, and cash back on all US purchases. [Click here to learn more about the Expensify Card](https://use.expensify.com/company-credit-card).
+
+We've also teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts:
 - American Express
 - Bank of America
 - Brex
@@ -75,7 +76,7 @@ Additionally, we've teamed up with major banks worldwide to ensure a smooth impo
 - Stripe
 - Wells Fargo
 
-Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, MasterCard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
+Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, Mastercard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
 
 # Troubleshooting American Express Business
 

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-Small-To-Medium-Sized-Businesses.md

@@ -194,14 +194,11 @@ As mentioned above, we’ll be able to pull in transactions as they post (daily)
 ### If you don't have a corporate card, use the Expensify Card (US only)
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (_Applies to USD purchases only._)
-- [SmartLimits](https://help.expensify.com/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features) to control what each individual cardholder can spend
-- A stable, unbreakable real-time connection (third-party bank feeds can run into connectivity issues)
-- Receipt compliance - informing notifications (e.g. add a receipt!) for users *as soon as the card is swiped*
-- Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
-- A 50% discount on the price of all Expensify plans
-- Multiple discounts and savings on a host of partner tech suppliers 
-- Good Karma - 10% of all card interchange we earn goes directly to the Expensify.org Social Justice Community funds
+- Finish your expenses in a swipe, we'll take care of everything else
+- Get cash back on every US purchase and up to 50% off your monthly Expensify bill
+- Stay in control with realtime alerts, spend limits, and auto-reconciliation
+- Don't worry about credit checks, annual fees, or personal guarantees
+- Create unlimited virtual cards with fixed or monthly limits for specific purchases
 
 The Expensify Card is recommended as the most efficient way to manage your company's spending. 
 

docs/articles/expensify-classic/getting-started/playbooks/Expensify-Playbook-For-US-Based-VC-Backed-Startups.md

@@ -155,11 +155,12 @@ The Expensify Card has many benefits for your company. Two in particular are wor
 ### If you don't have a corporate card, use the Expensify Card
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (Applies to USD purchases only)
-- [SmartLimits](https://community.expensify.com/discussion/4851/deep-dive-what-are-unapproved-expense-limits#latest)
-- Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
-- A stable, unbreakable connection (third-party bank feeds can run into connectivity issues)
-
+- Finish your expenses in a swipe, we'll take care of everything else
+- Get cash back on every US purchase and up to 50% off your monthly Expensify bill
+- Stay in control with realtime alerts, spend limits, and auto-reconciliation
+- Don't worry about credit checks, annual fees, or personal guarantees
+- Create unlimited virtual cards with fixed or monthly limits for specific purchases
+
 The Expensify Card is recommended as the most efficient way to manage your company's spending.
 
 Here’s how to enable it:

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.80</string>
+	<string>1.4.81</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.9</string>
+	<string>1.4.81.8</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.80</string>
+	<string>1.4.81</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.9</string>
+	<string>1.4.81.8</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.80</string>
+	<string>1.4.81</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.80.9</string>
+	<string>1.4.81.8</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

@@ -1852,7 +1852,7 @@ PODS:
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.70):
+  - RNLiveMarkdown (0.1.83):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -1870,9 +1870,9 @@ PODS:
     - React-utils
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.70)
+    - RNLiveMarkdown/common (= 0.1.83)
     - Yoga
-  - RNLiveMarkdown/common (0.1.70):
+  - RNLiveMarkdown/common (0.1.83):
     - glog
     - hermes-engine
     - RCT-Folly (= 2022.05.16.00)
@@ -2589,7 +2589,7 @@ SPEC CHECKSUMS:
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
   RNGestureHandler: 74b7b3d06d667ba0bbf41da7718f2607ae0dfe8f
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: 23250f3d64c9d5f82ff36c4733c03544af0222d2
+  RNLiveMarkdown: 88030b7d9a31f5f6e67743df48ad952d64513b4a
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   rnmapbox-maps: df8fe93dbd251f25022f4023d31bc04160d4d65c
   RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.80-9",
+  "version": "1.4.81-8",
   "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.",
@@ -65,7 +65,7 @@
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.70",
+    "@expensify/react-native-live-markdown": "0.1.83",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",

src/App.tsx

@@ -6,7 +6,7 @@ import {PickerStateProvider} from 'react-native-picker-select';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import '../wdyr';
 import ActiveElementRoleProvider from './components/ActiveElementRoleProvider';
-import ActiveWorkspaceContextProvider from './components/ActiveWorkspace/ActiveWorkspaceProvider';
+import ActiveWorkspaceContextProvider from './components/ActiveWorkspaceProvider';
 import ColorSchemeWrapper from './components/ColorSchemeWrapper';
 import ComposeProviders from './components/ComposeProviders';
 import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';