Merge branch 'main' into kicu/51009-search-icon

.github/workflows/cla.yml

@@ -4,39 +4,9 @@ on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA:
-    runs-on: ubuntu-latest
-    # This job only runs for pull request comments or pull request target events (not issue comments)
-    # It does not run for pull requests created by OSBotify
-    if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify' && github.event.pull_request.user.login != 'imgbot[bot]') }}
-    steps:
-        - name: CLA comment check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: sign
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - name: CLA comment re-check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: recheck
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*recheck\s*'
-        - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
-          # Version: 2.1.2-beta
-          uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
-          env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOTIFY_TOKEN }}
-          with:
-              path-to-signatures: '${{ github.repository }}/cla.json'
-              path-to-document: 'https://github.com/${{ github.repository }}/blob/main/contributingGuides/CLA.md'
-              branch: 'main'
-              remote-organization-name: 'Expensify'
-              remote-repository-name: 'CLA'
-              lock-pullrequest-aftermerge: false
-              allowlist: OSBotify,snyk-bot
+    uses: Expensify/GitHub-Actions/.github/workflows/cla.yml@main
+    secrets: inherit

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009005008
-        versionName "9.0.50-8"
+        versionCode 1009005101
+        versionName "9.0.51-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"

contributingGuides/CONTRIBUTING.md

@@ -32,9 +32,9 @@ This project and everyone participating in it is governed by the Expensify [Code
 At this time, we are not hiring contractors in Crimea, North Korea, Russia, Iran, Cuba, or Syria.
 
 ## Slack channels
-All contributors should be a member of a shared Slack channel called [#expensify-open-source](https://expensify.slack.com/archives/C01GTK53T8Q) -- this channel is used to ask **general questions**, facilitate **discussions**, and make **feature requests**.
+We have a shared Slack channel called #expensify-open-source — this channel is used to ask general questions, facilitate discussions, and make feature requests.
 
-Before requesting an invite to Slack, please ensure your Upwork account is active, since we only pay via Upwork (see [below](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#payment-for-contributions)). To request an invite to Slack, email [email protected] with the subject `Slack Channel Invites`. We'll send you an invite! 
+That said, we have a small issue with adding users at the moment and we’re working with Slack to try and get this resolved. If you would like to join, [fill out this form](https://forms.gle/Q7hnhUJPnQCK7Fe56) with your email and Upwork profile link. Once resolved, we’ll add you.
 
 Note: Do not send direct messages to the Expensify team in Slack or Expensify Chat, they will not be able to respond. 
 

contributingGuides/OFFLINE_UX.md

@@ -85,7 +85,7 @@ When the user is offline:
        - In the event that `successData` and `failureData` are the same, you can use a single object `finallyData` in place of both. 
 
 **Handling errors:**
-- The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.js) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
+- The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.tsx) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
 - The behavior for when something fails is:
     - If you were adding new data, the failed to add data is displayed greyed out and with the button to dismiss the error
     - If you were deleting data, the failed data is displayed regularly with the button to dismiss the error

docs/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite.md

@@ -1,12 +1,11 @@
 ---
 title: NetSuite
-description: Set up the direct connection from Expensify to NetSuite.
+description: Connect NetSuite to Expensify for streamlined expense reporting and accounting integration.
 order: 1
 ---
-# Overview
-Expensify's integration with NetSuite allows you to automate report exports, tailor your coding preferences, and tap into NetSuite's array of advanced features. By correctly configuring your NetSuite settings in Expensify, you can leverage the connection's settings to automate most of the tasks, making your workflow more efficient.
+Expensify's direct integration with NetSuite allows you to automate report exports, tailor your coding preferences, and tap into NetSuite's array of advanced features. 
 
-**Before connecting NetSuite to Expensify, a few things to note:**
+## Before connecting NetSuite to Expensify, review the following details:
 - Token-based authentication works by ensuring that each request to NetSuite is accompanied by a signed token which is verified for authenticity
 - You must be able to login to NetSuite as an administrator to initiate the connection
 - You must have a Control Plan in Expensify to integrate with NetSuite
@@ -15,23 +14,21 @@ Expensify's integration with NetSuite allows you to automate report exports, tai
 - Ensure that your workspace's report output currency setting matches the NetSuite Subsidiary default currency
 - Make sure your page size is set to 1000 for importing your customers and vendors. You can check this in NetSuite under **Setup > Integration > Web Services Preferences > 'Search Page Size'**
 
-# Connect to NetSuite 
-
-## Step 1: Install the Expensify Bundle in NetSuite
+# Step 1: Install the Expensify Bundle in NetSuite
 
 1. While logged into NetSuite as an administrator, go to Customization > SuiteBundler > Search & Install Bundles, then search for "Expensify"
 2. Click on the Expensify Connect bundle (Bundle ID 283395)
 3. Click Install
 4. If you already have the Expensify Connect bundle installed, head to _Customization > SuiteBundler > Search & Install Bundles > List_ and update it to the latest version
 5. Select **Show on Existing Custom Forms** for all available fields
 
-## Step 2: Enable Token-Based Authentication
+# Step 2: Enable Token-Based Authentication
 
 1. Head to _Setup > Company > Enable Features > SuiteCloud > Manage Authentication_
 2. Make sure “Token Based Authentication” is enabled
 3. Click **Save**
 
-## Step 3: Add Expensify Integration Role to a User
+# Step 3: Add Expensify Integration Role to a User
 
 The user you select must have access to at least the permissions included in the Expensify Integration Role, but they're not required to be an Admin.
 1. In NetSuite, head to Lists > Employees, and find the user you want to add the Expensify Integration role to
@@ -40,7 +37,7 @@ The user you select must have access to at least the permissions included in the
 
 Remember that Tokens are linked to a User and a Role, not solely to a User. It's important to note that you cannot establish a connection with tokens using one role and then switch to another role afterward. Once you've initiated a connection with tokens, you must continue using the same token/user/role combination for all subsequent sync or export actions.
 
-## Step 4: Create Access Tokens
+# Step 4: Create Access Tokens
 
 1. Using Global Search in NetSuite, enter “page: tokens”
 2. Click **New Access Token**
@@ -49,58 +46,57 @@ Remember that Tokens are linked to a User and a Role, not solely to a User. It's
 5. Press **Save**
 6. Copy and Paste the token and token ID to a saved location on your computer (this is the only time you will see these details)
 
-## Step 5: Confirm Expense Reports are Enabled in NetSuite.
+# Step 5: Confirm Expense Reports are Enabled in NetSuite.
 
 Enabling Expense Reports is required as part of Expensify's integration with NetSuite:
 1. Logged into NetSuite as an administrator, go to Setup > Company > Enable Features > Employees
 2. Confirm the checkbox next to Expense Reports is checked
 3. If not, click the checkbox and then Save to enable Expense Reports
 
-## Step 6: Confirm Expense Categories are set up in NetSuite.
+# Step 6: Confirm Expense Categories are set up in NetSuite.
 
 Once Expense Reports are enabled, Expense Categories can be set up in NetSuite. Expense Categories are an alias for General Ledger accounts used to code expenses.
-
 1. Logged into NetSuite as an administrator, go to Setup > Accounting > Expense Categories (a list of Expense Categories should show)
 2. If no Expense Categories are visible, click **New** to create new ones
 
-## Step 7: Confirm Journal Entry Transaction Forms are Configured Properly
+# Step 7: Confirm Journal Entry Transaction Forms are Configured Properly
 
 1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_
 2. Click **Customize** or **Edit** next to the Standard Journal Entry form
 3. Then, click Screen Fields > Main. Please verify the "Created From" label has "Show" checked and the Display Type is set to Normal
 4. Click the sub-header Lines and verify that the "Show" column for "Receipt URL" is checked
 5. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the journal type have this same configuration
 
-## Step 8: Confirm Expense Report Transaction Forms are Configured Properly
+# Step 8: Confirm Expense Report Transaction Forms are Configured Properly
 
 1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_
 2. Click **Customize** or **Edit** next to the Standard Expense Report form, then click **Screen Fields > Main**
 3. Verify the "Created From" label has "Show" checked and the Display Type is set to Normal
 4. Click the second sub-header, Expenses, and verify that the 'Show' column for 'Receipt URL' is checked
 5. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the expense report type have this same configuration
 
-## Step 9: Confirm Vendor Bill Transactions Forms are Configured Properly
+# Step 9: Confirm Vendor Bill Transactions Forms are Configured Properly
 
 1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_ 
 2. Click **Customize** or **Edit** next to your preferred Vendor Bill form
 3. Then, click _Screen Fields > Main_ and verify that the "Created From" label has "Show" checked and that Departments, Classes, and Locations have the "Show" label unchecked
 4. Under the Expenses sub-header (make sure to click the "Expenses" sub-header at the very bottom and not "Expenses & Items"), ensure "Show" is checked for Receipt URL, Department, Location, and Class
 5. Go to _Customization > Forms > Transaction Forms_ and provide all other transaction forms with the vendor bill type have this same configuration
 
-## Step 10: Confirm Vendor Credit Transactions Forms are Configured Properly
+# Step 10: Confirm Vendor Credit Transactions Forms are Configured Properly
 
 1. While logged in as an administrator, go to _Customization > Forms > Transaction Forms_
 2. Click **Customize** or **Edit** next to your preferred Vendor Credit form, then click _Screen Fields > Main_ and verify that the "Created From" label has "Show" checked and that Departments, Classes, and Locations have the "Show" label unchecked
 3. Under the Expenses sub-header (make sure to click the "Expenses" sub-header at the very bottom and not "Expenses & Items"), ensure "Show" is checked for Receipt URL, Department, Location, and Class
 4. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the vendor credit type have this same configuration
 
-## Step 11: Set up Tax Groups (only applicable if tracking taxes)
+# Step 11: Set up Tax Groups (only applicable if tracking taxes)
 
 Expensify imports NetSuite Tax Groups (not Tax Codes), which you can find in NetSuite under _Setup > Accounting > Tax Groups_.
 
 Tax Groups are an alias for Tax Codes in NetSuite and can contain one or more Tax Codes (Please note: for UK and Ireland subsidiaries, please ensure your Tax Groups do not have more than one Tax Code). We recommend naming Tax Groups so your employees can easily understand them, as the name and rate will be displayed in Expensify.
 
-Before importing NetSuite Tax Groups into Expensify:
+## Before importing NetSuite Tax Groups into Expensify:
 1. Create your Tax Groups in NetSuite by going to _Setup > Accounting > Tax Groups_
 2. Click **New**
 3. Select the country for your Tax Group
@@ -115,9 +111,9 @@ Ensure Tax Groups can be applied to expenses by going to _Setup > Accounting > S
 
 If this field does not display, it’s not needed for that specific country.
 
-## Step 12: Connect Expensify and NetSuite
+# Step 12: Connect Expensify and NetSuite
 
-1. Log into Expensify as a Policy Admin and go to **Settings > Workspaces > _[Workspace Name]_ > Connections > NetSuite**
+1. Log into Expensify as a Workspace Admin and go to **Settings > Workspaces > _[Workspace Name]_ > Connections > NetSuite**
 2. Click **Connect to NetSuite**
 3. Enter your Account ID (Account ID can be found in NetSuite by going to _Setup > Integration > Web Services Preferences_)
 4. Then, enter the token and token secret 

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.50</string>
+	<string>9.0.51</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.50.8</string>
+	<string>9.0.51.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.50</string>
+	<string>9.0.51</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.50.8</string>
+	<string>9.0.51.1</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.50</string>
+	<string>9.0.51</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.50.8</string>
+	<string>9.0.51.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.50-8",
+  "version": "9.0.51-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.",

src/CONST.ts

@@ -5788,6 +5788,14 @@ const CONST = {
                 description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}.description` as const,
                 icon: 'IntacctSquare',
             },
+            [this.POLICY.CONNECTIONS.NAME.QBD]: {
+                id: this.POLICY.CONNECTIONS.NAME.QBD,
+                alias: 'qbd',
+                name: this.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.quickbooksDesktop,
+                title: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.QBD}.title` as const,
+                description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.QBD}.description` as const,
+                icon: 'QBDSquare',
+            },
             approvals: {
                 id: 'approvals' as const,
                 alias: 'approvals' as const,

src/ROUTES.ts

@@ -149,10 +149,6 @@ const ROUTES = {
         route: 'settings/security/delegate/:login/role/:role/confirm',
         getRoute: (login: string, role: string) => `settings/security/delegate/${encodeURIComponent(login)}/role/${role}/confirm` as const,
     },
-    SETTINGS_DELEGATE_MAGIC_CODE: {
-        route: 'settings/security/delegate/:login/role/:role/magic-code',
-        getRoute: (login: string, role: string) => `settings/security/delegate/${encodeURIComponent(login)}/role/${role}/magic-code` as const,
-    },
     SETTINGS_ABOUT: 'settings/about',
     SETTINGS_APP_DOWNLOAD_LINKS: 'settings/about/app-download-links',
     SETTINGS_WALLET: 'settings/wallet',
@@ -231,7 +227,6 @@ const ROUTES = {
         route: 'settings/profile/contact-methods/:contactMethod/details',
         getRoute: (contactMethod: string, backTo?: string) => getUrlWithBackToParam(`settings/profile/contact-methods/${encodeURIComponent(contactMethod)}/details`, backTo),
     },
-    SETINGS_CONTACT_METHOD_VALIDATE_ACTION: 'settings/profile/contact-methods/validate-action',
     SETTINGS_NEW_CONTACT_METHOD: {
         route: 'settings/profile/contact-methods/new',
         getRoute: (backTo?: string) => getUrlWithBackToParam('settings/profile/contact-methods/new', backTo),

src/SCREENS.ts

@@ -74,7 +74,6 @@ const SCREENS = {
             DISPLAY_NAME: 'Settings_Display_Name',
             CONTACT_METHODS: 'Settings_ContactMethods',
             CONTACT_METHOD_DETAILS: 'Settings_ContactMethodDetails',
-            CONTACT_METHOD_VALIDATE_ACTION: 'Settings_ValidateContactMethodAction',
             NEW_CONTACT_METHOD: 'Settings_NewContactMethod',
             STATUS_CLEAR_AFTER: 'Settings_Status_Clear_After',
             STATUS_CLEAR_AFTER_DATE: 'Settings_Status_Clear_After_Date',
@@ -134,7 +133,6 @@ const SCREENS = {
             ADD_DELEGATE: 'Settings_Delegate_Add',
             DELEGATE_ROLE: 'Settings_Delegate_Role',
             DELEGATE_CONFIRM: 'Settings_Delegate_Confirm',
-            DELEGATE_MAGIC_CODE: 'Settings_Delegate_Magic_Code',
             UPDATE_DELEGATE_ROLE: 'Settings_Delegate_Update_Role',
             UPDATE_DELEGATE_ROLE_MAGIC_CODE: 'Settings_Delegate_Update_Magic_Code',
         },

src/components/ConnectToQuickbooksDesktopFlow/index.tsx

@@ -1,7 +1,6 @@
 import {useEffect} from 'react';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import Navigation from '@libs/Navigation/Navigation';
-import * as PolicyAction from '@userActions/Policy/Policy';
 import ROUTES from '@src/ROUTES';
 import type {ConnectToQuickbooksDesktopFlowProps} from './types';
 
@@ -12,8 +11,6 @@ function ConnectToQuickbooksDesktopFlow({policyID}: ConnectToQuickbooksDesktopFl
         if (isSmallScreenWidth) {
             Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_REQUIRED_DEVICE_MODAL.getRoute(policyID));
         } else {
-            // Since QBD doesn't support Taxes, we should disable them from the LHN when connecting to QBD
-            PolicyAction.enablePolicyTaxes(policyID, false);
             Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_MODAL.getRoute(policyID));
         }
     }, [isSmallScreenWidth, policyID]);