github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-03-22 00:13:45 -05:00
Code Issues 250 Packages Projects Releases 53 Wiki Activity

🐛 Fixed GoCardless SelectLinkedAccounts institution bug (#4667)

Browse Source 
* Fixed GoCardless SelectLinkedAccounts institution bug

* Modified to guarantee string return type

* Update packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.jsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.jsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.jsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Formatting

* Fixed spread syntax

* consistency in method (probably redundant)

---------

Co-authored-by: Alec Bakholdin <abakho@icims.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
Alec Bakholdin
2025-03-21 10:56:25 -04:00
committed by GitHub
parent af09e5b1d5
commit 6b2d2420a5
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
packages/desktop-client/src/components/modals/SelectLinkedAccountsModal.jsx
View File

@@ -43,10 +43,10 @@ export function SelectLinkedAccountsModal({
syncSource = undefined,
}) {
const sortedExternalAccounts = useMemo(() => {
const toSort = [...externalAccounts];
const toSort = externalAccounts ? [...externalAccounts] : [];
toSort.sort(
(a, b) =>
a.institution?.localeCompare(b.institution) ||
getInstitutionName(a)?.localeCompare(getInstitutionName(b)) ||
a.name.localeCompare(b.name),
);
return toSort;
@@ -234,6 +234,15 @@ export function SelectLinkedAccountsModal({
);
}
function getInstitutionName(externalAccount) {
if (typeof externalAccount?.institution === 'string') {
return externalAccount?.institution ?? '';
} else if (typeof externalAccount.institution?.name === 'string') {
return externalAccount?.institution?.name ?? '';
}
return '';
}
function TableRow({
externalAccount,
chosenAccount,
@@ -254,7 +263,7 @@ function TableRow({
return (
<Row style={{ backgroundColor: theme.tableBackground }}>
<Field width={175}>
<Tooltip content={externalAccount.institution}>
<Tooltip content={getInstitutionName(externalAccount)}>
<View
style={{
textOverflow: 'ellipsis',
@@ -262,7 +271,7 @@ function TableRow({
display: 'block',
}}
>
{externalAccount.institution}
{getInstitutionName(externalAccount)}
</View>
</Tooltip>
</Field>