Merge branch 'main' into gedu/delete_comment_conflict_resolver

.github/ISSUE_TEMPLATE/Standard.md

@@ -10,6 +10,7 @@ ___
 **Version Number:**
 **Reproducible in staging?:**
 **Reproducible in production?:**
+**If this was caught on HybridApp, is this reproducible on New Expensify Standalone?:**
 **If this was caught during regression testing, add the test name, ID and link from TestRail:**
 **Email or phone of affected tester (no customers):**
 **Logs:** https://stackoverflow.com/c/expensify/questions/4856
@@ -34,9 +35,11 @@ Can the user still use Expensify without this being fixed? Have you informed the
 Check off any platforms that are affected by this issue
 --->
 Which of our officially supported platforms is this issue occurring on?
-- [ ] Android: Native
+- [ ] Android: Standalone
+- [ ] Android: HybridApp
 - [ ] Android: mWeb Chrome
-- [ ] iOS: Native
+- [ ] iOS: Standalone
+- [ ] iOS: HybridApp
 - [ ] iOS: mWeb Safari
 - [ ] MacOS: Chrome / Safari
 - [ ] MacOS: Desktop

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009004900
-        versionName "9.0.49-0"
+        versionCode 1009004901
+        versionName "9.0.49-1"
         // 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/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills.md → docs/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills.md

@@ -1,26 +1,26 @@
 ---
-title: Pay Bills
+title: Create and Pay Bills
 description: Expensify bill management and payment methods.
 ---
 Streamline your operations by receiving and paying vendor or supplier bills directly in Expensify. Vendors can send bills even if they don't have an Expensify account, and you can manage payments seamlessly.
 
-## Receive Bills in Expensify
+# Receive Bills in Expensify
 You can receive bills in three ways:
 - Directly from Vendors: Provide your Expensify billing email to vendors.
 - Forwarding Emails: Forward bills received in your email to Expensify.
 - Manual Upload: For physical bills, create a Bill in Expensify from the Reports page.
 
-## Bill Pay Workflow
+# Bill Pay Workflow
 1. When a vendor or supplier sends a bill to Expensify, the document is automatically SmartScanned, and a Bill is created. This Bill is managed by the primary domain contact, who can view it on the Reports page within their default group policy.
 
 2. Once the Bill is ready for processing, it follows the established approval workflow. As each person approves it, the Bill appears in the next approver’s Inbox. The final approver will pay the Bill using one of the available payment methods.
 
 3. During this process, the Bill is coded with the appropriate GL codes from your connected accounting software. After completing the approval workflow, the Bill can be exported back to your accounting system.
 
-## Payment Methods
+# Payment Methods
 There are multiple ways to pay Bills in Expensify. Let’s go over each method below. 
 
-### ACH bank-to-bank transfer
+## ACH bank-to-bank transfer
 
 To use this payment method, you must have a [business bank account connected to your Expensify account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account).
 
@@ -32,7 +32,7 @@ To use this payment method, you must have a [business bank account connected to
 
 **Fees:** None
 
-### Credit or Debit Card
+## Credit or Debit Card
 This option is available to all US and International customers receiving a bill from a US vendor with a US business bank account. 
 
 **To pay with a credit or debit card:**
@@ -43,13 +43,13 @@ This option is available to all US and International customers receiving a bill
 
 **Fees:** 2.9% of the total amount paid.
 
-### Venmo
+## Venmo
 If both you and the vendor must have Venmo connected to Expensify, you can pay the bill by following the steps outlined [here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments#setting-up-third-party-payments).
 
 **Fees:** Venmo charges a 3% sender’s fee.
 
 
-### Pay outside of Expensify 
+## Pay outside of Expensify 
 If you are unable to pay using one of the above methods, you can still mark the Bill as paid. This will update its status to indicate that the payment was made outside Expensify. 
 
 **To mark a Bill as paid outside of Expensify:**

docs/articles/expensify-classic/expensify-billing/Consolidated-Domain-Billing.md

@@ -16,9 +16,12 @@ When a Domain Admin enables Consolidated Domain Billing, all Group workspaces ow
 If you don’t have multiple billing owners across your organization, or if you want to keep billing separate for any reason, then this feature isn’t necessary.
 
 If you have an Annual Subscription and enable Consolidated Domain Billing, the Consolidated Domain Billing feature will gather the amounts due for each Group workspace Billing Owner (listed under **Settings > Workspaces > Group**). To make full use of the Annual Subscription for all workspaces in your domain, you should also be the billing owner for all Group workspaces.
+
 {% include faq-begin.md %}
+
 ## How do I take over the billing of a workspace with Consolidated Domain Billing enabled? 
 You’ll have to toggle off Consolidated Domain Billing, take over ownership of the workspace, and then toggle it back on.
+
 ## Can I use Consolidated Domain Billing to cover the bill for some workspaces, but not others?
 No, this feature means that you’ll be paying the bill for all domain members who choose a subscription.
 

docs/articles/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md

@@ -4,25 +4,26 @@ description: Get the new Expensify Visa® Commercial Card
 ---
 <div id="new-expensify" markdown="1">
 
-If your company is already using Expensify Cards, you can upgrade your cards for free to the new Expensify Visa® Commercial Card to get even more tools to manage employee spending, including: 
-- Unlimited <a href="[url](https://use.expensify.com/unlimited-virtual-cards)">virtual cards</a>  
+When you upgrade the Expensify Cards to the new program, you'll have access to even more tools to manage employee spending, including: 
+- Unlimited [virtual cards](https://use.expensify.com/unlimited-virtual-cards)
 - Controlled spending amounts on virtual cards to manage subscriptions
 - Tighter controls for managing spend across employees and merchants
-- Fixed or monthly spend limits for each card 
+- Fixed or monthly spending limits for each card 
 - Unique naming for each virtual card for simplified expense categorization 
 
-# Upgrade your company’s Expensify Cards
-
 {% include info.html %}
-This process must be completed by a Domain Admin. Although the process is available for all Domain Admins, only one admin needs to complete these steps. 
+The Expensify Card upgrade must be completed by November 1, 2024.
+{% include end-info.html %}
 
-Before completing this process, you’ll want to:
+# Upgrade your company’s Expensify Card program
+This process must be completed by a Domain Admin. Any domain Admin can complete the upgrade, but only one admin needs to complete these steps. 
 
-- Have your employees update their address if needed so that they receive their new Expensify Card in the mail before completing the steps below. 
-- Ensure that existing cardholders have a limit greater than $0 if you want them to receive a new Expensify Card. If their limit is $0, increase the limit.
-{% include end-info.html %}
+**Before updating the card program:**
+- Make sure your employees' address is up-to-date in their Expensify account
+- Confirm the employees who should be receiving a new Expensify Card have a card limit set that's greater than $0
 
-1. On your Home page, click the task titled “Upgrade to the new and improved Expensify Card.”
+## Steps to upgrade the Expensify Cards
+1. On your Home page, click the task titled _Upgrade to the new and improved Expensify Card._
 2. Review and agree to the Terms of Service.
 3. Click **Get the new card**. All existing cardholders with a limit greater than $0 will be automatically mailed a new physical card to the address they have on file. Virtual cards will be automatically issued and available for immediate use. 
 4. If you have Positive Pay enabled for your settlement account, contact your bank as soon as possible to whitelist the new ACH ID: 2270239450. 
@@ -36,19 +37,19 @@ Cards won’t be issued to any employees who don’t currently have them. In thi
 
 {% include faq-begin.md %}
 
-**Why don’t I see the task to agree to new terms on my Home page?**
+## Why don’t I see the task to agree to new terms on my Home page?
 
 There are a few reasons why you might not see the task on your Home page:
 - You may not be a Domain Admin
 - Another domain admin has already accepted the terms
 - The task may be hidden. To find hidden tasks, scroll to the bottom of the Home page and click **Show Hidden Tasks** to see all of your available tasks. 
 
-**Will this affect the continuous reconciliation process?**
+## Will this affect the continuous reconciliation process?
 
 No. During the transition period, you may have some employees with old cards and some with new cards, so you’ll have two different debits (settlements) made to your settlement account for each settlement period. Once all spending has transitioned to the new cards, you’ll only see one debit/settlement. 
 
-**Do I have to upgrade to the new Expensify Visa® Commercial Card?**
+## Do I have to upgrade to the new Expensify Visa® Commercial Card?
 
-Yes. We’ll provide a deadline soon. But don’t worry—you’ll have plenty of time to upgrade.  
+Yes, the Expensify Cards will not work on the old program. This must be completed by November 1, 2024.   
 {% include faq-end.md %}
 </div>

docs/redirects.csv

@@ -586,3 +586,4 @@ https://community.expensify.com/discussion/9000/how-to-integrate-with-deel,https
 https://community.expensify.com/categories/expensify-classroom,https://use.expensify.com
 https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-Receive-for-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-and-Receive-Payment-for-Invoices.md
 https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Bulk-Upload-Multiple-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Add-Invoices-in-Bulk
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills

ios/NewExpensify.xcodeproj/project.pbxproj

@@ -43,7 +43,7 @@
 		D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */; };
 		DD79042B2792E76D004484B4 /* RCTBootSplash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.mm */; };
 		DDCB2E57F334C143AC462B43 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */; };
-		E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */ = {isa = PBXBuildFile; };
+		E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
 		E9DF872D2525201700607FDC /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = E9DF872C2525201700607FDC /* AirshipConfig.plist */; };
 		ED222ED90E074A5481A854FA /* ExpensifyNeue-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8B28D84EF339436DBD42A203 /* ExpensifyNeue-BoldItalic.otf */; };
 		F0C450EA2705020500FD2970 /* colors.json in Resources */ = {isa = PBXBuildFile; fileRef = F0C450E92705020500FD2970 /* colors.json */; };
@@ -176,8 +176,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				383643682B6D4AE2005BB9AE /* DeviceCheck.framework in Frameworks */,
-				E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */,
-				E51DC681C7DEE40AEBDDFBFE /* (null) in Frameworks */,
+				E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */,
+				E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */,
 				8744C5400E24E379441C04A4 /* libPods-NewExpensify.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.49.0</string>
+	<string>9.0.49.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

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

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.0.49</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.49.0</string>
+	<string>9.0.49.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/Podfile.lock

@@ -1606,16 +1606,29 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-config (1.5.0):
-    - react-native-config/App (= 1.5.0)
-  - react-native-config/App (1.5.0):
-    - RCT-Folly
+  - react-native-config (1.5.3):
+    - react-native-config/App (= 1.5.3)
+  - react-native-config/App (1.5.3):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React
-    - React-Codegen
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
     - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
+    - Yoga
   - react-native-document-picker (9.3.1):
     - DoubleConversion
     - glog
@@ -3173,7 +3186,7 @@ SPEC CHECKSUMS:
   react-native-airship: e10f6823d8da49bbcb2db4bdb16ff954188afccc
   react-native-blob-util: 221c61c98ae507b758472ac4d2d489119d1a6c44
   react-native-cameraroll: 478a0c1fcdd39f08f6ac272b7ed06e92b2c7c129
-  react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
+  react-native-config: 742a9e0a378a78d0eaff1fb3477d8c0ae222eb51
   react-native-document-picker: e9d83c149bdd72dc01cf8dcb8df0389c6bd5fddb
   react-native-geolocation: b9bd12beaf0ebca61a01514517ca8455bd26fa06
   react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.49-0",
+  "version": "9.0.49-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.",
@@ -133,7 +133,7 @@
     "react-native-android-location-enabler": "^2.0.1",
     "react-native-blob-util": "0.19.4",
     "react-native-collapsible": "^1.6.2",
-    "react-native-config": "1.5.0",
+    "react-native-config": "1.5.3",
     "react-native-dev-menu": "^4.1.1",
     "react-native-device-info": "10.3.1",
     "react-native-document-picker": "^9.3.1",