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

fix: Account names should use natural sort order #1663

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Account names should use natural sort order #1663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
571137c
fix: Account names should use natural sort order
alfiedotwtf Nov 23, 2024
a2b00b3
Merge branch 'master' into alfie/natural-sort-accounts
rodrigobranas Nov 28, 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
7 changes: 7 additions & 0 deletions packages/app/src/systems/Account/components/AccountList/AccountList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ export function AccountList({
setShowHidden((s) => !s);
}

const collator = new Intl.Collator(undefined, {
numeric: true,
sensitivity: "base"
});

accounts = accounts.sort((a, b) => collator.compare(a.name, b.name));
Comment on lines +35 to +40
Copy link
Member

@helciofranco helciofranco Dec 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

can we move this to AccountService.getAccounts?
so we fix the issue at the best place where the incorrect order is being returned

fuels-wallet/packages/app/src/systems/Account/services/account.ts

Lines 66 to 70 in 4fe865a

static async getAccounts() {
return db.transaction('r', db.accounts, async () => {
return db.accounts.toCollection().sortBy('name');
});
}

you'll need to use toArray() instead of toCollection() in order to run .sort() on it (and that sortBy('name') can be removed).

I think this approach might work:

static async getAccounts() {
  return db.transaction('r', db.accounts, async () => {
    const accounts = await db.accounts.toArray();
    return accounts.sort((a, b) => a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }));
  });
}


return (
Copy link
Member

Choose a reason for hiding this comment

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

also, could you add a short and clear changelog for this fix?

just run pnpm changeset and follow the instruction (it looks like a patch fix)

<Box.Stack gap="$4">
{isLoading && (
Expand Down
Loading