Merge pull request Expensify#52974 from twilight2294/patch-8

Fix: Selected Xero bank account is not highlighted with a green checkmark
software-mansion-labs · Nov 25, 2024 · ba65563 · ba65563
2 parents 9c07d81 + 71d18bd
commit ba65563
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
@@ -27,9 +27,11 @@ function XeroBankAccountSelectPage({policy}: WithPolicyConnectionsProps) {
     const policyID = policy?.id ?? '-1';
 
     const {config} = policy?.connections?.xero ?? {};
+    const {bankAccounts} = policy?.connections?.xero?.data ?? {};
     const xeroSelectorOptions = useMemo<SelectorType[]>(
-        () => getXeroBankAccounts(policy ?? undefined, config?.export?.nonReimbursableAccount),
-        [config?.export?.nonReimbursableAccount, policy],
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        () => getXeroBankAccounts(policy ?? undefined, config?.export?.nonReimbursableAccount || bankAccounts?.[0]?.id),
+        [config?.export?.nonReimbursableAccount, policy, bankAccounts],
     );
 
     const listHeaderComponent = useMemo(