Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Wave Collect] [Xero] Default select options #42360

Merged
merged 9 commits into from
May 21, 2024
Merged

[Wave Collect] [Xero] Default select options #42360

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
acbeb1b
fix: select first item in list
mananjadhav May 17, 2024
89a68ba
fix: default select first item
mananjadhav May 17, 2024
77cedd2
fix: default select first item
mananjadhav May 17, 2024
1f71c18
Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App …
mananjadhav May 20, 2024
a8ee9fe
Merge branch 'xero-merge-freeze' of https://github.com/Expensify/App …
mananjadhav May 21, 2024
f3cbb21
refactor: move bank selection to utils
mananjadhav May 21, 2024
e143cfb
refactor: replace with utils
mananjadhav May 21, 2024
92cd9c6
refactor: replace with utils
mananjadhav May 21, 2024
a66f8cb
refactor: lint fixes
mananjadhav May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
const getSelectedAccountName = useMemo(
() => (accountID: string) => {
const selectedAccount = (bankAccounts ?? []).find((bank) => bank.id === accountID);
return selectedAccount?.name ?? '';
return selectedAccount?.name ?? bankAccounts?.[0]?.name ?? '';
},
[bankAccounts],
);
Expand Down
20 changes: 10 additions & 10 deletions src/pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ function XeroBillPaymentAccountSelectorPage({policy}: WithPolicyConnectionsProps

const {reimbursementAccountID, syncReimbursedReports} = policy?.connections?.xero?.config.sync ?? {};

const xeroSelectorOptions = useMemo<SelectorType[]>(
() =>
(bankAccounts ?? []).map(({id, name}) => ({
value: id,
text: name,
keyForList: id,
isSelected: reimbursementAccountID === id,
})),
[reimbursementAccountID, bankAccounts],
);
const xeroSelectorOptions = useMemo<SelectorType[]>(() => {
const isMatchFound = bankAccounts?.some(({id}) => id === reimbursementAccountID);

return (bankAccounts ?? []).map(({id, name}, index) => ({
value: id,
text: name,
keyForList: id,
isSelected: isMatchFound ? reimbursementAccountID === id : index === 0,
}));
}, [reimbursementAccountID, bankAccounts]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is repeated 3 times, in 3 different files. Can you move it to an utility function?


const listHeaderComponent = useMemo(
() => (
Expand Down
20 changes: 10 additions & 10 deletions src/pages/workspace/accounting/xero/advanced/XeroInvoiceAccountSelectorPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ function XeroInvoiceAccountSelectorPage({policy}: WithPolicyConnectionsProps) {

const {invoiceCollectionsAccountID, syncReimbursedReports} = policy?.connections?.xero?.config.sync ?? {};

const xeroSelectorOptions = useMemo<SelectorType[]>(
() =>
(bankAccounts ?? []).map(({id, name}) => ({
value: id,
text: name,
keyForList: id,
isSelected: invoiceCollectionsAccountID === id,
})),
[invoiceCollectionsAccountID, bankAccounts],
);
const xeroSelectorOptions = useMemo<SelectorType[]>(() => {
const isMatchFound = bankAccounts?.some(({id}) => id === invoiceCollectionsAccountID);

return (bankAccounts ?? []).map(({id, name}, index) => ({
value: id,
text: name,
keyForList: id,
isSelected: isMatchFound ? invoiceCollectionsAccountID === id : index === 0,
}));
}, [invoiceCollectionsAccountID, bankAccounts]);

const listHeaderComponent = useMemo(
() => (
Expand Down
20 changes: 10 additions & 10 deletions src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ function XeroBankAccountSelectPage({policy}: WithPolicyConnectionsProps) {

const {nonReimbursableAccount: nonReimbursableAccountID} = policy?.connections?.xero?.config.export ?? {};

const xeroSelectorOptions = useMemo<SelectorType[]>(
() =>
(bankAccounts ?? []).map(({id, name}) => ({
value: id,
text: name,
keyForList: id,
isSelected: nonReimbursableAccountID === id,
})),
[nonReimbursableAccountID, bankAccounts],
);
const xeroSelectorOptions = useMemo<SelectorType[]>(() => {
const isMatchFound = bankAccounts?.some(({id}) => id === nonReimbursableAccountID);

return (bankAccounts ?? []).map(({id, name}, index) => ({
value: id,
text: name,
keyForList: id,
isSelected: isMatchFound ? nonReimbursableAccountID === id : index === 0,
}));
}, [nonReimbursableAccountID, bankAccounts]);

const listHeaderComponent = useMemo(
() => (
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
const {bankAccounts} = policy?.connections?.xero?.data ?? {};
const selectedBankAccountName = useMemo(() => {
const selectedAccount = (bankAccounts ?? []).find((bank) => bank.id === exportConfiguration?.nonReimbursableAccount);
return selectedAccount?.name ?? '';
return selectedAccount?.name ?? bankAccounts?.[0]?.name ?? '';
}, [bankAccounts, exportConfiguration?.nonReimbursableAccount]);

const currentXeroOrganizationName = useMemo(() => getCurrentXeroOrganizationName(policy ?? undefined), [policy]);
Expand Down
Loading