[HybridApp] Use NewDot login page

.eslintignore

@@ -12,5 +12,8 @@ docs/assets/**
 web/gtm.js
 **/.expo/**
 src/libs/SearchParser/searchParser.js
+<<<<<<< HEAD
+=======
 src/libs/SearchParser/autocompleteParser.js
+>>>>>>> main
 help/_scripts/**

.github/workflows/deployNewHelp.yml

@@ -55,7 +55,11 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v3
         with:
+<<<<<<< HEAD
+          node-version: '20.15.1'
+=======
           node-version: '20.18.0'
+>>>>>>> main
 
       # Wil install the _help/package.js
       - name: Install Node.js Dependencies

.github/workflows/e2ePerformanceTests.yml

@@ -32,13 +32,32 @@ jobs:
         with:
           fetch-depth: 0  # Fetches the entire history
 
+<<<<<<< HEAD
+      - name: Get most recent release version
+        id: getMostRecentRelease
+        run: echo "VERSION=$(gh release list --limit 1 | awk '{ print $1 }')" >> "$GITHUB_OUTPUT"
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: Check if there's an existing artifact for this baseline
+        id: checkForExistingArtifact
+        uses: ./.github/actions/javascript/getArtifactInfo
+        with:
+          GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
+          ARTIFACT_NAME: baseline-${{ steps.getMostRecentRelease.outputs.VERSION }}android-artifact-apk
+
+      - name: Skip build if there's already an existing artifact for the baseline
+        if: ${{ fromJSON(steps.checkForExistingArtifact.outputs.ARTIFACT_FOUND) }}
+        run: echo 'APK for baseline ${{ steps.getMostRecentRelease.outputs.VERSION }} already exists, reusing existing build'
+=======
       - name: Determine "baseline ref" (prev merge commit)
         id: getBaselineRef
         run: |
           previous_merge=$(git rev-list --merges HEAD~1 | head -n 1)
           git checkout "$previous_merge"
           echo "$previous_merge"
           echo "BASELINE_REF=$previous_merge" >> "$GITHUB_OUTPUT"
+>>>>>>> main
 
       - name: Get pull request details
         id: getPullRequestDetails

android/app/build.gradle

@@ -110,8 +110,13 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
+<<<<<<< HEAD
+        versionCode 1009005007
+        versionName "9.0.50-7"
+=======
         versionCode 1009005201
         versionName "9.0.52-1"
+>>>>>>> main
         // 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/redirects.csv

@@ -585,7 +585,13 @@ https://community.expensify.com/discussion/6699/faq-troubleshooting-known-bank-s
 https://community.expensify.com/discussion/4730/faq-expenses-are-exporting-to-the-wrong-accounts-whys-that,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings
 https://community.expensify.com/discussion/9000/how-to-integrate-with-deel,https://help.expensify.com/articles/expensify-classic/connections/Deel
 https://community.expensify.com/categories/expensify-classroom,https://use.expensify.com
+<<<<<<< HEAD
+https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-Receive-for-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-and-Receive-Payment-for-Invoices.md
+https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Bulk-Upload-Multiple-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Add-Invoices-in-Bulk
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills
+=======
 https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/adding-payment-card-subscription-overview,https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/add-a-payment-card-and-view-your-subscription
 https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-Receive-for-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Send-and-Receive-Payment-for-Invoices.md
 https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Bulk-Upload-Multiple-Invoices,https://help.expensify.com/articles/expensify-classic/articles/expensify-classic/expenses/Add-Invoices-in-Bulk
-https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Create-and-Pay-Bills
+>>>>>>> main

ios/NewExpensify/Info.plist

@@ -19,7 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
+<<<<<<< HEAD
+	<string>9.0.50</string>
+=======
 	<string>9.0.52</string>
+>>>>>>> main
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +44,11 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
+<<<<<<< HEAD
+	<string>9.0.50.7</string>
+=======
 	<string>9.0.52.1</string>
+>>>>>>> main
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,18 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
+<<<<<<< HEAD
+	<string>9.0.50</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>9.0.50.7</string>
+=======
 	<string>9.0.52</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>9.0.52.1</string>
+>>>>>>> main
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,15 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
+<<<<<<< HEAD
+	<string>9.0.50</string>
+	<key>CFBundleVersion</key>
+	<string>9.0.50.7</string>
+=======
 	<string>9.0.52</string>
 	<key>CFBundleVersion</key>
 	<string>9.0.52.1</string>
+>>>>>>> main
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,10 @@
 {
   "name": "new.expensify",
+<<<<<<< HEAD
+  "version": "9.0.50-7",
+=======
   "version": "9.0.52-1",
+>>>>>>> main
   "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

@@ -1143,6 +1143,9 @@ const CONST = {
         SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300,
         RESIZE_DEBOUNCE_TIME: 100,
         UNREAD_UPDATE_DEBOUNCE_TIME: 300,
+        SEARCH_CONVERT_SEARCH_VALUES: 'search_convert_search_values',
+        SEARCH_MAKE_TREE: 'search_make_tree',
+        SEARCH_BUILD_TREE: 'search_build_tree',
         SEARCH_FILTER_OPTIONS: 'search_filter_options',
         USE_DEBOUNCED_STATE_DELAY: 300,
     },
@@ -1515,7 +1518,10 @@ const CONST = {
             CLASSES: 'classes',
             CUSTOMERS: 'customers',
         },
+<<<<<<< HEAD
+=======
         IMPORT_ITEMS: 'importItems',
+>>>>>>> main
     },
 
     QUICKBOOKS_CONFIG: {
@@ -2539,13 +2545,16 @@ const CONST = {
             VISA: 'vcf',
             AMEX: 'gl1025',
             STRIPE: 'stripe',
+<<<<<<< HEAD
+=======
             CITIBANK: 'oauth.citibank.com',
             CAPITAL_ONE: 'oauth.capitalone.com',
             BANK_OF_AMERICA: 'oauth.bankofamerica.com',
             CHASE: 'oauth.chase.com',
             BREX: 'oauth.brex.com',
             WELLS_FARGO: 'oauth.wellsfargo.com',
             AMEX_DIRECT: 'oauth.americanexpressfdx.com',
+>>>>>>> main
         },
         STEP_NAMES: ['1', '2', '3', '4'],
         STEP: {
@@ -2633,6 +2642,8 @@ const CONST = {
             WELLS_FARGO: 'Wells Fargo',
             OTHER: 'Other',
         },
+<<<<<<< HEAD
+=======
         BANK_CONNECTIONS: {
             WELLS_FARGO: 'wellsfargo',
             CHASE: 'chase',
@@ -2641,6 +2652,7 @@ const CONST = {
             CITI_BANK: 'citibank',
             AMEX: 'americanexpressfdx',
         },
+>>>>>>> main
         AMEX_CUSTOM_FEED: {
             CORPORATE: 'American Express Corporate Cards',
             BUSINESS: 'American Express Business Cards',
@@ -5973,12 +5985,15 @@ const CONST = {
         HAS_CHILD_REPORT_AWAITING_ACTION: 'hasChildReportAwaitingAction',
         HAS_MISSING_INVOICE_BANK_ACCOUNT: 'hasMissingInvoiceBankAccount',
     },
+<<<<<<< HEAD
+=======
 
     RBR_REASONS: {
         HAS_ERRORS: 'hasErrors',
         HAS_VIOLATIONS: 'hasViolations',
         HAS_TRANSACTION_THREAD_VIOLATIONS: 'hasTransactionThreadViolations',
     },
+>>>>>>> main
 } as const;
 
 type Country = keyof typeof CONST.ALL_COUNTRIES;

src/Expensify.tsx

@@ -88,6 +88,7 @@ function Expensify() {
     const [session] = useOnyx(ONYXKEYS.SESSION);
     const [lastRoute] = useOnyx(ONYXKEYS.LAST_ROUTE);
     const [userMetadata] = useOnyx(ONYXKEYS.USER_METADATA);
+    const [useNewDotSignInPage] = useOnyx(ONYXKEYS.USE_NEWDOT_SIGN_IN_PAGE);
     const [shouldShowRequire2FAModal, setShouldShowRequire2FAModal] = useState(false);
     const [isCheckingPublicRoom] = useOnyx(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, {initWithStoredValues: false});
     const [updateAvailable] = useOnyx(ONYXKEYS.UPDATE_AVAILABLE, {initWithStoredValues: false});
@@ -119,7 +120,9 @@ function Expensify() {
     const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom;
     const shouldHideSplash =
         shouldInit &&
-        (NativeModules.HybridAppModule ? splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && isAuthenticated : splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE);
+        (NativeModules.HybridAppModule
+            ? splashScreenState === CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN && (isAuthenticated || useNewDotSignInPage)
+            : splashScreenState === CONST.BOOT_SPLASH_STATE.VISIBLE);
 
     const initializeClient = () => {
         if (!Visibility.isVisible()) {

src/ONYXKEYS.ts

@@ -441,6 +441,9 @@ const ONYXKEYS = {
     /** Stores recently used currencies */
     RECENTLY_USED_CURRENCIES: 'nvp_recentlyUsedCurrencies',
 
+    /** Stores the information if HybridApp uses NewDot's sign in flow */
+    USE_NEWDOT_SIGN_IN_PAGE: 'useNewDotSignInPage',
+
     /** Company cards custom names */
     NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES: 'nvp_expensify_ccCustomNames',
 
@@ -1004,8 +1007,10 @@ type OnyxValuesMapping = {
     [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
     [ONYXKEYS.IMPORTED_SPREADSHEET]: OnyxTypes.ImportedSpreadsheet;
     [ONYXKEYS.LAST_ROUTE]: string;
+    [ONYXKEYS.IS_SINGLE_NEW_DOT_ENTRY]: boolean | undefined;
     [ONYXKEYS.IS_USING_IMPORTED_STATE]: boolean;
     [ONYXKEYS.SHOULD_SHOW_SAVED_SEARCH_RENAME_TOOLTIP]: boolean;
+    [ONYXKEYS.USE_NEWDOT_SIGN_IN_PAGE]: boolean;
     [ONYXKEYS.NVP_EXPENSIFY_COMPANY_CARDS_CUSTOM_NAMES]: Record<string, string>;
 };
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;

src/SCREENS.ts

@@ -133,6 +133,10 @@ const SCREENS = {
             ADD_DELEGATE: 'Settings_Delegate_Add',
             DELEGATE_ROLE: 'Settings_Delegate_Role',
             DELEGATE_CONFIRM: 'Settings_Delegate_Confirm',
+<<<<<<< HEAD
+            DELEGATE_MAGIC_CODE: 'Settings_Delegate_Magic_Code',
+=======
+>>>>>>> main
             UPDATE_DELEGATE_ROLE: 'Settings_Delegate_Update_Role',
             UPDATE_DELEGATE_ROLE_MAGIC_CODE: 'Settings_Delegate_Update_Magic_Code',
         },
@@ -334,7 +338,10 @@ const SCREENS = {
             QUICKBOOKS_DESKTOP_CLASSES_DISPLAYED_AS: 'Policy_Accounting_Quickbooks_Desktop_Import_Classes_Dipslayed_As',
             QUICKBOOKS_DESKTOP_CUSTOMERS: 'Policy_Accounting_Quickbooks_Desktop_Import_Customers',
             QUICKBOOKS_DESKTOP_CUSTOMERS_DISPLAYED_AS: 'Policy_Accounting_Quickbooks_Desktop_Import_Customers_Dipslayed_As',
+<<<<<<< HEAD
+=======
             QUICKBOOKS_DESKTOP_ITEMS: 'Policy_Accounting_Quickbooks_Desktop_Import_Items',
+>>>>>>> main
             XERO_IMPORT: 'Policy_Accounting_Xero_Import',
             XERO_ORGANIZATION: 'Policy_Accounting_Xero_Customers',
             XERO_CHART_OF_ACCOUNTS: 'Policy_Accounting_Xero_Import_Chart_Of_Accounts',

src/components/ConnectToQuickbooksDesktopFlow/index.tsx

@@ -1,17 +1,29 @@
 import {useEffect} from 'react';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import Navigation from '@libs/Navigation/Navigation';
+<<<<<<< HEAD
+import * as PolicyAction from '@userActions/Policy/Policy';
+=======
+>>>>>>> main
 import ROUTES from '@src/ROUTES';
 import type {ConnectToQuickbooksDesktopFlowProps} from './types';
 
 function ConnectToQuickbooksDesktopFlow({policyID}: ConnectToQuickbooksDesktopFlowProps) {
+<<<<<<< HEAD
+=======
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
+>>>>>>> main
     const {isSmallScreenWidth} = useResponsiveLayout();
 
     useEffect(() => {
         if (isSmallScreenWidth) {
             Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_REQUIRED_DEVICE_MODAL.getRoute(policyID));
         } else {
+<<<<<<< HEAD
+            // Since QBD doesn't support Taxes, we should disable them from the LHN when connecting to QBD
+            PolicyAction.enablePolicyTaxes(policyID, false);
+=======
+>>>>>>> main
             Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_DESKTOP_SETUP_MODAL.getRoute(policyID));
         }
     }, [isSmallScreenWidth, policyID]);

src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+import React, {memo} from 'react';
+=======
 import React, {memo, useState} from 'react';
+>>>>>>> main
 import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {CustomRendererProps, TBlock} from 'react-native-render-html';

src/components/HeaderWithBackButton/index.tsx

@@ -191,7 +191,7 @@ function HeaderWithBackButton({
                     />
                 )}
                 {middleContent}
-                <View style={[styles.reportOptions, styles.flexRow, styles.pr5, styles.alignItemsCenter]}>
+                <View style={[styles.reportOptions, styles.flexRow, styles.pr5, styles.gap4, styles.alignItemsCenter]}>
                     {children}
                     {shouldShowDownloadButton && (
                         <Tooltip text={translate('common.download')}>

src/components/Icon/Expensicons.ts

@@ -405,5 +405,8 @@ export {
     Bookmark,
     Star,
     QBDSquare,
+<<<<<<< HEAD
+=======
     GalleryNotFound,
+>>>>>>> main
 };

src/components/InitialURLContextProvider.tsx

@@ -31,9 +31,10 @@ function InitialURLContextProvider({children, url}: InitialURLContextProviderPro
 
     useEffect(() => {
         if (url) {
-            const route = signInAfterTransitionFromOldDot(url);
-            setInitialURL(route);
-            setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
+            signInAfterTransitionFromOldDot(url).then((route) => {
+                setInitialURL(route);
+                setSplashScreenState(CONST.BOOT_SPLASH_STATE.READY_TO_BE_HIDDEN);
+            });
             return;
         }
         Linking.getInitialURL().then((initURL) => {

src/components/MoneyReportHeader.tsx

@@ -138,7 +138,12 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const shouldDisableApproveButton = shouldShowApproveButton && !ReportUtils.isAllowedToApproveExpenseReport(moneyRequestReport);
 
+<<<<<<< HEAD
+    const shouldShowSubmitButton = !!moneyRequestReport && isDraft && reimbursableSpend !== 0 && !hasAllPendingRTERViolations && !shouldShowBrokenConnectionViolation;
+
+=======
     const currentUserAccountID = getCurrentUserAccountID();
+>>>>>>> main
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
 
     const shouldShowSubmitButton =