Merge branch 'refs/heads/main' into company-cards-initial-setup

# Conflicts:
#	src/CONST.ts
#	src/languages/en.ts
#	src/languages/es.ts
#	src/libs/Navigation/types.ts
#	src/pages/workspace/WorkspaceInitialPage.tsx

.github/scripts/createHelpRedirects.sh

@@ -27,32 +27,6 @@ function checkCloudflareResult {
 declare -a ITEMS_TO_ADD
 
 while read -r line; do
-    # Split each line of the file into a source and destination so we can sanity check
-    # and compare against the current list.
-    read -r -a LINE_PARTS < <(echo "$line" | tr ',' ' ')
-    SOURCE_URL=${LINE_PARTS[0]}
-    DEST_URL=${LINE_PARTS[1]}
-
-    # Make sure the format of the line is as execpted.
-    if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
-        error "Found a line with more than one comma: $line"
-        exit 1
-    fi
-
-    # Basic sanity checking to make sure that the source and destination are in expected
-    # subdomains.
-    if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]]; then
-        error "Found source URL that is not a communityDot or helpDot URL: $SOURCE_URL"
-        exit 1
-    fi
-
-    if ! [[ $DEST_URL =~ ^https://(help|use)\.expensify\.com ]]; then
-        error "Found destination URL that is not a helpDot or useDot URL: $DEST_URL"
-        exit 1
-    fi
-
-    info "Source: $SOURCE_URL and destination: $DEST_URL appear to be formatted correctly."
-
     ITEMS_TO_ADD+=("$line")
 
 # This line skips the first line in the csv because the first line is a header row.
@@ -83,6 +57,9 @@ done | jq -n '. |= [inputs]')
 
 info "Adding redirects for $PUT_JSON"
 
+# Dump $PUT_JSON into a file otherwise the curl request below will fail with too many arguments
+echo "$PUT_JSON" > redirects.json
+
 # We use PUT here instead of POST so that we replace the entire list in place. This has many benefits:
 # 1. We don't have to check if items are already in the list, allowing this script to run faster
 # 2. We can support deleting redirects this way by simply removing them from the list
@@ -93,7 +70,7 @@ info "Adding redirects for $PUT_JSON"
 PUT_RESULT=$(curl -s --request PUT --url "https://api.cloudflare.com/client/v4/accounts/$ZONE_ID/rules/lists/$LIST_ID/items" \
     --header 'Content-Type: application/json' \
     --header "Authorization: Bearer $CLOUDFLARE_LIST_TOKEN" \
-    --data "$PUT_JSON")
+    --data-binary @redirects.json)
 
 checkCloudflareResult "$PUT_RESULT"
 OPERATION_ID=$(echo "$PUT_RESULT" | jq -r .result.operation_id)

.github/scripts/verifyRedirect.sh

@@ -3,7 +3,10 @@
 # HelpDot - Verifies that redirects.csv does not have any duplicates
 # Duplicate sourceURLs break redirection on cloudflare pages
 
+source scripts/shellUtils.sh
+
 declare -r REDIRECTS_FILE="docs/redirects.csv"
+declare -a ITEMS_TO_ADD
 
 declare -r RED='\033[0;31m'
 declare -r GREEN='\033[0;32m'
@@ -22,5 +25,44 @@ if [[ DETECT_CYCLE_EXIT_CODE -eq 1 ]]; then
     exit 1
 fi
 
+while read -r line; do
+    # Split each line of the file into a source and destination so we can sanity check
+    # and compare against the current list.
+    read -r -a LINE_PARTS < <(echo "$line" | tr ',' ' ')
+    SOURCE_URL=${LINE_PARTS[0]}
+    DEST_URL=${LINE_PARTS[1]}
+
+    # Make sure the format of the line is as expected.
+    if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
+        error "Found a line with more than one comma: $line"
+        exit 1
+    fi
+
+    # Basic sanity checking to make sure that the source and destination are in expected
+    # subdomains.
+    if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]] || [[ $SOURCE_URL =~ \# ]]; then
+    error "Found source URL that is not a communityDot or helpDot URL, or contains a '#': $SOURCE_URL"
+    exit 1
+fi
+
+    if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
+        error "Found destination URL that is not a supported URL: $DEST_URL"
+        exit 1
+    fi
+
+    info "Source: $SOURCE_URL and destination: $DEST_URL appear to be formatted correctly."
+
+    ITEMS_TO_ADD+=("$line")
+
+# This line skips the first line in the csv because the first line is a header row.
+done <<< "$(tail +2 $REDIRECTS_FILE)"
+
+# Sanity check that we should actually be running this and we aren't about to delete
+# every single redirect.
+if [[ "${#ITEMS_TO_ADD[@]}" -lt 1 ]]; then
+    error "No items found to add, why are we running?"
+    exit 1
+fi
+
 echo -e "${GREEN}The redirects.csv is valid!${NC}"
 exit 0

android/app/build.gradle

@@ -108,8 +108,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009002207
-        versionName "9.0.22-7"
+        versionCode 1009002400
+        versionName "9.0.24-0"
         // 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/bank-accounts/Connect-US-Business-Bank-Account.md

@@ -96,7 +96,7 @@ If you do not see these test transactions after two business days, click the gre
 
 {% include faq-begin.md %}
 
-**I received a “something’s gone wrong” error while trying to add my ID to Onfido.**
+### I received a “something’s gone wrong” error while trying to add my ID to Onfido.
 
 If you receive an error message during this process, check all of the following:
 - Ensure you are using either the Safari (on iPhone) or Chrome (on Android) browser.
@@ -108,44 +108,62 @@ If you receive an error message during this process, check all of the following:
 
 If the issue persists, follow these steps on a different device, if possible. Contact your Account Manager or Concierge for further troubleshooting assistance.
 
-**Should I add a Beneficial Owner if our business is owned by another company?**
+### Should I add a Beneficial Owner if our business is owned by another company?
 
 No, you should only indicate that you have a Beneficial Owner if an individual owns 25% or more of the business.
 
-**Why can’t I input my address or upload my ID?**
+### Why can’t I input my address or upload my ID?
 
 Ensure that the address you’re entering is in the United States. When adding a verified business bank account in Expensify, the individual adding the account and any beneficial owners are required to have a U.S. address, photo ID, and SSN. 
 
 If you do not meet these requirements, you’ll need to have another admin add the bank account and share access with you once the account is verified.
 
-**Why am I being asked for documentation when adding my bank account?**
+### Why am I being asked for documentation when adding my bank account?
 
 When a bank account is added to Expensify, we conduct a series of checks to comply with both our sponsor bank’s requirements and federal government regulations for the Bank Secrecy Act (BSA), Anti-Money Laundering (AML) laws, and anti-fraud. 
 
 If automatic verification fails, we may request manual verification, which could require documents such as address verification for your business, a letter from your bank confirming bank account ownership, etc.
 
 If you have any questions regarding the documentation request you received, contact Concierge for additional assistance.
 
-**I don’t see all three microtransactions I need to validate my bank account.** 
+### What should I do if I don’t see all three microtransactions needed to validate my bank account?
 
 If you do not see the three microtransactions by the end of the second business day, contact your bank and ask them to whitelist Expensify’s ACH IDs 1270239450 and 4270239450. Expensify’s ACH Originator Name is “Expensify.”
 
 Once you are whitelisted, contact your Account Manager or Concierge, and our team will re-trigger the three transactions.
 
-**What happens if my bank requires an additional security check before adding it to a third party?**
+### What happens if my bank requires an additional security check before adding it to a third party?
 
 If your bank account has two-factor authentication (2FA) or another security step enabled, you should be prompted to complete this authentication step when connecting the account to Expensify. However, if you encounter an error during this process, you can close the pop-up window and select Connect Manually to add the account manually.
 
-**I added a business deposit account. Can I also pay employees from this account?** 
+### I added a business deposit account. Can I also pay employees from this account?
 
 To pay employees from a business deposit account, click **Verify** next to the bank account. This will take you through the additional verification steps required to make this account a verified business bank account that you can use to issue payments.
 
-**I connected my business deposit account. Why haven’t I received my reimbursement?**
+### I connected my business deposit account. Why haven’t I received my reimbursement?
 
 There are a few reasons why you might not have received a reimbursement:  
 - The estimated deposit date on the report has not arrived yet.
 - The bank account information is incorrect. If you believe you may have entered the wrong account, contact the Concierge and provide the Report ID for the missing reimbursement.
-- Your account wasn’t set up for Direct Deposit/ACH. You can contact your bank to confirm.
+- Your account wasn’t set up for Direct Deposit/ACH. Please contact your bank to confirm.
+
+### Are there certain industries or businesses for which Expensify cannot process payments?
+
+There are! If your business is associated with one of the following industries, you won't be able to connect your business bank account to process payments:
+- Security Brokers & Dealers
+- Dating & Escort Services
+- Massage Parlors
+- Casinos & Gambling/Betting Services
+- Non-FI, Money Orders
+- Wires, Money Orders
+- Government Owned Lotteries
+- Government Licensed Online Casinos (Online Gambling)
+- Government Licensed Horse/Dog Racing
+- Crypto-currency businesses
+- Internet gambling
+- Marijuana-related businesses
+- Firearm-related businesses (manufacturing and selling)
+- NFT (non-fungible token) services
 
 {% include faq-end.md %}