Merge branch 'main' into fix/52696-held-expense-isn't-removed-when-ap…

…proved-or-payed
Expensify · Dec 2, 2024 · 710eed3 · 710eed3
2 parents 66de350 + 3a8c2ba
commit 710eed3
Show file tree

Hide file tree

Showing 569 changed files with 24,486 additions and 23,423 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009006607
-        versionName "9.0.66-7"
+        versionCode 1009006902
+        versionName "9.0.69-2"
         // 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"

diff --git a/contributingGuides/FORMS.md b/contributingGuides/FORMS.md
@@ -320,14 +320,17 @@ An example of this can be seen in the [ACHContractStep](https://github.com/Expen
 
 ### Safe Area Padding
 
-Any `FormProvider.js` that has a button will also add safe area padding by default. If the `<FormProvider>` is inside a `<ScreenWrapper>`, we will want to disable the default safe area padding applied there e.g.
+Any `FormProvider.tsx` that has a button at the bottom. If the `<FormProvider>` is inside a `<ScreenWrapper>`, the bottom safe area inset is handled automatically (`includeSafeAreaPaddingBottom` needs to be set to `true`, but its the default).
+If you have custom requirements and can't use `<ScreenWrapper includeSafeAreaPaddingBottom={true}>`, you can use the `useStyledSafeAreaInsets()` hook:
 
 ```jsx
-<ScreenWrapper includeSafeAreaPaddingBottom={false}>
+const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useStyledSafeAreaInsets();
+
+<View styles={[safeAreaPaddingBottomStyle, styles.pb5]}>
     <FormProvider>
         {...}
     </FormProvider>
-</ScreenWrapper>
+</View>
 ```
 
 ### Handling nested Pickers in Form

diff --git a/contributingGuides/PROPOSAL_TEMPLATE.md b/contributingGuides/PROPOSAL_TEMPLATE.md
@@ -7,8 +7,8 @@
 ### What changes do you think we should make in order to solve the problem?
 <!-- DO NOT POST CODE DIFFS -->
 
-### What specific scenarios should we cover in unit tests to prevent reintroducing this issue in the future?
-<!-- Clearly describe the different test cases you recommend adding or updating. Explain how they will ensure the problem is fully covered and that any future changes do not cause a regression. Consider edge cases, input variations, and typical user interactions that could trigger this issue. To get guidance on how to write unit tests, refer to the README.md in the tests folder. -->
+### What specific scenarios should we cover in automated tests to prevent reintroducing this issue in the future?
+<!-- Clearly describe the different test cases you recommend adding or updating. Explain how they will ensure the problem is fully covered and that any future changes do not cause a regression. Consider edge cases, input variations, and typical user interactions that could trigger this issue. To get guidance on how to write tests, refer to the [README.md](https://github.com/Expensify/App/blob/main/tests/README.md) in the tests folder. -->
 
 ### What alternative solutions did you explore? (Optional)
 

diff --git a/...s/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds.md b/...s/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds.md
@@ -82,7 +82,7 @@ Any transactions that were posted prior to this date will not be imported into E
 Click the Assign button
 Once assigned, you will see each cardholder associated with their card as well as the start date listed.
 
-If you're using a connected accounting system such as NetSuite, Xero, Intacct, Quickbooks Desktop, or QuickBooks Online, you can also connect the card to export to a specific credit card GL account.
+If you're using a connected accounting system such as NetSuite, Xero, Intacct, QuickBooks Desktop, or QuickBooks Online, you can also connect the card to export to a specific credit card GL account.
 
 Go to Settings > Domains > [Domain name] > Company Cards
 Click Edit Exports on the right-hand side of the card table and select the GL account you want to export expenses to.

diff --git a/...s/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings.md b/...s/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings.md
@@ -49,7 +49,7 @@ If Scheduled Submit is disabled on the group workspace level (or set to a manual
 
 # How to connect company cards to an accounting integration
 
-If you're using a connected accounting system such as NetSuite, Xero, Intacct, Quickbooks Desktop, or QuickBooks Online, you can also connect the card to export to a specific credit card GL account. First, connect the card itself, and once completed, follow the steps below:
+If you're using a connected accounting system such as NetSuite, Xero, Intacct, QuickBooks Desktop, or QuickBooks Online, you can also connect the card to export to a specific credit card GL account. First, connect the card itself, and once completed, follow the steps below:
 Go to Settings > Domains > Domain name > Company Cards
 Click Edit Exports on the right-hand side of the card table and select the GL account you want to export expenses to 
 You're all done. After the account is set, exported expenses will be mapped to the specific account selected when exported by a Domain Admin.

diff --git a/...expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections.md b/...expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections.md
@@ -56,7 +56,7 @@ To completely remove the card connection, unassign every card from the list and
 # Deep Dive 
 ## Configure card settings
 Once you’ve imported your company cards, the next step is configuring the cards’ settings. 
-If you're using a connected accounting system such as NetSuite, Xero, Sage Intacct, Quickbooks Desktop, or QuickBooks Online. In that case, you can connect the card to export to a specific credit card GL account.
+If you're using a connected accounting system such as NetSuite, Xero, Sage Intacct, QuickBooks Desktop, or QuickBooks Online. In that case, you can connect the card to export to a specific credit card GL account.
 1. Go to **Settings > Domains > _Domain Name_ > Company Cards**
 2. Click **Edit Exports** on the right-hand side of the card table and select the GL account you want to export expenses to 
 3. You're all done. After the account is set, exported expenses will be mapped to the specific account selected when exported by a Domain Admin.

diff --git a/...xpensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md b/...xpensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md
@@ -1,6 +1,6 @@
 ---
-title: Configure Quickbooks Desktop
-description: Configure Quickbooks Desktop
+title: Configure QuickBooks Desktop
+description: Configure QuickBooks Desktop
 ---
 Our new QuickBooks Desktop integration allows you to automate the import and export process with Expensify.
 
@@ -28,11 +28,11 @@ The following steps will determine how data will be exported from Expensify to Q
 
 # Step 2: Configure coding/import settings
 
-The following steps help you determine how data will be imported from QuickBooks Online to Expensify:
+The following steps help you determine how data will be imported from QuickBooks Desktop to Expensify:
 
 ![Expensify coding settings page for the QuickBooks Desktop integration](https://help.expensify.com/assets/images/quickbooks-desktop-coding-settings.png){:width="100%"}
 
-1. Click Import under the QuickBooks Online connection.
+1. Click Import under the QuickBooks Desktop connection.
 2. Review each of the following import settings:
 - **Chart of Accounts**: The Chart of Accounts is automatically imported from QuickBooks Desktop as categories. This cannot be amended.
 - **Classes**: Choose whether to import classes, which will be shown in Expensify as tags for expense-level coding.
@@ -67,15 +67,15 @@ To manually sync your connection:
 For manual syncing, we recommend completing this process at least once a week and/or after making changes in QuickBooks Desktop that could impact how reports export from Expensify. Changes may include adjustments to your chart of accounts, vendors, employees, customers/jobs, or items. Remember: Both the Web Connector and QuickBooks Desktop need to be running for syncing or exporting to work.
 {% include end-info.html %}
 
-## **Can I sync Expensify and QuickBooks Desktop (QBD) and use the platforms at the same time?**
+## **Can I sync Expensify and QuickBooks Desktop and use the platforms at the same time?**
 
 When syncing Expensify to QuickBooks Desktop, we recommend waiting until the sync finishes to access either Expensify and/or QuickBooks Desktop, as performance may vary during this process. You cannot open an instance of QuickBooks Desktop while a program is syncing - this may cause QuickBooks Desktop to behave unexpectedly.
 
-## **What are the different types of accounts that can be imported from Quickbooks Desktop?**
+## **What are the different types of accounts that can be imported from QuickBooks Desktop?**
 
 Here is the list of accounts from QuickBooks Desktop and how they are pulled into Expensify:
 
-| QBD account type  | How it imports to Expensify |
+| QuickBooks Desktop account type  | How it imports to Expensify |
 | ------------- | ------------- |
 | Accounts payable  | Vendor bill or journal entry export options  |
 | Accounts receivable  | Do not import  |

diff --git a/.../expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online.md b/.../expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online.md
@@ -1,6 +1,6 @@
 ---
-title: Configure Quickbooks Online
-description: Configure Quickbooks Online
+title: Configure QuickBooks Online
+description: Configure QuickBooks Online
 ---
 
 # Best Practices Using QuickBooks Online
@@ -88,7 +88,7 @@ The following steps help you determine the advanced settings for your connection
     - _Automatically Create Entities_: If you export reimbursable expenses as Vendor Bills or Journal Entries, Expensify will automatically create a vendor in QuickBooks (If one does not already exist). Expensify will also automatically create a customer when exporting Invoices.
     - _Sync Reimbursed Reports_: Enabling will mark the Vendor Bill as paid in QuickBooks Online if you reimburse a report via ACH direct deposit in Expensify. If you reimburse outside of Expensify, then marking the Vendor Bill as paid in QuickBooks Online will automatically mark the report as reimbursed in Expensify.
         - _QuickBooks Account_: Select the bank account your reimbursements are coming out of, and we'll create the payment in QuickBooks.
-        - _Collection Account_: When exporting invoices from Expensify to Quickbooks Online, the invoice will appear against the Collection Account once marked as Paid.
+        - _Collection Account_: When exporting invoices from Expensify to QuickBooks Online, the invoice will appear against the Collection Account once marked as Paid.
 
 {% include faq-begin.md %}
 

diff --git a/...sify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md b/...sify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md
@@ -1,6 +1,6 @@
 ---
-title: Quickbooks Online Troubleshooting
-description: Quickbooks Online Troubleshooting
+title: QuickBooks Online Troubleshooting
+description: QuickBooks Online Troubleshooting
 ---
 
 # ExpensiError QBO022: When exporting billable expenses, please make sure the account in QuickBooks Online has been marked as billable.

diff --git a/docs/articles/expensify-classic/expenses/Apply-Tax.md b/docs/articles/expensify-classic/expenses/Apply-Tax.md
@@ -28,6 +28,21 @@ To handle these, you can create a single tax that combines both taxes into a sin
 
 From the Reports page, you can select Reports and then click **Export To > Tax Report** to generate a CSV containing all the expense information, including the split-out taxes.
 
+## Why is the tax amount different than I expect?
+
+In Expensify, tax is *inclusive*, meaning it's already part of the total amount shown.
+
+To determine the inclusive tax from a total price that already includes tax, you can use the following formula:
+
+### **Tax amount = (Total price x Tax rate) ÷ (1 + Tax Rate)**
+
+For example, if an item costs $100  and the tax rate is 20%:
+Tax amount = (**$100** x .20) ÷ (1 + .**20**) = **$16.67**
+This means the tax amount $16.67 is included in the total.
+
+If you are simply trying to calculate the price before tax, you can use the formula: 
+
+### **Price before tax = (Total price) ÷ (1 + Tax rate)**
 
 # Deep Dive
 

diff --git a/...cles/new-expensify/connections/quickbooks-online/Configure-Quickbooks-Online.md b/...cles/new-expensify/connections/quickbooks-online/Configure-Quickbooks-Online.md
@@ -1,5 +1,5 @@
 ---
-title: Configure Quickbooks Online
+title: Configure QuickBooks Online
 description: Configure your QuickBooks Online connection with Expensify
 ---
 

diff --git a/...ew-expensify/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md b/...ew-expensify/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md
@@ -1,5 +1,5 @@
 ---
-title: Quickbooks Online Troubleshooting
+title: QuickBooks Online Troubleshooting
 description: A list of common QuickBooks Online errors and how to resolve them
 ---
 

diff --git a/docs/articles/new-expensify/expenses-&-payments/Create-an-expense.md b/docs/articles/new-expensify/expenses-&-payments/Create-an-expense.md
@@ -168,6 +168,24 @@ Yes, you can edit an expense until it is paid. When an expense is submitted, the
 In Expensify, expense reports group expenses in a batch to be paid or reconciled. When a draft report is open, all new expenses are added to it. 
 
 Once a report is submitted, you can track the status from the **Search** section. Click the **View** button for a specific expense or expense report. The status is displayed at the top of the expense or report.
+
+**How can I enable camera permission for a website on mobile browsers?**
+
+**Google Chrome:**
+1. Open Chrome.
+2. To the right of the address bar, tap More icon > **Settings**.
+3. Tap **Site settings** > **Camera**.
+4. Tap to turn the microphone or camera on or off.
+    - If you find the site you want to use under **Blocked**, tap the site > **Allow**.
+5. Refresh the site.
+
+**Safari:**
+1. Open Safari.
+2. To the left of the address bar, tap More icon > **Site settings** > **Camera**.
+3. Tap **Allow** to grant permission.
+4. Tap **Done**.
+5. Refresh the site.
+
 {% include faq-end.md %}
 
 </div>
diff --git a/docs/assets/images/ExpensifyHelp-Postman-Request-data.png b/docs/assets/images/ExpensifyHelp-Postman-Request-data.png
diff --git a/docs/assets/images/ExpensifyHelp-Postman-Successful-dryrun-response.png b/docs/assets/images/ExpensifyHelp-Postman-Successful-dryrun-response.png
diff --git a/docs/assets/images/ExpensifyHelp-Postman-userID-userSecret-request.png b/docs/assets/images/ExpensifyHelp-Postman-userID-userSecret-request.png
diff --git a/help/map.md b/help/map.md
@@ -254,8 +254,8 @@ Lost in the app?  Let this map guide you!
                 * Delete
         * Accounting
             * Connections list
-                * Quickbooks Online Connect
-                * Quickbooks Desktop Connect
+                * QuickBooks Online Connect
+                * QuickBooks Desktop Connect
                 * Xero
                 * NetSuite
                 * Sage Intacct

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.66</string>
+	<string>9.0.69</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.66.7</string>
+	<string>9.0.69.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.66</string>
+	<string>9.0.69</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.66.7</string>
+	<string>9.0.69.2</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.66</string>
+	<string>9.0.69</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.66.7</string>
+	<string>9.0.69.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>