Merge branch 'main' of https://github.com/TaduJR/App into fix-localization-dates-not-being-localized-correctly

Author: TaduJR

assets/images/integrationicons/dualentry-icon-square.svg

@@ -89,6 +89,7 @@
         "Crédit",
         "DFOLLY",
         "DSYM",
+        "DUALENTRY",
         "DYNAMICEXTERNAL",
         "Danske",
         "Deel",
@@ -582,6 +583,7 @@
         "dotlottie",
         "dsyms",
         "dylib",
+        "dualEntry",
         "durationMillis",
         "e2edelta",
         "ecash",

cspell.json

@@ -1,7 +1,7 @@
 ---
 title: How Concierge Analyzes Spend
 description: Learn how Concierge proactively analyzes company spend to share highlights, and how to ask Concierge questions about your expense data on demand.
-keywords: [New Expensify, Concierge, spend analysis, ask Concierge about expenses, expense questions, Concierge management report, insights, AI, expense trends, proactive insights, spend monitoring, flux analysis]
+keywords: [New Expensify, Concierge, spend analysis, ask Concierge about expenses, expense questions, Concierge management report, insights, AI, expense trends, proactive insights, spend monitoring, flux analysis, spend chart, bar chart, Concierge chart]
 internalScope: Audience is Workspace Admins and Members. Covers how Concierge performs proactive spend analysis and how to ask Concierge questions about expense data. Does not cover how to use Insights or generate custom reports.
 ---
 
@@ -51,6 +51,19 @@ Concierge currently answers direct lookup questions about your expense data. If
 
 ---
 
+## How to explore a Concierge spend chart
+
+When you ask Concierge to show spending as a chart—for example, “Give me a bar chart of my monthly expenses this year”—Concierge can reply with an interactive bar chart directly in the chat, alongside its written answer.
+
+On web, you can interact with the chart to dig into the numbers behind it:
+
+- Hover over a bar to see a tooltip with the details for that bar.
+- Select a bar to open its matching expenses on the **Search** page.
+
+This lets you move from a high-level view of your spend straight to the individual expenses without building a search yourself.
+
+---
+
 ## Where Concierge shares spend analysis insights
 
 When Concierge analyzes spend proactively, it sends a message to the #admins room for that workspace. The message is visible to all members of that room.

docs/articles/new-expensify/concierge-ai/How-Concierge-Analyzes-Spend.md

@@ -519,6 +519,7 @@ const CONST = {
         RILLET: 'Rillet',
         BILLCOM: 'Bill.com',
         ZENEFITS: 'Zenefits',
+        DUALENTRY: 'DualEntry',
     },
 
     REVERSED_TRANSACTION_ATTRIBUTE: 'is-reversed-transaction',
@@ -1028,6 +1029,7 @@ const CONST = {
         BULK_SUBMIT_APPROVE_PAY: 'bulkSubmitApprovePay',
         VENDOR_MATCHING: 'vendorMatching',
         RILLET: 'rillet',
+        DUALENTRY: 'dualEntry',
         INTUIT_ENTERPRISE_SUITE: 'intuitEnterpriseSuite',
         RULES_REVAMP: 'rulesRevamp',
         COMMUTER_EXCLUSIONS: 'commuterExclusions',
@@ -3579,6 +3581,54 @@ const CONST = {
         CREDIT_CARD: 'Credit Card',
     },
 
+    DUALENTRY_CONFIG: {
+        SUBSIDIARY_ID: 'subsidiaryID',
+        ENABLE_NEW_CATEGORIES: 'enableNewCategories',
+        SYNC_TAX_RATES: 'syncTaxRates',
+        EXPORTER: 'exporter',
+        EXPORT_DATE: 'exportDate',
+        REIMBURSABLE: 'reimbursable',
+        NON_REIMBURSABLE: 'nonReimbursable',
+        CREDIT_CARD_ACCOUNT_ID: 'creditCardAccountID',
+        EXPORT_TO_MULTIPLE_ACCOUNTS: 'exportToMultipleAccounts',
+        DEFAULT_VENDORID: 'defaultVendorID',
+        TRAVEL_INVOICING_PAYABLE_ACCOUNT_ID: 'travelInvoicingPayableAccountID',
+        ACCOUNTING_METHOD: 'accountingMethod',
+        AUTO_SYNC: 'autoSync',
+        SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
+        BILL_PAYMENT_ACCOUNT_ID: 'billPaymentAccountID',
+        SYNC_EXPENSIFY_CARD_SETTLEMENTS: 'syncExpensifyCardSettlements',
+        SETTLEMENTS_BANK_ACCOUNT_ID: 'settlementsBankAccountID',
+        SYNC_TRAVEL_INVOICING_SETTLEMENTS: 'syncTravelInvoicingSettlements',
+        TRAVEL_INVOICING_SETTLEMENTS_BANK_ACCOUNT_ID: 'travelInvoicingSettlementsBankAccountID',
+        FIELD_MAPPING_PREFIX: 'fieldMapping_',
+        CARD_PROGRAM_ACCOUNT_PREFIX: 'cardProgramAccount_',
+    },
+
+    DUALENTRY_MAPPING_VALUE: {
+        NONE: 'NONE',
+        TAG: 'TAG',
+    },
+
+    DUALENTRY_EXPORT_REIMBURSABLE: {
+        VENDOR_BILL: 'VENDOR_BILL',
+    },
+
+    DUALENTRY_EXPORT_NON_REIMBURSABLE: {
+        DIRECT_EXPENSE: 'DIRECT_EXPENSE',
+    },
+
+    DUALENTRY_EXPORT_DATE: {
+        LAST_EXPENSE: 'LAST_EXPENSE',
+        REPORT_EXPORTED: 'REPORT_EXPORTED',
+        REPORT_SUBMITTED: 'REPORT_SUBMITTED',
+    },
+
+    DUALENTRY_TAX_TYPE: {
+        VAT: 'VAT',
+        GST: 'GST',
+    },
+
     UPDATE_PERSONAL_BANK_ACCOUNT: {
         PAGE_NAME: {
             LEGAL_NAME: 'legal-name',
@@ -4328,6 +4378,7 @@ const CONST = {
                 SAGE_INTACCT: 'intacct',
                 CERTINIA: 'financialforce',
                 RILLET: 'rillet',
+                DUALENTRY: 'dualEntry',
                 GUSTO: 'gusto',
                 ZENEFITS: 'zenefits',
                 MERGE_HR: 'merge_hris',
@@ -4344,6 +4395,7 @@ const CONST = {
                 QBD: 'quickbooks-desktop',
                 CERTINIA: 'certinia',
                 RILLET: 'rillet',
+                DUALENTRY: 'dualentry',
                 GUSTO: 'gusto',
                 ZENEFITS: 'zenefits',
                 MERGE_HR: 'merge-hr',
@@ -4356,6 +4408,7 @@ const CONST = {
                 intacct: 'Sage Intacct',
                 financialforce: 'Certinia',
                 rillet: 'Rillet',
+                dualEntry: 'DualEntry',
                 gusto: 'Gusto',
                 billCom: 'Bill.com',
                 zenefits: 'TriNet',
@@ -4366,7 +4419,7 @@ const CONST = {
                 other: 'Other',
             },
             get ACCOUNTING_CONNECTION_NAMES() {
-                return [this.NAME.QBO, this.NAME.QBD, this.NAME.XERO, this.NAME.NETSUITE, this.NAME.SAGE_INTACCT, this.NAME.CERTINIA, this.NAME.RILLET] as const;
+                return [this.NAME.QBO, this.NAME.QBD, this.NAME.XERO, this.NAME.NETSUITE, this.NAME.SAGE_INTACCT, this.NAME.CERTINIA, this.NAME.RILLET, this.NAME.DUALENTRY] as const;
             },
             get HR_CONNECTION_NAMES() {
                 return [this.NAME.GUSTO, this.NAME.ZENEFITS, this.NAME.MERGE_HR] as const;
@@ -4469,6 +4522,9 @@ const CONST = {
                 RILLET_SYNC_TITLE: 'rilletSyncTitle',
                 RILLET_SYNC_CONNECTION: 'rilletSyncConnection',
                 RILLET_SYNC_IMPORT_DATA: 'rilletSyncImportData',
+                DUALENTRY_SYNC_TITLE: 'dualEntrySyncTitle',
+                DUALENTRY_SYNC_CONNECTION: 'dualEntrySyncConnection',
+                DUALENTRY_SYNC_IMPORT_DATA: 'dualEntrySyncImportData',
             },
             SYNC_STAGE_TIMEOUT_MINUTES: 20,
         },
@@ -4920,6 +4976,11 @@ const CONST = {
              * Name of Card NVP for Rillet custom export accounts
              */
             NVP_RILLET_EXPORT_ACCOUNT: 'rillet_export_account',
+
+            /**
+             * Name of Card NVP for DualEntry custom export accounts
+             */
+            NVP_DUALENTRY_EXPORT_ACCOUNT: 'dualentry_export_account',
         },
         EXPORT_CARD_POLICY_TYPES: {
             /**
@@ -4967,6 +5028,11 @@ const CONST = {
              * Name of Card NVP for Rillet custom export accounts
              */
             NVP_RILLET_EXPORT_ACCOUNT_POLICY_ID: 'rillet_export_account_policy_id',
+
+            /**
+             * Name of Card NVP for DualEntry custom export accounts
+             */
+            NVP_DUALENTRY_EXPORT_ACCOUNT_POLICY_ID: 'dualentry_export_account_policy_id',
         },
     },
     AVATAR_ROW_SIZE: {
@@ -7794,6 +7860,14 @@ const CONST = {
                 description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.RILLET}.description` as const,
                 icon: 'RilletSquare',
             },
+            [this.POLICY.CONNECTIONS.NAME.DUALENTRY]: {
+                id: this.POLICY.CONNECTIONS.NAME.DUALENTRY,
+                alias: 'dualentry',
+                name: this.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.dualEntry,
+                title: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.DUALENTRY}.title` as const,
+                description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.DUALENTRY}.description` as const,
+                icon: 'DualEntrySquare',
+            },
             approvals: {
                 id: 'approvals' as const,
                 alias: 'approvals' as const,

src/CONST/index.ts

@@ -808,6 +808,10 @@ const ONYXKEYS = {
     /** List of transaction IDs used when navigating to prev/next transaction when viewing it in RHP */
     TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS: 'transactionThreadNavigationTransactionIDs',
 
+    /** Hash of the search snapshot that holds the transactions referenced by TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS.
+     * Used to fall back to snapshot data when the live transaction collection hasn't loaded those transactions yet (e.g. opening an expense from the Spend page as an approver). */
+    TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH: 'transactionThreadNavigationSnapshotHash',
+
     /** Optional map of transactionID -> sibling descriptor for prev/next navigation in snapshot-backed flows (e.g. Home "Recently added"), where siblings may be absent from the main Onyx collections. When set, navigation resolves (and lazily creates) each sibling's thread on demand from its descriptor. */
     TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS: 'transactionThreadNavigationThreadReportIDs',
 
@@ -1286,6 +1290,8 @@ const ONYXKEYS = {
         EDIT_AGENT_RULE_FORM_DRAFT: 'editAgentRuleFormDraft',
         RILLET_CREDENTIALS_FORM: 'rilletCredentialsForm',
         RILLET_CREDENTIALS_FORM_DRAFT: 'rilletCredentialsFormDraft',
+        DUALENTRY_CREDENTIALS_FORM: 'dualEntryCredentialsForm',
+        DUALENTRY_CREDENTIALS_FORM_DRAFT: 'dualEntryCredentialsFormDraft',
     },
     DERIVED: {
         REPORT_ATTRIBUTES: 'reportAttributes',
@@ -1437,6 +1443,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.ADD_AGENT_RULE_FORM]: FormTypes.AddAgentRuleForm;
     [ONYXKEYS.FORMS.EDIT_AGENT_RULE_FORM]: FormTypes.EditAgentRuleForm;
     [ONYXKEYS.FORMS.RILLET_CREDENTIALS_FORM]: FormTypes.RilletCredentialsForm;
+    [ONYXKEYS.FORMS.DUALENTRY_CREDENTIALS_FORM]: FormTypes.DualEntryCredentialsForm;
 };
 
 type OnyxFormDraftValuesMapping = {
@@ -1789,6 +1796,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.REPORT_NAVIGATION_LAST_SEARCH_QUERY]: OnyxTypes.LastSearchParams;
     [ONYXKEYS.NVP_LAST_ANDROID_LOGIN]: string;
     [ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_TRANSACTION_IDS]: string[];
+    [ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_SNAPSHOT_HASH]: number;
     [ONYXKEYS.TRANSACTION_THREAD_NAVIGATION_THREAD_REPORT_IDS]: Record<string, TransactionThreadNavigationDescriptor>;
     [ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES]: OnyxTypes.ExportTemplate[];
     [ONYXKEYS.ONBOARDING_USER_REPORTED_INTEGRATION]: OnboardingAccounting;

src/ONYXKEYS.ts

@@ -4474,6 +4474,18 @@ const ROUTES = {
         route: 'workspaces/:policyID/accounting/rillet/advanced/travel-invoicing-settlement-account',
         getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/advanced/travel-invoicing-settlement-account` as const,
     },
+    POLICY_ACCOUNTING_DUALENTRY_SETUP: {
+        route: 'workspaces/:policyID/accounting/dualentry/setup',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/dualentry/setup` as const,
+    },
+    POLICY_ACCOUNTING_DUALENTRY_EXISTING_CONNECTIONS: {
+        route: 'workspaces/:policyID/accounting/dualentry/existing-connections',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/dualentry/existing-connections` as const,
+    },
+    POLICY_ACCOUNTING_DUALENTRY_COMPANY_SELECTOR: {
+        route: 'workspaces/:policyID/accounting/dualentry/company-selector',
+        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/dualentry/company-selector` as const,
+    },
     ADD_EXISTING_EXPENSE: {
         route: 'search/r/:reportID/add-existing-expense/:backToReport?',
         getRoute: (reportID: string | undefined, backToReport?: string) => `search/r/${reportID}/add-existing-expense/${backToReport ?? ''}` as const,

src/ROUTES.ts

@@ -689,6 +689,9 @@ const SCREENS = {
             RILLET_BILL_PAYMENT_ACCOUNT: 'Policy_Accounting_Rillet_Bill_Payment_Account',
             RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT: 'Policy_Accounting_Rillet_Expensify_Card_Settlement_Account',
             RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT: 'Policy_Accounting_Rillet_Travel_Invoicing_Settlement_Account',
+            DUALENTRY_SETUP: 'Policy_Accounting_DualEntry_Setup',
+            DUALENTRY_EXISTING_CONNECTIONS: 'Policy_Accounting_DualEntry_Existing_Connections',
+            DUALENTRY_COMPANY_SELECTOR: 'Policy_Accounting_DualEntry_Subsidiary_Selector',
             CARD_RECONCILIATION: 'Policy_Accounting_Card_Reconciliation',
             CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC: 'Policy_Accounting_Card_Reconciliation_Sage_Intacct_Auto_Sync',
             DYNAMIC_RECONCILIATION_ACCOUNT_SETTINGS: 'Dynamic_Policy_Accounting_Reconciliation_Account_Settings',

src/SCREENS.ts

@@ -0,0 +1,30 @@
+import useHasReusablePoliciesConnectedTo from '@hooks/useHasReusablePoliciesConnectedTo';
+
+import Navigation from '@libs/Navigation/Navigation';
+
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+import {useEffect} from 'react';
+
+type ConnectToDualEntryFlowProps = {
+    policyID: string;
+};
+
+function ConnectToDualEntryFlow({policyID}: ConnectToDualEntryFlowProps) {
+    const hasReusablePoliciesConnectedToDualEntry = useHasReusablePoliciesConnectedTo(CONST.POLICY.CONNECTIONS.NAME.DUALENTRY, policyID);
+
+    useEffect(() => {
+        if (hasReusablePoliciesConnectedToDualEntry) {
+            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_DUALENTRY_EXISTING_CONNECTIONS.getRoute(policyID));
+            return;
+        }
+        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_DUALENTRY_SETUP.getRoute(policyID));
+        // This needs to run once as we will navigate away
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    return null;
+}
+
+export default ConnectToDualEntryFlow;

src/components/ConnectToDualEntry/index.tsx

@@ -134,6 +134,7 @@ import Info from '@assets/images/info.svg';
 import BillComSquare from '@assets/images/integrationicons/bill-com-icon-square.svg';
 import CertiniaSquare from '@assets/images/integrationicons/certinia-icon-square.svg';
 import CircleSlash from '@assets/images/integrationicons/circle-slash.svg';
+import DualEntrySquare from '@assets/images/integrationicons/dualentry-icon-square.svg';
 import NetSuiteExport from '@assets/images/integrationicons/export/netsuite-icon.svg';
 import QBOExport from '@assets/images/integrationicons/export/qbo-icon.svg';
 import SageIntacctExport from '@assets/images/integrationicons/export/sage-intacct-icon.svg';
@@ -473,6 +474,7 @@ const Expensicons = {
     ReplaceReceipt,
     ReceiptMultiple,
     RilletSquare,
+    DualEntrySquare,
     Rotate,
     RotateLeft,
     Scan,

src/components/Icon/chunks/expensify-icons.chunk.ts

@@ -46,7 +46,17 @@ function ImportedFromAccountingSoftware({policyID, currentConnectionName, transl
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
-    const expensifyIcons = useMemoizedLazyExpensifyIcons(['XeroSquare', 'QBOSquare', 'NetSuiteSquare', 'IntacctSquare', 'QBDSquare', 'CertiniaSquare', 'RilletSquare', 'GustoSquare']);
+    const expensifyIcons = useMemoizedLazyExpensifyIcons([
+        'XeroSquare',
+        'QBOSquare',
+        'NetSuiteSquare',
+        'IntacctSquare',
+        'QBDSquare',
+        'CertiniaSquare',
+        'RilletSquare',
+        'DualEntrySquare',
+        'GustoSquare',
+    ]);
     const icon = getIntegrationIcon(connectedIntegration, expensifyIcons);
 
     if (!customTagName && shouldShow) {