Merge branch 'main' of https://github.com/gijoe0295/App into gijoe-33452

android/app/build.gradle

@@ -96,8 +96,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001042204
-        versionName "1.4.22-4"
+        versionCode 1001042300
+        versionName "1.4.23-0"
     }
 
     flavorDimensions "default"

docs/articles/expensify-classic/account-settings/Account-Details.md

@@ -60,10 +60,12 @@ Is your Secondary Login (personal email) invalidated in your company account? If
 4. Head to your personal email account and follow the prompts
 5. You'll receive a link in the email to click that will unlink the two accounts
 
-# FAQ
+{% include faq-begin.md %}
 ## The profile picture on my account updated automatically. Why did this happen? 
 Our focus is always on making your experience user-friendly and saving you valuable time. One of the ways we achieve this is by utilizing a public API to retrieve public data linked to your email address.
 
 This tool searches for public accounts or profiles associated with your email address, such as on LinkedIn. When it identifies one, it pulls in the uploaded profile picture and name to Expensify.
 
 While this automated process is generally accurate, there may be instances where it's not entirely correct. If this happens, we apologize for any inconvenience caused. The good news is that rectifying such situations is a straightforward process. You can quickly update your information manually by following the directions provided above, ensuring your data is accurate and up to date in no time. 
+
+{% include faq-end.md %}

docs/articles/expensify-classic/account-settings/Close-Account.md

@@ -114,10 +114,12 @@ Here's how to do it:
 
 By following these steps, you can easily verify your email or phone number and close an unwanted Expensify account.
 
-# FAQ
+{% include faq-begin.md %}
 
 ## What should I do if I'm not directed to my account when clicking the validate option from my phone or email?
 It's possible your browser has blocked this, either because of some existing cache or extension. In this case, you should follow the Reset Password flow to reset the password and manually gain access with the new password, along with your email address. 
 
 ## Why don't I see the Close Account option?
 It's possible your account is on a managed company domain. In this case, only the admins from that company can close it.
+
+{% include faq-end.md %}

docs/articles/expensify-classic/account-settings/Copilot.md

@@ -59,11 +59,13 @@ To ensure a receipt is routed to the Expensify account in which you are a copilo
 3. Send
 
 
-# FAQ
+{% include faq-begin.md %}
 ## Can a Copilot's Secondary Login be used to forward receipts?
 Yes! A Copilot can use any of the email addresses tied to their account to forward receipts into the account of the person they're assisting.
 
 ## I'm in Copilot mode for an account; Can I add another Copilot to that account on their behalf?
 No, only the original account holder can add another Copilot to the account.
 ## Is there a restriction on the number of Copilots I can have or the number of users for whom I can act as a Copilot?
 There is no limit! You can have as many Copilots as you like, and you can be a Copilot for as many users as you need.
+
+{% include faq-end.md %}

docs/articles/expensify-classic/account-settings/Merge-Accounts.md

@@ -19,7 +19,7 @@ Merging two accounts together is fairly straightforward. Let’s go over how to
 8. Paste the code into the required field
 If you have any questions about this process, feel free to reach out to Concierge for some assistance!
 
-# FAQ
+{% include faq-begin.md %}
 ## Can you merge accounts from the mobile app?
 No, accounts can only be merged from the full website at expensify.com.
 ## Can I administratively merge two accounts together?
@@ -34,3 +34,5 @@ Yes! Please see below:
 - If you have two accounts with two different verified domains, you cannot merge them together.
 ## What happens to my “personal” Individual workspace when merging accounts?
 The old “personal” Individual workspace is deleted. If you plan to submit reports under a different workspace in the future, ensure that any reports on the Individual workspace in the old account are marked as Open before merging the accounts. You can typically do this by selecting “Undo Submit” on any submitted reports. 
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/International-Reimbursements.md

@@ -75,7 +75,7 @@ Examples of additional requested information:
 - An authorization letter 
 - An independently certified documentation such as shareholder agreement from a lawyer, notary, or public accountant if an individual owns more than 25% of the company
 
-# FAQ
+{% include faq-begin.md %}
 
 ## How many people can send reimbursements internationally? 
 
@@ -103,3 +103,4 @@ This is the person who will process international reimbursements. The authorized
 
 You can leave this form section blank since the “User” is Expensify. 
 
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards.md

@@ -59,7 +59,7 @@ Expenses can be imported as either reimbursable or non-reimbursable. Select the
 
 *Remove a card*: If you need to remove a card, you can select the red trash can icon. Please remember this will remove all unreported and un-submitted transactions from your account that are tied to this card, so be careful! 
 
-# FAQ
+{% include faq-begin.md %}
 *Is the bank/credit card import option right for me?*
 If you incur expenses using your personal or business card and need to get them accounted for in your company’s accounting, then you might want to import your bank/credit card. Please note, if you have a company-assigned corporate card, check with your company's Expensify admin on how to handle these cards. Often, admins will take care of card assignments, and you won't need to import them yourself.
 
@@ -74,3 +74,5 @@ If you aren't able to see the expenses imported when you click “View expenses
 
 *How do I remove an imported spreadsheet?*
 If you need to remove an imported spreadsheet, you can select the red trash can icon. Please remember this will remove all unreported and unsubmitted transactions from your account that are tied to this import, so be careful!  
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-AUD.md

@@ -36,7 +36,7 @@ You can complete this process either via the web app (on a computer), or via the
 If you are new to using Batch Payments in Australia, to reimburse your staff or process payroll, you may want to check out these bank-specific instructions for how to upload your .aba file:
 
 - ANZ Bank - [Import a file for payroll payments](https://www.anz.com.au/support/internet-banking/pay-transfer-business/payroll/import-file/)
-- CommBank - [Importing and using
 Direct Entry (EFT) files](https://www.commbank.com.au/business/pds/003-279-importing-a-de-file.pdf)
+- CommBank - [Importing and using Direct Entry (EFT) files](https://www.commbank.com.au/business/pds/003-279-importing-a-de-file.pdf)
 - Westpac - [Importing Payment Files](https://www.westpac.com.au/business-banking/online-banking/support-faqs/import-files/)
 - NAB - [Quick Reference Guide - Upload a payment file](https://www.nab.com.au/business/online-banking/nab-connect/help)
 - Bendigo Bank - [Bulk payments user guide](https://www.bendigobank.com.au/globalassets/documents/business/bulk-payments-user-guide.pdf)

docs/articles/expensify-classic/bank-accounts-and-credit-cards/business-bank-accounts/Business-Bank-Accounts-USD.md

@@ -127,7 +127,7 @@ If you get a generic error message that indicates, "Something's gone wrong", ple
 8. If you have another phone available, try to follow these steps on that device
 If the issue persists, please contact your Account Manager or Concierge for further troubleshooting assistance.
 
-# FAQ
+{% include faq-begin.md %}
 ## What is a Beneficial Owner?
 
 A Beneficial Owner refers to an **individual** who owns 25% or more of the business. If no individual owns 25% or more of the business, the company does not have a Beneficial Owner.
@@ -157,3 +157,5 @@ It's a good idea to wait till the end of that second business day. If you still
 
 Make sure to reach out to your Account Manager or to Concierge once you have done so and our team will be able to re-trigger those 3 transactions!
 
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import.md

@@ -93,9 +93,11 @@ Then, try to upload the revised spreadsheet again:
 3. Check the row count again on the Output Preview to confirm it matches the spreadsheet
 4. Click **Submit Spreadsheet**
 
-# FAQ 
+{% include faq-begin.md %} 
 ## Why can't I see my CSV transactions immediately after uploading them?
 Don't worry! You'll typically need to wait 1-2 minutes after clicking **I understand, I'll wait!**
 
 ## I'm trying to import a credit. Why isn't it uploading?
 Negative expenses shouldn't include a minus sign. Instead, they should just be wrapped in parentheses. For example, to indicate "-335.98," you'll want to make sure it's formatted as "(335.98)."
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds.md

@@ -99,7 +99,7 @@ To completely remove the card connection, unassign every card from the list and
 
 Note: If expenses are Processing and then rejected, they will also be deleted when they're returned to an Open state as the card they're linked to no longer exists.
 
-# FAQ
+{% include faq-begin.md %}
 
 ## My Commercial Card feed is set up. Why is a specific card not coming up when I try to assign it to an employee?
 Cards will appear in the drop-down when activated and have at least one posted transaction. If the card is activated and has been used for a while and you're still not seeing it, please reach out to your Account Manager or message concierge@expensify.com for further assistance.
@@ -124,3 +124,5 @@ If your company uses a Commercial Card program that isn’t with one of our Appr
 - Stripe
 - Brex
 
+
+{% include faq-end.md %}

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

@@ -84,8 +84,10 @@ Expensify eReceipts serve as digital substitutes for paper receipts in your purc
 To ensure seamless automatic importation, it's essential to maintain your transactions in US Dollars. Additionally, eReceipts can be directly imported from your bank account. Please be aware that CSV/OFX imported files of bank transactions do not support eReceipts.
 It's important to note that eReceipts are not generated for lodging expenses. Moreover, due to incomplete or inaccurate category information from certain banks, there may be instances of invalid eReceipts being generated for hotel purchases. If you choose to re-categorize expenses, a similar situation may arise. It's crucial to remember that our Expensify eReceipt Guarantee excludes coverage for hotel and motel expenses.
 
-# FAQ
+{% include faq-begin.md %}
 ## What plan/subscription is required in order to manage corporate cards?
 Group Policy (Collect or Control plan only) 
 ## When do my company card transactions import to Expensify?
 Credit card transactions are imported to Expensify once they’re posted to the bank account. This usually takes 1-3 business days between the point of purchase and when the transactions populate in your account.
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Connect-ANZ.md

@@ -24,7 +24,7 @@ Importing your ANZ Visa into Expensify will allow your card transactions to flow
 4. Once you’ve filled out and submitted your Internet Banking data authority form or ANZ Direct Online authority form, ANZ will set up the feed and send all the details directly to Expensify.
 5. Then, we’ll add the card feed to your Expensify account and send you a message to let you know that it has been set up. We'll also include some webinar training resources to ensure you have all the information you need!
 
-# FAQ
+{% include faq-begin.md %}
 ## Are there discounts available for ANZ customers?
 
 As ANZ’s preferred receipt tracking and expense management partner, Expensify offers ANZ business customers a few special perks:
@@ -44,3 +44,5 @@ After the free trial, you’ll get preferred pricing at 50% off the current rate
 
 ## Do I need to sign up for a specific period in order to receive the discount?
 There is no obligation to sign up for a certain period to receive the discount. After your free trial, the 50% discount for the first 12 months, will be applied automatically to your account. After the initial 12 months, the 15% discount will also be applied automatically.
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections.md

@@ -72,7 +72,7 @@ If you need to connect a separate card program from the same bank (that's access
 
 To fix this, you would need to contact your bank and request to combine all of your cards under a single set of login credentials. That way, you can connect all of your cards from that bank to Expensify using a single set of login credentials. 
 
-# FAQ
+{% include faq-begin.md %}
 ## How can I connect and manage my company’s cards centrally if I’m not a domain admin?
  If you cannot access Domains, you must request Domain Admin access to an existing Domain Admin (usually the workspace owner).
 
@@ -112,3 +112,5 @@ If you've answered "yes" to any of these questions, you'll need to update this i
 A Domain Admin can fix the connection by heading to **Settings > Domains > _Domain Name_ > Company Cards > Fix**. You will be prompted to enter the new credentials/updated information, and this should reestablish the connection.
 If you are still experiencing issues with the card connection, please search for company card troubleshooting or contact Expensify Support for help.
 
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation.md

@@ -51,7 +51,7 @@ If there are still unapproved expenses when you want to close your books for the
 - Match Approved Total to Company Card Liability account in your accounting system.
 - Unapproved Total becomes the Accrual amount (provided the first two amounts are correct).
 
-# FAQ  
+{% include faq-begin.md %}  
 
 ## Who can view and access the Reconciliation tab? 
 
@@ -67,3 +67,5 @@ If a cardholder reports expenses as missing, we first recommend using the Reconc
 
 If after updating, the expense still hasn’t appeared, you should reach out to Concierge with the missing expense specifics (merchant, date, amount and last four digits of the card number). Please note, only posted transactions will import. 
 
+
+{% include faq-end.md %}

docs/articles/expensify-classic/bank-accounts-and-credit-cards/deposit-accounts/Deposit-Accounts-USD.md

@@ -56,7 +56,7 @@ You should be all set! The bank account will display as a deposit-only business
 1. Navigate to **Settings > Account > Payments > Bank Accounts** 
 2. Click the **Delete** next to the bank account you want to remove
 
-# FAQ  
+{% include faq-begin.md %}  
 
 ## **What happens if my bank requires an additional security check before adding it to a third-party?**  
 
@@ -73,3 +73,5 @@ There are a few reasons a reimbursement may be unsuccessful. The first step is t
     - Your account wasn’t set up for Direct Deposit/ACH. You may want to contact your bank to confirm. 
 
 If you aren’t sure, please reach out to Concierge and we can assist!
+
+{% include faq-end.md %}

docs/articles/expensify-classic/billing-and-subscriptions/Billing-Overview.md

@@ -26,7 +26,7 @@ If at least 50% of your approved USD spend in a given month is on your company
 Additionally, every month, you receive 1% cash back on all Expensify Card purchases, and 2% if the spend across your Expensify Cards is $250k or more. Any cash back from the Expensify Card is first applied to your Expensify bill, further reducing your price per member. Any leftover cash back is deposited directly into your connected bank account.
 ## Savings calculator
 To see how much money you can save (and even earn!) by using the Expensify Card, check out our [savings calculator](https://use.expensify.com/price-savings-calculator). Just enter a few details and see how much you’ll save!
-# FAQ
+{% include faq-begin.md %}
 ## What if we put less than 50% of our total spend on the Expensify Card?
 If you put less than 50% of your total USD spend on your Expensify Card, your bill gets discounted on a sliding scale based on the percentage of use. So if you don't use the Expensify Card at all, you'll be charged the full rate for each member based on your plan and subscription.
 Example:
@@ -36,3 +36,5 @@ Example:
 You save 70% on the price per member on your bill for that month.
 
 Note: USD spend refers to approved USD transactions on the Expensify Card in any given month, compared to all approved USD spend on workspaces in that same month.
+
+{% include faq-end.md %}

docs/articles/expensify-classic/billing-and-subscriptions/Billing-Owner.md

@@ -38,7 +38,7 @@ To take over billing for the entire domain, you must:
 1. Go to **Settings > Domains > _Domain Name_ > Domain Admins** and enable Consolidated Domain Billing.
 
 Currently, Consolidated Domain Billing simply consolidates the amounts due for each Group Workspace Billing Owner (listed on the **Settings > Workspaces > Group** page). If you want to use the Annual Subscription across all Workspaces on the domain, you must also be the Billing Owner of all Group Workspaces.
-# FAQ
+{% include faq-begin.md %}
 ## Why can't I see the option to take over billing?
 There could be two reasons:
 1. You may not have the role of Workspace Admin. If you can't click on the Workspace name (if it's not a blue hyperlink), you're not a Workspace Admin. Another Workspace Admin for that Workspace must change your role before you can proceed.
@@ -47,3 +47,5 @@ There could be two reasons:
 There are two ways to resolve this:
 1. Have your IT dept. gain access to the account so that you can make yourself an admin. Your IT department may need to recreate the ex-employee's email address. Once your IT department has access to the employee's Home page, you can request a magic link to be sent to that email address to gain access to the account.
 1. Have another admin make you a Workspace admin.
+
+{% include faq-end.md %}

docs/articles/expensify-classic/billing-and-subscriptions/Change-Plan-Or-Subscription.md

@@ -76,9 +76,11 @@ Note: Refunds apply to Collect or Control Group Workspaces with one month of bil
 
 Once you’ve successfully downgraded to a free Expensify account, your Workspace will be deleted and you will see a refund line item added to your Billing History.
 
-# FAQ
+{% include faq-begin.md %}
 ## Will I be charged for a monthly subscription even if I don't use SmartScans?
 Yes, the Monthly Subscription is prepaid and not based on activity, so you'll be charged regardless of usage.
 
 ## I'm on a group policy; do I need the monthly subscription too?
 Probably not. Group policy members already have unlimited SmartScans, so there's usually no need to buy the subscription. However, you can use it for personal use if you leave your company's Workspace.
+
+{% include faq-end.md %}

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

@@ -16,8 +16,10 @@ 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.
-# FAQ
+{% 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.
+
+{% include faq-end.md %}