Merge branch 'main' of https://github.com/Expensify/App

.github/workflows/test.yml

@@ -41,7 +41,7 @@ jobs:
           key: ${{ runner.os }}-jest
 
       - name: Jest tests
-        run: npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
+        run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
 
   storybookTests:
     if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}

.nvmrc

@@ -1 +1 @@
-20.10.0
+20.13.0

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047201
-        versionName "1.4.72-1"
+        versionCode 1001047301
+        versionName "1.4.73-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"

assets/emojis/index.ts

@@ -1,7 +1,5 @@
 import type {Locale} from '@src/types/onyx';
 import emojis from './common';
-import enEmojis from './en';
-import esEmojis from './es';
 import type {Emoji, EmojisList} from './types';
 
 type EmojiTable = Record<string, Emoji>;
@@ -30,10 +28,22 @@ const emojiCodeTableWithSkinTones = emojis.reduce<EmojiTable>((prev, cur) => {
 }, {});
 
 const localeEmojis: LocaleEmojis = {
-    en: enEmojis,
-    es: esEmojis,
+    en: undefined,
+    es: undefined,
+};
+
+const importEmojiLocale = (locale: Locale) => {
+    const normalizedLocale = locale.toLowerCase().split('-')[0] as Locale;
+    if (!localeEmojis[normalizedLocale]) {
+        const emojiImportPromise = normalizedLocale === 'en' ? import('./en') : import('./es');
+        return emojiImportPromise.then((esEmojiModule) => {
+            // it is needed because in jest test the modules are imported in double nested default object
+            localeEmojis[normalizedLocale] = esEmojiModule.default.default ? (esEmojiModule.default.default as unknown as EmojisList) : esEmojiModule.default;
+        });
+    }
+    return Promise.resolve();
 };
 
 export default emojis;
-export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis};
+export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis, importEmojiLocale};
 export {skinTones, categoryFrequentlyUsed} from './common';

docs/articles/new-expensify/expenses/Resolve-Errors-Adding-a-Bank-Account.md

@@ -0,0 +1,21 @@
+---
+title: Resolve Errors Adding a Bank Account
+description: Troubleshooting issues adding a business bank account in Expensify.
+---
+<div id="new-expensify" markdown="1">
+
+Expensify is required to verify the identity of the individual who is connecting a business bank account.
+
+**If you get a generic error message while uploading your ID, please go through the following steps:**
+1. Ensure you are using either Safari (on iPhone) or Chrome (on Android) as your web browser.
+2. Check your browser's permissions to make sure that the camera and microphone settings are set to "Allow"
+3. Clear your web cache for Safari (on iPhone) or Chrome (on Android).
+4. If using a corporate Wi-Fi network, confirm that your corporate firewall isn't blocking the website.
+5. Make sure no other apps are overlapping your screen, such as the Facebook Messenger bubble, while recording the video. 
+6. On iPhone, if using iOS version 15 or later, disable the Hide IP address feature in Safari.
+7. If possible, try these steps on another device
+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.
+
+</div>

docs/articles/new-expensify/settings/Security.md → docs/articles/new-expensify/settings/Encryption-and-Data-Security.md

@@ -1,5 +1,5 @@
 ---
-title: Security
+title: Encryption and Data Security
 description: Expensify prioritizes data security and maintains strict compliance standards to safeguard users' sensitive information.
 ---
 <!-- The lines above are required by Jekyll to process the .md file -->

docs/articles/new-expensify/workspaces/Coming-Soon.md

@@ -0,0 +1,6 @@
+---
+title: Coming Soon!
+description: More info coming soon!
+---
+
+<!-- The lines above are required by Jekyll to process the .md file -->

docs/articles/new-expensify/workspaces/Create-expense-categories.md

@@ -0,0 +1,114 @@
+---
+title: Create expense categories
+description: Add categories to use for coding expenses
+---
+<div id="new-expensify" markdown="1">
+
+In Expensify, categories refer to the **chart of accounts, GL accounts, expense accounts**, and other line-item details that help code expenses for accounting and financial reporting.
+
+An admin can manually create categories for a workspace, or they will be automatically imported if your workspace is connected to another platform such as QuickBooks Online, QuickBooks Desktop, Intacct, Xero, or NetSuite. These imported categories can be enabled or disabled to use as categories for expenses added to Expensify. Additionally, Expensify will learn how you apply categories to specific merchants over time and apply them automatically.
+
+# Manually add or delete categories
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+To manually add a category,
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace you want to add categories to. 
+4. Click **Categories** in the left menu.
+5. Click **Add Category** in the top right. 
+6. Enter a name for the category and click **Save**.
+
+To delete a category, 
+
+1. Click the category on the Categories page. 
+2. Click the 3-dot menu in the top right. 
+3. Click **Delete category** to permanently delete the category. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+To manually add a category,
+
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select the workspace you want to add categories to.
+4. Tap **Categories**.
+5. Tap **Add Category**. 
+6. Enter a name for the category and tap **Save**. 
+
+To delete a category, 
+1. Tap the category on the Categories page. 
+2. Tap the 3-dot menu in the top right. 
+3. Tap **Delete category** to permanently delete the category.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Enable or disable categories
+
+Once you have manually added your categories or automatically imported them from a connected accounting system, you can enable or disable the categories to determine whether they can be added to expenses. 
+
+{% include info.html %}
+After connecting an accounting system, Expensify automatically imports charts of accounts, GL accounts, expense accounts, and additional details into your workspace as **disabled** categories. Workspace admins can enable these categories to make them available for workspace members to add to their expenses.
+{% include end-info.html %}
+
+To enable or disable a category, 
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select a workspace. 
+4. Click **Categories** in the left menu.
+5. Click a category and use the toggle to enable or disable it.
+
+{% include info.html %}
+You can enable, disable, or delete categories in bulk by selecting the checkbox to the left of the categories. Then click the “selected” dropdown menu at the top right of the page and select the desired option. 
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select a workspace. 
+4. Tap **Categories**.
+5. Tap a category and use the toggle to enable or disable it. 
+
+{% include info.html %}
+You can enable, disable, or delete categories in bulk by selecting the checkbox to the left of the categories. Then tap the “selected” dropdown menu at the top of the page and select the desired option.
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include end-selector.html %} 
+
+# Automatic Expensify categories
+
+Over time, Expensify learns how you categorize specific merchants and automatically applies that category to the merchant in the future. 
+- If you change a category, Expensify learns that correction over time as well. However, changing a category on one expense does not change it for other expenses that have already been assigned the category.
+- Any expense rules for your workspace take priority over Expensify’s automatic categories. 
+- Expensify won’t automatically add a category to an expense if it is already manually assigned a category. 
+
+{% include faq-begin.md %}
+**Can I edit my categories on a submitted expense report?**
+
+Yes, you can edit categories on an expense you have submitted until the expense is approved or reimbursed. 
+
+Approvers can also edit categories on the submitter’s behalf, even after approval. If you are an approver reviewing a report that wasn’t submitted to you, you’ll see the option to take control of the report and then you can change the category. 
+
+**Can I see an audit trail of category changes on an expense?** 
+
+Yes. When a category is manually edited, Expensify will log the change in the related workspace chat. 
+
+**If I change categories in my accounting system, what happens to categories in the workspace?**
+
+If a category is disabled in the accounting system, it will be removed from the workspace’s categories list in the workspace. However, the disabled category will remain on approved and drafted expense reports that it has been previously added to. An admin can change the category on an approved or reimbursed expense, and anyone can change the category on an unapproved expense.
+
+{% include faq-end.md %}
+
+</div>